Merge branch 'main' into swaps-sse-follow-up

Author: bfullam

.storybook/test-data.js

@@ -690,6 +690,7 @@ const state = {
     ],
     accountsAssets: {},
     assetsMetadata: {},
+    allIgnoredAssets: {},
     balances: {},
     conversionRates: {},
     networkConfigurationsByChainId: {},

.yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch

@@ -102,6 +102,7 @@ export const SENTRY_BACKGROUND_STATE = {
   MultichainAssetsController: {
     accountsAssets: false,
     assetsMetadata: false,
+    allIgnoredAssets: false,
   },
   MultichainAssetsRatesController: {
     assetsRates: false,

app/_locales/en/messages.json

@@ -1,4 +1,7 @@
-import { CurrencyRateController } from '@metamask/assets-controllers';
+import {
+  CodefiTokenPricesServiceV2,
+  CurrencyRateController,
+} from '@metamask/assets-controllers';
 import { getRootMessenger } from '../lib/messenger';
 import { ControllerInitRequest } from './types';
 import { buildControllerInitRequestMock } from './test/utils';
@@ -15,6 +18,15 @@ jest.mock('@metamask/assets-controllers', () => ({
     // This is needed since the controller init tries to override this function.
     fetchMultiExchangeRate = jest.fn();
   },
+  CodefiTokenPricesServiceV2: class {
+    fetchTokenPrices = jest.fn();
+
+    fetchExchangeRates = jest.fn();
+
+    validateChainIdSupported = jest.fn();
+
+    validateCurrencySupported = jest.fn();
+  },
 }));
 
 function getInitRequestMock(): jest.Mocked<
@@ -29,6 +41,7 @@ function getInitRequestMock(): jest.Mocked<
     ...buildControllerInitRequestMock(),
     controllerMessenger: getCurrencyRateControllerMessenger(baseMessenger),
     initMessenger: getCurrencyRateControllerInitMessenger(baseMessenger),
+    tokenPricesService: new CodefiTokenPricesServiceV2(),
   };
 
   return requestMock;

app/_locales/en_GB/messages.json

@@ -1,4 +1,7 @@
-import { CurrencyRateController } from '@metamask/assets-controllers';
+import {
+  CodefiTokenPricesServiceV2,
+  CurrencyRateController,
+} from '@metamask/assets-controllers';
 import {
   CurrencyRateControllerInitMessenger,
   CurrencyRateControllerMessenger,
@@ -28,6 +31,7 @@ export const CurrencyRateControllerInit: ControllerInitFunction<
     includeUsdRate: true,
     useExternalServices: () =>
       initMessenger.call('PreferencesController:getState').useExternalServices,
+    tokenPricesService: new CodefiTokenPricesServiceV2(),
   });
 
   // TODO: This logic should be ported to `CurrencyRateController` directly.

app/scripts/constants/sentry-state.ts

@@ -285,13 +285,31 @@ describe('submitSmartTransactionHook', () => {
           throw new Error('Backend call to /getFees failed');
         });
       const result = await submitSmartTransactionHook(request);
+      expect(request.smartTransactionsController.getFees).toHaveBeenCalled();
       expect(endFlowSpy).toHaveBeenCalledWith({
         id: 'approvalId',
       });
       expect(result).toEqual({ transactionHash: undefined });
     });
   });
 
+  it('skips getting fees if the transaction is signed and sponsored', async () => {
+    withRequest(async ({ request }) => {
+      request.transactionMeta.isGasFeeSponsored = true;
+      request.featureFlags.smartTransactions.extensionReturnTxHashAsap = true;
+
+      const result = await submitSmartTransactionHook(request);
+
+      expect(
+        request.smartTransactionsController.getFees,
+      ).not.toHaveBeenCalled();
+      expect(
+        request.smartTransactionsController.submitSignedTransactions,
+      ).toHaveBeenCalled();
+      expect(result).toEqual({ transactionHash: txHash });
+    });
+  });
+
   it('returns a txHash asap if the feature flag requires it', async () => {
     withRequest(async ({ request }) => {
       request.featureFlags.smartTransactions.extensionReturnTxHashAsap = true;