diff options
author | Torsten Grote <t@grobox.de> | 2020-05-14 14:13:18 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-05-15 14:26:42 -0300 |
commit | 69093aa9055da501fd14103ac772d730850cb7b4 (patch) | |
tree | 4886bd05b7790df295902ed44fcca93146fd06fc /wallet/src/main/java/net/taler/wallet/MainViewModel.kt | |
parent | 171a1ae228b801d5c0d54c6c7e7ad8aa458d6bce (diff) | |
download | taler-android-69093aa9055da501fd14103ac772d730850cb7b4.tar.gz taler-android-69093aa9055da501fd14103ac772d730850cb7b4.tar.bz2 taler-android-69093aa9055da501fd14103ac772d730850cb7b4.zip |
[wallet] Remove success pages for withdrawal and payment
The user is now brought the the transaction list where both are shown
directly as pending transactions.
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/MainViewModel.kt')
-rw-r--r-- | wallet/src/main/java/net/taler/wallet/MainViewModel.kt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/MainViewModel.kt b/wallet/src/main/java/net/taler/wallet/MainViewModel.kt index b880036..485df73 100644 --- a/wallet/src/main/java/net/taler/wallet/MainViewModel.kt +++ b/wallet/src/main/java/net/taler/wallet/MainViewModel.kt @@ -34,6 +34,7 @@ import net.taler.wallet.payment.PaymentManager import net.taler.wallet.pending.PendingOperationsManager import net.taler.wallet.refund.RefundManager import net.taler.wallet.transactions.TransactionManager +import net.taler.wallet.transactions.TransactionsResult import net.taler.wallet.withdraw.WithdrawManager import org.json.JSONObject @@ -121,6 +122,14 @@ class MainViewModel(val app: Application) : AndroidViewModel(app) { val amountIncoming = Amount.fromJsonObject(jsonAmountIncoming) balanceMap[currency] = BalanceItem(amount, amountIncoming) } + // TODO remove when wallet-core supports 0 balance for pending transactions + if (balanceMap.isEmpty()) { + val transactionsResult = transactionManager.transactions.value + if (transactionsResult is TransactionsResult.Success && transactionsResult.transactions.isNotEmpty()) { + val currency = transactionsResult.transactions[0].amountRaw.currency + balanceMap[currency] = BalanceItem(Amount.zero(currency), Amount.zero(currency)) + } + } mBalances.postValue(balanceMap) showProgressBar.postValue(false) } |