refactor create profile with keycard to be simpler

src/app/modules/onboarding/module.nim

@@ -12,7 +12,7 @@ import app_service/service/devices/service as devices_service
 import app_service/service/keycardV2/service as keycard_serviceV2
 from app_service/service/settings/dto/settings import SettingsDto
 from app_service/service/accounts/dto/accounts import AccountDto
-from app_service/service/keycardV2/dto import KeycardEventDto, KeycardExportedKeysDto
+from app_service/service/keycardV2/dto import KeycardEventDto, KeycardExportedKeysDto, KeycardState
 
 export io_interface
 
@@ -30,7 +30,8 @@ type SecondaryFlow* {.pure} = enum
   LoginWithKeycard,
   ActualLogin, # TODO get the real name and value for this when it's implemented on the front-end
 
-type AddKeyPairState* {.pure.} = enum
+type ProgressState* {.pure.} = enum
+  Idle,
   InProgress,
   Success,
   Failed
@@ -89,9 +90,11 @@ method load*[T](self: Module[T]) =
   self.delegate.onboardingDidLoad()
 
 method setPin*[T](self: Module[T], pin: string) =
+  self.view.setPinSettingState(ProgressState.InProgress.int)
   self.controller.setPin(pin)
 
 method authorize*[T](self: Module[T], pin: string) =
+  self.view.setAuthorizationState(ProgressState.InProgress.int)
   self.controller.authorize(pin)
 
 method getPasswordStrengthScore*[T](self: Module[T], password, userName: string): int =
@@ -110,7 +113,7 @@ method inputConnectionStringForBootstrapping*[T](self: Module[T], connectionStri
   self.controller.inputConnectionStringForBootstrapping(connectionString)
 
 method loadMnemonic*[T](self: Module[T], mnemonic: string) =
-  self.view.setAddKeyPairState(AddKeyPairState.InProgress.int)
+  self.view.setAddKeyPairState(ProgressState.InProgress.int)
   self.controller.loadMnemonic(mnemonic)
 
 method finishOnboardingFlow*[T](self: Module[T], flowInt: int, dataJson: string): string =
@@ -218,17 +221,25 @@ method onLocalPairingStatusUpdate*[T](self: Module[T], status: LocalPairingStatu
 method onKeycardStateUpdated*[T](self: Module[T], keycardEvent: KeycardEventDto) =
   self.view.setKeycardEvent(keycardEvent)
 
+  if keycardEvent.state == KeycardState.NotEmpty and self.view.getPinSettingState() == ProgressState.InProgress.int:
+    # We just finished setting the pin
+    self.view.setPinSettingState(ProgressState.Success.int)
+
+  if keycardEvent.state == KeycardState.Authorized and self.view.getAuthorizationState() == ProgressState.InProgress.int:
+    # We just finished authorizing
+    self.view.setAuthorizationState(ProgressState.Success.int)
+
 method onKeycardSetPinFailure*[T](self: Module[T], error: string) =
-  self.view.setPinFailed(error)
+  self.view.setPinSettingState(ProgressState.Failed.int)
 
 method onKeycardAuthorizeFailure*[T](self: Module[T], error: string) =
-  self.view.authorizationFailed(error)
+  self.view.setAuthorizationState(ProgressState.Failed.int)
 
 method onKeycardLoadMnemonicFailure*[T](self: Module[T], error: string) =
-  self.view.setAddKeyPairState(AddKeyPairState.Failed.int)
+  self.view.setAddKeyPairState(ProgressState.Failed.int)
 
 method onKeycardLoadMnemonicSuccess*[T](self: Module[T], keyUID: string) =
-  self.view.setAddKeyPairState(AddKeyPairState.Success.int)
+  self.view.setAddKeyPairState(ProgressState.Success.int)
 
 method onKeycardExportKeysFailure*[T](self: Module[T], error: string) =
   self.view.keycardExportKeysFailed(error)

src/app/modules/onboarding/view.nim

@@ -6,9 +6,11 @@ QtObject:
   type
     View* = ref object of QObject
       delegate: io_interface.AccessInterface
-      syncState: int
       keycardEvent: KeycardEventDto
+      syncState: int
       addKeyPairState: int
+      pinSettingState: int
+      authorizationState: int
 
   proc delete*(self: View) =
     self.QObject.delete
@@ -22,8 +24,6 @@ QtObject:
   ### QtSignals ###
 
   proc appLoaded*(self: View) {.signal.}
-  proc setPinFailed*(self: View, error: string) {.signal.}
-  proc authorizationFailed*(self: View, error: string) {.signal.}
   proc keycardExportKeysFailed*(self: View, error: string) {.signal.}
   proc keycardExportKeysSuccess*(self: View) {.signal.}
 
@@ -39,6 +39,26 @@ QtObject:
     self.syncState = syncState
     self.syncStateChanged()
 
+  proc pinSettingStateChanged*(self: View) {.signal.}
+  proc getPinSettingState*(self: View): int {.slot.} =
+    return self.pinSettingState
+  QtProperty[int] pinSettingState:
+    read = getPinSettingState
+    notify = pinSettingStateChanged
+  proc setPinSettingState*(self: View, pinSettingState: int) =
+    self.pinSettingState = pinSettingState
+    self.pinSettingStateChanged()
+
+  proc authorizationStateChanged*(self: View) {.signal.}
+  proc getAuthorizationState*(self: View): int {.slot.} =
+    return self.authorizationState
+  QtProperty[int] authorizationState:
+    read = getAuthorizationState
+    notify = authorizationStateChanged
+  proc setAuthorizationState*(self: View, authorizationState: int) =
+    self.authorizationState = authorizationState
+    self.authorizationStateChanged()
+
   proc keycardStateChanged*(self: View) {.signal.}
   proc getKeycardState(self: View): int {.slot.} =
     return self.keycardEvent.state.int

ui/StatusQ/src/onboarding/enums.h

@@ -45,24 +45,17 @@ class OnboardingEnums
         Authorized
     };
 
-    enum class AddKeyPairState {
+    enum class ProgressState {
+        Idle,
         InProgress,
         Success,
         Failed
     };
 
-    enum class SyncState {
-        Idle,
-        InProgress,
-        Failed,
-        Success
-    };
-
 private:
     Q_ENUM(PrimaryFlow)
     Q_ENUM(SecondaryFlow)
     Q_ENUM(LoginMethod)
     Q_ENUM(KeycardState)
-    Q_ENUM(AddKeyPairState)
-    Q_ENUM(SyncState)
+    Q_ENUM(ProgressState)
 };

ui/app/AppLayouts/Onboarding2/KeycardCreateProfileFlow.qml

@@ -13,6 +13,8 @@ SQUtils.QObject {
     required property StackView stackView
 
     required property int keycardState
+    required property int pinSettingState
+    required property int authorizationState
     required property int addKeyPairState
     required property int keycardPinInfoPageDelay
 
@@ -25,7 +27,6 @@ SQUtils.QObject {
     signal keycardFactoryResetRequested
     signal loadMnemonicRequested
     signal keycardPinCreated(string pin)
-    signal setPinFailed(string error)
     signal seedphraseSubmitted(string seedphrase)
 
     signal keypairAddTryAgainRequested
@@ -171,12 +172,17 @@ SQUtils.QObject {
             id: seedphrasePage
             title: qsTr("Create profile on empty Keycard using a recovery phrase")
 
+            authorizationState: root.authorizationState
             isSeedPhraseValid: root.isSeedPhraseValid
             onSeedphraseSubmitted: (seedphrase) => {
                 root.seedphraseSubmitted(seedphrase)
-                seedphrasePage.btnLoading = true
                 root.authorizationRequested()
-                // The page transition happens in keycardCreatePinPage's Connections
+            }
+            onKeycardAuthorized: {
+                if (!d.withNewSeedphrase) {
+                    root.loadMnemonicRequested()
+                    root.stackView.push(addKeypairPage)
+                }
             }
         }
     }
@@ -187,34 +193,22 @@ SQUtils.QObject {
         KeycardCreatePinPage {
             id: createPinPage
 
+            pinSettingState: root.pinSettingState
+            authorizationState: root.authorizationState
             onKeycardPinCreated: (pin) => {
-                createPinPage.loading = true
-                Backpressure.debounce(root, root.keycardPinInfoPageDelay, () => {
-                    root.keycardPinCreated(pin)
-                })()
+                root.keycardPinCreated(pin)
             }
-            Connections {
-                target: root
-                onKeycardStateChanged: function () {
-                    if (root.keycardState === Onboarding.KeycardState.NotEmpty) {
-                        if (d.withNewSeedphrase) {
-                            // Need to authorize before getting a seedphrase
-                            root.authorizationRequested()
-                        } else {
-                            root.stackView.push(seedphrasePage)
-                        }
-                    } else if (root.keycardState === Onboarding.KeycardState.Authorized) {
-                        if (d.withNewSeedphrase) {
-                            root.stackView.push(backupSeedIntroPage)
-                        } else {
-                            root.loadMnemonicRequested()
-                            root.stackView.push(addKeypairPage)
-                        }
-                    }
+            onKeycardPinSuccessfullySet: {
+                if (d.withNewSeedphrase) {
+                    // Need to authorize before getting a seedphrase
+                    root.authorizationRequested()
+                } else {
+                    root.stackView.push(seedphrasePage)
                 }
-                onSetPinFailed: function (error) {
-                    createPinPage.loading = false
-                    createPinPage.error = qsTr("Error setting pin: %1").arg(error)
+            }
+            onKeycardAuthorized: {
+                if (d.withNewSeedphrase) {
+                    root.stackView.push(backupSeedIntroPage)
                 }
             }
         }

ui/app/AppLayouts/Onboarding2/LoginBySyncingFlow.qml

@@ -40,7 +40,7 @@ SQUtils.QObject {
         SyncProgressPage {
             property string connectionString
             readonly property bool backAvailableHint:
-                root.syncState !== Onboarding.SyncState.InProgress
+                root.syncState !== Onboarding.ProgressState.InProgress
 
             syncState: root.syncState
 

ui/app/AppLayouts/Onboarding2/LoginWithKeycardFlow.qml

@@ -22,14 +22,12 @@ SQUtils.QObject {
     property bool displayKeycardPromoBanner
 
     signal keycardPinCreated(string pin)
-    signal setPinFailed(string error)
     signal seedphraseSubmitted(string seedphrase)
     signal reloadKeycardRequested
     signal keycardFactoryResetRequested
     signal createProfileWithEmptyKeycardRequested
     signal exportKeysRequested
     signal finished
-    signal authorizationFailed(string error)
     signal keycardExportKeysFailed(string error)
     signal keycardExportKeysSuccess()
 
@@ -104,7 +102,6 @@ SQUtils.QObject {
 
             Connections {
                 target: root
-                onAuthorizationFailed: keycardEnterPinPage.authorizationFailed(error)
                 onKeycardExportKeysFailed: keycardEnterPinPage.keycardExportKeysFailed(error)
             }
         }
@@ -137,13 +134,14 @@ SQUtils.QObject {
                     root.finished()
                 })()
             }
-            Connections {
-                target: root
-                onSetPinFailed: function (error) {
-                    createPinPage.loading = false
-                    createPinPage.error = qsTr("Error setting pin: %1").arg(error)
-                }
-            }
+            // TODO use states instead
+            // Connections {
+            //     target: root
+            //     onSetPinFailed: function (error) {
+            //         createPinPage.loading = false
+            //         createPinPage.error = qsTr("Error setting pin: %1").arg(error)
+            //     }
+            // }
         }
     }
 }

ui/app/AppLayouts/Onboarding2/OnboardingFlow.qml

@@ -13,6 +13,8 @@ SQUtils.QObject {
     required property StackView stackView
 
     required property int keycardState
+    required property int pinSettingState
+    required property int authorizationState
     required property int addKeyPairState
     required property int syncState
     required property var getSeedWords
@@ -41,18 +43,11 @@ SQUtils.QObject {
     signal exportKeysRequested
     signal loadMnemonicRequested
     signal authorizationRequested
-    signal setPinFailed(string error)
-    signal authorizationFailed(string error)
     signal keycardExportKeysFailed(string error)
     signal keycardExportKeysSuccess
 
     signal finished(int flow)
 
-    onSetPinFailed: function (error) {
-        keycardCreateProfileFlow.setPinFailed(error)
-        loginWithKeycardFlow.setPinFailed(error)
-    }
-    onAuthorizationFailed: loginWithKeycardFlow.authorizationFailed(error)
     onKeycardExportKeysFailed: loginWithKeycardFlow.keycardExportKeysFailed(error)
     onKeycardExportKeysSuccess: loginWithKeycardFlow.keycardExportKeysSuccess()
 
@@ -179,6 +174,8 @@ SQUtils.QObject {
 
         stackView: root.stackView
         keycardState: root.keycardState
+        pinSettingState: root.pinSettingState
+        authorizationState: root.authorizationState
         addKeyPairState: root.addKeyPairState
         getSeedWords: root.getSeedWords
         displayKeycardPromoBanner: root.displayKeycardPromoBanner

ui/app/AppLayouts/Onboarding2/OnboardingLayout.qml

@@ -70,8 +70,6 @@ Page {
 
         readonly property Connections conn: Connections {
             target: onboardingStore
-            onSetPinFailed: onboardingFlow.setPinFailed(error)
-            onAuthorizationFailed: onboardingFlow.authorizationFailed(error)
             onKeycardExportKeysFailed: onboardingFlow.keycardExportKeysFailed(error)
             onKeycardExportKeysSuccess: onboardingFlow.keycardExportKeysSuccess()
         }
@@ -163,6 +161,8 @@ Page {
         stackView: stack
 
         keycardState: root.onboardingStore.keycardState
+        pinSettingState: root.onboardingStore.pinSettingState
+        authorizationState: root.onboardingStore.authorizationState
         syncState: root.onboardingStore.syncState
         addKeyPairState: root.onboardingStore.addKeyPairState
 

ui/app/AppLayouts/Onboarding2/pages/CreateKeycardProfilePage.qml

@@ -77,7 +77,7 @@ OnboardingPage {
                         StatusButton {
                             objectName: "btnCreateWithEmptySeedphrase"
                             Layout.fillWidth: true
-                            text: qsTr("Let’s go!")
+                            text: qsTr("Let's go!")
                             font.pixelSize: Theme.additionalTextSize
                             onClicked: root.createKeycardProfileWithNewSeedphrase()
                         }

ui/app/AppLayouts/Onboarding2/pages/KeycardAddKeyPairPage.qml

@@ -13,7 +13,7 @@ import AppLayouts.Onboarding.enums 1.0
 OnboardingPage {
     id: root
 
-    required property int addKeyPairState // Onboarding.AddKeyPairState.xxx
+    required property int addKeyPairState // Onboarding.ProgressState.xxx
 
     signal keypairAddContinueRequested()
     signal keypairAddTryAgainRequested()
@@ -23,7 +23,7 @@ OnboardingPage {
     states: [
         State {
             name: "inprogress"
-            when: root.addKeyPairState === Onboarding.AddKeyPairState.InProgress
+            when: root.addKeyPairState === Onboarding.ProgressState.InProgress
             PropertyChanges {
                 target: root
                 title: qsTr("Adding key pair to Keycard")
@@ -44,7 +44,7 @@ OnboardingPage {
         },
         State {
             name: "success"
-            when: root.addKeyPairState === Onboarding.AddKeyPairState.Success
+            when: root.addKeyPairState === Onboarding.ProgressState.Success
             PropertyChanges {
                 target: root
                 title: qsTr("Key pair added to Keycard")
@@ -68,7 +68,7 @@ OnboardingPage {
         },
         State {
             name: "failed"
-            when: root.addKeyPairState === Onboarding.AddKeyPairState.Failed
+            when: root.addKeyPairState === Onboarding.ProgressState.Failed
             PropertyChanges {
                 target: root
                 title: "<font color='%1'>".arg(Theme.palette.dangerColor1) + qsTr("Failed to add key pair to Keycard") + "</font>"