@dynamic-labs/sdk-react-core 1.0.0-alpha.0 → 1.0.0-alpha.1

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs

@@ -15,11 +15,11 @@ require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('react');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 var localStorage$1 = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
 var localStorage = require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
 var useVerifyWallet = require('../../useVerifyWallet/useVerifyWallet.cjs');
 var CaptchaContext = require('../../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -30,8 +30,8 @@ var isProgrammableNetworkSwitchSupported = require('../../../functions/isProgram
 
 const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = true, } = {}) => {
     const { setView, goToInitialView } = ViewContext.useViewContext();
+    const { engageCaptcha, getCaptchaToken } = CaptchaContext.useCaptchaContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
-    const { captchaToken } = CaptchaContext.useCaptchaContext();
     const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
@@ -41,8 +41,35 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
         projectSettings,
         setIsSingleWalletAccount,
     });
+    const handleWalletVerify = (walletConnector, publicWalletAddress, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        if (!walletConnectorCore.isEmailWalletConnector(walletConnector) ||
+            walletConnectorCore.isBloctoConnector(walletConnector)) {
+            setView('pending-signature');
+        }
+        else {
+            walletUiUtils.disabledConfirmationOnce();
+        }
+        yield verifyWallet({
+            captchaToken,
+            publicWalletAddress,
+            walletConnector,
+        });
+    });
+    const handleWalletVerifyError = (err) => {
+        var _a;
+        const userCancelled = (err === null || err === void 0 ? void 0 : err.code) === 'user-cancelled';
+        if (!userCancelled)
+            logger.logger.debug(err);
+        setErrorMessage((_a = err === null || err === void 0 ? void 0 : err.code) === null || _a === void 0 ? void 0 : _a.toString());
+        goToInitialView();
+        // Since auth failed, clear verification flag
+        // But if user cancelled, clearStatesOnBackClick will have already cleared it. So avoid
+        // clearing again since that would trigger a warning
+        if (!userCancelled)
+            setIsVerificationInProgress(false);
+    };
     return ({ walletConnector, fetchPublicAddressOpts = undefined, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         // Raise verification ongoing flag
         setIsVerificationInProgress(true);
         try {
@@ -79,34 +106,23 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 return;
             }
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
-                setView('captcha');
+                engageCaptcha({
+                    authMethod: 'wallet',
+                    onCaptchaSuccess: (captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+                        try {
+                            yield handleWalletVerify(walletConnector, publicWalletAddress, captchaToken);
+                        }
+                        catch (e) {
+                            handleWalletVerifyError(e);
+                        }
+                    }),
+                });
                 return;
             }
-            if (!walletConnectorCore.isEmailWalletConnector(walletConnector) ||
-                walletConnectorCore.isBloctoConnector(walletConnector)) {
-                setView('pending-signature');
-            }
-            else {
-                walletUiUtils.disabledConfirmationOnce();
-            }
-            yield verifyWallet({
-                captchaToken,
-                publicWalletAddress,
-                walletConnector,
-            });
+            yield handleWalletVerify(walletConnector, publicWalletAddress, getCaptchaToken());
         }
         catch (err) {
-            const userCancelled = (err === null || err === void 0 ? void 0 : err.code) === 'user-cancelled';
-            if (!userCancelled)
-                logger.logger.debug(err);
-            setErrorMessage((_b = err === null || err === void 0 ? void 0 : err.code) === null || _b === void 0 ? void 0 : _b.toString());
-            goToInitialView();
-            // Since auth failed, clear verification flag
-            // But if user cancelled, clearStatesOnBackClick will have already cleared it. So avoid
-            // clearing again since that would trigger a warning
-            if (!userCancelled)
-                setIsVerificationInProgress(false);
-            return;
+            handleWalletVerifyError(err);
         }
     });
 };

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js

@@ -11,11 +11,11 @@ import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import 'react';
 import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
 import { LAST_USED_WALLET } from '../../../constants/localStorage.js';
 import '../../../constants/colors.js';
 import { LocalStorage } from '../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
 import { useVerifyWallet } from '../../useVerifyWallet/useVerifyWallet.js';
 import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
@@ -26,8 +26,8 @@ import { isProgrammableNetworkSwitchSupported } from '../../../functions/isProgr
 
 const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = true, } = {}) => {
     const { setView, goToInitialView } = useViewContext();
+    const { engageCaptcha, getCaptchaToken } = useCaptchaContext();
     const { setErrorMessage } = useErrorContext();
-    const { captchaToken } = useCaptchaContext();
     const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
@@ -37,8 +37,35 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
         projectSettings,
         setIsSingleWalletAccount,
     });
+    const handleWalletVerify = (walletConnector, publicWalletAddress, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
+        if (!isEmailWalletConnector(walletConnector) ||
+            isBloctoConnector(walletConnector)) {
+            setView('pending-signature');
+        }
+        else {
+            walletUiUtils.disabledConfirmationOnce();
+        }
+        yield verifyWallet({
+            captchaToken,
+            publicWalletAddress,
+            walletConnector,
+        });
+    });
+    const handleWalletVerifyError = (err) => {
+        var _a;
+        const userCancelled = (err === null || err === void 0 ? void 0 : err.code) === 'user-cancelled';
+        if (!userCancelled)
+            logger.debug(err);
+        setErrorMessage((_a = err === null || err === void 0 ? void 0 : err.code) === null || _a === void 0 ? void 0 : _a.toString());
+        goToInitialView();
+        // Since auth failed, clear verification flag
+        // But if user cancelled, clearStatesOnBackClick will have already cleared it. So avoid
+        // clearing again since that would trigger a warning
+        if (!userCancelled)
+            setIsVerificationInProgress(false);
+    };
     return ({ walletConnector, fetchPublicAddressOpts = undefined, }) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         // Raise verification ongoing flag
         setIsVerificationInProgress(true);
         try {
@@ -75,34 +102,23 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 return;
             }
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
-                setView('captcha');
+                engageCaptcha({
+                    authMethod: 'wallet',
+                    onCaptchaSuccess: (captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
+                        try {
+                            yield handleWalletVerify(walletConnector, publicWalletAddress, captchaToken);
+                        }
+                        catch (e) {
+                            handleWalletVerifyError(e);
+                        }
+                    }),
+                });
                 return;
             }
-            if (!isEmailWalletConnector(walletConnector) ||
-                isBloctoConnector(walletConnector)) {
-                setView('pending-signature');
-            }
-            else {
-                walletUiUtils.disabledConfirmationOnce();
-            }
-            yield verifyWallet({
-                captchaToken,
-                publicWalletAddress,
-                walletConnector,
-            });
+            yield handleWalletVerify(walletConnector, publicWalletAddress, getCaptchaToken());
         }
         catch (err) {
-            const userCancelled = (err === null || err === void 0 ? void 0 : err.code) === 'user-cancelled';
-            if (!userCancelled)
-                logger.debug(err);
-            setErrorMessage((_b = err === null || err === void 0 ? void 0 : err.code) === null || _b === void 0 ? void 0 : _b.toString());
-            goToInitialView();
-            // Since auth failed, clear verification flag
-            // But if user cancelled, clearStatesOnBackClick will have already cleared it. So avoid
-            // clearing again since that would trigger a warning
-            if (!userCancelled)
-                setIsVerificationInProgress(false);
-            return;
+            handleWalletVerifyError(err);
         }
     });
 };

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.cjs

@@ -16,11 +16,11 @@ require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('react');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 var localStorage$1 = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
 var localStorage = require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
 var CaptchaContext = require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 var useHandleWalletsToConnect = require('../../useHandleWalletsToConnect/useHandleWalletsToConnect.cjs');
@@ -28,7 +28,7 @@ var useHandleWalletsToConnect = require('../../useHandleWalletsToConnect/useHand
 const useConnectAndSignSplitSteps = () => {
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
-    const { captchaToken } = CaptchaContext.useCaptchaContext();
+    const { getCaptchaToken, engageCaptcha } = CaptchaContext.useCaptchaContext();
     const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
@@ -56,7 +56,13 @@ const useConnectAndSignSplitSteps = () => {
                 return;
             }
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
-                setView('captcha');
+                engageCaptcha({
+                    authMethod: 'wallet',
+                    onCaptchaSuccess: (_captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+                        setShowAuthFlow(true);
+                        setView('pending-signature');
+                    }),
+                });
                 return;
             }
             setShowAuthFlow(true);
@@ -81,7 +87,7 @@ const useConnectAndSignSplitSteps = () => {
                 return;
             }
             yield verifyWallet({
-                captchaToken,
+                captchaToken: getCaptchaToken(),
                 publicWalletAddress,
                 walletConnector,
             });

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.js

@@ -12,11 +12,11 @@ import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import 'react';
 import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
 import { LAST_USED_WALLET } from '../../../constants/localStorage.js';
 import '../../../constants/colors.js';
 import { LocalStorage } from '../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
 import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
 import { useHandleWalletsToConnect } from '../../useHandleWalletsToConnect/useHandleWalletsToConnect.js';
@@ -24,7 +24,7 @@ import { useHandleWalletsToConnect } from '../../useHandleWalletsToConnect/useHa
 const useConnectAndSignSplitSteps = () => {
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
-    const { captchaToken } = useCaptchaContext();
+    const { getCaptchaToken, engageCaptcha } = useCaptchaContext();
     const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
@@ -52,7 +52,13 @@ const useConnectAndSignSplitSteps = () => {
                 return;
             }
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
-                setView('captcha');
+                engageCaptcha({
+                    authMethod: 'wallet',
+                    onCaptchaSuccess: (_captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
+                        setShowAuthFlow(true);
+                        setView('pending-signature');
+                    }),
+                });
                 return;
             }
             setShowAuthFlow(true);
@@ -77,7 +83,7 @@ const useConnectAndSignSplitSteps = () => {
                 return;
             }
             yield verifyWallet({
-                captchaToken,
+                captchaToken: getCaptchaToken(),
                 publicWalletAddress,
                 walletConnector,
             });

package/src/lib/utils/hooks/authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.cjs

@@ -14,16 +14,18 @@ require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('react');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 require('../../../constants/colors.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
+var CaptchaContext = require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 
 const useSignConnectOnlyUser = () => {
     const { setView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
-    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnector, walletUiUtils, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { getCaptchaToken } = CaptchaContext.useCaptchaContext();
+    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnectorKey, walletUiUtils, } = useInternalDynamicContext.useInternalDynamicContext();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
         displaySiweStatement,
@@ -41,7 +43,7 @@ const useSignConnectOnlyUser = () => {
             // We need this because in connect-only we don't want to show wallet-list
             // We don't want to show the back button in the pending signature view
             // because we don't want to go back to the wallet-list
-            setSelectedWalletConnector(walletConnector);
+            setSelectedWalletConnectorKey(walletConnector.key);
             setView('pending-signature-without-back-button');
             setShowAuthFlow(true);
             // Wallet should be already connected at this point
@@ -51,6 +53,7 @@ const useSignConnectOnlyUser = () => {
                 return;
             }
             yield verifyWallet({
+                captchaToken: getCaptchaToken(),
                 publicWalletAddress,
                 walletConnector,
             });

package/src/lib/utils/hooks/authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.js

@@ -10,16 +10,18 @@ import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import 'react';
 import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
 import '../../../constants/colors.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
+import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
 
 const useSignConnectOnlyUser = () => {
     const { setView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
-    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnector, walletUiUtils, } = useInternalDynamicContext();
+    const { getCaptchaToken } = useCaptchaContext();
+    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnectorKey, walletUiUtils, } = useInternalDynamicContext();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
         displaySiweStatement,
@@ -37,7 +39,7 @@ const useSignConnectOnlyUser = () => {
             // We need this because in connect-only we don't want to show wallet-list
             // We don't want to show the back button in the pending signature view
             // because we don't want to go back to the wallet-list
-            setSelectedWalletConnector(walletConnector);
+            setSelectedWalletConnectorKey(walletConnector.key);
             setView('pending-signature-without-back-button');
             setShowAuthFlow(true);
             // Wallet should be already connected at this point
@@ -47,6 +49,7 @@ const useSignConnectOnlyUser = () => {
                 return;
             }
             yield verifyWallet({
+                captchaToken: getCaptchaToken(),
                 publicWalletAddress,
                 walletConnector,
             });

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

@@ -14,7 +14,6 @@ export { useConfirmationModal } from './useConfirmationModal';
 export { useWalletUiUtils } from './useWalletUiUtils';
 export { useForceUpdate } from './useForceUpdate';
 export { useKYCFlag } from './useKYCFlag';
-export { useMultiWalletFlag } from './useMultiWalletFlag';
 export { useDefaultQrCode } from './useDefaultQrCode';
 export { useWalletItemActions } from './useWalletItemActions';
 export { usePromise } from './usePromise';

package/src/lib/utils/hooks/multiWallet/useMultiWallet/useMultiWallet.cjs

@@ -10,12 +10,12 @@ require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 var localStorage = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
 var localStorage$1 = require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 var useLocalStorage = require('../../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
+require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
 
 const useMultiWallet = (toolkitEnabled, multiWalletSettings) => {

package/src/lib/utils/hooks/multiWallet/useMultiWallet/useMultiWallet.js

@@ -6,12 +6,12 @@ import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
 import { IS_MULTI_WALLET_ENABLED } from '../../../constants/localStorage.js';
 import '../../../constants/colors.js';
 import { LocalStorage } from '../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import { useLocalStorage } from '../../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
+import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
 
 const useMultiWallet = (toolkitEnabled, multiWalletSettings) => {

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.cjs

@@ -11,7 +11,7 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useI
 var errors = require('../../../constants/errors.cjs');
 
 const useSyncPrimaryWallet = (canSync = true) => {
-    const { setShowAuthFlow, isAuthenticated, authMode, computeConnectedStateForWallets, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showLockedWalletView, showWidgetStatePopup, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setShowAuthFlow, isAuthenticated, authMode, computeConnectedStateForWallets, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showLockedWalletView, showWidgetStatePopup, setSelectedWalletWithAction, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const handlePrimaryWalletNotActive = React.useCallback((connectedAddress) => {
         if (!primaryWallet)
@@ -30,6 +30,10 @@ const useSyncPrimaryWallet = (canSync = true) => {
             // to a connected secondary wallet as it was causing an infinite loop
             const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected && primaryWallet.connector !== wallet.connector);
             if (!connectedSecondaryWallet) {
+                setSelectedWalletWithAction({
+                    action: 'select',
+                    wallet: primaryWallet,
+                });
                 setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
                 return;
             }

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.js

@@ -7,7 +7,7 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
 import { MISSING_ADDRESS_ERROR } from '../../../constants/errors.js';
 
 const useSyncPrimaryWallet = (canSync = true) => {
-    const { setShowAuthFlow, isAuthenticated, authMode, computeConnectedStateForWallets, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showLockedWalletView, showWidgetStatePopup, } = useInternalDynamicContext();
+    const { setShowAuthFlow, isAuthenticated, authMode, computeConnectedStateForWallets, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showLockedWalletView, showWidgetStatePopup, setSelectedWalletWithAction, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const handlePrimaryWalletNotActive = useCallback((connectedAddress) => {
         if (!primaryWallet)
@@ -26,6 +26,10 @@ const useSyncPrimaryWallet = (canSync = true) => {
             // to a connected secondary wallet as it was causing an infinite loop
             const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected && primaryWallet.connector !== wallet.connector);
             if (!connectedSecondaryWallet) {
+                setSelectedWalletWithAction({
+                    action: 'select',
+                    wallet: primaryWallet,
+                });
                 setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
                 return;
             }

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.cjs

@@ -11,10 +11,10 @@ require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 require('../../../constants/colors.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var requiresTwoStepAuthentication = require('../../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.cjs');

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.js

@@ -7,10 +7,10 @@ import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
 import '../../../constants/colors.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { requiresTwoStepAuthentication } from '../../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.js';

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

@@ -10,10 +10,10 @@ require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
 var localStorage$1 = require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 
 const useClearWalletConnectSessions = ({ connectors }) => {

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

@@ -6,10 +6,10 @@ import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
 import '../../constants/colors.js';
 import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 
 const useClearWalletConnectSessions = ({ connectors }) => {

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

@@ -10,10 +10,10 @@ require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('react');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/utils');
 var useMediaQuery = require('../../../shared/utils/hooks/useMediaQuery/useMediaQuery.cjs');
 require('../../../shared/consts/index.cjs');
 

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

@@ -6,10 +6,10 @@ import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import 'react';
 import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
 import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/utils';
 import { useMediaQuery } from '../../../shared/utils/hooks/useMediaQuery/useMediaQuery.js';
 import '../../../shared/consts/index.js';
 

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

@@ -11,12 +11,12 @@ require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
+require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 var getWalletProvider = require('../../functions/getWalletProvider/getWalletProvider.cjs');
 var api = require('../../../data/api.cjs');

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

@@ -7,12 +7,12 @@ import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
 import { CONNECTED_WALLETS_INFO } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
+import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import { getWalletProvider } from '../../functions/getWalletProvider/getWalletProvider.js';
 import { createVisit } from '../../../data/api.js';

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

@@ -11,10 +11,10 @@ require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');

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

@@ -7,10 +7,10 @@ import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
 import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';