test: Move files to the Browser folder

app/components/UI/AccountApproval/index.js

@@ -21,7 +21,7 @@ import { shuffle } from 'lodash';
 import URL from 'url-parse';
 import AppConstants from '../../../../app/core/AppConstants';
 import { CommonSelectorsIDs } from '../../../../e2e/selectors/Common.selectors';
-import { ConnectAccountModalSelectorsIDs } from '../../../../e2e/selectors/Modals/ConnectAccountModal.selectors';
+import { ConnectAccountModalSelectorsIDs } from '../../../../e2e/selectors/Browser/ConnectAccountModal.selectors';
 import generateTestId from '../../../../wdio/utils/generateTestId';
 import { withMetricsAwareness } from '../../../components/hooks/useMetrics';
 import Routes from '../../../constants/navigation/Routes';

app/components/UI/AccountSelectorList/AccountSelector.test.tsx

@@ -5,7 +5,7 @@ import renderWithProvider from '../../../util/test/renderWithProvider';
 import AccountSelectorList from './AccountSelectorList';
 import { useAccounts } from '../../../components/hooks/useAccounts';
 import { View } from 'react-native';
-import { ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID } from '../../../../wdio/screen-objects/testIDs/Components/AccountListComponent.testIds';
+import { AccountListViewSelectorsIDs } from '../../../../e2e/selectors/AccountListView.selectors';
 import { backgroundState } from '../../../util/test/initial-root-state';
 import { regex } from '../../../../app/util/regex';
 import {
@@ -128,10 +128,10 @@ describe('AccountSelectorList', () => {
 
     await waitFor(async () => {
       const businessAccountItem = await queryByTestId(
-        `${ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}-${BUSINESS_ACCOUNT}`,
+        `${AccountListViewSelectorsIDs.ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}-${BUSINESS_ACCOUNT}`,
       );
       const personalAccountItem = await queryByTestId(
-        `${ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}-${PERSONAL_ACCOUNT}`,
+        `${AccountListViewSelectorsIDs.ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}-${PERSONAL_ACCOUNT}`,
       );
 
       expect(within(businessAccountItem).getByText(regex.eth(1))).toBeDefined();
@@ -171,7 +171,7 @@ describe('AccountSelectorList', () => {
       expect(accounts.length).toBe(1);
 
       const businessAccountItem = await queryByTestId(
-        `${ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}-${BUSINESS_ACCOUNT}`,
+        `${AccountListViewSelectorsIDs.ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}-${BUSINESS_ACCOUNT}`,
       );
 
       expect(within(businessAccountItem).getByText(regex.eth(1))).toBeDefined();

app/components/UI/AccountSelectorList/AccountSelectorList.tsx

@@ -1,6 +1,6 @@
 // Third party dependencies.
 import React, { useCallback, useRef } from 'react';
-import { Alert, ListRenderItem, Platform, View } from 'react-native';
+import { Alert, ListRenderItem, View } from 'react-native';
 import { FlatList } from 'react-native-gesture-handler';
 import { useSelector } from 'react-redux';
 import { KeyringTypes } from '@metamask/keyring-controller';
@@ -29,8 +29,7 @@ import { removeAccountsFromPermissions } from '../../../core/Permissions';
 // Internal dependencies.
 import { AccountSelectorListProps } from './AccountSelectorList.types';
 import styleSheet from './AccountSelectorList.styles';
-import generateTestId from '../../../../wdio/utils/generateTestId';
-import { ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID } from '../../../../wdio/screen-objects/testIDs/Components/AccountListComponent.testIds.js';
+import { AccountListViewSelectorsIDs } from '../../../../e2e/selectors/AccountListView.selectors';
 
 const AccountSelectorList = ({
   onSelectAccount,
@@ -68,10 +67,7 @@ const AccountSelectorList = ({
     ({ fiatBalance, tokens }: Assets, address: string) => (
       <View
         style={styles.balancesContainer}
-        {...generateTestId(
-          Platform,
-          `${ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}-${address}`,
-        )}
+        testID={`${AccountListViewSelectorsIDs.ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}-${address}`}
       >
         <Text style={styles.balanceLabel}>{fiatBalance}</Text>
         {tokens && (

app/components/UI/BrowserBottomBar/index.js

@@ -11,15 +11,7 @@ import { MetaMetricsEvents } from '../../../core/Analytics';
 
 import Device from '../../../util/device';
 import { ThemeContext, mockTheme } from '../../../util/theme';
-import generateTestId from '../../../../wdio/utils/generateTestId';
-import {
-  HOME_BUTTON,
-  TABS_BUTTON,
-  FORWARD_BUTTON,
-  BACK_BUTTON,
-  OPTIONS_BUTTON,
-  SEARCH_BUTTON,
-} from '../../../../wdio/screen-objects/testIDs/BrowserScreen/BrowserScreen.testIds';
+import { BrowserViewSelectorsIDs } from '../../../../e2e/selectors/Browser/BrowserView.selectors';
 import { withMetricsAwareness } from '../../../components/hooks/useMetrics';
 
 // NOTE: not needed anymore. The use of BottomTabBar already accomodates the home indicator height
@@ -160,7 +152,7 @@ class BrowserBottomBar extends PureComponent {
         <TouchableOpacity
           onPress={onBackPress}
           style={styles.iconButton}
-          {...generateTestId(Platform, BACK_BUTTON)}
+          testID={BrowserViewSelectorsIDs.BACK_BUTTON}
           disabled={!canGoBack}
         >
           <Icon
@@ -172,7 +164,7 @@ class BrowserBottomBar extends PureComponent {
         <TouchableOpacity
           onPress={onForwardPress}
           style={styles.iconButton}
-          {...generateTestId(Platform, FORWARD_BUTTON)}
+          testID={BrowserViewSelectorsIDs.FORWARD_BUTTON}
           disabled={!canGoForward}
         >
           <Icon
@@ -184,30 +176,30 @@ class BrowserBottomBar extends PureComponent {
         <TouchableOpacity
           onPress={onSearchPress}
           style={styles.iconButton}
-          {...generateTestId(Platform, SEARCH_BUTTON)}
+          testID={BrowserViewSelectorsIDs.SEARCH_BUTTON}
         >
           <FeatherIcons name="search" size={24} style={styles.icon} />
         </TouchableOpacity>
 
         <TouchableOpacity
           onPress={showTabs}
           style={styles.iconButton}
-          {...generateTestId(Platform, TABS_BUTTON)}
+          testID={BrowserViewSelectorsIDs.TABS_BUTTON}
         >
           <TabCountIcon style={styles.tabIcon} />
         </TouchableOpacity>
         <TouchableOpacity
           onPress={onHomePress}
           style={styles.iconButton}
-          {...generateTestId(Platform, HOME_BUTTON)}
+          testID={BrowserViewSelectorsIDs.HOME_BUTTON}
         >
           <SimpleLineIcons name="home" size={22} style={styles.icon} />
         </TouchableOpacity>
 
         <TouchableOpacity
           onPress={toggleOptions}
           style={styles.iconButton}
-          {...generateTestId(Platform, OPTIONS_BUTTON)}
+          testID={BrowserViewSelectorsIDs.OPTIONS_BUTTON}
         >
           <MaterialIcon name="more-horiz" size={22} style={styles.icon} />
         </TouchableOpacity>

app/components/UI/ManageNetworks/ManageNetworks.tsx

@@ -20,7 +20,7 @@ import Routes from '../../../constants/navigation/Routes';
 import getDecimalChainId from '../../../util/networks/getDecimalChainId';
 import { useMetrics } from '../../../components/hooks/useMetrics';
 import { MetaMetricsEvents } from '../../../core/Analytics';
-import { ConnectedAccountsSelectorsIDs } from '../../../../e2e/selectors/Modals/ConnectedAccountModal.selectors';
+import { ConnectedAccountsSelectorsIDs } from '../../../../e2e/selectors/Browser/ConnectedAccountModal.selectors';
 import AppConstants from '../../../core/AppConstants';
 import styles from './ManageNetworks.styles';
 

app/components/UI/Tabs/TabCountIcon/index.js

@@ -4,8 +4,7 @@ import PropTypes from 'prop-types';
 import { fontStyles } from '../../../../styles/common';
 import { connect } from 'react-redux';
 import { ThemeContext, mockTheme } from '../../../../util/theme';
-import generateTestId from '../../../../../wdio/utils/generateTestId';
-import { TABS_NUMBER } from '../../../../../wdio/screen-objects/testIDs/BrowserScreen/BrowserScreen.testIds';
+import { BrowserViewSelectorsIDs } from '../../../../../e2e/selectors/Browser/BrowserView.selectors';
 
 const createStyles = (colors) =>
   StyleSheet.create({
@@ -51,7 +50,7 @@ class TabCountIcon extends PureComponent {
       <View style={[styles.tabIcon, style]}>
         <Text
           style={styles.tabCount}
-          {...generateTestId(Platform, TABS_NUMBER)}
+          testID={BrowserViewSelectorsIDs.TABS_NUMBER}
         >
           {tabCount}
         </Text>

app/components/UI/Tabs/index.js

@@ -12,12 +12,7 @@ import {
 import { SafeAreaInsetsContext } from 'react-native-safe-area-context';
 import MaterialCommunityIcon from 'react-native-vector-icons/MaterialCommunityIcons';
 import { strings } from '../../../../locales/i18n';
-import {
-  MULTI_TAB_ADD_BUTTON,
-  MULTI_TAB_CLOSE_ALL_BUTTON,
-  MULTI_TAB_DONE_BUTTON,
-  MULTI_TAB_NO_TABS_MESSAGE,
-} from '../../../../wdio/screen-objects/testIDs/BrowserScreen/MultiTab.testIds';
+import { BrowserViewSelectorsIDs } from '../../../../e2e/selectors/Browser/BrowserView.selectors';
 import { MetaMetricsEvents } from '../../../core/Analytics';
 import { fontStyles, colors as importedColors } from '../../../styles/common';
 import Device from '../../../util/device';
@@ -233,7 +228,7 @@ class Tabs extends PureComponent {
 
     return (
       <View style={styles.noTabs}>
-        <Text style={styles.noTabsTitle} testID={MULTI_TAB_NO_TABS_MESSAGE}>
+        <Text style={styles.noTabsTitle} testID={BrowserViewSelectorsIDs.NO_TABS_MESSAGE}>
           {strings('browser.no_tabs_title')}
         </Text>
         <Text style={styles.noTabsDesc}>{strings('browser.no_tabs_desc')}</Text>
@@ -286,7 +281,7 @@ class Tabs extends PureComponent {
         <TouchableOpacity
           style={[styles.tabAction, styles.tabActionleft]}
           onPress={closeAllTabs}
-          testID={MULTI_TAB_CLOSE_ALL_BUTTON}
+          testID={BrowserViewSelectorsIDs.CLOSE_ALL_TABS}
         >
           <Text
             style={[
@@ -301,7 +296,7 @@ class Tabs extends PureComponent {
           <TouchableOpacity
             style={styles.newTabIconButton}
             onPress={this.onNewTabPress}
-            testID={MULTI_TAB_ADD_BUTTON}
+            testID={BrowserViewSelectorsIDs.ADD_NEW_TAB}
           >
             <MaterialCommunityIcon
               name="plus"
@@ -314,7 +309,7 @@ class Tabs extends PureComponent {
         <TouchableOpacity
           style={[styles.tabAction, styles.tabActionRight]}
           onPress={closeTabsView}
-          testID={MULTI_TAB_DONE_BUTTON}
+          testID={BrowserViewSelectorsIDs.DONE_BUTTON}
         >
           <Text
             style={[

app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.tsx

@@ -1,11 +1,9 @@
 // Third party dependencies.
 import React, { useCallback, useState } from 'react';
-import { Platform, View, SafeAreaView } from 'react-native';
+import { View, SafeAreaView } from 'react-native';
 
 // External dependencies.
 import { strings } from '../../../../../locales/i18n';
-import { ACCOUNT_APPROVAL_SELECT_ALL_BUTTON } from '../../../../../wdio/screen-objects/testIDs/Components/AccountApprovalModal.testIds';
-import generateTestId from '../../../../../wdio/utils/generateTestId';
 import Button, {
   ButtonSize,
   ButtonVariants,
@@ -24,8 +22,8 @@ import HelpText, {
 } from '../../../../component-library/components/Form/HelpText';
 
 // Internal dependencies.
-import { ConnectAccountModalSelectorsIDs } from '../../../../../e2e/selectors/Modals/ConnectAccountModal.selectors';
-import { ACCOUNT_LIST_ADD_BUTTON_ID } from '../../../../../wdio/screen-objects/testIDs/Components/AccountListComponent.testIds';
+import { ConnectAccountModalSelectorsIDs } from '../../../../../e2e/selectors/Browser/ConnectAccountModal.selectors';
+import { AccountListViewSelectorsIDs } from '../../../../../e2e/selectors/AccountListView.selectors';
 import AddAccountActions from '../../AddAccountActions';
 import styleSheet from './AccountConnectMultiSelector.styles';
 import {
@@ -110,7 +108,7 @@ const AccountConnectMultiSelector = ({
             ...(isLoading && styles.disabled),
           }}
           label={strings('accounts.select_all')}
-          {...generateTestId(Platform, ACCOUNT_APPROVAL_SELECT_ALL_BUTTON)}
+          testID={ConnectAccountModalSelectorsIDs.SELECT_MULTI_BUTTON}
         />
       ),
     [accounts, isLoading, onSelectAddress, styles],
@@ -230,10 +228,7 @@ const AccountConnectMultiSelector = ({
                 ...(isConnectDisabled && styles.disabled),
               }}
               disabled={isConnectDisabled}
-              {...generateTestId(
-                Platform,
-                ConnectAccountModalSelectorsIDs.SELECT_MULTI_BUTTON,
-              )}
+              testID={ConnectAccountModalSelectorsIDs.SELECT_MULTI_BUTTON}
             />
           )}
         </View>
@@ -338,7 +333,7 @@ const AccountConnectMultiSelector = ({
               onPress={() =>
                 setScreen(AccountConnectMultiSelectorScreens.AddAccountActions)
               }
-              {...generateTestId(Platform, ACCOUNT_LIST_ADD_BUTTON_ID)}
+              testID={AccountListViewSelectorsIDs.ACCOUNT_LIST_ADD_BUTTON_ID}
             />
           </View>
           <View style={styles.body}>{renderCtaButtons()}</View>

app/components/Views/AccountConnect/AccountConnectSingle/AccountConnectSingle.tsx

@@ -1,6 +1,6 @@
 // Third party dependencies.
 import React, { useCallback } from 'react';
-import { Platform, View } from 'react-native';
+import { View } from 'react-native';
 import { useSelector } from 'react-redux';
 
 // External dependencies.
@@ -35,8 +35,7 @@ import styleSheet from './AccountConnectSingle.styles';
 import { AccountConnectSingleProps } from './AccountConnectSingle.types';
 
 import { CommonSelectorsIDs } from '../../../../../e2e/selectors/Common.selectors';
-import { ConnectAccountModalSelectorsIDs } from '../../../../../e2e/selectors/Modals/ConnectAccountModal.selectors';
-import generateTestId from '../../../../../wdio/utils/generateTestId';
+import { ConnectAccountModalSelectorsIDs } from '../../../../../e2e/selectors/Browser/ConnectAccountModal.selectors';
 
 const AccountConnectSingle = ({
   defaultSelectedAccount,
@@ -168,7 +167,7 @@ const AccountConnectSingle = ({
       <SheetHeader title={strings('accounts.connect_account_title')} />
       <View
         style={styles.body}
-        {...generateTestId(Platform, ConnectAccountModalSelectorsIDs.CONTAINER)}
+        testID={ConnectAccountModalSelectorsIDs.CONTAINER}
       >
         <TagUrl
           imageSource={favicon}

app/components/Views/AccountPermissions/AccountPermissionsConnected/AccountPermissionsConnected.tsx

@@ -29,7 +29,7 @@ import {
   ProviderConfig,
 } from '../../../../selectors/networkController';
 import { useNetworkInfo } from '../../../../selectors/selectedNetworkController';
-import { ConnectedAccountsSelectorsIDs } from '../../../../../e2e/selectors/Modals/ConnectedAccountModal.selectors';
+import { ConnectedAccountsSelectorsIDs } from '../../../../../e2e/selectors/Browser/ConnectedAccountModal.selectors';
 
 // Internal dependencies.
 import { AccountPermissionsConnectedProps } from './AccountPermissionsConnected.types';

app/components/Views/AccountPermissions/AccountPermissionsRevoke/AccountPermissionsRevoke.tsx

@@ -35,7 +35,7 @@ import { IconName } from '../../../../component-library/components/Icons/Icon';
 import Avatar from '../../../../component-library/components/Avatars/Avatar/Avatar';
 import { AvatarVariant } from '../../../../component-library/components/Avatars/Avatar';
 import { selectNetworkConfigurations } from '../../../../selectors/networkController';
-import { ConnectedAccountsSelectorsIDs } from '../../../../../e2e/selectors/Modals/ConnectedAccountModal.selectors';
+import { ConnectedAccountsSelectorsIDs } from '../../../../../e2e/selectors/Browser/ConnectedAccountModal.selectors';
 import { useMetrics } from '../../../../components/hooks/useMetrics';
 
 const AccountPermissionsRevoke = ({

app/components/Views/Browser/index.js

@@ -4,8 +4,7 @@ import { Dimensions, Platform, View } from 'react-native';
 import { captureScreen } from 'react-native-view-shot';
 import { connect, useSelector } from 'react-redux';
 import { strings } from '../../../../locales/i18n';
-import { BROWSER_SCREEN_ID } from '../../../../wdio/screen-objects/testIDs/BrowserScreen/BrowserScreen.testIds';
-import generateTestId from '../../../../wdio/utils/generateTestId';
+import { BrowserViewSelectorsIDs } from '../../../../e2e/selectors/Browser/BrowserView.selectors';
 import {
   closeAllTabs,
   closeTab,
@@ -370,7 +369,7 @@ export const Browser = (props) => {
   return (
     <View
       style={baseStyles.flexGrow}
-      {...generateTestId(Platform, BROWSER_SCREEN_ID)}
+      testID={BrowserViewSelectorsIDs.BROWSER_SCREEN_ID}
     >
       {renderBrowserTabs()}
       {renderTabsView()}

app/components/Views/confirmations/components/PersonalSign/PersonalSign.tsx

@@ -20,7 +20,7 @@ import ExpandedMessage from '../SignatureRequest/ExpandedMessage';
 import createStyles from './styles';
 import { PersonalSignProps } from './types';
 
-import { SigningModalSelectorsIDs } from '../../../../../../e2e/selectors/Modals/SigningModal.selectors';
+import { SigningModalSelectorsIDs } from '../../../../../../e2e/selectors/Browser/SigningModal.selectors';
 import { useMetrics } from '../../../../../components/hooks/useMetrics';
 import AppConstants from '../../../../../core/AppConstants';
 import { selectChainId } from '../../../../../selectors/networkController';

app/components/Views/confirmations/components/SignatureRequest/index.js

@@ -3,7 +3,7 @@ import React, { PureComponent } from 'react';
 import { StyleSheet, Text, TouchableOpacity, View } from 'react-native';
 import Ionicons from 'react-native-vector-icons/Ionicons';
 import { connect } from 'react-redux';
-import { SigningModalSelectorsIDs } from '../../../../../../e2e/selectors/Modals/SigningModal.selectors';
+import { SigningModalSelectorsIDs } from '../../../../../../e2e/selectors/Browser/SigningModal.selectors';
 import { strings } from '../../../../../../locales/i18n';
 import { withMetricsAwareness } from '../../../../../components/hooks/useMetrics';
 import ExtendedKeyringTypes from '../../../../../constants/keyringTypes';

app/components/Views/confirmations/components/TypedSign/index.js

@@ -25,7 +25,7 @@ import {
 } from '../../../../../util/confirmation/signatureUtils';
 import { isExternalHardwareAccount } from '../../../../../util/address';
 import createExternalSignModelNav from '../../../../../util/hardwareWallet/signatureUtils';
-import { SigningModalSelectorsIDs } from '../../../../../../e2e/selectors/Modals/SigningModal.selectors';
+import { SigningModalSelectorsIDs } from '../../../../../../e2e/selectors/Browser/SigningModal.selectors';
 import { withMetricsAwareness } from '../../../../../components/hooks/useMetrics';
 
 const createStyles = (colors) =>

app/components/Views/confirmations/components/TypedSign/index.test.tsx

@@ -14,7 +14,7 @@ import renderWithProvider from '../../../../../util/test/renderWithProvider';
 import { fireEvent, waitFor } from '@testing-library/react-native';
 import { MetaMetrics } from '../../../../../core/Analytics';
 import { MOCK_ACCOUNTS_CONTROLLER_STATE } from '../../../../../util/test/accountsControllerTestUtils';
-import { SigningModalSelectorsIDs } from '../../../../../../e2e/selectors/Modals/SigningModal.selectors';
+import { SigningModalSelectorsIDs } from '../../../../../../e2e/selectors/Browser/SigningModal.selectors';
 
 jest.mock('../../../../../core/Analytics/MetaMetrics');
 

app/util/regex/index.test.ts

@@ -1,4 +1,4 @@
-import { ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID } from '../../../wdio/screen-objects/testIDs/Components/AccountListComponent.testIds';
+import { AccountListViewSelectorsIDs } from '../../../e2e/selectors/AccountListView.selectors';
 import { regex, hasDecimals } from '.';
 
 describe('REGEX :: hasDecimals', () => {
@@ -64,13 +64,13 @@ describe('REGEX :: REGEX_6400_USD', () => {
 });
 
 describe('REGEX :: regex.accountBalance', () => {
-  it(`should match "${ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}"`, () => {
+  it(`should match "${AccountListViewSelectorsIDs.ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}"`, () => {
     expect(
-      regex.accountBalance.test(ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID),
+      regex.accountBalance.test(AccountListViewSelectorsIDs.ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID),
     ).toEqual(true);
   });
 
-  it(`should not match "Account balance != ${ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}"`, () => {
+  it(`should not match "Account balance != ${AccountListViewSelectorsIDs.ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}"`, () => {
     expect(regex.accountBalance.test('123')).toEqual(false);
   });
 });