fix(STX-340): use medium fee for gas fee in submission

rarquevaux · rarquevaux · commit fcfac09fe786 · 2026-01-08T16:39:02.000-08:00
diff --git a/packages/bridge-status-controller/CHANGELOG.md b/packages/bridge-status-controller/CHANGELOG.md
@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Bump `@metamask/controller-utils` from `^11.17.0` to `^11.18.0` ([#7583](https://github.com/MetaMask/core/pull/7583))
 - Bump `@metamask/network-controller` from `^27.1.0` to `^27.2.0` ([#7583](https://github.com/MetaMask/core/pull/7583))
 
+### Fixed
+
+- Use `BRIDGE_PREFERRED_GAS_ESTIMATE` from `@metamask/bridge-controller` for gas price estimates to align with validation ([#7582](https://github.com/MetaMask/core/pull/7582))
+
 ## [64.3.0]
 
 ### Changed
diff --git a/packages/bridge-status-controller/src/utils/gas.test.ts b/packages/bridge-status-controller/src/utils/gas.test.ts
@@ -1,3 +1,4 @@
+import { BRIDGE_PREFERRED_GAS_ESTIMATE } from '@metamask/bridge-controller';
 import type { GasFeeState } from '@metamask/gas-fee-controller';
 import type { FeeMarketGasFeeEstimates } from '@metamask/transaction-controller';
 import { GasFeeEstimateLevel } from '@metamask/transaction-controller';
@@ -45,23 +46,50 @@ describe('gas calculation utils', () => {
       });
     });
 
-    it('should handle missing high property in txGasFeeEstimates', () => {
-      // Call the function
+    it('should handle missing property in txGasFeeEstimates', () => {
       const result = getTxGasEstimates({
         txGasFeeEstimates: {} as never,
         networkGasFeeEstimates: {
           estimatedBaseFee: '0.00000001',
         } as GasFeeState['gasFeeEstimates'],
       });
 
-      // Verify the result
       expect(result).toStrictEqual({
         baseAndPriorityFeePerGas: undefined,
         maxFeePerGas: undefined,
         maxPriorityFeePerGas: undefined,
       });
     });
 
+    it('should use Bridge preferred gas estimate as gas estimates', () => {
+      const estimates = {
+        type: 'fee-market',
+        [GasFeeEstimateLevel.Low]: {
+          maxFeePerGas: '0xLOW',
+          maxPriorityFeePerGas: '0xLOW_PRIORITY',
+        },
+        [GasFeeEstimateLevel.Medium]: {
+          maxFeePerGas: '0xMEDIUM',
+          maxPriorityFeePerGas: '0xMEDIUM_PRIORITY',
+        },
+        [GasFeeEstimateLevel.High]: {
+          maxFeePerGas: '0xHIGH',
+          maxPriorityFeePerGas: '0xHIGH_PRIORITY',
+        },
+      } as FeeMarketGasFeeEstimates;
+      const result = getTxGasEstimates({
+        txGasFeeEstimates: estimates,
+        networkGasFeeEstimates: mockNetworkGasFeeEstimates,
+      });
+
+      expect(result.maxFeePerGas).toBe(
+        estimates[BRIDGE_PREFERRED_GAS_ESTIMATE]?.maxFeePerGas,
+      );
+      expect(result.maxPriorityFeePerGas).toBe(
+        estimates[BRIDGE_PREFERRED_GAS_ESTIMATE]?.maxPriorityFeePerGas,
+      );
+    });
+
     it('should use default estimatedBaseFee when not provided in networkGasFeeEstimates', () => {
       // Mock data
 
@@ -143,7 +171,7 @@ describe('gas calculation utils', () => {
         });
         const mockEstimateGasFeeFn = jest.fn().mockResolvedValueOnce({
           estimates: {
-            [GasFeeEstimateLevel.High]: {
+            [GasFeeEstimateLevel.Medium]: {
               maxFeePerGas: '0x1234567890',
               maxPriorityFeePerGas: '0x1234567890',
             },
diff --git a/packages/bridge-status-controller/src/utils/gas.ts b/packages/bridge-status-controller/src/utils/gas.ts
@@ -1,3 +1,4 @@
+import { BRIDGE_PREFERRED_GAS_ESTIMATE } from '@metamask/bridge-controller';
 import type { TokenAmountValues, TxData } from '@metamask/bridge-controller';
 import { toHex } from '@metamask/controller-utils';
 import type {
@@ -21,7 +22,8 @@ const getTransaction1559GasFeeEstimates = (
   txGasFeeEstimates: FeeMarketGasFeeEstimates,
   estimatedBaseFee: string,
 ) => {
-  const { maxFeePerGas, maxPriorityFeePerGas } = txGasFeeEstimates?.high ?? {};
+  const { maxFeePerGas, maxPriorityFeePerGas } =
+    txGasFeeEstimates?.[BRIDGE_PREFERRED_GAS_ESTIMATE] ?? {};
 
   const baseAndPriorityFeePerGas = maxPriorityFeePerGas
     ? new BigNumber(estimatedBaseFee, 10)
