@metamask-previews/bridge-status-controller 72.0.2-preview-f5ff6e53c → 72.0.2-preview-2b6e433

package/CHANGELOG.md

@@ -7,13 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Added
+### Changed
 
-- Add `batch_id` property to BatchSell events ([#8964](https://github.com/MetaMask/core/pull/8964))
-  - pre-generate the batchId using transaction controller's `generateBatchId` util
-  - attach batchId to the `Submitted`, `Completed` and `Failed` events
-  - provide batchId to the `TransactionController:addTransactionBatch` to propagate it the TransactionMeta
-- Publish tx submission metrics for `BatchSell`, `QuickBuy` and `UnifiedSwapBridge` actions ([#8964](https://github.com/MetaMask/core/pull/8964))
+- Bump `@metamask/transaction-controller` from `^66.0.1` to `^67.0.0` ([#9021](https://github.com/MetaMask/core/pull/9021))
+- Bump `@metamask/bridge-controller` from `^73.2.1` to `^74.0.0` ([#9045](https://github.com/MetaMask/core/pull/9045))
 
 ## [72.0.2]
 

package/dist/bridge-status-controller.cjs

@@ -17,7 +17,6 @@ var _BridgeStatusController_pollingTokensByTxMetaId, _BridgeStatusController_int
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BridgeStatusController = void 0;
 const bridge_controller_1 = require("@metamask/bridge-controller");
-const bridge_controller_2 = require("@metamask/bridge-controller");
 const polling_controller_1 = require("@metamask/polling-controller");
 const transaction_controller_1 = require("@metamask/transaction-controller");
 const utils_1 = require("@metamask/utils");
@@ -77,11 +76,11 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
         _BridgeStatusController_onTransactionFailed.set(this, ({ txMeta, historyKey, isApprovalTxMeta, }) => {
             // Check if the history item is already marked as a failure
             const isHistoryItemAlreadyFailed = historyKey
-                ? this.state.txHistory[historyKey]?.status.status === bridge_controller_2.StatusTypes.FAILED
+                ? this.state.txHistory[historyKey]?.status.status === bridge_controller_1.StatusTypes.FAILED
                 : false;
             __classPrivateFieldGet(this, _BridgeStatusController_updateHistoryItem, "f").call(this, {
                 historyKey,
-                status: bridge_controller_2.StatusTypes.FAILED,
+                status: bridge_controller_1.StatusTypes.FAILED,
                 txHash: isApprovalTxMeta ? undefined : txMeta.hash,
                 completionTime: Date.now(),
             });
@@ -93,7 +92,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             if (isHistoryItemAlreadyFailed) {
                 return;
             }
-            __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_2.UnifiedSwapBridgeEventName.Failed, historyKey, (0, metrics_1.getEVMTxPropertiesFromTransactionMeta)(txMeta));
+            __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, historyKey, (0, metrics_1.getEVMTxPropertiesFromTransactionMeta)(txMeta));
         });
         // Only EVM txs
         _BridgeStatusController_onTransactionConfirmed.set(this, ({ txMeta, historyKey, isApprovalTxMeta, }) => {
@@ -111,10 +110,10 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 case true:
                     __classPrivateFieldGet(this, _BridgeStatusController_updateHistoryItem, "f").call(this, {
                         historyKey,
-                        status: bridge_controller_2.StatusTypes.COMPLETE,
+                        status: bridge_controller_1.StatusTypes.COMPLETE,
                         completionTime: Date.now(),
                     });
-                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_2.UnifiedSwapBridgeEventName.Completed, historyKey);
+                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Completed, historyKey);
                     break;
                 default:
                     if (historyKey) {
@@ -185,10 +184,24 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     // Restart polling
                     __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, targetTxMetaId);
                     // Track polling manually restarted event
-                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_2.UnifiedSwapBridgeEventName.PollingStatusUpdated, targetTxMetaId, {
-                        polling_status: bridge_controller_2.PollingStatus.ManuallyRestarted,
-                        retry_attempts: previousAttempts,
-                    });
+                    if (!historyItem.featureId) {
+                        const selectedAccount = (0, accounts_1.getAccountByAddress)(this.messenger, historyItem.account);
+                        const requestParams = (0, metrics_1.getRequestParamFromHistory)(historyItem);
+                        const requestMetadata = (0, metrics_1.getRequestMetadataFromHistory)(historyItem, selectedAccount);
+                        const { security_warnings: _, ...metadataWithoutWarnings } = requestMetadata;
+                        __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.PollingStatusUpdated, targetTxMetaId, {
+                            ...(0, metrics_1.getTradeDataFromHistory)(historyItem),
+                            ...(0, metrics_1.getPriceImpactFromQuote)(historyItem.quote),
+                            ...metadataWithoutWarnings,
+                            chain_id_source: requestParams.chain_id_source,
+                            chain_id_destination: requestParams.chain_id_destination,
+                            token_symbol_source: requestParams.token_symbol_source,
+                            token_symbol_destination: requestParams.token_symbol_destination,
+                            action_type: bridge_controller_1.MetricsActionType.SWAPBRIDGE_V1,
+                            polling_status: bridge_controller_1.PollingStatus.ManuallyRestarted,
+                            retry_attempts: previousAttempts,
+                        });
+                    }
                 }
             }
         };
@@ -210,8 +223,8 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             const { txHistory } = this.state;
             const historyItems = Object.entries(txHistory);
             const incompleteHistoryItems = historyItems
-                .filter(([_, historyItem]) => historyItem.status.status === bridge_controller_2.StatusTypes.PENDING ||
-                historyItem.status.status === bridge_controller_2.StatusTypes.UNKNOWN)
+                .filter(([_, historyItem]) => historyItem.status.status === bridge_controller_1.StatusTypes.PENDING ||
+                historyItem.status.status === bridge_controller_1.StatusTypes.UNKNOWN)
                 // Only poll items with txMetaId (post-submission items)
                 .filter(([_, historyItem]) => {
                 if (!historyItem.txMetaId) {
@@ -320,9 +333,9 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 delete __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[bridgeTxMetaId];
                 // Track max polling reached event
                 const historyItem = this.state.txHistory[bridgeTxMetaId];
-                if (historyItem) {
+                if (historyItem && !historyItem.featureId) {
                     // Track polling status updated event
-                    __classPrivateFieldGet(this, _BridgeStatusController_trackPollingStatusUpdatedEvent, "f").call(this, bridgeTxMetaId, bridge_controller_2.PollingStatus.MaxPollingReached);
+                    __classPrivateFieldGet(this, _BridgeStatusController_trackPollingStatusUpdatedEvent, "f").call(this, bridgeTxMetaId, bridge_controller_1.PollingStatus.MaxPollingReached);
                 }
             }
             // Update the attempts counter
@@ -344,7 +357,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             }
             const pollingToken = __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[bridgeTxMetaId];
             // Track polling status updated event
-            __classPrivateFieldGet(this, _BridgeStatusController_trackPollingStatusUpdatedEvent, "f").call(this, bridgeTxMetaId, bridge_controller_2.PollingStatus.InvalidTransactionHash);
+            __classPrivateFieldGet(this, _BridgeStatusController_trackPollingStatusUpdatedEvent, "f").call(this, bridgeTxMetaId, bridge_controller_1.PollingStatus.InvalidTransactionHash);
             // If we've failed too many times, stop polling for the tx
             if (pollingToken) {
                 this.stopPollingByPollingToken(pollingToken);
@@ -390,7 +403,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     validationFailures = response.validationFailures;
                 }
                 if (validationFailures.length > 0) {
-                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_2.UnifiedSwapBridgeEventName.StatusValidationFailed, bridgeTxMetaId, {
+                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.StatusValidationFailed, bridgeTxMetaId, {
                         failures: validationFailures,
                         refresh_count: historyItem.attempts?.counter ?? 0,
                     });
@@ -400,8 +413,8 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 const newBridgeHistoryItem = {
                     ...historyItem,
                     status,
-                    completionTime: status.status === bridge_controller_2.StatusTypes.COMPLETE ||
-                        status.status === bridge_controller_2.StatusTypes.FAILED
+                    completionTime: status.status === bridge_controller_1.StatusTypes.COMPLETE ||
+                        status.status === bridge_controller_1.StatusTypes.FAILED
                         ? Date.now()
                         : undefined, // TODO make this more accurate by looking up dest txHash block time
                     attempts: undefined,
@@ -418,17 +431,21 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 }
                 // 5. After effects
                 const pollingToken = __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[bridgeTxMetaId];
-                const isFinalStatus = status.status === bridge_controller_2.StatusTypes.COMPLETE ||
-                    status.status === bridge_controller_2.StatusTypes.FAILED;
+                const isFinalStatus = status.status === bridge_controller_1.StatusTypes.COMPLETE ||
+                    status.status === bridge_controller_1.StatusTypes.FAILED;
                 if (isFinalStatus && pollingToken) {
                     this.stopPollingByPollingToken(pollingToken);
                     delete __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[bridgeTxMetaId];
-                    if (status.status === bridge_controller_2.StatusTypes.COMPLETE) {
-                        __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_2.UnifiedSwapBridgeEventName.Completed, bridgeTxMetaId);
+                    // Skip tracking events when featureId is set (i.e. PERPS)
+                    if (historyItem.featureId) {
+                        return;
+                    }
+                    if (status.status === bridge_controller_1.StatusTypes.COMPLETE) {
+                        __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Completed, bridgeTxMetaId);
                         this.messenger.publish('BridgeStatusController:destinationTransactionCompleted', historyItem.quote.destAsset.assetId);
                     }
-                    if (status.status === bridge_controller_2.StatusTypes.FAILED) {
-                        __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_2.UnifiedSwapBridgeEventName.Failed, bridgeTxMetaId);
+                    if (status.status === bridge_controller_1.StatusTypes.FAILED) {
+                        __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, bridgeTxMetaId);
                     }
                 }
             }
@@ -453,7 +470,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             // But it is possible to have bridgeHistoryItem in state without the srcTxHash yet when it is an STX
             const srcTxHash = txHistory[bridgeTxMetaId].status.srcChain.txHash;
             if (srcTxHash ||
-                (0, bridge_controller_2.isNonEvmChainId)(txHistory[bridgeTxMetaId].quote.srcChainId)) {
+                (0, bridge_controller_1.isNonEvmChainId)(txHistory[bridgeTxMetaId].quote.srcChainId)) {
                 return srcTxHash;
             }
             // Update history with TransactionController's hash if it has been updated
@@ -561,7 +578,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                             __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, payload.historyKey);
                             break;
                         case types_1.SubmitStep.PublishCompletedEvent:
-                            __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_2.UnifiedSwapBridgeEventName.Completed, payload.historyKey);
+                            __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Completed, payload.historyKey);
                             break;
                         /* c8 ignore start */
                         default:
@@ -590,7 +607,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
          * @returns The transaction meta
          * @throws An error if transaction submission fails before it gets published
          */
-        this.submitTx = async (accountAddress, maybeQuoteResponses, isStxEnabled, quotesReceivedContext, location = bridge_controller_2.MetaMetricsSwapsEventSource.MainView, abTests, activeAbTests, tokenSecurityTypeDestination, batchSellTrades) => {
+        this.submitTx = async (accountAddress, maybeQuoteResponses, isStxEnabled, quotesReceivedContext, location = bridge_controller_1.MetaMetricsSwapsEventSource.MainView, abTests, activeAbTests, tokenSecurityTypeDestination, batchSellTrades) => {
             /**
              * If there are multiple quote responses, we assume that they all originate from the same src chain
              * and the same account. In this case its safe to use the first quote response's properties for
@@ -600,35 +617,32 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 ? maybeQuoteResponses
                 : [maybeQuoteResponses];
             const quoteResponse = quoteResponses[0];
-            const { quote } = quoteResponse;
+            const { featureId, quote } = quoteResponse;
             const startTime = Date.now();
-            (0, bridge_1.stopPollingForQuotes)(this.messenger, quotesReceivedContext);
+            (0, bridge_1.stopPollingForQuotes)(this.messenger, featureId, quotesReceivedContext);
             const selectedAccount = (0, accounts_1.getAccountByAddress)(this.messenger, accountAddress);
             if (!selectedAccount) {
                 throw new Error('Failed to submit cross-chain swap transaction: undefined multichain account');
             }
-            const accountHardwareType = (0, bridge_controller_2.getAccountHardwareType)(selectedAccount);
+            const accountHardwareType = (0, bridge_controller_1.getAccountHardwareType)(selectedAccount);
             /**
              * For hardware wallets on Mobile, this is fixes an issue where the Ledger does not get prompted for the 2nd approval.
              * Extension does not have this issue
              */
             const requireApproval = __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f") === types_2.BridgeClientId.MOBILE && accountHardwareType !== null;
-            const isBridgeTx = (0, bridge_controller_2.isCrossChain)(quote.srcChainId, quote.destChainId);
-            const batchId = quoteResponses.some(({ featureId: quoteFeatureId }) => quoteFeatureId === bridge_controller_1.FeatureId.BATCH_SELL)
-                ? (0, transaction_controller_1.generateBatchId)()
-                : undefined;
-            const preConfirmationProperties = (0, metrics_1.getPreConfirmationPropertiesFromQuote)(quoteResponse, isStxEnabled, accountHardwareType, location, abTests, activeAbTests, tokenSecurityTypeDestination, batchSellTrades, batchId);
+            const isBridgeTx = (0, bridge_controller_1.isCrossChain)(quote.srcChainId, quote.destChainId);
+            const preConfirmationProperties = (0, metrics_1.getPreConfirmationPropertiesFromQuote)(quoteResponse, isStxEnabled, accountHardwareType, location, abTests, activeAbTests, tokenSecurityTypeDestination, batchSellTrades);
             try {
                 // Emit Submitted event after submit button is clicked
-                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_2.UnifiedSwapBridgeEventName.Submitted, undefined, preConfirmationProperties);
+                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Submitted, undefined, preConfirmationProperties, featureId);
                 /**
                  * Check if the account is an EIP-7702 delegated account.
                  * Delegated accounts only allow 1 in-flight tx, so approve + swap
                  * must be batched into a single transaction
                  */
-                const isDelegatedAccount = (0, bridge_controller_2.isNonEvmChainId)(quote.srcChainId)
+                const isDelegatedAccount = (0, bridge_controller_1.isNonEvmChainId)(quote.srcChainId)
                     ? false
-                    : await (0, transaction_1.checkIsDelegatedAccount)(this.messenger, selectedAccount.address, [(0, bridge_controller_2.formatChainIdToHex)(quote.srcChainId)]);
+                    : await (0, transaction_1.checkIsDelegatedAccount)(this.messenger, selectedAccount.address, [(0, bridge_controller_1.formatChainIdToHex)(quote.srcChainId)]);
                 const strategyParams = {
                     messenger: this.messenger,
                     quoteResponses,
@@ -643,7 +657,6 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     addTransactionBatchFn: __classPrivateFieldGet(this, _BridgeStatusController_addTransactionBatchFn, "f"),
                     fetchFn: __classPrivateFieldGet(this, _BridgeStatusController_fetchFn, "f"),
                     traceFn: __classPrivateFieldGet(this, _BridgeStatusController_trace, "f"),
-                    batchId,
                 };
                 return await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, (0, trace_1.getTraceParams)(quoteResponse, isStxEnabled), async () => await __classPrivateFieldGet(this, _BridgeStatusController_executeSubmitStrategy, "f").call(this, strategyParams, {
                     startTime,
@@ -654,10 +667,10 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 }));
             }
             catch (error) {
-                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_2.UnifiedSwapBridgeEventName.Failed, undefined, {
+                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, undefined, {
                     error_message: error?.message,
                     ...preConfirmationProperties,
-                });
+                }, featureId);
                 throw error;
             }
         };
@@ -693,45 +706,43 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
         _BridgeStatusController_trackPollingStatusUpdatedEvent.set(this, (historyKey, pollingStatus) => {
             // Track polling status updated event
             const historyItem = this.state.txHistory[historyKey];
-            __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_2.UnifiedSwapBridgeEventName.PollingStatusUpdated, historyKey, {
-                polling_status: pollingStatus,
-                retry_attempts: historyItem.attempts?.counter ?? 0,
-            });
+            __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.PollingStatusUpdated, historyKey, (0, metrics_1.getPollingStatusUpdatedProperties)(this.messenger, pollingStatus, historyItem));
         });
         /**
          * Tracks post-submission events for a cross-chain swap based on the history item
          *
          * @param eventName - The name of the event to track
-         * @param txHistoryKey - The txMetaId of the history item to track the event for
+         * @param txMetaId - The txMetaId of the history item to track the event for
          * @param eventProperties - The properties for the event
+         * @param featureIdOverride - The featureId to use when the history item is not available. Should
+         * only be provided for events that are not associated with a history item yet, such as Submitted or Failed
          */
-        _BridgeStatusController_trackUnifiedSwapBridgeEvent.set(this, (eventName, txHistoryKey, eventProperties) => {
-            const historyItem = txHistoryKey
-                ? this.state.txHistory[txHistoryKey]
+        _BridgeStatusController_trackUnifiedSwapBridgeEvent.set(this, (eventName, txMetaId, eventProperties, featureIdOverride) => {
+            const historyItem = txMetaId
+                ? this.state.txHistory[txMetaId]
                 : undefined;
-            const featureId = eventProperties?.feature_id ??
-                historyItem?.featureId ??
-                bridge_controller_1.FeatureId.UNIFIED_SWAP_BRIDGE;
-            if (!(constants_1.ALLOWED_FEATURE_IDS_FOR_STATUS_EVENTS.includes(featureId) ||
-                eventName === bridge_controller_2.UnifiedSwapBridgeEventName.StatusValidationFailed)) {
+            const featureId = featureIdOverride ?? historyItem?.featureId;
+            const shouldSkipMetrics = 
+            // Skip tracking all other events when featureId is set (i.e. PERPS)
+            featureId &&
+                // Always publish StatusValidationFailed event, regardless of featureId
+                eventName !== bridge_controller_1.UnifiedSwapBridgeEventName.StatusValidationFailed;
+            if (shouldSkipMetrics) {
                 return;
             }
             // Legacy/new metrics fields are intentionally kept independent during migration.
-            const historyAbTests = txHistoryKey
-                ? this.state.txHistory?.[txHistoryKey]?.abTests
+            const historyAbTests = txMetaId
+                ? this.state.txHistory?.[txMetaId]?.abTests
                 : undefined;
-            const historyActiveAbTests = txHistoryKey
-                ? this.state.txHistory?.[txHistoryKey]?.activeAbTests
+            const historyActiveAbTests = txMetaId
+                ? this.state.txHistory?.[txMetaId]?.activeAbTests
                 : undefined;
             const resolvedAbTests = eventProperties?.ab_tests ?? historyAbTests;
             const resolvedActiveAbTests = eventProperties?.active_ab_tests ?? historyActiveAbTests;
-            const location = (txHistoryKey
-                ? this.state.txHistory?.[txHistoryKey]?.location
-                : undefined) ?? bridge_controller_2.MetaMetricsSwapsEventSource.MainView;
+            const location = (txMetaId ? this.state.txHistory?.[txMetaId]?.location : undefined) ??
+                bridge_controller_1.MetaMetricsSwapsEventSource.MainView;
             const baseProperties = {
-                action_type: bridge_controller_2.MetricsActionType.SWAPBRIDGE_V1,
-                feature_id: featureId ?? bridge_controller_1.FeatureId.UNIFIED_SWAP_BRIDGE,
-                ...(historyItem?.batchId ? { batch_id: historyItem.batchId } : {}),
+                action_type: bridge_controller_1.MetricsActionType.SWAPBRIDGE_V1,
                 ...(eventProperties ?? {}),
                 location,
                 ...(resolvedAbTests &&
@@ -754,7 +765,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             }
             const { approvalTxId, quote } = historyItem;
             const requestParamProperties = (0, metrics_1.getRequestParamFromHistory)(historyItem);
-            if (eventName === bridge_controller_2.UnifiedSwapBridgeEventName.StatusValidationFailed) {
+            if (eventName === bridge_controller_1.UnifiedSwapBridgeEventName.StatusValidationFailed) {
                 (0, bridge_1.trackMetricsEvent)({
                     messenger: this.messenger,
                     eventName,
@@ -772,7 +783,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             }
             const selectedAccount = (0, accounts_1.getAccountByAddress)(this.messenger, historyItem.account);
             const transactions = (0, transaction_1.getTransactions)(this.messenger);
-            const txMeta = transactions.find((tx) => tx.id === txHistoryKey);
+            const txMeta = transactions.find((tx) => tx.id === txMetaId);
             const approvalTxMeta = transactions.find((tx) => tx.id === approvalTxId);
             const requiredEventProperties = {
                 ...baseProperties,