From a9f7f5872af48b3abc6b696eabc7d971bac225fd Mon Sep 17 00:00:00 2001 From: Sale Djenic Date: Fri, 7 Jun 2024 22:57:43 +0200 Subject: [PATCH] fix: onboarding keycard issues fixed - no emojihash and identicon ring displayed in for keycard onboarding flow - can't restore account (windows and linux), issue #15101 - can't create new account with keycard (linux, windows), issue #15055 - illegal storage access issue when hitting Start using status button (which actually was a crash after pressing the button), issue #15035 --- .../internal/user_profile_confirm_password_state.nim | 9 ++++++--- .../startup/internal/user_profile_create_state.nim | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/app/modules/startup/internal/user_profile_confirm_password_state.nim b/src/app/modules/startup/internal/user_profile_confirm_password_state.nim index 06a8dba127..e5273f0c0c 100644 --- a/src/app/modules/startup/internal/user_profile_confirm_password_state.nim +++ b/src/app/modules/startup/internal/user_profile_confirm_password_state.nim @@ -9,9 +9,12 @@ proc delete*(self: UserProfileConfirmPasswordState) = self.State.delete method getNextPrimaryState*(self: UserProfileConfirmPasswordState, controller: Controller): State = - if not main_constants.SUPPORTS_FINGERPRINT: - return nil - return createState(StateType.Biometrics, self.flowType, self) + if main_constants.SUPPORTS_FINGERPRINT: + return createState(StateType.Biometrics, self.flowType, self) + if self.flowType == FlowType.FirstRunOldUserImportSeedPhrase or + self.flowType == FlowType.FirstRunOldUserKeycardImport: + return createState(StateType.ProfileFetching, self.flowType, nil) + return nil method executePrimaryCommand*(self: UserProfileConfirmPasswordState, controller: Controller) = if main_constants.SUPPORTS_FINGERPRINT: diff --git a/src/app/modules/startup/internal/user_profile_create_state.nim b/src/app/modules/startup/internal/user_profile_create_state.nim index 6187c5d810..c6587efbf8 100644 --- a/src/app/modules/startup/internal/user_profile_create_state.nim +++ b/src/app/modules/startup/internal/user_profile_create_state.nim @@ -13,6 +13,9 @@ method executePrimaryCommand*(self: UserProfileCreateState, controller: Controll if self.flowType == FlowType.FirstRunOldUserImportSeedPhrase or self.flowType == FlowType.FirstRunOldUserKeycardImport: controller.storeProfileDataAndProceedWithAppLoading() + if self.flowType == FlowType.FirstRunNewUserNewKeycardKeys or + self.flowType == FlowType.FirstRunNewUserImportSeedPhraseIntoKeycard: + controller.storeKeycardAccountAndLogin(storeToKeychain = false, newKeycard = true) method getNextPrimaryState*(self: UserProfileCreateState, controller: Controller): State = if self.flowType == FlowType.FirstRunOldUserImportSeedPhrase or