From 6ae1fbd0439a8e22392499a40634bd6afdf9196b Mon Sep 17 00:00:00 2001
From: Martyn Janes <martyn@obany.com>
Date: Tue, 16 Mar 2021 09:08:32 +0100
Subject: [PATCH 1/5] fix: Cleanup the signup detail on login

---
 packages/shared/lib/app.ts                | 21 +++++++++++++++++----
 packages/shared/lib/router.ts             |  7 +++----
 packages/shared/routes/setup/Setup.svelte |  5 +++--
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/packages/shared/lib/app.ts b/packages/shared/lib/app.ts
index dbaaa252f46..1983f89b25a 100644
--- a/packages/shared/lib/app.ts
+++ b/packages/shared/lib/app.ts
@@ -6,10 +6,6 @@ import { closePopup } from './popup'
 import { activeProfile, clearActiveProfile } from './profile'
 import { resetRouter } from './router'
 import { api, destroyActor, resetWallet } from './wallet'
-/**
- * Notification content
- */
-export const notification = writable<string>(null)
 
 /**
  * Mobile mode
@@ -58,6 +54,23 @@ export const loggedIn = writable<boolean>(false)
  */
 export const developerMode = persistent<boolean>('developerMode', false)
 
+/**
+ * Cleanup the signup vars
+ */
+ export const cleanupSignup = () => {
+    mnemonic.set(null)
+    strongholdPassword.set(null)
+    walletPin.set(null)
+}
+
+/**
+ * Log in to the current profile
+ */
+export const login = () => {
+    cleanupSignup()
+    loggedIn.set(true)
+}
+
 /**
  * Logout from current profile
  */
diff --git a/packages/shared/lib/router.ts b/packages/shared/lib/router.ts
index 1afa60b4482..817d0e57016 100644
--- a/packages/shared/lib/router.ts
+++ b/packages/shared/lib/router.ts
@@ -1,4 +1,4 @@
-import { loggedIn, notification, strongholdPassword, walletPin } from 'shared/lib/app'
+import { loggedIn, login, strongholdPassword, walletPin } from 'shared/lib/app'
 import { profiles } from 'shared/lib/profile'
 import { AccountRoutes, AppRoute, SettingsRoutes, SetupType, Tabs, WalletRoutes } from 'shared/lib/typings/routes'
 import { get, readable, writable } from 'svelte/store'
@@ -24,7 +24,6 @@ export const path = readable<string>(null, (set) => {
     const updatePath = (): void => {
         const pathName = window.location.hash.substr(1)
         set(pathName)
-        notification.set(null)
     }
 
     window.addEventListener('hashchange', updatePath)
@@ -96,7 +95,7 @@ export const routerNext = (event) => {
             if (shouldAddProfile) {
                 nextRoute = AppRoute.Setup
             } else {
-                loggedIn.set(true)
+                login()
                 nextRoute = AppRoute.Dashboard
             }
             break
@@ -171,7 +170,7 @@ export const routerNext = (event) => {
             nextRoute = AppRoute.Congratulations
             break
         case AppRoute.Congratulations:
-            loggedIn.set(true)
+            login()
             nextRoute = AppRoute.Dashboard
             break
     }
diff --git a/packages/shared/routes/setup/Setup.svelte b/packages/shared/routes/setup/Setup.svelte
index e21989acdbd..b9f3d0189b6 100644
--- a/packages/shared/routes/setup/Setup.svelte
+++ b/packages/shared/routes/setup/Setup.svelte
@@ -1,11 +1,11 @@
 <script lang="typescript">
     import { Button, Checkbox, Illustration, Input, OnboardingLayout, Text } from 'shared/components'
-    import { developerMode } from 'shared/lib/app'
+    import { cleanupSignup, developerMode } from 'shared/lib/app'
     import { Electron } from 'shared/lib/electron'
     import { hasOnlyWhitespaces } from 'shared/lib/helpers'
     import { createProfile, disposeNewProfile, newProfile, profiles } from 'shared/lib/profile'
     import { SetupType } from 'shared/lib/typings/routes'
-    import { getStoragePath, initialise, api, MAX_PROFILE_NAME_LENGTH } from 'shared/lib/wallet'
+    import { api, getStoragePath, initialise, MAX_PROFILE_NAME_LENGTH } from 'shared/lib/wallet'
     import { createEventDispatcher } from 'svelte'
     import { get } from 'svelte/store'
 
@@ -50,6 +50,7 @@
     }
 
     function handleBackClick() {
+        cleanupSignup()
         disposeNewProfile()
         dispatch('previous')
     }

From 095b90e9f82dfced97d490a947898c1b605adab1 Mon Sep 17 00:00:00 2001
From: Martyn Janes <martyn@obany.com>
Date: Tue, 16 Mar 2021 09:14:29 +0100
Subject: [PATCH 2/5] fix: Remove unneccesary set

---
 packages/shared/lib/app.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/shared/lib/app.ts b/packages/shared/lib/app.ts
index 1983f89b25a..e062183b94e 100644
--- a/packages/shared/lib/app.ts
+++ b/packages/shared/lib/app.ts
@@ -86,7 +86,6 @@ export const logout = () => {
         resetWallet()
         resetRouter()
         clearActiveProfile()
-        mnemonic.set(null)
     }
 
     if (!ap?.isStrongholdLocked) {

From f27bccc72b2fe0c7b695738f24e03c4b4a244289 Mon Sep 17 00:00:00 2001
From: Martyn Janes <martyn@obany.com>
Date: Tue, 16 Mar 2021 09:17:21 +0100
Subject: [PATCH 3/5] fix: Move loggedIn set to more suitable location

---
 packages/shared/lib/app.ts    | 1 +
 packages/shared/lib/router.ts | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/shared/lib/app.ts b/packages/shared/lib/app.ts
index e062183b94e..90545bc0e52 100644
--- a/packages/shared/lib/app.ts
+++ b/packages/shared/lib/app.ts
@@ -86,6 +86,7 @@ export const logout = () => {
         resetWallet()
         resetRouter()
         clearActiveProfile()
+        loggedIn.set(false)
     }
 
     if (!ap?.isStrongholdLocked) {
diff --git a/packages/shared/lib/router.ts b/packages/shared/lib/router.ts
index 817d0e57016..d350ed36ca9 100644
--- a/packages/shared/lib/router.ts
+++ b/packages/shared/lib/router.ts
@@ -215,5 +215,4 @@ export const resetRouter = () => {
     settingsRoute.set(SettingsRoutes.Init)
     dashboardRoute.set(Tabs.Wallet)
     deepLinkRequestActive.set(false)
-    loggedIn.set(false)
 }

From c4c6a416ce2b41dcb0ef6e52aab6c8c0a2832784 Mon Sep 17 00:00:00 2001
From: Martyn Janes <martyn@obany.com>
Date: Tue, 16 Mar 2021 09:26:22 +0100
Subject: [PATCH 4/5] fix: Only show accounts loading busy if logged in

---
 .../shared/routes/dashboard/wallet/views/WalletActions.svelte  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/shared/routes/dashboard/wallet/views/WalletActions.svelte b/packages/shared/routes/dashboard/wallet/views/WalletActions.svelte
index dcf2a0dc6e8..095d3c3effc 100644
--- a/packages/shared/routes/dashboard/wallet/views/WalletActions.svelte
+++ b/packages/shared/routes/dashboard/wallet/views/WalletActions.svelte
@@ -1,5 +1,6 @@
 <script lang="typescript">
     import { AccountTile, Button, Text } from 'shared/components'
+    import { loggedIn } from 'shared/lib/app'
     import { closePopup, openPopup } from 'shared/lib/popup'
     import { accountRoute, walletRoute } from 'shared/lib/router'
     import { AccountRoutes, WalletRoutes } from 'shared/lib/typings/routes'
@@ -19,7 +20,7 @@
 
     let startInit
 
-    if ($walletRoute === WalletRoutes.Init && !$accountsLoaded) {
+    if ($walletRoute === WalletRoutes.Init && !$accountsLoaded && $loggedIn) {
         startInit = Date.now()
         openPopup({
             type: 'busy',

From 2fa259d5fecea1e45634d8f07c9ae8d20ea8b2aa Mon Sep 17 00:00:00 2001
From: Martyn Janes <martyn@obany.com>
Date: Wed, 17 Mar 2021 08:56:53 +0100
Subject: [PATCH 5/5] fix: Cleanup signup vars on on signup flow

---
 packages/shared/lib/app.ts    | 1 -
 packages/shared/lib/router.ts | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/shared/lib/app.ts b/packages/shared/lib/app.ts
index 90545bc0e52..ca765503547 100644
--- a/packages/shared/lib/app.ts
+++ b/packages/shared/lib/app.ts
@@ -67,7 +67,6 @@ export const developerMode = persistent<boolean>('developerMode', false)
  * Log in to the current profile
  */
 export const login = () => {
-    cleanupSignup()
     loggedIn.set(true)
 }
 
diff --git a/packages/shared/lib/router.ts b/packages/shared/lib/router.ts
index d350ed36ca9..d4799f68f87 100644
--- a/packages/shared/lib/router.ts
+++ b/packages/shared/lib/router.ts
@@ -1,4 +1,4 @@
-import { loggedIn, login, strongholdPassword, walletPin } from 'shared/lib/app'
+import { cleanupSignup, login, strongholdPassword, walletPin } from 'shared/lib/app'
 import { profiles } from 'shared/lib/profile'
 import { AccountRoutes, AppRoute, SettingsRoutes, SetupType, Tabs, WalletRoutes } from 'shared/lib/typings/routes'
 import { get, readable, writable } from 'svelte/store'
@@ -170,6 +170,7 @@ export const routerNext = (event) => {
             nextRoute = AppRoute.Congratulations
             break
         case AppRoute.Congratulations:
+            cleanupSignup()
             login()
             nextRoute = AppRoute.Dashboard
             break