summaryrefslogtreecommitdiff
path: root/wallet/src/main/java/net/taler/wallet/MainViewModel.kt
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2020-05-15 13:28:45 -0300
committerTorsten Grote <t@grobox.de>2020-05-15 14:26:44 -0300
commitebaffcdfabd2d33e1754321f0c08d7ca5bd1570a (patch)
tree9ca8a16f4244d85ec6e6e0970debd96bf3782b01 /wallet/src/main/java/net/taler/wallet/MainViewModel.kt
parent49b9fb9306addd4dc5540dfd08f0ced6d56050ec (diff)
downloadtaler-android-ebaffcdfabd2d33e1754321f0c08d7ca5bd1570a.tar.gz
taler-android-ebaffcdfabd2d33e1754321f0c08d7ca5bd1570a.tar.bz2
taler-android-ebaffcdfabd2d33e1754321f0c08d7ca5bd1570a.zip
[wallet] show a pending badge next to balances with 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.kt6
1 files changed, 3 insertions, 3 deletions
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<Map<String, BalanceItem>>()
@@ -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)