Merge pull request #535 from synonymdev/fix/cjit-autoscroll

jvsena42 · web-flow · commit e70592c987f2 · 2025-12-18T15:40:30.000-03:00
fix: cjit auto scroll and QR screen state update improvements
diff --git a/app/src/main/java/to/bitkit/repositories/BlocktankRepo.kt b/app/src/main/java/to/bitkit/repositories/BlocktankRepo.kt
@@ -201,7 +201,7 @@ class BlocktankRepo @Inject constructor(
         description: String = Env.DEFAULT_INVOICE_MESSAGE,
     ): Result<IcJitEntry> = withContext(bgDispatcher) {
         try {
-            if (coreService.checkGeoBlock().first) throw ServiceError.GeoBlocked
+            if (coreService.isGeoBlocked()) throw ServiceError.GeoBlocked
             val nodeId = lightningService.nodeId ?: throw ServiceError.NodeNotStarted
             val lspBalance = getDefaultLspBalance(clientBalance = amountSats)
             val channelSizeSat = amountSats + lspBalance
@@ -230,7 +230,7 @@ class BlocktankRepo @Inject constructor(
         channelExpiryWeeks: UInt = DEFAULT_CHANNEL_EXPIRY_WEEKS,
     ): Result<IBtOrder> = withContext(bgDispatcher) {
         try {
-            if (coreService.checkGeoBlock().first) throw ServiceError.GeoBlocked
+            if (coreService.isGeoBlocked()) throw ServiceError.GeoBlocked
 
             val options = defaultCreateOrderOptions(clientBalanceSat = spendingBalanceSats)
 
diff --git a/app/src/main/java/to/bitkit/repositories/LightningRepo.kt b/app/src/main/java/to/bitkit/repositories/LightningRepo.kt
@@ -37,7 +37,6 @@ import org.lightningdevkit.ldknode.PaymentDetails
 import org.lightningdevkit.ldknode.PaymentId
 import org.lightningdevkit.ldknode.PeerDetails
 import org.lightningdevkit.ldknode.SpendableUtxo
-import org.lightningdevkit.ldknode.TransactionDetails
 import org.lightningdevkit.ldknode.Txid
 import to.bitkit.data.CacheStore
 import to.bitkit.data.SettingsStore
@@ -283,9 +282,8 @@ class LightningRepo @Inject constructor(
     }
 
     suspend fun updateGeoBlockState() = withContext(bgDispatcher) {
-        val (isGeoBlocked, shouldBlockLightning) = coreService.checkGeoBlock()
         _lightningState.update {
-            it.copy(isGeoBlocked = isGeoBlocked, shouldBlockLightningReceive = shouldBlockLightning)
+            it.copy(isGeoBlocked = coreService.isGeoBlocked())
         }
     }
 
@@ -355,7 +353,8 @@ class LightningRepo @Inject constructor(
     private fun handleLdkEvent(event: Event) {
         when (event) {
             is Event.ChannelPending,
-            is Event.ChannelReady -> scope.launch {
+            is Event.ChannelReady,
+            -> scope.launch {
                 refreshChannelCache()
             }
 
@@ -560,10 +559,6 @@ class LightningRepo @Inject constructor(
         expirySeconds: UInt = 86_400u,
     ): Result<String> = executeWhenNodeRunning("Create invoice") {
         updateGeoBlockState()
-        if (lightningState.value.shouldBlockLightningReceive) {
-            return@executeWhenNodeRunning Result.failure(ServiceError.GeoBlocked)
-        }
-
         val invoice = lightningService.receive(amountSats, description, expirySeconds)
         Result.success(invoice)
     }
@@ -1016,7 +1011,6 @@ data class LightningState(
     val channels: List<ChannelDetails> = emptyList(),
     val balances: BalanceDetails? = null,
     val isSyncingWallet: Boolean = false,
-    val shouldBlockLightningReceive: Boolean = false,
     val isGeoBlocked: Boolean = false,
 ) {
     fun block(): BestBlock? = nodeStatus?.currentBestBlock
diff --git a/app/src/main/java/to/bitkit/repositories/WalletRepo.kt b/app/src/main/java/to/bitkit/repositories/WalletRepo.kt
@@ -121,10 +121,6 @@ class WalletRepo @Inject constructor(
             emptyList()
         }
 
-        val (_, shouldBlockLightningReceive) = coreService.checkGeoBlock()
-        _walletState.update {
-            it.copy(receiveOnSpendingBalance = !shouldBlockLightningReceive)
-        }
         clearBip21State(clearTags = false)
         refreshAddressIfNeeded()
         updateBip21Invoice()
@@ -429,16 +425,6 @@ class WalletRepo @Inject constructor(
         }
     }
 
-    suspend fun toggleReceiveOnSpendingBalance(): Result<Unit> = withContext(bgDispatcher) {
-        if (!_walletState.value.receiveOnSpendingBalance && coreService.checkGeoBlock().second) {
-            return@withContext Result.failure(ServiceError.GeoBlocked)
-        }
-
-        _walletState.update { it.copy(receiveOnSpendingBalance = !it.receiveOnSpendingBalance) }
-
-        return@withContext Result.success(Unit)
-    }
-
     // Payment ID management
     private suspend fun paymentHash(): String? = withContext(bgDispatcher) {
         val bolt11 = getBolt11()
@@ -553,7 +539,7 @@ class WalletRepo @Inject constructor(
             setBip21Description(description)
 
             val canReceive = lightningRepo.canReceive()
-            if (canReceive && _walletState.value.receiveOnSpendingBalance) {
+            if (canReceive) {
                 lightningRepo.createInvoice(amountSats, description).onSuccess {
                     setBolt11(it)
                 }
@@ -575,9 +561,7 @@ class WalletRepo @Inject constructor(
 
     suspend fun shouldRequestAdditionalLiquidity(): Result<Boolean> = withContext(bgDispatcher) {
         return@withContext try {
-            if (!_walletState.value.receiveOnSpendingBalance) return@withContext Result.success(false)
-
-            if (coreService.checkGeoBlock().first) return@withContext Result.success(false)
+            if (coreService.isGeoBlocked()) return@withContext Result.success(false)
 
             val channels = lightningRepo.lightningState.value.channels
             if (channels.filterOpen().isEmpty()) return@withContext Result.success(false)
@@ -617,7 +601,6 @@ data class WalletState(
     val bip21AmountSats: ULong? = null,
     val bip21Description: String = "",
     val selectedTags: List<String> = listOf(),
-    val receiveOnSpendingBalance: Boolean = true,
     val walletExists: Boolean = false,
 )
 
diff --git a/app/src/main/java/to/bitkit/services/CoreService.kt b/app/src/main/java/to/bitkit/services/CoreService.kt
@@ -135,7 +135,7 @@ class CoreService @Inject constructor(
     }
 
     @Suppress("KotlinConstantConditions")
-    private suspend fun isGeoBlocked(): Boolean {
+    suspend fun isGeoBlocked(): Boolean {
         if (!Env.isGeoblockingEnabled) {
             Logger.verbose("Geoblocking disabled via build config", context = "GeoCheck")
             return false
@@ -171,20 +171,6 @@ class CoreService @Inject constructor(
         }
     }
 
-    /**
-     * This method checks if the device is in a is geo blocked region and if lightning features should be blocked
-     * @return pair of `isGeoBlocked` to `shouldBlockLightningReceive`
-     * */
-    suspend fun checkGeoBlock(): Pair<Boolean, Boolean> {
-        val geoBlocked = isGeoBlocked()
-        val shouldBlockLightningReceive = when {
-            lightningService.hasExternalPeers() -> !lightningService.canReceive()
-            else -> geoBlocked
-        }
-
-        return Pair(geoBlocked, shouldBlockLightningReceive)
-    }
-
     suspend fun wipeData(): Result<Unit> = ServiceQueue.CORE.background {
         runCatching {
             val result = wipeAllDatabases()
@@ -1182,6 +1168,7 @@ class ActivityService(
                 // a closed channel's funding UTXO
                 findClosedChannelForTransaction(txid, transactionDetails)
             }
+
             PaymentDirection.OUTBOUND -> {
                 // Check if this transaction is a channel open by checking if it's
                 // the funding transaction for an open channel
diff --git a/app/src/main/java/to/bitkit/services/LightningService.kt b/app/src/main/java/to/bitkit/services/LightningService.kt
@@ -739,6 +739,7 @@ class LightningService @Inject constructor(
 /**
  * TODO remove, replace all usages with [FeeRate.fromSatPerVbUnchecked]
  * */
+@Deprecated("replace all usages with [FeeRate.fromSatPerVbUnchecked]")
 private fun convertVByteToKwu(satsPerVByte: UInt): FeeRate {
     // 1 vbyte = 4 weight units, so 1 sats/vbyte = 250 sats/kwu
     val satPerKwu = satsPerVByte.toULong() * 250u
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveQrScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveQrScreen.kt
@@ -93,7 +93,7 @@ fun ReceiveQrScreen(
     SetMaxBrightness()
 
     val haptic = LocalHapticFeedback.current
-    val hasUsableChannels = walletState.channels.any { it.isUsable }
+    val hasUsableChannels = walletState.channels.any { it.isChannelReady }
 
     var showDetails by remember { mutableStateOf(false) }
 
@@ -163,6 +163,17 @@ fun ReceiveQrScreen(
         }
     }
 
+    // Auto-switch to Spending tab when CJIT is not null
+    LaunchedEffect(cjitInvoice) {
+        if (cjitInvoice != null) {
+            val spendingIndex = visibleTabs.indexOf(ReceiveTab.SPENDING)
+            if (spendingIndex != -1) {
+                lazyListState.animateScrollToItem(spendingIndex)
+                selectedTab = ReceiveTab.SPENDING
+            }
+        }
+    }
+
     val showingCjitOnboarding = remember(walletState, cjitInvoice, hasUsableChannels) {
         !hasUsableChannels &&
             walletState.nodeLifecycleState.isRunning() &&
diff --git a/app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt b/app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt
@@ -85,7 +85,6 @@ class WalletViewModel @Inject constructor(
                         bip21AmountSats = state.bip21AmountSats,
                         bip21Description = state.bip21Description,
                         selectedTags = state.selectedTags,
-                        receiveOnSpendingBalance = state.receiveOnSpendingBalance,
                     )
                 }
                 if (state.walletExists && restoreState == RestoreState.InProgress.Wallet) {
@@ -306,7 +305,6 @@ data class MainUiState(
     val peers: List<PeerDetails> = emptyList(),
     val channels: List<ChannelDetails> = emptyList(),
     val isRefreshing: Boolean = false,
-    val receiveOnSpendingBalance: Boolean = true,
     val bip21AmountSats: ULong? = null,
     val bip21Description: String = "",
     val selectedTags: List<String> = listOf(),
diff --git a/app/src/test/java/to/bitkit/repositories/LightningRepoTest.kt b/app/src/test/java/to/bitkit/repositories/LightningRepoTest.kt
@@ -63,7 +63,7 @@ class LightningRepoTest : BaseUnitTest() {
 
     @Before
     fun setUp() {
-        wheneverBlocking { coreService.checkGeoBlock() }.thenReturn(Pair(false, false))
+        wheneverBlocking { coreService.isGeoBlocked() }.thenReturn(false)
         sut = LightningRepo(
             bgDispatcher = testDispatcher,
             lightningService = lightningService,
diff --git a/app/src/test/java/to/bitkit/repositories/WalletRepoTest.kt b/app/src/test/java/to/bitkit/repositories/WalletRepoTest.kt
@@ -73,7 +73,7 @@ class WalletRepoTest : BaseUnitTest() {
 
     @Before
     fun setUp() = runBlocking {
-        whenever(coreService.checkGeoBlock()).thenReturn(Pair(false, false))
+        whenever(coreService.isGeoBlocked()).thenReturn(false)
         whenever(cacheStore.data).thenReturn(flowOf(AppCacheData(bolt11 = "", onchainAddress = ADDRESS)))
         whenever(lightningRepo.lightningState).thenReturn(MutableStateFlow(LightningState()))
         whenever(lightningRepo.nodeEvents).thenReturn(MutableSharedFlow())
@@ -176,28 +176,6 @@ class WalletRepoTest : BaseUnitTest() {
         verify(lightningRepo).newAddress()
     }
 
-    @Test
-    fun `refreshBip21 should set receiveOnSpendingBalance false when shouldBlockLightning is true`() = test {
-        whenever(coreService.checkGeoBlock()).thenReturn(Pair(true, true))
-        whenever(lightningRepo.newAddress()).thenReturn(Result.success(ADDRESS_NEW))
-
-        val result = sut.refreshBip21()
-
-        assertTrue(result.isSuccess)
-        assertEquals(false, sut.walletState.value.receiveOnSpendingBalance)
-    }
-
-    @Test
-    fun `refreshBip21 should set receiveOnSpendingBalance true when shouldBlockLightning is false`() = test {
-        whenever(coreService.checkGeoBlock()).thenReturn(Pair(true, false))
-        whenever(lightningRepo.newAddress()).thenReturn(Result.success(ADDRESS_NEW))
-
-        val result = sut.refreshBip21()
-
-        assertTrue(result.isSuccess)
-        assertEquals(true, sut.walletState.value.receiveOnSpendingBalance)
-    }
-
     @Test
     fun `refreshBip21 should generate new address when current has transactions`() = test {
         whenever(cacheStore.data).thenReturn(flowOf(AppCacheData(onchainAddress = ADDRESS)))
@@ -333,28 +311,6 @@ class WalletRepoTest : BaseUnitTest() {
         assertTrue(result.contains("lightning=testInvoice"))
     }
 
-    @Test
-    fun `toggleReceiveOnSpendingBalance should toggle state`() = test {
-        val initialValue = sut.walletState.value.receiveOnSpendingBalance
-
-        sut.toggleReceiveOnSpendingBalance()
-
-        assertEquals(!initialValue, sut.walletState.value.receiveOnSpendingBalance)
-    }
-
-    @Test
-    fun `toggleReceiveOnSpendingBalance should return failure if shouldBlockLightning is true`() = test {
-        whenever(coreService.checkGeoBlock()).thenReturn(Pair(true, true))
-
-        if (sut.walletState.value.receiveOnSpendingBalance) {
-            sut.toggleReceiveOnSpendingBalance()
-        }
-
-        val result = sut.toggleReceiveOnSpendingBalance()
-
-        assert(result.isFailure)
-    }
-
     @Test
     fun `addTagToSelected should add tag and update lastUsedTags`() = test {
         // Set address in wallet state so paymentId() returns it
@@ -428,20 +384,9 @@ class WalletRepoTest : BaseUnitTest() {
         assertEquals(error, result.exceptionOrNull())
     }
 
-    @Test
-    fun `shouldRequestAdditionalLiquidity should return false when geoBlocked is true`() = test {
-        whenever(coreService.checkGeoBlock()).thenReturn(Pair(true, false))
-        sut.toggleReceiveOnSpendingBalance() // Set to false (initial is true)
-
-        val result = sut.shouldRequestAdditionalLiquidity()
-
-        assertTrue(result.isSuccess)
-        assertFalse(result.getOrThrow())
-    }
-
     @Test
     fun `shouldRequestAdditionalLiquidity should return false when geo status is true`() = test {
-        whenever(coreService.checkGeoBlock()).thenReturn(Pair(true, false))
+        whenever(coreService.isGeoBlocked()).thenReturn(true)
 
         val result = sut.shouldRequestAdditionalLiquidity()
 
@@ -451,7 +396,7 @@ class WalletRepoTest : BaseUnitTest() {
 
     @Test
     fun `shouldRequestAdditionalLiquidity should return true when amount exceeds inbound capacity`() = test {
-        whenever(coreService.checkGeoBlock()).thenReturn(Pair(false, false))
+        whenever(coreService.isGeoBlocked()).thenReturn(false)
         whenever(lightningRepo.lightningState).thenReturn(MutableStateFlow(LightningState(channels = channels)))
         sut.updateBip21Invoice(amountSats = 1000uL)
 
@@ -463,7 +408,7 @@ class WalletRepoTest : BaseUnitTest() {
 
     @Test
     fun `should not request additional liquidity for 0 channels`() = test {
-        whenever(coreService.checkGeoBlock()).thenReturn(Pair(false, false))
+        whenever(coreService.isGeoBlocked()).thenReturn(false)
         whenever(lightningRepo.lightningState).thenReturn(MutableStateFlow(LightningState()))
         sut.updateBip21Invoice(amountSats = 1000uL)
 
@@ -475,7 +420,7 @@ class WalletRepoTest : BaseUnitTest() {
 
     @Test
     fun `shouldRequestAdditionalLiquidity should return false when amount is less than inbound capacity`() = test {
-        whenever(coreService.checkGeoBlock()).thenReturn(Pair(false, false))
+        whenever(coreService.isGeoBlocked()).thenReturn(false)
         whenever(lightningRepo.lightningState).thenReturn(MutableStateFlow(LightningState(channels = channels)))
         sut.updateBip21Invoice(amountSats = 900uL)
 
