From ae1d538fe052c7f8d4b4932a848aa2e2d432b1a8 Mon Sep 17 00:00:00 2001
From: tomasklim <tomas.klim@gmail.com>
Date: Fri, 27 Dec 2024 10:20:26 +0100
Subject: [PATCH] feat(suite): use min fee for bump evm chain fee

---
 .../suite/src/components/wallet/Fees/CustomFee.tsx     | 10 +++++++---
 packages/suite/src/hooks/wallet/useRbfForm.ts          |  6 +++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/suite/src/components/wallet/Fees/CustomFee.tsx b/packages/suite/src/components/wallet/Fees/CustomFee.tsx
index 34acaaa41be..65168983224 100644
--- a/packages/suite/src/components/wallet/Fees/CustomFee.tsx
+++ b/packages/suite/src/components/wallet/Fees/CustomFee.tsx
@@ -119,9 +119,13 @@ export const CustomFee = <TFieldValues extends FormState>({
                 except: networkType !== 'ethereum',
             }),
             range: (value: string) => {
-                const feeBig = new BigNumber(value);
-                if (feeBig.isGreaterThan(maxFee) || feeBig.isLessThan(minFee)) {
-                    return translationString('CUSTOM_FEE_NOT_IN_RANGE', { minFee, maxFee });
+                const customFee = new BigNumber(value);
+
+                if (customFee.isGreaterThan(maxFee) || customFee.isLessThan(minFee)) {
+                    return translationString('CUSTOM_FEE_NOT_IN_RANGE', {
+                        minFee: new BigNumber(minFee).toString(),
+                        maxFee: new BigNumber(maxFee).toString(),
+                    });
                 }
             },
         },
diff --git a/packages/suite/src/hooks/wallet/useRbfForm.ts b/packages/suite/src/hooks/wallet/useRbfForm.ts
index 77a06f93736..6c958b7da8c 100644
--- a/packages/suite/src/hooks/wallet/useRbfForm.ts
+++ b/packages/suite/src/hooks/wallet/useRbfForm.ts
@@ -54,8 +54,8 @@ const getEthereumFeeInfo = (info: FeeInfo, gasPrice: string) => {
     const minFeeFromNetwork = new BigNumber(feeInfo.levels[0].feePerUnit);
 
     const getFee = () => {
-        if (minFeeFromNetwork.lte(current.plus(1))) {
-            return current.plus(1);
+        if (minFeeFromNetwork.lte(current.plus(feeInfo.minFee))) {
+            return current.plus(feeInfo.minFee);
         }
 
         return minFeeFromNetwork;
@@ -72,7 +72,7 @@ const getEthereumFeeInfo = (info: FeeInfo, gasPrice: string) => {
     return {
         ...feeInfo,
         levels,
-        minFee: current.plus(1).toNumber(), // increase required minFee rate
+        minFee: current.plus(feeInfo.minFee).toNumber(), // increase required minFee rate
     };
 };