Skip to content

Use cached outbound value as fallback when node is initializing #373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ovitrif merged 10 commits into from
Sep 12, 2025
Merged

Use cached outbound value as fallback when node is initializing #373

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
71ca2c9
fix: update send ui state only after node syncing
jvsena42 Sep 10, 2025
7119ce5
fix: use cached outbound as fallback when the node is not running
jvsena42 Sep 12, 2025
9f84947
fix: use cached balance
jvsena42 Sep 12, 2025
746fafc
chore: remove unused code
jvsena42 Sep 12, 2025
bab17aa
fix: ignore timeout error toasts
jvsena42 Sep 12, 2025
acf83b5
fix: increase sync timeout
jvsena42 Sep 12, 2025
f6ffee0
fix: update loading state to fee calculation
jvsena42 Sep 12, 2025
e370865
fix: handle quick pay crash on payment error
jvsena42 Sep 12, 2025
a2ee762
test: update test
jvsena42 Sep 12, 2025
d0e1667
fix: reduce node notification channel importance
jvsena42 Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions app/src/main/java/to/bitkit/repositories/LightningRepo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import to.bitkit.di.BgDispatcher
import to.bitkit.env.Env
import to.bitkit.ext.getSatsPerVByteFor
import to.bitkit.ext.totalNextOutboundHtlcLimitSats
import to.bitkit.models.CoinSelectionPreference
import to.bitkit.models.ElectrumServer
import to.bitkit.models.LnPeer
Expand Down Expand Up @@ -671,7 +672,7 @@
Result.success(Unit)
}

suspend fun syncState() {
suspend fun syncState(): Result<Unit> = executeWhenNodeRunning("sync State") {
_lightningState.update {
it.copy(
nodeId = getNodeId().orEmpty(),
Expand All @@ -680,10 +681,16 @@
channels = getChannels().orEmpty(),
)
}
Result.success(Unit)
}

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()

Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ class AppViewModel @Inject constructor(
}
}

private fun onAmountChange(value: String) {
private fun onAmountChange(value: String) = viewModelScope.launch {
_sendUiState.update {
it.copy(
amountInput = value,
Expand Down Expand Up @@ -405,7 +405,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
Expand Down Expand Up @@ -451,7 +451,7 @@ class AppViewModel @Inject constructor(
setSendEffect(SendEffect.NavigateToConfirm)
}

private fun validateAmount(
private suspend fun validateAmount(
value: String,
payMethod: SendMethod = _sendUiState.value.payMethod,
): Boolean {
Expand Down Expand Up @@ -826,7 +826,7 @@ class AppViewModel @Inject constructor(
return false
}

private fun resetAmountInput() {
private fun resetAmountInput() = viewModelScope.launch {
_sendUiState.update { state ->
state.copy(
amountInput = state.amount.toString(),
Expand Down
Loading