Skip to content

Commit 5fe406d

Browse files
committed
fix: display total balance in user selected denomination
1 parent 87b2d22 commit 5fe406d

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

common/src/commonMain/kotlin/com/blockstream/common/models/overview/WalletBalanceViewModel.kt

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ open class WalletBalanceViewModel(greenWallet: GreenWallet) :
6161
}.onEach {
6262
updateBalance(
6363
session.walletTotalBalance.value,
64-
session.walletTotalBalanceDenominationSharedFlow.value
64+
session.walletTotalBalanceDenominationSharedFlow.value.isFiat
6565
)
6666
}.launchIn(this)
6767
}
@@ -73,11 +73,7 @@ open class WalletBalanceViewModel(greenWallet: GreenWallet) :
7373
is LocalEvents.ToggleBalance -> {
7474
session.walletTotalBalanceDenominationSharedFlow.value =
7575
session.walletTotalBalanceDenominationSharedFlow.value.let {
76-
if (it == Denomination.BTC) {
77-
Denomination.fiat(session)!!
78-
} else {
79-
Denomination.BTC
80-
}
76+
Denomination.defaultOrFiat(session = session, isFiat = !it.isFiat)
8177
}
8278
}
8379

@@ -94,7 +90,7 @@ open class WalletBalanceViewModel(greenWallet: GreenWallet) :
9490
}
9591
}
9692

97-
private suspend fun updateBalance(value: Long, denomination: Denomination) {
93+
private suspend fun updateBalance(value: Long, isFiat: Boolean) {
9894
// Loading
9995
if (value == -1L) {
10096
_balancePrimary.value = null
@@ -103,8 +99,10 @@ open class WalletBalanceViewModel(greenWallet: GreenWallet) :
10399
session = session,
104100
assetId = session.walletAssets.value.data()?.policyId
105101
?: session.defaultNetwork.policyAsset,
106-
denomination = denomination.takeIf { !it.isFiat }
107-
?: Denomination.fiat(session) // Always create fiat from session, so that we get the correct fiat denomination
102+
denomination = Denomination.defaultOrFiat(
103+
session = session,
104+
isFiat = isFiat
105+
) // Always create fiat from session, so that we get the correct fiat denomination
108106
)
109107

110108
_balancePrimary.value = balance

0 commit comments

Comments
 (0)