feat: filter received sheet for RBF/channel close

Author: ovitrif

app/build.gradle.kts

@@ -195,7 +195,7 @@ dependencies {
     // Crypto
     implementation(libs.bouncycastle.provider.jdk)
     implementation(libs.ldk.node.android) { exclude(group = "net.java.dev.jna", module = "jna") }
-    implementation(libs.bitkitcore)
+    implementation(libs.bitkit.core)
     implementation(libs.vss)
     // Firebase
     implementation(platform(libs.firebase.bom))

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

@@ -7,6 +7,7 @@ import com.synonym.bitkitcore.ActivityTags
 import com.synonym.bitkitcore.ClosedChannelDetails
 import com.synonym.bitkitcore.IcJitEntry
 import com.synonym.bitkitcore.LightningActivity
+import com.synonym.bitkitcore.OnchainActivity
 import com.synonym.bitkitcore.PaymentState
 import com.synonym.bitkitcore.PaymentType
 import com.synonym.bitkitcore.SortDirection
@@ -191,6 +192,42 @@ class ActivityRepo @Inject constructor(
         }
     }
 
+    private suspend fun getOnchainActivityByTxId(txid: String): OnchainActivity? {
+        return coreService.activity.getOnchainActivityByTxId(txid)
+    }
+
+    /**
+     * Determines whether to show the payment received sheet for an onchain transaction.
+     * Returns false for:
+     * - Zero value transactions
+     * - Channel closure transactions (transfers to savings)
+     * - RBF replacement transactions with the same value as the original
+     */
+    suspend fun shouldShowReceivedSheet(txid: String, value: ULong): Boolean = withContext(bgDispatcher) {
+        if (value == 0uL) return@withContext false
+
+        if (findClosedChannelForTransaction(txid) != null) {
+            Logger.debug("Skipping received sheet for channel closure tx: $txid", context = TAG)
+            return@withContext false
+        }
+
+        val onchainActivity = getOnchainActivityByTxId(txid)
+        if (onchainActivity != null && onchainActivity.boostTxIds.isNotEmpty()) {
+            for (replacedTxid in onchainActivity.boostTxIds) {
+                val replacedActivity = getOnchainActivityByTxId(replacedTxid)
+                if (replacedActivity != null && replacedActivity.value == value) {
+                    Logger.info(
+                        "Skipping received sheet for RBF replacement $txid with same value as $replacedTxid",
+                        context = TAG
+                    )
+                    return@withContext false
+                }
+            }
+        }
+
+        return@withContext true
+    }
+
     /**
      * Gets a specific activity by payment hash or txID with retry logic
      */

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

@@ -29,6 +29,7 @@ import com.synonym.bitkitcore.deleteActivityById
 import com.synonym.bitkitcore.estimateOrderFeeFull
 import com.synonym.bitkitcore.getActivities
 import com.synonym.bitkitcore.getActivityById
+import com.synonym.bitkitcore.getActivityByTxId
 import com.synonym.bitkitcore.getAllClosedChannels
 import com.synonym.bitkitcore.getAllUniqueTags
 import com.synonym.bitkitcore.getCjitEntries
@@ -248,6 +249,10 @@ class ActivityService(
         }
     }
 
+    suspend fun getOnchainActivityByTxId(txId: String): OnchainActivity? = ServiceQueue.CORE.background {
+        getActivityByTxId(txId = txId)
+    }
+
     suspend fun get(
         filter: ActivityFilter? = null,
         txType: PaymentType? = null,

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

@@ -292,15 +292,30 @@ class AppViewModel @Inject constructor(
                         is Event.PaymentForwarded -> Unit
 
                         is Event.OnchainTransactionReceived -> {
-                            showNewTransactionSheet(
-                                NewTransactionSheetDetails(
-                                    type = NewTransactionSheetType.ONCHAIN,
-                                    direction = NewTransactionSheetDirection.RECEIVED,
-                                    paymentHashOrTxId = event.txid,
-                                    sats = event.details.amountSats.toLong(),
-                                ),
-                                event,
-                            )
+                            // Show notification for incoming transactions
+                            val sats = event.details.amountSats
+                            if (sats > 0) {
+                                launch(bgDispatcher) {
+                                    delay(500)
+                                    val shouldShow = activityRepo.shouldShowReceivedSheet(
+                                        txid = event.txid,
+                                        value = sats.toULong()
+                                    )
+                                    if (!shouldShow) {
+                                        Logger.info("Skipping received sheet for tx: ${event.txid}", context = TAG)
+                                        return@launch
+                                    }
+                                    showNewTransactionSheet(
+                                        NewTransactionSheetDetails(
+                                            type = NewTransactionSheetType.ONCHAIN,
+                                            direction = NewTransactionSheetDirection.RECEIVED,
+                                            paymentHashOrTxId = event.txid,
+                                            sats = sats,
+                                        ),
+                                        event,
+                                    )
+                                }
+                            }
                         }
 
                         is Event.OnchainTransactionConfirmed -> Unit

gradle/libs.versions.toml

@@ -44,7 +44,7 @@ activity-compose = { module = "androidx.activity:activity-compose", version.ref
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 barcode-scanning = { module = "com.google.mlkit:barcode-scanning", version.ref = "barcodeScanning" }
 biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" }
-bitkitcore = { module = "com.synonym:bitkit-core-android", version = "0.1.27" }
+bitkit-core = { module = "com.synonym:bitkit-core-android", version = "0.1.30" }
 bouncycastle-provider-jdk = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bouncyCastle" }
 camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "camera" }
 camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "camera" }