Fix RBF until events arrive

Bitkit/Services/CoreService.swift

@@ -54,7 +54,7 @@
                 }
             }
             await MainActor.run {
                 self.cachedTxIdsInBoostTxIds = txIds
             }
         } catch {
             Logger.error("Failed to refresh boostTxIds cache: \(error)", context: "ActivityService")
@@ -105,7 +105,7 @@
                     return false
                 }
             }
         } catch {
             Logger.error("Failed to check existing activities for replacement: \(error)", context: "CoreService.shouldShowReceivedSheet")
         }
 
@@ -356,6 +356,7 @@
 
                 // 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")
@@ -480,7 +481,7 @@
     }
 
     private func processLightningPayment(_ payment: PaymentDetails) async throws {
         guard case let .bolt11(hash, preimage, secret, description, bolt11) = payment.kind else { return }
 
         // Skip pending inbound payments - just means they created an invoice
         guard !(payment.status == .pending && payment.direction == .inbound) else { return }
@@ -534,7 +535,7 @@
 
             for payment in payments {
                 do {
                     let state: BitkitCore.PaymentState = switch payment.status {
                     case .failed:
                         .failed
                     case .pending:
@@ -570,7 +571,7 @@
                             latestCaughtError = error
                         }
                     }
                 } catch {
                     Logger.error("Error syncing LDK payment: \(error)", context: "CoreService")
                     latestCaughtError = error
                 }
@@ -603,7 +604,7 @@
     /// Check if a transaction spends a closed channel's funding UTXO
     private func findClosedChannelForTransaction(txid: String, transactionDetails: TransactionDetails? = nil) async -> String? {
         do {
             let closedChannels = try await getAllClosedChannels(sortDirection: .desc)
             guard !closedChannels.isEmpty else { return nil }
 
             // Use provided transaction details if available, otherwise try node
@@ -998,12 +999,11 @@
 
                 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"
                 )
             }

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
                         }