Skip to content

Commit 3bd315e

Browse files
committed
fix: check balance fraction first
1 parent e01b473 commit 3bd315e

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -838,25 +838,26 @@ class AppViewModel @Inject constructor(
838838
if (_sendUiState.value.showSanityWarningDialog != null) return
839839

840840
val settings = settingsStore.data.first()
841-
val amountInUsd = currencyRepo.convertSatsToFiat(amountSats.toLong(), "USD").getOrNull() ?: return
841+
842842
if (
843-
amountInUsd.value > BigDecimal(SEND_AMOUNT_WARNING_THRESHOLD) &&
844-
settings.enableSendAmountWarning &&
845-
SanityWarning.VALUE_OVER_100_USD !in _sendUiState.value.confirmedWarnings
843+
amountSats > BigDecimal.valueOf(walletRepo.balanceState.value.totalSats.toLong())
844+
.times(BigDecimal(MAX_BALANCE_FRACTION)).toLong().toUInt() &&
845+
SanityWarning.OVER_HALF_BALANCE !in _sendUiState.value.confirmedWarnings
846846
) {
847847
_sendUiState.update {
848-
it.copy(showSanityWarningDialog = SanityWarning.VALUE_OVER_100_USD)
848+
it.copy(showSanityWarningDialog = SanityWarning.OVER_HALF_BALANCE)
849849
}
850850
return
851851
}
852852

853+
val amountInUsd = currencyRepo.convertSatsToFiat(amountSats.toLong(), "USD").getOrNull() ?: return
853854
if (
854-
amountSats > BigDecimal.valueOf(walletRepo.balanceState.value.totalSats.toLong())
855-
.times(BigDecimal(MAX_BALANCE_FRACTION)).toLong().toUInt() &&
856-
SanityWarning.OVER_HALF_BALANCE !in _sendUiState.value.confirmedWarnings
855+
amountInUsd.value > BigDecimal(SEND_AMOUNT_WARNING_THRESHOLD) &&
856+
settings.enableSendAmountWarning &&
857+
SanityWarning.VALUE_OVER_100_USD !in _sendUiState.value.confirmedWarnings
857858
) {
858859
_sendUiState.update {
859-
it.copy(showSanityWarningDialog = SanityWarning.OVER_HALF_BALANCE)
860+
it.copy(showSanityWarningDialog = SanityWarning.VALUE_OVER_100_USD)
860861
}
861862
return
862863
}

0 commit comments

Comments
 (0)