From 45b7c0c37d0d55b9d5b7c4f934f9e80f64b0b74f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Cie=C5=9Blak?= Date: Tue, 7 Jan 2025 17:02:36 +0100 Subject: [PATCH] Onboarding: non-intrusive current page name inspection --- storybook/pages/BackupSeedphraseFlowPage.qml | 2 +- storybook/pages/OnboardingLayoutPage.qml | 3 +- .../qmlTests/tests/tst_OnboardingLayout.qml | 117 +++++++++--------- .../pages/BackupSeedphraseAcks.qml | 2 - .../pages/BackupSeedphraseIntro.qml | 2 - .../pages/BackupSeedphraseOutro.qml | 2 - .../pages/BackupSeedphraseReveal.qml | 2 - .../pages/BackupSeedphraseVerify.qml | 2 - .../pages/CreateKeycardProfilePage.qml | 2 - .../Onboarding2/pages/CreatePasswordPage.qml | 2 - .../Onboarding2/pages/CreateProfilePage.qml | 2 - .../pages/EnableBiometricsPage.qml | 2 - .../pages/HelpUsImproveStatusPage.qml | 2 - .../pages/KeycardAddKeyPairPage.qml | 2 - .../pages/KeycardCreatePinPage.qml | 1 - .../Onboarding2/pages/KeycardEmptyPage.qml | 2 - .../Onboarding2/pages/KeycardEnterPinPage.qml | 1 - .../Onboarding2/pages/KeycardIntroPage.qml | 2 - .../Onboarding2/pages/KeycardNotEmptyPage.qml | 2 - .../Onboarding2/pages/LoginBySyncingPage.qml | 2 - .../Onboarding2/pages/LoginPage.qml | 2 - .../Onboarding2/pages/OnboardingPage.qml | 2 - .../Onboarding2/pages/SeedphrasePage.qml | 2 - .../Onboarding2/pages/SyncProgressPage.qml | 2 - .../Onboarding2/pages/WelcomePage.qml | 1 - 25 files changed, 61 insertions(+), 102 deletions(-) diff --git a/storybook/pages/BackupSeedphraseFlowPage.qml b/storybook/pages/BackupSeedphraseFlowPage.qml index c7c7b6a8eec..d6fe3374105 100644 --- a/storybook/pages/BackupSeedphraseFlowPage.qml +++ b/storybook/pages/BackupSeedphraseFlowPage.qml @@ -52,7 +52,7 @@ Item { Label { anchors.right: parent.right anchors.bottom: parent.bottom - text: !!stack.currentItem && stack.currentItem.pageClassName === "BackupSeedphraseVerify" ? + text: !!stack.currentItem && stack.currentItem instanceof BackupSeedphraseVerify ? "Hint: %1".arg(stack.currentItem.seedWordsToVerify.map((entry) => entry.seedWord)) : "" } diff --git a/storybook/pages/OnboardingLayoutPage.qml b/storybook/pages/OnboardingLayoutPage.qml index 64cfda3038b..328f7ca7cb2 100644 --- a/storybook/pages/OnboardingLayoutPage.qml +++ b/storybook/pages/OnboardingLayoutPage.qml @@ -146,7 +146,6 @@ SplitView { Component { id: splashScreen DidYouKnowSplashScreen { - readonly property string pageClassName: "Splash" property bool runningProgressAnimation NumberAnimation on progress { from: 0.0 @@ -187,7 +186,7 @@ SplitView { ColumnLayout { Layout.fillWidth: true Label { - text: "Current page: %1".arg(onboarding.stack.currentItem ? onboarding.stack.currentItem.pageClassName : "") + text: "Current page: %1".arg(InspectionUtils.baseName(onboarding.stack.currentItem)) } Label { text: "Stack depth: %1".arg(onboarding.stack.depth) diff --git a/storybook/qmlTests/tests/tst_OnboardingLayout.qml b/storybook/qmlTests/tests/tst_OnboardingLayout.qml index 8637e5056a4..8d64156456c 100644 --- a/storybook/qmlTests/tests/tst_OnboardingLayout.qml +++ b/storybook/qmlTests/tests/tst_OnboardingLayout.qml @@ -150,12 +150,13 @@ Item { } } - function getCurrentPage(stack, pageClassName) { - if (!stack || !pageClassName) - fail("getCurrentPage: expected param 'stack' or 'pageClassName' empty") + function getCurrentPage(stack, pageClass) { + if (!stack || !pageClass) + fail("getCurrentPage: expected param 'stack' or 'pageClass' empty") verify(!!stack) tryCompare(stack, "busy", false) // wait for page transitions to stop - tryCompare(stack.currentItem, "pageClassName", pageClassName) + + verify(stack.currentItem instanceof pageClass) return stack.currentItem } @@ -187,7 +188,7 @@ Item { verify(!!stack) // PAGE 1: Welcome - let page = getCurrentPage(stack, "WelcomePage") + let page = getCurrentPage(stack, WelcomePage) const linksText = findChild(controlUnderTest, "approvalLinks") verify(!!linksText) @@ -207,7 +208,7 @@ Item { mouseClick(btnCreateProfile) // PAGE 2: Help us improve - page = getCurrentPage(stack, "HelpUsImproveStatusPage") + page = getCurrentPage(stack, HelpUsImproveStatusPage) let infoButton = findChild(controlUnderTest, "infoButton") verify(!!infoButton) @@ -224,14 +225,14 @@ Item { compare(dynamicSpy.signalArguments[0][0], data.shareResult) // PAGE 3: Create profile - page = getCurrentPage(stack, "CreateProfilePage") + page = getCurrentPage(stack, CreateProfilePage) const btnCreateWithPassword = findChild(controlUnderTest, "btnCreateWithPassword") verify(!!btnCreateWithPassword) mouseClick(btnCreateWithPassword) // PAGE 4: Create password - page = getCurrentPage(stack, "CreatePasswordPage") + page = getCurrentPage(stack, CreatePasswordPage) infoButton = findChild(controlUnderTest, "infoButton") verify(!!infoButton) @@ -269,7 +270,7 @@ Item { // PAGE 5: Enable Biometrics if (data.biometrics) { - page = getCurrentPage(stack, "EnableBiometricsPage") + page = getCurrentPage(stack, EnableBiometricsPage) const enableBioButton = findChild(controlUnderTest, data.bioEnabled ? "btnEnableBiometrics" : "btnDontEnableBiometrics") dynamicSpy.setup(page, "enableBiometricsRequested") @@ -298,14 +299,14 @@ Item { verify(!!stack) // PAGE 1: Welcome - let page = getCurrentPage(stack, "WelcomePage") + let page = getCurrentPage(stack, WelcomePage) const btnCreateProfile = findChild(controlUnderTest, "btnCreateProfile") verify(!!btnCreateProfile) mouseClick(btnCreateProfile) // PAGE 2: Help us improve - page = getCurrentPage(stack, "HelpUsImproveStatusPage") + page = getCurrentPage(stack, HelpUsImproveStatusPage) const shareButton = findChild(controlUnderTest, data.shareBtnName) dynamicSpy.setup(page, "shareUsageDataRequested") @@ -314,14 +315,14 @@ Item { compare(dynamicSpy.signalArguments[0][0], data.shareResult) // PAGE 3: Create profile - page = getCurrentPage(stack, "CreateProfilePage") + page = getCurrentPage(stack, CreateProfilePage) const btnCreateWithSeedPhrase = findChild(controlUnderTest, "btnCreateWithSeedPhrase") verify(!!btnCreateWithSeedPhrase) mouseClick(btnCreateWithSeedPhrase) // PAGE 4: Create profile using a recovery phrase - page = getCurrentPage(stack, "SeedphrasePage") + page = getCurrentPage(stack, SeedphrasePage) const btnContinue = findChild(page, "btnContinue") verify(!!btnContinue) @@ -336,7 +337,7 @@ Item { mouseClick(btnContinue) // PAGE 5: Create password - page = getCurrentPage(stack, "CreatePasswordPage") + page = getCurrentPage(stack, CreatePasswordPage) const btnConfirmPassword = findChild(controlUnderTest, "btnConfirmPassword") verify(!!btnConfirmPassword) @@ -366,7 +367,7 @@ Item { // PAGE 6: Enable Biometrics if (data.biometrics) { - page = getCurrentPage(stack, "EnableBiometricsPage") + page = getCurrentPage(stack, EnableBiometricsPage) const enableBioButton = findChild(controlUnderTest, data.bioEnabled ? "btnEnableBiometrics" : "btnDontEnableBiometrics") dynamicSpy.setup(page, "enableBiometricsRequested") @@ -408,13 +409,13 @@ Item { verify(!!stack) // PAGE 1: Welcome - let page = getCurrentPage(stack, "WelcomePage") + let page = getCurrentPage(stack, WelcomePage) const btnCreateProfile = findChild(controlUnderTest, "btnCreateProfile") verify(!!btnCreateProfile) mouseClick(btnCreateProfile) // PAGE 2: Help us improve - page = getCurrentPage(stack, "HelpUsImproveStatusPage") + page = getCurrentPage(stack, HelpUsImproveStatusPage) const shareButton = findChild(controlUnderTest, data.shareBtnName) dynamicSpy.setup(page, "shareUsageDataRequested") mouseClick(shareButton) @@ -422,32 +423,32 @@ Item { compare(dynamicSpy.signalArguments[0][0], data.shareResult) // PAGE 3: Create profile - page = getCurrentPage(stack, "CreateProfilePage") + page = getCurrentPage(stack, CreateProfilePage) const btnCreateWithEmptyKeycard = findChild(controlUnderTest, "btnCreateWithEmptyKeycard") verify(!!btnCreateWithEmptyKeycard) mouseClick(btnCreateWithEmptyKeycard) // PAGE 4: Keycard intro - page = getCurrentPage(stack, "KeycardIntroPage") + page = getCurrentPage(stack, KeycardIntroPage) dynamicSpy.setup(page, "emptyKeycardDetected") mockDriver.keycardState = Onboarding.KeycardState.Empty // SIMULATION // TODO test other states here as well tryCompare(dynamicSpy, "count", 1) tryCompare(page, "state", "empty") // PAGE 5: Create profile on empty Keycard -> Use a new recovery phrase - page = getCurrentPage(stack, "CreateKeycardProfilePage") + page = getCurrentPage(stack, CreateKeycardProfilePage) const btnCreateWithEmptySeedphrase = findChild(page, "btnCreateWithEmptySeedphrase") verify(!!btnCreateWithEmptySeedphrase) mouseClick(btnCreateWithEmptySeedphrase) // PAGE 6: Backup your recovery phrase (intro) - page = getCurrentPage(stack, "BackupSeedphraseIntro") + page = getCurrentPage(stack, BackupSeedphraseIntro) const btnBackupSeedphrase = findChild(page, "btnBackupSeedphrase") verify(!!btnBackupSeedphrase) mouseClick(btnBackupSeedphrase) // PAGE 7: Backup your recovery phrase (ack checkboxes) - page = getCurrentPage(stack, "BackupSeedphraseAcks") + page = getCurrentPage(stack, BackupSeedphraseAcks) let btnContinue = findChild(page, "btnContinue") verify(!!btnContinue) compare(btnContinue.enabled, false) @@ -460,7 +461,7 @@ Item { mouseClick(btnContinue) // PAGE 8: Backup your recovery phrase (seedphrase reveal) - step 1 - page = getCurrentPage(stack, "BackupSeedphraseReveal") + page = getCurrentPage(stack, BackupSeedphraseReveal) const seedGrid = findChild(page, "seedGrid") verify(!!seedGrid) tryCompare(seedGrid.layer, "enabled", true) @@ -475,7 +476,7 @@ Item { mouseClick(btnConfirm) // PAGE 9: Backup your recovery phrase (seedphrase verification) - step 2 - page = getCurrentPage(stack, "BackupSeedphraseVerify") + page = getCurrentPage(stack, BackupSeedphraseVerify) btnContinue = findChild(page, "btnContinue") verify(!!btnContinue) compare(btnContinue.enabled, false) @@ -491,7 +492,7 @@ Item { mouseClick(btnContinue) // PAGE 10: Backup your recovery phrase (outro) - step 3 - page = getCurrentPage(stack, "BackupSeedphraseOutro") + page = getCurrentPage(stack, BackupSeedphraseOutro) btnContinue = findChild(page, "btnContinue") verify(!!btnContinue) compare(btnContinue.enabled, false) @@ -505,7 +506,7 @@ Item { // PAGE 11a: Enter Keycard PIN if (!!data.pin) { - page = getCurrentPage(stack, "KeycardEnterPinPage") + page = getCurrentPage(stack, KeycardEnterPinPage) dynamicSpy.setup(page, "keycardPinEntered") keyClickSequence(data.pin) tryCompare(dynamicSpy, "count", 1) @@ -514,7 +515,7 @@ Item { // PAGE 11b: Create new Keycard PIN else { const newPin = "123321" - page = getCurrentPage(stack, "KeycardCreatePinPage") + page = getCurrentPage(stack, KeycardCreatePinPage) tryCompare(page, "state", "creating") dynamicSpy.setup(page, "keycardPinCreated") keyClickSequence(newPin) @@ -525,7 +526,7 @@ Item { } // PAGE 12: Adding key pair to Keycard - page = getCurrentPage(stack, "KeycardAddKeyPairPage") + page = getCurrentPage(stack, KeycardAddKeyPairPage) tryCompare(page, "addKeyPairState", Onboarding.AddKeyPairState.InProgress) page.addKeyPairState = Onboarding.AddKeyPairState.Success // SIMULATION btnContinue = findChild(page, "btnContinue") @@ -535,7 +536,7 @@ Item { // PAGE 13: Enable Biometrics if (data.biometrics) { - page = getCurrentPage(stack, "EnableBiometricsPage") + page = getCurrentPage(stack, EnableBiometricsPage) const enableBioButton = findChild(controlUnderTest, data.bioEnabled ? "btnEnableBiometrics" : "btnDontEnableBiometrics") dynamicSpy.setup(page, "enableBiometricsRequested") @@ -569,13 +570,13 @@ Item { verify(!!stack) // PAGE 1: Welcome - let page = getCurrentPage(stack, "WelcomePage") + let page = getCurrentPage(stack, WelcomePage) const btnCreateProfile = findChild(controlUnderTest, "btnCreateProfile") verify(!!btnCreateProfile) mouseClick(btnCreateProfile) // PAGE 2: Help us improve - page = getCurrentPage(stack, "HelpUsImproveStatusPage") + page = getCurrentPage(stack, HelpUsImproveStatusPage) const shareButton = findChild(controlUnderTest, data.shareBtnName) dynamicSpy.setup(page, "shareUsageDataRequested") mouseClick(shareButton) @@ -583,26 +584,26 @@ Item { compare(dynamicSpy.signalArguments[0][0], data.shareResult) // PAGE 3: Create profile - page = getCurrentPage(stack, "CreateProfilePage") + page = getCurrentPage(stack, CreateProfilePage) const btnCreateWithEmptyKeycard = findChild(controlUnderTest, "btnCreateWithEmptyKeycard") verify(!!btnCreateWithEmptyKeycard) mouseClick(btnCreateWithEmptyKeycard) // PAGE 4: Keycard intro - page = getCurrentPage(stack, "KeycardIntroPage") + page = getCurrentPage(stack, KeycardIntroPage) dynamicSpy.setup(page, "emptyKeycardDetected") mockDriver.keycardState = Onboarding.KeycardState.Empty // SIMULATION // TODO test other states here as well tryCompare(dynamicSpy, "count", 1) tryCompare(page, "state", "empty") // PAGE 5: Create profile on empty Keycard -> Use an existing recovery phrase - page = getCurrentPage(stack, "CreateKeycardProfilePage") + page = getCurrentPage(stack, CreateKeycardProfilePage) const btnCreateWithExistingSeedphrase = findChild(page, "btnCreateWithExistingSeedphrase") verify(!!btnCreateWithExistingSeedphrase) mouseClick(btnCreateWithExistingSeedphrase) // PAGE 6: Create profile on empty Keycard using a recovery phrase - page = getCurrentPage(stack, "SeedphrasePage") + page = getCurrentPage(stack, SeedphrasePage) const btnContinue = findChild(page, "btnContinue") verify(!!btnContinue) compare(btnContinue.enabled, false) @@ -616,7 +617,7 @@ Item { // PAGE 7a: Enter Keycard PIN if (!!data.pin) { - page = getCurrentPage(stack, "KeycardEnterPinPage") + page = getCurrentPage(stack, KeycardEnterPinPage) dynamicSpy.setup(page, "keycardPinEntered") keyClickSequence(data.pin) tryCompare(dynamicSpy, "count", 1) @@ -625,7 +626,7 @@ Item { // PAGE 7b: Create new Keycard PIN else { const newPin = "123321" - page = getCurrentPage(stack, "KeycardCreatePinPage") + page = getCurrentPage(stack, KeycardCreatePinPage) tryCompare(page, "state", "creating") dynamicSpy.setup(page, "keycardPinCreated") keyClickSequence(newPin) @@ -636,7 +637,7 @@ Item { } // PAGE 8: Adding key pair to Keycard - page = getCurrentPage(stack, "KeycardAddKeyPairPage") + page = getCurrentPage(stack, KeycardAddKeyPairPage) tryCompare(page, "addKeyPairState", Onboarding.AddKeyPairState.InProgress) page.addKeyPairState = Onboarding.AddKeyPairState.Success // SIMULATION const btnContinue2 = findChild(page, "btnContinue") @@ -646,7 +647,7 @@ Item { // PAGE 9: Enable Biometrics if (controlUnderTest.biometricsAvailable) { - page = getCurrentPage(stack, "EnableBiometricsPage") + page = getCurrentPage(stack, EnableBiometricsPage) const enableBioButton = findChild(controlUnderTest, data.bioEnabled ? "btnEnableBiometrics" : "btnDontEnableBiometrics") dynamicSpy.setup(page, "enableBiometricsRequested") @@ -675,13 +676,13 @@ Item { verify(!!stack) // PAGE 1: Welcome - let page = getCurrentPage(stack, "WelcomePage") + let page = getCurrentPage(stack, WelcomePage) const btnLogin = findChild(controlUnderTest, "btnLogin") verify(!!btnLogin) mouseClick(btnLogin) // PAGE 2: Help us improve - page = getCurrentPage(stack, "HelpUsImproveStatusPage") + page = getCurrentPage(stack, HelpUsImproveStatusPage) const shareButton = findChild(controlUnderTest, data.shareBtnName) dynamicSpy.setup(page, "shareUsageDataRequested") mouseClick(shareButton) @@ -689,13 +690,13 @@ Item { compare(dynamicSpy.signalArguments[0][0], data.shareResult) // PAGE 3: Log in -> Enter recovery phrase - page = getCurrentPage(stack, "LoginPage") + page = getCurrentPage(stack, LoginPage) const btnWithSeedphrase = findChild(page, "btnWithSeedphrase") verify(!!btnWithSeedphrase) mouseClick(btnWithSeedphrase) // PAGE 4: Sign in with your Status recovery phrase - page = getCurrentPage(stack, "SeedphrasePage") + page = getCurrentPage(stack, SeedphrasePage) const btnContinue = findChild(page, "btnContinue") verify(!!btnContinue) @@ -710,7 +711,7 @@ Item { mouseClick(btnContinue) // PAGE 5: Create password - page = getCurrentPage(stack, "CreatePasswordPage") + page = getCurrentPage(stack, CreatePasswordPage) const btnConfirmPassword = findChild(controlUnderTest, "btnConfirmPassword") verify(!!btnConfirmPassword) @@ -740,7 +741,7 @@ Item { // PAGE 6: Enable Biometrics if (data.biometrics) { - page = getCurrentPage(stack, "EnableBiometricsPage") + page = getCurrentPage(stack, EnableBiometricsPage) const enableBioButton = findChild(controlUnderTest, data.bioEnabled ? "btnEnableBiometrics" : "btnDontEnableBiometrics") dynamicSpy.setup(page, "enableBiometricsRequested") @@ -768,13 +769,13 @@ Item { verify(!!stack) // PAGE 1: Welcome - let page = getCurrentPage(stack, "WelcomePage") - const btnLogin = findChild(controlUnderTest, "btnLogin") + let page = getCurrentPage(stack, WelcomePage) + const btnLogin = findChild(controlUnderTest, btnLogin) verify(!!btnLogin) mouseClick(btnLogin) // PAGE 2: Help us improve - page = getCurrentPage(stack, "HelpUsImproveStatusPage") + page = getCurrentPage(stack, HelpUsImproveStatusPage) const shareButton = findChild(controlUnderTest, data.shareBtnName) dynamicSpy.setup(page, "shareUsageDataRequested") mouseClick(shareButton) @@ -782,7 +783,7 @@ Item { compare(dynamicSpy.signalArguments[0][0], data.shareResult) // PAGE 3: Log in - page = getCurrentPage(stack, "LoginPage") + page = getCurrentPage(stack, LoginPage) const btnBySyncing = findChild(page, "btnBySyncing") verify(!!btnBySyncing) mouseClick(btnBySyncing) @@ -802,7 +803,7 @@ Item { mouseClick(btnContinue) // PAGE 4: Log in by syncing - page = getCurrentPage(stack, "LoginBySyncingPage") + page = getCurrentPage(stack, LoginBySyncingPage) const enterCodeTabBtn = findChild(page, "secondTab_StatusSwitchTabButton") verify(!!enterCodeTabBtn) @@ -821,7 +822,7 @@ Item { mouseClick(btnContinue) // PAGE 5: Profile sync in progress - page = getCurrentPage(stack, "SyncProgressPage") + page = getCurrentPage(stack, SyncProgressPage) tryCompare(page, "syncState", Onboarding.SyncState.InProgress) page.syncState = Onboarding.SyncState.Success // SIMULATION const btnLogin2 = findChild(page, "btnLogin") // TODO test other flows/buttons here as well @@ -831,7 +832,7 @@ Item { // PAGE 6: Enable Biometrics if (data.biometrics) { - page = getCurrentPage(stack, "EnableBiometricsPage") + page = getCurrentPage(stack, EnableBiometricsPage) const enableBioButton = findChild(controlUnderTest, data.bioEnabled ? "btnEnableBiometrics" : "btnDontEnableBiometrics") dynamicSpy.setup(page, "enableBiometricsRequested") @@ -861,13 +862,13 @@ Item { verify(!!stack) // PAGE 1: Welcome - let page = getCurrentPage(stack, "WelcomePage") + let page = getCurrentPage(stack, WelcomePage) const btnLogin = findChild(controlUnderTest, "btnLogin") verify(!!btnLogin) mouseClick(btnLogin) // PAGE 2: Help us improve - page = getCurrentPage(stack, "HelpUsImproveStatusPage") + page = getCurrentPage(stack, HelpUsImproveStatusPage) const shareButton = findChild(controlUnderTest, data.shareBtnName) dynamicSpy.setup(page, "shareUsageDataRequested") mouseClick(shareButton) @@ -875,20 +876,20 @@ Item { compare(dynamicSpy.signalArguments[0][0], data.shareResult) // PAGE 3: Log in -> Login with Keycard - page = getCurrentPage(stack, "LoginPage") + page = getCurrentPage(stack, LoginPage) const btnWithKeycard = findChild(page, "btnWithKeycard") verify(!!btnWithKeycard) mouseClick(btnWithKeycard) // PAGE 4: Keycard intro - page = getCurrentPage(stack, "KeycardIntroPage") + page = getCurrentPage(stack, KeycardIntroPage) dynamicSpy.setup(page, "notEmptyKeycardDetected") mockDriver.keycardState = Onboarding.KeycardState.NotEmpty // SIMULATION // TODO test other states here as well tryCompare(dynamicSpy, "count", 1) tryCompare(page, "state", "notEmpty") // PAGE 5: Enter Keycard PIN - page = getCurrentPage(stack, "KeycardEnterPinPage") + page = getCurrentPage(stack, KeycardEnterPinPage) dynamicSpy.setup(page, "keycardPinEntered") keyClickSequence(mockDriver.existingPin) tryCompare(dynamicSpy, "count", 1) @@ -896,7 +897,7 @@ Item { // PAGE 6: Enable Biometrics if (data.biometrics) { - page = getCurrentPage(stack, "EnableBiometricsPage") + page = getCurrentPage(stack, EnableBiometricsPage) const enableBioButton = findChild(controlUnderTest, data.bioEnabled ? "btnEnableBiometrics" : "btnDontEnableBiometrics") dynamicSpy.setup(page, "enableBiometricsRequested") diff --git a/ui/app/AppLayouts/Onboarding2/pages/BackupSeedphraseAcks.qml b/ui/app/AppLayouts/Onboarding2/pages/BackupSeedphraseAcks.qml index afe4c2d5e38..90a9c114a70 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/BackupSeedphraseAcks.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/BackupSeedphraseAcks.qml @@ -12,8 +12,6 @@ OnboardingPage { signal backupSeedphraseContinue() - pageClassName: "BackupSeedphraseAcks" - contentItem: Item { ColumnLayout { anchors.centerIn: parent diff --git a/ui/app/AppLayouts/Onboarding2/pages/BackupSeedphraseIntro.qml b/ui/app/AppLayouts/Onboarding2/pages/BackupSeedphraseIntro.qml index 79641756689..101e953e1d7 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/BackupSeedphraseIntro.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/BackupSeedphraseIntro.qml @@ -12,8 +12,6 @@ OnboardingPage { signal backupSeedphraseRequested() - pageClassName: "BackupSeedphraseIntro" - contentItem: Item { ColumnLayout { anchors.centerIn: parent diff --git a/ui/app/AppLayouts/Onboarding2/pages/BackupSeedphraseOutro.qml b/ui/app/AppLayouts/Onboarding2/pages/BackupSeedphraseOutro.qml index a9f98225aa5..db59a73786b 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/BackupSeedphraseOutro.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/BackupSeedphraseOutro.qml @@ -14,8 +14,6 @@ OnboardingPage { signal backupSeedphraseRemovalConfirmed() - pageClassName: "BackupSeedphraseOutro" - contentItem: Item { ColumnLayout { anchors.centerIn: parent diff --git a/ui/app/AppLayouts/Onboarding2/pages/BackupSeedphraseReveal.qml b/ui/app/AppLayouts/Onboarding2/pages/BackupSeedphraseReveal.qml index 80fdde8d61a..d3787b171f5 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/BackupSeedphraseReveal.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/BackupSeedphraseReveal.qml @@ -17,8 +17,6 @@ OnboardingPage { signal backupSeedphraseConfirmed() - pageClassName: "BackupSeedphraseReveal" - QtObject { id: d property bool seedphraseRevealed diff --git a/ui/app/AppLayouts/Onboarding2/pages/BackupSeedphraseVerify.qml b/ui/app/AppLayouts/Onboarding2/pages/BackupSeedphraseVerify.qml index f3b32ad78a1..f9485ea84fa 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/BackupSeedphraseVerify.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/BackupSeedphraseVerify.qml @@ -21,8 +21,6 @@ OnboardingPage { signal backupSeedphraseVerified() - pageClassName: "BackupSeedphraseVerify" - QtObject { id: d readonly property var seedSuggestions: BIP39_en {} // [{seedWord:string}, ...] diff --git a/ui/app/AppLayouts/Onboarding2/pages/CreateKeycardProfilePage.qml b/ui/app/AppLayouts/Onboarding2/pages/CreateKeycardProfilePage.qml index 58cc9268cbd..dc900da57b8 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/CreateKeycardProfilePage.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/CreateKeycardProfilePage.qml @@ -19,8 +19,6 @@ OnboardingPage { signal createKeycardProfileWithNewSeedphrase() signal createKeycardProfileWithExistingSeedphrase() - pageClassName: "CreateKeycardProfilePage" - contentItem: Item { ColumnLayout { width: parent.width diff --git a/ui/app/AppLayouts/Onboarding2/pages/CreatePasswordPage.qml b/ui/app/AppLayouts/Onboarding2/pages/CreatePasswordPage.qml index a5298889a1f..36126f73766 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/CreatePasswordPage.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/CreatePasswordPage.qml @@ -19,8 +19,6 @@ OnboardingPage { title: qsTr("Create profile password") - pageClassName: "CreatePasswordPage" - QtObject { id: d diff --git a/ui/app/AppLayouts/Onboarding2/pages/CreateProfilePage.qml b/ui/app/AppLayouts/Onboarding2/pages/CreateProfilePage.qml index bc455385372..159cb7d6564 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/CreateProfilePage.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/CreateProfilePage.qml @@ -21,8 +21,6 @@ OnboardingPage { signal createProfileWithSeedphraseRequested() signal createProfileWithEmptyKeycardRequested() - pageClassName: "CreateProfilePage" - contentItem: Item { ColumnLayout { anchors.centerIn: parent diff --git a/ui/app/AppLayouts/Onboarding2/pages/EnableBiometricsPage.qml b/ui/app/AppLayouts/Onboarding2/pages/EnableBiometricsPage.qml index ad5b821eb7d..ab9b0672c91 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/EnableBiometricsPage.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/EnableBiometricsPage.qml @@ -16,8 +16,6 @@ OnboardingPage { signal enableBiometricsRequested(bool enable) - pageClassName: "EnableBiometricsPage" - contentItem: Item { ColumnLayout { anchors.centerIn: parent diff --git a/ui/app/AppLayouts/Onboarding2/pages/HelpUsImproveStatusPage.qml b/ui/app/AppLayouts/Onboarding2/pages/HelpUsImproveStatusPage.qml index 7ed2d519069..651178c7f0a 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/HelpUsImproveStatusPage.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/HelpUsImproveStatusPage.qml @@ -20,8 +20,6 @@ OnboardingPage { signal shareUsageDataRequested(bool enabled) signal privacyPolicyRequested() - pageClassName: "HelpUsImproveStatusPage" - contentItem: Item { ColumnLayout { anchors.centerIn: parent diff --git a/ui/app/AppLayouts/Onboarding2/pages/KeycardAddKeyPairPage.qml b/ui/app/AppLayouts/Onboarding2/pages/KeycardAddKeyPairPage.qml index f123b7ef012..7f4b6f00d1c 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/KeycardAddKeyPairPage.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/KeycardAddKeyPairPage.qml @@ -21,8 +21,6 @@ OnboardingPage { signal reloadKeycardRequested() signal createProfilePageRequested() - pageClassName: "KeycardAddKeyPairPage" - Timer { id: timer interval: root.timeoutInterval diff --git a/ui/app/AppLayouts/Onboarding2/pages/KeycardCreatePinPage.qml b/ui/app/AppLayouts/Onboarding2/pages/KeycardCreatePinPage.qml index d3c96c749de..7bc2b26d022 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/KeycardCreatePinPage.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/KeycardCreatePinPage.qml @@ -18,7 +18,6 @@ KeycardBasePage { signal keycardPinCreated(string pin) - pageClassName: "KeycardCreatePinPage" image.source: Theme.png("onboarding/keycard/reading") QtObject { diff --git a/ui/app/AppLayouts/Onboarding2/pages/KeycardEmptyPage.qml b/ui/app/AppLayouts/Onboarding2/pages/KeycardEmptyPage.qml index 4047c79712e..67ca1affe2d 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/KeycardEmptyPage.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/KeycardEmptyPage.qml @@ -14,8 +14,6 @@ KeycardBasePage { subtitle: qsTr("There is no profile key pair on this Keycard") image.source: Theme.png("onboarding/keycard/error") - pageClassName: "KeycardEmptyPage" - buttons: [ MaybeOutlineButton { anchors.horizontalCenter: parent.horizontalCenter diff --git a/ui/app/AppLayouts/Onboarding2/pages/KeycardEnterPinPage.qml b/ui/app/AppLayouts/Onboarding2/pages/KeycardEnterPinPage.qml index 21b02a328d9..3d66c3cb38d 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/KeycardEnterPinPage.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/KeycardEnterPinPage.qml @@ -24,7 +24,6 @@ KeycardBasePage { signal unlockWithSeedphraseRequested() signal keycardFactoryResetRequested() - pageClassName: "KeycardEnterPinPage" image.source: Theme.png("onboarding/keycard/reading") QtObject { diff --git a/ui/app/AppLayouts/Onboarding2/pages/KeycardIntroPage.qml b/ui/app/AppLayouts/Onboarding2/pages/KeycardIntroPage.qml index 3c88cda3848..31e7d46f419 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/KeycardIntroPage.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/KeycardIntroPage.qml @@ -25,8 +25,6 @@ KeycardBasePage { signal emptyKeycardDetected() signal notEmptyKeycardDetected() - pageClassName: "KeycardIntroPage" - OnboardingFrame { id: promoBanner visible: false diff --git a/ui/app/AppLayouts/Onboarding2/pages/KeycardNotEmptyPage.qml b/ui/app/AppLayouts/Onboarding2/pages/KeycardNotEmptyPage.qml index 4701147bcf2..ac7762357b0 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/KeycardNotEmptyPage.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/KeycardNotEmptyPage.qml @@ -15,8 +15,6 @@ KeycardBasePage { subtitle: qsTr("You can’t use it to store new keys right now") image.source: Theme.png("onboarding/keycard/error") - pageClassName: "KeycardNotEmptyPage" - buttons: [ MaybeOutlineButton { text: qsTr("I’ve inserted a different Keycard") diff --git a/ui/app/AppLayouts/Onboarding2/pages/LoginBySyncingPage.qml b/ui/app/AppLayouts/Onboarding2/pages/LoginBySyncingPage.qml index 2ea249c9699..a6bb2677b42 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/LoginBySyncingPage.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/LoginBySyncingPage.qml @@ -19,8 +19,6 @@ OnboardingPage { title: qsTr("Log in by syncing") - pageClassName: "LoginBySyncingPage" - contentItem: Item { ColumnLayout { anchors.centerIn: parent diff --git a/ui/app/AppLayouts/Onboarding2/pages/LoginPage.qml b/ui/app/AppLayouts/Onboarding2/pages/LoginPage.qml index 145c69f10a7..2e914532ebf 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/LoginPage.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/LoginPage.qml @@ -26,8 +26,6 @@ OnboardingPage { signal loginWithSyncingRequested() signal loginWithKeycardRequested() - pageClassName: "LoginPage" - contentItem: Item { ColumnLayout { anchors.centerIn: parent diff --git a/ui/app/AppLayouts/Onboarding2/pages/OnboardingPage.qml b/ui/app/AppLayouts/Onboarding2/pages/OnboardingPage.qml index 6a9efcbc0fa..5a6a81f04f3 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/OnboardingPage.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/OnboardingPage.qml @@ -4,8 +4,6 @@ import QtQuick.Controls 2.15 import StatusQ.Core.Theme 0.1 Page { - required property string pageClassName - signal openLink(string link) signal openLinkWithConfirmation(string link, string domain) diff --git a/ui/app/AppLayouts/Onboarding2/pages/SeedphrasePage.qml b/ui/app/AppLayouts/Onboarding2/pages/SeedphrasePage.qml index b410da57e23..507be21f784 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/SeedphrasePage.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/SeedphrasePage.qml @@ -20,8 +20,6 @@ OnboardingPage { signal seedphraseSubmitted(string seedphrase) - pageClassName: "SeedphrasePage" - contentItem: Item { ColumnLayout { anchors.centerIn: parent diff --git a/ui/app/AppLayouts/Onboarding2/pages/SyncProgressPage.qml b/ui/app/AppLayouts/Onboarding2/pages/SyncProgressPage.qml index 59595e4bef6..38b79eb3176 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/SyncProgressPage.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/SyncProgressPage.qml @@ -19,8 +19,6 @@ OnboardingPage { signal restartSyncRequested() signal loginWithSeedphraseRequested() - pageClassName: "SyncProgressPage" - Timer { id: timer interval: root.timeoutInterval diff --git a/ui/app/AppLayouts/Onboarding2/pages/WelcomePage.qml b/ui/app/AppLayouts/Onboarding2/pages/WelcomePage.qml index a0efb3cfc6c..cfe813c21a0 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/WelcomePage.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/WelcomePage.qml @@ -15,7 +15,6 @@ import utils 1.0 OnboardingPage { id: root - pageClassName: "WelcomePage" title: qsTr("Welcome to Status") signal createProfileRequested()