@dynamic-labs/sdk-react-core 2.1.0-alpha.9 → 2.1.1

package/src/lib/views/SmsVerification/useSmsVerification/useSmsVerification.cjs

@@ -6,50 +6,48 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var reactInternationalPhone = require('react-international-phone');
-var utils = require('@dynamic-labs/utils');
 require('../../../context/DynamicContext/DynamicContext.cjs');
-var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 require('@dynamic-labs/sdk-api-core');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
-var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
+require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../../utils/constants/colors.cjs');
 require('../../../utils/constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
-var isTurnkeyEnabled = require('../../../utils/functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 require('viem');
 require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/store');
 var sms = require('../../../data/api/sms/sms.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
-var AccountExistsContext = require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 var useOtpVerificationRequest = require('../../../utils/hooks/authenticationHooks/useOtpVerificationRequest/useOtpVerificationRequest.cjs');
 require('react-dom');
-var useEmbeddedWallet = require('../../../utils/hooks/useEmbeddedWallet/useEmbeddedWallet.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 var VerificationContext = require('../../../context/VerificationContext/VerificationContext.cjs');
+require('../../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 var useMutation = require('../../../utils/hooks/useMutation/useMutation.cjs');
 var useOnUnmount = require('../../../utils/hooks/useOnUnmount/useOnUnmount.cjs');
 require('@dynamic-labs/types');
-var useCreateUserProfileByJWTCallback = require('../../../utils/hooks/useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.cjs');
-var useHandleVerifiedUser = require('../../../utils/hooks/useHandleVerifiedUser/useHandleVerifiedUser.cjs');
+var useUserAuth = require('../../../utils/hooks/useUserAuth/useUserAuth.cjs');
 require('yup');
 require('../../../context/MockContext/MockContext.cjs');
-require('react-i18next');
+require('../../CollectUserDataView/useFields.cjs');
 require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
-require('../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
+require('react-i18next');
 require('../../../components/Alert/Alert.cjs');
 require('../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../components/IconButton/IconButton.cjs');
@@ -76,6 +74,8 @@ require('../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
@@ -83,35 +83,32 @@ require('../../TransactionConfirmationView/helpers/transactionErrorMessage.cjs')
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
-const sleepToShowSuccessMessage = () => utils.sleep(1500);
 const useSmsVerification = (type) => {
-    var _a, _b, _c, _d;
-    const { handleVerifiedUserWithJWT } = useHandleVerifiedUser.useHandleVerifiedUser();
     const { verificationUUID, displayedDestination: formattedPhone, retryData, } = VerificationContext.useVerification();
-    const { environmentId, handleLogOut, setOnboardingOnlyJwt, setCallback, setShowAuthFlow, projectSettings, authToken, onboardingOnlyJwt, } = useInternalDynamicContext.useInternalDynamicContext();
-    const { setView, goToInitialView } = ViewContext.useViewContext();
-    const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback.useCreateUserProfileByJWTCallback();
+    const { environmentId, user, unauthenticatedUser } = useInternalDynamicContext.useInternalDynamicContext();
     const [error, setError] = React.useState();
-    const { createEmbeddedWallet } = useEmbeddedWallet.useEmbeddedWallet();
-    const isTurnkeyProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
     const { verifyOtp } = useOtpVerificationRequest.useOtpVerificationRequest();
-    const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
+    const { initAuth, completeAuth, cancelAuth } = useUserAuth.useUserAuth({
+        authMethod: 'sms',
+    });
     /** Whether verification was successfully performed */
     const isValidatedRef = React.useRef(false);
     useOnUnmount.useOnUnmount(() => {
-        dynamicEvents.dynamicEvents.emit('smsVerificationResult', isValidatedRef.current, retryData !== null && retryData !== void 0 ? retryData : {
+        const phone = retryData !== null && retryData !== void 0 ? retryData : {
             dialCode: '',
             iso2: '',
             phone: '',
-        });
+        };
         if (!retryData)
             logger.logger.warn('WARNING: emitted smsVerificationResult with incomplete params because retryData was undefined');
+        dynamicEvents.dynamicEvents.emit('smsVerificationResult', isValidatedRef.current, phone);
+        if (!isValidatedRef.current)
+            dynamicEvents.dynamicEvents.emit('authFailure', { option: phone, phone, type: 'sms' }, 'user-cancelled');
     });
     const retryOneTimePassword = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         setError(undefined);
         if (!verificationUUID || !retryData) {
-            yield handleLogOut();
-            goToInitialView();
+            yield cancelAuth();
             return;
         }
         sms.retrySmsVerification({
@@ -126,118 +123,42 @@ const useSmsVerification = (type) => {
         });
     });
     const submitOtpForVerification = React.useCallback((verificationToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f;
-        if (!verificationUUID || (!authToken && !onboardingOnlyJwt)) {
-            yield handleLogOut();
-            goToInitialView();
-            return false;
-        }
-        const { updateUserProfileResponse } = yield verifyOtp(verificationToken, 'sms', verificationUUID);
-        isValidatedRef.current = true;
-        // There are no scenarios currently where the backend requests another verification after
-        // an SMS verification, but if this changes in the future, we will have to replace this comment
-        // with code similar to what we have after calling verifyEmail in EmailVerification
-        if (onboardingOnlyJwt) {
-            yield handleVerifiedUserWithJWT(updateUserProfileResponse.jwt);
-            setOnboardingOnlyJwt(undefined);
-            setCallback('authSuccess');
-        }
-        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)) {
-            setShowAuthFlow(false);
-            return true;
+        if (!verificationUUID || (!user && !unauthenticatedUser)) {
+            yield cancelAuth();
+            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));
-        return true;
+        yield completeAuth({
+            onValidUpdatedJwt: () => (isValidatedRef.current = true),
+            updateJwtFunction: () => _tslib.__awaiter(void 0, void 0, void 0, function* () { return verifyOtp(verificationToken, 'sms', verificationUUID); }),
+        });
     }), [
-        authToken,
-        createEmbeddedWallet,
-        goToInitialView,
-        handleLogOut,
-        isTurnkeyProviderEnabled,
-        onboardingOnlyJwt,
-        (_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,
-        setCallback,
-        setOnboardingOnlyJwt,
-        setShowAuthFlow,
+        cancelAuth,
+        completeAuth,
+        user,
+        unauthenticatedUser,
         verificationUUID,
         verifyOtp,
     ]);
     const submitOtpForLogin = React.useCallback((verificationToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _g, _h;
         if (!verificationUUID) {
-            yield handleLogOut();
-            goToInitialView();
-            return false;
+            yield cancelAuth();
+            return;
         }
-        try {
-            const { jwt, minifiedJwt } = yield sms.signInWithSmsVerification({
+        yield initAuth({
+            onError: (error) => setError(error),
+            onVerifySuccess: () => {
+                isValidatedRef.current = true;
+            },
+            options: { phone: retryData },
+            showSuccessMessage: true,
+            verifyFunction: () => sms.signInWithSmsVerification({
                 environmentId,
                 verificationToken,
                 verificationUUID,
-            });
-            if (!jwt) {
-                yield handleLogOut();
-                goToInitialView();
-                return false;
-            }
-            isValidatedRef.current = true;
-            const decodedJwt = decodeJwt.decodeJwt(jwt);
-            if (decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields.length) {
-                setOnboardingOnlyJwt(jwt);
-                yield sleepToShowSuccessMessage();
-                setView('collect-user-data-login-no-wallet', {
-                    userIdentification: 'phoneNumber',
-                    userIdentificationOverride: formattedPhone,
-                });
-                return true;
-            }
-            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 &&
-                !((_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)) {
-                setShowAuthFlow(false);
-                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));
-            return true;
-        }
-        catch (error) {
-            if (error instanceof utils.NoAccessError) {
-                setView('no-access');
-            }
-            if (error instanceof utils.AccountExistsError) {
-                setExistentAccountData(error.errorPayload);
-                setView('account-exists');
-            }
-            logger.logger.debug(error);
-            setError(error);
-            return false;
-        }
-    }), [
-        createEmbeddedWallet,
-        createUserProfileByJWT,
-        environmentId,
-        formattedPhone,
-        goToInitialView,
-        handleLogOut,
-        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,
-        setCallback,
-        setOnboardingOnlyJwt,
-        setShowAuthFlow,
-        setView,
-        verificationUUID,
-        setExistentAccountData,
-    ]);
-    const { data: isValid, isLoading, mutate: onSubmit, } = useMutation.useMutation(type === 'login' ? submitOtpForLogin : submitOtpForVerification, {
+            }),
+        });
+    }), [verificationUUID, initAuth, retryData, cancelAuth, environmentId]);
+    const { isLoading, mutate: onSubmit } = useMutation.useMutation(type === 'login' ? submitOtpForLogin : submitOtpForVerification, {
         onFailure: (error) => {
             setError(error);
         },
@@ -246,7 +167,7 @@ const useSmsVerification = (type) => {
         error,
         formattedPhone: formattedPhone !== null && formattedPhone !== void 0 ? formattedPhone : '',
         isLoading,
-        isValid: Boolean(isValid),
+        isValid: isValidatedRef.current,
         onSubmit,
         retryOneTimePassword,
         setError,

package/src/lib/views/SmsVerification/useSmsVerification/useSmsVerification.js

@@ -2,50 +2,48 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useRef, useCallback } from 'react';
 import { removeDialCode } from 'react-international-phone';
-import { NoAccessError, AccountExistsError, sleep } from '@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';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
-import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
+import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../../utils/constants/colors.js';
 import '../../../utils/constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
+import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
-import { isTurnkeyEnabled } from '../../../utils/functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 import 'viem';
 import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
+import '@dynamic-labs/store';
 import { signInWithSmsVerification, retrySmsVerification } from '../../../data/api/sms/sms.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 '../../../context/ThemeContext/ThemeContext.js';
 import { useVerification } from '../../../context/VerificationContext/VerificationContext.js';
+import '../../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import { useMutation } from '../../../utils/hooks/useMutation/useMutation.js';
 import { useOnUnmount } from '../../../utils/hooks/useOnUnmount/useOnUnmount.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 'react-i18next';
+import '../../CollectUserDataView/useFields.js';
 import '../../../context/FieldsStateContext/FieldsStateContext.js';
-import '../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
+import 'react-i18next';
 import '../../../components/Alert/Alert.js';
 import '../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../components/IconButton/IconButton.js';
@@ -72,6 +70,8 @@ import '../../../context/LoadingContext/LoadingContext.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
+import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
@@ -79,35 +79,32 @@ import '../../TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
-const sleepToShowSuccessMessage = () => sleep(1500);
 const useSmsVerification = (type) => {
-    var _a, _b, _c, _d;
-    const { handleVerifiedUserWithJWT } = useHandleVerifiedUser();
     const { verificationUUID, displayedDestination: formattedPhone, retryData, } = useVerification();
-    const { environmentId, handleLogOut, setOnboardingOnlyJwt, setCallback, setShowAuthFlow, projectSettings, authToken, onboardingOnlyJwt, } = useInternalDynamicContext();
-    const { setView, goToInitialView } = useViewContext();
-    const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback();
+    const { environmentId, user, unauthenticatedUser } = useInternalDynamicContext();
     const [error, setError] = useState();
-    const { createEmbeddedWallet } = useEmbeddedWallet();
-    const isTurnkeyProviderEnabled = isTurnkeyEnabled(projectSettings);
     const { verifyOtp } = useOtpVerificationRequest();
-    const { setExistentAccountData } = useAccountExistsContext();
+    const { initAuth, completeAuth, cancelAuth } = useUserAuth({
+        authMethod: 'sms',
+    });
     /** Whether verification was successfully performed */
     const isValidatedRef = useRef(false);
     useOnUnmount(() => {
-        dynamicEvents.emit('smsVerificationResult', isValidatedRef.current, retryData !== null && retryData !== void 0 ? retryData : {
+        const phone = retryData !== null && retryData !== void 0 ? retryData : {
             dialCode: '',
             iso2: '',
             phone: '',
-        });
+        };
         if (!retryData)
             logger.warn('WARNING: emitted smsVerificationResult with incomplete params because retryData was undefined');
+        dynamicEvents.emit('smsVerificationResult', isValidatedRef.current, phone);
+        if (!isValidatedRef.current)
+            dynamicEvents.emit('authFailure', { option: phone, phone, type: 'sms' }, 'user-cancelled');
     });
     const retryOneTimePassword = () => __awaiter(void 0, void 0, void 0, function* () {
         setError(undefined);
         if (!verificationUUID || !retryData) {
-            yield handleLogOut();
-            goToInitialView();
+            yield cancelAuth();
             return;
         }
         retrySmsVerification({
@@ -122,118 +119,42 @@ const useSmsVerification = (type) => {
         });
     });
     const submitOtpForVerification = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f;
-        if (!verificationUUID || (!authToken && !onboardingOnlyJwt)) {
-            yield handleLogOut();
-            goToInitialView();
-            return false;
-        }
-        const { updateUserProfileResponse } = yield verifyOtp(verificationToken, 'sms', verificationUUID);
-        isValidatedRef.current = true;
-        // There are no scenarios currently where the backend requests another verification after
-        // an SMS verification, but if this changes in the future, we will have to replace this comment
-        // with code similar to what we have after calling verifyEmail in EmailVerification
-        if (onboardingOnlyJwt) {
-            yield handleVerifiedUserWithJWT(updateUserProfileResponse.jwt);
-            setOnboardingOnlyJwt(undefined);
-            setCallback('authSuccess');
-        }
-        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)) {
-            setShowAuthFlow(false);
-            return true;
+        if (!verificationUUID || (!user && !unauthenticatedUser)) {
+            yield cancelAuth();
+            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));
-        return true;
+        yield completeAuth({
+            onValidUpdatedJwt: () => (isValidatedRef.current = true),
+            updateJwtFunction: () => __awaiter(void 0, void 0, void 0, function* () { return verifyOtp(verificationToken, 'sms', verificationUUID); }),
+        });
     }), [
-        authToken,
-        createEmbeddedWallet,
-        goToInitialView,
-        handleLogOut,
-        isTurnkeyProviderEnabled,
-        onboardingOnlyJwt,
-        (_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,
-        setCallback,
-        setOnboardingOnlyJwt,
-        setShowAuthFlow,
+        cancelAuth,
+        completeAuth,
+        user,
+        unauthenticatedUser,
         verificationUUID,
         verifyOtp,
     ]);
     const submitOtpForLogin = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
-        var _g, _h;
         if (!verificationUUID) {
-            yield handleLogOut();
-            goToInitialView();
-            return false;
+            yield cancelAuth();
+            return;
         }
-        try {
-            const { jwt, minifiedJwt } = yield signInWithSmsVerification({
+        yield initAuth({
+            onError: (error) => setError(error),
+            onVerifySuccess: () => {
+                isValidatedRef.current = true;
+            },
+            options: { phone: retryData },
+            showSuccessMessage: true,
+            verifyFunction: () => signInWithSmsVerification({
                 environmentId,
                 verificationToken,
                 verificationUUID,
-            });
-            if (!jwt) {
-                yield handleLogOut();
-                goToInitialView();
-                return false;
-            }
-            isValidatedRef.current = true;
-            const decodedJwt = decodeJwt(jwt);
-            if (decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields.length) {
-                setOnboardingOnlyJwt(jwt);
-                yield sleepToShowSuccessMessage();
-                setView('collect-user-data-login-no-wallet', {
-                    userIdentification: 'phoneNumber',
-                    userIdentificationOverride: formattedPhone,
-                });
-                return true;
-            }
-            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 &&
-                !((_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)) {
-                setShowAuthFlow(false);
-                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));
-            return true;
-        }
-        catch (error) {
-            if (error instanceof NoAccessError) {
-                setView('no-access');
-            }
-            if (error instanceof AccountExistsError) {
-                setExistentAccountData(error.errorPayload);
-                setView('account-exists');
-            }
-            logger.debug(error);
-            setError(error);
-            return false;
-        }
-    }), [
-        createEmbeddedWallet,
-        createUserProfileByJWT,
-        environmentId,
-        formattedPhone,
-        goToInitialView,
-        handleLogOut,
-        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,
-        setCallback,
-        setOnboardingOnlyJwt,
-        setShowAuthFlow,
-        setView,
-        verificationUUID,
-        setExistentAccountData,
-    ]);
-    const { data: isValid, isLoading, mutate: onSubmit, } = useMutation(type === 'login' ? submitOtpForLogin : submitOtpForVerification, {
+            }),
+        });
+    }), [verificationUUID, initAuth, retryData, cancelAuth, environmentId]);
+    const { isLoading, mutate: onSubmit } = useMutation(type === 'login' ? submitOtpForLogin : submitOtpForVerification, {
         onFailure: (error) => {
             setError(error);
         },
@@ -242,7 +163,7 @@ const useSmsVerification = (type) => {
         error,
         formattedPhone: formattedPhone !== null && formattedPhone !== void 0 ? formattedPhone : '',
         isLoading,
-        isValid: Boolean(isValid),
+        isValid: isValidatedRef.current,
         onSubmit,
         retryOneTimePassword,
         setError,

package/src/lib/views/SocialRedirectView/SocialRedirectView.cjs

@@ -28,6 +28,7 @@ require('react-international-phone');
 require('viem');
 require('viem/chains');
 require('../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/store');
 require('../../locale/locale.cjs');
 require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../context/AccountExistsContext/AccountExistsContext.cjs');
@@ -37,11 +38,13 @@ require('react-dom');
 require('../../context/WalletContext/WalletContext.cjs');
 var useFindSocialIcon = require('../../utils/hooks/useFindSocialIcon/useFindSocialIcon.cjs');
 require('../../context/ThemeContext/ThemeContext.cjs');
+require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
+require('../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../context/MockContext/MockContext.cjs');
+require('../CollectUserDataView/useFields.cjs');
 require('../../context/FieldsStateContext/FieldsStateContext.cjs');
-require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 var PoweredByDynamic = require('../../components/PoweredByDynamic/PoweredByDynamic.cjs');
@@ -53,10 +56,10 @@ require('../../components/Transition/OpacityTransition/OpacityTransition.cjs');
 require('../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
 var SocialRedirectContext = require('../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../context/MfaSettingsContext/MfaSettingsContext.cjs');
 require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
 var IconWithSpinner = require('../../components/IconWithSpinner/IconWithSpinner.cjs');
-require('../../context/LoadingContext/LoadingContext.cjs');
 require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
@@ -77,6 +80,7 @@ require('../WalletList/WalletList.cjs');
 require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
+require('../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 
 const SocialRedirectView = () => {
     const { socialProvider, signInProvider } = SocialRedirectContext.useSocialRedirectContext();

package/src/lib/views/SocialRedirectView/SocialRedirectView.js

@@ -24,6 +24,7 @@ import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
 import '../../config/ApiEndpoint.js';
+import '@dynamic-labs/store';
 import '../../locale/locale.js';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../context/AccountExistsContext/AccountExistsContext.js';
@@ -33,11 +34,13 @@ import 'react-dom';
 import '../../context/WalletContext/WalletContext.js';
 import { useFindSocialIcon } from '../../utils/hooks/useFindSocialIcon/useFindSocialIcon.js';
 import '../../context/ThemeContext/ThemeContext.js';
+import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
+import '../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../context/MockContext/MockContext.js';
+import '../CollectUserDataView/useFields.js';
 import '../../context/FieldsStateContext/FieldsStateContext.js';
-import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import { PoweredByDynamic } from '../../components/PoweredByDynamic/PoweredByDynamic.js';
@@ -49,10 +52,10 @@ import '../../components/Transition/OpacityTransition/OpacityTransition.js';
 import '../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.js';
 import { useSocialRedirectContext } from '../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
 import { IconWithSpinner } from '../../components/IconWithSpinner/IconWithSpinner.js';
-import '../../context/LoadingContext/LoadingContext.js';
 import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
@@ -73,6 +76,7 @@ import '../WalletList/WalletList.js';
 import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
+import '../../context/IpConfigurationContext/IpConfigurationContext.js';
 
 const SocialRedirectView = () => {
     const { socialProvider, signInProvider } = useSocialRedirectContext();