Merge branch 'master' into feat/spend-unconfirmed

Author: ovitrif

app/src/main/java/to/bitkit/repositories/LightningRepo.kt

@@ -334,6 +334,12 @@ class LightningRepo @Inject constructor(
         Result.success(Unit)
     }
 
+    fun syncAsync() = scope.launch {
+        sync().onFailure { error ->
+            Logger.warn("Sync failed", e = error, context = TAG)
+        }
+    }
+
     /** Clear pending sync flag. Called when manual pull-to-refresh takes priority. */
     fun clearPendingSync() {
         syncPending.set(false)

app/src/main/java/to/bitkit/ui/sheets/BoostTransactionViewModel.kt

@@ -209,20 +209,16 @@ class BoostTransactionViewModel @Inject constructor(
 
     private suspend fun handleBoostSuccess(newTxId: Txid, isRBF: Boolean) {
         Logger.debug("Boost successful. newTxId: $newTxId", context = TAG)
-        updateActivity(newTxId = newTxId, isRBF = isRBF).fold(
-            onSuccess = {
-                lightningRepo.sync()
-                activityRepo.syncActivities()
-                _uiState.update { it.copy(boosting = false) }
-                setBoostTransactionEffect(BoostTransactionEffects.OnBoostSuccess)
-            },
-            onFailure = { error ->
-                // Boost succeeded but activity update failed - still consider it successful
+        updateActivity(newTxId = newTxId, isRBF = isRBF)
+            .onFailure { error ->
                 Logger.warn("Boost successful but activity update failed", e = error, context = TAG)
-                _uiState.update { it.copy(boosting = false) }
-                setBoostTransactionEffect(BoostTransactionEffects.OnBoostSuccess)
             }
-        )
+
+        _uiState.update { it.copy(boosting = false) }
+        setBoostTransactionEffect(BoostTransactionEffects.OnBoostSuccess)
+
+        // Fire-and-forget sync to keep UI responsive even if LDK sync hangs.
+        lightningRepo.syncAsync()
     }
 
     fun onChangeAmount(increase: Boolean) {

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

@@ -311,8 +311,17 @@ class AppViewModel @Inject constructor(
     }
 
     private suspend fun handleOnchainTransactionReplaced(event: Event.OnchainTransactionReplaced) {
+        // If the replaced transaction was just boosted via RBF from within the app, we already show a
+        // dedicated boost success toast; suppress the generic "transaction replaced" toast to avoid
+        // flakiness/noise (notably in E2E flows).
+        val shouldSuppressReplacedToast = activityRepo
+            .getOnchainActivityByTxId(event.txid)
+            ?.let { it.isBoosted && it.txType == PaymentType.SENT } == true
+
         activityRepo.handleOnchainTransactionReplaced(event.txid, event.conflicts)
-        notifyTransactionReplaced(event)
+        if (!shouldSuppressReplacedToast) {
+            notifyTransactionReplaced(event)
+        }
     }
 
     private suspend fun handlePaymentFailed(event: Event.PaymentFailed) {

app/src/test/java/to/bitkit/ui/sheets/BoostTransactionViewModelTest.kt

@@ -4,6 +4,7 @@ import app.cash.turbine.test
 import com.synonym.bitkitcore.Activity
 import com.synonym.bitkitcore.OnchainActivity
 import com.synonym.bitkitcore.PaymentType
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Test
@@ -62,6 +63,7 @@ class BoostTransactionViewModelTest : BaseUnitTest() {
             activityRepo = activityRepo
         )
         wheneverBlocking { lightningRepo.listSpendableOutputs() }.thenReturn(Result.success(emptyList()))
+        whenever(lightningRepo.syncAsync()).thenReturn(Job())
     }
 
     @Test
@@ -224,6 +226,7 @@ class BoostTransactionViewModelTest : BaseUnitTest() {
         }
 
         verify(lightningRepo).accelerateByCpfp(any(), any(), any())
+        verify(lightningRepo).syncAsync()
         verify(activityRepo).updateActivity(any(), any(), any())
         verify(activityRepo, never()).deleteActivity(any())
     }