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

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

@@ -1,33 +1,33 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { isEmailWalletConnector, isEmailOTPWalletConnector, isBloctoConnector } from '@dynamic-labs/wallet-connector-core';
-import { showPendingConnectView } from '../helpers/showPendingConnectView.js';
-import { isConnectOnly } from '../helpers/isConnectOnly.js';
+import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
-import { useViewContext } from '../../../../context/ViewContext/ViewContext.js';
 import { useErrorContext } from '../../../../context/ErrorContext/ErrorContext.js';
+import { useViewContext } from '../../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../../shared/logger.js';
 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';
-import { useHandleWalletsToConnect } from '../../useHandleWalletsToConnect/useHandleWalletsToConnect.js';
 import '@dynamic-labs/multi-wallet';
-import { isSupportedNetwork } from '../../../functions/isSupportedNetwork/isSupportedNetwork.js';
 import { isProgrammableNetworkSwitchSupported } from '../../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.js';
+import { isSupportedNetwork } from '../../../functions/isSupportedNetwork/isSupportedNetwork.js';
+import { useHandleWalletsToConnect } from '../../useHandleWalletsToConnect/useHandleWalletsToConnect.js';
+import { useVerifyWallet } from '../../useVerifyWallet/useVerifyWallet.js';
+import { showPendingConnectView } from '../helpers/showPendingConnectView.js';
+import { isConnectOnly } from '../helpers/isConnectOnly.js';
 
 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 {
@@ -51,22 +78,32 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                     setView('wait-for-email-confirmation-view');
                 }
             }
-            const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts, shouldCallCallback);
-            if (!publicWalletAddress) {
+            const connectionResult = yield connectWallet(walletConnector, fetchPublicAddressOpts, shouldCallCallback);
+            if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
+            const { address, id } = connectionResult;
             const walletNetwork = yield walletConnector.getNetwork();
+            // When we switch networks on MM/walletconnect, it breaks the flow and doesn't always display the sign message
+            // Since it the network doesn't matter for the sign, we don't need to force the user to switch to the supported
+            // network at this stage and they can switch when doing a transaction
+            // Note: not checking specifically for MM since user can choose walletconnect connector to use with MM
+            const shouldForceSupportedNetwork = !walletConnector.isWalletConnect;
             const usesSupportedNetwork = isSupportedNetwork({
                 network: walletNetwork,
                 walletConnector,
             });
             if (!usesSupportedNetwork) {
-                if (isProgrammableNetworkSwitchSupported(walletConnector)) {
+                if (!isProgrammableNetworkSwitchSupported(walletConnector)) {
+                    return setView('network-not-supported-manual');
+                }
+                if (shouldForceSupportedNetwork) {
                     return setView('network-not-supported');
                 }
-                return setView('network-not-supported-manual');
             }
-            setCallback('connectSuccess');
+            setCallback('connectSuccess', {
+                walletId: id,
+            });
             if (isConnectOnly(user, authMode)) {
                 LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.key);
                 if (shouldUpdateWallets) {
@@ -75,34 +112,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, address, 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, address, 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({
@@ -48,15 +48,23 @@ const useConnectAndSignSplitSteps = () => {
         setIsVerificationInProgress(true);
         yield showPendingConnectView.showPendingConnectView(walletConnector, setView);
         try {
-            yield connectWallet(walletConnector, fetchPublicAddressOpts);
-            setCallback('connectSuccess');
+            const connectionResult = yield connectWallet(walletConnector, fetchPublicAddressOpts);
+            setCallback('connectSuccess', {
+                walletId: connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.id,
+            });
             if (isConnectOnly.isConnectOnly(user, authMode)) {
                 localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.key);
                 handleWalletsToConnect({ walletConnector });
                 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);
@@ -76,13 +84,13 @@ const useConnectAndSignSplitSteps = () => {
         // Raise verification ongoing flag
         setIsVerificationInProgress(true);
         try {
-            const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
-            if (!publicWalletAddress) {
+            const connectionResult = yield connectWallet(walletConnector, fetchPublicAddressOpts);
+            if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
             yield verifyWallet({
-                captchaToken,
-                publicWalletAddress,
+                captchaToken: getCaptchaToken(),
+                publicWalletAddress: connectionResult.address,
                 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({
@@ -44,15 +44,23 @@ const useConnectAndSignSplitSteps = () => {
         setIsVerificationInProgress(true);
         yield showPendingConnectView(walletConnector, setView);
         try {
-            yield connectWallet(walletConnector, fetchPublicAddressOpts);
-            setCallback('connectSuccess');
+            const connectionResult = yield connectWallet(walletConnector, fetchPublicAddressOpts);
+            setCallback('connectSuccess', {
+                walletId: connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.id,
+            });
             if (isConnectOnly(user, authMode)) {
                 LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.key);
                 handleWalletsToConnect({ walletConnector });
                 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);
@@ -72,13 +80,13 @@ const useConnectAndSignSplitSteps = () => {
         // Raise verification ongoing flag
         setIsVerificationInProgress(true);
         try {
-            const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
-            if (!publicWalletAddress) {
+            const connectionResult = yield connectWallet(walletConnector, fetchPublicAddressOpts);
+            if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
             yield verifyWallet({
-                captchaToken,
-                publicWalletAddress,
+                captchaToken: getCaptchaToken(),
+                publicWalletAddress: connectionResult.address,
                 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,17 +43,18 @@ 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
             // We just need to verify it
-            const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
-            if (!publicWalletAddress) {
+            const connectionResult = yield connectWallet(walletConnector, fetchPublicAddressOpts);
+            if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
             yield verifyWallet({
-                publicWalletAddress,
+                captchaToken: getCaptchaToken(),
+                publicWalletAddress: connectionResult.address,
                 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,17 +39,18 @@ 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
             // We just need to verify it
-            const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
-            if (!publicWalletAddress) {
+            const connectionResult = yield connectWallet(walletConnector, fetchPublicAddressOpts);
+            if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
             yield verifyWallet({
-                publicWalletAddress,
+                captchaToken: getCaptchaToken(),
+                publicWalletAddress: connectionResult.address,
                 walletConnector,
             });
         }

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

@@ -1,43 +1,44 @@
-export { useFetchProjectSettings } from './useFetchProjectSettings';
-export { useFetchNonce } from './useFetchNonce';
-export { useWallets } from './useWallets';
-export { useWalletConnectors } from './useWalletConnectors';
-export { useVerifyWallet } from './useVerifyWallet';
-export { useKeyboardHeight } from './useKeyboardHeight';
-export { useElementById } from './useElementById';
-export { useResizeObserver } from './useResizeObserver';
-export { useIsFirstRender } from './useIsFirstRender';
-export { useUpdateEffect } from './useUpdateEffect';
-export { useTransition } from './useTransition';
-export { usePrevious } from './usePrevious';
+export { useAuthenticateConnectedUser } from './useAuthenticateConnectedUser';
+export { useColorSchemePreference } from './useColorSchemePreference';
 export { useConfirmationModal } from './useConfirmationModal';
-export { useWalletUiUtils } from './useWalletUiUtils';
-export { useForceUpdate } from './useForceUpdate';
-export { useKYCFlag } from './useKYCFlag';
-export { useMultiWalletFlag } from './useMultiWalletFlag';
+export { useCountdown } from './useCountdown/useCountdown';
+export * from './useCreateDynamicEmbeddedWalletMutation';
 export { useDefaultQrCode } from './useDefaultQrCode';
-export { useWalletItemActions } from './useWalletItemActions';
-export { usePromise } from './usePromise';
-export { useMutation } from './useMutation';
-export { useColorSchemePreference } from './useColorSchemePreference';
+export { useDynamicScopes } from './useDynamicScopes';
+export { useElementById } from './useElementById';
+export { useEmbeddedWallet } from './useEmbeddedWallet';
+export { useEventListener } from './useEventListener';
+export { useFetchNonce } from './useFetchNonce';
+export { useFetchProjectSettings } from './useFetchProjectSettings';
 export { useFindSocialIcon } from './useFindSocialIcon';
+export { useForceUpdate } from './useForceUpdate';
 export { useIconThemeVariant } from './useIconThemeVariant';
 export type { IconThemeVariant } from './useIconThemeVariant';
+export { useInterval } from './useInterval/useInterval';
+export { useIsFirstRender } from './useIsFirstRender';
+export * from './useIsLoggedIn';
 export { useIsomorphicLayoutEffect } from './useIsomorphicLayoutEffect/useIsomorphicLayoutEffect';
+export { useKYCFlag } from './useKYCFlag';
+export { useKeyboardHeight } from './useKeyboardHeight';
+export { useMutation } from './useMutation';
+export * from './useOnUnmount';
+export { usePasskeyRecovery } from './usePasskeyRecovery';
+export { usePrevious } from './usePrevious';
+export { usePromise } from './usePromise';
+export { useResizeObserver } from './useResizeObserver';
+export { useSetWalletConnectorVerifiedCredentials } from './useSetWalletConnectorVerifiedCredentials';
+export { useSocialAccounts } from './useSocialAccounts';
 export { useTimeout } from './useTimeout/useTimeout';
-export { useInterval } from './useInterval/useInterval';
-export { useCountdown } from './useCountdown/useCountdown';
-export { useValidateSession } from './useValidateSession';
-export { useEventListener } from './useEventListener';
-export { useWalletConnectorEvent } from './useWalletConnectorEvent';
-export { useTransactionWithGasPrice } from './useTransactionWithGasPrice';
 export { useTransactionEstimatedGas } from './useTransactionEstimatedGas';
-export { useDynamicScopes } from './useDynamicScopes';
-export { useAuthenticateConnectedUser } from './useAuthenticateConnectedUser';
-export { useSocialAccounts } from './useSocialAccounts';
-export * from './useUserUpdateRequest';
+export { useTransactionWithGasPrice } from './useTransactionWithGasPrice';
+export { useTransition } from './useTransition';
+export { useUpdateEffect } from './useUpdateEffect';
 export * from './useUserDataForm';
-export * from './useOnUnmount';
-export { useSetWalletConnectorVerifiedCredentials } from './useSetWalletConnectorVerifiedCredentials';
-export { useEmbeddedWallet } from './useEmbeddedWallet';
-export * from './useIsLoggedIn';
+export * from './useUserUpdateRequest';
+export { useValidateSession } from './useValidateSession';
+export { useVerifyWallet } from './useVerifyWallet';
+export { useWalletConnectorEvent } from './useWalletConnectorEvent';
+export { useWalletConnectorOptions } from './useWalletConnectorOptions';
+export { useWalletConnectors } from './useWalletConnectors';
+export { useWalletItemActions } from './useWalletItemActions';
+export { useWalletUiUtils } from './useWalletUiUtils';

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, 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,11 +30,14 @@ 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;
             }
             setPrimaryWallet(connectedSecondaryWallet.id);
-            computeConnectedStateForWallets();
             return;
         }
         if (showWidgetStatePopup) {
@@ -48,7 +51,6 @@ const useSyncPrimaryWallet = (canSync = true) => {
             walletConnectorCore.isSameAddress(wallet.address, connectedAddress, wallet.chain));
         if (connectedWallet) {
             setPrimaryWallet(connectedWallet.id);
-            computeConnectedStateForWallets();
             return;
         }
         setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
@@ -59,7 +61,6 @@ const useSyncPrimaryWallet = (canSync = true) => {
         showWidgetStatePopup,
         setMultiWalletWidgetState,
         setPrimaryWallet,
-        computeConnectedStateForWallets,
         setShowWidgetStatePopup,
         connectWallet,
     ]);
@@ -88,7 +89,6 @@ const useSyncPrimaryWallet = (canSync = true) => {
             const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected);
             if (connectedSecondaryWallet) {
                 setPrimaryWallet(connectedSecondaryWallet.id);
-                computeConnectedStateForWallets();
                 return;
             }
             // user is logged in (has valid jwt), but no wallet is connected
@@ -110,7 +110,6 @@ const useSyncPrimaryWallet = (canSync = true) => {
         secondaryWallets,
         multiWalletWidgetState,
         setMultiWalletWidgetState,
-        computeConnectedStateForWallets,
         handlePrimaryWalletNotActive,
         handleLogOut,
         setPrimaryWallet,

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, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showLockedWalletView, showWidgetStatePopup, setSelectedWalletWithAction, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const handlePrimaryWalletNotActive = useCallback((connectedAddress) => {
         if (!primaryWallet)
@@ -26,11 +26,14 @@ 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;
             }
             setPrimaryWallet(connectedSecondaryWallet.id);
-            computeConnectedStateForWallets();
             return;
         }
         if (showWidgetStatePopup) {
@@ -44,7 +47,6 @@ const useSyncPrimaryWallet = (canSync = true) => {
             isSameAddress(wallet.address, connectedAddress, wallet.chain));
         if (connectedWallet) {
             setPrimaryWallet(connectedWallet.id);
-            computeConnectedStateForWallets();
             return;
         }
         setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
@@ -55,7 +57,6 @@ const useSyncPrimaryWallet = (canSync = true) => {
         showWidgetStatePopup,
         setMultiWalletWidgetState,
         setPrimaryWallet,
-        computeConnectedStateForWallets,
         setShowWidgetStatePopup,
         connectWallet,
     ]);
@@ -84,7 +85,6 @@ const useSyncPrimaryWallet = (canSync = true) => {
             const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected);
             if (connectedSecondaryWallet) {
                 setPrimaryWallet(connectedSecondaryWallet.id);
-                computeConnectedStateForWallets();
                 return;
             }
             // user is logged in (has valid jwt), but no wallet is connected
@@ -106,7 +106,6 @@ const useSyncPrimaryWallet = (canSync = true) => {
         secondaryWallets,
         multiWalletWidgetState,
         setMultiWalletWidgetState,
-        computeConnectedStateForWallets,
         handlePrimaryWalletNotActive,
         handleLogOut,
         setPrimaryWallet,

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

@@ -11,18 +11,18 @@ 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');
 var useConnectAndSign = require('../../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');
-require('../../../../config/ApiEndpoint.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../../../config/ApiEndpoint.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../context/EmailVerificationContext/EmailVerificationContext.cjs');