add missing loadings and errors and cleanup

src/app/modules/onboarding/controller.nim

@@ -176,6 +176,5 @@ proc stopKeycardService*(self: Controller) =
 proc generateMnemonic*(self: Controller, length: int): string =
   return self.keycardServiceV2.generateMnemonic(length)
 
-# TODO make this async
 proc exportRecoverKeysFromKeycard*(self: Controller) =
   self.keycardServiceV2.asyncExportRecoverKeys()

src/app/modules/onboarding/module.nim

@@ -101,7 +101,7 @@ method validMnemonic*[T](self: Module[T], mnemonic: string): bool =
   self.controller.validMnemonic(mnemonic)
 
 method getMnemonic*[T](self: Module[T]): string =
-  return self.controller.generateMnemonic(12) # TODO put in a constant
+  return self.controller.generateMnemonic(SupportedMnemonicLength12)
 
 method validateLocalPairingConnectionString*[T](self: Module[T], connectionString: string): bool =
   self.controller.validateLocalPairingConnectionString(connectionString)
@@ -219,8 +219,7 @@ method onKeycardStateUpdated*[T](self: Module[T], keycardEvent: KeycardEventDto)
   self.view.setKeycardEvent(keycardEvent)
 
 method onKeycardSetPinFailure*[T](self: Module[T], error: string) =
-  # TODO handle error
-  echo "ERROR ", error
+  self.view.setPinFailed(error)
 
 method onKeycardAuthorizeFailure*[T](self: Module[T], error: string) =
   self.view.authorizationFailed(error)

src/app/modules/onboarding/view.nim

@@ -22,6 +22,7 @@ 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.}
@@ -99,9 +100,5 @@ QtObject:
   proc exportRecoverKeys(self: View) {.slot.} =
     self.delegate.exportRecoverKeys()
 
-  # TODO find what does this do
-  # proc mnemonicWasShown(self: View): string {.slot.} =
-  #   return self.delegate.getMnemonic()
-
   proc finishOnboardingFlow(self: View, flowInt: int, dataJson: string): string {.slot.} =
     self.delegate.finishOnboardingFlow(flowInt, dataJson)

src/app_service/service/keycardV2/service.nim

@@ -24,6 +24,7 @@ include async_tasks
 logScope:
   topics = "keycardV2-service"
 
+const SupportedMnemonicLength12* = 12
 const PUKLengthForStatusApp* = 12
 
 const SIGNAL_KEYCARD_STATE_UPDATED* = "keycardStateUpdated"
@@ -94,7 +95,6 @@ QtObject:
       seedPhrase.add(englishWords[ind.getInt])
     return seedPhrase
 
-  # TODO make async?
   proc generateMnemonic*(self: Service, length: int): string =
     try:
       let response = self.callRPC("GenerateMnemonic", %*{"length": length})
@@ -172,7 +172,6 @@ QtObject:
       self.oldKeyCardService.receiveKeycardSignal(signal)
       var jsonSignal = signal.parseJson
 
-      # TODO find what are the other types and if we need an enum for them
       if jsonSignal["type"].getStr == "status-changed":
         let keycardEvent = jsonSignal["event"].toKeycardEventDto()
 

storybook/pages/OnboardingLayoutPage.qml

@@ -103,10 +103,6 @@ SplitView {
                 logs.logEvent("OnboardingStore.mnemonicWasShown()")
             }
 
-            function removeMnemonic() { // -> void
-                logs.logEvent("OnboardingStore.removeMnemonic()")
-            }
-
             function validateLocalPairingConnectionString(connectionString: string) { // -> bool
                 logs.logEvent("OnboardingStore.validateLocalPairingConnectionString", ["connectionString"], arguments)
                 return !Number.isNaN(parseInt(connectionString))

storybook/qmlTests/tests/tst_OnboardingLayout.qml

@@ -80,7 +80,6 @@ Item {
                     return mockDriver.seedWords.join(" ")
                 }
                 function mnemonicWasShown() {}
-                function removeMnemonic() {}
 
                 readonly property int syncState: Onboarding.SyncState.InProgress // enum Onboarding.SyncState
                 function validateLocalPairingConnectionString(connectionString: string) {

ui/app/AppLayouts/Onboarding2/KeycardCreateProfileFlow.qml

@@ -25,14 +25,14 @@ SQUtils.QObject {
     signal keycardFactoryResetRequested
     signal loadMnemonicRequested
     signal keycardPinCreated(string pin)
+    signal setPinFailed(string error)
     signal seedphraseSubmitted(string seedphrase)
 
     signal keypairAddTryAgainRequested
     signal reloadKeycardRequested
     signal createProfileWithoutKeycardRequested
     signal authorizationRequested
 
-    signal mnemonicRemovalRequested()
     signal finished(bool withNewSeedphrase)
 
     function init() {
@@ -158,8 +158,6 @@ SQUtils.QObject {
 
         BackupSeedphraseOutro {
             onBackupSeedphraseRemovalConfirmed: {
-                // TODO is this needed?
-                // root.mnemonicRemovalRequested()
                 root.loadMnemonicRequested()
                 root.stackView.push(addKeypairPage)
             }
@@ -170,13 +168,15 @@ SQUtils.QObject {
         id: seedphrasePage
 
         SeedphrasePage {
+            id: seedphrasePage
             title: qsTr("Create profile on empty Keycard using a recovery phrase")
 
             isSeedPhraseValid: root.isSeedPhraseValid
             onSeedphraseSubmitted: (seedphrase) => {
                 root.seedphraseSubmitted(seedphrase)
-                // TODO add loading here
+                seedphrasePage.btnLoading = true
                 root.authorizationRequested()
+                // The page transition happens in keycardCreatePinPage's Connections
             }
         }
     }
@@ -185,15 +185,17 @@ SQUtils.QObject {
         id: keycardCreatePinPage
 
         KeycardCreatePinPage {
+            id: createPinPage
+
             onKeycardPinCreated: (pin) => {
+                createPinPage.loading = true
                 Backpressure.debounce(root, root.keycardPinInfoPageDelay, () => {
-                    // TODO add loading here
                     root.keycardPinCreated(pin)
                 })()
             }
             Connections {
                 target: root
-                onKeycardStateChanged: {
+                onKeycardStateChanged: function () {
                     if (root.keycardState === Onboarding.KeycardState.NotEmpty) {
                         if (d.withNewSeedphrase) {
                             // Need to authorize before getting a seedphrase
@@ -209,7 +211,10 @@ SQUtils.QObject {
                             root.stackView.push(addKeypairPage)
                         }
                     }
-                    // TODO add other states and errors
+                }
+                onSetPinFailed: function (error) {
+                    createPinPage.loading = false
+                    createPinPage.error = qsTr("Error setting pin: %1").arg(error)
                 }
             }
         }

ui/app/AppLayouts/Onboarding2/LoginWithKeycardFlow.qml

@@ -22,6 +22,7 @@ SQUtils.QObject {
     property bool displayKeycardPromoBanner
 
     signal keycardPinCreated(string pin)
+    signal setPinFailed(string error)
     signal seedphraseSubmitted(string seedphrase)
     signal reloadKeycardRequested
     signal keycardFactoryResetRequested
@@ -127,12 +128,22 @@ SQUtils.QObject {
         id: keycardCreatePinPage
 
         KeycardCreatePinPage {
+            id: createPinPage
+
             onKeycardPinCreated: (pin) => {
+                createPinPage.loading = true
                 Backpressure.debounce(root, root.keycardPinInfoPageDelay, () => {
                     root.keycardPinCreated(pin)
                     root.finished()
                 })()
             }
+            Connections {
+                target: root
+                onSetPinFailed: function (error) {
+                    createPinPage.loading = false
+                    createPinPage.error = qsTr("Error setting pin: %1").arg(error)
+                }
+            }
         }
     }
 }

ui/app/AppLayouts/Onboarding2/OnboardingFlow.qml

@@ -41,14 +41,17 @@ SQUtils.QObject {
     signal exportKeysRequested
     signal loadMnemonicRequested
     signal authorizationRequested
+    signal setPinFailed(string error)
     signal authorizationFailed(string error)
     signal keycardExportKeysFailed(string error)
     signal keycardExportKeysSuccess
 
-    signal mnemonicRemovalRequested()
-
     signal finished(int flow)
 
+    onSetPinFailed: function (error) {
+        keycardCreateProfileFlow.setPinFailed(error)
+        loginWithKeycardFlow.setPinFailed(error)
+    }
     onAuthorizationFailed: loginWithKeycardFlow.authorizationFailed(error)
     onKeycardExportKeysFailed: loginWithKeycardFlow.keycardExportKeysFailed(error)
     onKeycardExportKeysSuccess: loginWithKeycardFlow.keycardExportKeysSuccess()
@@ -198,8 +201,6 @@ SQUtils.QObject {
             stackView.replace(page, createProfilePage, StackView.PopTransition)
         }
 
-        onMnemonicRemovalRequested: root.mnemonicRemovalRequested()
-
         onSeedphraseSubmitted: (seedphrase) => root.seedphraseSubmitted(seedphrase)
 
         onFinished: (withNewSeedphrase) => {

ui/app/AppLayouts/Onboarding2/OnboardingLayout.qml

@@ -70,6 +70,7 @@ Page {
 
         readonly property Connections conn: Connections {
             target: onboardingStore
+            onSetPinFailed: onboardingFlow.setPinFailed(error)
             onAuthorizationFailed: onboardingFlow.authorizationFailed(error)
             onKeycardExportKeysFailed: onboardingFlow.keycardExportKeysFailed(error)
             onKeycardExportKeysSuccess: onboardingFlow.keycardExportKeysSuccess()
@@ -165,7 +166,6 @@ Page {
         syncState: root.onboardingStore.syncState
         addKeyPairState: root.onboardingStore.addKeyPairState
 
-        // TODO fix this, we can only call this when the keycard is connected
         getSeedWords: function () {
             return root.onboardingStore.getMnemonic().split(" ")
         }
@@ -189,7 +189,6 @@ Page {
         onAuthorizationRequested: d.authorize()
         onShareUsageDataRequested: (enabled) => root.shareUsageDataRequested(enabled)
         onReloadKeycardRequested: root.reloadKeycardRequested()
-        onMnemonicRemovalRequested: root.onboardingStore.removeMnemonic()
 
         onSyncProceedWithConnectionString: (connectionString) =>
             root.onboardingStore.inputConnectionStringForBootstrapping(connectionString)

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

@@ -15,6 +15,9 @@ import utils 1.0
 KeycardBasePage {
     id: root
 
+    property bool loading
+    property string error
+
     signal keycardPinCreated(string pin)
 
     image.source: Theme.png("onboarding/keycard/reading")
@@ -53,10 +56,16 @@ KeycardBasePage {
         StatusBaseText {
             id: errorText
             anchors.horizontalCenter: parent.horizontalCenter
-            text: qsTr("PINs don’t match")
+            text: qsTr("PINs don't match")
             font.pixelSize: Theme.tertiaryTextFontSize
             color: Theme.palette.dangerColor1
             visible: false
+        },
+        StatusLoadingIndicator {
+            id: loadingIndicator
+            anchors.horizontalCenter: parent.horizontalCenter
+            anchors.topMargin: Theme.halfPadding
+            visible: root.loading
         }
     ]
 
@@ -83,13 +92,26 @@ KeycardBasePage {
                 image.source: Theme.png("onboarding/keycard/error")
             }
         },
+        State {
+            name: "error"
+            when: !!root.error
+            PropertyChanges {
+                target: errorText
+                visible: true
+                text: root.error
+            }
+            PropertyChanges {
+                target: root
+                image.source: Theme.png("onboarding/keycard/error")
+            }
+        },
         State {
             name: "success"
             extend: "repeating"
             when: !!d.pin && !!d.pin2 && d.pin === d.pin2
             PropertyChanges {
                 target: root
-                title: qsTr("Keycard PIN set")
+                title: qsTr("Setting Keycard PIN")
             }
             PropertyChanges {
                 target: pinInput

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

@@ -15,6 +15,7 @@ OnboardingPage {
     title: qsTr("Create profile using a recovery phrase")
     property string subtitle: qsTr("Enter your 12, 18 or 24 word recovery phrase")
     property alias btnContinueText: btnContinue.text
+    property alias btnLoading: btnContinue.loading
 
     property var isSeedPhraseValid: (mnemonic) => { console.error("isSeedPhraseValid IMPLEMENT ME"); return false }
 

ui/app/AppLayouts/Onboarding2/stores/OnboardingStore.qml

@@ -8,6 +8,7 @@ QtObject {
     id: root
 
     signal appLoaded
+    signal setPinFailed(string error)
     signal authorizationFailed(string error)
     signal keycardExportKeysSuccess
     signal keycardExportKeysFailed(string error)
@@ -22,6 +23,7 @@ QtObject {
             // d.onboardingModuleInst.accountLoginError.connect(root.accountLoginError)
             // d.onboardingModuleInst.obtainingPasswordSuccess.connect(root.obtainingPasswordSuccess)
             // d.onboardingModuleInst.obtainingPasswordError.connect(root.obtainingPasswordError)
+            d.onboardingModuleInst.setPinFailed.connect(root.setPinFailed)
             d.onboardingModuleInst.authorizationFailed.connect(root.authorizationFailed)
             d.onboardingModuleInst.onKeycardExportKeysSuccess.connect(root.keycardExportKeysSuccess)
             d.onboardingModuleInst.keycardExportKeysFailed.connect(root.keycardExportKeysFailed)
@@ -70,9 +72,6 @@ QtObject {
     function getMnemonic() { // -> string
         return d.onboardingModuleInst.getMnemonic()
     }
-    function removeMnemonic() { // -> void
-        d.onboardingModuleInst.removeMnemonic()
-    }
 
     // sync
     readonly property int syncState: d.onboardingModuleInst.syncState // cf. enum Onboarding.SyncState