zec
/
secant-android-wallet
mirror of https://github.com/zcash/secant-android-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#1317] Improve balances logic calculation 

- Closes #1317
This commit is contained in:
Honza Rychnovský 2024-04-03 14:16:51 +02:00 committed by GitHub
parent 2c45ab642b
commit e398af5690
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ui-lib/src/main/java/co/electriccoin/zcash/ui/common/model/WalletSnapshot.kt
View File

@ -18,21 +18,26 @@ data class WalletSnapshot(
val progress: PercentDecimal, val progress: PercentDecimal,
val synchronizerError: SynchronizerError? val synchronizerError: SynchronizerError?
) { ) {
// Note that both [hasSaplingFunds] and [hasTransparentFunds] checks are not entirely correct - they do not // Note: the wallet's transparent balance is effectively empty if it cannot cover the miner's fee
// calculate the resulting fee using the new Proposal API. It's fine for now, but it's subject to improvement val hasTransparentFunds = transparentBalance.value > 0L
// later once we figure out how to handle it in such cases.
// Note: the wallet is effectively empty if it cannot cover the miner's fee // Note: the wallet is effectively empty if it cannot cover the miner's fee
val hasSaplingFunds = saplingBalance.available.value > 0L val hasSaplingFunds = saplingBalance.available.value > 0L
val hasSaplingBalance = saplingBalance.total.value > 0L val hasSaplingBalance = saplingBalance.total.value > 0L
// Note: the wallet's transparent balance is effectively empty if it cannot cover the miner's fee // Note: the wallet is effectively empty if it cannot cover the miner's fee
val hasTransparentFunds = transparentBalance.value > 0L val hasOrchardFunds = orchardBalance.available.value > 0L
val isSendEnabled: Boolean get() = status == Synchronizer.Status.SYNCED && hasSaplingFunds val hasOrchardBalance = orchardBalance.total.value > 0L
val isSendEnabled: Boolean get() = hasSaplingFunds && hasOrchardFunds
} }
// Note this check is not entirely correct - it does not calculate the resulting fee using the new Proposal API. It's
// fine for now, but it's subject to improvement later once we figure out how to handle it in such cases.
fun WalletSnapshot.canSpend(amount: Zatoshi): Boolean = spendableBalance() >= amount
fun WalletSnapshot.totalBalance() = orchardBalance.total + saplingBalance.total + transparentBalance fun WalletSnapshot.totalBalance() = orchardBalance.total + saplingBalance.total + transparentBalance
// Note that considering both to be spendable is subject to change. // Note that considering both to be spendable is subject to change.

3
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/send/view/SendView.kt
View File

@ -53,6 +53,7 @@ import co.electriccoin.zcash.spackle.Twig
import co.electriccoin.zcash.ui.R import co.electriccoin.zcash.ui.R
import co.electriccoin.zcash.ui.common.compose.BalanceWidget import co.electriccoin.zcash.ui.common.compose.BalanceWidget
import co.electriccoin.zcash.ui.common.model.WalletSnapshot import co.electriccoin.zcash.ui.common.model.WalletSnapshot
import co.electriccoin.zcash.ui.common.model.canSpend
import co.electriccoin.zcash.ui.common.model.spendableBalance import co.electriccoin.zcash.ui.common.model.spendableBalance
import co.electriccoin.zcash.ui.common.test.CommonTag import co.electriccoin.zcash.ui.common.test.CommonTag
import co.electriccoin.zcash.ui.design.MINIMAL_WEIGHT import co.electriccoin.zcash.ui.design.MINIMAL_WEIGHT
@ -324,7 +325,7 @@ private fun SendForm(
recipientAddressState.address.isNotEmpty() && recipientAddressState.address.isNotEmpty() &&
amountState is AmountState.Valid && amountState is AmountState.Valid &&
amountState.value.isNotBlank() && amountState.value.isNotBlank() &&
walletSnapshot.spendableBalance() >= amountState.zatoshi && walletSnapshot.canSpend(amountState.zatoshi) &&
// A valid memo is necessary only for non-transparent recipient // A valid memo is necessary only for non-transparent recipient
(recipientAddressState.type == AddressType.Transparent || memoState is MemoState.Correct) (recipientAddressState.type == AddressType.Transparent || memoState is MemoState.Correct)