Use gasLimitNoBuffer on fee calculations

Author: OGPoyraz

shared/modules/gas.utils.js

@@ -58,14 +58,12 @@ export function getMaximumGasTotalInHexWei({
  * @returns {string} The minimum total cost of transaction in hex wei string
  */
 export function getMinimumGasTotalInHexWei({
-  gasLimit = '0x0',
-  gasLimitNoBuffer,
+  gasLimitNoBuffer = '0x0',
   gasPrice,
   maxPriorityFeePerGas,
   maxFeePerGas,
   baseFeePerGas,
 } = {}) {
-  const minimumGasLimit = gasLimitNoBuffer ?? gasLimit;
   const isEIP1559Estimate = Boolean(
     maxFeePerGas || maxPriorityFeePerGas || baseFeePerGas,
   );
@@ -94,7 +92,7 @@ export function getMinimumGasTotalInHexWei({
   }
   if (isEIP1559Estimate === false) {
     return getMaximumGasTotalInHexWei({
-      gasLimit: minimumGasLimit,
+      gasLimit: gasLimitNoBuffer,
       gasPrice,
     });
   }
@@ -104,11 +102,11 @@ export function getMinimumGasTotalInHexWei({
 
   if (new Numeric(minimumFeePerGas, 16).greaterThan(maxFeePerGas, 16)) {
     return getMaximumGasTotalInHexWei({
-      gasLimit: minimumGasLimit,
+      gasLimit: gasLimitNoBuffer,
       maxFeePerGas,
     });
   }
-  return new Numeric(minimumGasLimit, 16)
+  return new Numeric(gasLimitNoBuffer, 16)
     .times(new Numeric(minimumFeePerGas, 16))
     .toPrefixedHexString();
 }

ui/pages/confirmations/components/confirm/info/hooks/useFeeCalculations.ts

@@ -115,15 +115,15 @@ export function useFeeCalculations(transactionMeta: TransactionMeta) {
   );
 
   // Max fee
-  const gasLimit = transactionMeta?.txParams?.gas || HEX_ZERO;
+  const gasLimitNoBuffer = transactionMeta.gasLimitNoBuffer || HEX_ZERO;
   const gasPrice = transactionMeta?.txParams?.gasPrice || HEX_ZERO;
 
   const maxFee = useMemo(() => {
     return multiplyHexes(
       supportsEIP1559 ? (decimalToHex(maxFeePerGas) as Hex) : (gasPrice as Hex),
-      gasLimit as Hex,
+      gasLimitNoBuffer as Hex,
     );
-  }, [supportsEIP1559, maxFeePerGas, gasLimit, gasPrice]);
+  }, [supportsEIP1559, maxFeePerGas, gasLimitNoBuffer, gasPrice]);
 
   const {
     currentCurrencyFee: maxFeeFiat,
@@ -157,12 +157,9 @@ export function useFeeCalculations(transactionMeta: TransactionMeta) {
       minimumFeePerGas = decimalToHex(maxFeePerGas);
     }
 
-    // We want to pick gasLimitNoBuffer to show minimum network fee
-    const minimumGasLimit = transactionMeta?.gasLimitNoBuffer || gasLimit;
-
     const estimatedFee = multiplyHexes(
       supportsEIP1559 ? (minimumFeePerGas as Hex) : (gasPrice as Hex),
-      minimumGasLimit as Hex,
+      gasLimitNoBuffer as Hex,
     );
 
     return getFeesFromHex(estimatedFee);