From f7c05fb3702c3425bd1a5c26a1670266642ba61f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren?= <hello@soerenschwert.de>
Date: Mon, 24 Oct 2022 12:40:42 +0200
Subject: [PATCH] Always show account selector

Don't skip it even when only one account exists, as the user might want to log into another account.
---
 src/views/ChooseAddress.vue  |  3 ++-
 src/views/ConnectAccount.vue | 17 +++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/ChooseAddress.vue b/src/views/ChooseAddress.vue
index d5a21357..f11199dd 100644
--- a/src/views/ChooseAddress.vue
+++ b/src/views/ChooseAddress.vue
@@ -214,8 +214,9 @@ export default class ChooseAddress extends BitcoinSyncBaseView {
         staticStore.originalRouteName = RequestType.CHOOSE_ADDRESS;
         if (useReplace) {
             this.$router.replace({name: RequestType.ONBOARD});
+        } else {
+            this.$router.push({name: RequestType.ONBOARD});
         }
-        this.$router.push({name: RequestType.ONBOARD});
     }
 
     private backgroundClass(address: string) {
diff --git a/src/views/ConnectAccount.vue b/src/views/ConnectAccount.vue
index 5edfc2a4..62169676 100644
--- a/src/views/ConnectAccount.vue
+++ b/src/views/ConnectAccount.vue
@@ -78,14 +78,11 @@ export default class ConnectAccount extends Vue {
 
     private AccountType = AccountType;
 
-    private showAccountSelector = false;
+    private showAccountSelector = true;
 
     private async created() {
-        if (this.wallets.length === 1 && this.wallets[0].type !== WalletType.LEDGER) {
-            this.setWallet(this.wallets[0], false);
-        } else {
-            // If more than one wallet exists or the one wallet is an unsupported LEDGER wallet, show the selector
-            this.showAccountSelector = true;
+        if (this.wallets.length === 0) {
+            this.goToOnboarding();
         }
     }
 
@@ -136,10 +133,14 @@ export default class ConnectAccount extends Vue {
         client.connectAccount(request);
     }
 
-    private goToOnboarding() {
+    private goToOnboarding(useReplace?: boolean) {
         // Redirect to onboarding
         staticStore.originalRouteName = RequestType.CONNECT_ACCOUNT;
-        this.$router.push({name: RequestType.ONBOARD});
+        if (useReplace) {
+            this.$router.replace({name: RequestType.ONBOARD});
+        } else {
+            this.$router.push({name: RequestType.ONBOARD});
+        }
     }
 }
 </script>