From 3ea5b5baa51fc1724972056356d97d60d99bd44f Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Sun, 6 Jun 2021 18:17:44 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../send/redux/middlewares/AmountMiddleware.kt         | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AmountMiddleware.kt b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AmountMiddleware.kt
index 19bb270b16..dcf3bf5a43 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AmountMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AmountMiddleware.kt
@@ -83,15 +83,13 @@ class AmountMiddleware {
         val sendState = appState?.sendState ?: return
 
         dispatch(AmountAction.SetAmount(sendState.amountState.balanceCrypto, false))
-        dispatch(AmountActionUi.CheckAmountToSend)
-
-        if (SendState.isReadyToRequestFee()) {
-            dispatch(FeeAction.RequestFee)
-            if (!sendState.amountState.isCoinAmount()) return
-
+        if (sendState.amountState.isCoinAmount()) {
             dispatch(FeeAction.ChangeLayoutVisibility(main = true, controls = true, chipGroup = true))
             dispatch(FeeActionUi.ChangeIncludeFee(true))
         }
+
+        dispatch(AmountActionUi.CheckAmountToSend)
+        if (SendState.isReadyToRequestFee()) dispatch(FeeAction.RequestFee)
     }
 
     private fun toggleMainCurrency(appState: AppState?, dispatch: (Action) -> Unit) {