From 5df8fb6461624914adff96323f144574ec5c2adb Mon Sep 17 00:00:00 2001
From: salimtb <salim.toubal@outlook.com>
Date: Mon, 30 Sep 2024 12:49:41 +0200
Subject: [PATCH] fix: fix regression tests

---
 .../ListItemMultiSelectButton.tsx             |   1 -
 app/components/Nav/Main/index.js              |  39 ++-
 .../Views/NetworkSelector/NetworkSelector.tsx |  11 +
 .../NetworksSettings/NetworkSettings/index.js |  22 +-
 e2e/pages/modals/NetworkListModal.js          |  51 ++++
 .../Modals/NetworkListModal.selectors.js      |   2 +
 e2e/specs/networks/add-custom-rpc.spec.js     | 232 +++++++++---------
 .../networks/add-popular-networks.spec.js     |  14 +-
 .../networks/connect-test-network.spec.js     |   4 +
 e2e/specs/networks/networks-search.spec.js    |  42 ++--
 locales/languages/en.json                     |   1 +
 11 files changed, 269 insertions(+), 150 deletions(-)

diff --git a/app/component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.tsx b/app/component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.tsx
index d5c826cd0ef5..0c459067e349 100644
--- a/app/component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.tsx
+++ b/app/component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.tsx
@@ -80,7 +80,6 @@ const ListItemMultiSelectButton: React.FC<ListItemMultiSelectButtonProps> = ({
           <Button
             variant={ButtonVariants.Link}
             onPress={props.onButtonClick as () => void}
-            testID={BUTTON_TEXT_TEST_ID}
             labelTextVariant={TextVariant.BodyMD}
             size={ButtonSize.Lg}
             width={ButtonWidthTypes.Auto}
diff --git a/app/components/Nav/Main/index.js b/app/components/Nav/Main/index.js
index d800e78ce305..8dc029f26edc 100644
--- a/app/components/Nav/Main/index.js
+++ b/app/components/Nav/Main/index.js
@@ -59,6 +59,7 @@ import { useMinimumVersions } from '../../hooks/MinimumVersions';
 import navigateTermsOfUse from '../../../util/termsOfUse/termsOfUse';
 import {
   selectChainId,
+  selectNetworkConfigurations,
   selectProviderConfig,
   selectProviderType,
 } from '../../../selectors/networkController';
@@ -113,9 +114,6 @@ const Main = (props) => {
   useEnableAutomaticSecurityChecks();
   useMinimumVersions();
 
-
-
-
   useEffect(() => {
     if (DEPRECATED_NETWORKS.includes(props.chainId)) {
       setShowDeprecatedAlert(true);
@@ -235,8 +233,10 @@ const Main = (props) => {
    * Current network
    */
   const providerConfig = useSelector(selectProviderConfig);
+  const networkConfigurations = useSelector(selectNetworkConfigurations);
   const networkName = useSelector(selectNetworkName);
   const previousProviderConfig = useRef(undefined);
+  const previousNetworkConfigurations = useRef(undefined);
   const { toastRef } = useContext(ToastContext);
   const networkImage = useSelector(selectNetworkImageSource);
 
@@ -262,13 +262,44 @@ const Main = (props) => {
     previousProviderConfig.current = providerConfig;
   }, [providerConfig, networkName, networkImage, toastRef]);
 
+  // Show add network confirmation.
+  useEffect(() => {
+    if (
+      previousNetworkConfigurations.current &&
+      Object.values(networkConfigurations).length !==
+        Object.values(previousNetworkConfigurations.current).length
+    ) {
+      // Find the newly added network
+      const newNetworks = Object.values(networkConfigurations).filter(
+        (network) =>
+          !Object.values(previousNetworkConfigurations.current).includes(
+            network,
+          ),
+      );
+
+      toastRef?.current?.showToast({
+        variant: ToastVariants.Plain,
+        labelOptions: [
+          {
+            label: `${
+              newNetworks?.[0]?.name ?? strings('asset_details.network')
+            } `,
+            isBold: true,
+          },
+          { label: strings('toast.network_added') },
+        ],
+        networkImageSource: networkImage,
+      });
+    }
+    previousNetworkConfigurations.current = networkConfigurations;
+  }, [networkConfigurations, networkName, networkImage, toastRef]);
+
   useEffect(() => {
     if (locale.current !== I18n.locale) {
       locale.current = I18n.locale;
       initForceReload();
       return;
     }
-
   });
 
   // Remove all notifications that aren't visible
diff --git a/app/components/Views/NetworkSelector/NetworkSelector.tsx b/app/components/Views/NetworkSelector/NetworkSelector.tsx
index 70f4230c7d52..85445864b68c 100644
--- a/app/components/Views/NetworkSelector/NetworkSelector.tsx
+++ b/app/components/Views/NetworkSelector/NetworkSelector.tsx
@@ -423,6 +423,10 @@ const NetworkSelector = () => {
             networkName: mainnetName,
           })
         }
+        onLongPress={() => {
+          openModal(chainId, false, MAINNET, true);
+        }}
+        id={chainId}
       />
     );
   };
@@ -451,6 +455,9 @@ const NetworkSelector = () => {
         onButtonClick={() => {
           openModal(chainId, false, LINEA_MAINNET, true);
         }}
+        onLongPress={() => {
+          openModal(chainId, false, LINEA_MAINNET, true);
+        }}
         // TODO: Substitute with the new network controller's RPC array.
         onTextClick={() =>
           openRpcModal({
@@ -505,6 +512,9 @@ const NetworkSelector = () => {
             onButtonClick={() => {
               openModal(chainId, true, rpcUrl, false);
             }}
+            onLongPress={() => {
+              openModal(chainId, true, rpcUrl, false);
+            }}
             onTextClick={() =>
               openRpcModal({
                 rpcUrls: [hideKeyFromUrl(rpcUrl)],
@@ -881,6 +891,7 @@ const NetworkSelector = () => {
                 actionTitle={strings('app_settings.delete')}
                 iconName={IconName.Trash}
                 onPress={() => removeRpcUrl(showNetworkMenuModal.chainId)}
+                testID={`delete-network-button-${showNetworkMenuModal.chainId}`}
               />
             ) : null}
           </View>
diff --git a/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js b/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
index 0a35ea3e8204..b9cb4e2992ed 100644
--- a/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
+++ b/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
@@ -782,17 +782,17 @@ export class NetworkSettings extends PureComponent {
         ],
       });
 
-      const { networkClientId } =
-        addedNetwork?.rpcEndpoints?.[addedNetwork.defaultRpcEndpointIndex] ??
-        {};
-
-      await NetworkController.setActiveNetwork(networkClientId);
-      this.props.showNetworkOnboardingAction({
-        networkUrl,
-        networkType,
-        nativeToken,
-        showNetworkOnboarding,
-      });
+      // const { networkClientId } =
+      //   addedNetwork?.rpcEndpoints?.[addedNetwork.defaultRpcEndpointIndex] ??
+      //   {};
+
+      // await NetworkController.setActiveNetwork(networkClientId);
+      // this.props.showNetworkOnboardingAction({
+      //   networkUrl,
+      //   networkType,
+      //   nativeToken,
+      //   showNetworkOnboarding,
+      // });
     }
 
     isCustomMainnet
diff --git a/e2e/pages/modals/NetworkListModal.js b/e2e/pages/modals/NetworkListModal.js
index a177ab6ebe13..104524ee331a 100644
--- a/e2e/pages/modals/NetworkListModal.js
+++ b/e2e/pages/modals/NetworkListModal.js
@@ -5,6 +5,7 @@ import {
 import Matchers from '../../utils/Matchers';
 import Gestures from '../../utils/Gestures';
 import { CellModalSelectorsIDs } from '../../selectors/Modals/CellModal.selectors';
+import { NetworksViewSelectorsIDs } from '../../selectors/Settings/NetworksView.selectors';
 
 class NetworkListModal {
   get networkScroll() {
@@ -23,6 +24,28 @@ class NetworkListModal {
     );
   }
 
+  get closeIcon() {
+    return Matchers.getElementByID(NetworksViewSelectorsIDs.CLOSE_ICON);
+  }
+
+  get deleteNetworkButton() {
+    return Matchers.getElementByText(
+      NetworkListModalSelectorsText.DELETE_NETWORK,
+    );
+  }
+
+  get addPopularNetworkButton() {
+    return Matchers.getElementByText(
+      NetworkListModalSelectorsText.ADD_POPULAR_NETWORK_BUTTON,
+    );
+  }
+
+  get networkSearchInput() {
+    return Matchers.getElementByID(
+      NetworksViewSelectorsIDs.SEARCH_NETWORK_INPUT_BOX_ID,
+    );
+  }
+
   async getCustomNetwork(network, custom = false) {
     if (device.getPlatform() === 'android' || !custom) {
       return Matchers.getElementByText(network);
@@ -43,6 +66,14 @@ class NetworkListModal {
     await Gestures.swipe(this.networkScroll, 'up', 'fast');
   }
 
+  async tapDeleteButton() {
+    await Gestures.waitAndTap(this.deleteNetworkButton);
+  }
+
+  async scrollToTopOfNetworkList() {
+    await Gestures.swipe(this.networkScroll, 'down', 'fast');
+  }
+
   async swipeToDismissModal() {
     await Gestures.swipe(this.selectNetwork, 'down', 'slow', 0.6);
   }
@@ -50,6 +81,26 @@ class NetworkListModal {
   async tapTestNetworkSwitch() {
     await Gestures.waitAndTap(this.testNetToggle);
   }
+
+  async longPressOnNetwork(networkName) {
+    const network = Matchers.getElementByText(networkName);
+    await Gestures.tapAndLongPress(network);
+  }
+
+  async SearchNetworkName(networkName) {
+    await Gestures.typeTextAndHideKeyboard(
+      this.networkSearchInput,
+      networkName,
+    );
+  }
+
+  async tapClearSearch() {
+    await Gestures.waitAndTap(this.closeIcon);
+  }
+
+  async tapAddNetworkButton() {
+    await Gestures.waitAndTap(this.addPopularNetworkButton);
+  }
 }
 
 export default new NetworkListModal();
diff --git a/e2e/selectors/Modals/NetworkListModal.selectors.js b/e2e/selectors/Modals/NetworkListModal.selectors.js
index 338fd13576d5..2103e5c9abfb 100644
--- a/e2e/selectors/Modals/NetworkListModal.selectors.js
+++ b/e2e/selectors/Modals/NetworkListModal.selectors.js
@@ -2,6 +2,8 @@ import enContent from '../../../locales/languages/en.json';
 
 export const NetworkListModalSelectorsText = {
   SELECT_NETWORK: enContent.networks.select_network,
+  DELETE_NETWORK: enContent.app_settings.delete,
+  ADD_POPULAR_NETWORK_BUTTON: enContent.networks.add,
 };
 
 export const NetworkListModalSelectorsIDs = {
diff --git a/e2e/specs/networks/add-custom-rpc.spec.js b/e2e/specs/networks/add-custom-rpc.spec.js
index 7110a66c681c..6bece3157bc8 100644
--- a/e2e/specs/networks/add-custom-rpc.spec.js
+++ b/e2e/specs/networks/add-custom-rpc.spec.js
@@ -4,13 +4,9 @@ import { Regression } from '../../tags';
 import NetworkView from '../../pages/Settings/NetworksView';
 import WalletView from '../../pages/wallet/WalletView';
 import ToastModal from '../../pages/modals/ToastModal';
-import SettingsView from '../../pages/Settings/SettingsView';
 import NetworkListModal from '../../pages/modals/NetworkListModal';
 import NetworkEducationModal from '../../pages/modals/NetworkEducationModal';
-import NetworkAddedModal from '../../pages/modals/NetworkAddedModal';
-import NetworkApprovalModal from '../../pages/modals/NetworkApprovalModal';
 import { loginToApp } from '../../viewHelper';
-import TabBarComponent from '../../pages/TabBarComponent';
 import FixtureBuilder from '../../fixtures/fixture-builder';
 import {
   loadFixture,
@@ -21,9 +17,10 @@ import { getFixturesServerPort } from '../../fixtures/utils';
 import FixtureServer from '../../fixtures/fixture-server';
 import Assertions from '../../utils/Assertions';
 import { CustomNetworks } from '../../resources/networks.e2e';
+import Gestures from '../../utils/Gestures';
+import Matchers from '../../utils/Matchers';
 
 const fixtureServer = new FixtureServer();
-const MAINNET = 'Ethereum Main Network';
 
 describe(Regression('Custom RPC Tests'), () => {
   beforeAll(async () => {
@@ -47,9 +44,6 @@ describe(Regression('Custom RPC Tests'), () => {
 
   it('should go to network', async () => {
     await WalletView.tapNetworksButtonOnNavBar();
-    // TODO: fix this
-    // await Assertions.checkIfVisible(NetworkView.networkFormContainer);
-    // End of fix
   });
 
   it('should add Gnosis network', async () => {
@@ -85,110 +79,126 @@ describe(Regression('Custom RPC Tests'), () => {
       await NetworkView.tapChainIDLabel(); // Focus outside of text input field
       await NetworkView.tapRpcNetworkAddButton();
     }
+  });
+
+  it('should switch to Gnosis network', async () => {
+    await WalletView.tapNetworksButtonOnNavBar();
+    await NetworkListModal.changeNetworkTo(
+      CustomNetworks.Gnosis.providerConfig.nickname,
+    );
+  });
+
+  it('should dismiss network education modal', async () => {
+    await Assertions.checkIfVisible(NetworkEducationModal.container);
+    await Assertions.checkIfElementToHaveText(
+      NetworkEducationModal.networkName,
+      CustomNetworks.Gnosis.providerConfig.nickname,
+    );
+    await NetworkEducationModal.tapGotItButton();
+    await Assertions.checkIfNotVisible(NetworkEducationModal.container);
+    await Assertions.checkIfVisible(WalletView.container);
+    await Assertions.checkIfElementToHaveText(
+      WalletView.navbarNetworkText,
+      CustomNetworks.Gnosis.providerConfig.nickname,
+    );
+  });
 
-    // await Assertions.checkIfVisible(NetworkApprovalModal.container);
-    // await NetworkApprovalModal.tapApproveButton();
-    // await Assertions.checkIfVisible(NetworkAddedModal.switchNetwork);
-    // await NetworkAddedModal.tapSwitchToNetwork();
-    // await TestHelpers.delay(50000000);
+  it('should validate that Gnosis is added to network list', async () => {
+    // Tap to prompt network list
+    await WalletView.tapNetworksButtonOnNavBar();
+    await Assertions.checkIfVisible(NetworkListModal.networkScroll);
+
+    await Assertions.checkIfElementToHaveText(
+      WalletView.navbarNetworkText,
+      CustomNetworks.Gnosis.providerConfig.nickname,
+    );
+  });
+
+  it('should switch to Sepolia then dismiss the network education modal', async () => {
+    await NetworkListModal.scrollToBottomOfNetworkList();
+    await Assertions.checkIfToggleIsOn(NetworkListModal.testNetToggle);
+    await NetworkListModal.changeNetworkTo(
+      CustomNetworks.Sepolia.providerConfig.nickname,
+    );
+    await Assertions.checkIfVisible(NetworkEducationModal.container);
+    await Assertions.checkIfElementToHaveText(
+      NetworkEducationModal.networkName,
+      CustomNetworks.Sepolia.providerConfig.nickname,
+    );
+    await NetworkEducationModal.tapGotItButton();
+    await Assertions.checkIfNotVisible(NetworkEducationModal.container);
+    await Assertions.checkIfVisible(WalletView.container);
   });
 
-  // it('should dismiss network education modal', async () => {
-  //   await Assertions.checkIfVisible(NetworkEducationModal.container);
-  //   await Assertions.checkIfElementToHaveText(
-  //     NetworkEducationModal.networkName,
-  //     CustomNetworks.Gnosis.providerConfig.nickname,
-  //   );
-  //   await NetworkEducationModal.tapGotItButton();
-  //   await Assertions.checkIfNotVisible(NetworkEducationModal.container);
-  //   await Assertions.checkIfVisible(WalletView.container);
-  //   await Assertions.checkIfElementToHaveText(
-  //     WalletView.navbarNetworkText,
-  //     CustomNetworks.Gnosis.providerConfig.nickname,
-  //   );
-  // });
-
-  // it('should validate that Gnosis is added to network list', async () => {
-  //   // Tap to prompt network list
-  //   await WalletView.tapNetworksButtonOnNavBar();
-  //   await Assertions.checkIfVisible(NetworkListModal.networkScroll);
-  //   await Assertions.checkIfVisible(
-  //     NetworkListModal.getCustomNetwork(
-  //       CustomNetworks.Gnosis.providerConfig.nickname,
-  //       true,
-  //     ),
-  //   );
-  // });
-
-  // it('should switch to Sepolia then dismiss the network education modal', async () => {
-  //   await Assertions.checkIfToggleIsOn(NetworkListModal.testNetToggle);
-  //   await NetworkListModal.changeNetworkTo(
-  //     CustomNetworks.Sepolia.providerConfig.nickname,
-  //   );
-  //   await Assertions.checkIfVisible(NetworkEducationModal.container);
-  //   await Assertions.checkIfElementToHaveText(
-  //     NetworkEducationModal.networkName,
-  //     CustomNetworks.Sepolia.providerConfig.nickname,
-  //   );
-  //   await NetworkEducationModal.tapGotItButton();
-  //   await Assertions.checkIfNotVisible(NetworkEducationModal.container);
-  //   await Assertions.checkIfVisible(WalletView.container);
-  // });
-
-  // it('should switch back to Gnosis', async () => {
-  //   await Assertions.checkIfElementToHaveText(
-  //     WalletView.navbarNetworkText,
-  //     CustomNetworks.Sepolia.providerConfig.nickname,
-  //   );
-  //   await WalletView.tapNetworksButtonOnNavBar();
-  //   await Assertions.checkIfVisible(NetworkListModal.networkScroll);
-  //   await NetworkListModal.scrollToBottomOfNetworkList();
-  //   // Change to back to Gnosis Network
-  //   await NetworkListModal.changeNetworkTo(
-  //     CustomNetworks.Gnosis.providerConfig.nickname,
-  //     true,
-  //   );
-  //   await Assertions.checkIfVisible(WalletView.container);
-  //   await Assertions.checkIfElementToHaveText(
-  //     WalletView.navbarNetworkText,
-  //     CustomNetworks.Gnosis.providerConfig.nickname,
-  //   );
-  //   await Assertions.checkIfNotVisible(NetworkEducationModal.container);
-
-  //   try {
-  //     await Assertions.checkIfVisible(ToastModal.container);
-  //     await Assertions.checkIfNotVisible(ToastModal.container);
-  //   } catch {
-  //     // eslint-disable-next-line no-console
-  //     console.log('Toast is not visible');
-  //   }
-  // });
-
-  // it('should go to settings networks and remove xDai network', async () => {
-  //   await TabBarComponent.tapSettings();
-  //   await SettingsView.tapNetworks();
-  //   await Assertions.checkIfVisible(NetworkView.networkContainer);
-
-  //   await NetworkView.longPressToRemoveNetwork(
-  //     CustomNetworks.Gnosis.providerConfig.nickname,
-  //   );
-  //   if (device.getPlatform() === 'android') {
-  //     await device.disableSynchronization();
-  //   }
-  //   await NetworkEducationModal.tapGotItButton();
-
-  //   try {
-  //     await Assertions.checkIfVisible(ToastModal.container);
-  //     await Assertions.checkIfNotVisible(ToastModal.container);
-  //   } catch {
-  //     // eslint-disable-next-line no-console
-  //     console.log('Toast is not visible');
-  //   }
-  //   await TabBarComponent.tapWallet();
-  //   await Assertions.checkIfVisible(WalletView.container);
-  //   await Assertions.checkIfElementToHaveText(
-  //     WalletView.navbarNetworkText,
-  //     MAINNET,
-  //   );
-  // });
+  it('should switch back to Gnosis', async () => {
+    await WalletView.tapNetworksButtonOnNavBar();
+    await NetworkListModal.scrollToBottomOfNetworkList();
+    await Assertions.checkIfElementToHaveText(
+      WalletView.navbarNetworkText,
+      CustomNetworks.Sepolia.providerConfig.nickname,
+    );
+    await Assertions.checkIfVisible(NetworkListModal.networkScroll);
+    await NetworkListModal.scrollToTopOfNetworkList();
+    // // Change to back to Gnosis Network
+    await NetworkListModal.changeNetworkTo(
+      CustomNetworks.Gnosis.providerConfig.nickname,
+    );
+    await Assertions.checkIfVisible(WalletView.container);
+    await Assertions.checkIfElementToHaveText(
+      WalletView.navbarNetworkText,
+      CustomNetworks.Gnosis.providerConfig.nickname,
+    );
+    await Assertions.checkIfNotVisible(NetworkEducationModal.container);
+    try {
+      await Assertions.checkIfVisible(ToastModal.container);
+      await Assertions.checkIfNotVisible(ToastModal.container);
+    } catch {
+      // eslint-disable-next-line no-console
+      console.log('Toast is not visible');
+    }
+  });
+
+  it('should go to settings networks and remove xDai network', async () => {
+    await WalletView.tapNetworksButtonOnNavBar();
+    await NetworkListModal.scrollToBottomOfNetworkList();
+    await Assertions.checkIfToggleIsOn(NetworkListModal.testNetToggle);
+    await NetworkListModal.changeNetworkTo(
+      CustomNetworks.Sepolia.providerConfig.nickname,
+    );
+
+    // await NetworkEducationModal.tapGotItButton();
+    await WalletView.tapNetworksButtonOnNavBar();
+
+    await NetworkListModal.longPressOnNetwork(
+      CustomNetworks.Gnosis.providerConfig.nickname,
+    );
+
+    if (device.getPlatform() === 'android') {
+      await device.disableSynchronization();
+    }
+
+    // delete Gnosis network
+    const deleteButton = Matchers.getElementByID('delete-network-button-0x64');
+    await Gestures.waitAndTap(deleteButton);
+
+    await TestHelpers.delay(2000);
+
+    await NetworkListModal.tapDeleteButton();
+
+    try {
+      await Assertions.checkIfVisible(ToastModal.container);
+      await Assertions.checkIfNotVisible(ToastModal.container);
+    } catch {
+      // eslint-disable-next-line no-console
+      console.log('Toast is not visible');
+    }
+
+    try {
+      await Assertions.checkIfVisible(ToastModal.container);
+      await Assertions.checkIfNotVisible(ToastModal.container);
+    } catch {
+      // eslint-disable-next-line no-console
+      console.log('Toast is not visible');
+    }
+  });
 });
diff --git a/e2e/specs/networks/add-popular-networks.spec.js b/e2e/specs/networks/add-popular-networks.spec.js
index ce8ba6ce2e78..d7400336ba57 100644
--- a/e2e/specs/networks/add-popular-networks.spec.js
+++ b/e2e/specs/networks/add-popular-networks.spec.js
@@ -9,6 +9,9 @@ import { loginToApp } from '../../viewHelper';
 import TabBarComponent from '../../pages/TabBarComponent';
 import FixtureBuilder from '../../fixtures/fixture-builder';
 import { withFixtures } from '../../fixtures/fixture-helper';
+import WalletView from '../../pages/wallet/WalletView';
+import NetworkListModal from '../../pages/modals/NetworkListModal';
+import Assertions from '../../utils/Assertions';
 
 const Arbitrum = 'Arbitrum One';
 
@@ -27,10 +30,13 @@ describe(Regression('Add all popular networks'), () => {
       async () => {
         await loginToApp();
 
-        await TabBarComponent.tapSettings();
-        await SettingsView.tapNetworks();
-        await NetworkView.tapAddNetworkButton();
-        await NetworkView.tapNetworkByName(Arbitrum);
+        await WalletView.tapNetworksButtonOnNavBar();
+        await NetworkListModal.scrollToBottomOfNetworkList();
+
+        await Assertions.checkIfVisible(
+          NetworkListModal.addPopularNetworkButton,
+        );
+        await NetworkListModal.tapAddNetworkButton();
         await NetworkApprovalModal.tapApproveButton();
         await NetworkAddedModal.tapCloseButton();
       },
diff --git a/e2e/specs/networks/connect-test-network.spec.js b/e2e/specs/networks/connect-test-network.spec.js
index b5711acfa9ed..963a84fc82f4 100644
--- a/e2e/specs/networks/connect-test-network.spec.js
+++ b/e2e/specs/networks/connect-test-network.spec.js
@@ -41,6 +41,7 @@ describe(Regression('Connect to a Test Network'), () => {
   it('should switch to test Network then dismiss the network education modal', async () => {
     // Tap to prompt network list
     await WalletView.tapNetworksButtonOnNavBar();
+    await NetworkListModal.scrollToBottomOfNetworkList();
     await Assertions.checkIfVisible(NetworkListModal.networkScroll);
     await Assertions.checkIfToggleIsOn(NetworkListModal.testNetToggle);
     await NetworkListModal.changeNetworkTo(
@@ -62,12 +63,14 @@ describe(Regression('Connect to a Test Network'), () => {
 
   it('should not toggle off the Test Network switch while connected to test network', async () => {
     await WalletView.tapNetworksButtonOnNavBar();
+    await NetworkListModal.scrollToBottomOfNetworkList();
     await Assertions.checkIfVisible(NetworkListModal.networkScroll);
     await NetworkListModal.tapTestNetworkSwitch();
     await Assertions.checkIfToggleIsOn(NetworkListModal.testNetToggle);
   });
 
   it('should disconnect to Test Network', async () => {
+    await NetworkListModal.scrollToTopOfNetworkList();
     await NetworkListModal.changeNetworkTo(ETHEREUM);
     await Assertions.checkIfVisible(NetworkEducationModal.container);
     await Assertions.checkIfElementToHaveText(
@@ -85,6 +88,7 @@ describe(Regression('Connect to a Test Network'), () => {
 
   it('should toggle off the Test Network switch', async () => {
     await WalletView.tapNetworksButtonOnNavBar();
+    await NetworkListModal.scrollToBottomOfNetworkList();
     await Assertions.checkIfVisible(NetworkListModal.networkScroll);
     await Assertions.checkIfTextIsDisplayed(
       CustomNetworks.Sepolia.providerConfig.nickname,
diff --git a/e2e/specs/networks/networks-search.spec.js b/e2e/specs/networks/networks-search.spec.js
index 86c0b459e32b..42b0ea475b7d 100644
--- a/e2e/specs/networks/networks-search.spec.js
+++ b/e2e/specs/networks/networks-search.spec.js
@@ -10,8 +10,12 @@ import FixtureBuilder from '../../fixtures/fixture-builder';
 import { withFixtures } from '../../fixtures/fixture-helper';
 import Assertions from '../../utils/Assertions';
 import { PopularNetworksList } from '../../resources/networks.e2e';
+import WalletView from '../../pages/wallet/WalletView';
+import NetworkListModal from '../../pages/modals/NetworkListModal';
+import Matchers from '../../utils/Matchers';
+import Gestures from '../../utils/Gestures';
 
-const SHORT_HAND_NETWORK_TEXT = 'ava';
+const SHORT_HAND_NETWORK_TEXT = 'Ava';
 const INVALID_NETWORK_TEXT = 'cccM';
 describe(Regression('Networks Search'), () => {
   beforeAll(async () => {
@@ -28,28 +32,28 @@ describe(Regression('Networks Search'), () => {
       async () => {
         await loginToApp();
 
-        await TabBarComponent.tapSettings();
-        await SettingsView.tapNetworks();
-        await NetworkView.SearchNetworkName(INVALID_NETWORK_TEXT);
-        await Assertions.checkIfVisible(NetworkView.noMatchingText);
-        await NetworkView.tapClearSearch();
-        await NetworkView.SearchNetworkName(SHORT_HAND_NETWORK_TEXT);
-        await NetworkView.tapNetworkByName(
+        await WalletView.tapNetworksButtonOnNavBar();
+        await NetworkListModal.SearchNetworkName(INVALID_NETWORK_TEXT);
+        await NetworkListModal.tapClearSearch();
+        await NetworkListModal.SearchNetworkName(SHORT_HAND_NETWORK_TEXT);
+        await NetworkListModal.longPressOnNetwork(
           PopularNetworksList.Avalanche.providerConfig.nickname,
         );
-        await NetworkView.tapDeleteButton();
-        await Assertions.checkIfVisible(NetworkView.noMatchingText);
-        await NetworkView.tapClearSearch();
-        await Assertions.checkIfNotVisible(
-          NetworkView.getnetworkName(
-            PopularNetworksList.Avalanche.providerConfig.nickname,
-          ),
+        if (device.getPlatform() === 'android') {
+          await device.disableSynchronization();
+        }
+
+        // delete avalanche network
+        const deleteButton = Matchers.getElementByID(
+          'delete-network-button-0xa86a',
         );
-        await NetworkView.tapAddNetworkButton();
+        await Gestures.waitAndTap(deleteButton);
+
+        await TestHelpers.delay(2000);
+        await NetworkListModal.tapDeleteButton();
+
         await Assertions.checkIfVisible(
-          NetworkView.getnetworkName(
-            PopularNetworksList.Avalanche.providerConfig.nickname,
-          ),
+          NetworkListModal.addPopularNetworkButton,
         );
       },
     );
diff --git a/locales/languages/en.json b/locales/languages/en.json
index 4087997a3b2c..6cc11c22e9cc 100644
--- a/locales/languages/en.json
+++ b/locales/languages/en.json
@@ -727,6 +727,7 @@
   "toast": {
     "connected_and_active": "connected and active.",
     "now_active": "now active.",
+    "network_added": "was successfully added",
     "revoked": "revoked.",
     "revoked_all": "All accounts revoked.",
     "accounts_connected": "accounts connected.",