taler-android

Android apps for GNU Taler (wallet, PoS, cashier)
Log | Files | Refs | README | LICENSE

commit 35fb3686d411869ac4854f1f56efc46a21c7c42b
parent 64cd56ee8e336f9cff294e350235dfac4a2deb68
Author: Torsten Grote <t@grobox.de>
Date:   Mon, 20 Jul 2020 10:48:11 -0300

[wallet] manual withdrawals are confirmed when not pending anymore

Diffstat:
Mwallet/src/main/java/net/taler/wallet/transactions/Transactions.kt | 7+++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt @@ -92,8 +92,11 @@ class TransactionWithdrawal( override val amountType = AmountType.Positive override fun getTitle(context: Context) = cleanExchange(exchangeBaseUrl) override val generalTitleRes = R.string.withdraw_title - val confirmed: Boolean = - withdrawalDetails is TalerBankIntegrationApi && withdrawalDetails.confirmed + val confirmed: Boolean + get() = !pending && ( + (withdrawalDetails is TalerBankIntegrationApi && withdrawalDetails.confirmed) || + withdrawalDetails is ManualTransfer + ) } @JsonTypeInfo(use = NAME, include = PROPERTY, property = "type")