diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt index d3f607e439..7a5db9c286 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt @@ -254,7 +254,6 @@ data class WalletData( val mainButton: WalletMainButton = WalletMainButton.SendButton(false), val currency: Currency, val warningRent: WalletRent? = null, - val blockchainAmount: BigDecimal? = BigDecimal.ZERO ) { fun shouldShowMultipleAddress(): Boolean { val listOfAddresses = walletAddresses?.list ?: return false @@ -268,7 +267,7 @@ data class WalletData( fun shouldEnableTokenSendButton(): Boolean = !blockchainAmountIsEmpty() || !tokenAmountIsEmpty() - private fun blockchainAmountIsEmpty(): Boolean = blockchainAmount?.isZero() ?: false + private fun blockchainAmountIsEmpty(): Boolean = currencyData.blockchainAmount?.isZero() ?: false private fun tokenAmountIsEmpty(): Boolean = currencyData.amount?.isZero() == true } diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt index e654ad24ea..caf41a9386 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt @@ -55,6 +55,7 @@ class OnWalletLoadedReducer { currencyData = walletData.currencyData.copy( status = balanceStatus, currency = wallet.blockchain.fullName, currencySymbol = wallet.blockchain.currency, + blockchainAmount = coinAmountValue, amount = coinAmountValue, amountFormatted = formattedAmount, fiatAmount = fiatAmount, @@ -64,7 +65,6 @@ class OnWalletLoadedReducer { mainButton = WalletMainButton.SendButton(coinSendButton), currency = Currency.Blockchain(wallet.blockchain), tradeCryptoState = TradeCryptoState.from(exchangeManager, walletData), - blockchainAmount = coinAmountValue ) val tokens = wallet.getTokens().mapNotNull { token -> @@ -83,6 +83,7 @@ class OnWalletLoadedReducer { tokenWalletData?.copy( currencyData = tokenWalletData.currencyData.copy( status = tokenBalanceStatus, + blockchainAmount = coinAmountValue, amount = tokenAmountValue, amountFormatted = tokenAmountValue?.toFormattedCurrencyString(token.decimals, token.symbol), fiatAmount = tokenFiatAmount, @@ -91,7 +92,6 @@ class OnWalletLoadedReducer { pendingTransactions = tokenPendingTransactions.removeUnknownTransactions(), mainButton = WalletMainButton.SendButton(tokenSendButton), tradeCryptoState = TradeCryptoState.from(exchangeManager, tokenWalletData), - blockchainAmount = coinAmountValue ) } val newWallets = (tokens + newWalletData).mapNotNull { it } @@ -151,6 +151,7 @@ class OnWalletLoadedReducer { balanceStatus, wallet.blockchain.fullName, currencySymbol = wallet.blockchain.currency, token = tokenData, + blockchainAmount = amount, amount = amount, amountFormatted = formattedAmount, fiatAmountFormatted = fiatAmount, @@ -159,7 +160,6 @@ class OnWalletLoadedReducer { pendingTransactions = pendingTransactions.removeUnknownTransactions(), mainButton = WalletMainButton.SendButton(sendButtonEnabled), tradeCryptoState = TradeCryptoState.from(exchangeManager, walletState.primaryWallet), - blockchainAmount = amount ) val wallets = walletData?.let { listOf(walletData) } ?: emptyList() return walletState.copy( diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt index f67d9411cb..6f666e8601 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt @@ -22,6 +22,7 @@ data class BalanceWidgetData( val status: BalanceStatus? = null, val currency: String? = null, val currencySymbol: String? = null, + val blockchainAmount: BigDecimal? = BigDecimal.ZERO, val amount: BigDecimal? = null, val amountFormatted: String? = null, val fiatAmountFormatted: String? = null,