@dynamic-labs/sdk-react-core 2.1.0-alpha.3 → 2.1.0-alpha.5

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useTurnkey/useTurnkey.cjs

@@ -40,6 +40,8 @@ require('react-dom');
 var useCreateDynamicEmbeddedWalletMutation = require('../../../useCreateDynamicEmbeddedWalletMutation/useCreateDynamicEmbeddedWalletMutation.cjs');
 require('../../../../../context/WalletContext/WalletContext.cjs');
 var smartWallet = require('../../../useWalletConnectors/utils/smartWallet/smartWallet.cjs');
+var findPrimaryEmbeddedChain = require('../../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
+var findPasskeyEmailWalletConnector = require('../../../../../views/Passkey/utils/findPasskeyEmailWalletConnector/findPasskeyEmailWalletConnector.cjs');
 require('../../../../../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
 require('yup');
@@ -160,26 +162,46 @@ const useTurnkey = () => {
         return Promise.resolve(passkeyWallet);
     }), [setPrimaryWalletId, walletConnectorOptions]);
     const createTurnkeyWallet = React.useCallback((jwt, decodedJwt, chain) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f;
+        var _e, _f, _g, _h;
         const isManualMode = ((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation) === false;
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt, chain);
-        const userWaletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(jwt);
+        const userWalletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(jwt);
         // If the user doesn't have a wallet, or if the customer is in Manual
         // Mode, we should attempt to create a new wallet. Note that if in manual
         // mode, the check for the existance of an embedded wallet was arbitrarily
         // added as a safeguard given the pre-existing condition we're overriding.
-        if (!(userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.length) ||
+        if (!(userWalletsCredentials === null || userWalletsCredentials === void 0 ? void 0 : userWalletsCredentials.length) ||
             (!embeddedWalletVerifiedCredential && isManualMode)) {
             const hasEmailVC = getUserVerifiedCredentialType.getUserVerifiedCredentialType(decodedJwt, sdkApiCore.JwtVerifiedCredentialFormatEnum.Email);
-            // create wallet without authenticator
-            // if users log in and doesn't have an email vc they won't be able to use passkey recovery
-            // and it means that they need to create it while creating a wallet
             if (!((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.forceAuthenticatorAtSignup) &&
-                Boolean(hasEmailVC)) {
+                hasEmailVC) {
                 return startPregeneratedWalletCreationFlow(jwt, decodedJwt);
             }
-            // show the passkey view to create an embedded wallet
-            return startEmbeddedWalletCreationFlow();
+            else {
+                // show the passkey view to create an embedded wallet
+                return startEmbeddedWalletCreationFlow();
+            }
+        }
+        else {
+            // the pregenerated wallet must have been created at this point in the
+            // backend if this called as part of a new user sign up.
+            if (embeddedWalletVerifiedCredential &&
+                decodedJwt.newUser &&
+                ((_g = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _g === void 0 ? void 0 : _g.automaticEmbeddedWalletCreation)) {
+                const walletConnector = findPasskeyEmailWalletConnector.findPasskeyEmailWalletConnector(walletConnectorOptions, findPrimaryEmbeddedChain.findPrimaryEmbeddedChain(projectSettings));
+                if (!walletConnector) {
+                    throw new Error('Could not find the Embedded wallet connector');
+                }
+                const wallet = {
+                    address: (yield walletConnector.getAddress()) || '',
+                    authenticated: Boolean((_h = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _h === void 0 ? void 0 : _h.isAuthenticatorAttached),
+                    chain: walletConnector.connectedChain || '',
+                    connected: true,
+                    connector: walletConnector,
+                    id: embeddedWalletVerifiedCredential.id,
+                };
+                dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, jwt);
+            }
         }
         setShowAuthFlow(false, { performMultiWalletChecks: false });
         // if user logged in with MM for example, just continue the flow

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useTurnkey/useTurnkey.js

@@ -36,6 +36,8 @@ import 'react-dom';
 import { useCreateDynamicEmbeddedWalletMutation } from '../../../useCreateDynamicEmbeddedWalletMutation/useCreateDynamicEmbeddedWalletMutation.js';
 import '../../../../../context/WalletContext/WalletContext.js';
 import { findSmartWallet, initializeSmartWallet } from '../../../useWalletConnectors/utils/smartWallet/smartWallet.js';
+import { findPrimaryEmbeddedChain } from '../../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
+import { findPasskeyEmailWalletConnector } from '../../../../../views/Passkey/utils/findPasskeyEmailWalletConnector/findPasskeyEmailWalletConnector.js';
 import '../../../../../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
 import 'yup';
@@ -156,26 +158,46 @@ const useTurnkey = () => {
         return Promise.resolve(passkeyWallet);
     }), [setPrimaryWalletId, walletConnectorOptions]);
     const createTurnkeyWallet = useCallback((jwt, decodedJwt, chain) => __awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f;
+        var _e, _f, _g, _h;
         const isManualMode = ((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation) === false;
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt, chain);
-        const userWaletsCredentials = getUserWalletsFromVerifiedCredentials(jwt);
+        const userWalletsCredentials = getUserWalletsFromVerifiedCredentials(jwt);
         // If the user doesn't have a wallet, or if the customer is in Manual
         // Mode, we should attempt to create a new wallet. Note that if in manual
         // mode, the check for the existance of an embedded wallet was arbitrarily
         // added as a safeguard given the pre-existing condition we're overriding.
-        if (!(userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.length) ||
+        if (!(userWalletsCredentials === null || userWalletsCredentials === void 0 ? void 0 : userWalletsCredentials.length) ||
             (!embeddedWalletVerifiedCredential && isManualMode)) {
             const hasEmailVC = getUserVerifiedCredentialType(decodedJwt, JwtVerifiedCredentialFormatEnum.Email);
-            // create wallet without authenticator
-            // if users log in and doesn't have an email vc they won't be able to use passkey recovery
-            // and it means that they need to create it while creating a wallet
             if (!((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.forceAuthenticatorAtSignup) &&
-                Boolean(hasEmailVC)) {
+                hasEmailVC) {
                 return startPregeneratedWalletCreationFlow(jwt, decodedJwt);
             }
-            // show the passkey view to create an embedded wallet
-            return startEmbeddedWalletCreationFlow();
+            else {
+                // show the passkey view to create an embedded wallet
+                return startEmbeddedWalletCreationFlow();
+            }
+        }
+        else {
+            // the pregenerated wallet must have been created at this point in the
+            // backend if this called as part of a new user sign up.
+            if (embeddedWalletVerifiedCredential &&
+                decodedJwt.newUser &&
+                ((_g = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _g === void 0 ? void 0 : _g.automaticEmbeddedWalletCreation)) {
+                const walletConnector = findPasskeyEmailWalletConnector(walletConnectorOptions, findPrimaryEmbeddedChain(projectSettings));
+                if (!walletConnector) {
+                    throw new Error('Could not find the Embedded wallet connector');
+                }
+                const wallet = {
+                    address: (yield walletConnector.getAddress()) || '',
+                    authenticated: Boolean((_h = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _h === void 0 ? void 0 : _h.isAuthenticatorAttached),
+                    chain: walletConnector.connectedChain || '',
+                    connected: true,
+                    connector: walletConnector,
+                    id: embeddedWalletVerifiedCredential.id,
+                };
+                dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, jwt);
+            }
         }
         setShowAuthFlow(false, { performMultiWalletChecks: false });
         // if user logged in with MM for example, just continue the flow

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

@@ -21,6 +21,11 @@ require('../../../../../_virtual/_tslib.cjs');
 require('../../../config/ApiEndpoint.cjs');
 var settings = require('../../../data/api/settings/settings.cjs');
 require('../../../locale/locale.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
+require('viem');
+require('viem/chains');
+var serializeWalletConnectors = require('../../functions/serializeWalletConnectors/serializeWalletConnectors.cjs');
 
 const useSendDynamicProps = ({ settings: settings$1, environmentId, }) => {
     useEffectOnce.useEffectOnce(() => {
@@ -32,7 +37,7 @@ const useSendDynamicProps = ({ settings: settings$1, environmentId, }) => {
             settings: Object.assign(Object.assign({}, settings$1), { customPrivacyPolicy: Boolean(settings$1.customPrivacyPolicy), customTermsOfServices: Boolean(settings$1.customTermsOfServices), policiesConsentInnerComponent: Boolean(settings$1.policiesConsentInnerComponent) }),
         };
         const serializedEventsCallbacks = serializeEventsCallbacks(settings$1.events);
-        const serializedWalletConnectors = serializeWalletConnectors(settings$1.walletConnectors);
+        const serializedWalletConnectors = serializeWalletConnectors.serializeWalletConnectors(settings$1.walletConnectors);
         const serializedDynamicContextProps = Object.assign(Object.assign({}, updatedDynamicProps), { settings: Object.assign(Object.assign({}, updatedDynamicProps.settings), { events: serializedEventsCallbacks, walletConnectors: serializedWalletConnectors }) });
         settings.sendDynamicProps(environmentId, {
             dynamicContextProps: serializedDynamicContextProps,
@@ -58,17 +63,6 @@ const serializeEventsCallbacks = (events) => {
         return undefined;
     }
 };
-const serializeWalletConnectors = (walletConnectors) => {
-    try {
-        if (!walletConnectors)
-            return undefined;
-        return walletConnectors.map((connector) => connector.name);
-    }
-    catch (error) {
-        logger.logger.error('error serializing walletConnectors', error);
-        return undefined;
-    }
-};
 const getFrameworkSettings = () => {
     var _a;
     return ({
@@ -84,5 +78,4 @@ const getFrameworkSettings = () => {
 };
 
 exports.serializeEventsCallbacks = serializeEventsCallbacks;
-exports.serializeWalletConnectors = serializeWalletConnectors;
 exports.useSendDynamicProps = useSendDynamicProps;

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

@@ -1,5 +1,4 @@
-import { WalletConnectorsMethod } from '@dynamic-labs/wallet-connector-core';
-import { DynamicContextProps } from '../../../..';
+import { DynamicContextProps } from '../../../context/DynamicContext';
 import { DynamicEventsCallbacks } from '../../../shared';
 type UseSendDynamicHookProps = {
     settings: DynamicContextProps['settings'];
@@ -7,5 +6,4 @@ type UseSendDynamicHookProps = {
 };
 export declare const useSendDynamicProps: ({ settings, environmentId, }: UseSendDynamicHookProps) => void;
 export declare const serializeEventsCallbacks: (events: DynamicEventsCallbacks | undefined) => string[] | undefined;
-export declare const serializeWalletConnectors: (walletConnectors?: WalletConnectorsMethod[]) => string[] | undefined;
 export {};

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

@@ -17,6 +17,11 @@ import '../../../../../_virtual/_tslib.js';
 import '../../../config/ApiEndpoint.js';
 import { sendDynamicProps } from '../../../data/api/settings/settings.js';
 import '../../../locale/locale.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import 'viem';
+import 'viem/chains';
+import { serializeWalletConnectors } from '../../functions/serializeWalletConnectors/serializeWalletConnectors.js';
 
 const useSendDynamicProps = ({ settings, environmentId, }) => {
     useEffectOnce(() => {
@@ -54,17 +59,6 @@ const serializeEventsCallbacks = (events) => {
         return undefined;
     }
 };
-const serializeWalletConnectors = (walletConnectors) => {
-    try {
-        if (!walletConnectors)
-            return undefined;
-        return walletConnectors.map((connector) => connector.name);
-    }
-    catch (error) {
-        logger.error('error serializing walletConnectors', error);
-        return undefined;
-    }
-};
 const getFrameworkSettings = () => {
     var _a;
     return ({
@@ -79,4 +73,4 @@ const getFrameworkSettings = () => {
     });
 };
 
-export { serializeEventsCallbacks, serializeWalletConnectors, useSendDynamicProps };
+export { serializeEventsCallbacks, useSendDynamicProps };

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

@@ -5,9 +5,31 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
 var data = require('../../../views/WalletList/data.cjs');
+require('@dynamic-labs/wallet-connector-core');
+require('@dynamic-labs/sdk-api-core');
+require('../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('react/jsx-runtime');
+require('../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/wallet-book');
+require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('@dynamic-labs/utils');
+require('../../../shared/consts/index.cjs');
+require('../../../../../_virtual/_tslib.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
+require('viem');
+require('viem/chains');
+require('../../../config/ApiEndpoint.cjs');
+require('../../../locale/locale.cjs');
+var serializeWalletConnectors = require('../../functions/serializeWalletConnectors/serializeWalletConnectors.cjs');
 var verifyRequiredConnectorsAreSetup = require('./utils/verifyRequiredConnectorsAreSetup/verifyRequiredConnectorsAreSetup.cjs');
 
 const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, mobileExperience, networkConfigurations, walletBook, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
+    const walletConnectorsKey = React.useMemo(() => { var _a; return (_a = serializeWalletConnectors.serializeWalletConnectors(walletConnectorsProp)) === null || _a === void 0 ? void 0 : _a.join(','); }, [walletConnectorsProp]);
+    const walletBookLength = React.useMemo(() => Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length, [walletBook]);
     const walletConnectorOptions = React.useMemo(() => {
         if (!projectSettings ||
             !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length ||
@@ -31,14 +53,15 @@ const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, deepL
             walletConnectorExtensions,
         });
         // Cannot include walletUiUtils in the dependency array because it will cause an infinite loop
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
         appLogoUrl,
         appName,
         projectSettings,
-        walletConnectorsProp,
+        walletConnectorsKey,
         walletConnectPreferredChains,
         flowNetwork,
-        Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length,
+        walletBookLength,
         networkConfigurations,
     ]);
     React.useEffect(() => {

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

@@ -1,9 +1,31 @@
 'use client'
 import { useMemo, useEffect } from 'react';
 import { getWallets } from '../../../views/WalletList/data.js';
+import '@dynamic-labs/wallet-connector-core';
+import '@dynamic-labs/sdk-api-core';
+import '../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/wallet-book';
+import '../../constants/colors.js';
+import '../../constants/values.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
+import '@dynamic-labs/utils';
+import '../../../shared/consts/index.js';
+import '../../../../../_virtual/_tslib.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import 'viem';
+import 'viem/chains';
+import '../../../config/ApiEndpoint.js';
+import '../../../locale/locale.js';
+import { serializeWalletConnectors } from '../../functions/serializeWalletConnectors/serializeWalletConnectors.js';
 import { verifyRequiredConnectorsAreSetup } from './utils/verifyRequiredConnectorsAreSetup/verifyRequiredConnectorsAreSetup.js';
 
 const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, mobileExperience, networkConfigurations, walletBook, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
+    const walletConnectorsKey = useMemo(() => { var _a; return (_a = serializeWalletConnectors(walletConnectorsProp)) === null || _a === void 0 ? void 0 : _a.join(','); }, [walletConnectorsProp]);
+    const walletBookLength = useMemo(() => Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length, [walletBook]);
     const walletConnectorOptions = useMemo(() => {
         if (!projectSettings ||
             !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length ||
@@ -27,14 +49,15 @@ const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, deepL
             walletConnectorExtensions,
         });
         // Cannot include walletUiUtils in the dependency array because it will cause an infinite loop
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
         appLogoUrl,
         appName,
         projectSettings,
-        walletConnectorsProp,
+        walletConnectorsKey,
         walletConnectPreferredChains,
         flowNetwork,
-        Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length,
+        walletBookLength,
         networkConfigurations,
     ]);
     useEffect(() => {

package/src/lib/views/EmailVerification/EmailVerification.cjs

@@ -27,6 +27,7 @@ require('../../shared/consts/index.cjs');
 var useInternalDynamicContext = require('../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 require('../../context/CaptchaContext/CaptchaContext.cjs');
 var ErrorContext = require('../../context/ErrorContext/ErrorContext.cjs');
+var findEmbeddedWalletFromVerifiedCredentials = require('../../utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 var shortenEmail = require('../../shared/utils/functions/shortenEmail/shortenEmail.cjs');
@@ -100,7 +101,7 @@ require('../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection
 const SECONDS_TO_RETRY = 15;
 const sleepToShowSuccessMessage = () => utils.sleep(1500);
 const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _showRetryButton = true, showTransferMessage: _showTransferMessage = false, }) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const [showRetryButton, setShowRetryButton] = React.useState(_showRetryButton);
     const [showTransferMessage, setShowTransferMessage] = React.useState(_showTransferMessage);
     const { handleVerifiedUserWithJWT } = useHandleVerifiedUser.useHandleVerifiedUser();
@@ -135,7 +136,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
     const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback.useCreateUserProfileByJWTCallback();
     const isTurnkeyProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
     const handleComplete = React.useCallback((verificationToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f, _g;
+        var _g, _h, _j, _k, _l, _m, _o;
         setError(undefined);
         setLoading(true);
         if (!verificationUUID || (!authToken && !onboardingOnlyJwt)) {
@@ -172,16 +173,41 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
             if (isTurnkeyWallet &&
                 hasTurnkeyVerifiedCredentialAuthenticator &&
                 !hasRecoveryEmail &&
-                ((_e = updateUserProfileResponse === null || updateUserProfileResponse === void 0 ? void 0 : updateUserProfileResponse.user) === null || _e === void 0 ? void 0 : _e.email)) {
+                ((_g = updateUserProfileResponse === null || updateUserProfileResponse === void 0 ? void 0 : updateUserProfileResponse.user) === null || _g === void 0 ? void 0 : _g.email)) {
                 setUser(updateJWTAndCreateUserProfile.updateJWTAndCreateUserProfile(updateUserProfileResponse.jwt, updateUserProfileResponse.minifiedJwt));
                 yield addRecoveryEmail(updateUserProfileResponse.user.email);
                 setShowAuthFlow(false);
                 return;
             }
-            if (isTurnkeyProviderEnabled &&
-                !((_g = (_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _f === void 0 ? void 0 : _f.embeddedWallets) === null || _g === void 0 ? void 0 : _g.automaticEmbeddedWalletCreation)) {
-                setShowAuthFlow(false);
-                return;
+            if (isTurnkeyProviderEnabled) {
+                const isManualMode = !((_j = (_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _h === void 0 ? void 0 : _h.embeddedWallets) === null || _j === void 0 ? void 0 : _j.automaticEmbeddedWalletCreation);
+                const isUsingPregeneratedWallets = Boolean(((_l = (_k = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _k === void 0 ? void 0 : _k.embeddedWallets) === null || _l === void 0 ? void 0 : _l.automaticEmbeddedWalletCreation) &&
+                    !((_o = (_m = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _m === void 0 ? void 0 : _m.embeddedWallets) === null || _o === void 0 ? void 0 : _o.forceAuthenticatorAtSignup));
+                if (isUsingPregeneratedWallets) {
+                    // Pregenerated wallet was created during an
+                    // additional email validation step as part of onboarding
+                    // cannot rely on newUser JWT field here due to session being counted twice
+                    // when authentication happens followed by a separate email kyc step
+                    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(updateUserProfileResponse.jwt);
+                    if (!embeddedWalletVerifiedCredential) {
+                        throw new Error('Could not find an embedded wallet');
+                    }
+                    const wallet = {
+                        address: embeddedWalletVerifiedCredential.address,
+                        authenticated: false,
+                        chain: embeddedWalletVerifiedCredential.chain,
+                        connected: true,
+                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                        // @ts-ignore
+                        connector: undefined,
+                        id: embeddedWalletVerifiedCredential.id,
+                    };
+                    dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, updateUserProfileResponse.jwt);
+                }
+                if (isUsingPregeneratedWallets || isManualMode) {
+                    setShowAuthFlow(false);
+                    return;
+                }
             }
             // this function will check turnkey wallet enabled and create wallet if needed
             // if not enabled, it will throw an error.
@@ -217,7 +243,6 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         hasTurnkeyVerifiedCredentialAuthenticator,
         hasRecoveryEmail,
         isTurnkeyProviderEnabled,
-        (_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.automaticEmbeddedWalletCreation,
         createEmbeddedWallet,
         setOnboardingOnlyJwt,
         setView,
@@ -226,10 +251,12 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         setUser,
         addRecoveryEmail,
         setShowAuthFlow,
+        (_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.automaticEmbeddedWalletCreation,
+        (_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.forceAuthenticatorAtSignup,
         setErrorMessage,
     ]);
     const handleEmailLogin = React.useCallback((verificationToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _h, _j;
+        var _p, _q;
         setError(undefined);
         setLoading(true);
         if (!verificationUUID) {
@@ -264,7 +291,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
             yield sleepToShowSuccessMessage();
             yield createUserProfileByJWT(jwt, minifiedJwt);
             if (isTurnkeyProviderEnabled &&
-                !((_j = (_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _h === void 0 ? void 0 : _h.embeddedWallets) === null || _j === void 0 ? void 0 : _j.automaticEmbeddedWalletCreation)) {
+                !((_q = (_p = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _p === void 0 ? void 0 : _p.embeddedWallets) === null || _q === void 0 ? void 0 : _q.automaticEmbeddedWalletCreation)) {
                 setShowAuthFlow(false);
                 return;
             }
@@ -297,7 +324,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         setCallback,
         createUserProfileByJWT,
         isTurnkeyProviderEnabled,
-        (_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.automaticEmbeddedWalletCreation,
+        (_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _e === void 0 ? void 0 : _e.embeddedWallets) === null || _f === void 0 ? void 0 : _f.automaticEmbeddedWalletCreation,
         createEmbeddedWallet,
         setOnboardingOnlyJwt,
         setView,

package/src/lib/views/EmailVerification/EmailVerification.js

@@ -23,6 +23,7 @@ import '../../shared/consts/index.js';
 import { useInternalDynamicContext } from '../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 import '../../context/CaptchaContext/CaptchaContext.js';
 import { useErrorContext } from '../../context/ErrorContext/ErrorContext.js';
+import { findEmbeddedWalletFromVerifiedCredentials } from '../../utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import { shortenEmail } from '../../shared/utils/functions/shortenEmail/shortenEmail.js';
@@ -96,7 +97,7 @@ import '../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.
 const SECONDS_TO_RETRY = 15;
 const sleepToShowSuccessMessage = () => sleep(1500);
 const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _showRetryButton = true, showTransferMessage: _showTransferMessage = false, }) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const [showRetryButton, setShowRetryButton] = useState(_showRetryButton);
     const [showTransferMessage, setShowTransferMessage] = useState(_showTransferMessage);
     const { handleVerifiedUserWithJWT } = useHandleVerifiedUser();
@@ -131,7 +132,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
     const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback();
     const isTurnkeyProviderEnabled = isTurnkeyEnabled(projectSettings);
     const handleComplete = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f, _g;
+        var _g, _h, _j, _k, _l, _m, _o;
         setError(undefined);
         setLoading(true);
         if (!verificationUUID || (!authToken && !onboardingOnlyJwt)) {
@@ -168,16 +169,41 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
             if (isTurnkeyWallet &&
                 hasTurnkeyVerifiedCredentialAuthenticator &&
                 !hasRecoveryEmail &&
-                ((_e = updateUserProfileResponse === null || updateUserProfileResponse === void 0 ? void 0 : updateUserProfileResponse.user) === null || _e === void 0 ? void 0 : _e.email)) {
+                ((_g = updateUserProfileResponse === null || updateUserProfileResponse === void 0 ? void 0 : updateUserProfileResponse.user) === null || _g === void 0 ? void 0 : _g.email)) {
                 setUser(updateJWTAndCreateUserProfile(updateUserProfileResponse.jwt, updateUserProfileResponse.minifiedJwt));
                 yield addRecoveryEmail(updateUserProfileResponse.user.email);
                 setShowAuthFlow(false);
                 return;
             }
-            if (isTurnkeyProviderEnabled &&
-                !((_g = (_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _f === void 0 ? void 0 : _f.embeddedWallets) === null || _g === void 0 ? void 0 : _g.automaticEmbeddedWalletCreation)) {
-                setShowAuthFlow(false);
-                return;
+            if (isTurnkeyProviderEnabled) {
+                const isManualMode = !((_j = (_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _h === void 0 ? void 0 : _h.embeddedWallets) === null || _j === void 0 ? void 0 : _j.automaticEmbeddedWalletCreation);
+                const isUsingPregeneratedWallets = Boolean(((_l = (_k = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _k === void 0 ? void 0 : _k.embeddedWallets) === null || _l === void 0 ? void 0 : _l.automaticEmbeddedWalletCreation) &&
+                    !((_o = (_m = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _m === void 0 ? void 0 : _m.embeddedWallets) === null || _o === void 0 ? void 0 : _o.forceAuthenticatorAtSignup));
+                if (isUsingPregeneratedWallets) {
+                    // Pregenerated wallet was created during an
+                    // additional email validation step as part of onboarding
+                    // cannot rely on newUser JWT field here due to session being counted twice
+                    // when authentication happens followed by a separate email kyc step
+                    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(updateUserProfileResponse.jwt);
+                    if (!embeddedWalletVerifiedCredential) {
+                        throw new Error('Could not find an embedded wallet');
+                    }
+                    const wallet = {
+                        address: embeddedWalletVerifiedCredential.address,
+                        authenticated: false,
+                        chain: embeddedWalletVerifiedCredential.chain,
+                        connected: true,
+                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                        // @ts-ignore
+                        connector: undefined,
+                        id: embeddedWalletVerifiedCredential.id,
+                    };
+                    dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, updateUserProfileResponse.jwt);
+                }
+                if (isUsingPregeneratedWallets || isManualMode) {
+                    setShowAuthFlow(false);
+                    return;
+                }
             }
             // this function will check turnkey wallet enabled and create wallet if needed
             // if not enabled, it will throw an error.
@@ -213,7 +239,6 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         hasTurnkeyVerifiedCredentialAuthenticator,
         hasRecoveryEmail,
         isTurnkeyProviderEnabled,
-        (_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.automaticEmbeddedWalletCreation,
         createEmbeddedWallet,
         setOnboardingOnlyJwt,
         setView,
@@ -222,10 +247,12 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         setUser,
         addRecoveryEmail,
         setShowAuthFlow,
+        (_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.automaticEmbeddedWalletCreation,
+        (_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.forceAuthenticatorAtSignup,
         setErrorMessage,
     ]);
     const handleEmailLogin = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
-        var _h, _j;
+        var _p, _q;
         setError(undefined);
         setLoading(true);
         if (!verificationUUID) {
@@ -260,7 +287,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
             yield sleepToShowSuccessMessage();
             yield createUserProfileByJWT(jwt, minifiedJwt);
             if (isTurnkeyProviderEnabled &&
-                !((_j = (_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _h === void 0 ? void 0 : _h.embeddedWallets) === null || _j === void 0 ? void 0 : _j.automaticEmbeddedWalletCreation)) {
+                !((_q = (_p = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _p === void 0 ? void 0 : _p.embeddedWallets) === null || _q === void 0 ? void 0 : _q.automaticEmbeddedWalletCreation)) {
                 setShowAuthFlow(false);
                 return;
             }
@@ -293,7 +320,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         setCallback,
         createUserProfileByJWT,
         isTurnkeyProviderEnabled,
-        (_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.automaticEmbeddedWalletCreation,
+        (_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _e === void 0 ? void 0 : _e.embeddedWallets) === null || _f === void 0 ? void 0 : _f.automaticEmbeddedWalletCreation,
         createEmbeddedWallet,
         setOnboardingOnlyJwt,
         setView,

package/src/lib/views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.cjs

@@ -27,7 +27,7 @@ const initExport = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ i
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !walletConnectorCore.isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new utils.DynamicError('PasskeyWalletConnector not found');
+        throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const turnkeyExportHandler = (_b = wallet.connector) === null || _b === void 0 ? void 0 : _b.getExportHandler();
     const publicKey = yield turnkeyExportHandler.initExport(iframeContainer, iframeElementId);
@@ -48,7 +48,7 @@ const handleExportInitCheck = ({ authToken, userEmail, wallet, }) => {
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !walletConnectorCore.isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new utils.DynamicError('PasskeyWalletConnector not found');
+        throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const connector = wallet.connector;
     connector.setEmail(userEmail);

package/src/lib/views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.js

@@ -23,7 +23,7 @@ const initExport = (_a) => __awaiter(void 0, [_a], void 0, function* ({ iframeCo
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new DynamicError('PasskeyWalletConnector not found');
+        throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const turnkeyExportHandler = (_b = wallet.connector) === null || _b === void 0 ? void 0 : _b.getExportHandler();
     const publicKey = yield turnkeyExportHandler.initExport(iframeContainer, iframeElementId);
@@ -44,7 +44,7 @@ const handleExportInitCheck = ({ authToken, userEmail, wallet, }) => {
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new DynamicError('PasskeyWalletConnector not found');
+        throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const connector = wallet.connector;
     connector.setEmail(userEmail);