Merge pull request #385 from synonymdev/fix/channel-misleading-sheet

CJIT receive Sheets

Author: jvsena42

app/src/main/java/to/bitkit/fcm/WakeNodeWorker.kt

@@ -15,6 +15,7 @@ import kotlinx.serialization.json.contentOrNull
 import kotlinx.serialization.json.jsonObject
 import org.lightningdevkit.ldknode.Event
 import to.bitkit.di.json
+import to.bitkit.ext.amountOnClose
 import to.bitkit.models.BlocktankNotificationType
 import to.bitkit.models.BlocktankNotificationType.cjitPaymentArrived
 import to.bitkit.models.BlocktankNotificationType.incomingHtlc
@@ -140,15 +141,15 @@ class WakeNodeWorker @AssistedInject constructor(
                     self.bestAttemptContent?.body = "Via new channel"
 
                     lightningRepo.getChannels()?.find { it.channelId == event.channelId }?.let { channel ->
-                        val sats = channel.outboundCapacityMsat / 1000u
+                        val sats = channel.amountOnClose
                         self.bestAttemptContent?.title = "Received ⚡ $sats sats"
                         // Save for UI to pick up
                         NewTransactionSheetDetails.save(
                             appContext,
                             NewTransactionSheetDetails(
                                 type = NewTransactionSheetType.LIGHTNING,
                                 direction = NewTransactionSheetDirection.RECEIVED,
-                                sats = sats.toLong(),
+                                sats = channel.amountOnClose.toLong(),
                             )
                         )
                     }

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

@@ -26,6 +26,7 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.lightningdevkit.ldknode.ChannelDetails
 import to.bitkit.data.CacheStore
 import to.bitkit.di.BgDispatcher
 import to.bitkit.env.Env
@@ -96,6 +97,15 @@ class BlocktankRepo @Inject constructor(
         }
     }
 
+    suspend fun isCjitOrder(channel: ChannelDetails): Boolean = withContext(bgDispatcher) {
+        return@withContext runCatching {
+            _blocktankState.value.cjitEntries.any { order ->
+                order.channelSizeSat == channel.channelValueSats &&
+                    order.lspNode.pubkey == channel.counterpartyNodeId
+            }
+        }.getOrDefault(false)
+    }
+
     suspend fun refreshInfo() = withContext(bgDispatcher) {
         try {
             // Load from cache first

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

@@ -471,10 +471,11 @@ class WalletRepo @Inject constructor(
             return@withContext 0uL
         }
         val fallbackMaxFee = (spendableOnchainSats.toDouble() * FALLBACK_FEE_PERCENT).toULong()
+        val speed = settingsStore.data.first().defaultTransactionSpeed
 
         val fee = lightningRepo.calculateTotalFee(
             amountSats = spendableOnchainSats,
-            speed = TransactionSpeed.default(),
+            speed = speed,
             utxosToSpend = lightningRepo.listSpendableOutputs().getOrNull()
         ).onFailure {
             Logger.debug("Could not calculate max send fee, using as fallback 10% of total", context = TAG)

app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt

@@ -101,7 +101,6 @@ fun SendAmountScreen(
             onBack()
         }.takeIf { canGoBack },
         onClickMax = { maxSats ->
-            // TODO port the RN sendMax logic if still needed
             if (uiState.lnurl == null) {
                 app?.toast(
                     type = Toast.ToastType.WARNING,

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

@@ -48,6 +48,7 @@ import to.bitkit.data.resetPin
 import to.bitkit.di.BgDispatcher
 import to.bitkit.env.Env
 import to.bitkit.ext.WatchResult
+import to.bitkit.ext.amountOnClose
 import to.bitkit.ext.getClipboardText
 import to.bitkit.ext.getSatsPerVByteFor
 import to.bitkit.ext.maxSendableSat
@@ -211,33 +212,26 @@ class AppViewModel @Inject constructor(
                         is Event.ChannelPending -> Unit // Only relevant for channels to external nodes
 
                         is Event.ChannelReady -> {
-                            // TODO: handle ONLY cjit as payment received. This makes it look like any channel confirmed is a received payment.
                             val channel = lightningRepo.getChannels()?.find { it.channelId == event.channelId }
-                            if (channel != null) {
+                            if (channel != null && blocktankRepo.isCjitOrder(channel)) {
                                 showNewTransactionSheet(
                                     NewTransactionSheetDetails(
                                         type = NewTransactionSheetType.LIGHTNING,
                                         direction = NewTransactionSheetDirection.RECEIVED,
-                                        sats = (channel.inboundCapacityMsat / 1000u).toLong(),
+                                        sats = channel.amountOnClose.toLong(),
                                     ),
                                     event = event
                                 )
                             } else {
                                 toast(
-                                    type = Toast.ToastType.ERROR,
-                                    title = "Channel opened",
-                                    description = "Ready to send"
+                                    type = Toast.ToastType.LIGHTNING,
+                                    title = context.getString(R.string.lightning__channel_opened_title),
+                                    description = context.getString(R.string.lightning__channel_opened_msg),
                                 )
                             }
                         }
 
-                        is Event.ChannelClosed -> {
-                            toast(
-                                type = Toast.ToastType.LIGHTNING,
-                                title = "Channel closed",
-                                description = "Balance moved from spending to savings"
-                            )
-                        }
+                        is Event.ChannelClosed -> Unit
 
                         is Event.PaymentSuccessful -> {
                             val paymentHash = event.paymentHash