@metamask/bridge-controller 50.0.0 → 52.0.0

package/CHANGELOG.md

@@ -7,6 +7,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [52.0.0]
+
+### Changed
+
+- **BREAKING:** Bump peer dependency `@metamask/assets-controllers` from `^80.0.0` to `^81.0.0` ([#6834](https://github.com/MetaMask/core/pull/6834))
+
+## [51.0.0]
+
+### Added
+
+- Introduce server‑sent events quote streaming and integrates incremental quote updates into the bridge controller polling flow ([#6760](https://github.com/MetaMask/core/pull/6760))
+  - Add private `handleQuoteStreaming` method that calls `getQuoteStream` when the `sseEnabled` flag is enabled in LaunchDarkly
+  - Reuse existing polling, metrics and validation utilities when processing server-sent quotes
+- Add dependency on `@microsoft/fetch-event-source` at `^2.0.1` ([#6760](https://github.com/MetaMask/core/pull/6760))
+  - Note that clients need to patch this library such that it rejects instead of resolving when the quote request is cancelled. This preserves the controller's expected request cancellation behavior
+
+### Changed
+
+- Extract some logic from bridge-controller and move them to utility files for better readability ([#6760](https://github.com/MetaMask/core/pull/6760))
+
+### Removed
+
+- Remove cache options from spot-prices and getQuote api calls since they are only required by the extension client ([#6760](https://github.com/MetaMask/core/pull/6760))
+
+### Fixed
+
+- Pass abortSignal to fetchAssetPricesForCurrency in order to cancel exchange rate fetching when quote parameters change ([#6760](https://github.com/MetaMask/core/pull/6760))
+
 ## [50.0.0]
 
 ### Changed
@@ -696,7 +724,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release ([#5317](https://github.com/MetaMask/core/pull/5317))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-controller@50.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-controller@52.0.0...HEAD
+[52.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-controller@51.0.0...@metamask/bridge-controller@52.0.0
+[51.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-controller@50.0.0...@metamask/bridge-controller@51.0.0
 [50.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-controller@49.0.1...@metamask/bridge-controller@50.0.0
 [49.0.1]: https://github.com/MetaMask/core/compare/@metamask/bridge-controller@49.0.0...@metamask/bridge-controller@49.0.1
 [49.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-controller@48.0.0...@metamask/bridge-controller@49.0.0

package/dist/bridge-controller.cjs

@@ -10,16 +10,14 @@ 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_clientId, _BridgeController_clientVersion, _BridgeController_getLayer1GasFee, _BridgeController_fetchFn, _BridgeController_trackMetaMetricsFn, _BridgeController_trace, _BridgeController_config, _BridgeController_trackResponseValidationFailures, _BridgeController_getExchangeRateSources, _BridgeController_fetchAssetExchangeRates, _BridgeController_hasSufficientBalance, _BridgeController_fetchBridgeQuotes, _BridgeController_appendL1GasFees, _BridgeController_setMinimumBalanceForRentExemptionInLamports, _BridgeController_appendNonEvmFees, _BridgeController_getMultichainSelectedAccount, _BridgeController_getSelectedNetworkClientId, _BridgeController_getSelectedNetworkClient, _BridgeController_getRequestParams, _BridgeController_getRequestMetadata, _BridgeController_getQuoteFetchData, _BridgeController_getEventProperties, _BridgeController_trackInputChangedEvents;
+var _BridgeController_instances, _BridgeController_abortController, _BridgeController_quotesFirstFetched, _BridgeController_clientId, _BridgeController_clientVersion, _BridgeController_getLayer1GasFee, _BridgeController_fetchFn, _BridgeController_trackMetaMetricsFn, _BridgeController_trace, _BridgeController_config, _BridgeController_trackResponseValidationFailures, _BridgeController_getExchangeRateSources, _BridgeController_fetchAssetExchangeRates, _BridgeController_hasSufficientBalance, _BridgeController_fetchBridgeQuotes, _BridgeController_handleQuoteStreaming, _BridgeController_setMinimumBalanceForRentExemptionInLamports, _BridgeController_getMultichainSelectedAccount, _BridgeController_getSelectedNetworkClientId, _BridgeController_getSelectedNetworkClient, _BridgeController_getRequestParams, _BridgeController_getRequestMetadata, _BridgeController_getQuoteFetchData, _BridgeController_getEventProperties, _BridgeController_trackInputChangedEvents;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BridgeController = void 0;
 const contracts_1 = require("@ethersproject/contracts");
 const providers_1 = require("@ethersproject/providers");
 const metamask_eth_abis_1 = require("@metamask/metamask-eth-abis");
 const polling_controller_1 = require("@metamask/polling-controller");
-const utils_1 = require("@metamask/utils");
 const bridge_1 = require("./constants/bridge.cjs");
-const chains_1 = require("./constants/chains.cjs");
 const traces_1 = require("./constants/traces.cjs");
 const selectors_1 = require("./selectors.cjs");
 const types_1 = require("./types.cjs");
@@ -32,8 +30,8 @@ const fetch_1 = require("./utils/fetch.cjs");
 const constants_1 = require("./utils/metrics/constants.cjs");
 const properties_1 = require("./utils/metrics/properties.cjs");
 const quote_1 = require("./utils/quote.cjs");
+const quote_fees_1 = require("./utils/quote-fees.cjs");
 const snaps_1 = require("./utils/snaps.cjs");
-const validators_1 = require("./utils/validators.cjs");
 const metadata = {
     quoteRequest: {
         includeInStateLogs: true,
@@ -115,31 +113,14 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
             await __classPrivateFieldGet(this, _BridgeController_fetchBridgeQuotes, "f").call(this, pollingInput);
         };
         this.updateBridgeQuoteRequestParams = async (paramsToUpdate, context) => {
-            this.stopAllPolling();
-            __classPrivateFieldGet(this, _BridgeController_abortController, "f")?.abort(constants_1.AbortReason.QuoteRequestUpdated);
             __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) => {
                 state.quoteRequest = updatedQuoteRequest;
-                state.quotes = bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quotes;
-                state.quotesLastFetched =
-                    bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quotesLastFetched;
-                state.quotesLoadingStatus =
-                    bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quotesLoadingStatus;
-                state.quoteFetchError = bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quoteFetchError;
-                state.quotesRefreshCount =
-                    bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quotesRefreshCount;
-                state.quotesInitialLoadTime =
-                    bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quotesInitialLoadTime;
-                // Reset required minimum balance if the source chain is not Solana
-                if (updatedQuoteRequest.srcChainId &&
-                    !(0, bridge_2.isSolanaChainId)(updatedQuoteRequest.srcChainId)) {
-                    state.minimumBalanceForRentExemptionInLamports =
-                        bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.minimumBalanceForRentExemptionInLamports;
-                }
             });
             await __classPrivateFieldGet(this, _BridgeController_fetchAssetExchangeRates, "f").call(this, updatedQuoteRequest).catch((error) => console.warn('Failed to fetch asset exchange rates', error));
             if ((0, quote_1.isValidQuoteRequest)(updatedQuoteRequest)) {
@@ -156,10 +137,16 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
                     insufficientBal = true;
                 }
                 else {
-                    // Otherwise query the src token balance from the RPC provider
-                    insufficientBal =
-                        paramsToUpdate.insufficientBal ??
-                            !(await __classPrivateFieldGet(this, _BridgeController_hasSufficientBalance, "f").call(this, updatedQuoteRequest));
+                    try {
+                        // Otherwise query the src token balance from the RPC provider
+                        insufficientBal =
+                            paramsToUpdate.insufficientBal ??
+                                !(await __classPrivateFieldGet(this, _BridgeController_hasSufficientBalance, "f").call(this, updatedQuoteRequest));
+                    }
+                    catch (error) {
+                        console.warn('Failed to fetch balance', error);
+                        insufficientBal = true;
+                    }
                 }
                 const networkClientId = __classPrivateFieldGet(this, _BridgeController_instances, "m", _BridgeController_getSelectedNetworkClientId).call(this);
                 // Set refresh rate based on the source chain before starting polling
@@ -194,17 +181,8 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
                 ? { ...quoteRequest, ...quoteRequestOverrides }
                 : quoteRequest, abortSignal, __classPrivateFieldGet(this, _BridgeController_clientId, "f"), __classPrivateFieldGet(this, _BridgeController_fetchFn, "f"), __classPrivateFieldGet(this, _BridgeController_config, "f").customBridgeApiBaseUrl ?? bridge_1.BRIDGE_PROD_API_BASE_URL, featureId, __classPrivateFieldGet(this, _BridgeController_clientVersion, "f"));
             __classPrivateFieldGet(this, _BridgeController_trackResponseValidationFailures, "f").call(this, validationFailures);
-            const quotesWithL1GasFees = await __classPrivateFieldGet(this, _BridgeController_appendL1GasFees, "f").call(this, baseQuotes);
-            const quotesWithNonEvmFees = await __classPrivateFieldGet(this, _BridgeController_appendNonEvmFees, "f").call(this, baseQuotes, quoteRequest.walletAddress);
-            const quotesWithFees = quotesWithL1GasFees ?? quotesWithNonEvmFees ?? baseQuotes;
-            // Sort perps quotes by increasing estimated processing time (fastest first)
-            if (featureId === validators_1.FeatureId.PERPS) {
-                return quotesWithFees.sort((a, b) => {
-                    return (a.estimatedProcessingTimeInSeconds -
-                        b.estimatedProcessingTimeInSeconds);
-                });
-            }
-            return quotesWithFees;
+            const quotesWithFees = await (0, quote_fees_1.appendFeesToQuotes)(baseQuotes, this.messagingSystem, __classPrivateFieldGet(this, _BridgeController_getLayer1GasFee, "f"), __classPrivateFieldGet(this, _BridgeController_instances, "m", _BridgeController_getMultichainSelectedAccount).call(this, quoteRequest.walletAddress));
+            return (0, quote_1.sortQuotes)(quotesWithFees, featureId);
         };
         _BridgeController_trackResponseValidationFailures.set(this, (validationFailures) => {
             if (validationFailures.length === 0) {
@@ -255,6 +233,7 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
                 clientId: __classPrivateFieldGet(this, _BridgeController_clientId, "f"),
                 clientVersion: __classPrivateFieldGet(this, _BridgeController_clientVersion, "f"),
                 fetchFn: __classPrivateFieldGet(this, _BridgeController_fetchFn, "f"),
+                signal: __classPrivateFieldGet(this, _BridgeController_abortController, "f")?.signal,
             });
             const exchangeRates = (0, assets_1.toExchangeRates)(currency, pricesByAssetId);
             this.update((state) => {
@@ -265,10 +244,6 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
             });
         });
         _BridgeController_hasSufficientBalance.set(this, async (quoteRequest) => {
-            // Only check balance for EVM chains
-            if ((0, bridge_2.isNonEvmChainId)(quoteRequest.srcChainId)) {
-                return true;
-            }
             const srcChainIdInHex = (0, caip_formatters_1.formatChainIdToHex)(quoteRequest.srcChainId);
             const provider = __classPrivateFieldGet(this, _BridgeController_instances, "m", _BridgeController_getSelectedNetworkClient).call(this)?.provider;
             const normalizedSrcTokenAddress = (0, caip_formatters_1.formatAddressToCaipReference)(quoteRequest.srcTokenAddress);
@@ -282,8 +257,8 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
             this.stopAllPolling();
             __classPrivateFieldGet(this, _BridgeController_abortController, "f")?.abort(reason);
         };
-        this.resetState = () => {
-            this.stopPollingForQuotes(constants_1.AbortReason.ResetState);
+        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
                 state.quoteRequest = bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quoteRequest;
@@ -320,10 +295,13 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
             __classPrivateFieldGet(this, _BridgeController_abortController, "f")?.abort('New quote request');
             __classPrivateFieldSet(this, _BridgeController_abortController, new AbortController(), "f");
             this.trackUnifiedSwapBridgeEvent(constants_1.UnifiedSwapBridgeEventName.QuotesRequested, context);
+            const { sseEnabled, maxRefreshCount } = (0, feature_flags_1.getBridgeFeatureFlags)(this.messagingSystem);
+            const shouldStream = Boolean(sseEnabled);
             this.update((state) => {
-                state.quotesLoadingStatus = types_1.RequestStatus.LOADING;
                 state.quoteRequest = updatedQuoteRequest;
                 state.quoteFetchError = bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quoteFetchError;
+                state.quotesLastFetched = Date.now();
+                state.quotesLoadingStatus = types_1.RequestStatus.LOADING;
             });
             try {
                 await __classPrivateFieldGet(this, _BridgeController_trace, "f").call(this, {
@@ -335,22 +313,36 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
                         destChainId: (0, caip_formatters_1.formatChainIdToCaip)(updatedQuoteRequest.destChainId),
                     },
                 }, async () => {
+                    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, updatedQuoteRequest.srcChainId);
-                    const quotes = await this.fetchQuotes(updatedQuoteRequest, 
-                    // AbortController is always defined by this line, because we assign it a few lines above,
-                    // not sure why Jest thinks it's not
-                    // Linters accurately say that it's defined
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    __classPrivateFieldGet(this, _BridgeController_abortController, "f").signal);
+                    __classPrivateFieldGet(this, _BridgeController_setMinimumBalanceForRentExemptionInLamports, "f").call(this, updatedQuoteRequest.srcChainId, selectedAccount.metadata?.snap?.id);
+                    // Use SSE if enabled and return early
+                    if (shouldStream) {
+                        await __classPrivateFieldGet(this, _BridgeController_handleQuoteStreaming, "f").call(this, updatedQuoteRequest, selectedAccount);
+                        return;
+                    }
+                    // Otherwise use regular fetch
+                    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 ===
+                            bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quotesRefreshCount &&
+                            __classPrivateFieldGet(this, _BridgeController_quotesFirstFetched, "f")) {
+                            state.quotesInitialLoadTime =
+                                Date.now() - __classPrivateFieldGet(this, _BridgeController_quotesFirstFetched, "f");
+                        }
                         state.quotes = quotes;
                         state.quotesLoadingStatus = types_1.RequestStatus.FETCHED;
                     });
                 });
             }
             catch (error) {
+                // Reset the quotes list if the fetch fails to avoid showing stale quotes
+                this.update((state) => {
+                    state.quotes = bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quotes;
+                });
+                // Ignore abort errors
                 const isAbortError = error.name === 'AbortError';
                 if (isAbortError ||
                     [
@@ -361,141 +353,89 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
                     // Exit the function early to prevent other state updates
                     return;
                 }
+                // Update loading status and error message
                 this.update((state) => {
-                    state.quoteFetchError =
-                        error instanceof Error ? error.message : (error?.toString() ?? null);
+                    // The error object reference is not guaranteed to exist on mobile so reading
+                    // the message directly could cause an error.
+                    let errorMessage;
+                    try {
+                        errorMessage =
+                            error?.message ?? error.toString();
+                    }
+                    catch {
+                        // Intentionally empty
+                    }
+                    finally {
+                        state.quoteFetchError = errorMessage ?? 'Unknown error';
+                    }
                     state.quotesLoadingStatus = types_1.RequestStatus.ERROR;
-                    state.quotes = bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quotes;
                 });
+                // Track event and log error
                 this.trackUnifiedSwapBridgeEvent(constants_1.UnifiedSwapBridgeEventName.QuotesError, context);
-                console.log('Failed to fetch bridge quotes', error);
+                console.log(`Failed to ${shouldStream ? 'stream' : 'fetch'} bridge quotes`, error);
             }
-            const bridgeFeatureFlags = (0, feature_flags_1.getBridgeFeatureFlags)(this.messagingSystem);
-            const { maxRefreshCount } = bridgeFeatureFlags;
+            // Update refresh count after fetching, validation and fee calculation have completed
+            this.update((state) => {
+                state.quotesRefreshCount += 1;
+            });
             // Stop polling if the maximum number of refreshes has been reached
             if (updatedQuoteRequest.insufficientBal ||
                 (!updatedQuoteRequest.insufficientBal &&
                     this.state.quotesRefreshCount >= maxRefreshCount)) {
                 this.stopAllPolling();
             }
-            // Update quote fetching stats
-            const quotesLastFetched = Date.now();
-            this.update((state) => {
-                state.quotesInitialLoadTime =
-                    state.quotesRefreshCount === 0 && __classPrivateFieldGet(this, _BridgeController_quotesFirstFetched, "f")
-                        ? quotesLastFetched - __classPrivateFieldGet(this, _BridgeController_quotesFirstFetched, "f")
-                        : this.state.quotesInitialLoadTime;
-                state.quotesLastFetched = quotesLastFetched;
-                state.quotesRefreshCount += 1;
-            });
-        });
-        _BridgeController_appendL1GasFees.set(this, async (quotes) => {
-            // Indicates whether some of the quotes are not for optimism or base
-            const hasInvalidQuotes = quotes.some(({ quote }) => {
-                const chainId = (0, caip_formatters_1.formatChainIdToCaip)(quote.srcChainId);
-                return ![chains_1.CHAIN_IDS.OPTIMISM, chains_1.CHAIN_IDS.BASE]
-                    .map(caip_formatters_1.formatChainIdToCaip)
-                    .includes(chainId);
-            });
-            // Only append L1 gas fees if all quotes are for either optimism or base
-            if (hasInvalidQuotes) {
-                return undefined;
-            }
-            const l1GasFeePromises = Promise.allSettled(quotes.map(async (quoteResponse) => {
-                const { quote, trade, approval } = quoteResponse;
-                const chainId = (0, utils_1.numberToHex)(quote.srcChainId);
-                const getTxParams = (txData) => ({
-                    from: txData.from,
-                    to: txData.to,
-                    value: txData.value,
-                    data: txData.data,
-                    gasLimit: txData.gasLimit?.toString(),
-                });
-                const approvalL1GasFees = approval
-                    ? await __classPrivateFieldGet(this, _BridgeController_getLayer1GasFee, "f").call(this, {
-                        transactionParams: getTxParams(approval),
-                        chainId,
-                    })
-                    : '0x0';
-                const tradeL1GasFees = await __classPrivateFieldGet(this, _BridgeController_getLayer1GasFee, "f").call(this, {
-                    transactionParams: getTxParams(trade),
-                    chainId,
-                });
-                if (approvalL1GasFees === undefined || tradeL1GasFees === undefined) {
-                    return undefined;
-                }
-                return {
-                    ...quoteResponse,
-                    l1GasFeesInHexWei: (0, bridge_2.sumHexes)(approvalL1GasFees, tradeL1GasFees),
-                };
-            }));
-            const quotesWithL1GasFees = (await l1GasFeePromises).reduce((acc, result) => {
-                if (result.status === 'fulfilled' && result.value) {
-                    acc.push(result.value);
-                }
-                else if (result.status === 'rejected') {
-                    console.error('Error calculating L1 gas fees for quote', result.reason);
-                }
-                return acc;
-            }, []);
-            return quotesWithL1GasFees;
         });
-        _BridgeController_setMinimumBalanceForRentExemptionInLamports.set(this, (srcChainId) => {
-            const selectedAccount = __classPrivateFieldGet(this, _BridgeController_instances, "m", _BridgeController_getMultichainSelectedAccount).call(this);
-            return (0, bridge_2.isSolanaChainId)(srcChainId) && selectedAccount?.metadata?.snap?.id
-                ? this.messagingSystem
-                    .call('SnapController:handleRequest', (0, snaps_1.getMinimumBalanceForRentExemptionRequest)(selectedAccount.metadata.snap?.id)) // eslint-disable-next-line promise/always-return
-                    .then((result) => {
+        _BridgeController_handleQuoteStreaming.set(this, async (updatedQuoteRequest, 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
+             */
+            let validQuotesCounter = 0;
+            await (0, fetch_1.fetchBridgeQuoteStream)(__classPrivateFieldGet(this, _BridgeController_fetchFn, "f"), updatedQuoteRequest, __classPrivateFieldGet(this, _BridgeController_abortController, "f")?.signal, __classPrivateFieldGet(this, _BridgeController_clientId, "f"), __classPrivateFieldGet(this, _BridgeController_config, "f").customBridgeApiBaseUrl ?? bridge_1.BRIDGE_PROD_API_BASE_URL, {
+                onValidationFailure: __classPrivateFieldGet(this, _BridgeController_trackResponseValidationFailures, "f"),
+                onValidQuoteReceived: async (quote) => {
+                    const quotesWithFees = await (0, quote_fees_1.appendFeesToQuotes)([quote], this.messagingSystem, __classPrivateFieldGet(this, _BridgeController_getLayer1GasFee, "f"), selectedAccount);
+                    if (quotesWithFees.length > 0) {
+                        validQuotesCounter += 1;
+                    }
                     this.update((state) => {
-                        state.minimumBalanceForRentExemptionInLamports = String(result);
+                        // Clear previous quotes and quotes load time when first quote in the current
+                        // polling loop is received
+                        // This enables clients to continue showing the previous quotes while new
+                        // quotes are loading
+                        // Note: If there are no valid quotes until the 2nd fetch, quotesInitialLoadTime will be > refreshRate
+                        if (validQuotesCounter === 1) {
+                            state.quotes = bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quotes;
+                            if (!state.quotesInitialLoadTime && __classPrivateFieldGet(this, _BridgeController_quotesFirstFetched, "f")) {
+                                // Set the initial load time after the first quote is received
+                                state.quotesInitialLoadTime =
+                                    Date.now() - __classPrivateFieldGet(this, _BridgeController_quotesFirstFetched, "f");
+                            }
+                        }
+                        state.quotes = [...state.quotes, ...quotesWithFees];
                     });
-                })
-                    .catch((error) => {
-                    console.error('Error setting minimum balance for rent exemption', error);
+                },
+                onClose: () => {
                     this.update((state) => {
-                        state.minimumBalanceForRentExemptionInLamports =
-                            bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.minimumBalanceForRentExemptionInLamports;
+                        // If there are no valid quotes in the current stream, clear the quotes list
+                        // to remove quotes from the previous stream
+                        if (validQuotesCounter === 0) {
+                            state.quotes = bridge_1.DEFAULT_BRIDGE_CONTROLLER_STATE.quotes;
+                        }
+                        state.quotesLoadingStatus = types_1.RequestStatus.FETCHED;
                     });
-                })
-                : undefined;
+                },
+            }, __classPrivateFieldGet(this, _BridgeController_clientVersion, "f"));
         });
-        /**
-         * Appends transaction fees for non-EVM chains to quotes
-         *
-         * @param quotes - Array of quote responses to append fees to
-         * @param walletAddress - The wallet address for which the quotes were requested
-         * @returns Array of quotes with fees appended, or undefined if quotes are for EVM chains
-         */
-        _BridgeController_appendNonEvmFees.set(this, async (quotes, walletAddress) => {
-            if (quotes.some(({ quote: { srcChainId } }) => !(0, bridge_2.isNonEvmChainId)(srcChainId))) {
-                return undefined;
+        _BridgeController_setMinimumBalanceForRentExemptionInLamports.set(this, async (srcChainId, snapId) => {
+            if (!(0, bridge_2.isSolanaChainId)(srcChainId) || !snapId) {
+                return;
             }
-            const selectedAccount = __classPrivateFieldGet(this, _BridgeController_instances, "m", _BridgeController_getMultichainSelectedAccount).call(this, walletAddress);
-            const nonEvmFeePromises = Promise.allSettled(quotes.map(async (quoteResponse) => {
-                const { trade, quote } = quoteResponse;
-                if (selectedAccount?.metadata?.snap?.id && typeof trade === 'string') {
-                    const scope = (0, caip_formatters_1.formatChainIdToCaip)(quote.srcChainId);
-                    const response = (await this.messagingSystem.call('SnapController:handleRequest', (0, snaps_1.computeFeeRequest)(selectedAccount.metadata.snap?.id, trade, selectedAccount.id, scope)));
-                    const baseFee = response?.find((fee) => fee.type === 'base');
-                    // Store fees in native units as returned by the snap (e.g., SOL, BTC)
-                    const feeInNative = baseFee?.asset?.amount || '0';
-                    return {
-                        ...quoteResponse,
-                        nonEvmFeesInNative: feeInNative,
-                    };
-                }
-                return quoteResponse;
-            }));
-            const quotesWithNonEvmFees = (await nonEvmFeePromises).reduce((acc, result) => {
-                if (result.status === 'fulfilled' && result.value) {
-                    acc.push(result.value);
-                }
-                else if (result.status === 'rejected') {
-                    console.error('Error calculating non-EVM fees for quote', result.reason);
-                }
-                return acc;
-            }, []);
-            return quotesWithNonEvmFees;
+            const minimumBalanceForRentExemptionInLamports = await (0, snaps_1.getMinimumBalanceForRentExemptionInLamports)(snapId, this.messagingSystem);
+            this.update((state) => {
+                state.minimumBalanceForRentExemptionInLamports =
+                    minimumBalanceForRentExemptionInLamports;
+            });
         });
         _BridgeController_getRequestParams.set(this, () => {
             const srcChainIdCaip = (0, caip_formatters_1.formatChainIdToCaip)(this.state.quoteRequest.srcChainId ||
@@ -661,7 +601,7 @@ class BridgeController extends (0, polling_controller_1.StaticIntervalPollingCon
     }
 }
 exports.BridgeController = BridgeController;
-_BridgeController_abortController = new WeakMap(), _BridgeController_quotesFirstFetched = 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_trackResponseValidationFailures = new WeakMap(), _BridgeController_getExchangeRateSources = new WeakMap(), _BridgeController_fetchAssetExchangeRates = new WeakMap(), _BridgeController_hasSufficientBalance = new WeakMap(), _BridgeController_fetchBridgeQuotes = new WeakMap(), _BridgeController_appendL1GasFees = new WeakMap(), _BridgeController_setMinimumBalanceForRentExemptionInLamports = new WeakMap(), _BridgeController_appendNonEvmFees = new WeakMap(), _BridgeController_getRequestParams = new WeakMap(), _BridgeController_getRequestMetadata = new WeakMap(), _BridgeController_getQuoteFetchData = new WeakMap(), _BridgeController_getEventProperties = new WeakMap(), _BridgeController_trackInputChangedEvents = new WeakMap(), _BridgeController_instances = new WeakSet(), _BridgeController_getMultichainSelectedAccount = function _BridgeController_getMultichainSelectedAccount(walletAddress) {
+_BridgeController_abortController = new WeakMap(), _BridgeController_quotesFirstFetched = 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_trackResponseValidationFailures = new WeakMap(), _BridgeController_getExchangeRateSources = new WeakMap(), _BridgeController_fetchAssetExchangeRates = new WeakMap(), _BridgeController_hasSufficientBalance = new WeakMap(), _BridgeController_fetchBridgeQuotes = new WeakMap(), _BridgeController_handleQuoteStreaming = new WeakMap(), _BridgeController_setMinimumBalanceForRentExemptionInLamports = new WeakMap(), _BridgeController_getRequestParams = new WeakMap(), _BridgeController_getRequestMetadata = new WeakMap(), _BridgeController_getQuoteFetchData = new WeakMap(), _BridgeController_getEventProperties = new WeakMap(), _BridgeController_trackInputChangedEvents = 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');