fixed merge conflicts in E2E

MetaMask · Jul 29, 2024 · c92d34d · c92d34d
1 parent 2d8a59c
commit c92d34d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/wdio/screen-objects/CommonScreen.js b/wdio/screen-objects/CommonScreen.js
@@ -1,14 +1,7 @@
 import Selectors from '../helpers/Selectors';
 import Gestures from '../helpers/Gestures';
-<<<<<<< HEAD
 import { ANDROID_PROGRESS_BAR, TOAST_ID } from './testIDs/Common.testIds';
-=======
-import {
-  ToastSelectorsIDs,
-  ToastSelectorsText,
-} from '../../e2e/selectors/Modals/ToastModal.selectors';
-import { CommonSelectorsIDs } from '../../e2e/selectors/Common.selectors';
->>>>>>> ca52e90402 (test: Add step to close onboarding modals (#10387))
+import { ToastSelectorsText } from '../../e2e/selectors/Modals/ToastModal.selectors';
 import { NOTIFICATION_TITLE } from './testIDs/Components/Notification.testIds';
 
 class CommonScreen {

diff --git a/wdio/screen-objects/WalletMainScreen.js b/wdio/screen-objects/WalletMainScreen.js
@@ -1,7 +1,5 @@
 import Selectors from '../helpers/Selectors';
 import Gestures from '../helpers/Gestures.js';
-<<<<<<< HEAD
-import { ONBOARDING_WIZARD_STEP_1_NO_THANKS_ID } from './testIDs/Components/OnboardingWizard.testIds';
 import {
   IMPORT_NFT_BUTTON_ID,
   IMPORT_TOKEN_BUTTON_ID,
@@ -15,11 +13,7 @@ import {
   VIEW_ETHERSCAN,
   WALLET_ACCOUNT_ICON,
 } from './testIDs/Screens/WalletView.testIds';
-=======
 import { OnboardingWizardModalSelectorsIDs } from '../../e2e/selectors/Modals/OnboardingWizardModal.selectors';
-import { ProtectWalletModalSelectorsIDs } from '../../e2e/selectors/Modals/ProtectWalletModal.selectors';
-import { AccountActionsModalSelectorsIDs } from '../../e2e/selectors/Modals/AccountActionsModal.selectors';
->>>>>>> ca52e90402 (test: Add step to close onboarding modals (#10387))
 import { NOTIFICATION_TITLE } from './testIDs/Components/Notification.testIds';
 import { TabBarSelectorIDs } from '../../e2e/selectors/TabBar.selectors';