Merge pull request #49 from TxnLab/txn-1267-only-reconnect-to-active-wallet

Author: drichar

package.json

@@ -12,7 +12,7 @@
     "url": "https://github.com/txnlab/use-wallet/issues"
   },
   "homepage": "https://txnlab.github.io/use-wallet",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "React hooks for using Algorand compatible wallets in dApps.",
   "scripts": {
     "dev": "yarn storybook",

src/utils/providers.ts

@@ -0,0 +1,12 @@
+import { PROVIDER_ID } from "src/constants";
+import { useWalletStore } from "src/store";
+
+export const getActiveProviders = () => {
+  const accounts = useWalletStore.getState().accounts;
+  return [...new Set(accounts.map((acct) => acct.providerId))];
+}
+
+export const isActiveProvider = (id: PROVIDER_ID) => {
+  const activeProviders = getActiveProviders();
+  return activeProviders.includes(id);
+}

src/utils/reconnectProviders.ts

@@ -1,5 +1,6 @@
 import { WalletClient } from "../types";
 import { clearAccounts } from "./clearAccounts";
+import { isActiveProvider } from "./providers";
 
 type SupportedProviders = { [x: string]: Promise<WalletClient | null> };
 
@@ -9,7 +10,12 @@ export const reconnectProviders = async (providers: SupportedProviders) => {
 
     for (const client of clients) {
       const c = await client;
-      c?.reconnect(() => clearAccounts(c?.metadata.id));
+      const id = c?.metadata.id;
+
+      // Only reconnect to active providers
+      if (id && isActiveProvider(id)) {
+        c.reconnect(() => clearAccounts(id));
+      }
     }
   } catch (e) {
     console.error(e);