@dynamic-labs/sdk-react-core 2.0.0-alpha.30 → 2.0.0-alpha.31

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

@@ -29,6 +29,7 @@ import { isTurnkeyEnabled } from '../../utils/functions/isTurnkeyEnabled/isTurnk
 import 'viem';
 import 'viem/chains';
 import { signInWithEmailVerification, retryEmailVerification } from '../../data/api.js';
+import { updateJWTAndCreateUserProfile } from '../../utils/functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.js';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import { useAccountExistsContext } from '../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../context/UserWalletsContext/UserWalletsContext.js';
@@ -38,6 +39,7 @@ import { useEmbeddedWallet } from '../../utils/hooks/useEmbeddedWallet/useEmbedd
 import '../../context/ThemeContext/ThemeContext.js';
 import { useVerification } from '../../context/VerificationContext/VerificationContext.js';
 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';
@@ -47,8 +49,9 @@ import '../../context/MockContext/MockContext.js';
 import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
-import 'i18next';
+import '../../locale/locale.js';
 import { Typography } from '../../components/Typography/Typography.js';
+import { useIsTurnkeyWallet } from '../../utils/hooks/useIsTurnkeyWallet/useIsTurnkeyWallet.js';
 import '../../context/FooterAnimationContext/index.js';
 import '../../components/ShadowDOM/ShadowDOM.js';
 import '../../components/Transition/ZoomTransition/ZoomTransition.js';
@@ -91,10 +94,10 @@ import '../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.
 
 const SECONDS_TO_RETRY = 15;
 const sleepToShowSuccessMessage = () => sleep(1500);
-const EmailVerification = () => {
+const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _showRetryButton = true, showTransferMessage: _showTransferMessage = false, }) => {
     var _a, _b, _c, _d;
-    const [showRetryButton, setShowRetryButton] = useState(true);
-    const [showTransferMessage, setShowTransferMessage] = useState(false);
+    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);
@@ -106,11 +109,13 @@ const EmailVerification = () => {
     const { view, setView, goToInitialView } = useViewContext();
     const { error, setError, setErrorMessage } = useErrorContext();
     const { setExistentAccountData } = useAccountExistsContext();
-    const { environmentId, onboardingOnlyJwt, handleLogOut, authToken, setOnboardingOnlyJwt, setShowAuthFlow, setCallback, projectSettings, } = useInternalDynamicContext();
+    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();
     // When true, causes the component to call emailVerificationX callback on unmount
     const callCallbackOnUnmount = useRef(true);
     useOnUnmount(() => {
@@ -125,7 +130,7 @@ const EmailVerification = () => {
     const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback();
     const isTurnkeyProviderEnabled = isTurnkeyEnabled(projectSettings);
     const handleComplete = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f;
+        var _e, _f, _g;
         setError(undefined);
         setLoading(true);
         if (!verificationUUID || (!authToken && !onboardingOnlyJwt)) {
@@ -151,8 +156,25 @@ const EmailVerification = () => {
             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 (isTurnkeyProviderEnabled &&
-                !((_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)) {
+                !((_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;
             }
@@ -164,7 +186,11 @@ const EmailVerification = () => {
             logger.debug(error);
             // Handle the case where the user has already an account with the email
             if (error instanceof UserHasAccountWithEmailError) {
-                setView('merge-user-accounts');
+                setView('merge-user-accounts', {
+                    returnToView: isEmailRecoveryFlow
+                        ? 'passkey-recovery-add-email'
+                        : undefined,
+                });
                 return; // Early return to not show the error message
             }
             setErrorMessage(error.code);
@@ -181,17 +207,24 @@ const EmailVerification = () => {
         handleLogOut,
         goToInitialView,
         verifyOtp,
+        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,
     ]);
     const handleEmailLogin = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
-        var _g, _h;
+        var _h, _j;
         setError(undefined);
         setLoading(true);
         if (!verificationUUID) {
@@ -226,7 +259,7 @@ const EmailVerification = () => {
             yield sleepToShowSuccessMessage();
             yield createUserProfileByJWT(jwt, minifiedJwt);
             if (isTurnkeyProviderEnabled &&
-                !((_h = (_g = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _g === void 0 ? void 0 : _g.embeddedWallets) === null || _h === void 0 ? void 0 : _h.automaticEmbeddedWalletCreation)) {
+                !((_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;
             }
@@ -255,6 +288,7 @@ const EmailVerification = () => {
         handleLogOut,
         goToInitialView,
         environmentId,
+        handleVerifiedUserWithJWT,
         setCallback,
         createUserProfileByJWT,
         isTurnkeyProviderEnabled,
@@ -297,6 +331,10 @@ const EmailVerification = () => {
     // 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(() => {
@@ -305,7 +343,7 @@ const EmailVerification = () => {
     }, []);
     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 && (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) })] }), !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') }))] })] }));
 };
 
 export { EmailVerification };

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

@@ -26,8 +26,8 @@ require('react-international-phone');
 var shortenEmail = require('../../shared/utils/functions/shortenEmail/shortenEmail.cjs');
 require('viem');
 require('viem/chains');
-require('i18next');
 require('../../config/ApiEndpoint.cjs');
+require('../../locale/locale.cjs');
 require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../context/UserWalletsContext/UserWalletsContext.cjs');

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

@@ -22,8 +22,8 @@ import 'react-international-phone';
 import { shortenEmail } from '../../shared/utils/functions/shortenEmail/shortenEmail.js';
 import 'viem';
 import 'viem/chains';
-import 'i18next';
 import '../../config/ApiEndpoint.js';
+import '../../locale/locale.js';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../context/UserWalletsContext/UserWalletsContext.js';

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

@@ -33,8 +33,8 @@ require('react-international-phone');
 require('viem');
 require('viem/chains');
 var getEOAWallet = require('../../../utils/functions/getEOAWallet/getEOAWallet.cjs');
-require('i18next');
 var ApiEndpoint = require('../../../config/ApiEndpoint.cjs');
+require('../../../locale/locale.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');

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

@@ -29,8 +29,8 @@ import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
 import { getEOAWallet } from '../../../utils/functions/getEOAWallet/getEOAWallet.js';
-import 'i18next';
 import ApiEndpoint from '../../../config/ApiEndpoint.js';
+import '../../../locale/locale.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';

package/src/lib/views/EnterPasswordView/EnterPasswordView.cjs

@@ -28,8 +28,8 @@ require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('viem');
 require('viem/chains');
-require('i18next');
 require('../../config/ApiEndpoint.cjs');
+require('../../locale/locale.cjs');
 require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../context/UserWalletsContext/UserWalletsContext.cjs');

package/src/lib/views/EnterPasswordView/EnterPasswordView.js

@@ -24,8 +24,8 @@ import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
-import 'i18next';
 import '../../config/ApiEndpoint.js';
+import '../../locale/locale.js';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../context/UserWalletsContext/UserWalletsContext.js';

package/src/lib/views/FarcasterConnectView/FarcasterConnectView.cjs

@@ -24,8 +24,8 @@ require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('viem');
 require('viem/chains');
-require('i18next');
 require('../../config/ApiEndpoint.cjs');
+require('../../locale/locale.cjs');
 require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../context/UserWalletsContext/UserWalletsContext.cjs');

package/src/lib/views/FarcasterConnectView/FarcasterConnectView.js

@@ -20,8 +20,8 @@ import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
-import 'i18next';
 import '../../config/ApiEndpoint.js';
+import '../../locale/locale.js';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../context/UserWalletsContext/UserWalletsContext.js';

package/src/lib/views/LoginView/LoginViewSection/LoginViewSection.cjs

@@ -25,8 +25,8 @@ require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('viem');
 require('viem/chains');
-require('i18next');
 require('../../../config/ApiEndpoint.cjs');
+require('../../../locale/locale.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');

package/src/lib/views/LoginView/LoginViewSection/LoginViewSection.js

@@ -21,8 +21,8 @@ import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
-import 'i18next';
 import '../../../config/ApiEndpoint.js';
+import '../../../locale/locale.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';

package/src/lib/views/LoginView/sections/EmailSignInSection/LoginEmailForm.cjs

@@ -26,8 +26,8 @@ require('react-international-phone');
 var isEmailProviderEnabled = require('../../../../utils/functions/isEmailProviderEnabled/isEmailProviderEnabled.cjs');
 require('viem');
 require('viem/chains');
-require('i18next');
 require('../../../../config/ApiEndpoint.cjs');
+require('../../../../locale/locale.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -131,7 +131,7 @@ const LoginEmailForm = ({ isLoading: isExternalLoading, onSubmit, onSubmitError,
         logger.logger.error('Failed to render EmailSignInSection - no sign in provider enabled');
         return null;
     }
-    return (jsxRuntime.jsx(EmailForm.EmailForm, { onSubmit: handleSubmit, onSubmitError: onSubmitError, isLoading: isLoading, currentEmail: currentEmail, emailSubmitButtonInsideInput: (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _b === void 0 ? void 0 : _b.emailSubmitButtonInsideInput, isEmailInvalid: invalidEmail, className: className, style: style }));
+    return (jsxRuntime.jsx(EmailForm.EmailForm, { onSubmit: handleSubmit, isLoading: isLoading, currentEmail: currentEmail, emailSubmitButtonInsideInput: (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _b === void 0 ? void 0 : _b.emailSubmitButtonInsideInput, isEmailInvalid: invalidEmail, className: className, style: style }));
 };
 
 exports.LoginEmailForm = LoginEmailForm;

package/src/lib/views/LoginView/sections/EmailSignInSection/LoginEmailForm.js

@@ -22,8 +22,8 @@ import 'react-international-phone';
 import { isEmailProviderEnabled } from '../../../../utils/functions/isEmailProviderEnabled/isEmailProviderEnabled.js';
 import 'viem';
 import 'viem/chains';
-import 'i18next';
 import '../../../../config/ApiEndpoint.js';
+import '../../../../locale/locale.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -127,7 +127,7 @@ const LoginEmailForm = ({ isLoading: isExternalLoading, onSubmit, onSubmitError,
         logger.error('Failed to render EmailSignInSection - no sign in provider enabled');
         return null;
     }
-    return (jsx(EmailForm, { onSubmit: handleSubmit, onSubmitError: onSubmitError, isLoading: isLoading, currentEmail: currentEmail, emailSubmitButtonInsideInput: (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _b === void 0 ? void 0 : _b.emailSubmitButtonInsideInput, isEmailInvalid: invalidEmail, className: className, style: style }));
+    return (jsx(EmailForm, { onSubmit: handleSubmit, isLoading: isLoading, currentEmail: currentEmail, emailSubmitButtonInsideInput: (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _b === void 0 ? void 0 : _b.emailSubmitButtonInsideInput, isEmailInvalid: invalidEmail, className: className, style: style }));
 };
 
 export { LoginEmailForm };

package/src/lib/views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs

@@ -28,8 +28,8 @@ require('react-international-phone');
 var getCustomCountries = require('../../../../utils/functions/getCustomCountries/getCustomCountries.cjs');
 require('viem');
 require('viem/chains');
-require('i18next');
 require('../../../../config/ApiEndpoint.cjs');
+require('../../../../locale/locale.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');

package/src/lib/views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js

@@ -24,8 +24,8 @@ import 'react-international-phone';
 import { getCustomCountries } from '../../../../utils/functions/getCustomCountries/getCustomCountries.js';
 import 'viem';
 import 'viem/chains';
-import 'i18next';
 import '../../../../config/ApiEndpoint.js';
+import '../../../../locale/locale.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/UserWalletsContext/UserWalletsContext.js';

package/src/lib/views/LoginView/sections/PhoneNumberSignInSection/useSubmitPhoneNumber/useSubmitPhoneNumber.cjs

@@ -62,7 +62,8 @@ require('../../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../../WalletList/WalletList.cjs');
 require('../../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
-require('i18next');
+require('../../../../../locale/locale.cjs');
+var translation = require('../../../../../locale/en/translation.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../../../config/ApiEndpoint.cjs');
@@ -75,8 +76,6 @@ require('../../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs')
 require('../../../../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var useInternalDynamicContext = require('../../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
-require('../../../../../locale/locale.cjs');
-var translation = require('../../../../../locale/en/translation.cjs');
 
 const useSubmitPhoneNumber = ({ onSubmit, onSubmitError, country, phone, setInvalidNumberMessage, }) => {
     const { engageCaptcha } = CaptchaContext.useCaptchaContext();

package/src/lib/views/LoginView/sections/PhoneNumberSignInSection/useSubmitPhoneNumber/useSubmitPhoneNumber.js

@@ -58,7 +58,8 @@ import '../../../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../../WalletList/WalletList.js';
 import '../../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
-import 'i18next';
+import '../../../../../locale/locale.js';
+import { translation } from '../../../../../locale/en/translation.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../../../../context/LoadingContext/LoadingContext.js';
 import '../../../../../config/ApiEndpoint.js';
@@ -71,8 +72,6 @@ import '../../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../../TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import { useInternalDynamicContext } from '../../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
-import '../../../../../locale/locale.js';
-import { translation } from '../../../../../locale/en/translation.js';
 
 const useSubmitPhoneNumber = ({ onSubmit, onSubmitError, country, phone, setInvalidNumberMessage, }) => {
     const { engageCaptcha } = useCaptchaContext();

package/src/lib/views/LoginView/sections/SocialSignInSection/DynamicSocialSignIn/DynamicSocialSignIn.cjs

@@ -26,8 +26,8 @@ require('react-international-phone');
 var getProviderEnumForSocialSignInProvider = require('../../../../../utils/functions/getProviderEnumForSocialSignInProvider/getProviderEnumForSocialSignInProvider.cjs');
 require('viem');
 require('viem/chains');
-require('i18next');
 require('../../../../../config/ApiEndpoint.cjs');
+require('../../../../../locale/locale.cjs');
 require('../../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../../context/UserWalletsContext/UserWalletsContext.cjs');

package/src/lib/views/LoginView/sections/SocialSignInSection/DynamicSocialSignIn/DynamicSocialSignIn.js

@@ -22,8 +22,8 @@ import 'react-international-phone';
 import { getProviderEnumForSocialSignInProvider } from '../../../../../utils/functions/getProviderEnumForSocialSignInProvider/getProviderEnumForSocialSignInProvider.js';
 import 'viem';
 import 'viem/chains';
-import 'i18next';
 import '../../../../../config/ApiEndpoint.js';
+import '../../../../../locale/locale.js';
 import '../../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../../context/UserWalletsContext/UserWalletsContext.js';

package/src/lib/views/LoginView/sections/SocialSignInSection/MagicSocialSignIn/MagicSocialSignIn.cjs

@@ -25,8 +25,8 @@ require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('viem');
 require('viem/chains');
-require('i18next');
 require('../../../../../config/ApiEndpoint.cjs');
+require('../../../../../locale/locale.cjs');
 require('../../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../../context/UserWalletsContext/UserWalletsContext.cjs');

package/src/lib/views/LoginView/sections/SocialSignInSection/MagicSocialSignIn/MagicSocialSignIn.js

@@ -21,8 +21,8 @@ import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
-import 'i18next';
 import '../../../../../config/ApiEndpoint.js';
+import '../../../../../locale/locale.js';
 import '../../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../../context/UserWalletsContext/UserWalletsContext.js';

package/src/lib/views/LoginView/sections/SocialSignInSection/SocialSignInSection.cjs

@@ -26,8 +26,8 @@ var getSocialSignInProviderFromString = require('../../../../utils/functions/get
 var isProviderEnabled = require('../../../../utils/functions/isProviderEnabled/isProviderEnabled.cjs');
 require('viem');
 require('viem/chains');
-require('i18next');
 require('../../../../config/ApiEndpoint.cjs');
+require('../../../../locale/locale.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');

package/src/lib/views/LoginView/sections/SocialSignInSection/SocialSignInSection.js

@@ -22,8 +22,8 @@ import { getSocialSignInProviderFromString } from '../../../../utils/functions/g
 import { isProviderEnabled } from '../../../../utils/functions/isProviderEnabled/isProviderEnabled.js';
 import 'viem';
 import 'viem/chains';
-import 'i18next';
 import '../../../../config/ApiEndpoint.js';
+import '../../../../locale/locale.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/UserWalletsContext/UserWalletsContext.js';

package/src/lib/views/LoginView/sections/ToggleableSection/ToggleableSection.cjs

@@ -24,8 +24,8 @@ require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('viem');
 require('viem/chains');
-require('i18next');
 require('../../../../config/ApiEndpoint.cjs');
+require('../../../../locale/locale.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');

package/src/lib/views/LoginView/sections/ToggleableSection/ToggleableSection.js

@@ -20,8 +20,8 @@ import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
-import 'i18next';
 import '../../../../config/ApiEndpoint.js';
+import '../../../../locale/locale.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/UserWalletsContext/UserWalletsContext.js';

package/src/lib/views/LoginView/sections/WalletSignInSection/ListItemButton/ListItemButton.cjs

@@ -26,8 +26,8 @@ require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('viem');
 require('viem/chains');
-require('i18next');
 require('../../../../../config/ApiEndpoint.cjs');
+require('../../../../../locale/locale.cjs');
 require('../../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../../context/UserWalletsContext/UserWalletsContext.cjs');

package/src/lib/views/LoginView/sections/WalletSignInSection/ListItemButton/ListItemButton.js

@@ -22,8 +22,8 @@ import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
-import 'i18next';
 import '../../../../../config/ApiEndpoint.js';
+import '../../../../../locale/locale.js';
 import '../../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../../context/UserWalletsContext/UserWalletsContext.js';

package/src/lib/views/LoginView/sections/WalletSignInSection/WalletSignInSection.cjs

@@ -25,8 +25,8 @@ require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('viem');
 require('viem/chains');
-require('i18next');
 require('../../../../config/ApiEndpoint.cjs');
+require('../../../../locale/locale.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');

package/src/lib/views/LoginView/sections/WalletSignInSection/WalletSignInSection.js

@@ -21,8 +21,8 @@ import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
-import 'i18next';
 import '../../../../config/ApiEndpoint.js';
+import '../../../../locale/locale.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/UserWalletsContext/UserWalletsContext.js';

package/src/lib/views/LoginView/sections/WalletSignInSection/WalletSimpleSignIn/WalletSimpleSignIn.cjs

@@ -27,8 +27,8 @@ require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('viem');
 require('viem/chains');
-require('i18next');
 require('../../../../../config/ApiEndpoint.cjs');
+require('../../../../../locale/locale.cjs');
 require('../../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../../context/UserWalletsContext/UserWalletsContext.cjs');

package/src/lib/views/LoginView/sections/WalletSignInSection/WalletSimpleSignIn/WalletSimpleSignIn.js

@@ -23,8 +23,8 @@ import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
-import 'i18next';
 import '../../../../../config/ApiEndpoint.js';
+import '../../../../../locale/locale.js';
 import '../../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../../context/UserWalletsContext/UserWalletsContext.js';

package/src/lib/views/LoginView/useLoginView/useLoginView.cjs

@@ -27,8 +27,8 @@ require('react-international-phone');
 var isEmailProviderEnabled = require('../../../utils/functions/isEmailProviderEnabled/isEmailProviderEnabled.cjs');
 require('viem');
 require('viem/chains');
-require('i18next');
 require('../../../config/ApiEndpoint.cjs');
+require('../../../locale/locale.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');

package/src/lib/views/LoginView/useLoginView/useLoginView.js

@@ -23,8 +23,8 @@ import 'react-international-phone';
 import { isEmailProviderEnabled } from '../../../utils/functions/isEmailProviderEnabled/isEmailProviderEnabled.js';
 import 'viem';
 import 'viem/chains';
-import 'i18next';
 import '../../../config/ApiEndpoint.js';
+import '../../../locale/locale.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';

package/src/lib/views/MergeUserAccountsView/MergeUserAccountsView.cjs

@@ -46,7 +46,7 @@ require('../../context/MockContext/MockContext.cjs');
 require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
-require('i18next');
+require('../../locale/locale.cjs');
 var Typography = require('../../components/Typography/Typography.cjs');
 require('../../context/FooterAnimationContext/index.cjs');
 require('../../components/ShadowDOM/ShadowDOM.cjs');
@@ -82,7 +82,7 @@ require('@hcaptcha/react-hcaptcha');
 require('../../config/ApiEndpoint.cjs');
 require('../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 
-const MergeUserAccountsView = () => {
+const MergeUserAccountsView = ({ returnToView, }) => {
     const { environmentId, setUser, setOnboardingOnlyJwt, setShowAuthFlow, setCallback, primaryWallet, user, authToken, onboardingOnlyJwt, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleVerifiedUserWithUser } = useHandleVerifiedUser.useHandleVerifiedUser();
     const { t } = reactI18next.useTranslation();
@@ -120,6 +120,10 @@ const MergeUserAccountsView = () => {
     });
     const handleUseDifferentEmail = () => {
         setError(undefined);
+        if (returnToView) {
+            setView(returnToView);
+            return;
+        }
         if (user) {
             setShowAuthFlow(false);
             return;

package/src/lib/views/MergeUserAccountsView/MergeUserAccountsView.d.ts

@@ -1,2 +1,6 @@
-/// <reference types="react" />
-export declare const MergeUserAccountsView: () => JSX.Element;
+import { FC } from 'react';
+import { ViewType } from '../../context/ViewContext';
+export type MergeUserAccountsViewProps = {
+    returnToView?: ViewType;
+};
+export declare const MergeUserAccountsView: FC<MergeUserAccountsViewProps>;