diff --git a/app/component-library/components/Modals/ModalMandatory/ModalMandatory.tsx b/app/component-library/components/Modals/ModalMandatory/ModalMandatory.tsx index 0f47e5c8985..443f2c137b1 100644 --- a/app/component-library/components/Modals/ModalMandatory/ModalMandatory.tsx +++ b/app/component-library/components/Modals/ModalMandatory/ModalMandatory.tsx @@ -33,7 +33,7 @@ import { MandatoryModalProps, } from './ModalMandatory.types'; import stylesheet from './ModalMandatory.styles'; -import { TermsOfUseModalSelectorsIDs } from '../../../../../e2e/selectors/Modals/TermsOfUseModal.selectors'; +import { TermsOfUseModalSelectorsIDs } from '../../../../../e2e/selectors/Onboarding/TermsOfUseModal.selectors'; const ModalMandatory = ({ route }: MandatoryModalProps) => { const { colors } = useTheme(); diff --git a/app/components/UI/BackupAlert/BackupAlert.tsx b/app/components/UI/BackupAlert/BackupAlert.tsx index d3d0175adc8..134de7ca2df 100644 --- a/app/components/UI/BackupAlert/BackupAlert.tsx +++ b/app/components/UI/BackupAlert/BackupAlert.tsx @@ -8,7 +8,7 @@ import { useDispatch, useSelector } from 'react-redux'; import { backUpSeedphraseAlertNotVisible } from '../../../actions/user'; import { findRouteNameFromNavigatorState } from '../../../util/general'; import { MetaMetricsEvents } from '../../../core/Analytics'; -import { ProtectWalletModalSelectorsIDs } from '../../../../e2e/selectors/Modals/ProtectWalletModal.selectors'; +import { ProtectWalletModalSelectorsIDs } from '../../../../e2e/selectors/Onboarding/ProtectWalletModal.selectors'; import styleSheet from './BackupAlert.styles'; import { useStyles } from '../../../component-library/hooks'; import { BackupAlertI } from './BackupAlert.types'; diff --git a/app/components/UI/EnableAutomaticSecurityChecksModal/EnableAutomaticSecurityChecksModal.tsx b/app/components/UI/EnableAutomaticSecurityChecksModal/EnableAutomaticSecurityChecksModal.tsx index a0123631d78..267717fe297 100644 --- a/app/components/UI/EnableAutomaticSecurityChecksModal/EnableAutomaticSecurityChecksModal.tsx +++ b/app/components/UI/EnableAutomaticSecurityChecksModal/EnableAutomaticSecurityChecksModal.tsx @@ -23,7 +23,7 @@ import { import { MetaMetricsEvents } from '../../../core/Analytics'; import { ScrollView } from 'react-native-gesture-handler'; -import { EnableAutomaticSecurityChecksIDs } from '../../../../e2e/selectors/Modals/EnableAutomaticSecurityChecks.selectors'; +import { EnableAutomaticSecurityChecksIDs } from '../../../../e2e/selectors/Onboarding/EnableAutomaticSecurityChecks.selectors'; import generateDeviceAnalyticsMetaData from '../../../util/metrics'; import { useMetrics } from '../../../components/hooks/useMetrics'; diff --git a/app/components/UI/OnboardingWizard/Coachmark/index.js b/app/components/UI/OnboardingWizard/Coachmark/index.js index f84de8cf959..8be92c62e09 100644 --- a/app/components/UI/OnboardingWizard/Coachmark/index.js +++ b/app/components/UI/OnboardingWizard/Coachmark/index.js @@ -22,7 +22,7 @@ import { ButtonWidthTypes, } from '../../../../component-library/components/Buttons/Button'; import Button from '../../../../component-library/components/Buttons/Button/Button'; -import { OnboardingWizardModalSelectorsIDs } from '../../../../../e2e/selectors/Modals/OnboardingWizardModal.selectors'; +import { OnboardingWizardModalSelectorsIDs } from '../../../../../e2e/selectors/Onboarding/OnboardingWizardModal.selectors'; const createStyles = (colors) => StyleSheet.create({ diff --git a/app/components/UI/OnboardingWizard/Step1/index.tsx b/app/components/UI/OnboardingWizard/Step1/index.tsx index 71e8ffe5932..34c99d7c5b8 100644 --- a/app/components/UI/OnboardingWizard/Step1/index.tsx +++ b/app/components/UI/OnboardingWizard/Step1/index.tsx @@ -12,7 +12,7 @@ import { ONBOARDING_WIZARD_STEP_DESCRIPTION, } from '../../../../core/Analytics'; import { ThemeContext, mockTheme } from '../../../../util/theme'; -import { OnboardingWizardModalSelectorsIDs } from '../../../../../e2e/selectors/Modals/OnboardingWizardModal.selectors'; +import { OnboardingWizardModalSelectorsIDs } from '../../../../../e2e/selectors/Onboarding/OnboardingWizardModal.selectors'; import { useMetrics } from '../../../../components/hooks/useMetrics'; const styles = StyleSheet.create({ diff --git a/app/components/UI/OnboardingWizard/Step2/index.tsx b/app/components/UI/OnboardingWizard/Step2/index.tsx index cafcf535bb7..38d980f3207 100644 --- a/app/components/UI/OnboardingWizard/Step2/index.tsx +++ b/app/components/UI/OnboardingWizard/Step2/index.tsx @@ -12,7 +12,7 @@ import { ONBOARDING_WIZARD_STEP_DESCRIPTION, } from '../../../../core/Analytics'; import { useTheme } from '../../../../util/theme'; -import { OnboardingWizardModalSelectorsIDs } from '../../../../../e2e/selectors/Modals/OnboardingWizardModal.selectors'; +import { OnboardingWizardModalSelectorsIDs } from '../../../../../e2e/selectors/Onboarding/OnboardingWizardModal.selectors'; import { useMetrics } from '../../../hooks/useMetrics'; import useHandleLayout from '../useHandleLayout'; diff --git a/app/components/UI/OnboardingWizard/Step3/index.tsx b/app/components/UI/OnboardingWizard/Step3/index.tsx index f21941c5cfb..254884a0d92 100644 --- a/app/components/UI/OnboardingWizard/Step3/index.tsx +++ b/app/components/UI/OnboardingWizard/Step3/index.tsx @@ -12,7 +12,7 @@ import { } from '../../../../core/Analytics'; import { useTheme } from '../../../../util/theme'; import { useMetrics } from '../../../hooks/useMetrics'; -import { OnboardingWizardModalSelectorsIDs } from '../../../../../e2e/selectors/Modals/OnboardingWizardModal.selectors'; +import { OnboardingWizardModalSelectorsIDs } from '../../../../../e2e/selectors/Onboarding/OnboardingWizardModal.selectors'; import useHandleLayout from '../useHandleLayout'; const styles = StyleSheet.create({ diff --git a/app/components/UI/OnboardingWizard/Step4/index.tsx b/app/components/UI/OnboardingWizard/Step4/index.tsx index f7a5b2c1b1d..3b61ed84cc4 100644 --- a/app/components/UI/OnboardingWizard/Step4/index.tsx +++ b/app/components/UI/OnboardingWizard/Step4/index.tsx @@ -13,7 +13,7 @@ import { ONBOARDING_WIZARD_STEP_DESCRIPTION, } from '../../../../core/Analytics'; import { useTheme } from '../../../../util/theme'; -import { OnboardingWizardModalSelectorsIDs } from '../../../../../e2e/selectors/Modals/OnboardingWizardModal.selectors'; +import { OnboardingWizardModalSelectorsIDs } from '../../../../../e2e/selectors/Onboarding/OnboardingWizardModal.selectors'; import { useMetrics } from '../../../hooks/useMetrics'; diff --git a/app/components/UI/OnboardingWizard/Step5/index.tsx b/app/components/UI/OnboardingWizard/Step5/index.tsx index 583b68468aa..df08abd3209 100644 --- a/app/components/UI/OnboardingWizard/Step5/index.tsx +++ b/app/components/UI/OnboardingWizard/Step5/index.tsx @@ -13,7 +13,7 @@ import { import { useTheme } from '../../../../util/theme'; import { useMetrics } from '../../../hooks/useMetrics'; -import { OnboardingWizardModalSelectorsIDs } from '../../../../../e2e/selectors/Modals/OnboardingWizardModal.selectors'; +import { OnboardingWizardModalSelectorsIDs } from '../../../../../e2e/selectors/Onboarding/OnboardingWizardModal.selectors'; const styles = StyleSheet.create({ main: { diff --git a/app/components/UI/OnboardingWizard/Step6/index.tsx b/app/components/UI/OnboardingWizard/Step6/index.tsx index 58f08290442..944dca5bc90 100644 --- a/app/components/UI/OnboardingWizard/Step6/index.tsx +++ b/app/components/UI/OnboardingWizard/Step6/index.tsx @@ -13,7 +13,7 @@ import { ONBOARDING_WIZARD_STEP_DESCRIPTION, } from '../../../../core/Analytics'; import { useTheme } from '../../../../util/theme'; -import { OnboardingWizardModalSelectorsIDs } from '../../../../../e2e/selectors/Modals/OnboardingWizardModal.selectors'; +import { OnboardingWizardModalSelectorsIDs } from '../../../../../e2e/selectors/Onboarding/OnboardingWizardModal.selectors'; import { useMetrics } from '../../../hooks/useMetrics'; const styles = StyleSheet.create({ diff --git a/app/components/UI/OnboardingWizard/Step7/index.tsx b/app/components/UI/OnboardingWizard/Step7/index.tsx index cc0e539cfcd..c71c6414ea8 100644 --- a/app/components/UI/OnboardingWizard/Step7/index.tsx +++ b/app/components/UI/OnboardingWizard/Step7/index.tsx @@ -14,7 +14,7 @@ import { } from '../../../../core/Analytics'; import { useTheme } from '../../../../util/theme'; -import { OnboardingWizardModalSelectorsIDs } from '../../../../../e2e/selectors/Modals/OnboardingWizardModal.selectors'; +import { OnboardingWizardModalSelectorsIDs } from '../../../../../e2e/selectors/Onboarding/OnboardingWizardModal.selectors'; import { useMetrics } from '../../../hooks/useMetrics'; const styles = StyleSheet.create({ diff --git a/app/components/UI/ProtectYourWalletModal/index.js b/app/components/UI/ProtectYourWalletModal/index.js index 00342d87e6d..75e0b8507d7 100644 --- a/app/components/UI/ProtectYourWalletModal/index.js +++ b/app/components/UI/ProtectYourWalletModal/index.js @@ -11,7 +11,7 @@ import scaling from '../../../util/scaling'; import { MetaMetricsEvents } from '../../../core/Analytics'; import { ThemeContext, mockTheme } from '../../../util/theme'; -import { ProtectWalletModalSelectorsIDs } from '../../../../e2e/selectors/Modals/ProtectWalletModal.selectors'; +import { ProtectWalletModalSelectorsIDs } from '../../../../e2e/selectors/Onboarding/ProtectWalletModal.selectors'; import { withMetricsAwareness } from '../../../components/hooks/useMetrics'; const protectWalletImage = require('../../../images/explain-backup-seedphrase.png'); // eslint-disable-line diff --git a/app/components/UI/SkipAccountSecurityModal/index.js b/app/components/UI/SkipAccountSecurityModal/index.js index fe914e16444..da47cd7dcb4 100644 --- a/app/components/UI/SkipAccountSecurityModal/index.js +++ b/app/components/UI/SkipAccountSecurityModal/index.js @@ -15,7 +15,7 @@ import PropTypes from 'prop-types'; import { fontStyles } from '../../../styles/common'; import { useTheme } from '../../../util/theme'; import generateTestId from '../../../../wdio/utils/generateTestId'; -import { SkipAccountSecurityModalSelectorsIDs } from '../../../../e2e/selectors/Modals/SkipAccountSecurityModal.selectors'; +import { SkipAccountSecurityModalSelectorsIDs } from '../../../../e2e/selectors/Onboarding/SkipAccountSecurityModal.selectors'; const createStyles = (colors) => StyleSheet.create({ diff --git a/app/components/UI/WhatsNewModal/WhatsNewModal.tsx b/app/components/UI/WhatsNewModal/WhatsNewModal.tsx index c53a5d02f73..382cf8b18ec 100644 --- a/app/components/UI/WhatsNewModal/WhatsNewModal.tsx +++ b/app/components/UI/WhatsNewModal/WhatsNewModal.tsx @@ -29,7 +29,7 @@ import Icon, { import ReusableModal, { ReusableModalRef } from '../ReusableModal'; import { whatsNewList } from './'; import { Colors } from '../../../util/theme/models'; -import { WhatsNewModalSelectorsIDs } from '../../../../e2e/selectors/Modals/WhatsNewModal.selectors'; +import { WhatsNewModalSelectorsIDs } from '../../../../e2e/selectors/Onboarding/WhatsNewModal.selectors'; import { ScrollView } from 'react-native-gesture-handler'; import { useNavigation } from '@react-navigation/native'; diff --git a/app/components/Views/ExperienceEnhancerModal/index.test.tsx b/app/components/Views/ExperienceEnhancerModal/index.test.tsx index d33f6e7698a..7926424691b 100644 --- a/app/components/Views/ExperienceEnhancerModal/index.test.tsx +++ b/app/components/Views/ExperienceEnhancerModal/index.test.tsx @@ -6,7 +6,7 @@ import { useDispatch } from 'react-redux'; import { setDataCollectionForMarketing } from '../../../actions/security'; import { HOW_TO_MANAGE_METRAMETRICS_SETTINGS } from '../../../constants/urls'; import ExperienceEnhancerModal from './'; -import { ExperienceEnhancerModalSelectorsIDs } from '../../../../e2e/selectors/Modals/ExperienceEnhancerModal.selectors.js'; +import { ExperienceEnhancerBottomSheetSelectorsIDs } from '../../../../e2e/selectors/Onboarding/ExperienceEnhancerModal.selectors.js'; // Mock the BottomSheet component jest.mock( @@ -52,7 +52,7 @@ describe('ExperienceEnhancerModal', () => { const { getByTestId } = render(); const cancelButton = getByTestId( - ExperienceEnhancerModalSelectorsIDs.CANCEL_BUTTON, + ExperienceEnhancerBottomSheetSelectorsIDs.CANCEL_BUTTON, ); expect(cancelButton).toBeTruthy(); @@ -66,7 +66,7 @@ describe('ExperienceEnhancerModal', () => { const { getByTestId } = render(); const acceptButton = getByTestId( - ExperienceEnhancerModalSelectorsIDs.ACCEPT_BUTTON, + ExperienceEnhancerBottomSheetSelectorsIDs.ACCEPT_BUTTON, ); expect(acceptButton).toBeTruthy(); @@ -80,7 +80,7 @@ describe('ExperienceEnhancerModal', () => { const { getByTestId } = render(); const linkButton = getByTestId( - ExperienceEnhancerModalSelectorsIDs.LINK_BUTTON, + ExperienceEnhancerBottomSheetSelectorsIDs.LINK_BUTTON, ); expect(linkButton).toBeTruthy(); diff --git a/app/components/Views/ExperienceEnhancerModal/index.tsx b/app/components/Views/ExperienceEnhancerModal/index.tsx index c3b8eccffee..7f947d08dd7 100644 --- a/app/components/Views/ExperienceEnhancerModal/index.tsx +++ b/app/components/Views/ExperienceEnhancerModal/index.tsx @@ -24,7 +24,7 @@ import { useMetrics, } from '../../../components/hooks/useMetrics'; import { HOW_TO_MANAGE_METRAMETRICS_SETTINGS } from '../../../constants/urls'; -import { ExperienceEnhancerModalSelectorsIDs } from '../../../../e2e/selectors/Modals/ExperienceEnhancerModal.selectors.js'; +import { ExperienceEnhancerBottomSheetSelectorsIDs } from '../../../../e2e/selectors/Onboarding/ExperienceEnhancerModal.selectors.js'; const ExperienceEnhancerModal = () => { const dispatch = useDispatch(); @@ -53,7 +53,7 @@ const ExperienceEnhancerModal = () => { .build(), ); }, - testID: ExperienceEnhancerModalSelectorsIDs.CANCEL_BUTTON, + testID: ExperienceEnhancerBottomSheetSelectorsIDs.CANCEL_BUTTON, }; const acceptButtonProps: ButtonProps = { @@ -75,24 +75,24 @@ const ExperienceEnhancerModal = () => { .build(), ); }, - testID: ExperienceEnhancerModalSelectorsIDs.ACCEPT_BUTTON, + testID: ExperienceEnhancerBottomSheetSelectorsIDs.ACCEPT_BUTTON, }; return ( {strings('experience_enhancer_modal.title')} {strings('experience_enhancer_modal.paragraph1a')} @@ -100,35 +100,35 @@ const ExperienceEnhancerModal = () => { variant={ButtonVariants.Link} label={strings('experience_enhancer_modal.link')} onPress={() => Linking.openURL(HOW_TO_MANAGE_METRAMETRICS_SETTINGS)} - testID={ExperienceEnhancerModalSelectorsIDs.LINK_BUTTON} + testID={ExperienceEnhancerBottomSheetSelectorsIDs.LINK_BUTTON} /> {strings('experience_enhancer_modal.paragraph1b')} {strings('experience_enhancer_modal.paragraph2')} •{' '} {strings('experience_enhancer_modal.bullet1')} •{' '} {strings('experience_enhancer_modal.bullet2')} •{' '} {strings('experience_enhancer_modal.bullet3')} @@ -136,7 +136,7 @@ const ExperienceEnhancerModal = () => { {strings('experience_enhancer_modal.footer')} diff --git a/app/util/termsOfUse/termsOfUse.ts b/app/util/termsOfUse/termsOfUse.ts index 027d071a4e4..f5d115fc35c 100644 --- a/app/util/termsOfUse/termsOfUse.ts +++ b/app/util/termsOfUse/termsOfUse.ts @@ -3,7 +3,7 @@ import { MetricsEventBuilder } from '../../core/Analytics/MetricsEventBuilder'; import { TRUE, USE_TERMS } from '../../constants/storage'; import Routes from '../../constants/navigation/Routes'; import { strings } from '../../../locales/i18n'; -import { TermsOfUseModalSelectorsIDs } from '../../../e2e/selectors/Modals/TermsOfUseModal.selectors'; +import { TermsOfUseModalSelectorsIDs } from '../../../e2e/selectors/Onboarding/TermsOfUseModal.selectors'; import StorageWrapper from '../../store/storage-wrapper'; import termsOfUse from './termsOfUseContent'; diff --git a/e2e/pages/EnableDeviceNotificationsAlert.js b/e2e/pages/EnableDeviceNotificationsAlert.js deleted file mode 100644 index a5e6e512451..00000000000 --- a/e2e/pages/EnableDeviceNotificationsAlert.js +++ /dev/null @@ -1,36 +0,0 @@ -import Gestures from '../utils/Gestures'; -import Matchers from '../utils/Matchers'; - -import { - ENABLE_DEVICE_NOTIFICATIONS_CONTAINER_ID, - ENABLE_DEVICE_NOTIFICATIONS_NO_THANKS_BUTTON_ID, - ENABLE_DEVICE_NOTIFICATIONS_YES_BUTTON_ID -} from '../../wdio/screen-objects/testIDs/Screens/EnableDeviceNotificationsChecksAlert.testIds'; - -class EnableDeviceNotificationsAlert { - get stepOneContainer() { - return Matchers.getSystemElementByText(ENABLE_DEVICE_NOTIFICATIONS_CONTAINER_ID); - } - - get getEnableDeviceNotificationsButton() { - return Matchers.getSystemElementByText( - ENABLE_DEVICE_NOTIFICATIONS_YES_BUTTON_ID, - ); - } - - get getNotEnableDeviceNotificationsButton() { - return Matchers.getSystemElementByText( - ENABLE_DEVICE_NOTIFICATIONS_NO_THANKS_BUTTON_ID, - ); - } - - async tapOnEnableDeviceNotificationsButton() { - await Gestures.waitAndTap(this.getEnableDeviceNotificationsButton); - } - - async tapOnNotEnableDeviceNotificationsButton() { - await Gestures.waitAndTap(this.getNotEnableDeviceNotificationsButton); - } -} - -export default new EnableDeviceNotificationsAlert(); diff --git a/e2e/pages/modals/EnableAutomaticSecurityChecksView.js b/e2e/pages/Onboarding/EnableAutomaticSecurityChecksView.js similarity index 91% rename from e2e/pages/modals/EnableAutomaticSecurityChecksView.js rename to e2e/pages/Onboarding/EnableAutomaticSecurityChecksView.js index db740ab38e3..aea850b7985 100644 --- a/e2e/pages/modals/EnableAutomaticSecurityChecksView.js +++ b/e2e/pages/Onboarding/EnableAutomaticSecurityChecksView.js @@ -1,6 +1,6 @@ import Matchers from '../../utils/Matchers'; import Gestures from '../../utils/Gestures'; -import { EnableAutomaticSecurityChecksIDs } from '../../selectors/Modals/EnableAutomaticSecurityChecks.selectors'; +import { EnableAutomaticSecurityChecksIDs } from '../../selectors/Onboarding/EnableAutomaticSecurityChecks.selectors'; class EnableAutomaticSecurityChecksView { get container() { diff --git a/e2e/pages/Onboarding/EnableDeviceNotificationsAlert.js b/e2e/pages/Onboarding/EnableDeviceNotificationsAlert.js new file mode 100644 index 00000000000..5500a14b25a --- /dev/null +++ b/e2e/pages/Onboarding/EnableDeviceNotificationsAlert.js @@ -0,0 +1,24 @@ +import Gestures from '../../utils/Gestures'; +import Matchers from '../../utils/Matchers'; + +import { + EnableDeviceNotificationsAlertSelectorText +} from '../../selectors/Onboarding/EnableDeviceNotificationsAlert.selectors'; + +class EnableDeviceNotificationsAlert { + get stepOneContainer() { + return Matchers.getSystemElementByText(EnableDeviceNotificationsAlertSelectorText.CONTAINER); + } + + get getEnableDeviceNotificationsButton() { + return Matchers.getSystemElementByText( + EnableDeviceNotificationsAlertSelectorText.YES_BUTTON, + ); + } + + async tapOnEnableDeviceNotificationsButton() { + await Gestures.waitAndTap(this.getEnableDeviceNotificationsButton); + } +} + +export default new EnableDeviceNotificationsAlert(); diff --git a/e2e/pages/Onboarding/ExperienceEnhancerBottomSheet.js b/e2e/pages/Onboarding/ExperienceEnhancerBottomSheet.js new file mode 100644 index 00000000000..d73d9a8ab14 --- /dev/null +++ b/e2e/pages/Onboarding/ExperienceEnhancerBottomSheet.js @@ -0,0 +1,23 @@ +import { ExperienceEnhancerBottomSheetSelectorsIDs } from '../../selectors/Onboarding/ExperienceEnhancerModal.selectors'; +import Matchers from '../../utils/Matchers'; +import Gestures from '../../utils/Gestures'; + +class ExperienceEnhancerBottomSheet { + get container() { + return Matchers.getElementByID( + ExperienceEnhancerBottomSheetSelectorsIDs.BOTTOM_SHEET, + ); + } + + get iAgree() { + return Matchers.getElementByID( + ExperienceEnhancerBottomSheetSelectorsIDs.ACCEPT_BUTTON, + ); + } + + async tapIAgree() { + await Gestures.waitAndTap(this.iAgree); + } +} + +export default new ExperienceEnhancerBottomSheet(); diff --git a/e2e/pages/modals/OnboardingWizardModal.js b/e2e/pages/Onboarding/OnboardingWizardModal.js similarity index 97% rename from e2e/pages/modals/OnboardingWizardModal.js rename to e2e/pages/Onboarding/OnboardingWizardModal.js index 3d9cb4753a5..fc462718c03 100644 --- a/e2e/pages/modals/OnboardingWizardModal.js +++ b/e2e/pages/Onboarding/OnboardingWizardModal.js @@ -1,4 +1,4 @@ -import { OnboardingWizardModalSelectorsIDs } from '../../selectors/Modals/OnboardingWizardModal.selectors'; +import { OnboardingWizardModalSelectorsIDs } from '../../selectors/Onboarding/OnboardingWizardModal.selectors'; import Matchers from '../../utils/Matchers'; import Gestures from '../../utils/Gestures'; diff --git a/e2e/pages/modals/ProtectYourWalletModal.js b/e2e/pages/Onboarding/ProtectYourWalletModal.js similarity index 94% rename from e2e/pages/modals/ProtectYourWalletModal.js rename to e2e/pages/Onboarding/ProtectYourWalletModal.js index 8db9ff10603..023870d1aef 100644 --- a/e2e/pages/modals/ProtectYourWalletModal.js +++ b/e2e/pages/Onboarding/ProtectYourWalletModal.js @@ -1,4 +1,4 @@ -import { ProtectWalletModalSelectorsIDs } from '../../selectors/Modals/ProtectWalletModal.selectors'; +import { ProtectWalletModalSelectorsIDs } from '../../selectors/Onboarding/ProtectWalletModal.selectors'; import Matchers from '../../utils/Matchers'; import Gestures from '../../utils/Gestures'; diff --git a/e2e/pages/modals/SkipAccountSecurityModal.js b/e2e/pages/Onboarding/SkipAccountSecurityModal.js similarity index 85% rename from e2e/pages/modals/SkipAccountSecurityModal.js rename to e2e/pages/Onboarding/SkipAccountSecurityModal.js index d7163bc115f..f80ef5bcff8 100644 --- a/e2e/pages/modals/SkipAccountSecurityModal.js +++ b/e2e/pages/Onboarding/SkipAccountSecurityModal.js @@ -1,13 +1,8 @@ -import { SkipAccountSecurityModalSelectorsIDs } from '../../selectors/Modals/SkipAccountSecurityModal.selectors'; +import { SkipAccountSecurityModalSelectorsIDs } from '../../selectors/Onboarding/SkipAccountSecurityModal.selectors'; import Gestures from '../../utils/Gestures'; import Matchers from '../../utils/Matchers'; class SkipAccountSecurityModal { - get container() { - return Matchers.getElementByID( - SkipAccountSecurityModalSelectorsIDs.CONTAINER, - ); - } get iUnderstandCheckbox() { return device.getPlatform() === 'android' ? Matchers.getElementByID( diff --git a/e2e/pages/modals/TermsOfUseModal.js b/e2e/pages/Onboarding/TermsOfUseModal.js similarity index 89% rename from e2e/pages/modals/TermsOfUseModal.js rename to e2e/pages/Onboarding/TermsOfUseModal.js index 7b5c66ae8ca..3de7a1a3bcb 100644 --- a/e2e/pages/modals/TermsOfUseModal.js +++ b/e2e/pages/Onboarding/TermsOfUseModal.js @@ -1,4 +1,4 @@ -import { TermsOfUseModalSelectorsIDs } from '../../selectors/Modals/TermsOfUseModal.selectors'; +import { TermsOfUseModalSelectorsIDs } from '../../selectors/Onboarding/TermsOfUseModal.selectors'; import Matchers from '../../utils/Matchers'; import Gestures from '../../utils/Gestures'; diff --git a/e2e/pages/modals/WhatsNewModal.js b/e2e/pages/Onboarding/WhatsNewModal.js similarity index 81% rename from e2e/pages/modals/WhatsNewModal.js rename to e2e/pages/Onboarding/WhatsNewModal.js index 03abec1ced4..525567cab8f 100644 --- a/e2e/pages/modals/WhatsNewModal.js +++ b/e2e/pages/Onboarding/WhatsNewModal.js @@ -1,4 +1,4 @@ -import { WhatsNewModalSelectorsIDs } from '../../selectors/Modals/WhatsNewModal.selectors'; +import { WhatsNewModalSelectorsIDs } from '../../selectors/Onboarding/WhatsNewModal.selectors'; import Matchers from '../../utils/Matchers'; import Gestures from '../../utils/Gestures'; diff --git a/e2e/pages/modals/ExperienceEnhancerModal.js b/e2e/pages/modals/ExperienceEnhancerModal.js deleted file mode 100644 index 69316383831..00000000000 --- a/e2e/pages/modals/ExperienceEnhancerModal.js +++ /dev/null @@ -1,33 +0,0 @@ -import { ExperienceEnhancerModalSelectorsIDs } from '../../selectors/Modals/ExperienceEnhancerModal.selectors'; -import Matchers from '../../utils/Matchers'; -import Gestures from '../../utils/Gestures'; - -class ExperienceEnhancerModal { - get container() { - return Matchers.getElementByID( - ExperienceEnhancerModalSelectorsIDs.BOTTOM_SHEET, - ); - } - - get iAgree() { - return Matchers.getElementByID( - ExperienceEnhancerModalSelectorsIDs.ACCEPT_BUTTON, - ); - } - - get noThanks() { - return Matchers.getElementByID( - ExperienceEnhancerModalSelectorsIDs.CANCEL_BUTTON, - ); - } - - async tapIagree() { - await Gestures.waitAndTap(this.iAgree); - } - - async tapNoThanks() { - await Gestures.waitAndTap(this.noThanks); - } -} - -export default new ExperienceEnhancerModal(); diff --git a/e2e/selectors/Modals/EnableAutomaticSecurityChecks.selectors.js b/e2e/selectors/Onboarding/EnableAutomaticSecurityChecks.selectors.js similarity index 100% rename from e2e/selectors/Modals/EnableAutomaticSecurityChecks.selectors.js rename to e2e/selectors/Onboarding/EnableAutomaticSecurityChecks.selectors.js diff --git a/e2e/selectors/Onboarding/EnableDeviceNotificationsAlert.selectors.js b/e2e/selectors/Onboarding/EnableDeviceNotificationsAlert.selectors.js new file mode 100644 index 00000000000..611e6575b6f --- /dev/null +++ b/e2e/selectors/Onboarding/EnableDeviceNotificationsAlert.selectors.js @@ -0,0 +1,4 @@ +export const EnableDeviceNotificationsAlertSelectorText = { + CONTAINER: 'Would Like to Send You Notifications', + YES_BUTTON: 'Allow', +}; diff --git a/e2e/selectors/Modals/ExperienceEnhancerModal.selectors.js b/e2e/selectors/Onboarding/ExperienceEnhancerModal.selectors.js similarity index 90% rename from e2e/selectors/Modals/ExperienceEnhancerModal.selectors.js rename to e2e/selectors/Onboarding/ExperienceEnhancerModal.selectors.js index c985c26eb48..952c22310c7 100644 --- a/e2e/selectors/Modals/ExperienceEnhancerModal.selectors.js +++ b/e2e/selectors/Onboarding/ExperienceEnhancerModal.selectors.js @@ -1,4 +1,4 @@ -export const ExperienceEnhancerModalSelectorsIDs = { +export const ExperienceEnhancerBottomSheetSelectorsIDs = { LINK_BUTTON: 'experience-enhancer-modal-link-button', CANCEL_BUTTON: 'experience-enhancer-modal-cancel-button', ACCEPT_BUTTON: 'experience-enhancer-modal-accept-button', diff --git a/e2e/selectors/Modals/OnboardingWizardModal.selectors.js b/e2e/selectors/Onboarding/OnboardingWizardModal.selectors.js similarity index 100% rename from e2e/selectors/Modals/OnboardingWizardModal.selectors.js rename to e2e/selectors/Onboarding/OnboardingWizardModal.selectors.js diff --git a/e2e/selectors/Modals/ProtectWalletModal.selectors.js b/e2e/selectors/Onboarding/ProtectWalletModal.selectors.js similarity index 100% rename from e2e/selectors/Modals/ProtectWalletModal.selectors.js rename to e2e/selectors/Onboarding/ProtectWalletModal.selectors.js diff --git a/e2e/selectors/Modals/SkipAccountSecurityModal.selectors.js b/e2e/selectors/Onboarding/SkipAccountSecurityModal.selectors.js similarity index 100% rename from e2e/selectors/Modals/SkipAccountSecurityModal.selectors.js rename to e2e/selectors/Onboarding/SkipAccountSecurityModal.selectors.js diff --git a/e2e/selectors/Modals/TermsOfUseModal.selectors.js b/e2e/selectors/Onboarding/TermsOfUseModal.selectors.js similarity index 100% rename from e2e/selectors/Modals/TermsOfUseModal.selectors.js rename to e2e/selectors/Onboarding/TermsOfUseModal.selectors.js diff --git a/e2e/selectors/Modals/WhatsNewModal.selectors.js b/e2e/selectors/Onboarding/WhatsNewModal.selectors.js similarity index 100% rename from e2e/selectors/Modals/WhatsNewModal.selectors.js rename to e2e/selectors/Onboarding/WhatsNewModal.selectors.js diff --git a/e2e/specs/onboarding/onboarding-wizard-opt-in.spec.js b/e2e/specs/onboarding/onboarding-wizard-opt-in.spec.js index f81dc1001e1..7a7cef12bd6 100644 --- a/e2e/specs/onboarding/onboarding-wizard-opt-in.spec.js +++ b/e2e/specs/onboarding/onboarding-wizard-opt-in.spec.js @@ -8,18 +8,18 @@ import OnboardingCarouselView from '../../pages/Onboarding/OnboardingCarouselVie import MetaMetricsOptIn from '../../pages/Onboarding/MetaMetricsOptInView'; import OnboardingSuccessView from '../../pages/Onboarding/OnboardingSuccessView'; import WalletView from '../../pages/wallet/WalletView'; -import EnableAutomaticSecurityChecksView from '../../pages/modals/EnableAutomaticSecurityChecksView'; +import EnableAutomaticSecurityChecksView from '../../pages/Onboarding/EnableAutomaticSecurityChecksView'; import SettingsView from '../../pages/Settings/SettingsView'; import SecurityAndPrivacy from '../../pages/Settings/SecurityAndPrivacy/SecurityAndPrivacyView'; import LoginView from '../../pages/LoginView'; -import SkipAccountSecurityModal from '../../pages/modals/SkipAccountSecurityModal'; -import OnboardingWizardModal from '../../pages/modals/OnboardingWizardModal'; -import ProtectYourWalletModal from '../../pages/modals/ProtectYourWalletModal'; +import SkipAccountSecurityModal from '../../pages/Onboarding/SkipAccountSecurityModal'; +import OnboardingWizardModal from '../../pages/Onboarding/OnboardingWizardModal'; +import ProtectYourWalletModal from '../../pages/Onboarding/ProtectYourWalletModal'; import { acceptTermOfUse } from '../../viewHelper'; import TabBarComponent from '../../pages/TabBarComponent'; import CommonView from '../../pages/CommonView'; import Assertions from '../../utils/Assertions'; -import ExperienceEnhancerModal from '../../pages/modals/ExperienceEnhancerModal'; +import ExperienceEnhancerBottomSheet from '../../pages/Onboarding/ExperienceEnhancerBottomSheet'; const PASSWORD = '12345678'; @@ -80,8 +80,8 @@ describe( // dealing with flakiness on bitrise. await TestHelpers.delay(1000); try { - await Assertions.checkIfVisible(ExperienceEnhancerModal.container); - await ExperienceEnhancerModal.tapIagree(); + await Assertions.checkIfVisible(ExperienceEnhancerBottomSheet.container); + await ExperienceEnhancerBottomSheet.tapIAgree(); } catch { /* eslint-disable no-console */ diff --git a/e2e/specs/onboarding/term-of-use.spec.js b/e2e/specs/onboarding/term-of-use.spec.js index 8fe2e3355cd..764a3dc38b4 100644 --- a/e2e/specs/onboarding/term-of-use.spec.js +++ b/e2e/specs/onboarding/term-of-use.spec.js @@ -1,4 +1,4 @@ -import TermsOfUseModal from '../../pages/modals/TermsOfUseModal'; +import TermsOfUseModal from '../../pages/Onboarding/TermsOfUseModal'; import TestHelpers from '../../helpers'; import OnboardingCarouselView from '../../pages/Onboarding/OnboardingCarouselView'; import OnboardingView from '../../pages/Onboarding/OnboardingView'; 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 6c51ffe9754..1c9d68d23d2 100644 --- a/e2e/specs/permission-systems/permission-system-delete-wallet.spec.js +++ b/e2e/specs/permission-systems/permission-system-delete-wallet.spec.js @@ -8,7 +8,7 @@ import WalletView from '../../pages/wallet/WalletView'; import Browser from '../../pages/Browser/BrowserView'; import SettingsView from '../../pages/Settings/SettingsView'; import TabBarComponent from '../../pages/TabBarComponent'; -import SkipAccountSecurityModal from '../../pages/modals/SkipAccountSecurityModal'; +import SkipAccountSecurityModal from '../../pages/Onboarding/SkipAccountSecurityModal'; import ConnectedAccountsModal from '../../pages/Browser/ConnectedAccountsModal'; import DeleteWalletModal from '../../pages/Settings/SecurityAndPrivacy/DeleteWalletModal'; import LoginView from '../../pages/LoginView'; @@ -17,7 +17,7 @@ import { loginToApp } from '../../viewHelper'; import FixtureBuilder from '../../fixtures/fixture-builder'; import { withFixtures } from '../../fixtures/fixture-helper'; import MetaMetricsOptIn from '../../pages/Onboarding/MetaMetricsOptInView'; -import ProtectYourWalletModal from '../../pages/modals/ProtectYourWalletModal'; +import ProtectYourWalletModal from '../../pages/Onboarding/ProtectYourWalletModal'; import OnboardingSuccessView from '../../pages/Onboarding/OnboardingSuccessView'; import Assertions from '../../utils/Assertions'; import ToastModal from '../../pages/modals/ToastModal'; diff --git a/e2e/specs/wallet/request-token-flow.spec.js b/e2e/specs/wallet/request-token-flow.spec.js index 01f11967ab1..70a7ea2e57f 100644 --- a/e2e/specs/wallet/request-token-flow.spec.js +++ b/e2e/specs/wallet/request-token-flow.spec.js @@ -6,7 +6,7 @@ import PaymentRequestQrBottomSheet from '../../pages/Receive/PaymentRequestQrBot import RequestPaymentView from '../../pages/Receive/RequestPaymentView'; import TabBarComponent from '../../pages/TabBarComponent'; import WalletActionsModal from '../../pages/modals/WalletActionsModal'; -import ProtectYourWalletModal from '../../pages/modals/ProtectYourWalletModal'; +import ProtectYourWalletModal from '../../pages/Onboarding/ProtectYourWalletModal'; import { loginToApp } from '../../viewHelper'; import { loadFixture, diff --git a/e2e/specs/wallet/start-exploring.spec.js b/e2e/specs/wallet/start-exploring.spec.js index 6b4fd872e26..3c75685b147 100644 --- a/e2e/specs/wallet/start-exploring.spec.js +++ b/e2e/specs/wallet/start-exploring.spec.js @@ -7,10 +7,10 @@ import ProtectYourWalletView from '../../pages/Onboarding/ProtectYourWalletView' import CreatePasswordView from '../../pages/Onboarding/CreatePasswordView'; import MetaMetricsOptIn from '../../pages/Onboarding/MetaMetricsOptInView'; import OnboardingSuccessView from '../../pages/Onboarding/OnboardingSuccessView'; -import EnableAutomaticSecurityChecksView from '../../pages/modals/EnableAutomaticSecurityChecksView'; +import EnableAutomaticSecurityChecksView from '../../pages/Onboarding/EnableAutomaticSecurityChecksView'; import Browser from '../../pages/Browser/BrowserView'; -import SkipAccountSecurityModal from '../../pages/modals/SkipAccountSecurityModal'; -import OnboardingWizardModal from '../../pages/modals/OnboardingWizardModal'; +import SkipAccountSecurityModal from '../../pages/Onboarding/SkipAccountSecurityModal'; +import OnboardingWizardModal from '../../pages/Onboarding/OnboardingWizardModal'; import { acceptTermOfUse } from '../../viewHelper'; import Assertions from '../../utils/Assertions'; diff --git a/e2e/utils/Assertions.js b/e2e/utils/Assertions.js index ea2935fad2c..495c0ad8753 100644 --- a/e2e/utils/Assertions.js +++ b/e2e/utils/Assertions.js @@ -10,7 +10,7 @@ const TIMEOUT = 15000; class Assertions { /** * Check if an element with the specified ID is visible. - * @param {Promise} elementId - The ID of the element to check. + * @param {Promise} elementId - The ID of the element to check. * @param timeout */ static async checkIfVisible(elementId, timeout = TIMEOUT) { @@ -23,7 +23,7 @@ class Assertions { /** * Check if an element with the specified ID is not visible. - * @param {Promise} elementId - The ID of the element to check. + * @param {Promise} elementId - The ID of the element to check. * @param {number} [timeout=TIMEOUT] - Timeout in milliseconds. */ static async checkIfNotVisible(elementId, timeout = TIMEOUT) { diff --git a/e2e/utils/Matchers.js b/e2e/utils/Matchers.js index ea40255afb9..844a3228ef7 100644 --- a/e2e/utils/Matchers.js +++ b/e2e/utils/Matchers.js @@ -159,7 +159,7 @@ class Matchers { * Get system dialogs in the system-level (e.g. permissions, alerts, etc.), by text. * * @param {string} text - Match elements with the specified text - * @return {Promise} - Resolves to the located element + * @return {Promise} - Resolves to the located element */ static async getSystemElementByText(text) { return system.element(by.system.label(text)); diff --git a/e2e/viewHelper.js b/e2e/viewHelper.js index 2439f062d06..4e3dd4570b9 100644 --- a/e2e/viewHelper.js +++ b/e2e/viewHelper.js @@ -1,7 +1,7 @@ 'use strict'; -import EnableAutomaticSecurityChecksView from './pages/modals/EnableAutomaticSecurityChecksView'; -import EnableDeviceNotificationsAlert from './pages/EnableDeviceNotificationsAlert'; +import EnableAutomaticSecurityChecksView from './pages/Onboarding/EnableAutomaticSecurityChecksView'; +import EnableDeviceNotificationsAlert from './pages/Onboarding/EnableDeviceNotificationsAlert'; import ImportWalletView from './pages/Onboarding/ImportWalletView'; import MetaMetricsOptIn from './pages/Onboarding/MetaMetricsOptInView'; import NetworkEducationModal from './pages/Network/NetworkEducationModal'; @@ -9,19 +9,19 @@ import NetworkListModal from './pages/Network/NetworkListModal'; import NetworkView from './pages/Settings/NetworksView'; import OnboardingView from './pages/Onboarding/OnboardingView'; import OnboardingCarouselView from './pages/Onboarding/OnboardingCarouselView'; -import OnboardingWizardModal from './pages/modals/OnboardingWizardModal'; +import OnboardingWizardModal from './pages/Onboarding/OnboardingWizardModal'; import SettingsView from './pages/Settings/SettingsView'; import WalletView from './pages/wallet/WalletView'; import Accounts from '../wdio/helpers/Accounts'; -import SkipAccountSecurityModal from './pages/modals/SkipAccountSecurityModal'; -import ProtectYourWalletModal from './pages/modals/ProtectYourWalletModal'; +import SkipAccountSecurityModal from './pages/Onboarding/SkipAccountSecurityModal'; +import ProtectYourWalletModal from './pages/Onboarding/ProtectYourWalletModal'; import CreatePasswordView from './pages/Onboarding/CreatePasswordView'; import ProtectYourWalletView from './pages/Onboarding/ProtectYourWalletView'; import OnboardingSuccessView from './pages/Onboarding/OnboardingSuccessView'; import TestHelpers from './helpers'; -import TermsOfUseModal from './pages/modals/TermsOfUseModal'; +import TermsOfUseModal from './pages/Onboarding/TermsOfUseModal'; import TabBarComponent from './pages/TabBarComponent'; import LoginView from './pages/LoginView'; import { getGanachePort } from './fixtures/utils'; @@ -76,7 +76,7 @@ export const skipNotificationsDeviceSettings = async () => { await Assertions.checkIfVisible( EnableDeviceNotificationsAlert.stepOneContainer, ); - await EnableDeviceNotificationsAlert.tapOnNotEnableDeviceNotificationsButton(); + await EnableDeviceNotificationsAlert.tapOnEnableDeviceNotificationsButton(); await Assertions.checkIfNotVisible( EnableDeviceNotificationsAlert.stepOneContainer, ); diff --git a/wdio/screen-objects/EnableSecurityChecksScreen.js b/wdio/screen-objects/EnableSecurityChecksScreen.js index 35cc3a6e80b..c38a54c5b9d 100644 --- a/wdio/screen-objects/EnableSecurityChecksScreen.js +++ b/wdio/screen-objects/EnableSecurityChecksScreen.js @@ -1,6 +1,6 @@ import Gestures from '../helpers/Gestures'; import Selectors from '../helpers/Selectors'; -import { EnableAutomaticSecurityChecksIDs } from '../../e2e/selectors/Modals/EnableAutomaticSecurityChecks.selectors'; +import { EnableAutomaticSecurityChecksIDs } from '../../e2e/selectors/Onboarding/EnableAutomaticSecurityChecks.selectors'; class EnableAutomaticSecurityChecksScreen { get noThanksButton() { @@ -23,8 +23,5 @@ class EnableAutomaticSecurityChecksScreen { async isVisible() { await expect(this.enableAutomaticSecurityChecksScreen).toBeDisplayed(); } - async notVisible() { - await expect(this.enableAutomaticSecurityChecksScreen).not.toBeDisplayed(); - } } export default new EnableAutomaticSecurityChecksScreen(); diff --git a/wdio/screen-objects/Modals/ExperienceEnhancerModal.js b/wdio/screen-objects/Modals/ExperienceEnhancerModal.js index 11e1772451d..ed840c13127 100644 --- a/wdio/screen-objects/Modals/ExperienceEnhancerModal.js +++ b/wdio/screen-objects/Modals/ExperienceEnhancerModal.js @@ -1,5 +1,5 @@ -import { ExperienceEnhancerModalSelectorsIDs } from '../../../e2e/selectors/Modals/ExperienceEnhancerModal.selectors'; +import { ExperienceEnhancerBottomSheetSelectorsIDs } from '../../../e2e/selectors/Onboarding/ExperienceEnhancerModal.selectors'; import Selectors from '../../helpers/Selectors'; import Gestures from '../../helpers/Gestures'; @@ -7,13 +7,13 @@ import Gestures from '../../helpers/Gestures'; class ExperienceEnhancerModal { get container() { return Selectors.getXpathElementByResourceId( - ExperienceEnhancerModalSelectorsIDs.BOTTOM_SHEET, + ExperienceEnhancerBottomSheetSelectorsIDs.BOTTOM_SHEET, ); } get noThanks() { return Selectors.getXpathElementByResourceId( - ExperienceEnhancerModalSelectorsIDs.CANCEL_BUTTON, + ExperienceEnhancerBottomSheetSelectorsIDs.CANCEL_BUTTON, ); } diff --git a/wdio/screen-objects/Modals/OnboardingWizardModal.js b/wdio/screen-objects/Modals/OnboardingWizardModal.js index bc9a6c930ac..58c9ed18343 100644 --- a/wdio/screen-objects/Modals/OnboardingWizardModal.js +++ b/wdio/screen-objects/Modals/OnboardingWizardModal.js @@ -1,4 +1,4 @@ -import { OnboardingWizardModalSelectorsIDs } from '../../../e2e/selectors/Modals/OnboardingWizardModal.selectors'; +import { OnboardingWizardModalSelectorsIDs } from '../../../e2e/selectors/Onboarding/OnboardingWizardModal.selectors'; import Selectors from '../../helpers/Selectors'; import Gestures from '../../helpers/Gestures'; diff --git a/wdio/screen-objects/Modals/SkipAccountSecurityModal.js b/wdio/screen-objects/Modals/SkipAccountSecurityModal.js index 832237b1554..111d5f90520 100644 --- a/wdio/screen-objects/Modals/SkipAccountSecurityModal.js +++ b/wdio/screen-objects/Modals/SkipAccountSecurityModal.js @@ -1,7 +1,6 @@ -import { SKIP_BUTTON } from '../testIDs/Components/SkipAccountSecurityModalTestIds.js'; import Selectors from '../../helpers/Selectors'; import Gestures from '../../helpers/Gestures'; -import { ChoosePasswordSelectorsIDs } from "../../../e2e/selectors/Onboarding/ChoosePassword.selectors"; +import { ChoosePasswordSelectorsIDs } from '../../../e2e/selectors/Onboarding/ChoosePassword.selectors'; class SkipAccountSecurityModal { get skipBackupText() { @@ -10,10 +9,6 @@ class SkipAccountSecurityModal { ); } - get skipButton() { - return Selectors.getElementByPlatform(SKIP_BUTTON); - } - async proceedWithoutWalletSecure() { const setTimeout = 2000; await driver.pause(setTimeout); diff --git a/wdio/screen-objects/Modals/TermOfUseScreen.js b/wdio/screen-objects/Modals/TermOfUseScreen.js index aa1122d6a50..fdf26f85b43 100644 --- a/wdio/screen-objects/Modals/TermOfUseScreen.js +++ b/wdio/screen-objects/Modals/TermOfUseScreen.js @@ -1,34 +1,28 @@ import Selectors from '../../helpers/Selectors'; -import { - TERMS_OF_USE_ACCEPT_BUTTON_ID, - TERMS_OF_USE_CHECKBOX_ICON_ID, - TERMS_OF_USE_SCREEN_ID, - TERMS_OF_USE_SCROLL_END_ARROW_BUTTON_ID, - TERMS_OF_USE_WEBVIEW_ID, -} from '../testIDs/Components/TermsOfUse.testIds'; import Gestures from '../../helpers/Gestures'; +import { TermsOfUseModalSelectorsIDs } from '../../../e2e/selectors/Onboarding/TermsOfUseModal.selectors'; class TermOfUseScreen { get container() { - return Selectors.getXpathElementByResourceId(TERMS_OF_USE_SCREEN_ID); + return Selectors.getXpathElementByResourceId(TermsOfUseModalSelectorsIDs.CONTAINER); } get checkbox() { - return Selectors.getXpathElementByResourceId(TERMS_OF_USE_CHECKBOX_ICON_ID); + return Selectors.getXpathElementByResourceId(TermsOfUseModalSelectorsIDs.CHECKBOX); } get scrollEndArrowButton() { return Selectors.getXpathElementByResourceId( - TERMS_OF_USE_SCROLL_END_ARROW_BUTTON_ID, + TermsOfUseModalSelectorsIDs.SCROLL_ARROW_BUTTON, ); } get acceptButton() { - return Selectors.getXpathElementByResourceId(TERMS_OF_USE_ACCEPT_BUTTON_ID); + return Selectors.getXpathElementByResourceId(TermsOfUseModalSelectorsIDs.ACCEPT_BUTTON); } get webview() { - return Selectors.getXpathElementByResourceId(TERMS_OF_USE_WEBVIEW_ID); + return Selectors.getXpathElementByResourceId(TermsOfUseModalSelectorsIDs.WEBVIEW); } async isDisplayed() { diff --git a/wdio/screen-objects/Modals/WhatsNewModal.js b/wdio/screen-objects/Modals/WhatsNewModal.js index 3d29a942ff9..663c4b95f1b 100644 --- a/wdio/screen-objects/Modals/WhatsNewModal.js +++ b/wdio/screen-objects/Modals/WhatsNewModal.js @@ -1,6 +1,6 @@ import Gestures from '../../helpers/Gestures'; import Selectors from '../../helpers/Selectors'; -import { WhatsNewModalSelectorsIDs } from "../../../e2e/selectors/Modals/WhatsNewModal.selectors"; +import { WhatsNewModalSelectorsIDs } from "../../../e2e/selectors/Onboarding/WhatsNewModal.selectors"; class WhatsNewModal { get container() { diff --git a/wdio/screen-objects/WalletMainScreen.js b/wdio/screen-objects/WalletMainScreen.js index 290596ceb57..aca3124ff02 100644 --- a/wdio/screen-objects/WalletMainScreen.js +++ b/wdio/screen-objects/WalletMainScreen.js @@ -1,7 +1,7 @@ import Selectors from '../helpers/Selectors'; import Gestures from '../helpers/Gestures.js'; -import { OnboardingWizardModalSelectorsIDs } from '../../e2e/selectors/Modals/OnboardingWizardModal.selectors'; -import { ProtectWalletModalSelectorsIDs } from '../../e2e/selectors/Modals/ProtectWalletModal.selectors'; +import { OnboardingWizardModalSelectorsIDs } from '../../e2e/selectors/Onboarding/OnboardingWizardModal.selectors'; +import { ProtectWalletModalSelectorsIDs } from '../../e2e/selectors/Onboarding/ProtectWalletModal.selectors'; import { AccountActionsModalSelectorsIDs } from '../../e2e/selectors/Modals/AccountActionsModal.selectors'; import { NOTIFICATION_TITLE } from './testIDs/Components/Notification.testIds'; import { TabBarSelectorIDs } from '../../e2e/selectors/TabBar.selectors'; @@ -10,12 +10,6 @@ import { BACK_BUTTON_SIMPLE_WEBVIEW } from './testIDs/Components/SimpleWebView.t import { WalletViewSelectorsIDs } from '../../e2e/selectors/wallet/WalletView.selectors.js'; class WalletMainScreen { - get noThanks() { - return Selectors.getElementByPlatform( - OnboardingWizardModalSelectorsIDs.NO_THANKS_BUTTON, - ); - } - get ImportToken() { return Selectors.getElementByPlatform(WalletViewSelectorsIDs.IMPORT_TOKEN_BUTTON); } @@ -82,10 +76,6 @@ class WalletMainScreen { return Selectors.getXpathElementByText('Localhost 8545 now active.'); } - async tapNoThanks() { - await Gestures.waitAndTap(this.noThanks); - } - async tapImportTokensButton() { const importToken = await this.ImportToken; await importToken.waitForDisplayed(); diff --git a/wdio/screen-objects/testIDs/Components/SkipAccountSecurityModalTestIds.js b/wdio/screen-objects/testIDs/Components/SkipAccountSecurityModalTestIds.js deleted file mode 100644 index 57f770d57e9..00000000000 --- a/wdio/screen-objects/testIDs/Components/SkipAccountSecurityModalTestIds.js +++ /dev/null @@ -1,5 +0,0 @@ -export const ANDROID_SKIP_BACKUP_BUTTON_ID = 'skip-backup-text'; -export const iOS_SKIP_BACKUP_BUTTON_ID = 'skip-backup-check'; -export const SKIP_BACKUP_MODAL = 'skip-backup-modal'; -export const SKIP_BUTTON = 'Skip-button'; -export const CANCEL_BUTTON = 'Cancel-Skip'; diff --git a/wdio/screen-objects/testIDs/Components/TermsOfUse.testIds.js b/wdio/screen-objects/testIDs/Components/TermsOfUse.testIds.js deleted file mode 100644 index 6e8716ae1ff..00000000000 --- a/wdio/screen-objects/testIDs/Components/TermsOfUse.testIds.js +++ /dev/null @@ -1,10 +0,0 @@ -export const TERMS_OF_USE_SCREEN_ID = 'terms-of-use-screen-id'; - -export const TERMS_OF_USE_ACCEPT_BUTTON_ID = 'terms-of-use-accept-button-id'; - -export const TERMS_OF_USE_SCROLL_END_ARROW_BUTTON_ID = - 'terms-of-use-scroll-end-arrow-button-id'; - -export const TERMS_OF_USE_WEBVIEW_ID = 'terms-of-use-webview-id'; - -export const TERMS_OF_USE_CHECKBOX_ICON_ID = 'terms-of-use-checkbox'; diff --git a/wdio/screen-objects/testIDs/Screens/EnableDeviceNotificationsChecksAlert.testIds.js b/wdio/screen-objects/testIDs/Screens/EnableDeviceNotificationsChecksAlert.testIds.js deleted file mode 100644 index c12c78557f5..00000000000 --- a/wdio/screen-objects/testIDs/Screens/EnableDeviceNotificationsChecksAlert.testIds.js +++ /dev/null @@ -1,6 +0,0 @@ -export const ENABLE_DEVICE_NOTIFICATION_NO_THANKS_BUTTON_ID = - "Don't Allow"; -export const ENABLE_DEVICE_NOTIFICATIONS_CONTAINER_ID = - 'Would Like to Send You Notifications'; -export const ENABLE_DEVICE_NOTIFICATIONS_YES_BUTTON_ID = 'Allow'; -