Onboarding: non-intrusive current page name inspection

status-im · Jan 7, 2025 · 45b7c0c · 45b7c0c
1 parent a24c098
commit 45b7c0c
Show file tree

Hide file tree

Showing 25 changed files with 61 additions and 102 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -15,7 +15,6 @@ import utils 1.0
 OnboardingPage {
     id: root
 
-    pageClassName: "WelcomePage"
     title: qsTr("Welcome to Status")
 
     signal createProfileRequested()
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,8 +19,6 @@ OnboardingPage { @@
         title: qsTr("Create profile password")
-        pageClassName: "CreatePasswordPage"
         QtObject {
             id: d
@@ Expand Down @@