From 56ab676797f947e65128f3fa394a3886f2182773 Mon Sep 17 00:00:00 2001
From: Aaron Barnard <abarnard@protonmail.com>
Date: Wed, 20 Jul 2022 09:32:03 +1000
Subject: [PATCH 1/3] Handles failed autoselect with disable modals

---
 packages/core/src/views/connect/Index.svelte | 29 +++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/packages/core/src/views/connect/Index.svelte b/packages/core/src/views/connect/Index.svelte
index 958667450..373f261df 100644
--- a/packages/core/src/views/connect/Index.svelte
+++ b/packages/core/src/views/connect/Index.svelte
@@ -51,12 +51,6 @@
   let windowWidth: number
   let scrollContainer: HTMLElement
 
-  let walletToAutoSelect =
-    autoSelect.label &&
-    walletModules.find(
-      ({ label }) => label.toLowerCase() === autoSelect.label.toLowerCase()
-    )
-
   const modalStep$ = new BehaviorSubject<keyof i18n['connect']>(
     'selectingWallet'
   )
@@ -209,13 +203,13 @@
       // user rejected account access
       if (code === ProviderRpcErrorCode.ACCOUNT_ACCESS_REJECTED) {
         connectionRejected = true
-        if (walletToAutoSelect) {
-          walletToAutoSelect = null
 
-          if (autoSelect.disableModals) {
-            connectWallet$.next({ inProgress: false })
-          }
+        if (autoSelect.disableModals) {
+          connectWallet$.next({ inProgress: false })
+        } else if (autoSelect.label) {
+          autoSelect.label = ''
         }
+
         return
       }
 
@@ -263,8 +257,17 @@
   modalStep$.pipe(takeUntil(onDestroy$)).subscribe(step => {
     switch (step) {
       case 'selectingWallet': {
-        if (walletToAutoSelect) {
-          autoSelectWallet(walletToAutoSelect)
+        if (autoSelect.label) {
+          const walletToAutoSelect = walletModules.find(
+            ({ label }) =>
+              label.toLowerCase() === autoSelect.label.toLowerCase()
+          )
+
+          if (walletToAutoSelect) {
+            autoSelectWallet(walletToAutoSelect)
+          } else if (autoSelect.disableModals) {
+            connectWallet$.next({ inProgress: false })
+          }
         } else {
           loadWalletsForSelection()
         }

From ec79dfd6bc6048b6c32b7d416817269b8e8c88d2 Mon Sep 17 00:00:00 2001
From: Aaron Barnard <abarnard@protonmail.com>
Date: Wed, 20 Jul 2022 09:32:38 +1000
Subject: [PATCH 2/3] Increment version

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 165c27d1e..1eebb904a 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/core",
-  "version": "2.6.0-alpha.1",
+  "version": "2.6.0-alpha.2",
   "description": "Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardized spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",

From 6214dc90bed043aa717de806b8f462c99b8246cc Mon Sep 17 00:00:00 2001
From: Aaron Barnard <abarnard@protonmail.com>
Date: Wed, 20 Jul 2022 10:20:00 +1000
Subject: [PATCH 3/3] Increment core version in React and Vue pkgs

---
 packages/react/package.json | 2 +-
 packages/vue/package.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react/package.json b/packages/react/package.json
index 4d013971c..dc21b5729 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -62,7 +62,7 @@
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "@web3-onboard/core": "^2.6.0-alpha.1",
+    "@web3-onboard/core": "^2.6.0-alpha.2",
     "@web3-onboard/common": "^2.1.7-alpha.1",
     "use-sync-external-store": "1.0.0"
   },
diff --git a/packages/vue/package.json b/packages/vue/package.json
index 49b2c78e6..a76b0e611 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -63,7 +63,7 @@
     "@vueuse/core": "^8.4.2",
     "@vueuse/rxjs": "^8.2.0",
     "@web3-onboard/common": "^2.1.7-alpha.1",
-    "@web3-onboard/core": "^2.6.0-alpha.1",
+    "@web3-onboard/core": "^2.6.0-alpha.2",
     "vue-demi": "^0.12.4"
   },
   "peerDependencies": {