MetaMask
diff --git a/‎app/components/UI/Bridge/Views/BridgeView/index.tsx‎
Lines changed: 8 additions & 0 deletions b/‎app/components/UI/Bridge/Views/BridgeView/index.tsx‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎app/components/UI/Bridge/components/QuoteDetailsCard/QuoteDetailsCard.tsx‎
Lines changed: 7 additions & 25 deletions b/‎app/components/UI/Bridge/components/QuoteDetailsCard/QuoteDetailsCard.tsx‎
Lines changed: 7 additions & 25 deletions
diff --git a/‎app/components/UI/Bridge/hooks/useBridgeQuoteData/index.ts‎
Lines changed: 47 additions & 49 deletions b/‎app/components/UI/Bridge/hooks/useBridgeQuoteData/index.ts‎
Lines changed: 47 additions & 49 deletions
@@ -377,6 +377,14 @@ const BridgeView = () => {
       );
     }
 
+    // Prevent bottom section from rendering when no active
+    // quotes exist and none are being fetching.
+    // This resolves edge cases when users are redirected back from
+    // Select Quote page due to quotes expiry.
+    if (!activeQuote) {
+      return null;
+    }
+
     // TODO: remove this once controller types are updated
     // @ts-expect-error: controller types are not up to date yet
     const quoteBpsFee = activeQuote?.quote?.feeData?.metabridge?.quoteBpsFee;
 
@@ -39,11 +39,12 @@ import AddRewardsAccount from '../../../Rewards/components/AddRewardsAccount/Add
 import QuoteCountdownTimer from '../QuoteCountdownTimer';
 import QuoteDetailsRecipientKeyValueRow from '../QuoteDetailsRecipientKeyValueRow/QuoteDetailsRecipientKeyValueRow';
 import { toSentenceCase } from '../../../../../util/string';
-import { getGasFeesSponsoredNetworkEnabled } from '../../../../../selectors/featureFlagController/gasFeesSponsored';
-import { QuoteDetailsCardProps } from './QuoteDetailsCard.types';
 import TagColored, {
   TagColor,
 } from '../../../../../component-library/components-temp/TagColored';
+import { useShouldRenderGasSponsoredBanner } from '../../hooks/useShouldRenderGasSponsoredBanner';
+import { isGaslessQuote } from '../../utils/isGaslessQuote';
+import { QuoteDetailsCardProps } from './QuoteDetailsCard.types';
 
 if (
   Platform.OS === 'android' &&
@@ -80,34 +81,17 @@ const QuoteDetailsCard: React.FC<QuoteDetailsCardProps> = ({
     isQuoteLoading,
   });
 
-  const gasFeesSponsoredNetworkEnabled = useSelector(
-    getGasFeesSponsoredNetworkEnabled,
-  );
-
   const nativeTokenName = useMemo(() => {
     const chainId = sourceToken?.chainId;
     if (!chainId) return undefined;
     const native = getNativeSourceToken(chainId);
     return native?.symbol ?? sourceToken?.symbol ?? '';
   }, [sourceToken?.chainId, sourceToken?.symbol]);
 
-  const isCurrentNetworkGasSponsored = useMemo(() => {
-    if (!sourceToken?.chainId || !gasFeesSponsoredNetworkEnabled) {
-      return false;
-    }
-    return gasFeesSponsoredNetworkEnabled(sourceToken.chainId);
-  }, [sourceToken?.chainId, gasFeesSponsoredNetworkEnabled]);
-
-  const shouldShowGasSponsored = useMemo(() => {
-    const gasSponsored = activeQuote?.quote?.gasSponsored ?? false;
-    return (
-      gasSponsored || (hasInsufficientBalance && isCurrentNetworkGasSponsored)
-    );
-  }, [
-    activeQuote?.quote?.gasSponsored,
+  const shouldShowGasSponsored = useShouldRenderGasSponsoredBanner({
+    quoteGasSponsored: activeQuote?.quote?.gasSponsored ?? false,
     hasInsufficientBalance,
-    isCurrentNetworkGasSponsored,
-  ]);
+  });
 
   const handleSlippagePress = () => {
     navigation.navigate(Routes.BRIDGE.MODALS.ROOT, {
@@ -131,9 +115,7 @@ const QuoteDetailsCard: React.FC<QuoteDetailsCardProps> = ({
 
   const { networkFee, rate, priceImpact, slippage } = formattedQuoteData;
 
-  const gasIncluded = !!activeQuote?.quote.gasIncluded;
-  const gasIncluded7702 = !!activeQuote?.quote.gasIncluded7702;
-  const isGasless = gasIncluded7702 || gasIncluded;
+  const isGasless = isGaslessQuote(activeQuote?.quote);
 
   const formattedMinToTokenAmount = formatMinimumReceived(
     activeQuote?.minToTokenAmount?.amount || '0',
 
@@ -14,23 +14,18 @@ import {
 import { RequestStatus, isNonEvmChainId } from '@metamask/bridge-controller';
 import { areAddressesEqual } from '../../../../../util/address';
 import { useCallback, useMemo, useEffect, useState, useRef } from 'react';
-import {
-  fromTokenMinimalUnit,
-  isNumberValue,
-} from '../../../../../util/number';
+import { fromTokenMinimalUnit } from '../../../../../util/number';
 import {
   isQuoteExpired,
   getQuoteRefreshRate,
   shouldRefreshQuote,
 } from '../../utils/quoteUtils';
-
-import { BigNumber } from 'bignumber.js';
 import I18n from '../../../../../../locales/i18n';
-import useFiatFormatter from '../../../SimulationDetails/FiatDisplay/useFiatFormatter';
 import useIsInsufficientBalance from '../useInsufficientBalance';
 import { BigNumber as EthersBigNumber } from 'ethers';
 import useValidateBridgeTx from '../../../../../util/bridge/hooks/useValidateBridgeTx';
 import { getIntlNumberFormatter } from '../../../../../util/intl';
+import { useFormattedNetworkFee } from '../useFormattedNetworkFee';
 
 interface UseBridgeQuoteDataParams {
   latestSourceAtomicBalance?: EthersBigNumber;
@@ -49,7 +44,6 @@ export const useBridgeQuoteData = ({
   const slippage = useSelector(selectSlippage);
   const isSubmittingTx = useSelector(selectIsSubmittingTx);
   const locale = I18n.locale;
-  const fiatFormatter = useFiatFormatter();
   const quotes = useSelector(selectBridgeQuotes);
   const bridgeFeatureFlags = useSelector(selectBridgeFeatureFlags);
   const isSolanaSwap = useSelector(selectIsSolanaSwap);
@@ -85,6 +79,10 @@ export const useBridgeQuoteData = ({
   const isExpired = isQuoteExpired(willRefresh, refreshRate, quotesLastFetched);
 
   const bestQuote = quotes?.recommendedQuote;
+  const allQuotes = useMemo(
+    () => quotes?.sortedQuotes ?? [],
+    [quotes?.sortedQuotes],
+  );
 
   const activeQuote =
     isExpired && !willRefresh && !isSubmittingTx ? undefined : bestQuote;
@@ -104,25 +102,45 @@ export const useBridgeQuoteData = ({
     return areAddressesEqual(quoteSourceAddress, selectedSourceAddress);
   }, [activeQuote, sourceToken]);
 
-  // Validate that the quote's destination asset matches the selected destination token
+  // Helper to validate that a quote's destination asset matches the selected destination token
   // This prevents showing stale quote data (with wrong decimals) when user changes destination token
-  const isQuoteDestTokenMatch = useMemo(() => {
-    if (!activeQuote || !destToken) return false;
-
-    const { destAsset } = activeQuote.quote;
-
-    // For non-EVM chains (e.g., Solana), destAsset.address is in raw format (e.g., "EPj...")
-    // or zero address for native tokens, while destToken.address uses CAIP format
-    // (e.g., "solana:.../token:EPj...").
-    // Use destAsset.assetId (CAIP format) for comparison.
-    // For EVM chains, use the original address comparison.
-    const quoteDestAddress = isNonEvmChainId(destToken.chainId)
-      ? (destAsset.assetId ?? destAsset.address)
-      : destAsset.address;
+  const isQuoteDestTokenMatchForQuote = useCallback(
+    (quote: (typeof allQuotes)[number] | undefined | null): boolean => {
+      if (!quote || !destToken) return false;
+
+      const { destAsset } = quote.quote;
+
+      // For non-EVM chains (e.g., Solana), destAsset.address is in raw format (e.g., "EPj...")
+      // or zero address for native tokens, while destToken.address uses CAIP format
+      // (e.g., "solana:.../token:EPj...").
+      // Use destAsset.assetId (CAIP format) for comparison.
+      // For EVM chains, use the original address comparison.
+      const quoteDestAddress = isNonEvmChainId(destToken.chainId)
+        ? (destAsset.assetId ?? destAsset.address)
+        : destAsset.address;
+
+      const selectedDestAddress = destToken.address;
+      return areAddressesEqual(quoteDestAddress, selectedDestAddress);
+    },
+    [destToken],
+  );
 
-    const selectedDestAddress = destToken.address;
-    return areAddressesEqual(quoteDestAddress, selectedDestAddress);
-  }, [activeQuote, destToken]);
+  const isQuoteDestTokenMatch = isQuoteDestTokenMatchForQuote(activeQuote);
+
+  // Filter all quotes to only include valid ones (not expired and matching dest token)
+  const validQuotes = useMemo(
+    () =>
+      isExpired && !willRefresh && !isSubmittingTx
+        ? []
+        : allQuotes.filter((quote) => isQuoteDestTokenMatchForQuote(quote)),
+    [
+      isExpired,
+      willRefresh,
+      isSubmittingTx,
+      allQuotes,
+      isQuoteDestTokenMatchForQuote,
+    ],
+  );
 
   const destTokenAmount =
     activeQuote && destToken && isQuoteSourceTokenMatch && isQuoteDestTokenMatch
@@ -137,28 +155,7 @@ export const useBridgeQuoteData = ({
       ? undefined
       : Number(destTokenAmount) / Number(sourceAmount);
 
-  const getNetworkFee = useCallback(() => {
-    if (!activeQuote?.totalNetworkFee) return '-';
-
-    const { totalNetworkFee } = activeQuote;
-
-    const { amount, valueInCurrency } = totalNetworkFee;
-
-    if (
-      amount == null ||
-      valueInCurrency == null ||
-      !isNumberValue(amount) ||
-      !isNumberValue(valueInCurrency)
-    ) {
-      return '-';
-    }
-
-    const formattedValueInCurrency = fiatFormatter(
-      new BigNumber(valueInCurrency),
-    );
-
-    return formattedValueInCurrency;
-  }, [activeQuote, fiatFormatter]);
+  const networkFee = useFormattedNetworkFee(activeQuote);
 
   const formattedQuoteData = useMemo(() => {
     if (!activeQuote) return undefined;
@@ -186,7 +183,7 @@ export const useBridgeQuoteData = ({
       : '--';
 
     return {
-      networkFee: getNetworkFee(),
+      networkFee,
       estimatedTime:
         estimatedProcessingTimeInSeconds >= 60
           ? `${Math.ceil(estimatedProcessingTimeInSeconds / 60)} min`
@@ -204,9 +201,9 @@ export const useBridgeQuoteData = ({
     quoteRate,
     sourceToken?.symbol,
     destToken?.symbol,
-    getNetworkFee,
     slippage,
     locale,
+    networkFee,
   ]);
 
   const isLoading = quotesLoadingStatus === RequestStatus.LOADING;
@@ -303,5 +300,6 @@ export const useBridgeQuoteData = ({
     isExpired,
     blockaidError,
     shouldShowPriceImpactWarning,
+    validQuotes,
   };
 };