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

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

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
 var api = require('../../../data/api.cjs');
 var index = require('../../functions/storeAuthToken/index.cjs');
@@ -11,13 +12,14 @@ var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 var logger = require('../../../shared/logger.cjs');
+require('../../../config/LSSuffix.cjs');
 var setToLS = require('../../../shared/utils/functions/storage/setToLS.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('react');
 require('ethers');
+require('../../../shared/consts/index.cjs');
 var getVerifyArgs = require('../../functions/getVerifyArgs/getVerifyArgs.cjs');
 var createUserProfile = require('../../functions/createUserProfile/createUserProfile.cjs');
 var isSupportedNetwork = require('../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
@@ -27,20 +29,21 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useInte
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 var getSiweStatement = require('../../functions/getSiweStatement/getSiweStatement.cjs');
 var getWalletProvider = require('../../functions/getWalletProvider/getWalletProvider.cjs');
-require('../../../shared/consts/index.cjs');
+var AccessDeniedContext = require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 
 // This logic is used to both verify or link a wallet
 // Since we are re-using the different screens to authenticate or link the wallet.
 // This logic is the best place to determine whether we should verify or verify and link.
 const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, }) => {
-    const { setView } = ViewContext.useViewContext();
+    const { setDeniedAddress, setDeniedOauthProvider } = AccessDeniedContext.useAccessDeniedContext();
+    const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage, setError } = ErrorContext.useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, loginWithEmail, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, } = useInternalDynamicContext.useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
     const verifyOnly = !authToken;
-    const generateJWT = (walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const generateJWT = (walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         let Jwt;
         const nonce = consumeNonce();
         if (nonce === undefined)
@@ -56,7 +59,8 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             walletProvider,
         });
         if (authToken === undefined || !multiWalletEnabled) {
-            Jwt = yield api.verifyWallet(environmentId, Object.assign(Object.assign({}, verifyArgs), { captchaToken }));
+            Jwt = yield api.verifyWallet(environmentId, Object.assign(Object.assign({}, verifyArgs), { captchaToken,
+                oauth }));
         }
         else {
             Jwt = yield api.linkWallet(environmentId, verifyArgs, authToken);
@@ -86,7 +90,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             }
         }
     };
-    const handleError = (e, walletConnector) => {
+    const handleError = (e, walletConnector, address, oauth) => {
         // This is a special case where the user is trying to link a wallet
         // and the wallet is already linked and we don't want to kill the session.
         if (e instanceof utils.WalletUsedError) {
@@ -104,13 +108,18 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             return;
         }
         if (e instanceof utils.NoAccessError) {
+            setDeniedAddress(address);
+            // we need to set this value if it's magic in order to set proper icon
+            if (walletConnectorCore.isSocialWalletConnector(walletConnector)) {
+                setDeniedOauthProvider(oauth === null || oauth === void 0 ? void 0 : oauth.provider);
+            }
             setView('no-access');
             return;
         }
         if (connectedWallet && authMode === 'connect-only') {
             throw new utils.DynamicError(e.message);
         }
-        setView(loginWithEmail ? 'login-with-email-or-wallet' : 'wallet-list');
+        goToInitialView();
         logger.logger.error(e);
         if (debugError) {
             setError(`${e.message}\n ${e.stack}`);
@@ -119,7 +128,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             setErrorMessage(e.code);
         }
     };
-    return ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    return ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const walletProvider = getWalletProvider.getWalletProvider(walletConnector);
         const network = yield walletConnector.getNetwork();
         const _isSupportedNetwork = isSupportedNetwork.isSupportedNetwork({
@@ -127,7 +136,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             walletConnector,
         });
         try {
-            const Jwt = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken);
+            const Jwt = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth);
             const decodedJwt = decodeJwt.decodeJwt(Jwt);
             if (decodedJwt === undefined)
                 throw new utils.DynamicError('Invalid token!');
@@ -165,7 +174,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             }
         }
         catch (e) {
-            handleError(e, walletConnector);
+            handleError(e, walletConnector, publicWalletAddress, oauth);
         }
     });
 };

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

@@ -5,5 +5,5 @@ type UseVerifyWalletArgs = VerifyProps & ProjectSettingsProps & {
     displayTermsOfService: boolean;
     setIsSingleWalletAccount: Dispatch<SetStateAction<boolean>>;
 };
-export declare const useVerifyWallet: ({ consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, }: UseVerifyWalletArgs) => ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, }: VerifyCallbackArgs) => Promise<void>;
+export declare const useVerifyWallet: ({ consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, }: UseVerifyWalletArgs) => ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth, }: VerifyCallbackArgs) => Promise<void>;
 export {};

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

@@ -1,4 +1,5 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { DynamicError, WalletUsedError, ChainalysisError, NoAccessError } from '@dynamic-labs/utils';
 import { verifyWallet, linkWallet } from '../../../data/api.js';
 import { storeAuthToken } from '../../functions/storeAuthToken/index.js';
@@ -7,13 +8,14 @@ import { LAST_USED_WALLET } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import { logger } from '../../../shared/logger.js';
+import '../../../config/LSSuffix.js';
 import { setToLS } from '../../../shared/utils/functions/storage/setToLS.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import 'react';
 import 'ethers';
+import '../../../shared/consts/index.js';
 import { getVerifyArgs } from '../../functions/getVerifyArgs/getVerifyArgs.js';
 import { createUserProfile } from '../../functions/createUserProfile/createUserProfile.js';
 import { isSupportedNetwork } from '../../functions/isSupportedNetwork/isSupportedNetwork.js';
@@ -23,20 +25,21 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useIn
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import { getSiweStatement } from '../../functions/getSiweStatement/getSiweStatement.js';
 import { getWalletProvider } from '../../functions/getWalletProvider/getWalletProvider.js';
-import '../../../shared/consts/index.js';
+import { useAccessDeniedContext } from '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 
 // This logic is used to both verify or link a wallet
 // Since we are re-using the different screens to authenticate or link the wallet.
 // This logic is the best place to determine whether we should verify or verify and link.
 const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, }) => {
-    const { setView } = useViewContext();
+    const { setDeniedAddress, setDeniedOauthProvider } = useAccessDeniedContext();
+    const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage, setError } = useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, loginWithEmail, } = useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, } = useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
     const verifyOnly = !authToken;
-    const generateJWT = (walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
+    const generateJWT = (walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth) => __awaiter(void 0, void 0, void 0, function* () {
         let Jwt;
         const nonce = consumeNonce();
         if (nonce === undefined)
@@ -52,7 +55,8 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             walletProvider,
         });
         if (authToken === undefined || !multiWalletEnabled) {
-            Jwt = yield verifyWallet(environmentId, Object.assign(Object.assign({}, verifyArgs), { captchaToken }));
+            Jwt = yield verifyWallet(environmentId, Object.assign(Object.assign({}, verifyArgs), { captchaToken,
+                oauth }));
         }
         else {
             Jwt = yield linkWallet(environmentId, verifyArgs, authToken);
@@ -82,7 +86,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             }
         }
     };
-    const handleError = (e, walletConnector) => {
+    const handleError = (e, walletConnector, address, oauth) => {
         // This is a special case where the user is trying to link a wallet
         // and the wallet is already linked and we don't want to kill the session.
         if (e instanceof WalletUsedError) {
@@ -100,13 +104,18 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             return;
         }
         if (e instanceof NoAccessError) {
+            setDeniedAddress(address);
+            // we need to set this value if it's magic in order to set proper icon
+            if (isSocialWalletConnector(walletConnector)) {
+                setDeniedOauthProvider(oauth === null || oauth === void 0 ? void 0 : oauth.provider);
+            }
             setView('no-access');
             return;
         }
         if (connectedWallet && authMode === 'connect-only') {
             throw new DynamicError(e.message);
         }
-        setView(loginWithEmail ? 'login-with-email-or-wallet' : 'wallet-list');
+        goToInitialView();
         logger.error(e);
         if (debugError) {
             setError(`${e.message}\n ${e.stack}`);
@@ -115,7 +124,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             setErrorMessage(e.code);
         }
     };
-    return ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, }) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth, }) => __awaiter(void 0, void 0, void 0, function* () {
         const walletProvider = getWalletProvider(walletConnector);
         const network = yield walletConnector.getNetwork();
         const _isSupportedNetwork = isSupportedNetwork({
@@ -123,7 +132,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             walletConnector,
         });
         try {
-            const Jwt = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken);
+            const Jwt = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth);
             const decodedJwt = decodeJwt(Jwt);
             if (decodedJwt === undefined)
                 throw new DynamicError('Invalid token!');
@@ -161,7 +170,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             }
         }
         catch (e) {
-            handleError(e, walletConnector);
+            handleError(e, walletConnector, publicWalletAddress, oauth);
         }
     });
 };

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

@@ -0,0 +1,39 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+require('@dynamic-labs/sdk-api');
+require('../../../shared/logger.cjs');
+require('../../../config/LSSuffix.cjs');
+require('@dynamic-labs/iconic');
+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');
+require('@dynamic-labs/multi-wallet');
+var getReferencedAccount = require('../../functions/getReferencedAccount/getReferencedAccount.cjs');
+
+/**
+ * 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) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    if (!walletConnectorCore.isSocialWalletConnector(wallet.connector)) {
+        return;
+    }
+    const socialAccountDataForWallet = getReferencedAccount.getReferencedAccount(jwt, wallet.id);
+    if (!socialAccountDataForWallet ||
+        !socialAccountDataForWallet.oauthProvider) {
+        return;
+    }
+    yield wallet.connector.connect(socialAccountDataForWallet.oauthProvider);
+});
+
+exports.reconnectSocialWallet = reconnectSocialWallet;

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

@@ -0,0 +1,8 @@
+import { Wallet } from '../../../shared';
+/**
+ * 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
+ */
+export declare const reconnectSocialWallet: (jwt: string | undefined, wallet: Wallet) => Promise<void>;

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

@@ -0,0 +1,35 @@
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import '@dynamic-labs/sdk-api';
+import '../../../shared/logger.js';
+import '../../../config/LSSuffix.js';
+import '@dynamic-labs/iconic';
+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 '@dynamic-labs/multi-wallet';
+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

@@ -6,8 +6,9 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
-var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
+require('@dynamic-labs/sdk-api');
 var logger = require('../../../shared/logger.cjs');
+require('../../../config/LSSuffix.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
@@ -16,79 +17,35 @@ 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/multi-wallet');
-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) {
@@ -97,9 +54,7 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
         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
@@ -107,8 +62,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, []);
@@ -123,7 +82,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) {
@@ -137,6 +97,11 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
                 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* () {
@@ -146,6 +111,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');
@@ -154,6 +129,7 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
             logger.logger.error('Failed to connect to wallet');
         }
     }), [
+        authToken,
         checkIfAccountChangeIsRequired,
         checkIfShowQrCodeModal,
         getPrimaryWallet,
@@ -166,8 +142,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;