fix: fix regression tests

MetaMask · Sep 30, 2024 · 5df8fb6 · 5df8fb6
1 parent 6451584
commit 5df8fb6
Show file tree

Hide file tree

Showing 11 changed files with 269 additions and 150 deletions.
diff --git a/...component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.tsx b/...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
@@ -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
@@ -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
@@ -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
@@ -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,13 +66,41 @@ 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);
   }
 
   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
@@ -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 = {