Skip to content

Commit 9c3cb5c

Browse files
authored
Merge pull request synonymdev#247 from synonymdev/fix/rbf-display
Fix RBF until events arrive
2 parents c7aa2b8 + c5bf267 commit 9c3cb5c

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

Bitkit/Services/CoreService.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,7 @@ class ActivityService {
356356

357357
// Mark the replaced transaction as not existing
358358
existing.doesExist = false
359+
existing.isBoosted = false
359360
existing.updatedAt = UInt64(Date().timeIntervalSince1970)
360361
try await self.update(id: existing.id, activity: .onchain(existing))
361362
Logger.info("Marked transaction \(txid) as replaced", context: "CoreService.handleOnchainTransactionReplaced")
@@ -998,12 +999,11 @@ class ActivityService {
998999

9991000
Logger.info("RBF transaction created successfully: \(txid)", context: "CoreService.boostOnchainTransaction")
10001001

1001-
// For RBF, mark the original activity as doesExist = false instead of deleting it
1002-
// This allows it to be displayed with the "removed" status
1003-
onchainActivity.doesExist = false
1002+
// For RBF, mark the original activity as boosted until the replacement comes
1003+
onchainActivity.isBoosted = true
10041004
try await self.update(id: activityId, activity: .onchain(onchainActivity))
10051005
Logger.info(
1006-
"Successfully marked activity \(activityId) as doesExist = false (replaced by RBF)",
1006+
"Successfully marked activity \(activityId) as replaced by fee",
10071007
context: "CoreService.boostOnchainTransaction"
10081008
)
10091009
}

Bitkit/ViewModels/AppViewModel.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -401,10 +401,6 @@ extension AppViewModel {
401401

402402
await MainActor.run {
403403
if !shouldShow {
404-
Logger.info(
405-
"Skipping received sheet for RBF replacement with same value: \(txid)",
406-
context: "AppViewModel"
407-
)
408404
return
409405
}
410406

0 commit comments

Comments
 (0)