[pull] main from MetaMask:main

.github/workflows/ci.yml

@@ -347,7 +347,6 @@ jobs:
         check-workflows,
         js-bundle-size-check,
         sonar-cloud-quality-gate-status,
-        e2e-smoke-tests-android,
       ]
     outputs:
       ALL_JOBS_PASSED: ${{ steps.jobs-passed-status.outputs.ALL_JOBS_PASSED }}

app/components/Nav/App/App.tsx

@@ -41,7 +41,6 @@ import { TokenSortBottomSheet } from '../../../components/UI/Tokens/TokensBottom
 import ProfilerManager from '../../../components/UI/ProfilerManager';
 import { TokenFilterBottomSheet } from '../../../components/UI/Tokens/TokensBottomSheet/TokenFilterBottomSheet';
 import NetworkManager from '../../../components/UI/NetworkManager';
-import AccountConnect from '../../../components/Views/AccountConnect';
 import AccountPermissions from '../../../components/Views/AccountPermissions';
 import { AccountPermissionsScreens } from '../../../components/Views/AccountPermissions/AccountPermissions.types';
 import AccountPermissionsConfirmRevokeAll from '../../../components/Views/AccountPermissions/AccountPermissionsConfirmRevokeAll';
@@ -152,6 +151,7 @@ import { SmartAccountUpdateModal } from '../../Views/confirmations/components/sm
 import { PayWithModal } from '../../Views/confirmations/components/modals/pay-with-modal/pay-with-modal';
 import { PayWithNetworkModal } from '../../Views/confirmations/components/modals/pay-with-network-modal/pay-with-network-modal';
 import { useMetrics } from '../../hooks/useMetrics';
+import { State2AccountConnectWrapper } from '../../Views/MultichainAccounts/MultichainAccountConnect/State2AccountConnectWrapper';
 import { SmartAccountModal } from '../../Views/MultichainAccounts/AccountDetails/components/SmartAccountModal/SmartAccountModal';
 
 const clearStackNavigatorOptions = {
@@ -408,7 +408,7 @@ const RootModalFlow = (props: RootModalFlowProps) => (
     />
     <Stack.Screen
       name={Routes.SHEET.ACCOUNT_CONNECT}
-      component={AccountConnect}
+      component={State2AccountConnectWrapper}
     />
     <Stack.Screen
       name={Routes.SHEET.ACCOUNT_PERMISSIONS}

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

@@ -4,7 +4,7 @@ import {
   selectDestToken,
 } from '../../../../../core/redux/slices/bridge';
 import { useDispatch, useSelector } from 'react-redux';
-import { DefaultSwapDestTokens } from '../../constants/default-swap-dest-tokens';
+import { getDefaultDestToken } from '../../utils/tokenUtils';
 import { selectChainId } from '../../../../../selectors/networkController';
 import { BridgeViewMode, BridgeToken } from '../../types';
 import { getNativeSourceToken } from '../useInitialSourceToken';
@@ -34,7 +34,7 @@ export const useInitialDestToken = (
   }
 
   const destTokenTargetChainId = initialSourceToken?.chainId ?? selectedChainId;
-  let defaultDestToken = DefaultSwapDestTokens[destTokenTargetChainId];
+  let defaultDestToken = getDefaultDestToken(destTokenTargetChainId);
 
   // If the initial source token is the same as the default dest token, set the default dest token to the native token
   if (

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

@@ -12,16 +12,16 @@ import { CaipChainId, Hex } from '@metamask/utils';
 import {
   getNativeAssetForChainId,
   isSolanaChainId,
+  formatChainIdToCaip,
+  formatChainIdToHex,
 } from '@metamask/bridge-controller';
 import { constants } from 'ethers';
-///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
 import { SolScope } from '@metamask/keyring-api';
 import usePrevious from '../../../../hooks/usePrevious';
 import {
   selectIsEvmNetworkSelected,
   selectSelectedNonEvmNetworkChainId,
 } from '../../../../../selectors/multichainNetworkController';
-///: END:ONLY_INCLUDE_IF
 
 export const getNativeSourceToken = (chainId: Hex | CaipChainId) => {
   const nativeAsset = getNativeAssetForChainId(chainId);
@@ -63,12 +63,7 @@ export const useInitialSourceToken = (
     domainIsConnectedDapp,
     networkName: selectedEvmNetworkName,
   } = useNetworkInfo();
-  const {
-    onSetRpcTarget,
-    ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
-    onNonEvmNetworkChange,
-    ///: END:ONLY_INCLUDE_IF
-  } = useSwitchNetworks({
+  const { onSetRpcTarget, onNonEvmNetworkChange } = useSwitchNetworks({
     domainIsConnectedDapp,
     selectedChainId: selectedEvmChainId,
     selectedNetworkName: selectedEvmNetworkName,
@@ -101,14 +96,19 @@ export const useInitialSourceToken = (
   }
 
   // Change network if necessary
-  if (initialSourceToken?.chainId && initialSourceToken?.chainId !== chainId) {
-    ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
-    if (initialSourceToken?.chainId === SolScope.Mainnet) {
-      onNonEvmNetworkChange(initialSourceToken.chainId);
-      return;
-    }
-    ///: END:ONLY_INCLUDE_IF
+  if (initialSourceToken?.chainId) {
+    // Convert both chain IDs to CAIP format for accurate comparison
+    const sourceCaipChainId = formatChainIdToCaip(initialSourceToken.chainId);
+    const currentCaipChainId = formatChainIdToCaip(chainId);
 
-    onSetRpcTarget(evmNetworkConfigurations[initialSourceToken.chainId as Hex]);
+    if (sourceCaipChainId !== currentCaipChainId) {
+      if (sourceCaipChainId === SolScope.Mainnet) {
+        onNonEvmNetworkChange(SolScope.Mainnet);
+        return;
+      }
+
+      const hexChainId = formatChainIdToHex(sourceCaipChainId);
+      onSetRpcTarget(evmNetworkConfigurations[hexChainId]);
+    }
   }
 };

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

@@ -2,16 +2,18 @@ import { useCallback } from 'react';
 import { useNavigation } from '@react-navigation/native';
 import useGoToPortfolioBridge from '../useGoToPortfolioBridge';
 import Routes from '../../../../../constants/navigation/Routes';
-import { Hex } from '@metamask/utils';
+import { Hex, CaipChainId } from '@metamask/utils';
 import Engine from '../../../../../core/Engine';
 import { useSelector } from 'react-redux';
 import { selectChainId } from '../../../../../selectors/networkController';
 import { BridgeToken, BridgeViewMode } from '../../types';
-import { getNativeAssetForChainId } from '@metamask/bridge-controller';
+import {
+  formatChainIdToHex,
+  getNativeAssetForChainId,
+  isSolanaChainId,
+} from '@metamask/bridge-controller';
 import { BridgeRouteParams } from '../../Views/BridgeView';
-///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
-import { SolScope } from '@metamask/keyring-api';
-///: END:ONLY_INCLUDE_IF
+import { SolScope, EthScope } from '@metamask/keyring-api';
 import { ethers } from 'ethers';
 import { MetaMetricsEvents, useMetrics } from '../../../../hooks/useMetrics';
 import { getDecimalChainId } from '../../../../../util/networks';
@@ -25,6 +27,7 @@ import {
 } from '../../../../../core/redux/slices/bridge';
 import { RootState } from '../../../../../reducers';
 import { trace, TraceName } from '../../../../../util/trace';
+import { useCurrentNetworkInfo } from '../../../../hooks/useCurrentNetworkInfo';
 
 export enum SwapBridgeNavigationLocation {
   TabBar = 'TabBar',
@@ -55,14 +58,37 @@ export const useSwapBridgeNavigation = ({
     selectIsBridgeEnabledSource(state, selectedChainId),
   );
   const isUnifiedSwapsEnabled = useSelector(selectIsUnifiedSwapsEnabled);
+  const currentNetworkInfo = useCurrentNetworkInfo();
 
   // Bridge
   const goToNativeBridge = useCallback(
     (bridgeViewMode: BridgeViewMode) => {
+      // Determine effective chain ID - use home page filter network when no sourceToken provided
+      const getEffectiveChainId = (): CaipChainId | Hex => {
+        if (tokenBase) {
+          // If specific token provided, use its chainId
+          return tokenBase.chainId;
+        }
+
+        // No token provided - check home page filter network
+        const homePageFilterNetwork = currentNetworkInfo.getNetworkInfo(0);
+        if (
+          !homePageFilterNetwork?.caipChainId ||
+          currentNetworkInfo.enabledNetworks.length > 1
+        ) {
+          // Fall back to mainnet if no filter or multiple networks
+          return EthScope.Mainnet;
+        }
+
+        return homePageFilterNetwork.caipChainId as CaipChainId;
+      };
+
+      const effectiveChainId = getEffectiveChainId();
+
       let bridgeSourceNativeAsset;
       try {
         if (!tokenBase) {
-          bridgeSourceNativeAsset = getNativeAssetForChainId(selectedChainId);
+          bridgeSourceNativeAsset = getNativeAssetForChainId(effectiveChainId);
         }
       } catch (error) {
         // Suppress error as it's expected when the chain is not supported
@@ -76,7 +102,9 @@ export const useSwapBridgeNavigation = ({
               symbol: bridgeSourceNativeAsset.symbol,
               image: bridgeSourceNativeAsset.iconUrl ?? '',
               decimals: bridgeSourceNativeAsset.decimals,
-              chainId: selectedChainId,
+              chainId: isSolanaChainId(effectiveChainId) // TODO: refactor for other non-evm chains
+                ? effectiveChainId
+                : formatChainIdToHex(effectiveChainId), // Use hex format for balance fetching compatibility, unless it's a Solana chain
             }
           : undefined;
 
@@ -118,13 +146,13 @@ export const useSwapBridgeNavigation = ({
     },
     [
       navigation,
-      selectedChainId,
       tokenBase,
       sourcePage,
       trackEvent,
       createEventBuilder,
       location,
       isBridgeEnabledSource,
+      currentNetworkInfo,
     ],
   );