[pull] main from MetaMask:main

.github/workflows/run-e2e-smoke-tests-android.yml

@@ -134,20 +134,20 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
     secrets: inherit
 
-  # prediction-market-android-smoke:
-  #   strategy:
-  #     matrix:
-  #       split: [1]
-  #     fail-fast: false
-  #   uses: ./.github/workflows/run-e2e-workflow.yml
-  #   with:
-  #     test-suite-name: prediction_market_android_smoke-${{ matrix.split }}
-  #     platform: android
-  #     test_suite_tag: 'SmokePredictions'
-  #     split_number: ${{ matrix.split }}
-  #     total_splits: 1
-  #     changed_files: ${{ inputs.changed_files }}
-  #   secrets: inherit
+  prediction-market-android-smoke:
+    strategy:
+      matrix:
+        split: [1]
+      fail-fast: false
+    uses: ./.github/workflows/run-e2e-workflow.yml
+    with:
+      test-suite-name: prediction_market_android_smoke-${{ matrix.split }}
+      platform: android
+      test_suite_tag: 'SmokePredictions'
+      split_number: ${{ matrix.split }}
+      total_splits: 1
+      changed_files: ${{ inputs.changed_files }}
+    secrets: inherit
 
   rewards-android-smoke:
     strategy:
@@ -177,7 +177,7 @@ jobs:
       - network-abstraction-android-smoke
       - network-expansion-android-smoke
       - confirmations-redesigned-android-smoke
-      # - prediction-market-android-smoke
+      - prediction-market-android-smoke
       - rewards-android-smoke
     steps:
       - name: Checkout

.github/workflows/run-e2e-smoke-tests-ios.yml

@@ -134,20 +134,20 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
     secrets: inherit
 
-  # prediction-market-ios-smoke:
-  #   strategy:
-  #     matrix:
-  #       split: [1]
-  #     fail-fast: false
-  #   uses: ./.github/workflows/run-e2e-workflow.yml
-  #   with:
-  #     test-suite-name: prediction_market_ios_smoke-${{ matrix.split }}
-  #     platform: ios
-  #     test_suite_tag: 'SmokePredictions'
-  #     split_number: ${{ matrix.split }}
-  #     total_splits: 1
-  #     changed_files: ${{ inputs.changed_files }}
-  #   secrets: inherit
+  prediction-market-ios-smoke:
+    strategy:
+      matrix:
+        split: [1]
+      fail-fast: false
+    uses: ./.github/workflows/run-e2e-workflow.yml
+    with:
+      test-suite-name: prediction_market_ios_smoke-${{ matrix.split }}
+      platform: ios
+      test_suite_tag: 'SmokePredictions'
+      split_number: ${{ matrix.split }}
+      total_splits: 1
+      changed_files: ${{ inputs.changed_files }}
+    secrets: inherit
 
   rewards-ios-smoke:
     strategy:
@@ -177,7 +177,7 @@ jobs:
       - accounts-ios-smoke
       - network-abstraction-ios-smoke
       - network-expansion-ios-smoke
-      # - prediction-market-ios-smoke
+      - prediction-market-ios-smoke
       - rewards-ios-smoke
     steps:
       - name: Checkout

app/components/Nav/Main/MainNavigator.js

@@ -60,6 +60,7 @@ import RampRoutes from '../../UI/Ramp/Aggregator/routes';
 import { RampType } from '../../UI/Ramp/Aggregator/types';
 import RampSettings from '../../UI/Ramp/Aggregator/Views/Settings';
 import RampActivationKeyForm from '../../UI/Ramp/Aggregator/Views/Settings/ActivationKeyForm';
+import RampTokenSelection from '../../UI/Ramp/components/TokenSelection';
 
 import DepositOrderDetails from '../../UI/Ramp/Deposit/Views/DepositOrderDetails/DepositOrderDetails';
 import DepositRoutes from '../../UI/Ramp/Deposit/routes';
@@ -1065,6 +1066,10 @@ const MainNavigator = () => {
         options={{ headerShown: false }}
       />
       <Stack.Screen name="PaymentRequestView" component={PaymentRequestView} />
+      <Stack.Screen
+        name={Routes.RAMP.TOKEN_SELECTION}
+        component={RampTokenSelection}
+      />
       <Stack.Screen name={Routes.RAMP.BUY}>
         {() => <RampRoutes rampType={RampType.BUY} />}
       </Stack.Screen>

app/components/Nav/Main/__snapshots__/MainNavigator.test.tsx.snap

@@ -128,6 +128,10 @@ exports[`MainNavigator matches rendered snapshot 1`] = `
     component={[Function]}
     name="PaymentRequestView"
   />
+  <Screen
+    component={[Function]}
+    name="RampTokenSelection"
+  />
   <Screen
     name="RampBuy"
   />

app/components/UI/Bridge/components/BridgeDestNetworkSelector/BridgeDestNetworkSelector.test.tsx

@@ -152,3 +152,105 @@ describe('BridgeDestNetworkSelector', () => {
     expect(queryByText('Optimism')).toBeTruthy();
   });
 });
+
+describe('BridgeDestNetworkSelector - ChainPopularity fallback', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('assigns Infinity to chains without defined popularity', () => {
+    // Add networks with and without defined popularity to test all branch combinations:
+    // - Optimism: HAS defined popularity (10 in ChainPopularity)
+    // - Palm: NO defined popularity (triggers ?? Infinity)
+    // - zkSync Era: NO defined popularity (triggers ?? Infinity)
+    // This ensures all branch combinations are tested:
+    // 1. Both have defined popularity (Optimism already tested in existing tests)
+    // 2. Both lack defined popularity (Palm vs zkSync Era)
+    // 3. One has, one doesn't (Optimism vs Palm/zkSync)
+    const stateWithMultipleNetworks = {
+      ...initialState,
+      engine: {
+        ...initialState.engine,
+        backgroundState: {
+          ...initialState.engine.backgroundState,
+          RemoteFeatureFlagController: {
+            remoteFeatureFlags: {
+              bridgeConfig: {
+                minimumVersion: '0.0.0',
+                maxRefreshCount: 5,
+                refreshRate: 30000,
+                support: true,
+                chains: {
+                  'eip155:1': {
+                    isActiveSrc: true,
+                    isActiveDest: true,
+                  },
+                  'eip155:10': {
+                    // Optimism - HAS defined popularity
+                    isActiveSrc: true,
+                    isActiveDest: true,
+                  },
+                  'eip155:11297108109': {
+                    // Palm - NOT in ChainPopularity
+                    isActiveSrc: true,
+                    isActiveDest: true,
+                  },
+                  'eip155:324': {
+                    // zkSync Era - NOT in ChainPopularity
+                    isActiveSrc: true,
+                    isActiveDest: true,
+                  },
+                },
+              },
+              bridgeConfigV2: {
+                minimumVersion: '0.0.0',
+                maxRefreshCount: 5,
+                refreshRate: 30000,
+                support: true,
+                chains: {
+                  'eip155:1': {
+                    isActiveSrc: true,
+                    isActiveDest: true,
+                    isGaslessSwapEnabled: true,
+                  },
+                  'eip155:10': {
+                    // Optimism
+                    isActiveSrc: true,
+                    isActiveDest: true,
+                    isGaslessSwapEnabled: false,
+                  },
+                  'eip155:11297108109': {
+                    // Palm
+                    isActiveSrc: true,
+                    isActiveDest: true,
+                    isGaslessSwapEnabled: false,
+                  },
+                  'eip155:324': {
+                    // zkSync Era
+                    isActiveSrc: true,
+                    isActiveDest: true,
+                    isGaslessSwapEnabled: false,
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    };
+
+    const { getByText } = renderScreen(
+      BridgeDestNetworkSelector,
+      {
+        name: Routes.BRIDGE.MODALS.DEST_NETWORK_SELECTOR,
+      },
+      { state: stateWithMultipleNetworks },
+    );
+
+    // All three networks should be visible and sorted by popularity
+    // Optimism (popularity 10) should appear before Palm and zkSync Era (both Infinity)
+    expect(getByText('Optimism')).toBeTruthy();
+    expect(getByText('Palm')).toBeTruthy();
+    expect(getByText('zkSync Era')).toBeTruthy();
+  });
+});

app/components/UI/Bridge/components/BridgeDestNetworkSelector/__snapshots__/BridgeDestNetworkSelector.test.tsx.snap

@@ -637,7 +637,7 @@ exports[`BridgeDestNetworkSelector renders with initial state and displays netwo
                                                   }
                                                 }
                                               >
-                                                Optimism
+                                                Bitcoin
                                               </Text>
                                             </View>
                                           </View>
@@ -831,7 +831,7 @@ exports[`BridgeDestNetworkSelector renders with initial state and displays netwo
                                                   }
                                                 }
                                               >
-                                                Bitcoin
+                                                Optimism
                                               </Text>
                                             </View>
                                           </View>

app/components/UI/Bridge/components/BridgeDestNetworkSelector/index.tsx

@@ -17,6 +17,7 @@ import { NetworkRow } from '../NetworkRow';
 import Routes from '../../../../../constants/navigation/Routes';
 import { selectChainId } from '../../../../../selectors/networkController';
 import { BridgeViewMode } from '../../types';
+import { ChainPopularity } from '../BridgeDestNetworksBar';
 
 export interface BridgeDestNetworkSelectorRouteParams {
   shouldGoToTokens?: boolean;
@@ -68,6 +69,11 @@ export const BridgeDestNetworkSelector: React.FC = () => {
           }
           return chain.chainId !== currentChainId;
         })
+        .sort((a, b) => {
+          const aPopularity = ChainPopularity[a.chainId] ?? Infinity;
+          const bPopularity = ChainPopularity[b.chainId] ?? Infinity;
+          return aPopularity - bPopularity;
+        })
         .map((chain) => (
           <TouchableOpacity
             key={chain.chainId}

app/components/UI/Bridge/components/BridgeDestNetworksBar.tsx

@@ -39,7 +39,7 @@ import { selectChainId } from '../../../../selectors/networkController';
 // Using ScrollView from react-native-gesture-handler to fix scroll issues with the bottom sheet
 import { ScrollView } from 'react-native-gesture-handler';
 ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
-import { SolScope } from '@metamask/keyring-api';
+import { BtcScope, SolScope } from '@metamask/keyring-api';
 import { BridgeViewMode } from '../types';
 ///: END:ONLY_INCLUDE_IF
 const createStyles = (params: { theme: Theme }) => {
@@ -72,21 +72,22 @@ const createStyles = (params: { theme: Theme }) => {
  * 1 = most popular
  * Infinity = least popular
  */
-const ChainPopularity: Record<Hex | CaipChainId, number> = {
+export const ChainPopularity: Record<Hex | CaipChainId, number> = {
   [ETH_CHAIN_ID]: 1,
+  [BSC_CHAIN_ID]: 2,
   ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
-  [SolScope.Mainnet]: 2,
+  [BtcScope.Mainnet]: 3,
+  [SolScope.Mainnet]: 4,
   ///: END:ONLY_INCLUDE_IF
-  [BASE_CHAIN_ID]: 3,
-  [BSC_CHAIN_ID]: 4,
-  [LINEA_CHAIN_ID]: 5,
-  [OPTIMISM_CHAIN_ID]: 6,
-  [ARBITRUM_CHAIN_ID]: 7,
-  [AVALANCHE_CHAIN_ID]: 9,
+  [BASE_CHAIN_ID]: 5,
+  [ARBITRUM_CHAIN_ID]: 6,
+  [LINEA_CHAIN_ID]: 7,
   [POLYGON_CHAIN_ID]: 8,
-  [ZKSYNC_ERA_CHAIN_ID]: 10,
-  [NETWORKS_CHAIN_ID.SEI]: 11,
-  [NETWORKS_CHAIN_ID.MONAD]: 12,
+  [AVALANCHE_CHAIN_ID]: 9,
+  [OPTIMISM_CHAIN_ID]: 10,
+  [ZKSYNC_ERA_CHAIN_ID]: 11,
+  [NETWORKS_CHAIN_ID.SEI]: 12,
+  [NETWORKS_CHAIN_ID.MONAD]: 13,
 };
 
 const ShortChainNames: Record<Hex | CaipChainId, string> = {

app/components/UI/Bridge/components/BridgeDestTokenSelector/__snapshots__/BridgeDestTokenSelector.test.tsx.snap

@@ -663,7 +663,7 @@ exports[`BridgeDestTokenSelector renders with initial state and displays tokens
                                         }
                                       }
                                     >
-                                      Solana
+                                      Bitcoin
                                     </Text>
                                   </View>
                                 </TouchableOpacity>
@@ -717,7 +717,7 @@ exports[`BridgeDestTokenSelector renders with initial state and displays tokens
                                         }
                                       }
                                     >
-                                      Optimism
+                                      Solana
                                     </Text>
                                   </View>
                                 </TouchableOpacity>
@@ -771,7 +771,7 @@ exports[`BridgeDestTokenSelector renders with initial state and displays tokens
                                         }
                                       }
                                     >
-                                      Bitcoin
+                                      Optimism
                                     </Text>
                                   </View>
                                 </TouchableOpacity>

app/components/UI/Bridge/hooks/useBridgeQuoteData/index.ts

@@ -17,14 +17,12 @@ import {
   fromTokenMinimalUnit,
   isNumberValue,
 } from '../../../../../util/number';
-import { selectPrimaryCurrency } from '../../../../../selectors/settings';
 import {
   isQuoteExpired,
   getQuoteRefreshRate,
   shouldRefreshQuote,
 } from '../../utils/quoteUtils';
 
-import { selectTicker } from '../../../../../selectors/networkController';
 import { BigNumber } from 'bignumber.js';
 import I18n from '../../../../../../locales/i18n';
 import useFiatFormatter from '../../../SimulationDetails/FiatDisplay/useFiatFormatter';
@@ -51,8 +49,6 @@ export const useBridgeQuoteData = ({
   const isSubmittingTx = useSelector(selectIsSubmittingTx);
   const locale = I18n.locale;
   const fiatFormatter = useFiatFormatter();
-  const primaryCurrency = useSelector(selectPrimaryCurrency) ?? 'ETH';
-  const ticker = useSelector(selectTicker);
   const quotes = useSelector(selectBridgeQuotes);
   const bridgeFeatureFlags = useSelector(selectBridgeFeatureFlags);
   const isSolanaSwap = useSelector(selectIsSolanaSwap);
@@ -123,20 +119,12 @@ export const useBridgeQuoteData = ({
       return '-';
     }
 
-    const networkFeeFormatter = getIntlNumberFormatter(locale, {
-      maximumFractionDigits: 6,
-    });
-    const formattedAmount = `${networkFeeFormatter.format(
-      Number(amount),
-    )} ${ticker}`;
     const formattedValueInCurrency = fiatFormatter(
       new BigNumber(valueInCurrency),
     );
 
-    return primaryCurrency === 'ETH'
-      ? formattedAmount
-      : formattedValueInCurrency;
-  }, [activeQuote, locale, ticker, fiatFormatter, primaryCurrency]);
+    return formattedValueInCurrency;
+  }, [activeQuote, fiatFormatter]);
 
   const formattedQuoteData = useMemo(() => {
     if (!activeQuote) return undefined;