@dynamic-labs/sdk-react-core 2.1.0-alpha.2 → 2.1.0-alpha.20

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

@@ -3,11 +3,10 @@ import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { useState, useRef, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { UserHasAccountWithEmailError, NoAccessError, AccountExistsError, sleep } from '@dynamic-labs/utils';
 import { classNames } from '../../utils/functions/classNames/classNames.js';
 import { dynamicEvents } from '../../events/dynamicEvents.js';
+import '@dynamic-labs/utils';
 import '../../context/DynamicContext/DynamicContext.js';
-import { decodeJwt } from '../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -23,6 +22,8 @@ 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 { createUserProfileFromSdkUser } from '../../utils/functions/createUserProfile/createUserProfile.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';
@@ -34,11 +35,10 @@ import '../../config/ApiEndpoint.js';
 import '../../locale/locale.js';
 import { updateJWTAndCreateUserProfile } from '../../utils/functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.js';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
-import { useAccountExistsContext } from '../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../context/UserWalletsContext/UserWalletsContext.js';
 import { useOtpVerificationRequest } from '../../utils/hooks/authenticationHooks/useOtpVerificationRequest/useOtpVerificationRequest.js';
 import 'react-dom';
-import { useEmbeddedWallet } from '../../utils/hooks/useEmbeddedWallet/useEmbeddedWallet.js';
 import '../../context/WalletContext/WalletContext.js';
 import { useIsTurnkeyWallet } from '../../utils/hooks/useIsTurnkeyWallet/useIsTurnkeyWallet.js';
 import '../../context/ThemeContext/ThemeContext.js';
@@ -46,13 +46,15 @@ import { useVerification } from '../../context/VerificationContext/VerificationC
 import { useOnUnmount } from '../../utils/hooks/useOnUnmount/useOnUnmount.js';
 import { usePasskeyRecovery } from '../../utils/hooks/usePasskeyRecovery/usePasskeyRecovery.js';
 import '@dynamic-labs/types';
-import { useCreateUserProfileByJWTCallback } from '../../utils/hooks/useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.js';
-import { useHandleVerifiedUser } from '../../utils/hooks/useHandleVerifiedUser/useHandleVerifiedUser.js';
+import { useUserAuth } from '../../utils/hooks/useUserAuth/useUserAuth.js';
 import 'yup';
 import '../../context/MockContext/MockContext.js';
-import '../../context/FieldsStateContext/FieldsStateContext.js';
+import '../CollectUserDataView/useFields.js';
 import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import 'zustand';
+import 'zustand/middleware';
+import 'zustand/react/shallow';
 import '@dynamic-labs/rpc-providers';
 import { Typography } from '../../components/Typography/Typography.js';
 import '../../context/FooterAnimationContext/index.js';
@@ -74,6 +76,7 @@ import '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import { ErrorContainer } from '../../components/ErrorContainer/ErrorContainer.js';
 import 'formik';
+import '../../context/FieldsStateContext/FieldsStateContext.js';
 import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../components/Alert/Alert.js';
 import '../../components/Input/Input.js';
@@ -94,12 +97,14 @@ import '@hcaptcha/react-hcaptcha';
 import '../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 
 const SECONDS_TO_RETRY = 15;
-const sleepToShowSuccessMessage = () => sleep(1500);
 const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _showRetryButton = true, showTransferMessage: _showTransferMessage = false, }) => {
     var _a, _b, _c, _d;
+    const { environmentId, onboardingOnlyJwt, handleLogOut, authToken, setUser, setPrimaryWalletId, setShowAuthFlow, projectSettings, } = useInternalDynamicContext();
+    const { view, setView, goToInitialView } = useViewContext();
+    const { error, setError, setErrorMessage } = useErrorContext();
+    const { loading, setLoading } = useLoadingContext();
     const [showRetryButton, setShowRetryButton] = useState(_showRetryButton);
     const [showTransferMessage, setShowTransferMessage] = useState(_showTransferMessage);
-    const { handleVerifiedUserWithJWT } = useHandleVerifiedUser();
     // Use a state to ensure UI is updated, but also a ref to access in effect cleanup
     const [isValidated, _setIsValidated] = useState(false);
     const isValidatedRef = useRef(isValidated);
@@ -107,16 +112,14 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         _setIsValidated(value);
         isValidatedRef.current = value;
     };
-    const { view, setView, goToInitialView } = useViewContext();
-    const { error, setError, setErrorMessage } = useErrorContext();
-    const { setExistentAccountData } = useAccountExistsContext();
-    const { environmentId, onboardingOnlyJwt, handleLogOut, authToken, setOnboardingOnlyJwt, setShowAuthFlow, setCallback, projectSettings, setUser, } = useInternalDynamicContext();
     const { displayedDestination: email, verificationUUID, setVerificationUUID, } = useVerification();
-    const { loading, setLoading } = useLoadingContext();
     const { t } = useTranslation();
-    const { createEmbeddedWallet } = useEmbeddedWallet();
-    const { isTurnkeyWallet, hasTurnkeyVerifiedCredentialAuthenticator, hasRecoveryEmail, } = useIsTurnkeyWallet();
     const { addRecoveryEmail } = usePasskeyRecovery();
+    const { isTurnkeyWallet, hasTurnkeyVerifiedCredentialAuthenticator, hasRecoveryEmail, } = useIsTurnkeyWallet();
+    const isTurnkeyProviderEnabled = isTurnkeyEnabled(projectSettings);
+    const { initAuth, completeAuth, cancelAuth } = useUserAuth({
+        authMethod: 'email',
+    });
     // When true, causes the component to call emailVerificationX callback on unmount
     const callCallbackOnUnmount = useRef(true);
     useOnUnmount(() => {
@@ -128,178 +131,129 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
     });
     const isLoginView = view.type === 'login-with-email-verification';
     const { verifyOtp } = useOtpVerificationRequest();
-    const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback();
-    const isTurnkeyProviderEnabled = isTurnkeyEnabled(projectSettings);
-    const handleComplete = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f, _g;
-        setError(undefined);
-        setLoading(true);
-        if (!verificationUUID || (!authToken && !onboardingOnlyJwt)) {
-            yield handleLogOut();
-            goToInitialView();
-            return;
+    const completeSignInFlow = useCallback((updateUserProfileResponse) => __awaiter(void 0, void 0, void 0, function* () {
+        var _e, _f, _g, _h, _j;
+        if (updateUserProfileResponse.nextView === 'verified-and-transferred') {
+            setShowTransferMessage === null || setShowTransferMessage === void 0 ? void 0 : setShowTransferMessage(true);
         }
-        try {
-            const { isSmsVerificationRequired, updateUserProfileResponse } = yield verifyOtp(verificationToken, 'email', verificationUUID);
-            // This causes emaiLVerificationSuccess to be raised, so it should be set as soon
-            // as verification doesn't fail. Don't move it below
-            setIsValidated(true);
-            if (isSmsVerificationRequired) {
-                setOnboardingOnlyJwt(updateUserProfileResponse.jwt);
-                setView('verify-sms');
-                return;
-            }
-            if (onboardingOnlyJwt) {
-                yield handleVerifiedUserWithJWT(updateUserProfileResponse.jwt);
-                setOnboardingOnlyJwt(undefined);
-                setCallback('authSuccess');
-            }
-            if (updateUserProfileResponse.nextView === 'verified-and-transferred') {
-                setShowTransferMessage(true);
-            }
-            if (isEmailRecoveryFlow) {
-                setView('passkey-recovery-add-email', {
-                    canSkipAddingEmail: false,
-                    isFromEmailVerification: true,
-                });
-                return;
-            }
-            // If the user has a turnkey embedded wallet and no recovery email, add the email as a recovery email
-            if (isTurnkeyWallet &&
-                hasTurnkeyVerifiedCredentialAuthenticator &&
-                !hasRecoveryEmail &&
-                ((_e = updateUserProfileResponse === null || updateUserProfileResponse === void 0 ? void 0 : updateUserProfileResponse.user) === null || _e === void 0 ? void 0 : _e.email)) {
-                setUser(updateJWTAndCreateUserProfile(updateUserProfileResponse.jwt, updateUserProfileResponse.minifiedJwt));
-                yield addRecoveryEmail(updateUserProfileResponse.user.email);
-                setShowAuthFlow(false);
-                return;
+        if (isEmailRecoveryFlow) {
+            setView('passkey-recovery-add-email', {
+                canSkipAddingEmail: false,
+                isFromEmailVerification: true,
+            });
+            return true;
+        }
+        // If the user has a turnkey embedded wallet and no recovery email, add the email as a recovery email
+        if (isTurnkeyWallet &&
+            hasTurnkeyVerifiedCredentialAuthenticator &&
+            !hasRecoveryEmail &&
+            ((_e = updateUserProfileResponse === null || updateUserProfileResponse === void 0 ? void 0 : updateUserProfileResponse.user) === null || _e === void 0 ? void 0 : _e.email)) {
+            setUser(updateJWTAndCreateUserProfile(updateUserProfileResponse.jwt, updateUserProfileResponse.minifiedJwt));
+            yield addRecoveryEmail(updateUserProfileResponse.user.email);
+            setShowAuthFlow(false);
+            return true;
+        }
+        if (isTurnkeyProviderEnabled) {
+            const isManualMode = !((_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);
+            const isUsingPregeneratedWallets = Boolean(!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.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(createUserProfileFromSdkUser(updateUserProfileResponse.user));
+                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,
+                };
+                setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
+                dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, updateUserProfileResponse.jwt);
             }
-            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)) {
+            if (isUsingPregeneratedWallets || isManualMode) {
                 setShowAuthFlow(false);
-                return;
+                return true;
             }
-            // this function will check turnkey wallet enabled and create wallet if needed
-            // if not enabled, it will throw an error.
-            yield createEmbeddedWallet().catch(() => setShowAuthFlow(false));
         }
-        catch (error) {
-            logger.debug(error);
-            // Handle the case where the user has already an account with the email
-            if (error instanceof UserHasAccountWithEmailError) {
-                setView('merge-user-accounts-with-same-email', {
-                    returnToView: isEmailRecoveryFlow
-                        ? 'passkey-recovery-add-email'
-                        : undefined,
-                });
-                return; // Early return to not show the error message
-            }
-            setErrorMessage(error.code);
-        }
-        finally {
-            setLoading(false);
+        return false;
+    }), [
+        addRecoveryEmail,
+        hasRecoveryEmail,
+        hasTurnkeyVerifiedCredentialAuthenticator,
+        isEmailRecoveryFlow,
+        isTurnkeyProviderEnabled,
+        isTurnkeyWallet,
+        (_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,
+        setPrimaryWalletId,
+        setShowAuthFlow,
+        setUser,
+        setView,
+    ]);
+    const handleComplete = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
+        setError(undefined);
+        setLoading(true);
+        if (!verificationUUID || (!authToken && !onboardingOnlyJwt)) {
+            yield cancelAuth();
+            return;
         }
+        yield completeAuth({
+            completeSignInFlow: (updateUserResponse) => __awaiter(void 0, void 0, void 0, function* () { return completeSignInFlow(updateUserResponse); }),
+            onValidUpdatedJwt: () => {
+                // This causes emaiLVerificationSuccess to be raised, so it should be set as soon
+                // as verification doesn't fail. Don't move it below
+                setIsValidated(true);
+            },
+            options: { email, isEmailRecoveryFlow },
+            updateJwtFunction: () => __awaiter(void 0, void 0, void 0, function* () { return verifyOtp(verificationToken, 'email', verificationUUID); }),
+        });
     }), [
         setError,
         setLoading,
         verificationUUID,
         authToken,
         onboardingOnlyJwt,
-        handleLogOut,
-        goToInitialView,
-        verifyOtp,
+        completeAuth,
+        email,
         isEmailRecoveryFlow,
-        isTurnkeyWallet,
-        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,
-        handleVerifiedUserWithJWT,
-        setCallback,
-        setUser,
-        addRecoveryEmail,
-        setShowAuthFlow,
-        setErrorMessage,
+        cancelAuth,
+        completeSignInFlow,
+        verifyOtp,
     ]);
     const handleEmailLogin = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
-        var _h, _j;
         setError(undefined);
         setLoading(true);
         if (!verificationUUID) {
-            yield handleLogOut();
-            goToInitialView();
+            yield cancelAuth();
             return;
         }
-        try {
-            const { jwt, minifiedJwt } = yield signInWithEmailVerification({
+        yield initAuth({
+            onVerifySuccess: () => setIsValidated(true),
+            options: { email },
+            showSuccessMessage: true,
+            verifyFunction: () => signInWithEmailVerification({
                 environmentId,
                 verificationToken,
                 verificationUUID,
-            });
-            if (!jwt) {
-                yield handleLogOut();
-                goToInitialView();
-                return;
-            }
-            const decodedJwt = decodeJwt(jwt);
-            setIsValidated(true);
-            if (decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields.length) {
-                setOnboardingOnlyJwt(jwt);
-                yield sleepToShowSuccessMessage();
-                setView('collect-user-data-login-no-wallet', {
-                    userIdentification: 'email',
-                });
-                return;
-            }
-            yield handleVerifiedUserWithJWT(jwt);
-            setCallback('authSuccess');
-            // this timeout is set to make sure that the user will see success message
-            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)) {
-                setShowAuthFlow(false);
-                return;
-            }
-            // this function will check turnkey wallet enabled and create wallet if needed
-            // if not enabled, it will throw an error.
-            yield createEmbeddedWallet().catch(() => setShowAuthFlow(false));
-        }
-        catch (error) {
-            if (error instanceof NoAccessError) {
-                setView('no-access');
-            }
-            if (error instanceof AccountExistsError) {
-                setExistentAccountData(error.errorPayload);
-                setView('account-exists');
-            }
-            logger.debug(error);
-            setErrorMessage(error.code);
-        }
-        finally {
-            setLoading(false);
-        }
+            }),
+        });
     }), [
         setError,
         setLoading,
         verificationUUID,
-        handleLogOut,
-        goToInitialView,
+        initAuth,
+        email,
+        cancelAuth,
         environmentId,
-        handleVerifiedUserWithJWT,
-        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,
-        createEmbeddedWallet,
-        setOnboardingOnlyJwt,
-        setView,
-        setShowAuthFlow,
-        setErrorMessage,
-        setExistentAccountData,
     ]);
     const handleRetry = () => __awaiter(void 0, void 0, void 0, function* () {
         try {
@@ -329,22 +283,13 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
             setLoading(false);
         }
     });
-    // Go to update email screen, but prevent onEmailVerificationX callback from being called
-    const updateEmail = () => {
-        callCallbackOnUnmount.current = false;
-        if (isEmailRecoveryFlow) {
-            setView('passkey-recovery-add-email');
-            return;
-        }
-        setView('update-email');
-    };
     const EmailIcon = useMemo(() => {
         const EmailIcon = (props) => (jsx(Icon, { color: 'brand-primary', children: jsx(SvgSignInWithEmail, Object.assign({}, props)) }));
         return EmailIcon;
     }, []);
     return (jsxs(Fragment, { children: [error && (jsx(ErrorContainer, { withIcon: false, className: 'email-verification__error-message', children: error })), jsxs("div", { className: classNames('email-verification__container', {
                     'email-verification__container--error': Boolean(error),
-                }), children: [showTransferMessage && (jsx("div", { className: 'email-verification__transfer-message', copykey: 'dyn_otp_verification.email.complete', children: t('dyn_otp_verification.email.complete') })), isValidated ? (jsx("div", { className: 'email-verification__icon-container', children: jsx(IconWithStatus, { containerClassName: 'email-verification__icon--verified', Icon: EmailIcon, iconSize: 64, InnerIcon: SvgCheck }) })) : (jsx(IconWithSpinner, { Icon: EmailIcon, iconSize: 96, isSpinning: true, className: 'email-verification__icon-with-spinner' })), jsxs("div", { className: 'email-verification__copy-text-container', children: [jsx(Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', copykey: 'dyn_otp_verification.description', children: t('dyn_otp_verification.description') }), jsx(Typography, { variant: 'body_normal', weight: 'bold', color: 'secondary', children: shortenEmail(email) })] }), !isLoginView && !isValidated && (jsx(TextButton, { onClick: updateEmail, className: 'email-verification__text-button', disabled: loading, copykey: 'dyn_otp_verification.email.edit', children: t('dyn_otp_verification.email.edit') })), jsx(PinField, { initialValue: Array(6).join('.').split('.'), isLoading: loading, handleComplete: isLoginView ? handleEmailLogin : handleComplete, isValidated: isValidated, inputMode: 'numeric', pattern: '[0-9]*', hasError: Boolean(error), onChange: () => setError(undefined) }), showRetryButton && (jsx(RetrySendVerificationCodeSection, { className: 'email-verification__retry-container', retryHandler: handleRetry, secondsToRetry: SECONDS_TO_RETRY })), !isLoginView && !isEmailRecoveryFlow && (jsx(TextButton, { className: 'email-verification__log-out', onClick: handleLogOut, copykey: 'dyn_otp_verification.log_out_button', children: t('dyn_otp_verification.log_out_button') }))] })] }));
+                }), children: [showTransferMessage && (jsx("div", { className: 'email-verification__transfer-message', copykey: 'dyn_otp_verification.email.complete', children: t('dyn_otp_verification.email.complete') })), isValidated ? (jsx("div", { className: 'email-verification__icon-container', children: jsx(IconWithStatus, { containerClassName: 'email-verification__icon--verified', Icon: EmailIcon, iconSize: 64, InnerIcon: SvgCheck }) })) : (jsx(IconWithSpinner, { Icon: EmailIcon, iconSize: 96, isSpinning: true, className: 'email-verification__icon-with-spinner' })), jsxs("div", { className: 'email-verification__copy-text-container', children: [jsx(Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', copykey: 'dyn_otp_verification.description', children: t('dyn_otp_verification.description') }), jsx(Typography, { variant: 'body_normal', weight: 'bold', color: 'secondary', children: shortenEmail(email) })] }), jsx(PinField, { initialValue: Array(6).join('.').split('.'), isLoading: loading, handleComplete: isLoginView ? handleEmailLogin : handleComplete, isValidated: isValidated, inputMode: 'numeric', pattern: '[0-9]*', hasError: Boolean(error), onChange: () => setError(undefined) }), showRetryButton && (jsx(RetrySendVerificationCodeSection, { className: 'email-verification__retry-container', retryHandler: handleRetry, secondsToRetry: SECONDS_TO_RETRY })), !isLoginView && !isEmailRecoveryFlow && (jsx(TextButton, { className: 'email-verification__log-out', onClick: handleLogOut, copykey: 'dyn_otp_verification.log_out_button', children: t('dyn_otp_verification.log_out_button') }))] })] }));
 };
 
 export { EmailVerification };

package/src/lib/views/EmailWalletOTPVerificationView/EmailWalletOTPVerificationView.cjs

@@ -38,13 +38,17 @@ require('../../context/WalletContext/WalletContext.cjs');
 require('../../context/ThemeContext/ThemeContext.cjs');
 var useMutation = require('../../utils/hooks/useMutation/useMutation.cjs');
 require('@dynamic-labs/types');
+require('../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../context/MockContext/MockContext.cjs');
-require('react-i18next');
-require('../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../CollectUserDataView/useFields.cjs');
 require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('zustand');
+require('zustand/middleware');
+require('zustand/react/shallow');
 require('@dynamic-labs/rpc-providers');
+require('react-i18next');
 require('../../context/FooterAnimationContext/index.cjs');
 require('../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../components/Transition/ZoomTransition/ZoomTransition.cjs');
@@ -55,11 +59,11 @@ require('../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
-require('../../context/LoadingContext/LoadingContext.cjs');
 require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 require('formik');
+require('../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../components/Alert/Alert.cjs');
 require('../../components/Input/Input.cjs');

package/src/lib/views/EmailWalletOTPVerificationView/EmailWalletOTPVerificationView.js

@@ -34,13 +34,17 @@ import '../../context/WalletContext/WalletContext.js';
 import '../../context/ThemeContext/ThemeContext.js';
 import { useMutation } from '../../utils/hooks/useMutation/useMutation.js';
 import '@dynamic-labs/types';
+import '../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../context/MockContext/MockContext.js';
-import 'react-i18next';
-import '../../context/FieldsStateContext/FieldsStateContext.js';
+import '../CollectUserDataView/useFields.js';
 import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import 'zustand';
+import 'zustand/middleware';
+import 'zustand/react/shallow';
 import '@dynamic-labs/rpc-providers';
+import 'react-i18next';
 import '../../context/FooterAnimationContext/index.js';
 import '../../components/ShadowDOM/ShadowDOM.js';
 import '../../components/Transition/ZoomTransition/ZoomTransition.js';
@@ -51,11 +55,11 @@ import '../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
-import '../../context/LoadingContext/LoadingContext.js';
 import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import 'formik';
+import '../../context/FieldsStateContext/FieldsStateContext.js';
 import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../components/Alert/Alert.js';
 import '../../components/Input/Input.js';

package/src/lib/views/EmbeddedReveal/EmbeddedRevealView/EmbeddedRevealView.cjs

@@ -43,15 +43,20 @@ require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../context/WalletContext/WalletContext.cjs');
 var useIsTurnkeyWallet = require('../../../utils/hooks/useIsTurnkeyWallet/useIsTurnkeyWallet.cjs');
+var turnkeyExport = require('../utils/turnkeyExport/turnkeyExport.cjs');
 var usePromise = require('../../../utils/hooks/usePromise/usePromise.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 var useMutation = require('../../../utils/hooks/useMutation/useMutation.cjs');
 require('@dynamic-labs/types');
+require('../../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../../context/MockContext/MockContext.cjs');
-require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../../CollectUserDataView/useFields.cjs');
 require('../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('zustand');
+require('zustand/middleware');
+require('zustand/react/shallow');
 require('@dynamic-labs/rpc-providers');
 var Typography = require('../../../components/Typography/Typography.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
@@ -64,12 +69,12 @@ require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
-require('../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 var IconButton = require('../../../components/IconButton/IconButton.cjs');
 require('../../../components/MenuList/Dropdown/Dropdown.cjs');
 var ErrorContainer = require('../../../components/ErrorContainer/ErrorContainer.cjs');
 require('formik');
+require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 var TypographyButton = require('../../../components/TypographyButton/TypographyButton.cjs');
 require('../../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 var ModalHeader = require('../../../components/ModalHeader/ModalHeader.cjs');
@@ -88,7 +93,6 @@ require('qrcode');
 require('../../WalletList/WalletList.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
-var turnkeyExport = require('../utils/turnkeyExport/turnkeyExport.cjs');
 var constants = require('../constants.cjs');
 require('../../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 

package/src/lib/views/EmbeddedReveal/EmbeddedRevealView/EmbeddedRevealView.js

@@ -39,15 +39,20 @@ import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../context/WalletContext/WalletContext.js';
 import { useIsTurnkeyWallet } from '../../../utils/hooks/useIsTurnkeyWallet/useIsTurnkeyWallet.js';
+import { cleanupExport, exportCredential, initExport } from '../utils/turnkeyExport/turnkeyExport.js';
 import { usePromise } from '../../../utils/hooks/usePromise/usePromise.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import { useMutation } from '../../../utils/hooks/useMutation/useMutation.js';
 import '@dynamic-labs/types';
+import '../../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';
-import '../../../context/FieldsStateContext/FieldsStateContext.js';
+import '../../CollectUserDataView/useFields.js';
 import '../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import 'zustand';
+import 'zustand/middleware';
+import 'zustand/react/shallow';
 import '@dynamic-labs/rpc-providers';
 import { Typography } from '../../../components/Typography/Typography.js';
 import '../../../context/FooterAnimationContext/index.js';
@@ -60,12 +65,12 @@ import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
-import '../../../context/LoadingContext/LoadingContext.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import { IconButton } from '../../../components/IconButton/IconButton.js';
 import '../../../components/MenuList/Dropdown/Dropdown.js';
 import { ErrorContainer } from '../../../components/ErrorContainer/ErrorContainer.js';
 import 'formik';
+import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import { TypographyButton } from '../../../components/TypographyButton/TypographyButton.js';
 import '../../TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import { ModalHeader } from '../../../components/ModalHeader/ModalHeader.js';
@@ -84,7 +89,6 @@ import 'qrcode';
 import '../../WalletList/WalletList.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
-import { cleanupExport, exportCredential, initExport } from '../utils/turnkeyExport/turnkeyExport.js';
 import { iframeContainerId, iframeElementId } from '../constants.js';
 import '../../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 

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

@@ -19,6 +19,11 @@ require('../../../../utils/constants/values.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../../shared/consts/index.cjs');
 require('../../../../config/ApiEndpoint.cjs');
+var errors = require('../../../../utils/constants/errors.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
+require('viem');
+require('viem/chains');
 var embeddedWallets = require('../../../../data/api/embeddedWallets/embeddedWallets.cjs');
 require('../../../../locale/locale.cjs');
 
@@ -27,12 +32,12 @@ 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', errors.INVALID_WALLET_DATA);
     }
     const turnkeyExportHandler = (_b = wallet.connector) === null || _b === void 0 ? void 0 : _b.getExportHandler();
     const publicKey = yield turnkeyExportHandler.initExport(iframeContainer, iframeElementId);
     if (!publicKey) {
-        throw new utils.DynamicError('Something went wrong');
+        throw new utils.DynamicError('Something went wrong', errors.ERROR_PROCESSING_REVEAL_REQUEST);
     }
     return turnkeyExportHandler;
 });
@@ -48,7 +53,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);
@@ -86,7 +91,7 @@ const exportCredential = (_c) => _tslib.__awaiter(void 0, [_c], void 0, function
     const turnkeyExportHandler = connector.getExportHandler();
     const targetPublicKey = turnkeyExportHandler.publicKey;
     if (!targetPublicKey) {
-        throw new utils.DynamicError('Must initialize export first');
+        throw new utils.DynamicError('Must initialize export first', errors.ERROR_PROCESSING_REVEAL_REQUEST);
     }
     // calls turnkey export api
     let newActivity;
@@ -117,13 +122,12 @@ const exportCredential = (_c) => _tslib.__awaiter(void 0, [_c], void 0, function
         const res = yield embeddedWallets.exportEmbeddedWallet({
             activityId,
             environmentId,
-            userJwt: authToken || '',
             walletId: (wallet === null || wallet === void 0 ? void 0 : wallet.id) || '',
         });
         exportBundle = res === null || res === void 0 ? void 0 : res.exportBundle;
     }
     if (!exportBundle) {
-        throw new utils.DynamicError('Invalid export response');
+        throw new utils.DynamicError('Invalid export response', errors.ERROR_PROCESSING_REVEAL_REQUEST);
     }
     if (address || privateKeyId) {
         return turnkeyExportHandler.verifyExportPrivateKey(exportBundle);