@dynamic-labs/sdk-react-core 0.17.0-RC.3 → 0.17.0-RC.31

package/src/lib/utils/hooks/useWalletConnectors/reconnectSocialWallet.js

@@ -0,0 +1,33 @@
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import '../../constants/colors.js';
+import '@dynamic-labs/multi-wallet';
+import '@dynamic-labs/utils';
+import '@dynamic-labs/sdk-api';
+import '../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import 'react';
+import 'ethers';
+import { getReferencedAccount } from '../../functions/getReferencedAccount/getReferencedAccount.js';
+
+/**
+ * This function will use a referenced account to kick off the social wallet
+ * authentication. This is useful in the multiwallet scenario where the user
+ * wants to set their disconnected social wallet as their primary wallet, in
+ * which case the wallet needs to be reconnected
+ */
+const reconnectSocialWallet = (jwt, wallet) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!isSocialWalletConnector(wallet.connector)) {
+        return;
+    }
+    const socialAccountDataForWallet = getReferencedAccount(jwt, wallet.id);
+    if (!socialAccountDataForWallet ||
+        !socialAccountDataForWallet.oauthProvider) {
+        return;
+    }
+    yield wallet.connector.connect(socialAccountDataForWallet.oauthProvider);
+});
+
+export { reconnectSocialWallet };

package/src/lib/utils/hooks/useWalletConnectors/useWalletConnectors.cjs

@@ -4,99 +4,56 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var multiWallet = require('@dynamic-labs/multi-wallet');
-var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var utils = require('@dynamic-labs/utils');
+require('@dynamic-labs/sdk-api');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 var localStorage$1 = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
+require('ethers');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 require('../../../shared/consts/index.cjs');
-var isWalletConnected = require('../../functions/isWalletConnected/isWalletConnected.cjs');
 var isSameWalletName = require('../../functions/isSameWalletName/isSameWalletName.cjs');
-require('@dynamic-labs/sdk-api');
-var shouldManuallyReconnectOnRefresh = require('../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
+var useWalletsConnectionState = require('../useWalletsConnectionState/useWalletsConnectionState.cjs');
+var primaryWalletIdValidator = require('./utils/primaryWalletIdValidator/primaryWalletIdValidator.cjs');
+var createLinkedWalletsFromWalletOptions = require('./utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs');
+var reconnectSocialWallet = require('./reconnectSocialWallet.cjs');
 
 const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = React.useState(false);
-    const [wallets, setWallets] = React.useState([]);
-    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletId] = useLocalStorage.useLocalStorage(localStorage$1.PRIMARY_WALLET_ID, undefined, (value) => typeof value === 'string' || typeof value === 'undefined');
+    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletId] = useLocalStorage.useLocalStorage(localStorage$1.PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator.primaryWalletIdValidator);
+    const linkedWallets = React.useMemo(() => {
+        if (!authToken) {
+            return [];
+        }
+        return createLinkedWalletsFromWalletOptions.createLinkedWalletsFromWalletOptions({
+            authToken,
+            primaryWalletId,
+            walletOptions: availableWallets,
+        });
+    }, [availableWallets, primaryWalletId, authToken]);
+    const { connectedWalletMap, computeConnectedStateForWallets, didConnectedStateLoad, } = useWalletsConnectionState.useWalletsConnectionState(linkedWallets);
+    const wallets = React.useMemo(() => linkedWallets.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, linkedWallets]);
+    React.useEffect(() => {
+        computeConnectedStateForWallets();
+    }, [primaryWalletId, computeConnectedStateForWallets]);
     const setPrimaryWalletId = React.useCallback((walletId) => {
         setPrimaryWalletIdState(walletId);
     }, [setPrimaryWalletIdState]);
-    const clearWalletStates = React.useCallback(() => {
-        setWallets([]);
-        clearPrimaryWalletId();
-    }, [clearPrimaryWalletId]);
-    const getPrimaryWallet = React.useCallback(() => {
-        const primaryWallet = wallets.find((wallet) => wallet.id === primaryWalletId);
-        if (!primaryWallet) {
-            return null;
-        }
-        return primaryWallet;
-    }, [primaryWalletId, wallets]);
+    const getPrimaryWallet = React.useCallback(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
     const getSecondaryWallets = React.useCallback(() => wallets.filter((wallet) => wallet.id !== primaryWalletId), [primaryWalletId, wallets]);
-    React.useEffect(() => {
-        const decodedJwt = decodeJwt.decodeJwt(authToken);
-        // wallet state should be null while loading all the wallets or when there is no user
-        if (!availableWallets || !decodedJwt) {
-            setWallets([]);
-            return;
-        }
-        Promise.all(decodedJwt.verifiedCredentials.map((account) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            const wallet = availableWallets.find((wallet) => account.walletName &&
-                isSameWalletName.isSameWalletName(wallet.name, account.walletName));
-            // this probably shouldn't happen. this would mean that the user has an account linked
-            // with wallet W, but the customer has toggled off wallet W or the chain that
-            // supports wallet W
-            /* istanbul ignore next */
-            if (!wallet)
-                return null;
-            if (account.id === primaryWalletId &&
-                shouldManuallyReconnectOnRefresh.shouldManuallyReconnectOnRefresh(wallet.walletConnector)) {
-                yield wallet.walletConnector.connect();
-            }
-            if (account.address && account.chain) {
-                return {
-                    address: account.address,
-                    chain: account.chain,
-                    connected: yield isWalletConnected.isWalletConnected({
-                        address: account.address,
-                        chain: account.chain,
-                        connector: wallet.walletConnector,
-                    }),
-                    connector: wallet.walletConnector,
-                    id: account.id,
-                };
-            }
-            return null;
-        }))).then((result) => {
-            setWallets(result.filter((wc) => wc !== null));
-            return null;
-        });
-    }, [availableWallets, primaryWalletId, authToken]);
-    const computeConnectedStateForWallets = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        if (!primaryWalletId)
-            return;
-        const connectionMap = {};
-        for (const wallet of wallets) {
-            connectionMap[wallet.id] = yield isWalletConnected.isWalletConnected(wallet);
-        }
-        setWallets((currentWallets) => currentWallets.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: connectionMap[wallet.id] }))));
-    }), [primaryWalletId, wallets]);
     const getSelectedWallet = React.useCallback((walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const newWallet = wallets.find(({ id }) => id === walletId);
         if (!newWallet) {
-            throw new multiWallet.DynamicError(`Wallet with id: ${walletId} not found`);
+            throw new utils.DynamicError(`Wallet with id: ${walletId} not found`);
         }
         const connectedAccounts = yield newWallet.connector.getConnectedAccounts();
         return { connectedAccounts, newWallet };
     }), [wallets]);
-    const checkIfAccountChangeIsRequired = React.useCallback((primaryWallet, newPrimaryWallet) => {
-        if (!primaryWallet)
-            return;
+    const checkIfAccountChangeIsRequired = React.useCallback((primaryWallet, newPrimaryWallet, connectedAccounts) => {
         /**
          * we need to check multiWalletWidgetState here because `setPrimaryWallet` currently gets
          * called twice: once when the user clicks "make active" and once when the user performs
@@ -104,8 +61,12 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
          * (https://github.com/dynamic-labs/DynamicAuth/pull/550) is merged, since setting the
          * primary wallet will be simpler, so we won't need to call `setPrimaryWallet` twice.
          */
-        return (multiWalletWidgetState === 'idle' &&
-            isSameWalletName.isSameWalletName(newPrimaryWallet.connector.name, primaryWallet.connector.name));
+        if (!primaryWallet || multiWalletWidgetState !== 'idle')
+            return;
+        const accountIsNotConnectedInSecondaryWallet = connectedAccounts &&
+            !connectedAccounts.find((connectedAccount) => connectedAccount.toLowerCase() ===
+                newPrimaryWallet.address.toLowerCase());
+        return (isSameWalletName.isSameWalletName(newPrimaryWallet.connector.name, primaryWallet.connector.name) || accountIsNotConnectedInSecondaryWallet);
     }, [multiWalletWidgetState]);
     const checkIfShowQrCodeModal = React.useCallback((wallet) => !wallet.connector.isInstalledOnBrowser() &&
         !wallet.connector.canConnectViaCustodialService, []);
@@ -120,20 +81,26 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
             return;
         const primaryWallet = getPrimaryWallet();
         if (checkIfAccountChangeIsRequired(primaryWallet, newPrimaryWallet)) {
-            setMultiWalletWidgetState('awaiting_account_switch', 'switching_primary');
+            yield newPrimaryWallet.connector.connect();
+            setPrimaryWalletId(walletId);
             return;
         }
         if (!connectedAccounts.length) {
             setMultiWalletWidgetState('awaiting_connection');
             setShowQrcodeModal(checkIfShowQrCodeModal(newPrimaryWallet));
         }
-        if (multiWallet.isEmailWalletConnector(newPrimaryWallet.connector)) {
+        if (walletConnectorCore.isEmailWalletConnector(newPrimaryWallet.connector)) {
             const emailConnector = newPrimaryWallet.connector;
             const email = localStorage.getItem('magic-link-email');
             if (email) {
                 emailConnector.setEmail(email);
             }
         }
+        if (walletConnectorCore.isSocialWalletConnector(newPrimaryWallet.connector) &&
+            !newPrimaryWallet.connected) {
+            reconnectSocialWallet.reconnectSocialWallet(authToken, newPrimaryWallet);
+            return;
+        }
         /* istanbul ignore next */
         const publicAddress = yield newPrimaryWallet.connector.fetchPublicAddress({
             onDesktopUri: (uri) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -143,6 +110,16 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
                 setQrcodeUri(uri);
             }),
         });
+        /**
+         * need to check for connected account again for wallets that disconnect on refresh
+         *  and only reconnect upon fetching public address above
+         */
+        const updatedConnectedAccounts = yield newPrimaryWallet.connector.getConnectedAccounts();
+        if (checkIfAccountChangeIsRequired(primaryWallet, newPrimaryWallet, updatedConnectedAccounts) &&
+            !walletConnectorCore.isEmailWalletConnector(newPrimaryWallet.connector)) {
+            setMultiWalletWidgetState('awaiting_account_switch', 'switching_primary');
+            return;
+        }
         if (publicAddress) {
             setPrimaryWalletId(walletId);
             setMultiWalletWidgetState('idle');
@@ -151,6 +128,7 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
             logger.logger.error('Failed to connect to wallet');
         }
     }), [
+        authToken,
         checkIfAccountChangeIsRequired,
         checkIfShowQrCodeModal,
         getPrimaryWallet,
@@ -163,8 +141,9 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
     ]);
     const walletConnectors = wallets.map((wallet) => wallet.connector);
     return {
-        clearWalletStates,
+        clearPrimaryWalletId,
         computeConnectedStateForWallets,
+        didConnectedStateLoad,
         getPrimaryWallet,
         getSecondaryWallets,
         primaryWallet: getPrimaryWallet(),

package/src/lib/utils/hooks/useWalletConnectors/useWalletConnectors.d.ts

@@ -11,8 +11,9 @@ type Props = {
     wallets: WalletOption[];
 };
 export interface UseWalletConnectors {
-    clearWalletStates: () => void;
+    clearPrimaryWalletId: () => void;
     computeConnectedStateForWallets: () => Promise<void>;
+    didConnectedStateLoad: boolean;
     getPrimaryWallet: () => Wallet | null;
     getSecondaryWallets: () => Wallet[];
     primaryWallet: Wallet | null;

package/src/lib/utils/hooks/useWalletConnectors/useWalletConnectors.js

@@ -1,87 +1,46 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState, useCallback, useEffect } from 'react';
-import { DynamicError, isEmailWalletConnector } from '@dynamic-labs/multi-wallet';
-import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
+import { useState, useMemo, useEffect, useCallback } from 'react';
+import { isEmailWalletConnector, isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { DynamicError } from '@dynamic-labs/utils';
+import '@dynamic-labs/sdk-api';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import { PRIMARY_WALLET_ID } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
+import 'ethers';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import '../../../shared/consts/index.js';
-import { isWalletConnected } from '../../functions/isWalletConnected/isWalletConnected.js';
 import { isSameWalletName } from '../../functions/isSameWalletName/isSameWalletName.js';
-import '@dynamic-labs/sdk-api';
-import { shouldManuallyReconnectOnRefresh } from '../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
+import { useWalletsConnectionState } from '../useWalletsConnectionState/useWalletsConnectionState.js';
+import { primaryWalletIdValidator } from './utils/primaryWalletIdValidator/primaryWalletIdValidator.js';
+import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
+import { reconnectSocialWallet } from './reconnectSocialWallet.js';
 
 const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = useState(false);
-    const [wallets, setWallets] = useState([]);
-    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletId] = useLocalStorage(PRIMARY_WALLET_ID, undefined, (value) => typeof value === 'string' || typeof value === 'undefined');
+    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletId] = useLocalStorage(PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator);
+    const linkedWallets = useMemo(() => {
+        if (!authToken) {
+            return [];
+        }
+        return createLinkedWalletsFromWalletOptions({
+            authToken,
+            primaryWalletId,
+            walletOptions: availableWallets,
+        });
+    }, [availableWallets, primaryWalletId, authToken]);
+    const { connectedWalletMap, computeConnectedStateForWallets, didConnectedStateLoad, } = useWalletsConnectionState(linkedWallets);
+    const wallets = useMemo(() => linkedWallets.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, linkedWallets]);
+    useEffect(() => {
+        computeConnectedStateForWallets();
+    }, [primaryWalletId, computeConnectedStateForWallets]);
     const setPrimaryWalletId = useCallback((walletId) => {
         setPrimaryWalletIdState(walletId);
     }, [setPrimaryWalletIdState]);
-    const clearWalletStates = useCallback(() => {
-        setWallets([]);
-        clearPrimaryWalletId();
-    }, [clearPrimaryWalletId]);
-    const getPrimaryWallet = useCallback(() => {
-        const primaryWallet = wallets.find((wallet) => wallet.id === primaryWalletId);
-        if (!primaryWallet) {
-            return null;
-        }
-        return primaryWallet;
-    }, [primaryWalletId, wallets]);
+    const getPrimaryWallet = useCallback(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
     const getSecondaryWallets = useCallback(() => wallets.filter((wallet) => wallet.id !== primaryWalletId), [primaryWalletId, wallets]);
-    useEffect(() => {
-        const decodedJwt = decodeJwt(authToken);
-        // wallet state should be null while loading all the wallets or when there is no user
-        if (!availableWallets || !decodedJwt) {
-            setWallets([]);
-            return;
-        }
-        Promise.all(decodedJwt.verifiedCredentials.map((account) => __awaiter(void 0, void 0, void 0, function* () {
-            const wallet = availableWallets.find((wallet) => account.walletName &&
-                isSameWalletName(wallet.name, account.walletName));
-            // this probably shouldn't happen. this would mean that the user has an account linked
-            // with wallet W, but the customer has toggled off wallet W or the chain that
-            // supports wallet W
-            /* istanbul ignore next */
-            if (!wallet)
-                return null;
-            if (account.id === primaryWalletId &&
-                shouldManuallyReconnectOnRefresh(wallet.walletConnector)) {
-                yield wallet.walletConnector.connect();
-            }
-            if (account.address && account.chain) {
-                return {
-                    address: account.address,
-                    chain: account.chain,
-                    connected: yield isWalletConnected({
-                        address: account.address,
-                        chain: account.chain,
-                        connector: wallet.walletConnector,
-                    }),
-                    connector: wallet.walletConnector,
-                    id: account.id,
-                };
-            }
-            return null;
-        }))).then((result) => {
-            setWallets(result.filter((wc) => wc !== null));
-            return null;
-        });
-    }, [availableWallets, primaryWalletId, authToken]);
-    const computeConnectedStateForWallets = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        if (!primaryWalletId)
-            return;
-        const connectionMap = {};
-        for (const wallet of wallets) {
-            connectionMap[wallet.id] = yield isWalletConnected(wallet);
-        }
-        setWallets((currentWallets) => currentWallets.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: connectionMap[wallet.id] }))));
-    }), [primaryWalletId, wallets]);
     const getSelectedWallet = useCallback((walletId) => __awaiter(void 0, void 0, void 0, function* () {
         const newWallet = wallets.find(({ id }) => id === walletId);
         if (!newWallet) {
@@ -90,9 +49,7 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
         const connectedAccounts = yield newWallet.connector.getConnectedAccounts();
         return { connectedAccounts, newWallet };
     }), [wallets]);
-    const checkIfAccountChangeIsRequired = useCallback((primaryWallet, newPrimaryWallet) => {
-        if (!primaryWallet)
-            return;
+    const checkIfAccountChangeIsRequired = useCallback((primaryWallet, newPrimaryWallet, connectedAccounts) => {
         /**
          * we need to check multiWalletWidgetState here because `setPrimaryWallet` currently gets
          * called twice: once when the user clicks "make active" and once when the user performs
@@ -100,8 +57,12 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
          * (https://github.com/dynamic-labs/DynamicAuth/pull/550) is merged, since setting the
          * primary wallet will be simpler, so we won't need to call `setPrimaryWallet` twice.
          */
-        return (multiWalletWidgetState === 'idle' &&
-            isSameWalletName(newPrimaryWallet.connector.name, primaryWallet.connector.name));
+        if (!primaryWallet || multiWalletWidgetState !== 'idle')
+            return;
+        const accountIsNotConnectedInSecondaryWallet = connectedAccounts &&
+            !connectedAccounts.find((connectedAccount) => connectedAccount.toLowerCase() ===
+                newPrimaryWallet.address.toLowerCase());
+        return (isSameWalletName(newPrimaryWallet.connector.name, primaryWallet.connector.name) || accountIsNotConnectedInSecondaryWallet);
     }, [multiWalletWidgetState]);
     const checkIfShowQrCodeModal = useCallback((wallet) => !wallet.connector.isInstalledOnBrowser() &&
         !wallet.connector.canConnectViaCustodialService, []);
@@ -116,7 +77,8 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
             return;
         const primaryWallet = getPrimaryWallet();
         if (checkIfAccountChangeIsRequired(primaryWallet, newPrimaryWallet)) {
-            setMultiWalletWidgetState('awaiting_account_switch', 'switching_primary');
+            yield newPrimaryWallet.connector.connect();
+            setPrimaryWalletId(walletId);
             return;
         }
         if (!connectedAccounts.length) {
@@ -130,6 +92,11 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
                 emailConnector.setEmail(email);
             }
         }
+        if (isSocialWalletConnector(newPrimaryWallet.connector) &&
+            !newPrimaryWallet.connected) {
+            reconnectSocialWallet(authToken, newPrimaryWallet);
+            return;
+        }
         /* istanbul ignore next */
         const publicAddress = yield newPrimaryWallet.connector.fetchPublicAddress({
             onDesktopUri: (uri) => __awaiter(void 0, void 0, void 0, function* () {
@@ -139,6 +106,16 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
                 setQrcodeUri(uri);
             }),
         });
+        /**
+         * need to check for connected account again for wallets that disconnect on refresh
+         *  and only reconnect upon fetching public address above
+         */
+        const updatedConnectedAccounts = yield newPrimaryWallet.connector.getConnectedAccounts();
+        if (checkIfAccountChangeIsRequired(primaryWallet, newPrimaryWallet, updatedConnectedAccounts) &&
+            !isEmailWalletConnector(newPrimaryWallet.connector)) {
+            setMultiWalletWidgetState('awaiting_account_switch', 'switching_primary');
+            return;
+        }
         if (publicAddress) {
             setPrimaryWalletId(walletId);
             setMultiWalletWidgetState('idle');
@@ -147,6 +124,7 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
             logger.error('Failed to connect to wallet');
         }
     }), [
+        authToken,
         checkIfAccountChangeIsRequired,
         checkIfShowQrCodeModal,
         getPrimaryWallet,
@@ -159,8 +137,9 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
     ]);
     const walletConnectors = wallets.map((wallet) => wallet.connector);
     return {
-        clearWalletStates,
+        clearPrimaryWalletId,
         computeConnectedStateForWallets,
+        didConnectedStateLoad,
         getPrimaryWallet,
         getSecondaryWallets,
         primaryWallet: getPrimaryWallet(),

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs

@@ -0,0 +1,55 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var decodeJwt = require('../../../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
+require('../../../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../../../context/ViewContext/ViewContext.cjs');
+require('react');
+require('@dynamic-labs/utils');
+require('../../../../constants/colors.cjs');
+require('ethers');
+require('../../../../../shared/consts/index.cjs');
+var isSameWalletName = require('../../../../functions/isSameWalletName/isSameWalletName.cjs');
+require('@dynamic-labs/multi-wallet');
+require('@dynamic-labs/sdk-api');
+var shouldManuallyReconnectOnRefresh = require('../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
+
+const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primaryWalletId, }) => {
+    const decodedJwt = decodeJwt.decodeJwt(authToken);
+    // wallet state should be null while loading all the wallets or when there is no user
+    if (!walletOptions || !decodedJwt) {
+        return [];
+    }
+    return decodedJwt.verifiedCredentials
+        .map((account) => {
+        const wallet = walletOptions.find((wallet) => account.walletName &&
+            isSameWalletName.isSameWalletName(wallet.name, account.walletName));
+        // this probably shouldn't happen. this would mean that the user has an account linked
+        // with wallet W, but the customer has toggled off wallet W or the chain that
+        // supports wallet W
+        /* istanbul ignore next */
+        if (!wallet)
+            return null;
+        if (account.id === primaryWalletId &&
+            shouldManuallyReconnectOnRefresh.shouldManuallyReconnectOnRefresh(wallet.walletConnector)) {
+            wallet.walletConnector.connect();
+        }
+        if (account.address && account.chain) {
+            return {
+                address: account.address,
+                chain: account.chain,
+                connected: false,
+                connector: wallet.walletConnector,
+                id: account.id,
+            };
+        }
+        return null;
+    })
+        .filter((wc) => wc !== null);
+};
+
+exports.createLinkedWalletsFromWalletOptions = createLinkedWalletsFromWalletOptions;

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.d.ts

@@ -0,0 +1,8 @@
+import { Wallet, WalletOption } from '../../../../../shared';
+type CreateWalletsFromWalletOptionsProps = {
+    authToken: string;
+    primaryWalletId: string | undefined;
+    walletOptions: WalletOption[] | undefined;
+};
+export declare const createLinkedWalletsFromWalletOptions: ({ authToken, walletOptions, primaryWalletId, }: CreateWalletsFromWalletOptionsProps) => Wallet[];
+export {};

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js

@@ -0,0 +1,51 @@
+import { decodeJwt } from '../../../../../shared/utils/functions/decodeJwt/decodeJwt.js';
+import '../../../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../../../context/ViewContext/ViewContext.js';
+import 'react';
+import '@dynamic-labs/utils';
+import '../../../../constants/colors.js';
+import 'ethers';
+import '../../../../../shared/consts/index.js';
+import { isSameWalletName } from '../../../../functions/isSameWalletName/isSameWalletName.js';
+import '@dynamic-labs/multi-wallet';
+import '@dynamic-labs/sdk-api';
+import { shouldManuallyReconnectOnRefresh } from '../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
+
+const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primaryWalletId, }) => {
+    const decodedJwt = decodeJwt(authToken);
+    // wallet state should be null while loading all the wallets or when there is no user
+    if (!walletOptions || !decodedJwt) {
+        return [];
+    }
+    return decodedJwt.verifiedCredentials
+        .map((account) => {
+        const wallet = walletOptions.find((wallet) => account.walletName &&
+            isSameWalletName(wallet.name, account.walletName));
+        // this probably shouldn't happen. this would mean that the user has an account linked
+        // with wallet W, but the customer has toggled off wallet W or the chain that
+        // supports wallet W
+        /* istanbul ignore next */
+        if (!wallet)
+            return null;
+        if (account.id === primaryWalletId &&
+            shouldManuallyReconnectOnRefresh(wallet.walletConnector)) {
+            wallet.walletConnector.connect();
+        }
+        if (account.address && account.chain) {
+            return {
+                address: account.address,
+                chain: account.chain,
+                connected: false,
+                connector: wallet.walletConnector,
+                id: account.id,
+            };
+        }
+        return null;
+    })
+        .filter((wc) => wc !== null);
+};
+
+export { createLinkedWalletsFromWalletOptions };

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/index.d.ts

@@ -0,0 +1 @@
+export { createLinkedWalletsFromWalletOptions } from './createLinkedWalletsFromWalletOptions';

package/src/lib/utils/hooks/useWalletConnectors/utils/index.d.ts

@@ -0,0 +1,2 @@
+export * from './primaryWalletIdValidator';
+export * from './createLinkedWalletsFromWalletOptions';

package/src/lib/utils/hooks/useWalletConnectors/utils/primaryWalletIdValidator/index.d.ts

@@ -0,0 +1 @@
+export { primaryWalletIdValidator } from './primaryWalletIdValidator';

package/src/lib/utils/hooks/useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.cjs

@@ -0,0 +1,7 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const primaryWalletIdValidator = (value) => typeof value === 'string' || typeof value === 'undefined';
+
+exports.primaryWalletIdValidator = primaryWalletIdValidator;

package/src/lib/utils/hooks/useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.d.ts

@@ -0,0 +1 @@
+export declare const primaryWalletIdValidator: (value: string | unknown) => value is string | undefined;

package/src/lib/utils/hooks/useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.js

@@ -0,0 +1,3 @@
+const primaryWalletIdValidator = (value) => typeof value === 'string' || typeof value === 'undefined';
+
+export { primaryWalletIdValidator };