diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/ReceiptReducer.kt b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/ReceiptReducer.kt
index 64d5cc23d3..9d7ac05a20 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/ReceiptReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/ReceiptReducer.kt
@@ -102,7 +102,7 @@ class ReceiptReducer : SendInternalReducer {
         if (feeState.feeIsIncluded) {
             return ReceiptCrypto(
                 amountCrypto = amountState.amountToSendCrypto.minus(feeCrypto).stripZeroPlainString(),
-                feeCrypto = feeCrypto.stripZeroPlainString(),
+                feeCrypto = feeCrypto.stripZeroPlainString().addPrecisionSign(),
                 totalCrypto = amountState.amountToSendCrypto.stripZeroPlainString(),
                 feeFiat = feeFiat,
                 willSentFiat = convertToFiatPrecision(amountState.amountToSendCrypto),
@@ -112,7 +112,7 @@ class ReceiptReducer : SendInternalReducer {
             val totalCrypto = amountState.amountToSendCrypto.plus(feeCrypto)
             return ReceiptCrypto(
                 amountCrypto = amountState.amountToSendCrypto.stripZeroPlainString(),
-                feeCrypto = feeCrypto.stripZeroPlainString(),
+                feeCrypto = feeCrypto.stripZeroPlainString().addPrecisionSign(),
                 totalCrypto = totalCrypto.stripZeroPlainString(),
                 feeFiat = feeFiat,
                 willSentFiat = convertToFiatPrecision(totalCrypto),
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt
index e079a6b114..0d6e8b528a 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt
@@ -131,9 +131,7 @@ sealed class WalletAction : Action {
 
     object Scan : WalletAction()
 
-    data class Send(val amount: Amount? = null) : WalletAction() {
-        data class ChooseCurrency(val amounts: List<Amount>?) : WalletAction()
-    }
+    data class Send(val amount: Amount? = null) : WalletAction()
 
     object EmptyField : WalletAction(), ErrorAction {
         override val error = TapError.PayIdEmptyField
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 7c63b551f9..ecf9579bb9 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
@@ -12,7 +12,13 @@ import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.operations.attestation.Attestation
 import com.tangem.operations.attestation.OnlineCardVerifier
 import com.tangem.tap.common.analytics.Analytics
-import com.tangem.tap.common.extensions.*
+import com.tangem.tap.common.extensions.copyToClipboard
+import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
+import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.extensions.dispatchOpenUrl
+import com.tangem.tap.common.extensions.onCardScanned
+import com.tangem.tap.common.extensions.shareText
+import com.tangem.tap.common.extensions.stripZeroPlainString
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.common.redux.navigation.AppScreen
@@ -22,11 +28,11 @@ import com.tangem.tap.domain.loadedRates
 import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.tap.features.home.redux.HomeAction
 import com.tangem.tap.features.send.redux.PrepareSendScreen
+import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.features.wallet.models.PendingTransactionType
 import com.tangem.tap.features.wallet.models.filterByCoin
 import com.tangem.tap.features.wallet.models.getPendingTransactions
 import com.tangem.tap.features.wallet.models.getSendableAmounts
-import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.features.wallet.redux.WalletData
 import com.tangem.tap.features.wallet.redux.WalletState
@@ -36,7 +42,6 @@ import com.tangem.tap.preferencesStorage
 import com.tangem.tap.scope
 import com.tangem.tap.store
 import com.tangem.tap.tangemSdkManager
-import java.math.BigDecimal
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.launch
@@ -44,6 +49,7 @@ import org.rekotlin.Action
 import org.rekotlin.DispatchFunction
 import org.rekotlin.Middleware
 import timber.log.Timber
+import java.math.BigDecimal
 
 class WalletMiddleware {
     private val tradeCryptoMiddleware = TradeCryptoMiddleware()
@@ -276,7 +282,7 @@ class WalletMiddleware {
                 }
             } else {
                 if (amounts?.size ?: 0 > 1) {
-                    WalletAction.Send.ChooseCurrency(amounts)
+                    WalletAction.DialogAction.ChooseCurrency(amounts)
                 } else {
                     val amountToSend = amounts?.first()
                     PrepareSendScreen(