@dynamic-labs/sdk-react-core 5.0.0-rc.0 → 5.0.0-rc.1

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

@@ -40,13 +40,6 @@ require('../../../context/DynamicContext/useDynamicContext/useDynamicContext.cjs
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 var LoadingContext = require('../../../context/LoadingContext/LoadingContext.cjs');
-var useEmbeddedWallet = require('../useEmbeddedWallet/useEmbeddedWallet.cjs');
-require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
-require('../../../context/WalletContext/WalletContext.cjs');
-require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
-require('../../functions/compareChains/compareChains.cjs');
-require('../../../context/VerificationContext/VerificationContext.cjs');
-require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 var useHandleAuthenticatedUser = require('../useHandleAuthenticatedUser/useHandleAuthenticatedUser.cjs');
 
 const sleepToShowSuccessMessage = () => utils.sleep(1500);
@@ -58,7 +51,6 @@ const useUserAuth = ({ authMethod, }) => {
     const { setErrorMessage, setError } = ErrorContext.useErrorContext();
     const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
     const handleAuthenticatedUser = useHandleAuthenticatedUser.useHandleAuthenticatedUser();
-    const { shouldAutoCreateEmbeddedWallet, shouldPromptForKeyExport, embeddedWalletSettingVersion, } = useEmbeddedWallet.useEmbeddedWallet();
     const projectSettings = useProjectSettings.useProjectSettings();
     const isVerifyResponse = (response) => response.user;
     const cancelAuth = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -66,7 +58,7 @@ const useUserAuth = ({ authMethod, }) => {
         yield handleLogOutWithReason('auth-cancelled');
         clearStackAndPushInitialView();
     }), [authMethod, clearStackAndPushInitialView, handleLogOutWithReason]);
-    const handleAuthError = React.useCallback((error, { options = {}, onError, }) => {
+    const handleAuthError = React.useCallback((error, { onError, }) => {
         var _a, _b;
         instrumentAuthLoginFailed.instrumentAuthLoginFailed(error, {
             authOrigin: 'user-auth',
@@ -101,11 +93,7 @@ const useUserAuth = ({ authMethod, }) => {
         }
         // Handle the case where the user has already an account with the email
         if (error instanceof utils.UserHasAccountWithEmailError) {
-            pushView('merge-user-accounts-with-same-email', {
-                returnToView: 'isEmailRecoveryFlow' in options && options.isEmailRecoveryFlow
-                    ? 'passkey-recovery-add-email'
-                    : undefined,
-            });
+            pushView('merge-user-accounts-with-same-email', {});
             return;
         }
         // Re-throw passkey errors so they propagate to usePromise in the UI
@@ -149,7 +137,7 @@ const useUserAuth = ({ authMethod, }) => {
         setExistentAccountData,
     ]);
     const initAuth = React.useCallback((_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ isSignIn = true, verifyFunction, onVerifySuccess, onSettled, onError, showSuccessMessage = false, skipDefaultErrorHandling = false, }) {
-        var _b, _c, _d, _e, _f;
+        var _b, _c, _d, _e, _f, _g, _h;
         logger.logger.debug('initAuth', { authMethod, isSignIn });
         try {
             // TODO: change this logic to const verifiedUser = await verifyFunction();
@@ -180,11 +168,6 @@ const useUserAuth = ({ authMethod, }) => {
             }
             setMultiWalletWidgetState('idle');
             yield handleAuthenticatedUser(verifiedUser);
-            // we should only close auth flow if no wallet is going to be created or there is no key export
-            // otherwise there will be a glitch with auth flow closing and then reopening for passkeys or export
-            const shouldCreateWallet = shouldAutoCreateEmbeddedWallet();
-            // only support export prompt on v2 and higher
-            const shouldPromptExport = shouldPromptForKeyExport();
             if (showSuccessMessage) {
                 // this timeout is set to make sure that the user will see success message
                 yield sleepToShowSuccessMessage();
@@ -192,19 +175,14 @@ const useUserAuth = ({ authMethod, }) => {
             if (isSignIn) {
                 setCallback('authSuccess');
             }
-            const walletVersion = embeddedWalletSettingVersion();
-            const userHasEmbeddedWallet = (_d = (_c = verifiedUser.verifiedCredentials) === null || _c === void 0 ? void 0 : _c.some((vc) => vc.walletProvider === sdkApiCore.WalletProviderEnum.EmbeddedWallet)) !== null && _d !== void 0 ? _d : false;
+            const walletVersion = (_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.embeddedWallets) === null || _d === void 0 ? void 0 : _d.defaultWalletVersion;
+            const userHasEmbeddedWallet = (_f = (_e = verifiedUser.verifiedCredentials) === null || _e === void 0 ? void 0 : _e.some((vc) => vc.walletProvider === sdkApiCore.WalletProviderEnum.EmbeddedWallet)) !== null && _f !== void 0 ? _f : false;
             const shouldKeepAuthFlowOpenForPasswordSetup = walletVersion === sdkApiCore.EmbeddedWalletVersionEnum.V3 &&
-                Boolean((_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _e === void 0 ? void 0 : _e.waas) === null || _f === void 0 ? void 0 : _f.passcodeRequired) &&
+                Boolean((_h = (_g = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _g === void 0 ? void 0 : _g.waas) === null || _h === void 0 ? void 0 : _h.passcodeRequired) &&
                 !userHasEmbeddedWallet;
-            if (shouldKeepAuthFlowOpenForPasswordSetup) {
-                // Keep auth flow open so setup-password can be shown (useSyncDynamicWaas)
-            }
-            else if (walletVersion === sdkApiCore.EmbeddedWalletVersionEnum.V1 &&
-                shouldCreateWallet) {
-                setShowAuthFlow(true);
-            }
-            else if (!shouldCreateWallet || !shouldPromptExport) {
+            // Keep auth flow open so setup-password can be shown (useSyncDynamicWaas);
+            // otherwise close it now that the user is authenticated.
+            if (!shouldKeepAuthFlowOpenForPasswordSetup) {
                 setShowAuthFlow(false);
             }
             onSettled === null || onSettled === void 0 ? void 0 : onSettled();
@@ -224,7 +202,6 @@ const useUserAuth = ({ authMethod, }) => {
     }), [
         authMethod,
         cancelAuth,
-        embeddedWalletSettingVersion,
         handleAuthError,
         handleAuthenticatedUser,
         projectSettings,
@@ -232,11 +209,9 @@ const useUserAuth = ({ authMethod, }) => {
         setLoading,
         setMultiWalletWidgetState,
         setShowAuthFlow,
-        shouldAutoCreateEmbeddedWallet,
-        shouldPromptForKeyExport,
         walletConnectorOptions,
     ]);
-    const handleVerifyMissingFields = React.useCallback((_g) => _tslib.__awaiter(void 0, [_g], void 0, function* ({ missingFields, isEmailVerificationRequired, isSmsVerificationRequired, }) {
+    const handleVerifyMissingFields = React.useCallback((_j) => _tslib.__awaiter(void 0, [_j], void 0, function* ({ missingFields, isEmailVerificationRequired, isSmsVerificationRequired, }) {
         if (isEmailVerificationRequired &&
             missingFields.find((field) => field.name === 'email')) {
             pushView('verify-email');
@@ -249,7 +224,7 @@ const useUserAuth = ({ authMethod, }) => {
         }
         pushView(view.type);
     }), [pushView, view === null || view === void 0 ? void 0 : view.type]);
-    const completeAuth = React.useCallback((_h) => _tslib.__awaiter(void 0, [_h], void 0, function* ({ completeSignInFlow, updateJwtFunction, onValidUpdatedJwt, options = {}, }) {
+    const completeAuth = React.useCallback((_k) => _tslib.__awaiter(void 0, [_k], void 0, function* ({ completeSignInFlow, updateJwtFunction, onValidUpdatedJwt, }) {
         logger.logger.debug('completeAuth', { authMethod });
         try {
             const { updateUserProfileResponse, isSmsVerificationRequired, isEmailVerificationRequired, missingFields, } = yield updateJwtFunction();
@@ -276,18 +251,14 @@ const useUserAuth = ({ authMethod, }) => {
                     return;
                 }
             }
-            // we should only close auth flow if no wallet is going to be created,
-            // otherwise there will be a glitch with auth flow closing and then reopening for passkeys
-            const shouldCreateWallet = shouldAutoCreateEmbeddedWallet();
-            if (!shouldCreateWallet &&
-                updatedUser.mfaBackupCodeAcknowledgement !==
-                    sdkApiCore.MfaBackupCodeAcknowledgement.Pending) {
+            if (updatedUser.mfaBackupCodeAcknowledgement !==
+                sdkApiCore.MfaBackupCodeAcknowledgement.Pending) {
                 setShowAuthFlow(false);
             }
         }
         catch (error) {
             logger.logger.debug(error);
-            handleAuthError(error, { options });
+            handleAuthError(error, {});
         }
         finally {
             setLoading(false);
@@ -300,7 +271,6 @@ const useUserAuth = ({ authMethod, }) => {
         setCallback,
         setLoading,
         setShowAuthFlow,
-        shouldAutoCreateEmbeddedWallet,
     ]);
     return {
         cancelAuth,

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

@@ -1,10 +1,9 @@
-import { CompleteUserAuthProps, InitUserAuthProps, OnErrorCallback, UseUserAuthOptions, UseUserAuthProps } from './useUserAuth.types';
+import { CompleteUserAuthProps, InitUserAuthProps, OnErrorCallback, UseUserAuthProps } from './useUserAuth.types';
 export declare const useUserAuth: <T extends keyof import("@dynamic-labs/types").AuthOptions>({ authMethod, }: UseUserAuthProps<T>) => {
     cancelAuth: () => Promise<void>;
-    completeAuth: ({ completeSignInFlow, updateJwtFunction, onValidUpdatedJwt, options, }: CompleteUserAuthProps<T>) => Promise<void>;
-    handleAuthError: <T_1 extends keyof import("@dynamic-labs/types").AuthOptions>(error: any, { options, onError, }: {
-        options?: UseUserAuthOptions[T_1] | undefined;
-        onError?: OnErrorCallback | undefined;
+    completeAuth: ({ completeSignInFlow, updateJwtFunction, onValidUpdatedJwt, }: CompleteUserAuthProps) => Promise<void>;
+    handleAuthError: (error: any, { onError, }: {
+        onError?: OnErrorCallback;
     }) => void;
     initAuth: ({ isSignIn, verifyFunction, onVerifySuccess, onSettled, onError, showSuccessMessage, skipDefaultErrorHandling, }: InitUserAuthProps<T>) => Promise<void>;
 };

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

@@ -36,13 +36,6 @@ import '../../../context/DynamicContext/useDynamicContext/useDynamicContext.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import { useLoadingContext } from '../../../context/LoadingContext/LoadingContext.js';
-import { useEmbeddedWallet } from '../useEmbeddedWallet/useEmbeddedWallet.js';
-import '../../../context/UserWalletsContext/UserWalletsContext.js';
-import '../../../context/WalletContext/WalletContext.js';
-import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
-import '../../functions/compareChains/compareChains.js';
-import '../../../context/VerificationContext/VerificationContext.js';
-import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import { useHandleAuthenticatedUser } from '../useHandleAuthenticatedUser/useHandleAuthenticatedUser.js';
 
 const sleepToShowSuccessMessage = () => sleep(1500);
@@ -54,7 +47,6 @@ const useUserAuth = ({ authMethod, }) => {
     const { setErrorMessage, setError } = useErrorContext();
     const { setExistentAccountData } = useAccountExistsContext();
     const handleAuthenticatedUser = useHandleAuthenticatedUser();
-    const { shouldAutoCreateEmbeddedWallet, shouldPromptForKeyExport, embeddedWalletSettingVersion, } = useEmbeddedWallet();
     const projectSettings = useProjectSettings();
     const isVerifyResponse = (response) => response.user;
     const cancelAuth = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
@@ -62,7 +54,7 @@ const useUserAuth = ({ authMethod, }) => {
         yield handleLogOutWithReason('auth-cancelled');
         clearStackAndPushInitialView();
     }), [authMethod, clearStackAndPushInitialView, handleLogOutWithReason]);
-    const handleAuthError = useCallback((error, { options = {}, onError, }) => {
+    const handleAuthError = useCallback((error, { onError, }) => {
         var _a, _b;
         instrumentAuthLoginFailed(error, {
             authOrigin: 'user-auth',
@@ -97,11 +89,7 @@ const useUserAuth = ({ authMethod, }) => {
         }
         // Handle the case where the user has already an account with the email
         if (error instanceof UserHasAccountWithEmailError) {
-            pushView('merge-user-accounts-with-same-email', {
-                returnToView: 'isEmailRecoveryFlow' in options && options.isEmailRecoveryFlow
-                    ? 'passkey-recovery-add-email'
-                    : undefined,
-            });
+            pushView('merge-user-accounts-with-same-email', {});
             return;
         }
         // Re-throw passkey errors so they propagate to usePromise in the UI
@@ -145,7 +133,7 @@ const useUserAuth = ({ authMethod, }) => {
         setExistentAccountData,
     ]);
     const initAuth = useCallback((_a) => __awaiter(void 0, [_a], void 0, function* ({ isSignIn = true, verifyFunction, onVerifySuccess, onSettled, onError, showSuccessMessage = false, skipDefaultErrorHandling = false, }) {
-        var _b, _c, _d, _e, _f;
+        var _b, _c, _d, _e, _f, _g, _h;
         logger.debug('initAuth', { authMethod, isSignIn });
         try {
             // TODO: change this logic to const verifiedUser = await verifyFunction();
@@ -176,11 +164,6 @@ const useUserAuth = ({ authMethod, }) => {
             }
             setMultiWalletWidgetState('idle');
             yield handleAuthenticatedUser(verifiedUser);
-            // we should only close auth flow if no wallet is going to be created or there is no key export
-            // otherwise there will be a glitch with auth flow closing and then reopening for passkeys or export
-            const shouldCreateWallet = shouldAutoCreateEmbeddedWallet();
-            // only support export prompt on v2 and higher
-            const shouldPromptExport = shouldPromptForKeyExport();
             if (showSuccessMessage) {
                 // this timeout is set to make sure that the user will see success message
                 yield sleepToShowSuccessMessage();
@@ -188,19 +171,14 @@ const useUserAuth = ({ authMethod, }) => {
             if (isSignIn) {
                 setCallback('authSuccess');
             }
-            const walletVersion = embeddedWalletSettingVersion();
-            const userHasEmbeddedWallet = (_d = (_c = verifiedUser.verifiedCredentials) === null || _c === void 0 ? void 0 : _c.some((vc) => vc.walletProvider === WalletProviderEnum.EmbeddedWallet)) !== null && _d !== void 0 ? _d : false;
+            const walletVersion = (_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.embeddedWallets) === null || _d === void 0 ? void 0 : _d.defaultWalletVersion;
+            const userHasEmbeddedWallet = (_f = (_e = verifiedUser.verifiedCredentials) === null || _e === void 0 ? void 0 : _e.some((vc) => vc.walletProvider === WalletProviderEnum.EmbeddedWallet)) !== null && _f !== void 0 ? _f : false;
             const shouldKeepAuthFlowOpenForPasswordSetup = walletVersion === EmbeddedWalletVersionEnum.V3 &&
-                Boolean((_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _e === void 0 ? void 0 : _e.waas) === null || _f === void 0 ? void 0 : _f.passcodeRequired) &&
+                Boolean((_h = (_g = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _g === void 0 ? void 0 : _g.waas) === null || _h === void 0 ? void 0 : _h.passcodeRequired) &&
                 !userHasEmbeddedWallet;
-            if (shouldKeepAuthFlowOpenForPasswordSetup) {
-                // Keep auth flow open so setup-password can be shown (useSyncDynamicWaas)
-            }
-            else if (walletVersion === EmbeddedWalletVersionEnum.V1 &&
-                shouldCreateWallet) {
-                setShowAuthFlow(true);
-            }
-            else if (!shouldCreateWallet || !shouldPromptExport) {
+            // Keep auth flow open so setup-password can be shown (useSyncDynamicWaas);
+            // otherwise close it now that the user is authenticated.
+            if (!shouldKeepAuthFlowOpenForPasswordSetup) {
                 setShowAuthFlow(false);
             }
             onSettled === null || onSettled === void 0 ? void 0 : onSettled();
@@ -220,7 +198,6 @@ const useUserAuth = ({ authMethod, }) => {
     }), [
         authMethod,
         cancelAuth,
-        embeddedWalletSettingVersion,
         handleAuthError,
         handleAuthenticatedUser,
         projectSettings,
@@ -228,11 +205,9 @@ const useUserAuth = ({ authMethod, }) => {
         setLoading,
         setMultiWalletWidgetState,
         setShowAuthFlow,
-        shouldAutoCreateEmbeddedWallet,
-        shouldPromptForKeyExport,
         walletConnectorOptions,
     ]);
-    const handleVerifyMissingFields = useCallback((_g) => __awaiter(void 0, [_g], void 0, function* ({ missingFields, isEmailVerificationRequired, isSmsVerificationRequired, }) {
+    const handleVerifyMissingFields = useCallback((_j) => __awaiter(void 0, [_j], void 0, function* ({ missingFields, isEmailVerificationRequired, isSmsVerificationRequired, }) {
         if (isEmailVerificationRequired &&
             missingFields.find((field) => field.name === 'email')) {
             pushView('verify-email');
@@ -245,7 +220,7 @@ const useUserAuth = ({ authMethod, }) => {
         }
         pushView(view.type);
     }), [pushView, view === null || view === void 0 ? void 0 : view.type]);
-    const completeAuth = useCallback((_h) => __awaiter(void 0, [_h], void 0, function* ({ completeSignInFlow, updateJwtFunction, onValidUpdatedJwt, options = {}, }) {
+    const completeAuth = useCallback((_k) => __awaiter(void 0, [_k], void 0, function* ({ completeSignInFlow, updateJwtFunction, onValidUpdatedJwt, }) {
         logger.debug('completeAuth', { authMethod });
         try {
             const { updateUserProfileResponse, isSmsVerificationRequired, isEmailVerificationRequired, missingFields, } = yield updateJwtFunction();
@@ -272,18 +247,14 @@ const useUserAuth = ({ authMethod, }) => {
                     return;
                 }
             }
-            // we should only close auth flow if no wallet is going to be created,
-            // otherwise there will be a glitch with auth flow closing and then reopening for passkeys
-            const shouldCreateWallet = shouldAutoCreateEmbeddedWallet();
-            if (!shouldCreateWallet &&
-                updatedUser.mfaBackupCodeAcknowledgement !==
-                    MfaBackupCodeAcknowledgement.Pending) {
+            if (updatedUser.mfaBackupCodeAcknowledgement !==
+                MfaBackupCodeAcknowledgement.Pending) {
                 setShowAuthFlow(false);
             }
         }
         catch (error) {
             logger.debug(error);
-            handleAuthError(error, { options });
+            handleAuthError(error, {});
         }
         finally {
             setLoading(false);
@@ -296,7 +267,6 @@ const useUserAuth = ({ authMethod, }) => {
         setCallback,
         setLoading,
         setShowAuthFlow,
-        shouldAutoCreateEmbeddedWallet,
     ]);
     return {
         cancelAuth,

package/src/lib/utils/hooks/useUserAuth/useUserAuth.types.d.ts

@@ -47,7 +47,7 @@ export type InitUserAuthProps<T extends AuthMethod> = {
      */
     options?: UseUserAuthOptions[T];
 };
-export type CompleteUserAuthProps<T extends AuthMethod> = {
+export type CompleteUserAuthProps = {
     /**
      * Optional function specific to each auth method that should be called to complete the auth flow
      * after onboarding is completed.
@@ -61,9 +61,4 @@ export type CompleteUserAuthProps<T extends AuthMethod> = {
      * Optional callback that will be called whenever updateJwtFunction completes successfuly.
      */
     onValidUpdatedJwt?: () => void;
-    /**
-     * Props specific to the auth method.
-     * (e.g. isRecoveryFlow for email auth, provider for social auth, etc.)
-     */
-    options?: UseUserAuthOptions[T];
 };

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

@@ -11,6 +11,7 @@ var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 require('../../../context/DynamicContext/useDynamicContext/useDynamicContext.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
+require('@dynamic-labs/sdk-api-core');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/iconic');
@@ -20,10 +21,8 @@ require('@dynamic-labs/wallet-book');
 var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
-require('@dynamic-labs/sdk-api-core');
 var instrumentAuthLoginFailed = require('../../../shared/utils/functions/instrumentAuthLoginFailed/instrumentAuthLoginFailed.cjs');
 require('../../../shared/consts/index.cjs');
-var errors = require('../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 var getVerifyArgs = require('../../functions/getVerifyArgs/getVerifyArgs.cjs');
@@ -36,26 +35,26 @@ var updatePrimaryWalletId = require('../../functions/updatePrimaryWalletId/updat
 var connectedWalletsInfo = require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
-require('@dynamic-labs/locale');
-var wallets = require('../../../data/api/wallets/wallets.cjs');
 require('../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
 var AccessDeniedContext = require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 var AccountExistsContext = require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
+require('@dynamic-labs/locale');
+var wallets = require('../../../data/api/wallets/wallets.cjs');
 var authMode = require('../../../store/state/authMode/authMode.cjs');
+var errors = require('../../constants/errors.cjs');
 var getSiweStatement = require('../../functions/getSiweStatement/getSiweStatement.cjs');
 require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('../../../store/state/nonce/nonce.cjs');
 require('react-dom');
-require('../../functions/compareChains/compareChains.cjs');
-require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
-var useEmbeddedWalletSessionKeys = require('../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
+require('../../functions/compareChains/compareChains.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');
 require('@dynamic-labs/types');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
+var useEmbeddedWalletSessionKeys = require('../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs');
 var useUserAuth = require('../useUserAuth/useUserAuth.cjs');
 require('yup');
 require('../../../context/MockContext/MockContext.cjs');
@@ -88,14 +87,16 @@ require('../useSubdomainCheck/useSubdomainCheck.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../useGetMfaToken/useGetMfaToken.cjs');
+require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../useWalletBackup/useWalletBackup.cjs');
 require('../useWalletBackup/BackupError.cjs');
 require('../useWalletBackup/types.cjs');
 require('../useWalletBackup/cloudProviders.cjs');
+require('@hcaptcha/react-hcaptcha');
+require('@marsidev/react-turnstile');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
-require('@hcaptcha/react-hcaptcha');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.cjs');
 require('../../../views/ExchangeWhitelistWarning/ExchangeWhitelistWarning.cjs');
@@ -111,7 +112,6 @@ require('../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
 require('../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.cjs');
-require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../widgets/DynamicWidget/views/CryptoComOnramp/CryptoComOnramp.cjs');
 require('../../../../index.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysMfaWidgetView/ManagePasskeysMfaWidgetView.cjs');

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

@@ -7,6 +7,7 @@ import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import '../../../context/DynamicContext/useDynamicContext/useDynamicContext.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
+import '@dynamic-labs/sdk-api-core';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/iconic';
@@ -16,10 +17,8 @@ import '@dynamic-labs/wallet-book';
 import { LAST_USED_WALLET } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
 import '../../constants/values.js';
-import '@dynamic-labs/sdk-api-core';
 import { instrumentAuthLoginFailed } from '../../../shared/utils/functions/instrumentAuthLoginFailed/instrumentAuthLoginFailed.js';
 import '../../../shared/consts/index.js';
-import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import { getVerifyArgs } from '../../functions/getVerifyArgs/getVerifyArgs.js';
@@ -32,26 +31,26 @@ import { updatePrimaryWalletId } from '../../functions/updatePrimaryWalletId/upd
 import { resetConnectedWalletsInfo } from '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
-import '@dynamic-labs/locale';
-import { verifyWallet, walletsVerify, linkWallet } from '../../../data/api/wallets/wallets.js';
 import '../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import { useAccessDeniedContext } from '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import { useAccountExistsContext } from '../../../context/AccountExistsContext/AccountExistsContext.js';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
+import '@dynamic-labs/locale';
+import { verifyWallet, walletsVerify, linkWallet } from '../../../data/api/wallets/wallets.js';
 import { setAuthMode, getAuthMode } from '../../../store/state/authMode/authMode.js';
+import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import { getSiweStatement } from '../../functions/getSiweStatement/getSiweStatement.js';
 import '../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import '../../../store/state/nonce/nonce.js';
 import 'react-dom';
-import '../../functions/compareChains/compareChains.js';
-import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
-import { useEmbeddedWalletSessionKeys } from '../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
 import '../../../context/ThemeContext/ThemeContext.js';
+import '../../functions/compareChains/compareChains.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';
 import '@dynamic-labs/types';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
+import { useEmbeddedWalletSessionKeys } from '../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
 import { useUserAuth } from '../useUserAuth/useUserAuth.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';
@@ -84,14 +83,16 @@ import '../useSubdomainCheck/useSubdomainCheck.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../useGetMfaToken/useGetMfaToken.js';
+import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../useWalletBackup/useWalletBackup.js';
 import '../useWalletBackup/BackupError.js';
 import '../useWalletBackup/types.js';
 import '../useWalletBackup/cloudProviders.js';
+import '@hcaptcha/react-hcaptcha';
+import '@marsidev/react-turnstile';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
-import '@hcaptcha/react-hcaptcha';
 import '../../../context/LoadingContext/LoadingContext.js';
 import '../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.js';
 import '../../../views/ExchangeWhitelistWarning/ExchangeWhitelistWarning.js';
@@ -107,7 +108,6 @@ import '../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../views/TransactionConfirmationView/TransactionConfirmationView.js';
 import '../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.js';
-import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../widgets/DynamicWidget/views/CryptoComOnramp/CryptoComOnramp.js';
 import '../../../../index.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysMfaWidgetView/ManagePasskeysMfaWidgetView.js';

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

@@ -20,7 +20,6 @@ require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 var values = require('../../constants/values.cjs');
 require('../../../shared/consts/index.cjs');
-var errors = require('../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
@@ -35,6 +34,7 @@ var useUser = require('../../../client/extension/user/useUser/useUser.cjs');
 var useProjectSettings = require('../../../client/extension/projectSettings/useProjectSettings/useProjectSettings.cjs');
 require('../../../context/DynamicContext/useDynamicContext/useDynamicContext.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
+var errors = require('../../constants/errors.cjs');
 var useDynamicWaas = require('../useDynamicWaas/useDynamicWaas.cjs');
 var useRefreshAuth = require('../useRefreshAuth/useRefreshAuth.cjs');
 var useSocialAccounts = require('../useSocialAccounts/useSocialAccounts.cjs');

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

@@ -16,7 +16,6 @@ import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import { VerifiedCredentialNameToChainEnum } from '../../constants/values.js';
 import '../../../shared/consts/index.js';
-import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
@@ -31,6 +30,7 @@ import { useUser } from '../../../client/extension/user/useUser/useUser.js';
 import { useProjectSettings } from '../../../client/extension/projectSettings/useProjectSettings/useProjectSettings.js';
 import '../../../context/DynamicContext/useDynamicContext/useDynamicContext.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
+import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import { useDynamicWaas } from '../useDynamicWaas/useDynamicWaas.js';
 import { useRefreshAuth } from '../useRefreshAuth/useRefreshAuth.js';
 import { useSocialAccounts } from '../useSocialAccounts/useSocialAccounts.js';

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

@@ -30,7 +30,6 @@ var updatePrimaryWalletId = require('../../functions/updatePrimaryWalletId/updat
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
-require('@dynamic-labs/locale');
 require('../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
 var createLinkedWalletsFromWalletOptions = require('./utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs');
 var updateUserWalletsFromLinkedWallets = require('./utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.cjs');

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

@@ -26,7 +26,6 @@ import { updatePrimaryWalletId } from '../../functions/updatePrimaryWalletId/upd
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
-import '@dynamic-labs/locale';
 import '../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
 import { updateUserWalletsFromLinkedWallets } from './utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.js';

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

@@ -21,7 +21,6 @@ var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/consts/index.cjs');
-var errors = require('../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
@@ -38,6 +37,7 @@ require('../../../context/DynamicContext/useDynamicContext/useDynamicContext.cjs
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 var waas = require('../../../data/api/waas/waas.cjs');
+var errors = require('../../constants/errors.cjs');
 var useDynamicWaas = require('../useDynamicWaas/useDynamicWaas.cjs');
 var useRefreshAuth = require('../useRefreshAuth/useRefreshAuth.cjs');
 var DelegationError = require('./DelegationError.cjs');

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

@@ -17,7 +17,6 @@ import { DELEGATION_STATE } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/consts/index.js';
-import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
@@ -34,6 +33,7 @@ import '../../../context/DynamicContext/useDynamicContext/useDynamicContext.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
 import { updateWaasWalletSettings } from '../../../data/api/waas/waas.js';
+import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import { useDynamicWaas } from '../useDynamicWaas/useDynamicWaas.js';
 import { useRefreshAuth } from '../useRefreshAuth/useRefreshAuth.js';
 import { DelegationError } from './DelegationError.js';

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

@@ -31,7 +31,6 @@ var updatePrimaryWalletId = require('../../functions/updatePrimaryWalletId/updat
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
-require('@dynamic-labs/locale');
 require('../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
 var authMode = require('../../../store/state/authMode/authMode.cjs');
 

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

@@ -27,7 +27,6 @@ import { updatePrimaryWalletId } from '../../functions/updatePrimaryWalletId/upd
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
-import '@dynamic-labs/locale';
 import '../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import { getAuthMode } from '../../../store/state/authMode/authMode.js';
 

package/src/lib/utils/hooks/useWalletItemActions/useHandleWalletItem/useHandleWalletItem.cjs

@@ -171,13 +171,14 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
     };
     const handleWalletItemClick = (wallet) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const { walletConnector, isInstalledOnBrowser } = wallet;
+        // MetaMask SDK sets canHandleMultipleConnections=false for mobile/QR flows,
+        // but when the extension is installed on desktop it handles multiple
+        // connections natively — skip the session teardown in that case.
+        const isMetaMaskExtensionInstalled = walletConnector.key.startsWith('metamask') && isInstalledOnBrowser;
         const shouldEndWalletConnectorSession = walletConnector.connectedChain === 'FLOW' ||
             walletConnectorCore.isPhantomRedirectConnector(walletConnector) ||
-            // because some wallet connectors only supports one connection at a time,
-            // we need to end the session (disconnect) when the user selects
-            // a different wallet to connect with
-            // a new connection is established a few steps further down
-            !walletConnector.canHandleMultipleConnections;
+            (!walletConnector.canHandleMultipleConnections &&
+                !isMetaMaskExtensionInstalled);
         logger.logger.logVerboseTroubleshootingMessage('[handleWalletItemClick]', {
             mockedSDK,
             shouldEndWalletConnectorSession,