From 7f7076d1a4f1dcd029a8da60dcc7a592192fa161 Mon Sep 17 00:00:00 2001 From: benk10 Date: Thu, 27 Nov 2025 11:14:09 -0500 Subject: [PATCH] Fix RBF until events arrive --- Bitkit/Services/CoreService.swift | 8 ++++---- Bitkit/ViewModels/AppViewModel.swift | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Bitkit/Services/CoreService.swift b/Bitkit/Services/CoreService.swift index de48295e..53afed50 100644 --- a/Bitkit/Services/CoreService.swift +++ b/Bitkit/Services/CoreService.swift @@ -356,6 +356,7 @@ class ActivityService { // Mark the replaced transaction as not existing existing.doesExist = false + existing.isBoosted = false existing.updatedAt = UInt64(Date().timeIntervalSince1970) try await self.update(id: existing.id, activity: .onchain(existing)) Logger.info("Marked transaction \(txid) as replaced", context: "CoreService.handleOnchainTransactionReplaced") @@ -998,12 +999,11 @@ class ActivityService { Logger.info("RBF transaction created successfully: \(txid)", context: "CoreService.boostOnchainTransaction") - // For RBF, mark the original activity as doesExist = false instead of deleting it - // This allows it to be displayed with the "removed" status - onchainActivity.doesExist = false + // For RBF, mark the original activity as boosted until the replacement comes + onchainActivity.isBoosted = true try await self.update(id: activityId, activity: .onchain(onchainActivity)) Logger.info( - "Successfully marked activity \(activityId) as doesExist = false (replaced by RBF)", + "Successfully marked activity \(activityId) as replaced by fee", context: "CoreService.boostOnchainTransaction" ) } diff --git a/Bitkit/ViewModels/AppViewModel.swift b/Bitkit/ViewModels/AppViewModel.swift index 7da6fce3..39e11944 100644 --- a/Bitkit/ViewModels/AppViewModel.swift +++ b/Bitkit/ViewModels/AppViewModel.swift @@ -401,10 +401,6 @@ extension AppViewModel { await MainActor.run { if !shouldShow { - Logger.info( - "Skipping received sheet for RBF replacement with same value: \(txid)", - context: "AppViewModel" - ) return }