From f6aba5ddfc4eaaf270c5171fcddd2d1b6e983558 Mon Sep 17 00:00:00 2001
From: romsters <petriv.roma@gmail.com>
Date: Fri, 30 Aug 2024 16:00:28 +0300
Subject: [PATCH 1/2] fix: disable token select while fee is loading to prevent
 fee overrides

---
 components/common/input/TransactionAmount.vue | 1 +
 views/transactions/Deposit.vue                | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/common/input/TransactionAmount.vue b/components/common/input/TransactionAmount.vue
index d257d453e..2c789d02b 100644
--- a/components/common/input/TransactionAmount.vue
+++ b/components/common/input/TransactionAmount.vue
@@ -82,6 +82,7 @@
           class="h-max"
           :toggled="selectTokenModalOpened"
           variant="light"
+          :disabled="loading"
           @click="selectTokenModalOpened = true"
         >
           <template #left-icon>
diff --git a/views/transactions/Deposit.vue b/views/transactions/Deposit.vue
index 9d3158b86..0b83e9436 100644
--- a/views/transactions/Deposit.vue
+++ b/views/transactions/Deposit.vue
@@ -50,7 +50,7 @@
           :balances="availableBalances"
           :max-amount="maxAmount"
           :approve-required="!enoughAllowance && (!tokenCustomBridge || !tokenCustomBridge.bridgingDisabled)"
-          :loading="tokensRequestInProgress || balanceInProgress"
+          :loading="tokensRequestInProgress || balanceInProgress || feeLoading"
           class="mb-block-padding-1/2 sm:mb-block-gap"
         >
           <template #dropdown>

From 6f5de0e78a4c71a7c1ccf8f4f985a6ab309b0237 Mon Sep 17 00:00:00 2001
From: romsters <petriv.roma@gmail.com>
Date: Fri, 30 Aug 2024 16:04:05 +0300
Subject: [PATCH 2/2] fix: disable token select while fee is loading for
 withdrawals and transfers

---
 views/transactions/Transfer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/transactions/Transfer.vue b/views/transactions/Transfer.vue
index c70c334df..ef2432e99 100644
--- a/views/transactions/Transfer.vue
+++ b/views/transactions/Transfer.vue
@@ -53,7 +53,7 @@
           :tokens="availableTokens"
           :balances="availableBalances"
           :max-amount="maxAmount"
-          :loading="tokensRequestInProgress || balanceInProgress"
+          :loading="tokensRequestInProgress || balanceInProgress || feeLoading"
         >
           <template v-if="type === 'withdrawal' && account.address" #token-dropdown-bottom>
             <CommonAlert class="sticky bottom-0 mt-6" variant="neutral" :icon="InformationCircleIcon">