Merge pull request #532 from synonymdev/feat/spend-unconfirmed

Author: ovitrif

app/src/main/java/to/bitkit/data/CacheStore.kt

@@ -98,10 +98,6 @@ class CacheStore @Inject constructor(
         }
     }
 
-    suspend fun setLastLightningPayment(paymentId: String) {
-        store.updateData { it.copy(lastLightningPaymentId = paymentId) }
-    }
-
     suspend fun setBackgroundReceive(details: NewTransactionSheetDetails) = store.updateData {
         it.copy(backgroundReceive = details)
     }
@@ -130,7 +126,6 @@ data class AppCacheData(
     val balance: BalanceState? = null,
     val backupStatuses: Map<BackupCategory, BackupItemStatus> = mapOf(),
     val deletedActivities: List<String> = listOf(),
-    val lastLightningPaymentId: String? = null,
     val pendingBoostActivities: List<PendingBoostActivity> = listOf(),
     val backgroundReceive: NewTransactionSheetDetails? = null,
 ) {

app/src/main/java/to/bitkit/services/LightningService.kt

@@ -108,6 +108,7 @@ class LightningService @Inject constructor(
                 trustedPeersNoReserve = trustedPeerNodeIds,
                 perChannelReserveSats = 1u,
             ),
+            includeUntrustedPendingInSpendable = true,
         )
     }
 

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

@@ -382,20 +382,8 @@ class AppViewModel @Inject constructor(
 
     private suspend fun notifyPaymentReceived(event: Event) {
         val command = NotifyPaymentReceived.Command.from(event) ?: return
-        if (command is NotifyPaymentReceived.Command.Lightning) {
-            val cachedId = cacheStore.data.first().lastLightningPaymentId
-            // Skip if this is a replay by ldk-node on startup
-            if (command.event.paymentHash == cachedId) {
-                Logger.debug("Skipping notification for replayed event: $event", context = TAG)
-                return
-            }
-            // Cache to skip later as needed
-            cacheStore.setLastLightningPayment(command.event.paymentHash)
-        }
-
         val result = notifyPaymentReceivedHandler(command).getOrNull()
         if (result !is NotifyPaymentReceived.Result.ShowSheet) return
-
         showTransactionSheet(result.sheet)
     }