Merge branch 'feat/onchain-events' into fix/toast-ui

Author: ovitrif

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

@@ -133,4 +133,6 @@ data class AppCacheData(
     val lastLightningPaymentId: String? = null,
     val pendingBoostActivities: List<PendingBoostActivity> = listOf(),
     val backgroundReceive: NewTransactionSheetDetails? = null,
-)
+) {
+    fun resetBip21() = copy(bip21 = "", bolt11 = "", onchainAddress = "")
+}

app/src/main/java/to/bitkit/domain/commands/NotifyPaymentReceived.kt

@@ -7,40 +7,31 @@ import to.bitkit.models.NotificationDetails
 sealed interface NotifyPaymentReceived {
 
     sealed interface Command : NotifyPaymentReceived {
-        val sats: ULong
-        val paymentHashOrTxId: String
         val includeNotification: Boolean
 
         data class Lightning(
-            override val sats: ULong,
-            override val paymentHashOrTxId: String,
+            val event: Event.PaymentReceived,
             override val includeNotification: Boolean = false,
         ) : Command
 
         data class Onchain(
-            override val sats: ULong,
-            override val paymentHashOrTxId: String,
+            val event: Event.OnchainTransactionReceived,
             override val includeNotification: Boolean = false,
         ) : Command
 
         companion object {
             fun from(event: Event, includeNotification: Boolean = false): Command? =
                 when (event) {
                     is Event.PaymentReceived -> Lightning(
-                        sats = event.amountMsat / 1000u,
-                        paymentHashOrTxId = event.paymentHash,
+                        event = event,
                         includeNotification = includeNotification,
                     )
 
-                    is Event.OnchainTransactionReceived -> {
-                        val amountSats = event.details.amountSats
-                        Onchain(
-                            sats = amountSats.toULong(),
-                            paymentHashOrTxId = event.txid,
-                            includeNotification = includeNotification,
-                        ).takeIf {
-                            amountSats > 0
-                        }
+                    is Event.OnchainTransactionReceived -> Onchain(
+                        event = event,
+                        includeNotification = includeNotification,
+                    ).takeIf {
+                        event.details.amountSats > 0
                     }
 
                     else -> null

app/src/main/java/to/bitkit/domain/commands/NotifyPaymentReceivedHandler.kt

@@ -38,26 +38,32 @@ class NotifyPaymentReceivedHandler @Inject constructor(
             val shouldShow = when (command) {
                 is NotifyPaymentReceived.Command.Lightning -> true
                 is NotifyPaymentReceived.Command.Onchain -> {
+                    activityRepo.handleOnchainTransactionReceived(command.event.txid, command.event.details)
                     delay(DELAY_FOR_ACTIVITY_SYNC_MS)
-                    activityRepo.shouldShowReceivedSheet(command.paymentHashOrTxId, command.sats)
+                    activityRepo.shouldShowReceivedSheet(command.event.txid, command.event.details.amountSats.toULong())
                 }
             }
 
             if (!shouldShow) return@runCatching NotifyPaymentReceived.Result.Skip
 
-            val satsLong = command.sats.toLong()
             val details = NewTransactionSheetDetails(
                 type = when (command) {
                     is NotifyPaymentReceived.Command.Lightning -> NewTransactionSheetType.LIGHTNING
                     is NotifyPaymentReceived.Command.Onchain -> NewTransactionSheetType.ONCHAIN
                 },
                 direction = NewTransactionSheetDirection.RECEIVED,
-                paymentHashOrTxId = command.paymentHashOrTxId,
-                sats = satsLong,
+                paymentHashOrTxId = when (command) {
+                    is NotifyPaymentReceived.Command.Lightning -> command.event.paymentHash
+                    is NotifyPaymentReceived.Command.Onchain -> command.event.txid
+                },
+                sats = when (command) {
+                    is NotifyPaymentReceived.Command.Lightning -> (command.event.amountMsat / 1000u).toLong()
+                    is NotifyPaymentReceived.Command.Onchain -> command.event.details.amountSats
+                },
             )
 
             if (command.includeNotification) {
-                val notification = buildNotificationContent(satsLong)
+                val notification = buildNotificationContent(details.sats)
                 NotifyPaymentReceived.Result.ShowNotification(details, notification)
             } else {
                 NotifyPaymentReceived.Result.ShowSheet(details)
@@ -97,8 +103,8 @@ class NotifyPaymentReceivedHandler @Inject constructor(
         const val TAG = "NotifyPaymentReceivedHandler"
 
         /**
-         * Delay before calling `shouldShowPaymentReceived` for onchain transactions to allow ActivityRepo
-         * to sync payments before we check for RBF replacement or channel closure.
+         * Delay after syncing onchain transaction to allow the database to fully process
+         * the transaction before checking for RBF replacement or channel closure.
          */
         private const val DELAY_FOR_ACTIVITY_SYNC_MS = 500L
     }

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

@@ -484,8 +484,8 @@ class BackupRepo @Inject constructor(
         return@withContext try {
             performRestore(BackupCategory.METADATA) { dataBytes ->
                 val parsed = json.decodeFromString<MetadataBackupV1>(String(dataBytes))
-                val cleanedUp = parsed.cache.copy(onchainAddress = "") // Force address rotation
-                cacheStore.update { cleanedUp }
+                val cleanCache = parsed.cache.resetBip21() // Force address rotation
+                cacheStore.update { cleanCache }
                 Logger.debug("Restored caches: ${jsonLogOf(parsed.cache.copy(cachedRates = emptyList()))}", TAG)
                 onCacheRestored()
                 preActivityMetadataRepo.upsertPreActivityMetadata(parsed.tagMetadata).getOrNull()