Merge pull request #373 from synonymdev/fix/ln-balance-check-send

Use cached outbound value as fallback when node is initializing

Author: ovitrif

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

@@ -62,7 +62,7 @@ import kotlin.time.Duration
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 
-private const val SYNC_TIMEOUT_MS = 10_000L
+private const val SYNC_TIMEOUT_MS = 15_000L
 
 @Singleton
 class LightningRepo @Inject constructor(
@@ -684,8 +684,13 @@ class LightningRepo @Inject constructor(
         }
     }
 
-    fun canSend(amountSats: ULong): Boolean =
-        _lightningState.value.nodeLifecycleState.isRunning() && lightningService.canSend(amountSats)
+    suspend fun canSend(amountSats: ULong, fallbackToCachedBalance: Boolean = true): Boolean {
+        return if (!_lightningState.value.nodeLifecycleState.isRunning() && fallbackToCachedBalance) {
+            amountSats <= (cacheStore.data.first().balance?.maxSendLightningSats ?: 0u)
+        } else {
+            lightningService.canSend(amountSats)
+        }
+    }
 
     fun getSyncFlow(): Flow<Unit> = lightningService.syncFlow()
 

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

@@ -445,11 +445,13 @@ class LightningService @Inject constructor(
             .getOrElse { e -> throw LdkError(e as NodeException) }
 
         return ServiceQueue.LDK.background {
-            when (sats != null) {
-                true -> node.bolt11Payment().sendUsingAmount(bolt11Invoice, sats * 1000u, null)
-                else -> node.bolt11Payment().send(bolt11Invoice, null)
+            runCatching {
+                when (sats != null) {
+                    true -> node.bolt11Payment().sendUsingAmount(bolt11Invoice, sats * 1000u, null)
+                    else -> node.bolt11Payment().send(bolt11Invoice, null)
+                }
             }
-        }
+        }.getOrThrow()
     }
 
     suspend fun estimateRoutingFees(bolt11: String): Result<ULong> {

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

@@ -1,5 +1,6 @@
 package to.bitkit.ui
 
+import android.app.NotificationManager
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.compose.setContent
@@ -70,10 +71,11 @@ class MainActivity : FragmentActivity() {
 
         initNotificationChannel()
         initNotificationChannel(
-            // TODO EXTRACT TO Strings
+            // TODO Transifex
             id = CHANNEL_ID_NODE,
             name = "Lightning node notification",
             desc = "Channel for LightningNodeService",
+            importance = NotificationManager.IMPORTANCE_LOW
         )
         startForegroundService(Intent(this, LightningNodeService::class.java))
         installSplashScreen()

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

@@ -294,6 +294,7 @@ private fun SendAmountNodeRunning(
             PrimaryButton(
                 text = stringResource(R.string.common__continue),
                 enabled = uiState.isAmountInputValid,
+                isLoading = uiState.isLoading,
                 onClick = { onEvent(SendEvent.AmountContinue(uiState.amountInput)) },
                 modifier = Modifier.testTag("ContinueAmount")
             )

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

@@ -347,7 +347,7 @@ class AppViewModel @Inject constructor(
         }
     }
 
-    private fun onAmountChange(value: String) {
+    private fun onAmountChange(value: String) = viewModelScope.launch {
         _sendUiState.update {
             it.copy(
                 amountInput = value,
@@ -401,7 +401,7 @@ class AppViewModel @Inject constructor(
         }
     }
 
-    private fun onPaymentMethodSwitch() {
+    private fun onPaymentMethodSwitch() = viewModelScope.launch {
         val nextPaymentMethod = when (_sendUiState.value.payMethod) {
             SendMethod.ONCHAIN -> SendMethod.LIGHTNING
             SendMethod.LIGHTNING -> SendMethod.ONCHAIN
@@ -433,8 +433,10 @@ class AppViewModel @Inject constructor(
             return
         }
 
+        _sendUiState.update { it.copy(isLoading = true) }
         refreshOnchainSendIfNeeded()
         estimateLightningRoutingFeesIfNeeded()
+        _sendUiState.update { it.copy(isLoading = false) }
 
         setSendEffect(SendEffect.NavigateToConfirm)
     }
@@ -447,7 +449,7 @@ class AppViewModel @Inject constructor(
         setSendEffect(SendEffect.NavigateToConfirm)
     }
 
-    private fun validateAmount(
+    private suspend fun validateAmount(
         value: String,
         payMethod: SendMethod = _sendUiState.value.payMethod,
     ): Boolean {
@@ -822,7 +824,7 @@ class AppViewModel @Inject constructor(
         return false
     }
 
-    private fun resetAmountInput() {
+    private fun resetAmountInput() = viewModelScope.launch {
         _sendUiState.update { state ->
             state.copy(
                 amountInput = state.amount.toString(),

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

@@ -73,7 +73,11 @@ class QuickPayViewModel @Inject constructor(
         bolt11: String,
         amount: ULong? = null,
     ): Result<PaymentId> {
-        val hash = lightningRepo.payInvoice(bolt11 = bolt11, sats = amount).getOrThrow()
+        val hash = lightningRepo.payInvoice(bolt11 = bolt11, sats = amount)
+            .onFailure { exception ->
+                return Result.failure(exception)
+            }
+            .getOrDefault("")
 
         // Wait until matching payment event is received
         val result = ldkNodeEventBus.events.watchUntil { event ->

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

@@ -7,6 +7,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -163,7 +164,9 @@ class WalletViewModel @Inject constructor(
             walletRepo.syncNodeAndWallet()
                 .onFailure { error ->
                     Logger.error("Failed to refresh state: ${error.message}", error)
-                    ToastEventBus.send(error)
+                    if (error !is TimeoutCancellationException) {
+                        ToastEventBus.send(error)
+                    }
                 }
         }
     }
@@ -174,7 +177,9 @@ class WalletViewModel @Inject constructor(
             walletRepo.syncNodeAndWallet()
                 .onFailure { error ->
                     Logger.error("Failed to refresh state: ${error.message}", error)
-                    ToastEventBus.send(error)
+                    if (error !is TimeoutCancellationException) {
+                        ToastEventBus.send(error)
+                    }
                 }
             _uiState.update { it.copy(isRefreshing = false) }
         }

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

@@ -22,12 +22,14 @@ import org.mockito.kotlin.verify
 import org.mockito.kotlin.verifyBlocking
 import org.mockito.kotlin.whenever
 import org.mockito.kotlin.wheneverBlocking
+import to.bitkit.data.AppCacheData
 import to.bitkit.data.CacheStore
 import to.bitkit.data.SettingsData
 import to.bitkit.data.SettingsStore
 import to.bitkit.data.dto.TransactionMetadata
 import to.bitkit.data.keychain.Keychain
 import to.bitkit.ext.createChannelDetails
+import to.bitkit.models.BalanceState
 import to.bitkit.models.CoinSelectionPreference
 import to.bitkit.models.ElectrumServer
 import to.bitkit.models.LnPeer
@@ -286,8 +288,15 @@ class LightningRepoTest : BaseUnitTest() {
     }
 
     @Test
-    fun `canSend should return false when node is not running`() = test {
-        assertFalse(sut.canSend(1000uL))
+    fun `canSend should use cached outbound when node is not running`() = test {
+        val cacheData = AppCacheData(
+            balance = BalanceState(
+                maxSendLightningSats = 2000uL
+            )
+        )
+        whenever(cacheStore.data).thenReturn(flowOf(cacheData))
+
+        assert(sut.canSend(1000uL, fallbackToCachedBalance = true))
     }
 
     @Test