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

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

@@ -1,7 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useRef, useCallback, useEffect } from 'react';
-import { EmbeddedWalletException } from '@dynamic-labs/utils';
+import { useCallback, useEffect } from 'react';
 import { getDynamicClient } from '../../../client/client.js';
 import '../../../context/DynamicContext/useDynamicContext/useDynamicContext.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
@@ -13,6 +12,7 @@ import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
+import '@dynamic-labs/utils';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import '@dynamic-labs/sdk-api-core';
@@ -32,14 +32,9 @@ import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
+import { reconcilePrimaryWallet } from '../../functions/reconcilePrimaryWallet/reconcilePrimaryWallet.js';
 import { useInternalDynamicEvents } from '../events/useDynamicEvents/useDynamicEvents.js';
 import { useEmbeddedReveal } from '../useEmbeddedReveal/useEmbeddedReveal.js';
-import { useEmbeddedWallet } from '../useEmbeddedWallet/useEmbeddedWallet.js';
-import '../../../context/UserWalletsContext/UserWalletsContext.js';
-import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
-import '../../functions/compareChains/compareChains.js';
-import '../../../context/VerificationContext/VerificationContext.js';
-import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 
 let acknowledgedExportPrompt = false;
 const useSyncEmbeddedWalletFlow = () => {
@@ -48,45 +43,48 @@ const useSyncEmbeddedWalletFlow = () => {
     const { loading: globalLoading } = useLoadingContext();
     const { initExportProcess } = useEmbeddedReveal();
     const [wasShownExportPrompt, setWasShownExportPrompt] = useLocalStorage(`dynamic_export_prompt-${contextUser === null || contextUser === void 0 ? void 0 : contextUser.userId}`, false, (data) => Boolean(data));
-    const { createEmbeddedWallet, shouldAutoCreateEmbeddedWallet, shouldPromptForKeyExport, } = useEmbeddedWallet();
-    const triggeredCreate = useRef(false);
     const handleAcknowledgeExportPrompt = useCallback((value = true) => {
         acknowledgedExportPrompt = value;
         setWasShownExportPrompt(value);
     }, [setWasShownExportPrompt]);
     useInternalDynamicEvents('logout', () => {
-        triggeredCreate.current = false;
         acknowledgedExportPrompt = false;
     });
-    // this is used to trigger createEmbeddedWallet
-    // when user didn't create a passkey after login,
-    // we force them to created it before they can use the app
+    // Prompts the user to export their legacy embedded wallet key when the
+    // project is configured to prompt for key export.
     // ** It must be an useEffect because some of the dependencies are async
     useEffect(() => {
+        var _a, _b;
         // Explanation: if the user just logged out, the user from the hook might still be set
         // but the client will be null.
         // And if the user is not onboarding complete yet, the hook won't be set even though the client.user is set.
         // This is why we check for the user AND the client.user.
         const user = contextUser && getDynamicClient().user;
+        // Legacy wallet creation used to set the primary wallet as a side-effect on
+        // login. That path is gone in v5, so reconcile the primary wallet here from
+        // the user's verified credentials on login/session restore. No wallet is
+        // created — this only selects the primary wallet.
+        const clientUser = getDynamicClient().user;
+        if (clientUser === null || clientUser === void 0 ? void 0 : clientUser.verifiedCredentials) {
+            reconcilePrimaryWallet(clientUser);
+        }
+        if (wasShownExportPrompt && !acknowledgedExportPrompt) {
+            acknowledgedExportPrompt = true;
+        }
+        const shouldPromptKeyExport = Boolean((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.promptForKeyExport);
+        const shouldSyncPromptKeyExport = shouldPromptKeyExport && !acknowledgedExportPrompt;
+        if (!shouldSyncPromptKeyExport ||
+            !user ||
+            !projectSettings ||
+            !walletConnectorOptions.length || // no connectors to use for the embedded wallet
+            isLoadingEmbeddedWallet || // already has a wallet
+            globalLoading // this will be true if auth is in progress
+        ) {
+            return;
+        }
         const syncEmbeddedWallet = () => __awaiter(void 0, void 0, void 0, function* () {
             const isNewUser = user === null || user === void 0 ? void 0 : user.newUser;
-            if (shouldSyncCreateWallet) {
-                triggeredCreate.current = true;
-                try {
-                    yield createEmbeddedWallet();
-                }
-                catch (error) {
-                    if (error instanceof EmbeddedWalletException) {
-                        logger.debug('[useSyncEmbeddedWalletFlow][EmbeddedWalletException] Error creating embedded wallet', error);
-                    }
-                    else {
-                        logger.error('[useSyncEmbeddedWalletFlow] Error creating embedded wallet', error);
-                    }
-                    setShowAuthFlow(false);
-                }
-            }
-            if (shouldSyncPromptKeyExport &&
-                isNewUser &&
+            if (isNewUser &&
                 findEmbeddedWalletFromVerifiedCredentials(user) &&
                 primaryWallet) {
                 try {
@@ -99,42 +97,22 @@ const useSyncEmbeddedWalletFlow = () => {
                 }
             }
         });
-        const shouldCreateWallet = shouldAutoCreateEmbeddedWallet();
-        const shouldSyncCreateWallet = shouldCreateWallet && !triggeredCreate.current;
-        if (wasShownExportPrompt && !acknowledgedExportPrompt)
-            acknowledgedExportPrompt = true;
-        const shouldPromptKeyExport = shouldPromptForKeyExport();
-        const shouldSyncPromptKeyExport = shouldPromptKeyExport && !acknowledgedExportPrompt;
-        const shouldSyncEmbeddedWallet = shouldSyncCreateWallet || shouldSyncPromptKeyExport;
-        if (!shouldSyncEmbeddedWallet ||
-            !user ||
-            !projectSettings ||
-            !walletConnectorOptions.length || // no connectors to use for the embedded wallet
-            isLoadingEmbeddedWallet || // already has a wallet
-            globalLoading // this will be true if auth is in progress
-        ) {
-            return;
-        }
         syncEmbeddedWallet();
     }, [
         contextUser,
         projectSettings,
         primaryWalletId,
-        createEmbeddedWallet,
         isLoadingEmbeddedWallet,
         walletConnectorOptions,
         globalLoading,
-        shouldAutoCreateEmbeddedWallet,
         setShowAuthFlow,
         initExportProcess,
         primaryWallet,
-        shouldPromptForKeyExport,
         setWasShownExportPrompt,
         handleAcknowledgeExportPrompt,
         wasShownExportPrompt,
     ]);
     return {
-        acknowledgedExportPrompt,
         handleAcknowledgeExportPrompt,
     };
 };

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

@@ -46,9 +46,8 @@ require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../store/state/authMode/authMode.cjs');
 require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('react-dom');
-require('../../functions/compareChains/compareChains.cjs');
-require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
+require('../../functions/compareChains/compareChains.cjs');
 require('bs58');
 require('@dynamic-labs/types');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
@@ -82,6 +81,7 @@ 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');
@@ -106,7 +106,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/useSyncOnboardingFlow/useSyncOnboardingFlow.js

@@ -42,9 +42,8 @@ import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../store/state/authMode/authMode.js';
 import '../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import 'react-dom';
-import '../../functions/compareChains/compareChains.js';
-import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../context/ThemeContext/ThemeContext.js';
+import '../../functions/compareChains/compareChains.js';
 import 'bs58';
 import '@dynamic-labs/types';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
@@ -78,6 +77,7 @@ 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';
@@ -102,7 +102,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/useTelegramLogin/useTelegramLogin.cjs

@@ -6,8 +6,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 require('../../constants/values.cjs');
-require('@dynamic-labs/utils');
 require('@dynamic-labs/multi-wallet');
+require('@dynamic-labs/utils');
 var logger = require('../../../shared/logger.cjs');
 require('react-international-phone');
 require('../../constants/colors.cjs');

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

@@ -2,8 +2,8 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { ProviderEnum } from '@dynamic-labs/sdk-api-core';
 import '../../constants/values.js';
-import '@dynamic-labs/utils';
 import '@dynamic-labs/multi-wallet';
+import '@dynamic-labs/utils';
 import { logger } from '../../../shared/logger.js';
 import 'react-international-phone';
 import '../../constants/colors.js';

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

@@ -20,7 +20,6 @@ require('@dynamic-labs/wallet-book');
 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');
@@ -40,6 +39,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 var balances = require('../../../data/api/chains/balances.cjs');
 var authMode = require('../../../store/state/authMode/authMode.cjs');
 var tokenBalances = require('../../../store/state/tokenBalances.cjs');
+var errors = require('../../constants/errors.cjs');
 var useDynamicEvents = require('../events/useDynamicEvents/useDynamicEvents.cjs');
 var utils = require('./utils.cjs');
 

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

@@ -16,7 +16,6 @@ import '@dynamic-labs/wallet-book';
 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';
@@ -36,6 +35,7 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 import { getAccountTokenBalances } from '../../../data/api/chains/balances.js';
 import { getAuthMode } from '../../../store/state/authMode/authMode.js';
 import { useTokenBalancesState, setTokenBalanceVariable } from '../../../store/state/tokenBalances.js';
+import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import { useInternalDynamicEvents } from '../events/useDynamicEvents/useDynamicEvents.js';
 import { resolveNetworkIdForRequest, getTokenBalanceErrorMessage } from './utils.js';
 

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

@@ -20,7 +20,6 @@ require('@dynamic-labs/wallet-book');
 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');
 var getVerifyArgs = require('../../functions/getVerifyArgs/getVerifyArgs.cjs');
@@ -29,14 +28,14 @@ var updatePrimaryWalletId = require('../../functions/updatePrimaryWalletId/updat
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 var dynamicContextProps = 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');
 require('../../../events/dynamicEvents.cjs');
 var useOnboardingCompleteUser = require('../../../client/extension/user/useOnboardingCompleteUser/useOnboardingCompleteUser.cjs');
 require('../../../context/DynamicContext/useDynamicContext/useDynamicContext.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
+var wallets = require('../../../data/api/wallets/wallets.cjs');
+var errors = require('../../constants/errors.cjs');
 
 const useTransferWallet = () => {
     const user = useOnboardingCompleteUser.useOnboardingCompleteUser();

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

@@ -16,7 +16,6 @@ import '@dynamic-labs/wallet-book';
 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 { getVerifyArgs } from '../../functions/getVerifyArgs/getVerifyArgs.js';
@@ -25,14 +24,14 @@ import { updatePrimaryWalletId } from '../../functions/updatePrimaryWalletId/upd
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import { useDynamicSettings, useEnvironmentId } from '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
-import '@dynamic-labs/locale';
-import { transferWallet } from '../../../data/api/wallets/wallets.js';
 import '../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import '../../../events/dynamicEvents.js';
 import { useOnboardingCompleteUser } from '../../../client/extension/user/useOnboardingCompleteUser/useOnboardingCompleteUser.js';
 import '../../../context/DynamicContext/useDynamicContext/useDynamicContext.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
+import { transferWallet } from '../../../data/api/wallets/wallets.js';
+import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 
 const useTransferWallet = () => {
     const user = useOnboardingCompleteUser();

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,