chore: rename

rename

rename

wip

fix: merge conflict

Author: micaelae

packages/bridge-status-controller/src/bridge-status-controller.ts

@@ -844,7 +844,7 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
    *
    * @param accountAddress - The address of the account to submit the transaction for
    * @param quoteResponse - The quote response
-   * @param isStxEnabledOnClient - Whether smart transactions are enabled on the client, for example the getSmartTransactionsEnabled selector value from the extension
+   * @param isStxEnabled - Whether smart transactions are enabled on the client, for example the getSmartTransactionsEnabled selector value from the extension
    * @param quotesReceivedContext - The context for the QuotesReceived event
    * @param location - The entry point from which the user initiated the swap or bridge (e.g. Main View, Token View, Trending Explore)
    * @param abTests - Legacy A/B test context for `ab_tests` (backward compatibility)
@@ -855,7 +855,7 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
   submitTx = async (
     accountAddress: string,
     quoteResponse: QuoteResponse<Trade, Trade> & QuoteMetadata,
-    isStxEnabledOnClient: boolean,
+    isStxEnabled: boolean,
     quotesReceivedContext?: RequiredEventContextFromClient[UnifiedSwapBridgeEventName.QuotesReceived],
     location: MetaMetricsSwapsEventSource = MetaMetricsSwapsEventSource.MainView,
     abTests?: Record<string, string>,
@@ -889,7 +889,7 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
 
     const preConfirmationProperties = getPreConfirmationPropertiesFromQuote(
       quoteResponse,
-      isStxEnabledOnClient,
+      isStxEnabled,
       isHardwareAccount,
       location,
       abTests,
@@ -907,7 +907,7 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
           preConfirmationProperties,
         );
       return await this.#trace(
-        getTraceParams(quoteResponse, isStxEnabledOnClient),
+        getTraceParams(quoteResponse, isStxEnabled),
         async () => {
           /**
            * Check if the account is an EIP-7702 delegated account.
@@ -926,7 +926,7 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
 
           const params: SubmitStrategyParams = {
             quoteResponse,
-            isStxEnabledOnClient,
+            isStxEnabledOnClient: isStxEnabled,
             isDelegatedAccount,
             messenger: this.messenger,
             selectedAccount,
@@ -956,7 +956,7 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
                   ...payload,
                   quoteResponse,
                   accountAddress: selectedAccount.address,
-                  isStxEnabled: isStxEnabledOnClient,
+                  isStxEnabled,
                   startTime,
                   location,
                   abTests,
@@ -1009,7 +1009,7 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
    * @param params.location - The entry point from which the user initiated the swap or bridge
    * @param params.abTests - Legacy A/B test context for `ab_tests` (backward compatibility)
    * @param params.activeAbTests - New A/B test context for `active_ab_tests` (migration target). Attributes events to specific experiments.
-   * @param params.isStxEnabledOnClient - Whether smart transactions are enabled on the client, for example the getSmartTransactionsEnabled selector value from the extension
+   * @param params.isStxEnabled - Whether smart transactions are enabled on the client, for example the getSmartTransactionsEnabled selector value from the extension
    * @param params.quotesReceivedContext - The context for the QuotesReceived event
    * @returns A lightweight TransactionMeta-like object for history linking
    * @throws An error if intent or transaction submission fails before they get published
@@ -1020,7 +1020,7 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
     location?: MetaMetricsSwapsEventSource;
     abTests?: Record<string, string>;
     activeAbTests?: { key: string; value: string }[];
-    isStxEnabledOnClient?: boolean;
+    isStxEnabled?: boolean;
     quotesReceivedContext?: RequiredEventContextFromClient[UnifiedSwapBridgeEventName.QuotesReceived];
   }): Promise<Pick<TransactionMeta, 'id' | 'chainId' | 'type' | 'status'>> => {
     const {
@@ -1029,15 +1029,15 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
       location,
       abTests,
       activeAbTests,
-      isStxEnabledOnClient,
+      isStxEnabled = false,
       quotesReceivedContext,
     } = params;
 
     // TODO add metrics context
     return await this.submitTx(
       accountAddress,
       quoteResponse,
-      Boolean(isStxEnabledOnClient),
+      isStxEnabled,
       quotesReceivedContext,
       location,
       abTests,
@@ -1078,13 +1078,15 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
     const resolvedActiveAbTests =
       eventProperties?.active_ab_tests ?? historyActiveAbTests;
 
+    const location =
+      (txMetaId
+        ? this.state.txHistory?.[txMetaId]?.location
+        : eventProperties?.location) ?? MetaMetricsSwapsEventSource.MainView;
+
     const baseProperties = {
       action_type: MetricsActionType.SWAPBRIDGE_V1,
-      location:
-        eventProperties?.location ??
-        (txMetaId ? this.state.txHistory?.[txMetaId]?.location : undefined) ??
-        MetaMetricsSwapsEventSource.MainView,
       ...(eventProperties ?? {}),
+      location,
       ...(resolvedAbTests &&
         Object.keys(resolvedAbTests).length > 0 && {
           ab_tests: resolvedAbTests,

packages/bridge-status-controller/src/strategy/batch-strategy.ts

@@ -1,4 +1,4 @@
-import { isEvmTxData } from '@metamask/bridge-controller';
+import { TxData } from '@metamask/bridge-controller';
 
 import type { SubmitStrategyParams, SubmitStepResult } from './types';
 import {
@@ -13,7 +13,7 @@ import {
  * @yields The approvalMeta and tradeMeta for the batched transaction
  */
 export async function* submitBatchHandler(
-  args: SubmitStrategyParams,
+  args: SubmitStrategyParams<TxData>,
 ): AsyncGenerator<SubmitStepResult, void, void> {
   const {
     requireApproval,
@@ -22,19 +22,11 @@ export async function* submitBatchHandler(
     isBridgeTx,
     addTransactionBatchFn,
   } = args;
-  if (!isEvmTxData(quoteResponse.trade)) {
-    throw new Error(
-      'Failed to submit cross-chain swap transaction: trade is not an EVM transaction',
-    );
-  }
   const transactionParams = await getAddTransactionBatchParams({
     messenger,
     isBridgeTx,
     resetApproval: quoteResponse.resetApproval,
-    approval:
-      quoteResponse.approval && isEvmTxData(quoteResponse.approval)
-        ? quoteResponse.approval
-        : undefined,
+    approval: quoteResponse.approval,
     trade: quoteResponse.trade,
     quoteResponse,
     requireApproval,

packages/bridge-status-controller/src/strategy/evm-strategy.ts

@@ -105,10 +105,15 @@ export async function* submitEvmHandler(
       return await handleEvmApprovals(args);
     },
   );
+
   // Delay after approval
-  await handleMobileHardwareWalletDelay(requireApproval);
   if (approvalTxId) {
     await handleApprovalDelay(quoteResponse.quote.srcChainId);
+  }
+  // Hardware-wallet delay first (Ledger second-prompt spacing), then wait for
+  // on-chain approval confirmation so swap gas estimation runs after allowance is set.
+  await handleMobileHardwareWalletDelay(requireApproval);
+  if (requireApproval && approvalTxId) {
     await waitForTxConfirmation(args.messenger, approvalTxId);
   }
 

packages/bridge-status-controller/src/strategy/index.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
-import { isNonEvmChainId } from '@metamask/bridge-controller';
+import { isEvmTxData, isNonEvmChainId } from '@metamask/bridge-controller';
 
 import { submitBatchHandler } from './batch-strategy';
 import { submitEvmHandler as defaultSubmitHandler } from './evm-strategy';
@@ -25,9 +25,11 @@ const SUBMIT_STRATEGY_REGISTRY: SubmitStrategy[] = [
       const { quoteResponse, isStxEnabledOnClient, isDelegatedAccount } =
         params;
       return (
-        isStxEnabledOnClient ||
-        quoteResponse.quote.gasIncluded7702 ||
-        isDelegatedAccount
+        (isStxEnabledOnClient ||
+          quoteResponse.quote.gasIncluded7702 ||
+          isDelegatedAccount) &&
+        isEvmTxData(quoteResponse.trade) &&
+        (quoteResponse.approval ? isEvmTxData(quoteResponse.approval) : true)
       );
     },
     execute: submitBatchHandler,

packages/bridge-status-controller/src/strategy/types.ts

@@ -3,6 +3,7 @@ import type {
   BridgeClientId,
   QuoteMetadata,
   QuoteResponse,
+  Trade,
 } from '@metamask/bridge-controller';
 import type { TraceCallback } from '@metamask/controller-utils';
 import type {
@@ -55,13 +56,13 @@ export type SubmitStepResult =
 /**
  * The parameters for the submission flow
  */
-export type SubmitStrategyParams = {
+export type SubmitStrategyParams<TradeType extends Trade = Trade> = {
   addTransactionBatchFn: TransactionController['addTransactionBatch'];
   isBridgeTx: boolean;
   isDelegatedAccount: boolean;
   isStxEnabledOnClient: boolean;
   messenger: BridgeStatusControllerMessenger;
-  quoteResponse: QuoteResponse & QuoteMetadata;
+  quoteResponse: QuoteResponse<TradeType, TradeType> & QuoteMetadata;
   requireApproval: boolean;
   selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string];
   traceFn: TraceCallback;

packages/bridge-status-controller/src/utils/metrics.ts

@@ -185,7 +185,7 @@ export const getPreConfirmationPropertiesFromQuote = (
   quoteResponse: QuoteResponse & Partial<QuoteMetadata>,
   isStxEnabledOnClient: boolean,
   isHardwareAccount: boolean,
-  location: MetaMetricsSwapsEventSource = MetaMetricsSwapsEventSource.MainView,
+  location?: MetaMetricsSwapsEventSource,
   abTests?: Record<string, string>,
   activeAbTests?: { key: string; value: string }[],
 ) => {