test: Move files to Wallet folder (#12531)

## **Description** We currently have a few of our page object files lingering outside of a specific folder. As part of our ongoing efforts to improve the organization and maintainability of our test automation codebase, we need to move Page Object files into their respective folders. This will help streamline the project structure, making it easier for team members to locate and manage the files. The folder where each of the remaining files should be moved have to reflect the functionality or feature on the app. This same structure should be reflected on the selectors folder. Files to relocate to the Wallet folder: - e2e/pages/AccountListView.js (this is not a complete view) - e2e/pages/EditAccountNameView.js - e2e/pages/LoginView.js - e2e/pages/TabBarComponent.js - e2e/pages/TokenOverview.js - e2e/pages/modals/AddAccountModal.js - e2e/pages/modals/ToastModal.js - e2e/pages/modals/AccountActionsModal.js - e2e/pages/modals/NftDetectionModal.js - e2e/pages/modals/WalletActionsModal.js ## **Related issues** Fixes: ## **Manual testing steps** 1. Go to this page... 2. 3. ## **Screenshots/Recordings** Regression https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/c590e21e-b802-496e-96a7-19f927a20acd?tab=workflows ### **Before**  ### **After**  ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile Coding Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.
MetaMask · Dec 4, 2024 · e33e278 · e33e278
1 parent 734e389
commit e33e278
Show file tree

Hide file tree

Showing 114 changed files with 334 additions and 356 deletions.
diff --git a/app/component-library/components/Toast/Toast.tsx b/app/component-library/components/Toast/Toast.tsx
@@ -38,7 +38,7 @@ import {
   ToastVariants,
 } from './Toast.types';
 import styles from './Toast.styles';
-import { ToastSelectorsIDs } from '../../../../e2e/selectors/Modals/ToastModal.selectors';
+import { ToastSelectorsIDs } from '../../../../e2e/selectors/wallet/ToastModal.selectors';
 import { ButtonProps } from '../Buttons/Button/Button.types';
 
 const visibilityDuration = 2750;

diff --git a/app/components/UI/AccountSelectorList/AccountSelector.test.tsx b/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 { AccountListViewSelectorsIDs } from '../../../../e2e/selectors/AccountListView.selectors';
+import { AccountListBottomSheetSelectorsIDs } from '../../../../e2e/selectors/wallet/AccountListBottomSheet.selectors';
 import { backgroundState } from '../../../util/test/initial-root-state';
 import { regex } from '../../../../app/util/regex';
 import {
@@ -140,10 +140,10 @@ describe('AccountSelectorList', () => {
 
     await waitFor(async () => {
       const businessAccountItem = await queryByTestId(
-        `${AccountListViewSelectorsIDs.ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}-${BUSINESS_ACCOUNT}`,
+        `${AccountListBottomSheetSelectorsIDs.ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}-${BUSINESS_ACCOUNT}`,
       );
       const personalAccountItem = await queryByTestId(
-        `${AccountListViewSelectorsIDs.ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}-${PERSONAL_ACCOUNT}`,
+        `${AccountListBottomSheetSelectorsIDs.ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}-${PERSONAL_ACCOUNT}`,
       );
 
       expect(within(businessAccountItem).getByText(regex.eth(1))).toBeDefined();
@@ -183,7 +183,7 @@ describe('AccountSelectorList', () => {
       expect(accounts.length).toBe(1);
 
       const businessAccountItem = await queryByTestId(
-        `${AccountListViewSelectorsIDs.ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}-${BUSINESS_ACCOUNT}`,
+        `${AccountListBottomSheetSelectorsIDs.ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}-${BUSINESS_ACCOUNT}`,
       );
 
       expect(within(businessAccountItem).getByText(regex.eth(1))).toBeDefined();
@@ -251,7 +251,7 @@ describe('AccountSelectorList', () => {
 
     await waitFor(() => {
       const businessAccountItem = queryByTestId(
-        `${AccountListViewSelectorsIDs.ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}-${BUSINESS_ACCOUNT}`,
+        `${AccountListBottomSheetSelectorsIDs.ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}-${BUSINESS_ACCOUNT}`,
       );
 
       expect(within(businessAccountItem).getByText(regex.eth(1))).toBeDefined();
@@ -272,7 +272,7 @@ describe('AccountSelectorList', () => {
 
     await waitFor(() => {
       const businessAccountItem = queryByTestId(
-        `${AccountListViewSelectorsIDs.ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}-${BUSINESS_ACCOUNT}`,
+        `${AccountListBottomSheetSelectorsIDs.ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}-${BUSINESS_ACCOUNT}`,
       );
 
       expect(within(businessAccountItem).queryByText(regex.eth(1))).toBeNull();

diff --git a/app/components/UI/AccountSelectorList/AccountSelectorList.tsx b/app/components/UI/AccountSelectorList/AccountSelectorList.tsx
@@ -35,7 +35,7 @@ import Routes from '../../../constants/navigation/Routes';
 // Internal dependencies.
 import { AccountSelectorListProps } from './AccountSelectorList.types';
 import styleSheet from './AccountSelectorList.styles';
-import { AccountListViewSelectorsIDs } from '../../../../e2e/selectors/AccountListView.selectors';
+import { AccountListBottomSheetSelectorsIDs } from '../../../../e2e/selectors/wallet/AccountListBottomSheet.selectors';
 import { WalletViewSelectorsIDs } from '../../../../e2e/selectors/wallet/WalletView.selectors';
 
 const AccountSelectorList = ({
@@ -81,7 +81,7 @@ const AccountSelectorList = ({
       return (
         <View
           style={styles.balancesContainer}
-          testID={`${AccountListViewSelectorsIDs.ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}-${address}`}
+          testID={`${AccountListBottomSheetSelectorsIDs.ACCOUNT_BALANCE_BY_ADDRESS_TEST_ID}-${address}`}
         >
           <SensitiveText
             length={SensitiveTextLength.Long}

diff --git a/app/components/UI/AssetOverview/AssetOverview.test.tsx b/app/components/UI/AssetOverview/AssetOverview.test.tsx
@@ -11,7 +11,7 @@ import {
 } from '../../../util/test/accountsControllerTestUtils';
 import { createBuyNavigationDetails } from '../Ramp/routes/utils';
 import { getDecimalChainId } from '../../../util/networks';
-import { TokenOverviewSelectorsIDs } from '../../../../e2e/selectors/TokenOverview.selectors';
+import { TokenOverviewSelectorsIDs } from '../../../../e2e/selectors/wallet/TokenOverview.selectors';
 
 const MOCK_CHAIN_ID = '0x1';
 

diff --git a/app/components/UI/AssetOverview/AssetOverview.tsx b/app/components/UI/AssetOverview/AssetOverview.tsx
@@ -4,7 +4,7 @@ import { TouchableOpacity, View } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import { useDispatch, useSelector } from 'react-redux';
 import { strings } from '../../../../locales/i18n';
-import { TokenOverviewSelectorsIDs } from '../../../../e2e/selectors/TokenOverview.selectors';
+import { TokenOverviewSelectorsIDs } from '../../../../e2e/selectors/wallet/TokenOverview.selectors';
 import { newAssetTransaction } from '../../../actions/transaction';
 import AppConstants from '../../../core/AppConstants';
 import Engine from '../../../core/Engine';

diff --git a/app/components/UI/AssetOverview/Price/Price.tsx b/app/components/UI/AssetOverview/Price/Price.tsx
@@ -17,7 +17,7 @@ import Text, {
 import PriceChart from '../PriceChart/PriceChart';
 import { distributeDataPoints } from '../PriceChart/utils';
 import styleSheet from './Price.styles';
-import { TokenOverviewSelectorsIDs } from '../../../../../e2e/selectors/TokenOverview.selectors';
+import { TokenOverviewSelectorsIDs } from '../../../../../e2e/selectors/wallet/TokenOverview.selectors';
 import { TokenI } from '../../Tokens/types';
 
 interface PriceProps {

diff --git a/app/components/UI/CollectibleContractOverview/index.js b/app/components/UI/CollectibleContractOverview/index.js
@@ -13,7 +13,7 @@ import { newAssetTransaction } from '../../../actions/transaction';
 import { toLowerCaseEquals } from '../../../util/general';
 import { collectiblesSelector } from '../../../reducers/collectibles';
 import { ThemeContext, mockTheme } from '../../../util/theme';
-import { SEND_BUTTON_ID } from '../../../../wdio/screen-objects/testIDs/Screens/WalletView.testIds';
+import { TokenOverviewSelectorsIDs } from '../../../../e2e/selectors/wallet/TokenOverview.selectors';
 import { WalletViewSelectorsIDs } from '../../../../e2e/selectors/wallet/WalletView.selectors';
 
 const createStyles = (colors) =>
@@ -139,7 +139,7 @@ class CollectibleContractOverview extends PureComponent {
             icon="send"
             onPress={this.onSend}
             label={leftActionButtonText}
-            testID={SEND_BUTTON_ID}
+            testID={TokenOverviewSelectorsIDs.SEND_BUTTON}
           />
           <AssetActionButton
             icon="add"

diff --git a/app/components/UI/LoginOptionsSwitch/LoginOptionsSwitch.tsx b/app/components/UI/LoginOptionsSwitch/LoginOptionsSwitch.tsx
@@ -3,7 +3,7 @@ import { Switch, Text, View } from 'react-native';
 import { strings } from '../../../../locales/i18n';
 import { BIOMETRY_TYPE } from 'react-native-keychain';
 import { createStyles } from './styles';
-import { LoginViewSelectors } from '../../../../e2e/selectors/LoginView.selectors';
+import { LoginViewSelectors } from '../../../../e2e/selectors/wallet/LoginView.selectors';
 import { useSelector } from 'react-redux';
 import { LoginOptionsSwitchSelectorsIDs } from '../../../../e2e/selectors/LoginOptionsSwitch.selectors';
 import { useTheme } from '../../../util/theme';

diff --git a/app/components/UI/Notification/BaseNotification/index.js b/app/components/UI/Notification/BaseNotification/index.js
@@ -9,7 +9,7 @@ import IonicIcon from 'react-native-vector-icons/Ionicons';
 import AntIcon from 'react-native-vector-icons/AntDesign';
 import Text from '../../../Base/Text';
 import { useTheme } from '../../../../util/theme';
-import { ToastSelectorsIDs } from '../../../../../e2e/selectors/Modals/ToastModal.selectors';
+import { ToastSelectorsIDs } from '../../../../../e2e/selectors/wallet/ToastModal.selectors';
 
 const createStyles = (colors) =>
   StyleSheet.create({

diff --git a/app/components/Views/AccountActions/AccountActions.test.tsx b/app/components/Views/AccountActions/AccountActions.test.tsx
@@ -10,7 +10,7 @@ import renderWithProvider from '../../../util/test/renderWithProvider';
 import Engine from '../../../core/Engine';
 import Routes from '../../../constants/navigation/Routes';
 import AccountActions from './AccountActions';
-import { AccountActionsModalSelectorsIDs } from '../../../../e2e/selectors/Modals/AccountActionsModal.selectors';
+import { AccountActionsBottomSheetSelectorsIDs } from '../../../../e2e/selectors/wallet/AccountActionsBottomSheet.selectors';
 import { backgroundState } from '../../../util/test/initial-root-state';
 import { MOCK_ACCOUNTS_CONTROLLER_STATE } from '../../../util/test/accountsControllerTestUtils';
 
@@ -116,16 +116,16 @@ describe('AccountActions', () => {
     });
 
     expect(
-      getByTestId(AccountActionsModalSelectorsIDs.EDIT_ACCOUNT),
+      getByTestId(AccountActionsBottomSheetSelectorsIDs.EDIT_ACCOUNT),
     ).toBeDefined();
     expect(
-      getByTestId(AccountActionsModalSelectorsIDs.VIEW_ETHERSCAN),
+      getByTestId(AccountActionsBottomSheetSelectorsIDs.VIEW_ETHERSCAN),
     ).toBeDefined();
     expect(
-      getByTestId(AccountActionsModalSelectorsIDs.SHARE_ADDRESS),
+      getByTestId(AccountActionsBottomSheetSelectorsIDs.SHARE_ADDRESS),
     ).toBeDefined();
     expect(
-      getByTestId(AccountActionsModalSelectorsIDs.SHOW_PRIVATE_KEY),
+      getByTestId(AccountActionsBottomSheetSelectorsIDs.SHOW_PRIVATE_KEY),
     ).toBeDefined();
   });
 
@@ -135,7 +135,7 @@ describe('AccountActions', () => {
     });
 
     fireEvent.press(
-      getByTestId(AccountActionsModalSelectorsIDs.VIEW_ETHERSCAN),
+      getByTestId(AccountActionsBottomSheetSelectorsIDs.VIEW_ETHERSCAN),
     );
 
     expect(mockNavigate).toHaveBeenCalledWith('Webview', {
@@ -152,7 +152,7 @@ describe('AccountActions', () => {
       state: initialState,
     });
 
-    fireEvent.press(getByTestId(AccountActionsModalSelectorsIDs.SHARE_ADDRESS));
+    fireEvent.press(getByTestId(AccountActionsBottomSheetSelectorsIDs.SHARE_ADDRESS));
 
     expect(Share.open).toHaveBeenCalledWith({
       message: '0xC4966c0D659D99699BFD7EB54D8fafEE40e4a756',
@@ -165,7 +165,7 @@ describe('AccountActions', () => {
     });
 
     fireEvent.press(
-      getByTestId(AccountActionsModalSelectorsIDs.SHOW_PRIVATE_KEY),
+      getByTestId(AccountActionsBottomSheetSelectorsIDs.SHOW_PRIVATE_KEY),
     );
 
     expect(mockNavigate).toHaveBeenCalledWith(
@@ -190,7 +190,7 @@ describe('AccountActions', () => {
       state: initialState,
     });
 
-    fireEvent.press(getByTestId(AccountActionsModalSelectorsIDs.EDIT_ACCOUNT));
+    fireEvent.press(getByTestId(AccountActionsBottomSheetSelectorsIDs.EDIT_ACCOUNT));
 
     expect(mockNavigate).toHaveBeenCalledWith('EditAccountName', {
       selectedAccount: {
@@ -218,7 +218,7 @@ describe('AccountActions', () => {
       );
 
       fireEvent.press(
-        getByTestId(AccountActionsModalSelectorsIDs.REMOVE_HARDWARE_ACCOUNT),
+        getByTestId(AccountActionsBottomSheetSelectorsIDs.REMOVE_HARDWARE_ACCOUNT),
       );
 
       const alertFnMock = Alert.alert as jest.MockedFn<typeof Alert.alert>;

diff --git a/app/components/Views/AccountActions/AccountActions.tsx b/app/components/Views/AccountActions/AccountActions.tsx
@@ -37,7 +37,7 @@ import styleSheet from './AccountActions.styles';
 import Logger from '../../../util/Logger';
 import { protectWalletModalVisible } from '../../../actions/user';
 import Routes from '../../../constants/navigation/Routes';
-import { AccountActionsModalSelectorsIDs } from '../../../../e2e/selectors/Modals/AccountActionsModal.selectors';
+import { AccountActionsBottomSheetSelectorsIDs } from '../../../../e2e/selectors/wallet/AccountActionsBottomSheet.selectors';
 import { useMetrics } from '../../../components/hooks/useMetrics';
 import {
   isHardwareAccount,
@@ -366,7 +366,7 @@ const AccountActions = () => {
           actionTitle={strings('account_actions.edit_name')}
           iconName={IconName.Edit}
           onPress={goToEditAccountName}
-          testID={AccountActionsModalSelectorsIDs.EDIT_ACCOUNT}
+          testID={AccountActionsBottomSheetSelectorsIDs.EDIT_ACCOUNT}
         />
         {isExplorerVisible && (
           <AccountAction
@@ -377,27 +377,27 @@ const AccountActions = () => {
             }
             iconName={IconName.Export}
             onPress={viewInEtherscan}
-            testID={AccountActionsModalSelectorsIDs.VIEW_ETHERSCAN}
+            testID={AccountActionsBottomSheetSelectorsIDs.VIEW_ETHERSCAN}
           />
         )}
         <AccountAction
           actionTitle={strings('drawer.share_address')}
           iconName={IconName.Share}
           onPress={onShare}
-          testID={AccountActionsModalSelectorsIDs.SHARE_ADDRESS}
+          testID={AccountActionsBottomSheetSelectorsIDs.SHARE_ADDRESS}
         />
         <AccountAction
           actionTitle={strings('account_details.show_private_key')}
           iconName={IconName.Key}
           onPress={goToExportPrivateKey}
-          testID={AccountActionsModalSelectorsIDs.SHOW_PRIVATE_KEY}
+          testID={AccountActionsBottomSheetSelectorsIDs.SHOW_PRIVATE_KEY}
         />
         {selectedAddress && isHardwareAccount(selectedAddress) && (
           <AccountAction
             actionTitle={strings('accounts.remove_hardware_account')}
             iconName={IconName.Close}
             onPress={showRemoveHWAlert}
-            testID={AccountActionsModalSelectorsIDs.REMOVE_HARDWARE_ACCOUNT}
+            testID={AccountActionsBottomSheetSelectorsIDs.REMOVE_HARDWARE_ACCOUNT}
           />
         )}
         {
@@ -407,7 +407,7 @@ const AccountActions = () => {
               actionTitle={strings('accounts.remove_snap_account')}
               iconName={IconName.Close}
               onPress={showRemoveSnapAccountAlert}
-              testID={AccountActionsModalSelectorsIDs.REMOVE_SNAP_ACCOUNT}
+              testID={AccountActionsBottomSheetSelectorsIDs.REMOVE_SNAP_ACCOUNT}
             />
           )
           ///: END:ONLY_INCLUDE_IF

diff --git a/...mponents/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.tsx b/...mponents/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.tsx
@@ -25,7 +25,7 @@ import Engine from '../../../../core/Engine';
 
 // Internal dependencies.
 import { ConnectAccountBottomSheetSelectorsIDs } from '../../../../../e2e/selectors/Browser/ConnectAccountBottomSheet.selectors';
-import { AccountListViewSelectorsIDs } from '../../../../../e2e/selectors/AccountListView.selectors';
+import { AccountListBottomSheetSelectorsIDs } from '../../../../../e2e/selectors/wallet/AccountListBottomSheet.selectors';
 import AddAccountActions from '../../AddAccountActions';
 import styleSheet from './AccountConnectMultiSelector.styles';
 import {
@@ -355,7 +355,7 @@ const AccountConnectMultiSelector = ({
               onPress={() =>
                 setScreen(AccountConnectMultiSelectorScreens.AddAccountActions)
               }
-              testID={AccountListViewSelectorsIDs.ACCOUNT_LIST_ADD_BUTTON_ID}
+              testID={AccountListBottomSheetSelectorsIDs.ACCOUNT_LIST_ADD_BUTTON_ID}
             />
           </View>
           <View style={styles.body}>{renderCtaButtons()}</View>

diff --git a/app/components/Views/AccountSelector/AccountSelector.test.tsx b/app/components/Views/AccountSelector/AccountSelector.test.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { screen } from '@testing-library/react-native';
 import AccountSelector from './AccountSelector';
 import { renderScreen } from '../../../util/test/renderWithProvider';
-import { AccountListViewSelectorsIDs } from '../../../../e2e/selectors/AccountListView.selectors';
+import { AccountListBottomSheetSelectorsIDs } from '../../../../e2e/selectors/wallet/AccountListBottomSheet.selectors';
 import Routes from '../../../constants/navigation/Routes';
 import {
   AccountSelectorParams,
@@ -140,7 +140,7 @@ describe('AccountSelector', () => {
     );
 
     const accountsList = screen.getByTestId(
-      AccountListViewSelectorsIDs.ACCOUNT_LIST_ID,
+      AccountListBottomSheetSelectorsIDs.ACCOUNT_LIST_ID,
     );
     expect(accountsList).toBeDefined();
   });
@@ -158,7 +158,7 @@ describe('AccountSelector', () => {
     );
 
     const addButton = screen.getByTestId(
-      AccountListViewSelectorsIDs.ACCOUNT_LIST_ADD_BUTTON_ID,
+      AccountListBottomSheetSelectorsIDs.ACCOUNT_LIST_ADD_BUTTON_ID,
     );
     expect(addButton).toBeDefined();
   });

diff --git a/app/components/Views/AccountSelector/AccountSelector.tsx b/app/components/Views/AccountSelector/AccountSelector.tsx
@@ -24,7 +24,7 @@ import Button, {
   ButtonWidthTypes,
 } from '../../../component-library/components/Buttons/Button';
 import AddAccountActions from '../AddAccountActions';
-import { AccountListViewSelectorsIDs } from '../../../../e2e/selectors/AccountListView.selectors';
+import { AccountListBottomSheetSelectorsIDs } from '../../../../e2e/selectors/wallet/AccountListBottomSheet.selectors';
 // Internal dependencies.
 import {
   AccountSelectorProps,
@@ -101,7 +101,7 @@ const AccountSelector = ({ route }: AccountSelectorProps) => {
           ensByAccountAddress={ensByAccountAddress}
           isRemoveAccountEnabled
           privacyMode={privacyMode}
-          testID={AccountListViewSelectorsIDs.ACCOUNT_LIST_ID}
+          testID={AccountListBottomSheetSelectorsIDs.ACCOUNT_LIST_ID}
         />
         <View style={styles.sheet}>
           <Button
@@ -110,7 +110,7 @@ const AccountSelector = ({ route }: AccountSelectorProps) => {
             width={ButtonWidthTypes.Full}
             size={ButtonSize.Lg}
             onPress={() => setScreen(AccountSelectorScreens.AddAccountActions)}
-            testID={AccountListViewSelectorsIDs.ACCOUNT_LIST_ADD_BUTTON_ID}
+            testID={AccountListBottomSheetSelectorsIDs.ACCOUNT_LIST_ADD_BUTTON_ID}
           />
         </View>
       </Fragment>

diff --git a/app/components/Views/AddAccountActions/AddAccountActions.tsx b/app/components/Views/AddAccountActions/AddAccountActions.tsx
@@ -14,7 +14,7 @@ import Engine from '../../../core/Engine';
 
 // Internal dependencies
 import { AddAccountActionsProps } from './AddAccountActions.types';
-import { AddAccountModalSelectorsIDs } from '../../../../e2e/selectors/Modals/AddAccountModal.selectors';
+import { AddAccountBottomSheetSelectorsIDs } from '../../../../e2e/selectors/wallet/AddAccountBottomSheet.selectors';
 import Routes from '../../../constants/navigation/Routes';
 import { useMetrics } from '../../../components/hooks/useMetrics';
 
@@ -125,7 +125,7 @@ const AddAccountActions = ({ onBack }: AddAccountActionsProps) => {
             iconName={IconName.Add}
             onPress={createNewAccount}
             disabled={isLoading}
-            testID={AddAccountModalSelectorsIDs.NEW_ACCOUNT_BUTTON}
+            testID={AddAccountBottomSheetSelectorsIDs.NEW_ACCOUNT_BUTTON}
           />
           {
             ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
@@ -162,7 +162,7 @@ const AddAccountActions = ({ onBack }: AddAccountActionsProps) => {
             iconName={IconName.Import}
             onPress={openImportAccount}
             disabled={isLoading}
-            testID={AddAccountModalSelectorsIDs.IMPORT_ACCOUNT_BUTTON}
+            testID={AddAccountBottomSheetSelectorsIDs.IMPORT_ACCOUNT_BUTTON}
           />
           <AccountAction
             actionTitle={strings('account_actions.add_hardware_wallet')}

diff --git a/app/components/Views/AssetDetails/AssetDetailsActions/AssetDetailsActions.test.tsx b/app/components/Views/AssetDetails/AssetDetailsActions/AssetDetailsActions.test.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { fireEvent } from '@testing-library/react-native';
 import AssetDetailsActions from './AssetDetailsActions';
 import { strings } from '../../../../../locales/i18n';
-import { TokenOverviewSelectorsIDs } from '../../../../../e2e/selectors/TokenOverview.selectors';
+import { TokenOverviewSelectorsIDs } from '../../../../../e2e/selectors/wallet/TokenOverview.selectors';
 import {
   expectedUuid2,
   MOCK_ACCOUNTS_CONTROLLER_STATE,

diff --git a/app/components/Views/AssetDetails/AssetDetailsActions/AssetDetailsActions.tsx b/app/components/Views/AssetDetails/AssetDetailsActions/AssetDetailsActions.tsx
@@ -9,7 +9,7 @@ import { AvatarSize } from '../../../../component-library/components/Avatars/Ava
 import Text, {
   TextVariant,
 } from '../../../../component-library/components/Texts/Text';
-import { TokenOverviewSelectorsIDs } from '../../../../../e2e/selectors/TokenOverview.selectors';
+import { TokenOverviewSelectorsIDs } from '../../../../../e2e/selectors/wallet/TokenOverview.selectors';
 import { useSelector } from 'react-redux';
 import { selectCanSignTransactions } from '../../../../selectors/accountsController';
 

diff --git a/app/components/Views/EditAccountName/EditAccountName.test.tsx b/app/components/Views/EditAccountName/EditAccountName.test.tsx
@@ -7,7 +7,7 @@ import EditAccountName from './EditAccountName';
 import renderWithProvider from '../../../util/test/renderWithProvider';
 import { backgroundState } from '../../../util/test/initial-root-state';
 import { createMockAccountsControllerState } from '../../../util/test/accountsControllerTestUtils';
-import EditAccountNameSelectorIDs from '../../../../e2e/selectors/EditAccountName.selectors';
+import { EditAccountNameSelectorIDs } from '../../../../e2e/selectors/wallet/EditAccountName.selectors';
 
 const mockPreferencesSetAccountLabel = jest.fn();
 const mockEngineSetAccountLabel = jest.fn();