diff --git a/app/components/Base/DetailsModal.js b/app/components/Base/DetailsModal.js
index a5ca13c1937..da1b0096359 100644
--- a/app/components/Base/DetailsModal.js
+++ b/app/components/Base/DetailsModal.js
@@ -5,10 +5,7 @@ import Ionicons from 'react-native-vector-icons/Ionicons';
 import { fontStyles } from '../../styles/common';
 import Text from './Text';
 import { useTheme } from '../../util/theme';
-import {
-  DETAILS_MODAL_TITLE,
-  DETAILS_MODAL_CLOSE_ICON,
-} from '../../../wdio/screen-objects/testIDs/Components/DetailsModal.js';
+import { TransactionDetailsModalSelectorsIDs } from '../../../e2e/selectors/Modals/TransactionDetailsModal.selectors';
 
 const createStyles = (colors) =>
   StyleSheet.create({
@@ -85,7 +82,7 @@ const DetailsModalTitle = ({ style, ...props }) => {
 
   return (
     <Text
-      testID={DETAILS_MODAL_TITLE}
+      testID={TransactionDetailsModalSelectorsIDs.TITLE}
       style={[styles.title, style]}
       {...props}
     />
@@ -99,7 +96,7 @@ const DetailsModalCloseIcon = ({ style, ...props }) => {
     <TouchableOpacity
       style={[styles.closeIcon, style]}
       {...props}
-      testID={DETAILS_MODAL_CLOSE_ICON}
+      testID={TransactionDetailsModalSelectorsIDs.CLOSE_ICON}
     >
       <Ionicons color={colors.text.default} name={'ios-close'} size={38} />
     </TouchableOpacity>
@@ -109,7 +106,13 @@ const DetailsModalBody = ({ style, ...props }) => {
   const { colors } = useTheme();
   const styles = createStyles(colors);
 
-  return <View style={[styles.body, style]} {...props} />;
+  return (
+    <View
+      testID={TransactionDetailsModalSelectorsIDs.BODY}
+      style={[styles.body, style]}
+      {...props}
+    />
+  );
 };
 const DetailsModalSection = ({ style, borderBottom, ...props }) => {
   const { colors } = useTheme();
diff --git a/app/components/Base/StatusText.js b/app/components/Base/StatusText.js
index 83f1ffc1966..0de17d43962 100644
--- a/app/components/Base/StatusText.js
+++ b/app/components/Base/StatusText.js
@@ -5,7 +5,7 @@ import { StyleSheet } from 'react-native';
 import { FIAT_ORDER_STATES } from '../../constants/on-ramp';
 import { strings } from '../../../locales/i18n';
 import { useTheme } from '../../util/theme';
-import { DETAILS_MODAL_TITLE } from '../../../wdio/screen-objects/testIDs/Components/DetailsModal.js';
+import { CommonSelectorsIDs } from '../../../e2e/selectors/Common.selectors';
 
 const styles = StyleSheet.create({
   status: {
@@ -17,7 +17,7 @@ const styles = StyleSheet.create({
 
 export const ConfirmedText = (props) => (
   <Text
-    testID={DETAILS_MODAL_TITLE}
+    testID={CommonSelectorsIDs.STATUS_CONFIRMED}
     bold
     green
     style={styles.status}
diff --git a/app/components/UI/NetworkModal/NetworkAdded/index.tsx b/app/components/UI/NetworkModal/NetworkAdded/index.tsx
index 2b4039a8f6b..b888ab7143e 100644
--- a/app/components/UI/NetworkModal/NetworkAdded/index.tsx
+++ b/app/components/UI/NetworkModal/NetworkAdded/index.tsx
@@ -4,10 +4,8 @@ import StyledButton from '../../StyledButton';
 import { strings } from '../../../../../locales/i18n';
 import Text from '../../../Base/Text';
 import { useTheme } from '../../../../util/theme';
-import {
-  NEW_NETWORK_ADDED_SWITCH_TO_NETWORK_BUTTON,
-  NEW_NETWORK_ADDED_CLOSE_BUTTON,
-} from '../../../../../wdio/screen-objects/testIDs/Screens/NetworksScreen.testids';
+import { NetworkAddedModalSelectorsIDs } from '../../../../../e2e/selectors/Modals/NetworkAddedModal.selectors';
+
 const createStyles = (colors: any) =>
   StyleSheet.create({
     buttonView: {
@@ -54,7 +52,7 @@ const NetworkAdded = (props: NetworkAddedProps) => {
       <View style={styles.buttonView}>
         <StyledButton
           type={'cancel'}
-          testID={NEW_NETWORK_ADDED_CLOSE_BUTTON}
+          testID={NetworkAddedModalSelectorsIDs.CLOSE_NETWORK_BUTTON}
           onPress={closeModal}
           containerStyle={[styles.button, styles.cancel]}
         >
@@ -63,7 +61,7 @@ const NetworkAdded = (props: NetworkAddedProps) => {
         <StyledButton
           type={'confirm'}
           onPress={switchNetwork}
-          testID={NEW_NETWORK_ADDED_SWITCH_TO_NETWORK_BUTTON}
+          testID={NetworkAddedModalSelectorsIDs.SWITCH_NETWORK_BUTTON}
           containerStyle={[styles.button, styles.confirm]}
         >
           {strings('networks.switch_network')}
diff --git a/app/components/UI/Tabs/index.js b/app/components/UI/Tabs/index.js
index 7c337d5cc94..6f002584f8a 100644
--- a/app/components/UI/Tabs/index.js
+++ b/app/components/UI/Tabs/index.js
@@ -7,7 +7,6 @@ import {
   ScrollView,
   TouchableOpacity,
   StyleSheet,
-  Platform,
 } from 'react-native';
 import MaterialCommunityIcon from 'react-native-vector-icons/MaterialCommunityIcons';
 import PropTypes from 'prop-types';
@@ -19,7 +18,6 @@ import { MetaMetricsEvents } from '../../../core/Analytics';
 import AnalyticsV2 from '../../../util/analyticsV2';
 
 import { ThemeContext, mockTheme } from '../../../util/theme';
-import generateTestId from '../../../../wdio/utils/generateTestId';
 import {
   MULTI_TAB_ADD_BUTTON,
   MULTI_TAB_CLOSE_ALL_BUTTON,
@@ -231,10 +229,7 @@ export default class Tabs extends PureComponent {
 
     return (
       <View style={styles.noTabs}>
-        <Text
-          style={styles.noTabsTitle}
-          {...generateTestId(Platform, MULTI_TAB_NO_TABS_MESSAGE)}
-        >
+        <Text style={styles.noTabsTitle} testID={MULTI_TAB_NO_TABS_MESSAGE}>
           {strings('browser.no_tabs_title')}
         </Text>
         <Text style={styles.noTabsDesc}>{strings('browser.no_tabs_desc')}</Text>
@@ -287,7 +282,7 @@ export default class Tabs extends PureComponent {
         <TouchableOpacity
           style={[styles.tabAction, styles.tabActionleft]}
           onPress={closeAllTabs}
-          {...generateTestId(Platform, MULTI_TAB_CLOSE_ALL_BUTTON)}
+          testID={MULTI_TAB_CLOSE_ALL_BUTTON}
         >
           <Text
             style={[
@@ -302,7 +297,7 @@ export default class Tabs extends PureComponent {
           <TouchableOpacity
             style={styles.newTabIconButton}
             onPress={this.onNewTabPress}
-            {...generateTestId(Platform, MULTI_TAB_ADD_BUTTON)}
+            testID={MULTI_TAB_ADD_BUTTON}
           >
             <MaterialCommunityIcon
               name="plus"
@@ -315,7 +310,7 @@ export default class Tabs extends PureComponent {
         <TouchableOpacity
           style={[styles.tabAction, styles.tabActionRight]}
           onPress={closeTabsView}
-          {...generateTestId(Platform, MULTI_TAB_DONE_BUTTON)}
+          testID={MULTI_TAB_DONE_BUTTON}
         >
           <Text
             style={[
diff --git a/app/components/Views/AccountPermissions/AccountPermissionsConnected/AccountPermissionsConnected.tsx b/app/components/Views/AccountPermissions/AccountPermissionsConnected/AccountPermissionsConnected.tsx
index 635ca6a680a..a727f51378e 100644
--- a/app/components/Views/AccountPermissions/AccountPermissionsConnected/AccountPermissionsConnected.tsx
+++ b/app/components/Views/AccountPermissions/AccountPermissionsConnected/AccountPermissionsConnected.tsx
@@ -140,10 +140,7 @@ const AccountPermissionsConnected = ({
   return (
     <>
       <SheetHeader title={strings('accounts.connected_accounts_title')} />
-      <View
-        style={styles.body}
-        testID={ConnectedAccountsSelectorsIDs.CONTAINER}
-      >
+      <View style={styles.body}>
         <TagUrl
           imageSource={favicon}
           label={urlWithProtocol}
diff --git a/e2e/pages/CommonView.js b/e2e/pages/CommonView.js
index 227dd129187..32d4f10c61e 100644
--- a/e2e/pages/CommonView.js
+++ b/e2e/pages/CommonView.js
@@ -18,7 +18,6 @@ class CommonView {
   get errorMessage() {
     return Matchers.getElementByID(CommonSelectorsIDs.ERROR_MESSAGE);
   }
-
   async tapBackButton() {
     await Gestures.waitAndTap(this.backButton);
   }
diff --git a/e2e/pages/modals/ConnectedAccountsModal.js b/e2e/pages/modals/ConnectedAccountsModal.js
index 1c66d17d3ec..ce6391583c2 100644
--- a/e2e/pages/modals/ConnectedAccountsModal.js
+++ b/e2e/pages/modals/ConnectedAccountsModal.js
@@ -6,10 +6,6 @@ import Matchers from '../../utils/Matchers';
 import Gestures from '../../utils/Gestures';
 
 class ConnectedAccountsModal {
-  get container() {
-    return Matchers.getElementByID(ConnectedAccountsSelectorsIDs.CONTAINER);
-  }
-
   get permissionsButton() {
     return Matchers.getElementByText(
       ConnectedAccountModalSelectorsText.PERMISSION_LINK,
@@ -34,6 +30,10 @@ class ConnectedAccountsModal {
     );
   }
 
+  get title() {
+    return Matchers.getElementByText(ConnectedAccountModalSelectorsText.TITLE);
+  }
+
   async tapPermissionsButton() {
     await Gestures.waitAndTap(this.permissionsButton);
   }
@@ -50,7 +50,7 @@ class ConnectedAccountsModal {
   // }
 
   async scrollToBottomOfModal() {
-    await Gestures.swipe(this.container, 'down', 'fast');
+    await Gestures.swipe(this.title, 'down', 'fast');
   }
 
   async tapConnectMoreAccountsButton() {
diff --git a/e2e/pages/modals/DeleteWalletModal.js b/e2e/pages/modals/DeleteWalletModal.js
index 79979e59202..4a59a45a85c 100644
--- a/e2e/pages/modals/DeleteWalletModal.js
+++ b/e2e/pages/modals/DeleteWalletModal.js
@@ -1,38 +1,40 @@
-import TestHelpers from '../../helpers';
 import {
   DeleteWalletModalSelectorsIDs,
   DeleteWalletModalSelectorsText,
 } from '../../selectors/Modals/DeleteWalletModal.selectors';
-import { CommonSelectorsText } from '../../selectors/Common.selectors';
+import Matchers from '../../utils/Matchers';
+import Gestures from '../../utils/Gestures';
 
-export default class DeleteWalletModal {
-  static async tapIUnderstandButton() {
-    await TestHelpers.delay(2000);
-    await TestHelpers.tapByText(
+class DeleteWalletModal {
+  get container() {
+    return Matchers.getElementByID(DeleteWalletModalSelectorsIDs.CONTAINER);
+  }
+
+  get understandButton() {
+    return Matchers.getElementByText(
       DeleteWalletModalSelectorsText.UNDERSTAND_BUTTON,
     );
   }
 
-  static async tapCancelButton() {
-    await TestHelpers.tapByText(CommonSelectorsText.CANCEL_BUTTON);
+  get deleteWalletButton() {
+    return Matchers.getElementByText(DeleteWalletModalSelectorsText.DELETE_MY);
   }
-  static async tapDeleteMyWalletButton() {
-    await TestHelpers.tapByText(DeleteWalletModalSelectorsText.DELETE_MY);
+
+  get deleteInput() {
+    return Matchers.getElementByID(DeleteWalletModalSelectorsIDs.INPUT);
   }
-  static async typeDeleteInInputBox() {
-    await TestHelpers.typeTextAndHideKeyboard(
-      DeleteWalletModalSelectorsIDs.INPUT,
-      'delete',
-    );
+
+  async tapIUnderstandButton() {
+    await Gestures.waitAndTap(this.understandButton);
   }
 
-  static async isVisible() {
-    await TestHelpers.checkIfVisible(DeleteWalletModalSelectorsIDs.CONTAINER);
+  async tapDeleteMyWalletButton() {
+    await Gestures.waitAndTap(this.deleteWalletButton);
   }
 
-  static async isNotVisible() {
-    await TestHelpers.checkIfNotVisible(
-      DeleteWalletModalSelectorsIDs.CONTAINER,
-    );
+  async typeDeleteInInputBox() {
+    await Gestures.typeTextAndHideKeyboard(this.deleteInput, 'delete');
   }
 }
+
+export default new DeleteWalletModal();
diff --git a/e2e/pages/modals/DetailsModal.js b/e2e/pages/modals/DetailsModal.js
index 3c698aa8256..cceeed5459d 100644
--- a/e2e/pages/modals/DetailsModal.js
+++ b/e2e/pages/modals/DetailsModal.js
@@ -1,32 +1,43 @@
-import TestHelpers from '../../helpers';
 import {
-  DETAILS_MODAL_TITLE,
-  DETAILS_MODAL_STATUS_CONFIRMED,
-  DETAILS_MODAL_CLOSE_ICON,
-} from '../../../wdio/screen-objects/testIDs/Components/DetailsModal.js';
-import { TransactionDetailsModalSelectorsText } from '../../selectors/Modals/TransactionDetailsModal.selectors';
+  TransactionDetailsModalSelectorsText,
+  TransactionDetailsModalSelectorsIDs,
+} from '../../selectors/Modals/TransactionDetailsModal.selectors';
+import Matchers from '../../utils/Matchers';
+import Gestures from '../../utils/Gestures';
+import { CommonSelectorsIDs } from '../../selectors/Common.selectors';
 
-export default class DetailsModal {
-  static async isTitleVisible(sourceToken, destinationToken) {
-    let title = TransactionDetailsModalSelectorsText.TITLE;
-    title = title.replace('{{sourceToken}}', sourceToken);
-    title = title.replace('{{destinationToken}}', destinationToken);
-    await TestHelpers.checkIfElementHasString(DETAILS_MODAL_TITLE, title);
+class DetailsModal {
+  get title() {
+    return Matchers.getElementByID(TransactionDetailsModalSelectorsIDs.TITLE);
+  }
+
+  get closeIcon() {
+    return Matchers.getElementByID(
+      TransactionDetailsModalSelectorsIDs.CLOSE_ICON,
+    );
   }
 
-  static async isStatusCorrect(status) {
-    await TestHelpers.checkIfElementHasString(
-      DETAILS_MODAL_STATUS_CONFIRMED,
-      status,
+  get statusConfirmed() {
+    return Matchers.getElementIDWithAncestor(
+      CommonSelectorsIDs.STATUS_CONFIRMED,
+      TransactionDetailsModalSelectorsIDs.BODY,
     );
   }
 
-  static async tapOnCloseIcon() {
+  generateExpectedTitle(sourceToken, destinationToken) {
+    let title = TransactionDetailsModalSelectorsText.TITLE;
+    title = title.replace('{{sourceToken}}', sourceToken);
+    title = title.replace('{{destinationToken}}', destinationToken);
+    return title;
+  }
+
+  async tapOnCloseIcon() {
     try {
-      await TestHelpers.waitAndTap(DETAILS_MODAL_CLOSE_ICON);
-      await TestHelpers.delay(1000);
+      await Gestures.waitAndTap(this.closeIcon);
     } catch {
       //
     }
   }
 }
+
+export default new DetailsModal();
diff --git a/e2e/pages/modals/NetworkAddedModal.js b/e2e/pages/modals/NetworkAddedModal.js
index a890e074c42..12ebc183a01 100644
--- a/e2e/pages/modals/NetworkAddedModal.js
+++ b/e2e/pages/modals/NetworkAddedModal.js
@@ -1,37 +1,44 @@
-import TestHelpers from '../../helpers';
 import {
   NetworkAddedModalSelectorsIDs,
   NetworkAddedModalSelectorsText,
 } from '../../selectors/Modals/NetworkAddedModal.selectors';
+import Matchers from '../../utils/Matchers';
+import Gestures from '../../utils/Gestures';
 
-export default class NetworkAddedModal {
-  static async tapSwitchToNetwork() {
-    await TestHelpers.tap(NetworkAddedModalSelectorsIDs.SWITCH_NETWORK_BUTTON);
+class NetworkAddedModal {
+  get switchNetwork() {
+    return Matchers.getElementByText(
+      NetworkAddedModalSelectorsText.SWITCH_NETWORK,
+    );
   }
-  static async tapCloseButton() {
-    await TestHelpers.tap(NetworkAddedModalSelectorsIDs.CLOSE_NETWORK_BUTTON);
+
+  get switchNetworkButton() {
+    return device.getPlatform() === 'android'
+      ? Matchers.getElementByLabel(
+          NetworkAddedModalSelectorsIDs.SWITCH_NETWORK_BUTTON,
+        )
+      : Matchers.getElementByID(
+          NetworkAddedModalSelectorsIDs.SWITCH_NETWORK_BUTTON,
+        );
   }
 
-  static async isVisible() {
-    await TestHelpers.checkIfElementWithTextIsVisible(
-      NetworkAddedModalSelectorsText.SWITCH_NETWORK,
-    );
+  get closeNetworkButton() {
+    return device.getPlatform() === 'android'
+      ? Matchers.getElementByLabel(
+          NetworkAddedModalSelectorsIDs.CLOSE_NETWORK_BUTTON,
+        )
+      : Matchers.getElementByID(
+          NetworkAddedModalSelectorsIDs.CLOSE_NETWORK_BUTTON,
+        );
   }
-  static async isNotVisible() {
-    await TestHelpers.checkIfElementWithTextIsVisible(
-      NetworkAddedModalSelectorsText.SWITCH_NETWORK,
-    );
+
+  async tapSwitchToNetwork() {
+    await Gestures.waitAndTap(this.switchNetworkButton);
   }
 
-  static async tapSwitchToNetworkButton() {
-    if (device.getPlatform() === 'android') {
-      await TestHelpers.waitAndTapByLabel(
-        NetworkAddedModalSelectorsIDs.SWITCH_NETWORK_BUTTON,
-      );
-    } else {
-      await TestHelpers.tap(
-        NetworkAddedModalSelectorsIDs.SWITCH_NETWORK_BUTTON,
-      );
-    }
+  async tapCloseButton() {
+    await Gestures.waitAndTap(this.closeNetworkButton);
   }
 }
+
+export default new NetworkAddedModal();
diff --git a/e2e/pages/modals/NetworkApprovalModal.js b/e2e/pages/modals/NetworkApprovalModal.js
index 2d8ed888aa5..120ea1914dd 100644
--- a/e2e/pages/modals/NetworkApprovalModal.js
+++ b/e2e/pages/modals/NetworkApprovalModal.js
@@ -1,28 +1,27 @@
-import TestHelpers from '../../helpers';
 import { NetworkApprovalModalSelectorsIDs } from '../../selectors/Modals/NetworkApprovalModal.selectors';
-export default class NetworkApprovalModal {
-  static async tapApproveButton() {
-    await TestHelpers.tap(NetworkApprovalModalSelectorsIDs.APPROVE_BUTTON);
+import Matchers from '../../utils/Matchers';
+import Gestures from '../../utils/Gestures';
+
+class NetworkApprovalModal {
+  get container() {
+    return Matchers.getElementByID(NetworkApprovalModalSelectorsIDs.CONTAINER);
   }
 
-  static async isVisible() {
-    await TestHelpers.checkIfVisible(
-      NetworkApprovalModalSelectorsIDs.CONTAINER,
+  get approvedButton() {
+    return Matchers.getElementByID(
+      NetworkApprovalModalSelectorsIDs.APPROVE_BUTTON,
     );
   }
 
-  static async isDisplayNameVisible(displayName) {
-    await TestHelpers.checkIfHasText(
+  get displayName() {
+    return Matchers.getElementByID(
       NetworkApprovalModalSelectorsIDs.DISPLAY_NAME,
-      displayName,
     );
   }
 
-  static async isChainIDVisible(chainID) {
-    await TestHelpers.checkIfElementWithTextIsVisible(chainID);
-  }
-
-  static async isNetworkURLVisible(networkURL) {
-    await TestHelpers.checkIfElementWithTextIsVisible(networkURL);
+  async tapApproveButton() {
+    await Gestures.waitAndTap(this.approvedButton);
   }
 }
+
+export default new NetworkApprovalModal();
diff --git a/e2e/selectors/Common.selectors.js b/e2e/selectors/Common.selectors.js
index 4a3d0842d11..a113d4fb1d1 100644
--- a/e2e/selectors/Common.selectors.js
+++ b/e2e/selectors/Common.selectors.js
@@ -14,6 +14,7 @@ export const CommonSelectorsIDs = {
   NAV_IOS_BACK: 'nav-ios-back',
   FOX_SCREEN: 'fox-screen',
   NAVBAR_TITLE_NETWORKS_TEXT: 'navbar-title-networks',
+  STATUS_CONFIRMED: 'status-confirmed-text',
 };
 
 export const CommonSelectorsText = {
diff --git a/e2e/selectors/Modals/ConnectedAccountModal.selectors.js b/e2e/selectors/Modals/ConnectedAccountModal.selectors.js
index 326566809c9..e98ede9f68c 100644
--- a/e2e/selectors/Modals/ConnectedAccountModal.selectors.js
+++ b/e2e/selectors/Modals/ConnectedAccountModal.selectors.js
@@ -5,11 +5,11 @@ export const ConnectedAccountModalSelectorsText = {
   PERMISSION_LINK: messages.accounts.permissions,
   DISCONNECT_ALL: messages.accounts.disconnect_all_accounts,
   IMPORTED: messages.accounts.imported,
+  TITLE: messages.accounts.connected_accounts_title,
 };
 
 export const ConnectedAccountsSelectorsIDs = {
   CONNECT_ACCOUNTS_BUTTON: 'connect-accounts-buttons',
-  CONTAINER: 'accounts-connected-modal-container',
   NETWORK_PICKER: 'accounts-connected-network-picker',
   DISCONNECT_ALL_BUTTON: 'accounts-connected-revoke-button',
 };
diff --git a/e2e/selectors/Modals/TransactionDetailsModal.selectors.js b/e2e/selectors/Modals/TransactionDetailsModal.selectors.js
index 9772ea9384f..4738e1d5287 100644
--- a/e2e/selectors/Modals/TransactionDetailsModal.selectors.js
+++ b/e2e/selectors/Modals/TransactionDetailsModal.selectors.js
@@ -1,6 +1,12 @@
 import messages from '../../../locales/languages/en.json';
 
-// eslint-disable-next-line import/prefer-default-export
 export const TransactionDetailsModalSelectorsText = {
   TITLE: messages.swaps.transaction_label.swap,
+  CONFIRMED: messages.transaction.confirmed,
+};
+
+export const TransactionDetailsModalSelectorsIDs = {
+  BODY: 'details-modal',
+  TITLE: 'details-modal-title',
+  CLOSE_ICON: 'details-modal-close-icon',
 };
diff --git a/e2e/specs/networks/add-custom-rpc.spec.js b/e2e/specs/networks/add-custom-rpc.spec.js
index 5755b8fd7a4..175d17c4eb1 100644
--- a/e2e/specs/networks/add-custom-rpc.spec.js
+++ b/e2e/specs/networks/add-custom-rpc.spec.js
@@ -18,6 +18,7 @@ import {
 } from '../../fixtures/fixture-helper';
 import { getFixturesServerPort } from '../../fixtures/utils';
 import FixtureServer from '../../fixtures/fixture-server';
+import Assertions from '../../utils/Assertions';
 
 const fixtureServer = new FixtureServer();
 const GORELI = 'Goerli Test Network';
@@ -68,12 +69,12 @@ describe(Regression('Custom RPC Tests'), () => {
     }
 
     await TestHelpers.delay(3000);
-    await NetworkApprovalModal.isVisible();
+    await Assertions.checkIfVisible(NetworkApprovalModal.container);
     await NetworkApprovalModal.tapApproveButton();
 
     await TestHelpers.delay(3000);
-    await NetworkAddedModal.isVisible();
-    await NetworkAddedModal.tapSwitchToNetworkButton();
+    await Assertions.checkIfVisible(NetworkAddedModal.switchNetwork);
+    await NetworkAddedModal.tapSwitchToNetwork();
 
     await TestHelpers.delay(3000);
     await WalletView.isVisible();
diff --git a/e2e/specs/permission-systems/permission-system-delete-wallet.spec.js b/e2e/specs/permission-systems/permission-system-delete-wallet.spec.js
index 73129c7a27d..4d48cc81e33 100644
--- a/e2e/specs/permission-systems/permission-system-delete-wallet.spec.js
+++ b/e2e/specs/permission-systems/permission-system-delete-wallet.spec.js
@@ -48,7 +48,7 @@ describe(
           await Browser.isVisible();
           await Browser.navigateToTestDApp();
           await Browser.tapNetworkAvatarButtonOnBrowserWhileAccountIsConnectedToDapp();
-          await Assertions.checkIfVisible(ConnectedAccountsModal.container);
+          await Assertions.checkIfVisible(ConnectedAccountsModal.title);
           await NetworkListModal.isNotVisible();
           await ConnectedAccountsModal.scrollToBottomOfModal();
 
@@ -61,7 +61,7 @@ describe(
           // should tap reset wallet button
           await LoginView.tapResetWalletButton();
 
-          await DeleteWalletModal.isVisible();
+          await Assertions.checkIfVisible(DeleteWalletModal.container);
 
           //Delete wallet
           await DeleteWalletModal.tapIUnderstandButton();
@@ -94,7 +94,7 @@ describe(
           await TabBarComponent.tapBrowser();
           await Browser.isVisible();
           await Browser.tapNetworkAvatarButtonOnBrowser();
-          await Assertions.checkIfNotVisible(ConnectedAccountsModal.container);
+          await Assertions.checkIfNotVisible(ConnectedAccountsModal.title);
           await NetworkListModal.isVisible();
         },
       );
diff --git a/e2e/specs/permission-systems/permission-system-revoke-single-account.spec.js b/e2e/specs/permission-systems/permission-system-revoke-single-account.spec.js
index 801c80738e3..ebde3b32c05 100644
--- a/e2e/specs/permission-systems/permission-system-revoke-single-account.spec.js
+++ b/e2e/specs/permission-systems/permission-system-revoke-single-account.spec.js
@@ -37,7 +37,7 @@ describe(SmokeCore('Revoke Single Account after connecting to a dapp'), () => {
 
         await TestHelpers.delay(5500);
         await Browser.tapNetworkAvatarButtonOnBrowser();
-        await Assertions.checkIfNotVisible(ConnectedAccountsModal.container);
+        await Assertions.checkIfNotVisible(ConnectedAccountsModal.title);
         await NetworkListModal.isVisible();
       },
     );
diff --git a/e2e/specs/permission-systems/permission-system-revoking-multiple-accounts.spec.js b/e2e/specs/permission-systems/permission-system-revoking-multiple-accounts.spec.js
index ab7089c0e46..70a68ca0eec 100644
--- a/e2e/specs/permission-systems/permission-system-revoking-multiple-accounts.spec.js
+++ b/e2e/specs/permission-systems/permission-system-revoking-multiple-accounts.spec.js
@@ -48,7 +48,7 @@ describe('Connecting to multiple dapps and revoking permission on one but stayin
         await Browser.navigateToTestDApp();
         await Browser.isAccountToastVisible('Account 1');
         await Browser.tapNetworkAvatarButtonOnBrowserWhileAccountIsConnectedToDapp();
-        await Assertions.checkIfVisible(ConnectedAccountsModal.container);
+        await Assertions.checkIfVisible(ConnectedAccountsModal.title);
         await ConnectedAccountsModal.tapConnectMoreAccountsButton();
         await TestHelpers.delay(1000);
         await AccountListView.tapAddAccountButton();
@@ -64,7 +64,7 @@ describe('Connecting to multiple dapps and revoking permission on one but stayin
         await ConnectedAccountsModal.tapDisconnectAllButton();
         await Browser.isRevokeAllAccountToastVisible();
         await Browser.tapNetworkAvatarButtonOnBrowser();
-        await Assertions.checkIfNotVisible(ConnectedAccountsModal.container);
+        await Assertions.checkIfNotVisible(ConnectedAccountsModal.title);
         await NetworkListModal.isVisible();
         await NetworkListModal.swipeToDismissModal();
         await NetworkListModal.isNotVisible();
diff --git a/e2e/specs/quarantine/deeplinks.failing.js b/e2e/specs/quarantine/deeplinks.failing.js
index 4be04bf956f..29530a3caa2 100644
--- a/e2e/specs/quarantine/deeplinks.failing.js
+++ b/e2e/specs/quarantine/deeplinks.failing.js
@@ -20,7 +20,7 @@ import Accounts from '../../../wdio/helpers/Accounts';
 import TabBarComponent from '../../pages/TabBarComponent';
 import Assertions from '../../utils/Assertions';
 
-const BINANCE_RPC_URL = 'https://bsc-dataseed1.binance.org';
+//const BINANCE_RPC_URL = 'https://bsc-dataseed1.binance.org';
 
 const BINANCE_DEEPLINK_URL =
   'https://metamask.app.link/send/0xB8B4EE5B1b693971eB60bDa15211570df2dB228A@56?value=1e14';
@@ -98,30 +98,31 @@ describe(Regression('Deep linking Tests'), () => {
     await NetworkView.isRpcViewVisible();
     await NetworkView.tapPopularNetworkByName('BNB Smart Chain');
 
-    await NetworkApprovalModal.isVisible();
-    await NetworkApprovalModal.isDisplayNameVisible('BNB Smart Chain');
-    await NetworkApprovalModal.isNetworkURLVisible(BINANCE_RPC_URL);
-    await NetworkApprovalModal.isChainIDVisible('56');
+    await Assertions.checkIfVisible(NetworkApprovalModal.container);
+    await Assertions.checkIfElementToHaveText(
+      NetworkApprovalModal.displayName,
+      'BNB Smart Chain',
+    );
     await NetworkApprovalModal.tapApproveButton();
 
-    await NetworkAddedModal.isVisible();
+    await Assertions.checkIfVisible(NetworkAddedModal.switchNetwork);
     await NetworkAddedModal.tapCloseButton();
     await NetworkView.isRpcViewVisible();
-
-    //await WalletView.isVisible();
   });
 
   it('should add polygon network', async () => {
     await NetworkView.tapPopularNetworkByName('Polygon Mainnet');
 
-    await NetworkApprovalModal.isVisible();
-    await NetworkApprovalModal.isDisplayNameVisible('Polygon Mainnet');
-    await NetworkApprovalModal.isChainIDVisible('137');
+    await Assertions.checkIfVisible(NetworkApprovalModal.container);
+    await Assertions.checkIfElementToHaveText(
+      NetworkApprovalModal.displayName,
+      'Polygon Mainnet',
+    );
 
     await NetworkApprovalModal.tapApproveButton();
     await TestHelpers.delay(1000);
 
-    await NetworkAddedModal.isVisible();
+    await Assertions.checkIfVisible(NetworkAddedModal.switchNetwork);
     await NetworkAddedModal.tapSwitchToNetwork();
 
     await WalletView.isVisible();
diff --git a/e2e/specs/quarantine/permission-system-removing-imported-account.failing.js b/e2e/specs/quarantine/permission-system-removing-imported-account.failing.js
index 94a3df6816d..e7983305e27 100644
--- a/e2e/specs/quarantine/permission-system-removing-imported-account.failing.js
+++ b/e2e/specs/quarantine/permission-system-removing-imported-account.failing.js
@@ -110,7 +110,7 @@ describe(
 
     it('imported account is not visible', async () => {
       await Browser.tapNetworkAvatarButtonOnBrowserWhileAccountIsConnectedToDapp();
-      await Assertions.checkIfNotVisible(ConnectedAccountsModal.container);
+      await Assertions.checkIfNotVisible(ConnectedAccountsModal.title);
       await AccountListView.accountNameNotVisible('Account 2');
     });
   },
diff --git a/e2e/specs/settings/delete-wallet.spec.js b/e2e/specs/settings/delete-wallet.spec.js
index ad7d03138e2..b710b846db7 100644
--- a/e2e/specs/settings/delete-wallet.spec.js
+++ b/e2e/specs/settings/delete-wallet.spec.js
@@ -60,7 +60,7 @@ describe(
         // should tap reset wallet button
         await LoginView.tapResetWalletButton();
 
-        await DeleteWalletModal.isVisible();
+        await Assertions.checkIfVisible(DeleteWalletModal.container);
 
         // should delete wallet
         await DeleteWalletModal.tapIUnderstandButton();
diff --git a/e2e/specs/swaps/swap-action-regression.spec.js b/e2e/specs/swaps/swap-action-regression.spec.js
index ea2ab6fe837..062ff5a7edb 100644
--- a/e2e/specs/swaps/swap-action-regression.spec.js
+++ b/e2e/specs/swaps/swap-action-regression.spec.js
@@ -18,6 +18,7 @@ import TestHelpers from '../../helpers';
 import FixtureServer from '../../fixtures/fixture-server';
 import { getFixturesServerPort } from '../../fixtures/utils';
 import { Regression } from '../../tags';
+import Assertions from '../../utils/Assertions';
 
 const fixtureServer = new FixtureServer();
 
@@ -87,8 +88,12 @@ describe(Regression('Multiple Swaps from Actions'), () => {
         sourceTokenSymbol,
         destTokenSymbol,
       );
-      await DetailsModal.isTitleVisible(sourceTokenSymbol, destTokenSymbol);
-      await DetailsModal.isStatusCorrect('Confirmed');
+      await Assertions.checkIfVisible(DetailsModal.title);
+      await Assertions.checkIfElementToHaveText(
+        DetailsModal.title,
+        DetailsModal.generateExpectedTitle(sourceTokenSymbol, destTokenSymbol),
+      );
+      await Assertions.checkIfVisible(DetailsModal.statusConfirmed);
       await DetailsModal.tapOnCloseIcon();
     },
   );
diff --git a/e2e/specs/swaps/swap-action-smoke.spec.js b/e2e/specs/swaps/swap-action-smoke.spec.js
index dda70a9d482..18847e5680f 100644
--- a/e2e/specs/swaps/swap-action-smoke.spec.js
+++ b/e2e/specs/swaps/swap-action-smoke.spec.js
@@ -18,6 +18,7 @@ import TestHelpers from '../../helpers';
 import FixtureServer from '../../fixtures/fixture-server';
 import { getFixturesServerPort } from '../../fixtures/utils';
 import { SmokeSwaps } from '../../tags';
+import Assertions from '../../utils/Assertions';
 
 const fixtureServer = new FixtureServer();
 
@@ -87,8 +88,11 @@ describe(SmokeSwaps('Swap from Actions'), () => {
         sourceTokenSymbol,
         destTokenSymbol,
       );
-      await DetailsModal.isTitleVisible(sourceTokenSymbol, destTokenSymbol);
-      await DetailsModal.isStatusCorrect('Confirmed');
+      await Assertions.checkIfElementToHaveText(
+        DetailsModal.title,
+        DetailsModal.generateExpectedTitle(sourceTokenSymbol, destTokenSymbol),
+      );
+      await Assertions.checkIfVisible(DetailsModal.statusConfirmed);
       await DetailsModal.tapOnCloseIcon();
     },
   );
diff --git a/e2e/utils/Matchers.js b/e2e/utils/Matchers.js
index 1b44e7dd86b..d7934977eee 100644
--- a/e2e/utils/Matchers.js
+++ b/e2e/utils/Matchers.js
@@ -46,6 +46,17 @@ class Matchers {
     return element(by.id(parentElement).withDescendant(by.id(childElement)));
   }
 
+  /**
+   * Get element with ancestor.
+   *
+   * @param {string} childElement - The ID of the child element to locate within the parent element.
+   * @param {string} parentElement - Matches elements with at least one descendant that matches the specified matcher.
+   * @return {Promise<Detox.IndexableNativeElement>} - Resolves to the located element
+   */
+  static async getElementIDWithAncestor(childElement, parentElement) {
+    return element(by.id(childElement).withAncestor(by.id(parentElement)));
+  }
+
   /**
    * Get element by web ID.
    *
diff --git a/wdio/screen-objects/testIDs/Components/DetailsModal.js b/wdio/screen-objects/testIDs/Components/DetailsModal.js
deleted file mode 100644
index 5633f2df3bb..00000000000
--- a/wdio/screen-objects/testIDs/Components/DetailsModal.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const DETAILS_MODAL_TITLE = 'details-modal-title';
-export const DETAILS_MODAL_STATUS_CONFIRMED = 'status-confirmed-text';
-export const DETAILS_MODAL_CLOSE_ICON = 'details-modal-close-icon';