aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2020-07-20 10:48:11 -0300
committerTorsten Grote <t@grobox.de>2020-07-20 10:48:11 -0300
commit35fb3686d411869ac4854f1f56efc46a21c7c42b (patch)
tree5cd0bd491c5130dfcb6a933a6b1653fda4a62c84
parent64cd56ee8e336f9cff294e350235dfac4a2deb68 (diff)
downloadtaler-android-35fb3686d411869ac4854f1f56efc46a21c7c42b.tar.gz
taler-android-35fb3686d411869ac4854f1f56efc46a21c7c42b.tar.bz2
taler-android-35fb3686d411869ac4854f1f56efc46a21c7c42b.zip
[wallet] manual withdrawals are confirmed when not pending anymore
-rw-r--r--wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt7
1 files 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
index ccc40eb..1dc55dc 100644
--- 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")