From ebaffcdfabd2d33e1754321f0c08d7ca5bd1570a Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 15 May 2020 13:28:45 -0300 Subject: [wallet] show a pending badge next to balances with pending transactions --- wallet/src/main/java/net/taler/wallet/MainViewModel.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'wallet/src/main/java/net/taler/wallet/MainViewModel.kt') diff --git a/wallet/src/main/java/net/taler/wallet/MainViewModel.kt b/wallet/src/main/java/net/taler/wallet/MainViewModel.kt index 6a1d6aa..75cab67 100644 --- a/wallet/src/main/java/net/taler/wallet/MainViewModel.kt +++ b/wallet/src/main/java/net/taler/wallet/MainViewModel.kt @@ -32,6 +32,7 @@ import net.taler.common.Event import net.taler.common.assertUiThread import net.taler.common.toEvent import net.taler.wallet.backend.WalletBackendApi +import net.taler.wallet.balances.BalanceItem import net.taler.wallet.history.DevHistoryManager import net.taler.wallet.payment.PaymentManager import net.taler.wallet.pending.PendingOperationsManager @@ -48,8 +49,6 @@ private val transactionNotifications = listOf( "withdraw-group-finished" ) -data class BalanceItem(val available: Amount, val pendingIncoming: Amount) - class MainViewModel(val app: Application) : AndroidViewModel(app) { private val mBalances = MutableLiveData>() @@ -127,7 +126,8 @@ class MainViewModel(val app: Application) : AndroidViewModel(app) { val jsonAmountIncoming = byCurrency.getJSONObject(currency) .getJSONObject("pendingIncoming") val amountIncoming = Amount.fromJsonObject(jsonAmountIncoming) - balanceMap[currency] = BalanceItem(amount, amountIncoming) + val hasPending = transactionManager.hasPending(currency) + balanceMap[currency] = BalanceItem(amount, amountIncoming, hasPending) } mBalances.postValue(balanceMap) showProgressBar.postValue(false) -- cgit v1.2.3