fix: move strongholdVersion logic from create profile to finish onboa…

…rding (#7304)
iotaledger · Aug 3, 2023 · 38c65bb · 38c65bb
1 parent e7b469f
commit 38c65bb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/...ages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte b/...ages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte
@@ -7,11 +7,14 @@
         completeOnboardingProcess,
         isOnboardingLedgerProfile,
         onboardingProfile,
+        updateOnboardingProfile,
     } from '@contexts/onboarding'
     import { mobile } from '@core/app'
     import { localize } from '@core/i18n'
     import { checkOrConnectLedger } from '@core/ledger'
+    import { ProfileType } from '@core/profile'
     import { setStrongholdPassword } from '@core/profile-manager'
+    import { STRONGHOLD_VERSION } from '@core/stronghold'
     import { Animation, Button, Icon, Text, TextHint } from '@ui'
     import { TextType } from '@ui/enums'
     import { onboardingRouter } from '@views/onboarding/onboarding-router'
@@ -29,6 +32,9 @@
         if ($onboardingProfile?.restoreProfileType === RestoreProfileType.Stronghold) {
             await setStrongholdPassword($onboardingProfile.strongholdPassword)
         }
+        const isLedgerProfile = $onboardingProfile?.type === ProfileType.Ledger
+        const strongholdVersion = isLedgerProfile ? undefined : STRONGHOLD_VERSION
+        updateOnboardingProfile({ ...(strongholdVersion && { strongholdVersion }) })
         completeOnboardingProcess()
         $onboardingRouter.next()
         return Promise.resolve()

diff --git a/...es/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte b/...es/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte
@@ -15,7 +15,6 @@
     import { destroyProfileManager } from '@core/profile-manager/actions'
     import { Icon as IconEnum } from '@auxiliary/icon'
     import { AnimationEnum } from '@auxiliary/animation'
-    import { STRONGHOLD_VERSION } from '@core/stronghold'
 
     let isBusy = {
         [CreateProfileType.Mnemonic]: false,
@@ -28,10 +27,8 @@
 
     async function onProfileTypeClick(createProfileType: CreateProfileType): Promise<void> {
         isBusy = { ...isBusy, [createProfileType]: true }
-        const isLedgerProfile = createProfileType === CreateProfileType.Ledger
-        const type = isLedgerProfile ? ProfileType.Ledger : ProfileType.Software
-        const strongholdVersion = isLedgerProfile ? undefined : STRONGHOLD_VERSION
-        updateOnboardingProfile({ createProfileType, type, ...(strongholdVersion && { strongholdVersion }) })
+        const type = createProfileType === CreateProfileType.Ledger ? ProfileType.Ledger : ProfileType.Software
+        updateOnboardingProfile({ createProfileType, type })
         await initialiseProfileManagerFromOnboardingProfile()
         $createProfileRouter.next()
     }