fix: use networkClientId if included in transaction

app/scripts/controllers/bridge/bridge-controller.test.ts

@@ -366,10 +366,7 @@ describe('BridgeController', function () {
     expect(bridgeController.state.bridgeState).toEqual(
       expect.objectContaining({
         quoteRequest: { ...quoteRequest, insufficientBal: false },
-        quotes: [
-          ...mockBridgeQuotesNativeErc20Eth,
-          ...mockBridgeQuotesNativeErc20Eth,
-        ],
+        quotes: [],
         quotesLoadingStatus: 2,
         quoteFetchError: 'Network error',
         quotesRefreshCount: 3,

app/scripts/controllers/bridge/bridge-controller.ts

@@ -276,6 +276,7 @@ export default class BridgeController extends StaticIntervalPollingController<Br
       this.update((_state) => {
         _state.bridgeState = {
           ...bridgeState,
+          quotes: DEFAULT_BRIDGE_STATE.quotes,
           quoteFetchError:
             error instanceof Error ? error.message : 'Unknown error',
           quotesLoadingStatus: RequestStatus.ERROR,

app/scripts/metamask-controller.js

@@ -5376,7 +5376,9 @@ export default class MetamaskController extends EventEmitter {
       internalAccounts: this.accountsController.listAccounts(),
       dappRequest,
       networkClientId:
-        dappRequest?.networkClientId ?? this.#getGlobalNetworkClientId(),
+        dappRequest?.networkClientId ??
+        transactionOptions?.networkClientId ??
+        this.#getGlobalNetworkClientId(),
       selectedAccount: this.accountsController.getAccountByAddress(
         transactionParams.from,
       ),

ui/pages/bridge/hooks/useHandleTx.ts

@@ -35,6 +35,7 @@ import {
   getMemoizedUnapprovedTemplatedConfirmations,
   getMemoizedUnapprovedConfirmations,
   getSelectedInternalAccount,
+  getNetworkConfigurationIdByChainId,
 } from '../../../selectors';
 import {
   CONFIRM_TRANSACTION_ROUTE,
@@ -49,6 +50,10 @@ export default function useHandleTx() {
   const networkGasFeeEstimates = useSelector(getGasFeeEstimates);
   const shouldUseSmartTransaction = useSelector(getIsSmartTransaction);
 
+  const networkConfigurationIds = useSelector(
+    getNetworkConfigurationIdByChainId,
+  );
+
   const handleEvmTx = async ({
     txType,
     txParams,
@@ -84,18 +89,25 @@ export default function useHandleTx() {
       maxPriorityFeePerGas,
     };
 
+    const networkClientId =
+      networkConfigurationIds[
+        hexChainId as keyof typeof networkConfigurationIds
+      ];
+
     // For the bridge tx only
     // Need access to the txMeta.id right away so we can track it in BridgeStatusController,
     // so we call addTransaction instead of addTransactionAndWaitForPublish
     // if it's an STX, addTransactionAndWaitForPublish blocks until there is a txHash
     let txMeta: TransactionMeta;
     if (txType === TransactionType.bridge && shouldUseSmartTransaction) {
       txMeta = await addTransaction(finalTxParams, {
+        networkClientId,
         requireApproval: false,
         type: txType,
       });
     } else {
       txMeta = await addTransactionAndWaitForPublish(finalTxParams, {
+        networkClientId,
         requireApproval: false,
         type: txType,
       });

ui/pages/bridge/hooks/useSubmitBridgeTransaction.test.tsx

@@ -167,6 +167,7 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
           value: '0x00',
         },
         {
+          networkClientId: expect.any(String),
           requireApproval: false,
           type: 'bridge',
         },
@@ -218,6 +219,7 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
           value: '0x00',
         },
         {
+          networkClientId: expect.any(String),
           requireApproval: false,
           type: 'bridgeApproval',
         },
@@ -236,6 +238,7 @@ describe('ui/pages/bridge/hooks/useSubmitBridgeTransaction', () => {
           value: '0x00',
         },
         {
+          networkClientId: expect.any(String),
           requireApproval: false,
           type: 'bridge',
         },

ui/store/actions.ts

@@ -1034,6 +1034,7 @@ export function addTransactionAndRouteToConfirmationPage(
  * @param options.swaps.hasApproveTx - Whether the swap required an approval transaction.
  * @param options.swaps.meta - Additional transaction metadata required by swaps.
  * @param options.type
+ * @param options.networkClientId - The network client id to use for the transaction.
  * @returns
  */
 export async function addTransactionAndWaitForPublish(
@@ -1043,6 +1044,7 @@ export async function addTransactionAndWaitForPublish(
     requireApproval?: boolean;
     swaps?: { hasApproveTx?: boolean; meta?: Record<string, unknown> };
     type?: TransactionType;
+    networkClientId?: string;
   },
 ): Promise<TransactionMeta> {
   log.debug('background.addTransactionAndWaitForPublish');
@@ -1075,6 +1077,7 @@ export async function addTransactionAndWaitForPublish(
  * @param options.swaps.hasApproveTx - Whether the swap required an approval transaction.
  * @param options.swaps.meta - Additional transaction metadata required by swaps.
  * @param options.type
+ * @param options.networkClientId - The network client id to use for the transaction.
  * @returns
  */
 export async function addTransaction(
@@ -1084,6 +1087,7 @@ export async function addTransaction(
     requireApproval?: boolean;
     swaps?: { hasApproveTx?: boolean; meta?: Record<string, unknown> };
     type?: TransactionType;
+    networkClientId?: string;
   },
 ): Promise<TransactionMeta> {
   log.debug('background.addTransaction');