Add additional handling for single wallet connect from older W3O version, add try to disconnect logic

Author: Adamj1232

packages/core/src/disconnect.ts

@@ -46,17 +46,23 @@ async function disconnect(options: DisconnectOptions): Promise<WalletState[]> {
 
   const lastConnectedWallets = getLocalStore(STORAGE_KEYS.LAST_CONNECTED_WALLET)
   if (lastConnectedWallets) {
-    const labels = JSON.parse(lastConnectedWallets)
+    try {
+      const labels = JSON.parse(lastConnectedWallets)
 
-    if (Array.isArray(labels) && labels.indexOf(label) >= 0) {
-      setLocalStore(
-        STORAGE_KEYS.LAST_CONNECTED_WALLET,
-        JSON.stringify(labels.filter(walletLabel => walletLabel !== label))
+      if (Array.isArray(labels) && labels.indexOf(label) >= 0) {
+        setLocalStore(
+          STORAGE_KEYS.LAST_CONNECTED_WALLET,
+          JSON.stringify(labels.filter(walletLabel => walletLabel !== label))
+        )
+      }
+      if (typeof labels === 'string' && labels === label) {
+        delLocalStore(STORAGE_KEYS.LAST_CONNECTED_WALLET)
+      }
+    } catch (e) {
+      console.error(
+        `There was an error disconnecting the last connected wallet from localStorage - Error: ${e}`
       )
     }
-    if (typeof labels === 'string' && labels === label) {
-      delLocalStore(STORAGE_KEYS.LAST_CONNECTED_WALLET)
-    }
   }
 
   return state.get().wallets

packages/core/src/index.ts

@@ -290,6 +290,12 @@ function init(options: InitOptions): OnboardAPI {
       ) {
         connectAllPreviousWallets(lastConnectedWalletsParsed, connect)
       }
+      if (
+        lastConnectedWalletsParsed &&
+        typeof lastConnectedWalletsParsed === 'string'
+      ) {
+        connectAllPreviousWallets([lastConnectedWalletsParsed], connect)
+      }
     } catch (err) {
       // Handle for legacy single wallet approach
       // Above try will throw syntax error is local storage is not json