File tree Expand file tree Collapse file tree 3 files changed +15
-17
lines changed
feature-wallet-api/src/main/java/jp/co/soramitsu/wallet/impl/domain/model
feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/balance/detail Expand file tree Collapse file tree 3 files changed +15
-17
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ buildscript {
66 ext {
77 // App version
88 versionName = ' 3.4.2'
9- versionCode = 165
9+ versionCode = 166
1010
1111 // SDK and tools
1212 compileSdkVersion = 34
Original file line number Diff line number Diff line change @@ -83,16 +83,10 @@ data class Asset(
8383
8484 val transferable = free - locked
8585 val transferableInPlanks = freeInPlanks?.let { it - miscFrozenInPlanks.orZero().max(feeFrozenInPlanks.orZero()) }.orZero()
86- val sendAvailable: BigDecimal = if (status == STATUS_FROZEN ) {
87- BigDecimal .ZERO
88- } else {
89- transferable
90- }
91- val sendAvailableInPlanks: BigInteger = if (status == STATUS_FROZEN ) {
92- BigInteger .ZERO
93- } else {
94- transferableInPlanks
95- }
86+
87+ val isAssetFrozen = status == STATUS_FROZEN
88+ val sendAvailable: BigDecimal = if (isAssetFrozen) BigDecimal .ZERO else transferable
89+ val sendAvailableInPlanks: BigInteger = if (isAssetFrozen) BigInteger .ZERO else transferableInPlanks
9690
9791 val bonded = token.amountFromPlanks(bondedInPlanks.orZero())
9892 val redeemable = token.amountFromPlanks(redeemableInPlanks.orZero())
Original file line number Diff line number Diff line change @@ -226,18 +226,22 @@ class BalanceDetailViewModel @Inject constructor(
226226 )
227227
228228 val transferableFormatted =
229- balanceModel.transferable .formatCryptoDetail(balanceModel.token.configuration.symbol)
230- val transferableFiat = balanceModel.token.fiatAmount(balanceModel.transferable )
229+ balanceModel.sendAvailable .formatCryptoDetail(balanceModel.token.configuration.symbol)
230+ val transferableFiat = balanceModel.token.fiatAmount(balanceModel.sendAvailable )
231231 ?.formatFiat(balanceModel.token.fiatSymbol)
232232 val newTransferableState = defaultState.transferableViewState.copy(
233233 value = transferableFormatted,
234234 additionalValue = transferableFiat
235235 )
236236
237- val lockedFormatted =
238- balanceModel.locked.formatCryptoDetail(balanceModel.token.configuration.symbol)
239- val lockedFiat = balanceModel.token.fiatAmount(balanceModel.locked)
240- ?.formatFiat(balanceModel.token.fiatSymbol)
237+ val showLocked = if (balanceModel.isAssetFrozen) {
238+ balanceModel.transferable
239+ } else {
240+ balanceModel.locked
241+ }
242+ val lockedFormatted = showLocked.formatCryptoDetail(balanceModel.token.configuration.symbol)
243+ val lockedFiat = balanceModel.token.fiatAmount(showLocked)?.formatFiat(balanceModel.token.fiatSymbol)
244+
241245 val newLockedState = defaultState.lockedViewState.copy(
242246 value = lockedFormatted,
243247 additionalValue = lockedFiat,
You can’t perform that action at this time.
0 commit comments