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 72ebc7ce50..299cc99014 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
@@ -36,7 +36,7 @@ data class WalletState(
     val walletManagers: List<WalletManager> = emptyList(),
     val isMultiwalletAllowed: Boolean = false,
     val cardCurrency: CryptoCurrencyName? = null,
-    val selectedWallet: Currency? = null,
+    val selectedCurrency: Currency? = null,
     val primaryBlockchain: Blockchain? = null,
     val primaryToken: Token? = null,
     val isTestnet: Boolean = false,
@@ -93,7 +93,7 @@ data class WalletState(
     }
 
     fun getSelectedWalletData(): WalletData? {
-        return walletsData.find { it.currency == selectedWallet }
+        return walletsData.find { it.currency == selectedCurrency }
     }
 
     fun canBeRemoved(walletData: WalletData?): Boolean {
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
index f625dd9d1e..a9506668c6 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
@@ -203,7 +203,7 @@ class WalletMiddleware {
                 }
             }
             is WalletAction.ShowDialog.QrCode -> {
-                val selectedWalletData = walletState.getWalletData(walletState.selectedWallet) ?: return
+                val selectedWalletData = walletState.getWalletData(walletState.selectedCurrency) ?: return
                 val selectedAddressData = selectedWalletData.walletAddresses?.selectedAddress ?: return
 
                 val currency = selectedWalletData.currency
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/MultiWalletReducer.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/MultiWalletReducer.kt
index de55ee1707..d684e1da6d 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/MultiWalletReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/MultiWalletReducer.kt
@@ -21,7 +21,7 @@ class MultiWalletReducer {
                 state.addWalletManagers(action.walletManagers)
             }
             is WalletAction.MultiWallet.AddBlockchains -> {
-                val wallets = action.blockchains.map { blockchain ->
+                val walletsData = action.blockchains.map { blockchain ->
                     val wallet = state.getWalletManager(blockchain)?.wallet
                     val cardToken = if (!state.isMultiwalletAllowed) {
                         wallet?.getFirstToken()?.symbol?.let { TokenData("", tokenSymbol = it) }
@@ -41,14 +41,14 @@ class MultiWalletReducer {
                     )
                 }
 
-                val selectedWallet = if (!state.isMultiwalletAllowed) {
-                    wallets[0].currency
+                val selectedCurrency = if (!state.isMultiwalletAllowed) {
+                    walletsData[0].currency
                 } else {
-                    state.selectedWallet
+                    state.selectedCurrency
                 }
                 state.copy(
-                        walletsData = wallets,
-                        selectedWallet = selectedWallet
+                        walletsData = walletsData,
+                        selectedCurrency = selectedCurrency
                 )
             }
             is WalletAction.MultiWallet.AddBlockchain -> {
@@ -115,7 +115,7 @@ class MultiWalletReducer {
                 state.copy(isMultiwalletAllowed = action.isMultiwalletAllowed)
 
             is WalletAction.MultiWallet.SelectWallet ->
-                state.copy(selectedWallet = action.walletData?.currency)
+                state.copy(selectedCurrency = action.walletData?.currency)
 
             is WalletAction.MultiWallet.RemoveWallet -> {
                 val wallets = state.walletsData.filterNot {
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 0c45051b13..6bc4b389d1 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
@@ -137,6 +137,7 @@ class OnWalletLoadedReducer {
         val pendingTransactions = wallet.recentTransactions
                 .toPendingTransactions(wallet.address)
 
+        //TO:
         val sendButtonEnabled = amount?.isZero() == false && pendingTransactions.isEmpty()
         val balanceStatus = if (pendingTransactions.isNotEmpty()) {
             BalanceStatus.TransactionInProgress
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt
index c886a3edf1..488f7e1ab9 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt
@@ -228,7 +228,7 @@ private fun internalReduce(action: Action, state: AppState): WalletState {
         is WalletAction.Send.Cancel -> newState = newState.copy(walletDialog = null)
         is WalletAction.TradeCryptoAction -> return newState
         is WalletAction.ChangeSelectedAddress -> {
-            val selectedWalletData = newState.getWalletData(newState.selectedWallet)
+            val selectedWalletData = newState.getWalletData(newState.selectedCurrency)
 
             val walletAddresses =
                 newState.getWalletData(selectedWalletData?.currency)?.walletAddresses
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt
index 57d4b733de..3644f38988 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt
@@ -94,7 +94,7 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
 
     override fun newState(state: WalletState) {
         if (activity == null || view == null) return
-        if (state.selectedWallet == null) return
+        if (state.selectedCurrency == null) return
         val selectedWallet = state.getSelectedWalletData() ?: return