fix(receive): enable LN receive and QR only when having channels ready

Author: ovitrif

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

@@ -245,11 +245,10 @@ class LightningRepo @Inject constructor(
         }
     }
 
-    /**Updates the shouldBlockLightning state and returns the current value*/
     suspend fun updateGeoBlockState() {
         val (isGeoBlocked, shouldBlockLightning) = coreService.checkGeoBlock()
         _lightningState.update {
-            it.copy(shouldBlockLightning = shouldBlockLightning, isGeoBlocked = isGeoBlocked)
+            it.copy(isGeoBlocked = isGeoBlocked, shouldBlockLightning = shouldBlockLightning)
         }
     }
 
@@ -673,7 +672,7 @@ class LightningRepo @Inject constructor(
         Result.success(Unit)
     }
 
-    suspend fun syncState() {
+    fun syncState() {
         _lightningState.update {
             it.copy(
                 nodeId = getNodeId().orEmpty(),
@@ -709,8 +708,11 @@ class LightningRepo @Inject constructor(
     fun getChannels(): List<ChannelDetails>? =
         if (_lightningState.value.nodeLifecycleState.isRunning()) lightningService.channels else null
 
-    fun hasChannels(): Boolean =
-        _lightningState.value.nodeLifecycleState.isRunning() && lightningService.channels?.isNotEmpty() == true
+    fun hasChannelsReady(): Boolean {
+        val isRunning = _lightningState.value.nodeLifecycleState.isRunning()
+        val hasChannelsReady = lightningService.channels?.any { it.isChannelReady } == true
+        return isRunning && hasChannelsReady
+    }
 
     suspend fun registerForNotifications(token: String? = null) = executeWhenNodeRunning("registerForNotifications") {
         return@executeWhenNodeRunning try {

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

@@ -102,9 +102,9 @@ class WalletRepo @Inject constructor(
     suspend fun refreshBip21(force: Boolean = false): Result<Unit> = withContext(bgDispatcher) {
         Logger.debug("Refreshing bip21 (force: $force)", context = TAG)
 
-        val shouldBlockLightning = coreService.checkGeoBlock().second
+        val receiveOnSpendingBalance = !coreService.checkGeoBlock().second && lightningRepo.hasChannelsReady()
         _walletState.update {
-            it.copy(receiveOnSpendingBalance = !shouldBlockLightning)
+            it.copy(receiveOnSpendingBalance = receiveOnSpendingBalance)
         }
 
         // Reset invoice state
@@ -382,9 +382,8 @@ class WalletRepo @Inject constructor(
             updateBip21AmountSats(amountSats)
             updateBip21Description(description)
 
-            val hasChannels = lightningRepo.hasChannels()
-
-            if (hasChannels && _walletState.value.receiveOnSpendingBalance) {
+            val hasChannelsReady = lightningRepo.hasChannelsReady()
+            if (hasChannelsReady && _walletState.value.receiveOnSpendingBalance) {
                 lightningRepo.createInvoice(
                     amountSats = _walletState.value.bip21AmountSats,
                     description = _walletState.value.bip21Description,

app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveSheet.kt

@@ -75,7 +75,7 @@ fun ReceiveSheet(
                     walletState = walletState,
                     onCjitToggle = { isOn ->
                         when {
-                            isOn && lightningState.shouldBlockLightning -> { // TODO SHOULD BLOCK HERE
+                            isOn && lightningState.shouldBlockLightning -> {
                                 navController.navigate(ReceiveRoute.GeoBlock)
                             }
 

app/src/test/java/to/bitkit/repositories/LightningRepoTest.kt

@@ -254,8 +254,25 @@ class LightningRepoTest : BaseUnitTest() {
     }
 
     @Test
-    fun `hasChannels should return false when node is not running`() = test {
-        assertFalse(sut.hasChannels())
+    fun `hasChannelsReady should return false when node is not running`() = test {
+        assertFalse(sut.hasChannelsReady())
+    }
+
+    @Test
+    fun `hasChannelsReady should return false when having non-ready channels`() = test {
+        startNodeForTesting()
+        whenever(lightningService.channels).thenReturn(listOf(mock()))
+
+        assertFalse(sut.hasChannelsReady())
+    }
+
+    @Test
+    fun `hasChannelsReady should return true when having channels ready`() = test {
+        startNodeForTesting()
+        whenever(lightningService.channels)
+            .thenReturn(listOf(mock<ChannelDetails> { on { isChannelReady } doReturn true }))
+
+        assertTrue(sut.hasChannelsReady())
     }
 
     @Test

app/src/test/java/to/bitkit/repositories/WalletRepoTest.kt

@@ -258,10 +258,10 @@ class WalletRepoTest : BaseUnitTest() {
     }
 
     @Test
-    fun `updateBip21Invoice should create bolt11 when channels exist`() = test {
+    fun `updateBip21Invoice should create bolt11 when having channels ready`() = test {
         val testInvoice = "testInvoice"
-        whenever(lightningRepo.hasChannels()).thenReturn(true)
-        whenever(lightningRepo.createInvoice(1000uL, description = "test")).thenReturn(Result.success(testInvoice))
+        whenever(lightningRepo.hasChannelsReady()).thenReturn(true)
+        whenever(lightningRepo.createInvoice(anyOrNull(), any(), any())).thenReturn(Result.success(testInvoice))
 
         sut.updateBip21Invoice(amountSats = 1000uL, description = "test").let { result ->
             assertTrue(result.isSuccess)
@@ -271,8 +271,7 @@ class WalletRepoTest : BaseUnitTest() {
 
     @Test
     fun `updateBip21Invoice should not create bolt11 when no channels exist`() = test {
-        whenever(lightningRepo.hasChannels()).thenReturn(false)
-
+        whenever(lightningRepo.hasChannelsReady()).thenReturn(false)
         sut.updateBip21Invoice(amountSats = 1000uL, description = "test").let { result ->
             assertTrue(result.isSuccess)
             assertEquals("", sut.walletState.value.bolt11)
@@ -283,7 +282,8 @@ class WalletRepoTest : BaseUnitTest() {
     fun `updateBip21Invoice should build correct BIP21 URL`() = test {
         val testAddress = "testAddress"
         whenever(cacheStore.data).thenReturn(flowOf(AppCacheData(onchainAddress = testAddress)))
-        whenever(lightningRepo.hasChannels()).thenReturn(false)
+        whenever(lightningRepo.hasChannelsReady()).thenReturn(false)
+        whenever(lightningRepo.createInvoice(anyOrNull(), any(), any())).thenReturn(Result.success("testInvoice"))
         sut = createSut()
 
         sut.updateBip21Invoice(amountSats = 1000uL, description = "test").let { result ->