chore: rename

rename

rename

wip

Author: micaelae

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

@@ -257,7 +257,6 @@ const setup = (options?: {
     addTransactionBatchFn: jest.fn(),
     clientId: options?.clientId ?? BridgeClientId.EXTENSION,
     fetchFn: (...args: any[]) => mockFetchFn(...args),
-    addTransactionBatchFn: jest.fn(),
     config: { customBridgeApiBaseUrl: 'http://localhost' },
     traceFn: (_req: any, fn?: any): any => fn?.(),
   });

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

@@ -904,7 +904,7 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
       );
 
     let tradeTxMeta: TransactionMeta;
-    let publishFailedEvent = false;
+    let publishEventOnFailure = false;
 
     try {
       return await this.#trace(
@@ -943,8 +943,8 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
 
           // Each submission strategy determines when to return values, which means these values can be returned in any order
           for await (const { type, payload } of steps) {
-            if (type === 'publishFailedEvent') {
-              publishFailedEvent = payload;
+            if (type === 'publishEventOnFailure') {
+              publishEventOnFailure = payload;
             }
             if (type === 'rekeyHistoryItem') {
               this.#rekeyHistoryItem(payload.actionId, payload.tradeMeta);
@@ -989,7 +989,7 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
         },
       );
     } catch (error) {
-      if (!quoteResponse.featureId && publishFailedEvent) {
+      if (!quoteResponse.featureId && publishEventOnFailure) {
         this.#trackUnifiedSwapBridgeEvent(
           UnifiedSwapBridgeEventName.Failed,
           undefined,
@@ -1086,7 +1086,11 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
       action_type: MetricsActionType.SWAPBRIDGE_V1,
       location:
         eventProperties?.location ??
-        (txMetaId ? this.state.txHistory?.[txMetaId]?.location : undefined) ??
+        (txMetaId
+          ? // comseyhil jfildsjfkl jilfd
+            this.state.txHistory?.[txMetaId]?.location
+          : // comseyhil jfildsjfkl jilfd
+            undefined) ??
         MetaMetricsSwapsEventSource.MainView,
       ...(eventProperties ?? {}),
       ...(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/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/non-evm-strategy.ts

@@ -62,7 +62,7 @@ export async function* submitNonEvmHandler(
   // Until the transaction has been added to the TransactionController state
   // TODO remove this once the bug is fixed
   yield {
-    type: 'publishFailedEvent',
+    type: 'publishEventOnFailure',
     payload: true,
   };
 

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

@@ -3,6 +3,8 @@ import type {
   BridgeClientId,
   QuoteMetadata,
   QuoteResponse,
+  Trade,
+  TxData,
 } from '@metamask/bridge-controller';
 import type { TraceCallback } from '@metamask/controller-utils';
 import type {
@@ -21,7 +23,7 @@ import type {
  */
 export type SubmitStepResult =
   | {
-      type: 'publishFailedEvent';
+      type: 'publishEventOnFailure';
       payload: boolean;
     }
   | {
@@ -59,13 +61,13 @@ export type SubmitStepResult =
 /**
  * The parameters for the submission flow
  */
-export type SubmitStrategyParams = {
+export type SubmitStrategyParams<TradeType extends Trade = TxData> = {
   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;