Merge branch 'master' into feat/e2e-test-tags

Author: ovitrif

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

@@ -100,6 +100,7 @@ class ActivityRepo @Inject constructor(
         paymentHashOrTxId: String,
         type: ActivityFilter,
         txType: PaymentType,
+        retry: Boolean = true,
     ): Result<Activity> = withContext(bgDispatcher) {
         if (paymentHashOrTxId.isEmpty()) {
             return@withContext Result.failure(
@@ -115,7 +116,7 @@ class ActivityRepo @Inject constructor(
             ).getOrNull()?.firstOrNull { it.matchesPaymentId(paymentHashOrTxId) }
 
             var activity = findActivity()
-            if (activity == null) {
+            if (activity == null && retry) {
                 Logger.warn(
                     "activity with paymentHashOrTxId:$paymentHashOrTxId not found, trying again after sync",
                     context = TAG

app/src/main/java/to/bitkit/ui/ContentView.kt

@@ -183,7 +183,7 @@ fun ContentView(
 
                     val pendingTransaction = NewTransactionSheetDetails.load(context)
                     if (pendingTransaction != null) {
-                        appViewModel.showNewTransactionSheet(pendingTransaction)
+                        appViewModel.showNewTransactionSheet(details = pendingTransaction, event = null)
                         NewTransactionSheetDetails.clear(context)
                     }
 
@@ -329,7 +329,7 @@ fun ContentView(
                                 onComplete = { txSheet ->
                                     appViewModel.hideSheet()
                                     appViewModel.clearClipboardForAutoRead()
-                                    txSheet?.let { appViewModel.showNewTransactionSheet(it) }
+                                    txSheet?.let { appViewModel.showNewTransactionSheet(details = it, event = null) }
                                 }
                             )
                         }

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

@@ -191,15 +191,16 @@ class AppViewModel @Inject constructor(
         viewModelScope.launch {
             ldkNodeEventBus.events.collect { event ->
                 try {
-                    when (event) {
+                    when (event) { // TODO Create individual sheet for each type of event
                         is Event.PaymentReceived -> {
                             handleTags(event)
                             showNewTransactionSheet(
                                 NewTransactionSheetDetails(
                                     type = NewTransactionSheetType.LIGHTNING,
                                     direction = NewTransactionSheetDirection.RECEIVED,
                                     sats = (event.amountMsat / 1000u).toLong(),
-                                )
+                                ),
+                                event = event
                             )
                         }
 
@@ -214,7 +215,8 @@ class AppViewModel @Inject constructor(
                                         type = NewTransactionSheetType.LIGHTNING,
                                         direction = NewTransactionSheetDirection.RECEIVED,
                                         sats = (channel.inboundCapacityMsat / 1000u).toLong(),
-                                    )
+                                    ),
+                                    event = event
                                 )
                             } else {
                                 toast(
@@ -240,7 +242,8 @@ class AppViewModel @Inject constructor(
                                     type = NewTransactionSheetType.LIGHTNING,
                                     direction = NewTransactionSheetDirection.SENT,
                                     sats = ((event.feePaidMsat ?: 0u) / 1000u).toLong(),
-                                )
+                                ),
+                                event = event
                             )
                         }
 
@@ -1208,10 +1211,28 @@ class AppViewModel @Inject constructor(
         isNewTransactionSheetEnabled = enabled
     }
 
-    fun showNewTransactionSheet(details: NewTransactionSheetDetails) {
+    fun showNewTransactionSheet(
+        details: NewTransactionSheetDetails,
+        event: Event?,
+    ) = viewModelScope.launch {
         if (!isNewTransactionSheetEnabled) {
             Logger.debug("NewTransactionSheet display blocked by isNewTransactionSheetEnabled=false", context = TAG)
-            return
+            return@launch
+        }
+
+        if (event is Event.PaymentReceived) {
+            val activity = activityRepo.findActivityByPaymentId(
+                paymentHashOrTxId = event.paymentHash,
+                type = ActivityFilter.ALL,
+                txType = PaymentType.RECEIVED,
+                retry = false
+            ).getOrNull()
+
+            // TODO Temporary fix while ldk-node bug is not fixed https://github.com/synonymdev/bitkit-android/pull/297
+            if (activity != null) {
+                Logger.warn("Activity ${activity.rawId()} already exists, skipping sheet", context = TAG)
+                return@launch
+            }
         }
 
         newTransaction = details

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

@@ -216,7 +216,8 @@ class BoostTransactionViewModelTest : BaseUnitTest() {
             activityRepo.findActivityByPaymentId(
                 paymentHashOrTxId = any(),
                 type = any(),
-                txType = any()
+                txType = any(),
+                retry = any(),
             )
         ).thenReturn(Result.success(Activity.Onchain(v1 = newActivity)))