@metamask-previews/bridge-status-controller 66.0.2-preview-e8f4442d4 → 66.0.2-preview-d7935cb09

package/CHANGELOG.md

@@ -7,16 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Added
-
-- Added `location` property to `BridgeHistoryItem` to persist the entry point across the transaction lifecycle ([#7931](https://github.com/MetaMask/core/pull/7931))
-- Added `location` parameter to `StartPollingForBridgeTxStatusArgs` ([#7931](https://github.com/MetaMask/core/pull/7931))
-- Added optional `location` parameter to `submitTx` method ([#7931](https://github.com/MetaMask/core/pull/7931))
-
-### Changed
-
-- All post-submission events (`Submitted`, `Completed`, `Failed`, `PollingStatusUpdated`, `StatusValidationFailed`) now include the `location` property from `BridgeHistoryItem` ([#7931](https://github.com/MetaMask/core/pull/7931))
-
 ### Fixed
 
 - Fix `usd_amount_source` default value in EVM transaction metrics properties from `100` to `0` ([#7899](https://github.com/MetaMask/core/pull/7899))

package/dist/bridge-status-controller.cjs

@@ -159,7 +159,6 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                             action_type: bridge_controller_1.MetricsActionType.SWAPBRIDGE_V1,
                             polling_status: bridge_controller_1.PollingStatus.ManuallyRestarted,
                             retry_attempts: previousAttempts,
-                            location: historyItem.location ?? bridge_controller_1.MetaMetricsSwapsEventSource.MainView,
                         });
                     }
                 }
@@ -208,7 +207,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             });
         });
         _BridgeStatusController_addTxToHistory.set(this, (startPollingForBridgeTxStatusArgs, actionId) => {
-            const { bridgeTxMeta, statusRequest, quoteResponse, startTime, slippagePercentage, initialDestAssetBalance, targetContractAddress, approvalTxId, isStxEnabled, location, accountAddress: selectedAddress, } = startPollingForBridgeTxStatusArgs;
+            const { bridgeTxMeta, statusRequest, quoteResponse, startTime, slippagePercentage, initialDestAssetBalance, targetContractAddress, approvalTxId, isStxEnabled, accountAddress: selectedAddress, } = startPollingForBridgeTxStatusArgs;
             // Determine the key for this history item:
             // - For pre-submission (non-batch EVM): use actionId
             // - For post-submission or other cases: use bridgeTxMeta.id
@@ -248,7 +247,6 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 approvalTxId,
                 isStxEnabled: isStxEnabled ?? false,
                 featureId: quoteResponse.featureId,
-                location,
             };
             this.update((state) => {
                 // Use actionId as key for pre-submission, or txMeta.id for post-submission
@@ -357,7 +355,6 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                         action_type: bridge_controller_1.MetricsActionType.SWAPBRIDGE_V1,
                         polling_status: bridge_controller_1.PollingStatus.MaxPollingReached,
                         retry_attempts: newAttempts.counter,
-                        location: historyItem.location ?? bridge_controller_1.MetaMetricsSwapsEventSource.MainView,
                     });
                 }
             }
@@ -409,7 +406,6 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 if (validationFailures.length > 0) {
                     __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.StatusValidationFailed, bridgeTxMetaId, {
                         failures: validationFailures,
-                        location: historyItem.location ?? bridge_controller_1.MetaMetricsSwapsEventSource.MainView,
                     });
                     throw new Error(`Bridge status validation failed: ${validationFailures.join(', ')}`);
                 }
@@ -705,10 +701,9 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
          * @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 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)
          * @returns The transaction meta
          */
-        this.submitTx = async (accountAddress, quoteResponse, isStxEnabledOnClient, quotesReceivedContext, location) => {
+        this.submitTx = async (accountAddress, quoteResponse, isStxEnabledOnClient, quotesReceivedContext) => {
             this.messenger.call('BridgeController:stopPollingForQuotes', bridge_controller_1.AbortReason.TransactionSubmitted, 
             // If trade is submitted before all quotes are loaded, the QuotesReceived event is published
             // If the trade has a featureId, it means it was submitted outside of the Unified Swap and Bridge experience, so no QuotesReceived event is published
@@ -721,10 +716,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             const preConfirmationProperties = (0, metrics_1.getPreConfirmationPropertiesFromQuote)(quoteResponse, isStxEnabledOnClient, isHardwareAccount);
             // Emit Submitted event after submit button is clicked
             !quoteResponse.featureId &&
-                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Submitted, undefined, {
-                    ...preConfirmationProperties,
-                    location: location ?? bridge_controller_1.MetaMetricsSwapsEventSource.MainView,
-                });
+                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Submitted, undefined, preConfirmationProperties);
             let txMeta;
             let approvalTxId;
             const startTime = Date.now();
@@ -754,7 +746,6 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                                 __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, undefined, {
                                     error_message: error?.message,
                                     ...preConfirmationProperties,
-                                    location: location ?? bridge_controller_1.MetaMetricsSwapsEventSource.MainView,
                                 });
                             throw error;
                         }
@@ -785,7 +776,6 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                             __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, txMeta?.id, {
                                 error_message: error?.message,
                                 ...preConfirmationProperties,
-                                location: location ?? bridge_controller_1.MetaMetricsSwapsEventSource.MainView,
                             });
                         throw error;
                     }
@@ -844,7 +834,6 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                         isStxEnabled: isStxEnabledOnClient,
                         startTime,
                         approvalTxId,
-                        location,
                     }, actionId);
                     // Pass txFee when gasIncluded is true to use the quote's gas fees
                     // instead of re-estimating (which would fail for max native token swaps)
@@ -884,7 +873,6 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                         isStxEnabled: isStxEnabledOnClient,
                         startTime,
                         approvalTxId,
-                        location,
                     });
                 }
                 if ((0, bridge_controller_1.isNonEvmChainId)(quoteResponse.quote.srcChainId)) {
@@ -909,11 +897,10 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
          * @param params.quoteResponse - Quote carrying intent data
          * @param params.signature - Hex signature produced by eth_signTypedData_v4
          * @param params.accountAddress - The EOA submitting the order
-         * @param params.location - The entry point from which the user initiated the swap or bridge
          * @returns A lightweight TransactionMeta-like object for history linking
          */
         this.submitIntent = async (params) => {
-            const { quoteResponse, signature, accountAddress, location } = params;
+            const { quoteResponse, signature, accountAddress } = params;
             this.messenger.call('BridgeController:stopPollingForQuotes', bridge_controller_1.AbortReason.TransactionSubmitted);
             // Build pre-confirmation properties for error tracking parity with submitTx
             const account = __classPrivateFieldGet(this, _BridgeStatusController_instances, "m", _BridgeStatusController_getMultichainSelectedAccount).call(this, accountAddress);
@@ -1013,7 +1000,6 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                         isStxEnabled: false,
                         approvalTxId,
                         startTime,
-                        location,
                     });
                     // Start polling using the orderId key to route to intent manager
                     __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, bridgeHistoryKey);
@@ -1028,7 +1014,6 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, undefined, {
                     error_message: error?.message,
                     ...preConfirmationProperties,
-                    location: location ?? bridge_controller_1.MetaMetricsSwapsEventSource.MainView,
                 });
                 throw error;
             }
@@ -1045,32 +1030,26 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 action_type: bridge_controller_1.MetricsActionType.SWAPBRIDGE_V1,
                 ...(eventProperties ?? {}),
             };
-            // The messenger.call for trackUnifiedSwapBridgeEvent is generic but TypeScript
-            // can't narrow EventName within this method's body, so we use `any` for the
-            // properties argument. The real type safety comes from the external call sites.
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const callTrack = (properties) => this.messenger.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, properties);
             // This will publish events for PERPS dropped tx failures as well
             if (!txMetaId) {
-                callTrack(baseProperties);
+                this.messenger.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, baseProperties);
                 return;
             }
             const historyItem = this.state.txHistory[txMetaId];
             if (!historyItem) {
-                callTrack(eventProperties ?? {});
+                this.messenger.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, eventProperties ?? {});
                 return;
             }
             const requestParamProperties = (0, metrics_1.getRequestParamFromHistory)(historyItem);
             // Always publish StatusValidationFailed event, regardless of featureId
             if (eventName === bridge_controller_1.UnifiedSwapBridgeEventName.StatusValidationFailed) {
-                callTrack({
+                this.messenger.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, {
                     ...baseProperties,
                     chain_id_source: requestParamProperties.chain_id_source,
                     chain_id_destination: requestParamProperties.chain_id_destination,
                     token_address_source: requestParamProperties.token_address_source,
                     token_address_destination: requestParamProperties.token_address_destination,
                     refresh_count: historyItem.attempts?.counter ?? 0,
-                    location: historyItem.location ?? bridge_controller_1.MetaMetricsSwapsEventSource.MainView,
                 });
                 return;
             }
@@ -1090,9 +1069,8 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 ...(0, metrics_1.getTxStatusesFromHistory)(historyItem),
                 ...(0, metrics_1.getFinalizedTxProperties)(historyItem, txMeta, approvalTxMeta),
                 ...(0, metrics_1.getPriceImpactFromQuote)(historyItem.quote),
-                location: historyItem.location ?? bridge_controller_1.MetaMetricsSwapsEventSource.MainView,
             };
-            callTrack(requiredEventProperties);
+            this.messenger.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, requiredEventProperties);
         });
         __classPrivateFieldSet(this, _BridgeStatusController_clientId, clientId, "f");
         __classPrivateFieldSet(this, _BridgeStatusController_fetchFn, fetchFn, "f");
@@ -1144,11 +1122,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     else if (actionId && this.state.txHistory[actionId]) {
                         historyKey = actionId;
                     }
-                    const historyLocation = this.state.txHistory[historyKey ?? txMetaId]?.location;
-                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, historyKey ?? txMetaId, {
-                        ...(0, metrics_1.getEVMTxPropertiesFromTransactionMeta)(transactionMeta),
-                        location: historyLocation ?? bridge_controller_1.MetaMetricsSwapsEventSource.MainView,
-                    });
+                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, historyKey ?? txMetaId, (0, metrics_1.getEVMTxPropertiesFromTransactionMeta)(transactionMeta));
                 }
             }
         });