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 dcf3bf5a43..3d59d0a270 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
@@ -68,9 +68,9 @@ class AmountMiddleware {
         } else {
             val amountErrors = extractErrorsForAmountField(transactionErrors)
             if (amountErrors.isNotEmpty()) {
+                transactionErrors.removeAll(amountErrors)
                 dispatch(AmountAction.SetAmountError(createValidateTransactionError(amountErrors, walletManager)))
             }
-            transactionErrors.removeAll(amountErrors)
             if (transactionErrors.isNotEmpty()) {
                 dispatch(SendAction.SendError(createValidateTransactionError(transactionErrors, walletManager)))
             }
@@ -84,7 +84,7 @@ class AmountMiddleware {
 
         dispatch(AmountAction.SetAmount(sendState.amountState.balanceCrypto, false))
         if (sendState.amountState.isCoinAmount()) {
-            dispatch(FeeAction.ChangeLayoutVisibility(main = true, controls = true, chipGroup = true))
+            dispatch(FeeAction.ChangeLayoutVisibility(main = true, controls = true))
             dispatch(FeeActionUi.ChangeIncludeFee(true))
         }
 
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/RequestFeeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/RequestFeeMiddleware.kt
index b2523e9e7a..04d5b420d5 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/RequestFeeMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/RequestFeeMiddleware.kt
@@ -29,7 +29,7 @@ class RequestFeeMiddleware {
 
         if (!SendState.isReadyToRequestFee()) {
             dispatch(FeeAction.FeeCalculation.SetFeeError(FeeAction.Error.ADDRESS_OR_AMOUNT_IS_EMPTY))
-            dispatch(FeeAction.ChangeLayoutVisibility(main = false, chipGroup = true))
+//            dispatch(FeeAction.ChangeLayoutVisibility(main = false, chipGroup = true))
             dispatch(ReceiptAction.RefreshReceipt)
             dispatch(SendAction.ChangeSendButtonState(sendState.getButtonState()))
             return
@@ -60,7 +60,7 @@ class RequestFeeMiddleware {
                     }
                     is Result.Failure -> {
                         dispatch(FeeAction.FeeCalculation.SetFeeError(FeeAction.Error.REQUEST_FAILED))
-                        dispatch(FeeAction.ChangeLayoutVisibility(main = false, controls = false, chipGroup = false))
+                        dispatch(FeeAction.ChangeLayoutVisibility(main = false))
                     }
                 }
                 dispatch(AmountActionUi.CheckAmountToSend)
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt
index 26d2f8dd27..5f3e43fd59 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt
@@ -254,7 +254,7 @@ fun extractErrorsForAmountField(errors: EnumSet<TransactionError>): EnumSet<Tran
                 showIntoAmountField.add(it)
             }
             TransactionError.TotalExceedsBalance -> {
-                val notAcceptable = listOf(TransactionError.FeeExceedsBalance, TransactionError.FeeExceedsBalance)
+                val notAcceptable = listOf(TransactionError.AmountExceedsBalance, TransactionError.FeeExceedsBalance)
                 if (!showIntoAmountField.containsAll(notAcceptable)) showIntoAmountField.add(it)
             }
             TransactionError.InvalidAmountValue -> showIntoAmountField.add(it)
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/FeeReducer.kt b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/FeeReducer.kt
index f5da58ab54..d0a1a13072 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/FeeReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/FeeReducer.kt
@@ -45,7 +45,7 @@ class FeeReducer : SendInternalReducer {
                 state.copy(
                         mainLayoutIsVisible = getVisibility(state.mainLayoutIsVisible, action.main),
                         controlsLayoutIsVisible = getVisibility(state.controlsLayoutIsVisible, action.controls),
-                        feeChipGroupIsVisible = getVisibility(state.mainLayoutIsVisible, action.chipGroup)
+                        feeChipGroupIsVisible = getVisibility(state.feeChipGroupIsVisible, action.chipGroup)
                 )
             }
             is FeeAction.FeeCalculation.SetFeeResult -> {