@metamask-previews/bridge-controller 71.1.1-preview-9e2a7fac5 → 71.1.1-preview-2b316ced3

package/CHANGELOG.md

@@ -7,16 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Added
-
-- **BREAKING:** Add support for BatchSell quotes ([#8711](https://github.com/MetaMask/core/pull/8711))
-  - change `quoteRequest`'s type from `QuoteRequest` to `QuoteRequest[]`
-  - allow callers to update specific quote requests within a batch by adding 2 optional parameters to `updateBridgeQuoteRequest`: quoteRequestIndex and quoteRequestCount
-  - export `isValidBatchSellQuoteRequest` request validator
-  - fetch multiple swap quotes through a single SSE stream and append `quoteRequestIndex` to link each one to its originating quoteRequest
-  - implement `selectBatchSellQuotes` selector which returns the recommended quote for each batched quote, and their aggregated fees and received amounts
-  - trace BatchSell quote fetch operations in Sentry using label `Batch Sell Quotes Fetched`
-
 ### Changed
 
 - Bump `@metamask/gas-fee-controller` from `^26.1.1` to `^26.2.0` ([#8722](https://github.com/MetaMask/core/pull/8722))

package/dist/bridge-controller.cjs

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _BridgeController_instances, _BridgeController_abortController, _BridgeController_quotesFirstFetched, _BridgeController_location, _BridgeController_clientId, _BridgeController_clientVersion, _BridgeController_getLayer1GasFee, _BridgeController_fetchFn, _BridgeController_trackMetaMetricsFn, _BridgeController_trace, _BridgeController_config, _BridgeController_getUseAssetsControllerForRates, _BridgeController_trackQuoteValidationFailures, _BridgeController_getExchangeRateSources, _BridgeController_fetchAssetExchangeRates, _BridgeController_hasInsufficientBalance, _BridgeController_appendInsufficientBalAndResetApproval, _BridgeController_shouldResetApproval, _BridgeController_fetchBridgeQuotes, _BridgeController_handleQuoteStreaming, _BridgeController_setMinimumBalanceForRentExemptionInLamports, _BridgeController_getMultichainSelectedAccount, _BridgeController_getNetworkClientByChainId, _BridgeController_getJwt, _BridgeController_getRequestMetadata, _BridgeController_getQuoteFetchData, _BridgeController_getEventProperties, _BridgeController_trackInputChangedEvents, _BridgeController_getUSDTMainnetAllowance;
+var _BridgeController_instances, _BridgeController_abortController, _BridgeController_quotesFirstFetched, _BridgeController_location, _BridgeController_clientId, _BridgeController_clientVersion, _BridgeController_getLayer1GasFee, _BridgeController_fetchFn, _BridgeController_trackMetaMetricsFn, _BridgeController_trace, _BridgeController_config, _BridgeController_getUseAssetsControllerForRates, _BridgeController_trackQuoteValidationFailures, _BridgeController_getExchangeRateSources, _BridgeController_fetchAssetExchangeRates, _BridgeController_hasInsufficientBalance, _BridgeController_shouldResetApproval, _BridgeController_fetchBridgeQuotes, _BridgeController_handleQuoteStreaming, _BridgeController_setMinimumBalanceForRentExemptionInLamports, _BridgeController_getMultichainSelectedAccount, _BridgeController_getNetworkClientByChainId, _BridgeController_getJwt, _BridgeController_getRequestMetadata, _BridgeController_getQuoteFetchData, _BridgeController_getEventProperties, _BridgeController_trackInputChangedEvents, _BridgeController_getUSDTMainnetAllowance;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BridgeController = void 0;
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
@@ -156,48 +156,54 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
         this._executePoll = async (pollingInput) => {
             await __classPrivateFieldGet(this, _BridgeController_fetchBridgeQuotes, "f").call(this, pollingInput);
         };
-        /**
-         * Updates the quote request at the specified index with the given parameters, then starts
-         * polling for quotes.
-         *
-         * @param paramsToUpdate - The parameters to update in the quote request at the specified index
-         * @param context - metrics context
-         * @param quoteRequestIndex - The index of the quote request to update
-         * @param quoteRequestCount - The number of quote requests in the UI
-         */
-        this.updateBridgeQuoteRequestParams = async (paramsToUpdate, context, quoteRequestIndex = 0, quoteRequestCount = 1) => {
-            // Guard against updating a quote request that doesn't exist
-            if (quoteRequestIndex >= quoteRequestCount) {
-                return;
-            }
-            __classPrivateFieldGet(this, _BridgeController_trackInputChangedEvents, "f").call(this, paramsToUpdate, quoteRequestIndex);
-            this.resetState(constants_1.AbortReason.QuoteRequestUpdated, quoteRequestIndex);
+        this.updateBridgeQuoteRequestParams = async (paramsToUpdate, context) => {
+            __classPrivateFieldGet(this, _BridgeController_trackInputChangedEvents, "f").call(this, paramsToUpdate);
+            this.resetState(constants_1.AbortReason.QuoteRequestUpdated);
+            const updatedQuoteRequest = {
+                ...bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quoteRequest,
+                ...paramsToUpdate,
+            };
             this.update((state) => {
-                // Update only the specified quote request and keep the rest of the quote requests unchanged
-                state.quoteRequest = state.quoteRequest
-                    .slice(0, quoteRequestIndex)
-                    .concat({
-                    ...bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quoteRequest[0],
-                    ...paramsToUpdate,
-                })
-                    .concat(state.quoteRequest.slice(quoteRequestIndex + 1, quoteRequestCount));
+                state.quoteRequest = updatedQuoteRequest;
                 state.tokenSecurityTypeDestination =
                     context.token_security_type_destination ?? null;
             });
-            // BatchSell and Unified swaps both use the same polling logic so both validations should pass
-            if ((0, quote_1.isValidQuoteRequest)(paramsToUpdate) &&
-                (0, quote_1.isValidBatchSellQuoteRequest)(this.state.quoteRequest)) {
+            if ((0, quote_1.isValidQuoteRequest)(updatedQuoteRequest)) {
                 __classPrivateFieldSet(this, _BridgeController_quotesFirstFetched, Date.now(), "f");
-                // Update the insufficientBal and resetApproval params for the quote request
-                const quoteWithInsufficientBalAndResetApproval = await __classPrivateFieldGet(this, _BridgeController_appendInsufficientBalAndResetApproval, "f").call(this, paramsToUpdate);
-                this.update((state) => {
-                    state.quoteRequest[quoteRequestIndex] =
-                        quoteWithInsufficientBalAndResetApproval;
-                });
+                const isSrcChainNonEVM = (0, bridge_2.isNonEvmChainId)(updatedQuoteRequest.srcChainId);
+                const providerConfig = isSrcChainNonEVM
+                    ? undefined
+                    : __classPrivateFieldGet(this, _BridgeController_instances, "m", _BridgeController_getNetworkClientByChainId).call(this, (0, caip_formatters_1.formatChainIdToHex)(updatedQuoteRequest.srcChainId))?.configuration;
+                let insufficientBal;
+                let resetApproval = Boolean(paramsToUpdate.resetApproval);
+                if (isSrcChainNonEVM) {
+                    // If the source chain is not an EVM network, use value from params
+                    insufficientBal = paramsToUpdate.insufficientBal;
+                }
+                else if (providerConfig?.rpcUrl?.includes('tenderly')) {
+                    // If the rpcUrl is a tenderly fork (e2e tests), set insufficientBal=true
+                    // The bridge-api filters out quotes if the balance on mainnet is insufficient so this override allows quotes to always be returned
+                    insufficientBal = true;
+                }
+                else {
+                    // Set loading status if RPC calls are made before the quotes are fetched
+                    this.update((state) => {
+                        state.quotesLoadingStatus = types_1.RequestStatus.LOADING;
+                    });
+                    resetApproval = await __classPrivateFieldGet(this, _BridgeController_shouldResetApproval, "f").call(this, updatedQuoteRequest);
+                    // Otherwise query the src token balance from the RPC provider
+                    insufficientBal =
+                        paramsToUpdate.insufficientBal ??
+                            (await __classPrivateFieldGet(this, _BridgeController_hasInsufficientBalance, "f").call(this, updatedQuoteRequest));
+                }
                 // Set refresh rate based on the source chain before starting polling
                 this.setChainIntervalLength();
                 this.startPolling({
-                    quoteRequests: this.state.quoteRequest,
+                    updatedQuoteRequest: {
+                        ...updatedQuoteRequest,
+                        insufficientBal,
+                        resetApproval,
+                    },
                     context,
                 });
             }
@@ -255,21 +261,25 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
          * Fetches the exchange rates for the assets in the quote request if they are not already in the state
          * In addition to the selected tokens, this also fetches the native asset for the source and destination chains
          *
-         * @param quoteRequests - The quote requests to fetch the exchange rates for
+         * @param quoteRequest - The quote request
+         * @param quoteRequest.srcChainId - The source chain ID
+         * @param quoteRequest.srcTokenAddress - The source token address
+         * @param quoteRequest.destChainId - The destination chain ID
+         * @param quoteRequest.destTokenAddress - The destination token address
          */
-        _BridgeController_fetchAssetExchangeRates.set(this, async (quoteRequests) => {
+        _BridgeController_fetchAssetExchangeRates.set(this, async ({ srcChainId, srcTokenAddress, destChainId, destTokenAddress, }) => {
+            const assetIds = new Set([]);
             const exchangeRateSources = __classPrivateFieldGet(this, _BridgeController_getExchangeRateSources, "f").call(this);
-            // Get unique assetIds for all quote requests
-            const assetIds = new Set(quoteRequests
-                .flatMap((quoteRequest) => [
-                quoteRequest.srcTokenAddress && quoteRequest.srcChainId
-                    ? (0, assets_1.getAssetIdsForToken)(quoteRequest.srcTokenAddress, quoteRequest.srcChainId)
-                    : undefined,
-                quoteRequest.destTokenAddress && quoteRequest.destChainId
-                    ? (0, assets_1.getAssetIdsForToken)(quoteRequest.destTokenAddress, quoteRequest.destChainId)
-                    : undefined,
-            ].flat())
-                .filter((assetId) => !(0, selectors_1.selectIsAssetExchangeRateInState)(exchangeRateSources, assetId)));
+            if (srcTokenAddress &&
+                srcChainId &&
+                !(0, selectors_1.selectIsAssetExchangeRateInState)(exchangeRateSources, srcChainId, srcTokenAddress)) {
+                (0, assets_1.getAssetIdsForToken)(srcTokenAddress, srcChainId).forEach((assetId) => assetIds.add(assetId));
+            }
+            if (destTokenAddress &&
+                destChainId &&
+                !(0, selectors_1.selectIsAssetExchangeRateInState)(exchangeRateSources, destChainId, destTokenAddress)) {
+                (0, assets_1.getAssetIdsForToken)(destTokenAddress, destChainId).forEach((assetId) => assetIds.add(assetId));
+            }
             const currency = __classPrivateFieldGet(this, _BridgeController_getUseAssetsControllerForRates, "f").call(this)
                 ? this.messenger.call('AssetsController:getExchangeRatesForBridge')
                     .currentCurrency
@@ -310,39 +320,6 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
                 return true;
             }
         });
-        _BridgeController_appendInsufficientBalAndResetApproval.set(this, async (quoteRequest) => {
-            const isSrcChainNonEVM = (0, bridge_2.isNonEvmChainId)(quoteRequest.srcChainId);
-            const providerConfig = isSrcChainNonEVM
-                ? undefined
-                : __classPrivateFieldGet(this, _BridgeController_instances, "m", _BridgeController_getNetworkClientByChainId).call(this, (0, caip_formatters_1.formatChainIdToHex)(quoteRequest.srcChainId))?.configuration;
-            let insufficientBal;
-            let resetApproval = Boolean(quoteRequest.resetApproval);
-            if (isSrcChainNonEVM) {
-                // If the source chain is not an EVM network, use value from params
-                insufficientBal = quoteRequest.insufficientBal;
-            }
-            else if (providerConfig?.rpcUrl?.includes('tenderly')) {
-                // If the rpcUrl is a tenderly fork (e2e tests), set insufficientBal=true
-                // The bridge-api filters out quotes if the balance on mainnet is insufficient so this override allows quotes to always be returned
-                insufficientBal = true;
-            }
-            else {
-                // Set loading status if RPC calls are made before the quotes are fetched
-                this.update((state) => {
-                    state.quotesLoadingStatus = types_1.RequestStatus.LOADING;
-                });
-                resetApproval = await __classPrivateFieldGet(this, _BridgeController_shouldResetApproval, "f").call(this, quoteRequest);
-                // Otherwise query the src token balance from the RPC provider
-                insufficientBal =
-                    quoteRequest.insufficientBal ??
-                        (await __classPrivateFieldGet(this, _BridgeController_hasInsufficientBalance, "f").call(this, quoteRequest));
-            }
-            return {
-                ...quoteRequest,
-                insufficientBal,
-                resetApproval,
-            };
-        });
         _BridgeController_shouldResetApproval.set(this, async (quoteRequest) => {
             if ((0, bridge_2.isNonEvmChainId)(quoteRequest.srcChainId)) {
                 return false;
@@ -380,21 +357,11 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
         this.setLocation = (location) => {
             __classPrivateFieldSet(this, _BridgeController_location, location, "f");
         };
-        this.resetState = (reason = constants_1.AbortReason.ResetState, quoteRequestIndex = null) => {
+        this.resetState = (reason = constants_1.AbortReason.ResetState) => {
             this.stopPollingForQuotes(reason);
             this.update((state) => {
                 // Cannot do direct assignment to state, i.e. state = {... }, need to manually assign each field
-                if (quoteRequestIndex === null) {
-                    // Clear all requests if index is null
-                    state.quoteRequest = bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quoteRequest;
-                }
-                else {
-                    // Otherwise only clear the specified request
-                    state.quoteRequest = state.quoteRequest
-                        .slice(0, quoteRequestIndex)
-                        .concat(bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quoteRequest[0])
-                        .concat(state.quoteRequest.slice(quoteRequestIndex + 1));
-                }
+                state.quoteRequest = bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quoteRequest;
                 state.quotesInitialLoadTime =
                     bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quotesInitialLoadTime;
                 state.quotes = bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quotes;
@@ -421,9 +388,7 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
          */
         this.setChainIntervalLength = () => {
             const { state } = this;
-            // Assume that BatchSell quote requests all have the same source chain
-            // Use the first one to determine refresh rate
-            const { srcChainId } = state.quoteRequest[0];
+            const { srcChainId } = state.quoteRequest;
             const bridgeFeatureFlags = (0, feature_flags_1.getBridgeFeatureFlags)(this.messenger);
             const refreshRateOverride = srcChainId
                 ? bridgeFeatureFlags.chains[(0, caip_formatters_1.formatChainIdToCaip)(srcChainId)]?.refreshRate
@@ -431,16 +396,16 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
             const defaultRefreshRate = bridgeFeatureFlags.refreshRate;
             this.setIntervalLength(refreshRateOverride ?? defaultRefreshRate);
         };
-        _BridgeController_fetchBridgeQuotes.set(this, async ({ quoteRequests, context, }) => {
+        _BridgeController_fetchBridgeQuotes.set(this, async ({ updatedQuoteRequest, context, }) => {
             __classPrivateFieldGet(this, _BridgeController_abortController, "f")?.abort(constants_1.AbortReason.NewQuoteRequest);
             __classPrivateFieldSet(this, _BridgeController_abortController, new AbortController(), "f");
-            __classPrivateFieldGet(this, _BridgeController_fetchAssetExchangeRates, "f").call(this, quoteRequests).catch((error) => console.warn('Failed to fetch asset exchange rates', error));
+            __classPrivateFieldGet(this, _BridgeController_fetchAssetExchangeRates, "f").call(this, updatedQuoteRequest).catch((error) => console.warn('Failed to fetch asset exchange rates', error));
             this.trackUnifiedSwapBridgeEvent(constants_1.UnifiedSwapBridgeEventName.QuotesRequested, context);
             const { sse, maxRefreshCount } = (0, feature_flags_1.getBridgeFeatureFlags)(this.messenger);
             const shouldStream = sse?.enabled &&
                 (0, feature_flags_1.hasMinimumRequiredVersion)(__classPrivateFieldGet(this, _BridgeController_clientVersion, "f"), sse.minimumVersion);
-            const isBatchSellRequest = quoteRequests.length > 1;
             this.update((state) => {
+                state.quoteRequest = updatedQuoteRequest;
                 state.quoteFetchError = bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quoteFetchError;
                 state.tokenWarnings = bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.tokenWarnings;
                 state.quoteStreamComplete =
@@ -450,30 +415,26 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
             });
             const jwt = await __classPrivateFieldGet(this, _BridgeController_getJwt, "f").call(this);
             try {
-                const [firstQuoteRequest] = quoteRequests;
-                const unifiedSwapTraceName = (0, bridge_2.isCrossChain)(firstQuoteRequest.srcChainId, firstQuoteRequest.destChainId)
-                    ? traces_1.TraceName.BridgeQuotesFetched
-                    : traces_1.TraceName.SwapQuotesFetched;
                 await __classPrivateFieldGet(this, _BridgeController_trace, "f").call(this, {
-                    name: isBatchSellRequest
-                        ? traces_1.TraceName.BatchSellQuotesFetched
-                        : unifiedSwapTraceName,
+                    name: (0, bridge_2.isCrossChain)(updatedQuoteRequest.srcChainId, updatedQuoteRequest.destChainId)
+                        ? traces_1.TraceName.BridgeQuotesFetched
+                        : traces_1.TraceName.SwapQuotesFetched,
                     data: {
-                        srcChainId: (0, caip_formatters_1.formatChainIdToCaip)(firstQuoteRequest.srcChainId),
-                        destChainId: (0, caip_formatters_1.formatChainIdToCaip)(firstQuoteRequest.destChainId),
+                        srcChainId: (0, caip_formatters_1.formatChainIdToCaip)(updatedQuoteRequest.srcChainId),
+                        destChainId: (0, caip_formatters_1.formatChainIdToCaip)(updatedQuoteRequest.destChainId),
                     },
                 }, async () => {
-                    const selectedAccount = __classPrivateFieldGet(this, _BridgeController_instances, "m", _BridgeController_getMultichainSelectedAccount).call(this, firstQuoteRequest.walletAddress);
+                    const selectedAccount = __classPrivateFieldGet(this, _BridgeController_instances, "m", _BridgeController_getMultichainSelectedAccount).call(this, updatedQuoteRequest.walletAddress);
                     // This call is not awaited to prevent blocking quote fetching if the snap takes too long to respond
                     // eslint-disable-next-line @typescript-eslint/no-floating-promises
-                    __classPrivateFieldGet(this, _BridgeController_setMinimumBalanceForRentExemptionInLamports, "f").call(this, firstQuoteRequest.srcChainId, selectedAccount?.metadata?.snap?.id);
+                    __classPrivateFieldGet(this, _BridgeController_setMinimumBalanceForRentExemptionInLamports, "f").call(this, updatedQuoteRequest.srcChainId, selectedAccount?.metadata?.snap?.id);
                     // Use SSE if enabled and return early
-                    if (shouldStream || isBatchSellRequest) {
-                        await __classPrivateFieldGet(this, _BridgeController_handleQuoteStreaming, "f").call(this, quoteRequests, jwt, selectedAccount);
+                    if (shouldStream) {
+                        await __classPrivateFieldGet(this, _BridgeController_handleQuoteStreaming, "f").call(this, updatedQuoteRequest, jwt, selectedAccount);
                         return;
                     }
                     // Otherwise use regular fetch
-                    const quotes = await this.fetchQuotes(firstQuoteRequest, __classPrivateFieldGet(this, _BridgeController_abortController, "f")?.signal);
+                    const quotes = await this.fetchQuotes(updatedQuoteRequest, __classPrivateFieldGet(this, _BridgeController_abortController, "f")?.signal);
                     this.update((state) => {
                         // Set the initial load time if this is the first fetch
                         if (state.quotesRefreshCount ===
@@ -529,17 +490,14 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
             this.update((state) => {
                 state.quotesRefreshCount += 1;
             });
-            const hasNoFundedQuoteRequests = quoteRequests.every(({ insufficientBal }) => Boolean(insufficientBal));
-            if (hasNoFundedQuoteRequests
-                ? // If all quote requests are insufficiently funded, stop polling
-                    // So if a BatchSell has at least 1 sufficiently funded quote request, polling continues
-                    true
-                : // Otherwise continue polling until the maximum number of refreshes has been reached
-                    this.state.quotesRefreshCount >= maxRefreshCount) {
+            // Stop polling if the maximum number of refreshes has been reached
+            if (updatedQuoteRequest.insufficientBal ||
+                (!updatedQuoteRequest.insufficientBal &&
+                    this.state.quotesRefreshCount >= maxRefreshCount)) {
                 this.stopAllPolling();
             }
         });
-        _BridgeController_handleQuoteStreaming.set(this, async (quoteRequests, jwt, selectedAccount) => {
+        _BridgeController_handleQuoteStreaming.set(this, async (updatedQuoteRequest, jwt, selectedAccount) => {
             /**
              * Tracks the number of valid quotes received from the current stream, which is used
              * to determine when to clear the quotes list and set the initial load time
@@ -550,7 +508,7 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
              * before setting quotesLoadingStatus to FETCHED
              */
             const pendingFeeAppendPromises = new Set();
-            await (0, fetch_1.fetchBridgeQuoteStream)(__classPrivateFieldGet(this, _BridgeController_fetchFn, "f"), quoteRequests, __classPrivateFieldGet(this, _BridgeController_abortController, "f")?.signal, __classPrivateFieldGet(this, _BridgeController_clientId, "f"), jwt, __classPrivateFieldGet(this, _BridgeController_config, "f").customBridgeApiBaseUrl ?? bridge_1.BRIDGE_PROD_API_BASE_URL, {
+            await (0, fetch_1.fetchBridgeQuoteStream)(__classPrivateFieldGet(this, _BridgeController_fetchFn, "f"), updatedQuoteRequest, __classPrivateFieldGet(this, _BridgeController_abortController, "f")?.signal, __classPrivateFieldGet(this, _BridgeController_clientId, "f"), jwt, __classPrivateFieldGet(this, _BridgeController_config, "f").customBridgeApiBaseUrl ?? bridge_1.BRIDGE_PROD_API_BASE_URL, {
                 onQuoteValidationFailure: __classPrivateFieldGet(this, _BridgeController_trackQuoteValidationFailures, "f"),
                 onValidQuoteReceived: async (quote) => {
                     const feeAppendPromise = (async () => {
@@ -637,16 +595,15 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
                 return undefined;
             }
         });
-        _BridgeController_getRequestMetadata.set(this, (quoteRequestIndex = 0) => {
-            const quoteRequest = this.state.quoteRequest[quoteRequestIndex];
-            const { walletAddress } = quoteRequest;
+        _BridgeController_getRequestMetadata.set(this, () => {
+            const { walletAddress } = this.state.quoteRequest;
             const accountHardwareType = (0, properties_1.getAccountHardwareType)(walletAddress
                 ? __classPrivateFieldGet(this, _BridgeController_instances, "m", _BridgeController_getMultichainSelectedAccount).call(this, walletAddress)
                 : undefined);
             return {
-                slippage_limit: quoteRequest.slippage,
-                swap_type: (0, properties_1.getSwapTypeFromQuote)(quoteRequest),
-                custom_slippage: (0, properties_1.isCustomSlippage)(quoteRequest.slippage),
+                slippage_limit: this.state.quoteRequest.slippage,
+                swap_type: (0, properties_1.getSwapTypeFromQuote)(this.state.quoteRequest),
+                custom_slippage: (0, properties_1.isCustomSlippage)(this.state.quoteRequest.slippage),
                 account_hardware_type: accountHardwareType,
                 is_hardware_wallet: accountHardwareType !== null,
             };
@@ -659,35 +616,34 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
                 has_gas_included_quote: this.state.quotes.some(({ quote }) => quote.gasIncluded),
             };
         });
-        _BridgeController_getEventProperties.set(this, (eventName, propertiesFromClient, quoteRequestIndex = 0) => {
+        _BridgeController_getEventProperties.set(this, (eventName, propertiesFromClient) => {
             const clientProps = propertiesFromClient;
             const baseProperties = {
                 ...propertiesFromClient,
                 location: clientProps?.location ?? __classPrivateFieldGet(this, _BridgeController_location, "f"),
                 action_type: constants_1.MetricsActionType.SWAPBRIDGE_V1,
             };
-            const quoteRequest = this.state.quoteRequest[quoteRequestIndex];
             switch (eventName) {
                 case constants_1.UnifiedSwapBridgeEventName.ButtonClicked:
                     return {
-                        ...(0, properties_1.getRequestParams)(quoteRequest, this.state.tokenSecurityTypeDestination),
+                        ...(0, properties_1.getRequestParams)(this.state.quoteRequest, this.state.tokenSecurityTypeDestination),
                         ...baseProperties,
                     };
                 case constants_1.UnifiedSwapBridgeEventName.PageViewed:
                     return {
-                        ...(0, properties_1.getRequestParams)(quoteRequest, this.state.tokenSecurityTypeDestination),
+                        ...(0, properties_1.getRequestParams)(this.state.quoteRequest, this.state.tokenSecurityTypeDestination),
                         ...__classPrivateFieldGet(this, _BridgeController_getRequestMetadata, "f").call(this),
                         ...baseProperties,
                     };
                 case constants_1.UnifiedSwapBridgeEventName.QuotesValidationFailed:
                     return {
-                        ...(0, properties_1.getRequestParams)(quoteRequest, this.state.tokenSecurityTypeDestination),
+                        ...(0, properties_1.getRequestParams)(this.state.quoteRequest, this.state.tokenSecurityTypeDestination),
                         refresh_count: this.state.quotesRefreshCount,
                         ...baseProperties,
                     };
                 case constants_1.UnifiedSwapBridgeEventName.QuotesReceived:
                     return {
-                        ...(0, properties_1.getRequestParams)(quoteRequest, this.state.tokenSecurityTypeDestination),
+                        ...(0, properties_1.getRequestParams)(this.state.quoteRequest, this.state.tokenSecurityTypeDestination),
                         ...__classPrivateFieldGet(this, _BridgeController_getRequestMetadata, "f").call(this),
                         ...__classPrivateFieldGet(this, _BridgeController_getQuoteFetchData, "f").call(this),
                         refresh_count: this.state.quotesRefreshCount,
@@ -695,24 +651,24 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
                     };
                 case constants_1.UnifiedSwapBridgeEventName.QuotesRequested:
                     return {
-                        ...(0, properties_1.getRequestParams)(quoteRequest, this.state.tokenSecurityTypeDestination),
+                        ...(0, properties_1.getRequestParams)(this.state.quoteRequest, this.state.tokenSecurityTypeDestination),
                         ...__classPrivateFieldGet(this, _BridgeController_getRequestMetadata, "f").call(this),
-                        has_sufficient_funds: !quoteRequest.insufficientBal,
+                        has_sufficient_funds: !this.state.quoteRequest.insufficientBal,
                         ...baseProperties,
                     };
                 case constants_1.UnifiedSwapBridgeEventName.QuotesError:
                     return {
-                        ...(0, properties_1.getRequestParams)(quoteRequest, this.state.tokenSecurityTypeDestination),
+                        ...(0, properties_1.getRequestParams)(this.state.quoteRequest, this.state.tokenSecurityTypeDestination),
                         ...__classPrivateFieldGet(this, _BridgeController_getRequestMetadata, "f").call(this),
                         error_message: this.state.quoteFetchError,
-                        has_sufficient_funds: !quoteRequest.insufficientBal,
+                        has_sufficient_funds: !this.state.quoteRequest.insufficientBal,
                         ...baseProperties,
                     };
                 case constants_1.UnifiedSwapBridgeEventName.AllQuotesOpened:
                 case constants_1.UnifiedSwapBridgeEventName.AllQuotesSorted:
                 case constants_1.UnifiedSwapBridgeEventName.QuoteSelected:
                     return {
-                        ...(0, properties_1.getRequestParams)(quoteRequest, this.state.tokenSecurityTypeDestination),
+                        ...(0, properties_1.getRequestParams)(this.state.quoteRequest, this.state.tokenSecurityTypeDestination),
                         ...__classPrivateFieldGet(this, _BridgeController_getRequestMetadata, "f").call(this),
                         ...__classPrivateFieldGet(this, _BridgeController_getQuoteFetchData, "f").call(this),
                         ...baseProperties,
@@ -721,7 +677,7 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
                     // Populate the properties that the error occurred before the tx was submitted
                     return {
                         ...baseProperties,
-                        ...(0, properties_1.getRequestParams)(quoteRequest, this.state.tokenSecurityTypeDestination),
+                        ...(0, properties_1.getRequestParams)(this.state.quoteRequest, this.state.tokenSecurityTypeDestination),
                         ...__classPrivateFieldGet(this, _BridgeController_getRequestMetadata, "f").call(this),
                         ...__classPrivateFieldGet(this, _BridgeController_getQuoteFetchData, "f").call(this),
                         ...propertiesFromClient,
@@ -748,15 +704,13 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
                     return baseProperties;
             }
         });
-        _BridgeController_trackInputChangedEvents.set(this, (paramsToUpdate, quoteRequestIndex = 0) => {
+        _BridgeController_trackInputChangedEvents.set(this, (paramsToUpdate) => {
             Object.entries(paramsToUpdate).forEach(([key, value]) => {
                 const inputKey = properties_1.toInputChangedPropertyKey[key];
                 const inputValue = properties_1.toInputChangedPropertyValue[key]?.(paramsToUpdate);
                 if (inputKey &&
                     inputValue !== undefined &&
-                    this.state.quoteRequest[quoteRequestIndex] &&
-                    value !==
-                        this.state.quoteRequest[quoteRequestIndex][key]) {
+                    value !== this.state.quoteRequest[key]) {
                     this.trackUnifiedSwapBridgeEvent(constants_1.UnifiedSwapBridgeEventName.InputChanged, {
                         input: inputKey,
                         input_value: inputValue,
@@ -770,15 +724,14 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
          *
          * @param eventName - The name of the event to track
          * @param propertiesFromClient - Properties that can't be calculated from the event name and need to be provided by the client
-         * @param quoteRequestIndex - The index of the quote request to track the event for
          * @example
          * this.trackUnifiedSwapBridgeEvent(UnifiedSwapBridgeEventName.ActionOpened, {
          *   location: MetaMetricsSwapsEventSource.MainView,
          * });
          */
-        this.trackUnifiedSwapBridgeEvent = (eventName, propertiesFromClient, quoteRequestIndex = 0) => {
+        this.trackUnifiedSwapBridgeEvent = (eventName, propertiesFromClient) => {
             try {
-                const combinedPropertiesForEvent = __classPrivateFieldGet(this, _BridgeController_getEventProperties, "f").call(this, eventName, propertiesFromClient, quoteRequestIndex);
+                const combinedPropertiesForEvent = __classPrivateFieldGet(this, _BridgeController_getEventProperties, "f").call(this, eventName, propertiesFromClient);
                 __classPrivateFieldGet(this, _BridgeController_trackMetaMetricsFn, "f").call(this, eventName, combinedPropertiesForEvent);
             }
             catch (error) {
@@ -820,9 +773,8 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
     }
 }
 exports.BridgeController = BridgeController;
-_BridgeController_abortController = new WeakMap(), _BridgeController_quotesFirstFetched = new WeakMap(), _BridgeController_location = new WeakMap(), _BridgeController_clientId = new WeakMap(), _BridgeController_clientVersion = new WeakMap(), _BridgeController_getLayer1GasFee = new WeakMap(), _BridgeController_fetchFn = new WeakMap(), _BridgeController_trackMetaMetricsFn = new WeakMap(), _BridgeController_trace = new WeakMap(), _BridgeController_config = new WeakMap(), _BridgeController_getUseAssetsControllerForRates = new WeakMap(), _BridgeController_trackQuoteValidationFailures = new WeakMap(), _BridgeController_getExchangeRateSources = new WeakMap(), _BridgeController_fetchAssetExchangeRates = new WeakMap(), _BridgeController_hasInsufficientBalance = new WeakMap(), _BridgeController_appendInsufficientBalAndResetApproval = new WeakMap(), _BridgeController_shouldResetApproval = new WeakMap(), _BridgeController_fetchBridgeQuotes = new WeakMap(), _BridgeController_handleQuoteStreaming = new WeakMap(), _BridgeController_setMinimumBalanceForRentExemptionInLamports = new WeakMap(), _BridgeController_getJwt = new WeakMap(), _BridgeController_getRequestMetadata = new WeakMap(), _BridgeController_getQuoteFetchData = new WeakMap(), _BridgeController_getEventProperties = new WeakMap(), _BridgeController_trackInputChangedEvents = new WeakMap(), _BridgeController_getUSDTMainnetAllowance = new WeakMap(), _BridgeController_instances = new WeakSet(), _BridgeController_getMultichainSelectedAccount = function _BridgeController_getMultichainSelectedAccount(walletAddress) {
-    // Assume that all quotes in a batch are for the same account
-    const addressToUse = walletAddress ?? this.state.quoteRequest[0].walletAddress;
+_BridgeController_abortController = new WeakMap(), _BridgeController_quotesFirstFetched = new WeakMap(), _BridgeController_location = new WeakMap(), _BridgeController_clientId = new WeakMap(), _BridgeController_clientVersion = new WeakMap(), _BridgeController_getLayer1GasFee = new WeakMap(), _BridgeController_fetchFn = new WeakMap(), _BridgeController_trackMetaMetricsFn = new WeakMap(), _BridgeController_trace = new WeakMap(), _BridgeController_config = new WeakMap(), _BridgeController_getUseAssetsControllerForRates = new WeakMap(), _BridgeController_trackQuoteValidationFailures = new WeakMap(), _BridgeController_getExchangeRateSources = new WeakMap(), _BridgeController_fetchAssetExchangeRates = new WeakMap(), _BridgeController_hasInsufficientBalance = new WeakMap(), _BridgeController_shouldResetApproval = new WeakMap(), _BridgeController_fetchBridgeQuotes = new WeakMap(), _BridgeController_handleQuoteStreaming = new WeakMap(), _BridgeController_setMinimumBalanceForRentExemptionInLamports = new WeakMap(), _BridgeController_getJwt = new WeakMap(), _BridgeController_getRequestMetadata = new WeakMap(), _BridgeController_getQuoteFetchData = new WeakMap(), _BridgeController_getEventProperties = new WeakMap(), _BridgeController_trackInputChangedEvents = new WeakMap(), _BridgeController_getUSDTMainnetAllowance = new WeakMap(), _BridgeController_instances = new WeakSet(), _BridgeController_getMultichainSelectedAccount = function _BridgeController_getMultichainSelectedAccount(walletAddress) {
+    const addressToUse = walletAddress ?? this.state.quoteRequest.walletAddress;
     if (!addressToUse) {
         throw new Error('Account address is required');
     }