From 067233a1b618efb96b6a50073f8ec3967e2bf9ac Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Wed, 21 Feb 2024 16:07:04 -0800
Subject: [PATCH 01/22] update selectors for onboarding

---
 e2e/pages/Onboarding/MetaMetricsOptInView.js  | 21 ++++++++++---------
 .../Onboarding/MetaMetricsOptIn.selectors.js  | 13 ++++++++++++
 2 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 e2e/selectors/Onboarding/MetaMetricsOptIn.selectors.js

diff --git a/e2e/pages/Onboarding/MetaMetricsOptInView.js b/e2e/pages/Onboarding/MetaMetricsOptInView.js
index a964daecdac..e2b8d678af8 100644
--- a/e2e/pages/Onboarding/MetaMetricsOptInView.js
+++ b/e2e/pages/Onboarding/MetaMetricsOptInView.js
@@ -1,29 +1,30 @@
-import {
-  OPTIN_METRICS_I_AGREE_BUTTON_ID,
-  OPTIN_METRICS_NO_THANKS_BUTTON_ID,
-  OPTIN_METRICS_PRIVACY_POLICY_DESCRIPTION_CONTENT_1_ID,
-  METAMETRICS_OPT_IN_CONTAINER_ID,
-} from '../../../wdio/screen-objects/testIDs/Screens/OptinMetricsScreen.testIds';
+import { MetaMetricsOptInSelectorsIDs } from '../../selectors/Onboarding/MetaMetricsOptIn.selectors';
 import Matchers from '../../utils/Matchers';
 import Gestures from '../../utils/Gestures';
 
 class MetaMetricsOptIn {
   get container() {
-    return Matchers.getElementByID(METAMETRICS_OPT_IN_CONTAINER_ID);
+    return Matchers.getElementByID(
+      MetaMetricsOptInSelectorsIDs.METAMETRICS_OPT_IN_CONTAINER_ID,
+    );
   }
 
   get optInMetricsContent() {
     return Matchers.getElementByID(
-      OPTIN_METRICS_PRIVACY_POLICY_DESCRIPTION_CONTENT_1_ID,
+      MetaMetricsOptInSelectorsIDs.OPTIN_METRICS_PRIVACY_POLICY_DESCRIPTION_CONTENT_1_ID,
     );
   }
 
   get iAgreeButton() {
-    return Matchers.getElementByID(OPTIN_METRICS_I_AGREE_BUTTON_ID);
+    return Matchers.getElementByID(
+      MetaMetricsOptInSelectorsIDs.OPTIN_METRICS_I_AGREE_BUTTON_ID,
+    );
   }
 
   get noThanksButton() {
-    return Matchers.getElementByID(OPTIN_METRICS_NO_THANKS_BUTTON_ID);
+    return Matchers.getElementByID(
+      MetaMetricsOptInSelectorsIDs.OPTIN_METRICS_NO_THANKS_BUTTON_ID,
+    );
   }
 
   async tapAgreeButton() {
diff --git a/e2e/selectors/Onboarding/MetaMetricsOptIn.selectors.js b/e2e/selectors/Onboarding/MetaMetricsOptIn.selectors.js
new file mode 100644
index 00000000000..64679ae3bde
--- /dev/null
+++ b/e2e/selectors/Onboarding/MetaMetricsOptIn.selectors.js
@@ -0,0 +1,13 @@
+// eslint-disable-next-line import/prefer-default-export
+export const MetaMetricsOptInSelectorsIDs = {
+  OPTIN_METRICS_TITLE_ID: 'optin-metrics-title-id',
+  OPTIN_METRICS_NO_THANKS_BUTTON_ID: 'optin-metrics-no-thanks-button-id',
+  OPTIN_METRICS_I_AGREE_BUTTON_ID: 'optin-metrics-i-agree-button-id',
+  OPTIN_METRICS_PRIVACY_POLICY_DESCRIPTION_CONTENT_1_ID:
+    'optin-metrics-privacy-policy-description',
+  OPTIN_METRICS_HERE_DEFAULT_NETWORK_ID: 'optin-metrics-default-network-id',
+  DEFAULT_NETWORK_RPC_URL: 'default-network-rpc-url',
+  DEFAULT_NETWORK_USE_THIS_NETWORK_BUTTON_ID:
+    'default-network-use-this-button-id',
+  METAMETRICS_OPT_IN_CONTAINER_ID: 'meta-metrics-container',
+};

From d01e258fc71edfc917d2e205e944626511942a2b Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Sun, 25 Feb 2024 22:28:40 -0800
Subject: [PATCH 02/22] add tests, views and selectors

---
 .../NetworksSettings/NetworkSettings/index.js |  7 +++
 e2e/pages/Onboarding/DefaultNetworkView.js    | 42 +++++++++++++++
 e2e/pages/Onboarding/MetaMetricsOptInView.js  |  9 ++++
 .../CustomDefaultNetwork.selectors.js         |  7 +++
 .../onboarding/add-custom-eth-mainnet.spec.js | 52 +++++++++++++++++++
 5 files changed, 117 insertions(+)
 create mode 100644 e2e/pages/Onboarding/DefaultNetworkView.js
 create mode 100644 e2e/selectors/Onboarding/CustomDefaultNetwork.selectors.js
 create mode 100644 e2e/specs/onboarding/add-custom-eth-mainnet.spec.js

diff --git a/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js b/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
index 35d975a66e7..a6687130fb8 100644
--- a/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
+++ b/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
@@ -7,6 +7,7 @@ import {
   TextInput,
   SafeAreaView,
   Linking,
+  Platform,
 } from 'react-native';
 import { connect } from 'react-redux';
 import {
@@ -65,6 +66,8 @@ import {
 import { regex } from '../../../../../../app/util/regex';
 import { NetworksViewSelectorsIDs } from '../../../../../../e2e/selectors/Settings/NetworksView.selectors';
 import { isSafeChainId, toHex } from '@metamask/controller-utils';
+import { CustomDefaultNetworkIDs } from '../../../../../../e2e/selectors/Onboarding/CustomDefaultNetwork.selectors';
+import generateTestId from '../../../../../../wdio/utils/generateTestId';
 
 const createStyles = (colors) =>
   StyleSheet.create({
@@ -1029,6 +1032,10 @@ class NetworkSettings extends PureComponent {
               size={ButtonSize.Lg}
               disabled={isActionDisabled}
               width={ButtonWidthTypes.Full}
+              {...generateTestId(
+                Platform,
+                CustomDefaultNetworkIDs.USE_THIS_NETWORK_BUTTON_ID,
+              )}
             />
           ) : (
             (addMode || editable) && (
diff --git a/e2e/pages/Onboarding/DefaultNetworkView.js b/e2e/pages/Onboarding/DefaultNetworkView.js
new file mode 100644
index 00000000000..8ba63e196fb
--- /dev/null
+++ b/e2e/pages/Onboarding/DefaultNetworkView.js
@@ -0,0 +1,42 @@
+import { NetworksViewSelectorsIDs } from '../../selectors/Settings/NetworksView.selectors';
+import Matchers from '../../utils/Matchers';
+import Gestures from '../../utils/Gestures';
+import NetworksView from '../Settings/NetworksView';
+import TestHelpers from '../../helpers';
+import {
+  CustomDefaultNetworkIDs,
+  CustomeDefaultNetworkTexts,
+} from '../../selectors/Onboarding/CustomDefaultNetwork.selectors';
+
+class DefaultNetworkView {
+  get useThisNetworkButton() {
+    return Matchers.getElementByID(
+      CustomDefaultNetworkIDs.USE_THIS_NETWORK_BUTTON_ID,
+    );
+  }
+
+  get invalidRPCLabel() {
+    return Matchers.getElementByID(NetworksViewSelectorsIDs.RPC_WARNING_BANNER);
+  }
+
+  async tapUseThisNetworkButton() {
+    if (device.getPlatform() === 'ios') {
+      await Gestures.waitAndTap(this.useThisNetworkButton);
+      await Gestures.waitAndTap(this.useThisNetworkButton);
+    } else {
+      await TestHelpers.waitAndTapByLabel(
+        CustomeDefaultNetworkTexts.USE_THIS_NETWORK_BUTTON_TEXT,
+      );
+      await TestHelpers.waitAndTapByLabel(
+        CustomeDefaultNetworkTexts.USE_THIS_NETWORK_BUTTON_TEXT,
+      );
+    }
+  }
+
+  async typeRpcURL(rpcURL) {
+    await (await NetworksView.rpcURLInput).clearText();
+    await NetworksView.typeInRpcUrl(rpcURL);
+  }
+}
+
+export default new DefaultNetworkView();
diff --git a/e2e/pages/Onboarding/MetaMetricsOptInView.js b/e2e/pages/Onboarding/MetaMetricsOptInView.js
index e2b8d678af8..a2c0ab960a1 100644
--- a/e2e/pages/Onboarding/MetaMetricsOptInView.js
+++ b/e2e/pages/Onboarding/MetaMetricsOptInView.js
@@ -36,6 +36,15 @@ class MetaMetricsOptIn {
     await Gestures.swipe(this.optInMetricsContent, 'up', 'fast', 0.9);
     await Gestures.waitAndTap(this.noThanksButton);
   }
+
+  async tapEditDefaultNetworkHere() {
+    await Gestures.swipe(this.optInMetricsContent, 'up', 'fast', 0.9);
+    if (device.getPlatform() === 'ios') {
+      await Gestures.tapAtPoint(this.container, { x: 333, y: 534 });
+    } else {
+      await Gestures.tapAtPoint(this.optInMetricsContent, { x: 15, y: 570 });
+    }
+  }
 }
 
 export default new MetaMetricsOptIn();
diff --git a/e2e/selectors/Onboarding/CustomDefaultNetwork.selectors.js b/e2e/selectors/Onboarding/CustomDefaultNetwork.selectors.js
new file mode 100644
index 00000000000..6c1d734a4cf
--- /dev/null
+++ b/e2e/selectors/Onboarding/CustomDefaultNetwork.selectors.js
@@ -0,0 +1,7 @@
+export const CustomDefaultNetworkIDs = {
+  USE_THIS_NETWORK_BUTTON_ID: 'use-this-network',
+};
+
+export const CustomeDefaultNetworkTexts = {
+  USE_THIS_NETWORK_BUTTON_TEXT: 'Use this network',
+};
diff --git a/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js b/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
new file mode 100644
index 00000000000..588aa2db1bd
--- /dev/null
+++ b/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
@@ -0,0 +1,52 @@
+import { Regression } from '../../tags';
+import OnboardingCarouselView from '../../pages/Onboarding/OnboardingCarouselView';
+import OnboardingView from '../../pages/Onboarding/OnboardingView';
+import Assertions from '../../utils/Assertions';
+import MetaMetricsOptIn from '../../pages/Onboarding/MetaMetricsOptInView';
+import DefaultNetworkView from '../../pages/Onboarding/DefaultNetworkView';
+import TermsOfUseModal from '../../pages/modals/TermsOfUseModal';
+import CreatePasswordView from '../../pages/Onboarding/CreatePasswordView';
+import EnableAutomaticSecurityChecksView from '../../pages/EnableAutomaticSecurityChecksView';
+import SkipAccountSecurityModal from '../../pages/modals/SkipAccountSecurityModal';
+import WalletView from '../../pages/WalletView';
+import ProtectYourWalletView from '../../pages/Onboarding/ProtectYourWalletView';
+
+describe(Regression('Add custom default ETH Mainnet'), () => {
+  beforeAll(async () => {
+    await device.launchApp();
+  });
+
+  it('should navigate to edit custome default ETH Mainnet from Opt-In screen', async () => {
+    await OnboardingCarouselView.tapOnGetStartedButton();
+    await OnboardingView.tapCreateWallet();
+    await Assertions.checkIfVisible(MetaMetricsOptIn.container);
+  });
+
+  it('should not edit default network with invalid RPC', async () => {
+    await MetaMetricsOptIn.tapEditDefaultNetworkHere();
+    await DefaultNetworkView.typeRpcURL('not a valid URL');
+    await Assertions.checkIfVisible(DefaultNetworkView.invalidRPCLabel);
+  });
+
+  it('should edit default ETH Mainnet with valid RPC', async () => {
+    await DefaultNetworkView.typeRpcURL('https://eth.llamarpc.com');
+    await DefaultNetworkView.tapUseThisNetworkButton();
+    await Assertions.checkIfVisible(MetaMetricsOptIn.container);
+  });
+
+  it('should show custom default ETH Mainnet as active', async () => {
+    await MetaMetricsOptIn.tapAgreeButton();
+    await TermsOfUseModal.tapScrollEndButton();
+    await TermsOfUseModal.tapAgreeCheckBox();
+    await TermsOfUseModal.tapAcceptButton();
+    await CreatePasswordView.enterPassword('Autop@ss1');
+    await CreatePasswordView.reEnterPassword('Autop@ss1');
+    await CreatePasswordView.tapIUnderstandCheckBox();
+    await CreatePasswordView.tapCreatePasswordButton();
+    await ProtectYourWalletView.tapOnRemindMeLaterButton();
+    await SkipAccountSecurityModal.tapIUnderstandCheckBox();
+    await SkipAccountSecurityModal.tapSkipButton();
+    await EnableAutomaticSecurityChecksView.tapNoThanks();
+    await WalletView.isNetworkNameVisible('Ethereum Main Custom');
+  });
+});

From 2df1f7eeaf668ab4db71ab13dc084ec13125d3e9 Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Sun, 25 Feb 2024 22:48:01 -0800
Subject: [PATCH 03/22] Update index.js

Fix merge conflicts
---
 .../Views/Settings/NetworksSettings/NetworkSettings/index.js    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js b/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
index 098bb22375f..5d3aa1a01d0 100644
--- a/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
+++ b/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
@@ -10,8 +10,6 @@ import {
   Platform,
 } from 'react-native';
 import { connect } from 'react-redux';
-import { isSafeChainId, toHex } from '@metamask/controller-utils';
-
 import {
   fontStyles,
   colors as staticColors,

From 1cc84963697134297fdb61a63db6fae3832aca20 Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Sun, 25 Feb 2024 22:59:15 -0800
Subject: [PATCH 04/22] update spelling

---
 e2e/selectors/Onboarding/CustomDefaultNetwork.selectors.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/selectors/Onboarding/CustomDefaultNetwork.selectors.js b/e2e/selectors/Onboarding/CustomDefaultNetwork.selectors.js
index 6c1d734a4cf..2709c02cd11 100644
--- a/e2e/selectors/Onboarding/CustomDefaultNetwork.selectors.js
+++ b/e2e/selectors/Onboarding/CustomDefaultNetwork.selectors.js
@@ -2,6 +2,6 @@ export const CustomDefaultNetworkIDs = {
   USE_THIS_NETWORK_BUTTON_ID: 'use-this-network',
 };
 
-export const CustomeDefaultNetworkTexts = {
+export const CustomDefaultNetworkTexts = {
   USE_THIS_NETWORK_BUTTON_TEXT: 'Use this network',
 };

From 81b9367d46b609950838748aade11bfe0da659b8 Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Sun, 25 Feb 2024 23:26:10 -0800
Subject: [PATCH 05/22] update reference

---
 e2e/pages/Onboarding/DefaultNetworkView.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/e2e/pages/Onboarding/DefaultNetworkView.js b/e2e/pages/Onboarding/DefaultNetworkView.js
index 8ba63e196fb..30472bbe92a 100644
--- a/e2e/pages/Onboarding/DefaultNetworkView.js
+++ b/e2e/pages/Onboarding/DefaultNetworkView.js
@@ -5,7 +5,7 @@ import NetworksView from '../Settings/NetworksView';
 import TestHelpers from '../../helpers';
 import {
   CustomDefaultNetworkIDs,
-  CustomeDefaultNetworkTexts,
+  CustomDefaultNetworkTexts,
 } from '../../selectors/Onboarding/CustomDefaultNetwork.selectors';
 
 class DefaultNetworkView {
@@ -25,10 +25,10 @@ class DefaultNetworkView {
       await Gestures.waitAndTap(this.useThisNetworkButton);
     } else {
       await TestHelpers.waitAndTapByLabel(
-        CustomeDefaultNetworkTexts.USE_THIS_NETWORK_BUTTON_TEXT,
+        CustomDefaultNetworkTexts.USE_THIS_NETWORK_BUTTON_TEXT,
       );
       await TestHelpers.waitAndTapByLabel(
-        CustomeDefaultNetworkTexts.USE_THIS_NETWORK_BUTTON_TEXT,
+        CustomDefaultNetworkTexts.USE_THIS_NETWORK_BUTTON_TEXT,
       );
     }
   }

From 279ed6364c5fbd9dec9fe5318d85d57423115319 Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Sun, 25 Feb 2024 23:28:55 -0800
Subject: [PATCH 06/22] update test description spelling

---
 e2e/specs/onboarding/add-custom-eth-mainnet.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js b/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
index 588aa2db1bd..6509cd86548 100644
--- a/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
+++ b/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
@@ -16,7 +16,7 @@ describe(Regression('Add custom default ETH Mainnet'), () => {
     await device.launchApp();
   });
 
-  it('should navigate to edit custome default ETH Mainnet from Opt-In screen', async () => {
+  it('should navigate to edit custom default ETH Mainnet from Opt-In screen', async () => {
     await OnboardingCarouselView.tapOnGetStartedButton();
     await OnboardingView.tapCreateWallet();
     await Assertions.checkIfVisible(MetaMetricsOptIn.container);

From 9f829e9e3c9db95708428ef9f20d2903293c28f8 Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Tue, 27 Feb 2024 20:52:44 -0800
Subject: [PATCH 07/22] use testID

---
 .../Settings/NetworksSettings/NetworkSettings/index.js      | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js b/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
index 5d3aa1a01d0..21db3698291 100644
--- a/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
+++ b/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
@@ -67,7 +67,6 @@ import { regex } from '../../../../../../app/util/regex';
 import { NetworksViewSelectorsIDs } from '../../../../../../e2e/selectors/Settings/NetworksView.selectors';
 import { isSafeChainId, toHex } from '@metamask/controller-utils';
 import { CustomDefaultNetworkIDs } from '../../../../../../e2e/selectors/Onboarding/CustomDefaultNetwork.selectors';
-import generateTestId from '../../../../../../wdio/utils/generateTestId';
 import { updateIncomingTransactions } from '../../../../../util/transaction-controller';
 
 const createStyles = (colors) =>
@@ -1032,10 +1031,7 @@ class NetworkSettings extends PureComponent {
               size={ButtonSize.Lg}
               disabled={isActionDisabled}
               width={ButtonWidthTypes.Full}
-              {...generateTestId(
-                Platform,
-                CustomDefaultNetworkIDs.USE_THIS_NETWORK_BUTTON_ID,
-              )}
+              testID={CustomDefaultNetworkIDs.USE_THIS_NETWORK_BUTTON_ID}
             />
           ) : (
             (addMode || editable) && (

From 37355c357436f649c9bfe46f461ecae352ea3527 Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Tue, 27 Feb 2024 21:19:31 -0800
Subject: [PATCH 08/22] remove redundant funciton

---
 e2e/pages/Onboarding/DefaultNetworkView.js          | 4 ----
 e2e/specs/onboarding/add-custom-eth-mainnet.spec.js | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/e2e/pages/Onboarding/DefaultNetworkView.js b/e2e/pages/Onboarding/DefaultNetworkView.js
index 30472bbe92a..0cd4062a67b 100644
--- a/e2e/pages/Onboarding/DefaultNetworkView.js
+++ b/e2e/pages/Onboarding/DefaultNetworkView.js
@@ -15,10 +15,6 @@ class DefaultNetworkView {
     );
   }
 
-  get invalidRPCLabel() {
-    return Matchers.getElementByID(NetworksViewSelectorsIDs.RPC_WARNING_BANNER);
-  }
-
   async tapUseThisNetworkButton() {
     if (device.getPlatform() === 'ios') {
       await Gestures.waitAndTap(this.useThisNetworkButton);
diff --git a/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js b/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
index 6509cd86548..08e376043b5 100644
--- a/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
+++ b/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
@@ -10,6 +10,7 @@ import EnableAutomaticSecurityChecksView from '../../pages/EnableAutomaticSecuri
 import SkipAccountSecurityModal from '../../pages/modals/SkipAccountSecurityModal';
 import WalletView from '../../pages/WalletView';
 import ProtectYourWalletView from '../../pages/Onboarding/ProtectYourWalletView';
+import NetworksView from '../../pages/Settings/NetworksView';
 
 describe(Regression('Add custom default ETH Mainnet'), () => {
   beforeAll(async () => {
@@ -25,7 +26,7 @@ describe(Regression('Add custom default ETH Mainnet'), () => {
   it('should not edit default network with invalid RPC', async () => {
     await MetaMetricsOptIn.tapEditDefaultNetworkHere();
     await DefaultNetworkView.typeRpcURL('not a valid URL');
-    await Assertions.checkIfVisible(DefaultNetworkView.invalidRPCLabel);
+    await Assertions.checkIfVisible(NetworksView.rpcWarningBanner);
   });
 
   it('should edit default ETH Mainnet with valid RPC', async () => {

From 3dd1dc549ef54490ef46a6145c034a7d1bad0452 Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Tue, 27 Feb 2024 22:18:10 -0800
Subject: [PATCH 09/22] remove imports

---
 .../Views/Settings/NetworksSettings/NetworkSettings/index.js     | 1 -
 e2e/pages/Onboarding/DefaultNetworkView.js                       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js b/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
index 21db3698291..321ccd13acb 100644
--- a/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
+++ b/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
@@ -7,7 +7,6 @@ import {
   TextInput,
   SafeAreaView,
   Linking,
-  Platform,
 } from 'react-native';
 import { connect } from 'react-redux';
 import {
diff --git a/e2e/pages/Onboarding/DefaultNetworkView.js b/e2e/pages/Onboarding/DefaultNetworkView.js
index 0cd4062a67b..dc4f6652564 100644
--- a/e2e/pages/Onboarding/DefaultNetworkView.js
+++ b/e2e/pages/Onboarding/DefaultNetworkView.js
@@ -1,4 +1,3 @@
-import { NetworksViewSelectorsIDs } from '../../selectors/Settings/NetworksView.selectors';
 import Matchers from '../../utils/Matchers';
 import Gestures from '../../utils/Gestures';
 import NetworksView from '../Settings/NetworksView';

From 3c59197c527f20f43d2621e73c28201b96f1fda2 Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Tue, 27 Feb 2024 23:50:35 -0800
Subject: [PATCH 10/22] use Gestures for waitAndTapByLabel

---
 e2e/pages/Onboarding/DefaultNetworkView.js |  5 ++---
 e2e/utils/Gestures.js                      | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/e2e/pages/Onboarding/DefaultNetworkView.js b/e2e/pages/Onboarding/DefaultNetworkView.js
index dc4f6652564..33719b72b03 100644
--- a/e2e/pages/Onboarding/DefaultNetworkView.js
+++ b/e2e/pages/Onboarding/DefaultNetworkView.js
@@ -1,7 +1,6 @@
 import Matchers from '../../utils/Matchers';
 import Gestures from '../../utils/Gestures';
 import NetworksView from '../Settings/NetworksView';
-import TestHelpers from '../../helpers';
 import {
   CustomDefaultNetworkIDs,
   CustomDefaultNetworkTexts,
@@ -19,10 +18,10 @@ class DefaultNetworkView {
       await Gestures.waitAndTap(this.useThisNetworkButton);
       await Gestures.waitAndTap(this.useThisNetworkButton);
     } else {
-      await TestHelpers.waitAndTapByLabel(
+      await Gestures.waitAndTapByLabel(
         CustomDefaultNetworkTexts.USE_THIS_NETWORK_BUTTON_TEXT,
       );
-      await TestHelpers.waitAndTapByLabel(
+      await Gestures.waitAndTapByLabel(
         CustomDefaultNetworkTexts.USE_THIS_NETWORK_BUTTON_TEXT,
       );
     }
diff --git a/e2e/utils/Gestures.js b/e2e/utils/Gestures.js
index f636f03535b..e2a52c314ed 100644
--- a/e2e/utils/Gestures.js
+++ b/e2e/utils/Gestures.js
@@ -53,6 +53,24 @@ class Gestures {
     await element.atIndex(index).tap();
   }
 
+  /**
+   * Waits for an element with a specific label to become visible within a given timeout, then taps on it.
+   * This function is particularly useful in automated UI testing where you need to interact with elements that may take some time to appear.
+   *
+   * @param {string} text The label of the element to wait for and tap.
+   * @param {number} [timeout=8000] The maximum amount of time (in milliseconds) to wait for the element to become visible. Defaults to 8000ms if not specified.
+   * @param {number} [index=0] The index of the element to tap if there are multiple elements with the same label. Defaults to 0 (the first element) if not specified.
+   * @returns {Promise<void>} A promise that resolves when the tap action has been completed.
+   * @static
+   * @async
+   */
+  static async waitAndTapByLabel(text, timeout = 8000, index = 0) {
+    await waitFor(element(by.label(text)))
+      .toBeVisible()
+      .withTimeout(timeout);
+    await element(by.label(text)).atIndex(index).tap();
+  }
+
   /**
    * Wait for an element to be visible and then tap it.
    *

From 27f6689fabe65c9b6df9d09b0ce778c8a34e7294 Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Thu, 29 Feb 2024 13:18:56 -0700
Subject: [PATCH 11/22] use updated selectors and testID

---
 app/components/UI/OptinMetrics/index.js | 28 +++++++++----------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/app/components/UI/OptinMetrics/index.js b/app/components/UI/OptinMetrics/index.js
index 666f50c094a..63e6f18bdc2 100644
--- a/app/components/UI/OptinMetrics/index.js
+++ b/app/components/UI/OptinMetrics/index.js
@@ -8,7 +8,6 @@ import {
   BackHandler,
   Alert,
   InteractionManager,
-  Platform,
 } from 'react-native';
 import PropTypes from 'prop-types';
 import { baseStyles, fontStyles } from '../../../styles/common';
@@ -22,17 +21,9 @@ import { ONBOARDING_WIZARD } from '../../../constants/storage';
 import AppConstants from '../../../core/AppConstants';
 import { Analytics, MetaMetricsEvents } from '../../../core/Analytics';
 import { withMetricsAwareness } from '../../hooks/useMetrics';
-
 import DefaultPreference from 'react-native-default-preference';
 import { ThemeContext } from '../../../util/theme';
-import generateTestId from '../../../../wdio/utils/generateTestId';
-import {
-  OPTIN_METRICS_I_AGREE_BUTTON_ID,
-  OPTIN_METRICS_NO_THANKS_BUTTON_ID,
-  OPTIN_METRICS_TITLE_ID,
-  METAMETRICS_OPT_IN_CONTAINER_ID,
-  OPTIN_METRICS_PRIVACY_POLICY_DESCRIPTION_CONTENT_1_ID,
-} from '../../../../wdio/screen-objects/testIDs/Screens/OptinMetricsScreen.testIds';
+import { MetaMetricsOptInSelectorsIDs } from '../../../../e2e/selectors/Onboarding/MetaMetricsOptIn.selectors';
 import Button, {
   ButtonVariants,
   ButtonSize,
@@ -415,7 +406,9 @@ class OptinMetrics extends PureComponent {
         <Button
           variant={ButtonVariants.Secondary}
           onPress={this.onCancel}
-          {...generateTestId(Platform, OPTIN_METRICS_NO_THANKS_BUTTON_ID)}
+          testID={
+            MetaMetricsOptInSelectorsIDs.OPTIN_METRICS_NO_THANKS_BUTTON_ID
+          }
           style={styles.button}
           label={strings('privacy_policy.cta_no_thanks')}
           size={ButtonSize.Lg}
@@ -425,7 +418,7 @@ class OptinMetrics extends PureComponent {
         <Button
           variant={ButtonVariants.Primary}
           onPress={this.onConfirm}
-          {...generateTestId(Platform, OPTIN_METRICS_I_AGREE_BUTTON_ID)}
+          testID={MetaMetricsOptInSelectorsIDs.OPTIN_METRICS_I_AGREE_BUTTON_ID}
           style={styles.button}
           label={strings('privacy_policy.cta_i_agree')}
           size={ButtonSize.Lg}
@@ -487,7 +480,7 @@ class OptinMetrics extends PureComponent {
     return (
       <SafeAreaView
         style={styles.root}
-        {...generateTestId(Platform, METAMETRICS_OPT_IN_CONTAINER_ID)}
+        testID={MetaMetricsOptInSelectorsIDs.METAMETRICS_OPT_IN_CONTAINER_ID}
       >
         <ScrollView
           style={styles.root}
@@ -499,16 +492,15 @@ class OptinMetrics extends PureComponent {
           <View style={styles.wrapper}>
             <Text
               style={styles.title}
-              {...generateTestId(Platform, OPTIN_METRICS_TITLE_ID)}
+              testID={MetaMetricsOptInSelectorsIDs.OPTIN_METRICS_TITLE_ID}
             >
               {strings('privacy_policy.description_title')}
             </Text>
             <Text
               style={styles.content}
-              {...generateTestId(
-                Platform,
-                OPTIN_METRICS_PRIVACY_POLICY_DESCRIPTION_CONTENT_1_ID,
-              )}
+              testID={
+                MetaMetricsOptInSelectorsIDs.OPTIN_METRICS_PRIVACY_POLICY_DESCRIPTION_CONTENT_1_ID
+              }
             >
               {strings('privacy_policy.description_content_1')}
             </Text>

From 8b77f427fe37a0ff94a5fb4dc3d3825003560f00 Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Thu, 29 Feb 2024 14:16:39 -0700
Subject: [PATCH 12/22] use test data object

---
 .../onboarding/add-custom-eth-mainnet.spec.js      | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js b/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
index 08e376043b5..9a301543ddd 100644
--- a/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
+++ b/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
@@ -12,6 +12,12 @@ import WalletView from '../../pages/WalletView';
 import ProtectYourWalletView from '../../pages/Onboarding/ProtectYourWalletView';
 import NetworksView from '../../pages/Settings/NetworksView';
 
+const testData = {
+  password: 'Autop@ss1',
+  invalidURL: 'not a valid url',
+  validURL: 'https://eth.llamarpc.com',
+};
+
 describe(Regression('Add custom default ETH Mainnet'), () => {
   beforeAll(async () => {
     await device.launchApp();
@@ -25,12 +31,12 @@ describe(Regression('Add custom default ETH Mainnet'), () => {
 
   it('should not edit default network with invalid RPC', async () => {
     await MetaMetricsOptIn.tapEditDefaultNetworkHere();
-    await DefaultNetworkView.typeRpcURL('not a valid URL');
+    await DefaultNetworkView.typeRpcURL(testData.invalidURL);
     await Assertions.checkIfVisible(NetworksView.rpcWarningBanner);
   });
 
   it('should edit default ETH Mainnet with valid RPC', async () => {
-    await DefaultNetworkView.typeRpcURL('https://eth.llamarpc.com');
+    await DefaultNetworkView.typeRpcURL(testData.validURL);
     await DefaultNetworkView.tapUseThisNetworkButton();
     await Assertions.checkIfVisible(MetaMetricsOptIn.container);
   });
@@ -40,8 +46,8 @@ describe(Regression('Add custom default ETH Mainnet'), () => {
     await TermsOfUseModal.tapScrollEndButton();
     await TermsOfUseModal.tapAgreeCheckBox();
     await TermsOfUseModal.tapAcceptButton();
-    await CreatePasswordView.enterPassword('Autop@ss1');
-    await CreatePasswordView.reEnterPassword('Autop@ss1');
+    await CreatePasswordView.enterPassword(testData.password);
+    await CreatePasswordView.reEnterPassword(testData.password);
     await CreatePasswordView.tapIUnderstandCheckBox();
     await CreatePasswordView.tapCreatePasswordButton();
     await ProtectYourWalletView.tapOnRemindMeLaterButton();

From ab01d6996c484aeed8a7e4a4d914f0e876abb7c5 Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Thu, 29 Feb 2024 14:19:05 -0700
Subject: [PATCH 13/22] add urls to blacklist

---
 e2e/resources/blacklistURLs.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/e2e/resources/blacklistURLs.json b/e2e/resources/blacklistURLs.json
index 1701ce9b7f0..df2c6cfb137 100644
--- a/e2e/resources/blacklistURLs.json
+++ b/e2e/resources/blacklistURLs.json
@@ -8,6 +8,8 @@
     ".*rpc.tenderly.co/.*",
     ".*api-goerli.etherscan.io/.*",
     ".*cloudflare-ipfs.com/.*",
-    ".*stale.*"
+    ".*stale.*",
+    ".*phishing-detection.metafi.codefi.network/.*",
+    ".*token-api.metaswap.codefi.network/.*"
   ]
 }

From 419d25c10ad106dc294d496ce44c667e52e23d6d Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Fri, 1 Mar 2024 05:38:37 -0700
Subject: [PATCH 14/22] remove dupe import

---
 .../Views/Settings/NetworksSettings/NetworkSettings/index.js     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js b/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
index bbfb80801b4..241ed74d769 100644
--- a/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
+++ b/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
@@ -9,7 +9,6 @@ import {
   Linking,
 } from 'react-native';
 import { connect } from 'react-redux';
-import { isSafeChainId, toHex } from '@metamask/controller-utils';
 import { typography } from '@metamask/design-tokens';
 import {
   fontStyles,

From e5cd0fe50ea4ab56592ffda491d45d00dc6e34aa Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Fri, 1 Mar 2024 11:21:05 -0700
Subject: [PATCH 15/22] use app text for selector text

---
 e2e/selectors/Onboarding/CustomDefaultNetwork.selectors.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/e2e/selectors/Onboarding/CustomDefaultNetwork.selectors.js b/e2e/selectors/Onboarding/CustomDefaultNetwork.selectors.js
index 2709c02cd11..e3483e8aec9 100644
--- a/e2e/selectors/Onboarding/CustomDefaultNetwork.selectors.js
+++ b/e2e/selectors/Onboarding/CustomDefaultNetwork.selectors.js
@@ -1,7 +1,9 @@
+import messages from '../../../locales/languages/en.json';
+
 export const CustomDefaultNetworkIDs = {
   USE_THIS_NETWORK_BUTTON_ID: 'use-this-network',
 };
 
 export const CustomDefaultNetworkTexts = {
-  USE_THIS_NETWORK_BUTTON_TEXT: 'Use this network',
+  USE_THIS_NETWORK_BUTTON_TEXT: messages.app_settings.networks_default_cta,
 };

From 151a36bec99edebbb5529655bb815f8c1d78f0e5 Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Fri, 1 Mar 2024 16:14:59 -0700
Subject: [PATCH 16/22] use existing password helper

---
 e2e/specs/onboarding/add-custom-eth-mainnet.spec.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js b/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
index 9a301543ddd..691f8f8b34b 100644
--- a/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
+++ b/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
@@ -11,9 +11,11 @@ import SkipAccountSecurityModal from '../../pages/modals/SkipAccountSecurityModa
 import WalletView from '../../pages/WalletView';
 import ProtectYourWalletView from '../../pages/Onboarding/ProtectYourWalletView';
 import NetworksView from '../../pages/Settings/NetworksView';
+import Accounts from '../../../wdio/helpers/Accounts';
+
+const validAccount = Accounts.getValidAccount();
 
 const testData = {
-  password: 'Autop@ss1',
   invalidURL: 'not a valid url',
   validURL: 'https://eth.llamarpc.com',
 };
@@ -46,8 +48,8 @@ describe(Regression('Add custom default ETH Mainnet'), () => {
     await TermsOfUseModal.tapScrollEndButton();
     await TermsOfUseModal.tapAgreeCheckBox();
     await TermsOfUseModal.tapAcceptButton();
-    await CreatePasswordView.enterPassword(testData.password);
-    await CreatePasswordView.reEnterPassword(testData.password);
+    await CreatePasswordView.enterPassword(validAccount.password);
+    await CreatePasswordView.reEnterPassword(validAccount.password);
     await CreatePasswordView.tapIUnderstandCheckBox();
     await CreatePasswordView.tapCreatePasswordButton();
     await ProtectYourWalletView.tapOnRemindMeLaterButton();

From 63dd26471e6837221f9a1f89ef06a73e7e9b83e2 Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Fri, 1 Mar 2024 16:21:29 -0700
Subject: [PATCH 17/22] use default custom name from networks constants

---
 e2e/specs/onboarding/add-custom-eth-mainnet.spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js b/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
index 691f8f8b34b..55507dc1ac6 100644
--- a/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
+++ b/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
@@ -12,6 +12,7 @@ import WalletView from '../../pages/WalletView';
 import ProtectYourWalletView from '../../pages/Onboarding/ProtectYourWalletView';
 import NetworksView from '../../pages/Settings/NetworksView';
 import Accounts from '../../../wdio/helpers/Accounts';
+import { DEFAULT_MAINNET_CUSTOM_NAME } from '../../../app/constants/network';
 
 const validAccount = Accounts.getValidAccount();
 
@@ -56,6 +57,6 @@ describe(Regression('Add custom default ETH Mainnet'), () => {
     await SkipAccountSecurityModal.tapIUnderstandCheckBox();
     await SkipAccountSecurityModal.tapSkipButton();
     await EnableAutomaticSecurityChecksView.tapNoThanks();
-    await WalletView.isNetworkNameVisible('Ethereum Main Custom');
+    await WalletView.isNetworkNameVisible(DEFAULT_MAINNET_CUSTOM_NAME);
   });
 });

From 85e44fd851f3ca9f13e15bbcee35815ef233c01d Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Fri, 1 Mar 2024 17:08:25 -0700
Subject: [PATCH 18/22] remove unecessary function from Gestures and use proper
 Matchers

---
 e2e/pages/Onboarding/DefaultNetworkView.js | 23 +++++++++-------------
 e2e/utils/Gestures.js                      | 18 -----------------
 2 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/e2e/pages/Onboarding/DefaultNetworkView.js b/e2e/pages/Onboarding/DefaultNetworkView.js
index 33719b72b03..f5fecb810f5 100644
--- a/e2e/pages/Onboarding/DefaultNetworkView.js
+++ b/e2e/pages/Onboarding/DefaultNetworkView.js
@@ -8,23 +8,18 @@ import {
 
 class DefaultNetworkView {
   get useThisNetworkButton() {
-    return Matchers.getElementByID(
-      CustomDefaultNetworkIDs.USE_THIS_NETWORK_BUTTON_ID,
-    );
+    return device.getPlatform() === 'ios'
+      ? Matchers.getElementByID(
+          CustomDefaultNetworkIDs.USE_THIS_NETWORK_BUTTON_ID,
+        )
+      : Matchers.getElementByLabel(
+          CustomDefaultNetworkTexts.USE_THIS_NETWORK_BUTTON_TEXT,
+        );
   }
 
   async tapUseThisNetworkButton() {
-    if (device.getPlatform() === 'ios') {
-      await Gestures.waitAndTap(this.useThisNetworkButton);
-      await Gestures.waitAndTap(this.useThisNetworkButton);
-    } else {
-      await Gestures.waitAndTapByLabel(
-        CustomDefaultNetworkTexts.USE_THIS_NETWORK_BUTTON_TEXT,
-      );
-      await Gestures.waitAndTapByLabel(
-        CustomDefaultNetworkTexts.USE_THIS_NETWORK_BUTTON_TEXT,
-      );
-    }
+    await Gestures.waitAndTap(this.useThisNetworkButton);
+    await Gestures.waitAndTap(this.useThisNetworkButton);
   }
 
   async typeRpcURL(rpcURL) {
diff --git a/e2e/utils/Gestures.js b/e2e/utils/Gestures.js
index e2a52c314ed..f636f03535b 100644
--- a/e2e/utils/Gestures.js
+++ b/e2e/utils/Gestures.js
@@ -53,24 +53,6 @@ class Gestures {
     await element.atIndex(index).tap();
   }
 
-  /**
-   * Waits for an element with a specific label to become visible within a given timeout, then taps on it.
-   * This function is particularly useful in automated UI testing where you need to interact with elements that may take some time to appear.
-   *
-   * @param {string} text The label of the element to wait for and tap.
-   * @param {number} [timeout=8000] The maximum amount of time (in milliseconds) to wait for the element to become visible. Defaults to 8000ms if not specified.
-   * @param {number} [index=0] The index of the element to tap if there are multiple elements with the same label. Defaults to 0 (the first element) if not specified.
-   * @returns {Promise<void>} A promise that resolves when the tap action has been completed.
-   * @static
-   * @async
-   */
-  static async waitAndTapByLabel(text, timeout = 8000, index = 0) {
-    await waitFor(element(by.label(text)))
-      .toBeVisible()
-      .withTimeout(timeout);
-    await element(by.label(text)).atIndex(index).tap();
-  }
-
   /**
    * Wait for an element to be visible and then tap it.
    *

From abfc4babd91ba20d808c15cdd735e22ffa8bc906 Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Wed, 6 Mar 2024 13:39:51 -0800
Subject: [PATCH 19/22] add custom mainnet to networks and use in test

---
 e2e/resources/networks.json                        | 10 ++++++++++
 .../onboarding/add-custom-eth-mainnet.spec.js      | 14 +++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/e2e/resources/networks.json b/e2e/resources/networks.json
index 9b8278ae68d..59067db346d 100644
--- a/e2e/resources/networks.json
+++ b/e2e/resources/networks.json
@@ -71,5 +71,15 @@
       "nickname": "Gnosis",
       "ticker": "xDAI"
     }
+  },
+  "Ethereum Main Custom": {
+    "providerConfig": {
+      "type": "rpc",
+      "chainId": "1",
+      "rpcUrl": "https://eth.llamarpc.com",
+      "invalidUrl": "not a valid url",
+      "nickname": "Custom Mainnet",
+      "ticker": "ETH"
+    }
   }
 }
diff --git a/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js b/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
index 55507dc1ac6..c823b2ddce7 100644
--- a/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
+++ b/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
@@ -13,14 +13,10 @@ import ProtectYourWalletView from '../../pages/Onboarding/ProtectYourWalletView'
 import NetworksView from '../../pages/Settings/NetworksView';
 import Accounts from '../../../wdio/helpers/Accounts';
 import { DEFAULT_MAINNET_CUSTOM_NAME } from '../../../app/constants/network';
+import networks from '../../resources/networks.json';
 
 const validAccount = Accounts.getValidAccount();
 
-const testData = {
-  invalidURL: 'not a valid url',
-  validURL: 'https://eth.llamarpc.com',
-};
-
 describe(Regression('Add custom default ETH Mainnet'), () => {
   beforeAll(async () => {
     await device.launchApp();
@@ -34,12 +30,16 @@ describe(Regression('Add custom default ETH Mainnet'), () => {
 
   it('should not edit default network with invalid RPC', async () => {
     await MetaMetricsOptIn.tapEditDefaultNetworkHere();
-    await DefaultNetworkView.typeRpcURL(testData.invalidURL);
+    await DefaultNetworkView.typeRpcURL(
+      networks['Ethereum Main Custom'].providerConfig.invalidUrl,
+    );
     await Assertions.checkIfVisible(NetworksView.rpcWarningBanner);
   });
 
   it('should edit default ETH Mainnet with valid RPC', async () => {
-    await DefaultNetworkView.typeRpcURL(testData.validURL);
+    await DefaultNetworkView.typeRpcURL(
+      networks['Ethereum Main Custom'].providerConfig.rpcUrl,
+    );
     await DefaultNetworkView.tapUseThisNetworkButton();
     await Assertions.checkIfVisible(MetaMetricsOptIn.container);
   });

From 76be4001b607b5759f726f0bd9e1abff944812b9 Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Wed, 6 Mar 2024 16:57:23 -0800
Subject: [PATCH 20/22] update invalid url

---
 e2e/resources/networks.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/resources/networks.json b/e2e/resources/networks.json
index 59067db346d..878b59ecad9 100644
--- a/e2e/resources/networks.json
+++ b/e2e/resources/networks.json
@@ -77,7 +77,7 @@
       "type": "rpc",
       "chainId": "1",
       "rpcUrl": "https://eth.llamarpc.com",
-      "invalidUrl": "not a valid url",
+      "invalidUrl": "https//rpc.mevblocker.io",
       "nickname": "Custom Mainnet",
       "ticker": "ETH"
     }

From 125073eaa159a6d5bdfd8e1c7016e9ffeb98f1da Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Thu, 7 Mar 2024 10:35:47 -0800
Subject: [PATCH 21/22] remove invalid rpc from networks and add back into test

---
 e2e/resources/networks.json                         | 1 -
 e2e/specs/onboarding/add-custom-eth-mainnet.spec.js | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/e2e/resources/networks.json b/e2e/resources/networks.json
index 878b59ecad9..abd41d79088 100644
--- a/e2e/resources/networks.json
+++ b/e2e/resources/networks.json
@@ -77,7 +77,6 @@
       "type": "rpc",
       "chainId": "1",
       "rpcUrl": "https://eth.llamarpc.com",
-      "invalidUrl": "https//rpc.mevblocker.io",
       "nickname": "Custom Mainnet",
       "ticker": "ETH"
     }
diff --git a/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js b/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
index c823b2ddce7..99ff4f199a4 100644
--- a/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
+++ b/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
@@ -30,9 +30,7 @@ describe(Regression('Add custom default ETH Mainnet'), () => {
 
   it('should not edit default network with invalid RPC', async () => {
     await MetaMetricsOptIn.tapEditDefaultNetworkHere();
-    await DefaultNetworkView.typeRpcURL(
-      networks['Ethereum Main Custom'].providerConfig.invalidUrl,
-    );
+    await DefaultNetworkView.typeRpcURL('https//rpc.mevblocker.io');
     await Assertions.checkIfVisible(NetworksView.rpcWarningBanner);
   });
 

From 51f5ad885bf6626ce7454628dee9f3b8bbe35369 Mon Sep 17 00:00:00 2001
From: CW <chris.wilcox@consensys.net>
Date: Thu, 7 Mar 2024 14:56:00 -0800
Subject: [PATCH 22/22] use dot notation to access network property

---
 e2e/resources/networks.json                         | 4 ++--
 e2e/specs/onboarding/add-custom-eth-mainnet.spec.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/e2e/resources/networks.json b/e2e/resources/networks.json
index abd41d79088..6cce343759e 100644
--- a/e2e/resources/networks.json
+++ b/e2e/resources/networks.json
@@ -72,12 +72,12 @@
       "ticker": "xDAI"
     }
   },
-  "Ethereum Main Custom": {
+  "EthereumMainCustom": {
     "providerConfig": {
       "type": "rpc",
       "chainId": "1",
       "rpcUrl": "https://eth.llamarpc.com",
-      "nickname": "Custom Mainnet",
+      "nickname": "Ethereum Main Custom",
       "ticker": "ETH"
     }
   }
diff --git a/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js b/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
index 99ff4f199a4..795aacb1d80 100644
--- a/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
+++ b/e2e/specs/onboarding/add-custom-eth-mainnet.spec.js
@@ -13,7 +13,7 @@ import ProtectYourWalletView from '../../pages/Onboarding/ProtectYourWalletView'
 import NetworksView from '../../pages/Settings/NetworksView';
 import Accounts from '../../../wdio/helpers/Accounts';
 import { DEFAULT_MAINNET_CUSTOM_NAME } from '../../../app/constants/network';
-import networks from '../../resources/networks.json';
+import Networks from '../../resources/networks.json';
 
 const validAccount = Accounts.getValidAccount();
 
@@ -36,7 +36,7 @@ describe(Regression('Add custom default ETH Mainnet'), () => {
 
   it('should edit default ETH Mainnet with valid RPC', async () => {
     await DefaultNetworkView.typeRpcURL(
-      networks['Ethereum Main Custom'].providerConfig.rpcUrl,
+      Networks.EthereumMainCustom.providerConfig.rpcUrl,
     );
     await DefaultNetworkView.tapUseThisNetworkButton();
     await Assertions.checkIfVisible(MetaMetricsOptIn.container);