fix: fix non regression tests

app/components/UI/ReusableModal/ReusableModal.types.ts

@@ -17,6 +17,14 @@ export interface ReusableModalProps extends ViewProps {
    * @default true
    */
   isInteractable?: boolean;
+
+  /**
+   * Determines whether the navigation should revert to the previous path when the modal is closed.
+   * If set to `true`, closing the modal will trigger the navigation to go back to the previous screen or route.
+   * If set to `false`, the navigation will remain on the current path when the modal is closed.
+   * @default true
+   */
+  shouldGoBack?: boolean;
 }
 
 export type ReusableModalPostCallback = () => void;

app/components/UI/ReusableModal/index.tsx

@@ -47,7 +47,17 @@ import {
 export type { ReusableModalRef } from './ReusableModal.types';
 
 const ReusableModal = forwardRef<ReusableModalRef, ReusableModalProps>(
-  ({ children, onDismiss, isInteractable = true, style, ...props }, ref) => {
+  (
+    {
+      children,
+      onDismiss,
+      isInteractable = true,
+      shouldGoBack = true,
+      style,
+      ...props
+    },
+    ref,
+  ) => {
     const postCallback = useRef<ReusableModalPostCallback>();
     const { height: screenHeight } = useWindowDimensions();
     const { styles } = useStyles(styleSheet, {});
@@ -66,10 +76,12 @@ const ReusableModal = forwardRef<ReusableModalRef, ReusableModalProps>(
 
     const onHidden = useCallback(() => {
       // Sheet is automatically unmounted from the navigation stack.
-      navigation.goBack();
+      if (shouldGoBack) {
+        navigation.goBack();
+      }
       onDismiss?.(!!postCallback.current);
       postCallback.current?.();
-    }, [navigation, onDismiss]);
+    }, [navigation, onDismiss, shouldGoBack]);
 
     const gestureHandler = useAnimatedGestureHandler<
       PanGestureHandlerGestureEvent,

app/components/Views/NetworkSelector/NetworkSelector.tsx

@@ -159,9 +159,15 @@ const NetworkSelector = () => {
       networkName: '',
     });
 
-  const [showNetworkMenuModal, setNetworkMenuModal] = useState({
+  const [showNetworkMenuModal, setNetworkMenuModal] = useState<{
+    isVisible: boolean;
+    chainId: `0x${string}`;
+    displayEdit: boolean;
+    networkTypeOrRpcUrl: string;
+    isReadOnly: boolean;
+  }>({
     isVisible: false,
-    chainId: '',
+    chainId: '0x1',
     displayEdit: false,
     networkTypeOrRpcUrl: '',
     isReadOnly: false,
@@ -200,8 +206,15 @@ const NetworkSelector = () => {
 
       // Set the active network
       NetworkController.setActiveNetwork(clientId);
+      // Redirect to wallet page
+      navigate(Routes.WALLET.HOME, {
+        screen: Routes.WALLET.TAB_STACK_FLOW,
+        params: {
+          screen: Routes.WALLET_VIEW,
+        },
+      });
     },
-    [networkConfigurations],
+    [networkConfigurations, navigate],
   );
 
   const [showMultiRpcSelectModal, setShowMultiRpcSelectModal] = useState<{
@@ -220,54 +233,6 @@ const NetworkSelector = () => {
 
   const deleteModalSheetRef = useRef<BottomSheetRef>(null);
 
-  // The only possible value types are mainnet, linea-mainnet, sepolia and linea-sepolia
-  const onNetworkChange = (type: InfuraNetworkType) => {
-    const {
-      NetworkController,
-      CurrencyRateController,
-      AccountTrackerController,
-      SelectedNetworkController,
-    } = Engine.context;
-
-    if (domainIsConnectedDapp && process.env.MULTICHAIN_V1) {
-      SelectedNetworkController.setNetworkClientIdForDomain(origin, type);
-    } else {
-      let ticker = type;
-      if (type === LINEA_SEPOLIA) {
-        ticker = TESTNET_TICKER_SYMBOLS.LINEA_SEPOLIA as InfuraNetworkType;
-      }
-      if (type === SEPOLIA) {
-        ticker = TESTNET_TICKER_SYMBOLS.SEPOLIA as InfuraNetworkType;
-      }
-
-      const networkConfiguration =
-        NetworkController.getNetworkConfigurationByChainId(
-          BUILT_IN_NETWORKS[type].chainId,
-        );
-
-      const clientId =
-        networkConfiguration?.rpcEndpoints[
-          networkConfiguration.defaultRpcEndpointIndex
-        ].networkClientId ?? type;
-
-      CurrencyRateController.updateExchangeRate(ticker);
-      NetworkController.setActiveNetwork(clientId);
-      AccountTrackerController.refresh();
-
-      setTimeout(async () => {
-        await updateIncomingTransactions();
-      }, 1000);
-    }
-
-    sheetRef.current?.onCloseBottomSheet();
-
-    trackEvent(MetaMetricsEvents.NETWORK_SWITCHED, {
-      chain_id: getDecimalChainId(selectedChainId),
-      from_network: selectedNetworkName,
-      to_network: type,
-    });
-  };
-
   const onSetRpcTarget = async (networkConfiguration: NetworkConfiguration) => {
     const {
       CurrencyRateController,
@@ -343,7 +308,7 @@ const NetworkSelector = () => {
 
   const closeModal = useCallback(() => {
     setNetworkMenuModal(() => ({
-      chainId: '',
+      chainId: '0x1',
       isVisible: false,
       displayEdit: false,
       networkTypeOrRpcUrl: '',
@@ -384,6 +349,55 @@ const NetworkSelector = () => {
     Linking.openURL(strings('networks.learn_more_url'));
   };
 
+  // The only possible value types are mainnet, linea-mainnet, sepolia and linea-sepolia
+  const onNetworkChange = (type: InfuraNetworkType) => {
+    const {
+      NetworkController,
+      CurrencyRateController,
+      AccountTrackerController,
+      SelectedNetworkController,
+    } = Engine.context;
+
+    if (domainIsConnectedDapp && process.env.MULTICHAIN_V1) {
+      SelectedNetworkController.setNetworkClientIdForDomain(origin, type);
+    } else {
+      let ticker = type;
+      if (type === LINEA_SEPOLIA) {
+        ticker = TESTNET_TICKER_SYMBOLS.LINEA_SEPOLIA as InfuraNetworkType;
+      }
+      if (type === SEPOLIA) {
+        ticker = TESTNET_TICKER_SYMBOLS.SEPOLIA as InfuraNetworkType;
+      }
+
+      const networkConfiguration =
+        NetworkController.getNetworkConfigurationByChainId(
+          BUILT_IN_NETWORKS[type].chainId,
+        );
+
+      const clientId =
+        networkConfiguration?.rpcEndpoints[
+          networkConfiguration.defaultRpcEndpointIndex
+        ].networkClientId ?? type;
+
+      CurrencyRateController.updateExchangeRate(ticker);
+      NetworkController.setActiveNetwork(clientId);
+      closeRpcModal();
+      AccountTrackerController.refresh();
+
+      setTimeout(async () => {
+        await updateIncomingTransactions();
+      }, 1000);
+    }
+
+    sheetRef.current?.onCloseBottomSheet();
+
+    trackEvent(MetaMetricsEvents.NETWORK_SWITCHED, {
+      chain_id: getDecimalChainId(selectedChainId),
+      from_network: selectedNetworkName,
+      to_network: type,
+    });
+  };
+
   const filterNetworksByName = (
     networks: ExtendedNetwork[],
     networkName: string,
@@ -632,9 +646,7 @@ const NetworkSelector = () => {
       >;
       const { name, imageSource, chainId } = TypedNetworks[networkType];
 
-      const networkConfiguration = Object.values(networkConfigurations).find(
-        ({ chainId: networkId }) => networkId === chainId,
-      );
+      const networkConfiguration = networkConfigurations[chainId];
 
       const rpcUrl =
         networkConfiguration?.rpcEndpoints?.[
@@ -794,10 +806,8 @@ const NetworkSelector = () => {
     setSearchString('');
   };
 
-  const removeRpcUrl = (chainId: string) => {
-    const networkConfiguration = Object.values(networkConfigurations).find(
-      (config) => config.chainId === chainId,
-    );
+  const removeRpcUrl = (chainId: `0x${string}`) => {
+    const networkConfiguration = networkConfigurations[chainId];
 
     if (!networkConfiguration) {
       throw new Error(`Unable to find network with chain id ${chainId}`);
@@ -1020,7 +1030,7 @@ const NetworkSelector = () => {
                 actionTitle={strings('app_settings.delete')}
                 iconName={IconName.Trash}
                 onPress={() => removeRpcUrl(showNetworkMenuModal.chainId)}
-                testID={`delete-network-button-${showNetworkMenuModal.chainId}`}
+                testID={NetworkListModalSelectorsIDs.DELETE_NETWORK}
               />
             ) : null}
           </View>