fix: last selected account id not found (#7572)

iotaledger · Oct 11, 2023 · 6ffad61 · 6ffad61
1 parent aec90b1
commit 6ffad61
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/packages/shared/lib/core/profile/actions/active-profile/login.ts b/packages/shared/lib/core/profile/actions/active-profile/login.ts
@@ -140,7 +140,14 @@ export async function login(loginOptions?: ILoginOptions): Promise<void> {
                 pollLedgerNanoStatus()
             }
 
-            setSelectedAccount(lastUsedAccountIndex ?? get(activeAccounts)?.[0]?.index ?? null)
+            let initialSelectedAccountindex = get(activeAccounts)?.[0]?.index
+            if (
+                lastUsedAccountIndex &&
+                get(activeAccounts)?.find((_account) => _account.index === lastUsedAccountIndex)
+            ) {
+                initialSelectedAccountindex = lastUsedAccountIndex
+            }
+            setSelectedAccount(initialSelectedAccountindex)
             lastActiveAt.set(new Date())
             loggedIn.set(true)
             setTimeout(() => {