From 0cbaab21d46d517760d52bbdf3013a415978366a Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 18 Nov 2021 23:06:22 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../com/tangem/tap/domain/TapWalletManager.kt |  3 ---
 .../redux/reducers/OnWalletLoadedReducer.kt   | 24 +++++++++----------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
index 66ddcda23a..10f1a76a87 100644
--- a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
@@ -24,7 +24,6 @@ import com.tangem.tap.network.coinmarketcap.CoinMarketCapService
 import com.tangem.tap.store
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import timber.log.Timber
 import java.math.BigDecimal
 
 
@@ -55,7 +54,6 @@ class TapWalletManager {
     }
 
     suspend fun loadFiatRate(fiatCurrency: FiatCurrencyName, wallet: Wallet) {
-        Timber.d(wallet.getTokens().toString())
         val currencies = wallet.getTokens()
                 .map { Currency.Token(it) }
                 .plus(Currency.Blockchain(wallet.blockchain))
@@ -121,7 +119,6 @@ class TapWalletManager {
                 return@withContext
             }
 
-            val config = store.state.globalState.configManager?.config ?: return@withContext
             val blockchain = data.getBlockchain()
             val primaryWalletManager = walletManagerFactory.makePrimaryWalletManager(data)
 
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 e7c3e0a1a0..1cad2a84c4 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
@@ -31,18 +31,18 @@ class OnWalletLoadedReducer {
         val fiatCurrencySymbol = store.state.globalState.appCurrency
         val moonpayStatus = store.state.globalState.moonpayStatus
 
-        val amount = wallet.amounts[AmountType.Coin]?.value
+        val coinAmountValue = wallet.amounts[AmountType.Coin]?.value
         if (walletState.getWalletData(wallet.blockchain) == null) {
             return walletState
         }
-        val formattedAmount = amount?.toFormattedCurrencyString(
+        val formattedAmount = coinAmountValue?.toFormattedCurrencyString(
                 wallet.blockchain.decimals(),
                 wallet.blockchain.currency)
 
         val pendingTransactions = wallet.recentTransactions
                 .toPendingTransactions(wallet.address)
 
-        val sendButtonEnabled = amount?.isZero() == false && pendingTransactions.isEmpty()
+        val coinSendButton = coinAmountValue?.isZero() == false && pendingTransactions.isEmpty()
         val balanceStatus = if (pendingTransactions.isNotEmpty()) {
             BalanceStatus.TransactionInProgress
         } else {
@@ -50,7 +50,7 @@ class OnWalletLoadedReducer {
         }
         val walletData = walletState.getWalletData(wallet.blockchain)
 
-        val fiatAmount = walletData?.fiatRate?.let { amount?.toFiatValue(it) }
+        val fiatAmount = walletData?.fiatRate?.let { coinAmountValue?.toFiatValue(it) }
         val newWalletData = walletData?.copy(
                 currencyData = walletData.currencyData.copy(
                         status = balanceStatus, currency = wallet.blockchain.fullName,
@@ -60,7 +60,7 @@ class OnWalletLoadedReducer {
                         fiatAmountFormatted = fiatAmount?.toFormattedFiatValue(fiatCurrencySymbol)
                 ),
                 pendingTransactions = pendingTransactions.removeUnknownTransactions(),
-                mainButton = WalletMainButton.SendButton(sendButtonEnabled),
+                mainButton = WalletMainButton.SendButton(coinSendButton),
                 currency = Currency.Blockchain(wallet.blockchain),
                 tradeCryptoState = TradeCryptoState.from(moonpayStatus, walletData)
         )
@@ -73,22 +73,20 @@ class OnWalletLoadedReducer {
                 pendingTransactions.isNotEmpty() -> BalanceStatus.SameCurrencyTransactionInProgress
                 else -> BalanceStatus.VerifiedOnline
             }
-            val tokenFiatAmount = tokenWalletData?.fiatRate?.let { rate ->
-                wallet.getTokenAmount(token)?.value?.toFiatValue(rate)
-            }
+            val tokenAmountValue =  wallet.getTokenAmount(token)?.value
+            val tokenFiatAmount = tokenWalletData?.fiatRate?.let { rate -> tokenAmountValue?.toFiatValue(rate)}
+
+            val tokenSendButton = tokenAmountValue?.isZero() == false && tokenPendingTransactions.isEmpty()
             tokenWalletData?.copy(
                     currencyData = tokenWalletData.currencyData.copy(
                             status = tokenBalanceStatus,
-                            amount = wallet.getTokenAmount(token)?.value?.toFormattedCurrencyString(
-                                    token.decimals, token.symbol
-                            ),
+                            amount = tokenAmountValue?.toFormattedCurrencyString(token.decimals, token.symbol),
                             fiatAmount = tokenFiatAmount,
                             fiatAmountFormatted = tokenFiatAmount?.toFormattedFiatValue(fiatCurrencySymbol)
                     ),
                     pendingTransactions = tokenPendingTransactions.removeUnknownTransactions(),
-                    mainButton = WalletMainButton.SendButton(sendButtonEnabled),
+                    mainButton = WalletMainButton.SendButton(tokenSendButton),
                     tradeCryptoState = TradeCryptoState.from(moonpayStatus, tokenWalletData)
-
             )
         }
         val newWallets = (tokens + newWalletData).mapNotNull { it }