@dynamic-labs/sdk-react-core 1.0.4 → 1.0.5

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

@@ -60,7 +60,8 @@ const useAuthLayoutChecks = (walletConnector) => {
             // Don't show empty footer during the login
             ((view === 'login-with-email-or-wallet' ||
                 view === 'login-with-email-or-wallet-full-wallet-list' ||
-                view === 'login-with-wallet-only') &&
+                view === 'login-with-wallet-only' ||
+                view === 'multi-wallet-wallet-list') &&
                 (termsOfServiceUrl ||
                     privacyPolicyUrl ||
                     customPrivacyPolicy ||
@@ -90,7 +91,7 @@ const useAuthLayoutChecks = (walletConnector) => {
         view === 'passkey-intro' ||
         (view === 'merge-user-accounts' && !user);
     const showQrCodePreHeader = view === 'qr-code' && showQrCodeMessage && !showQrCodeImage;
-    const showDefaultFooter = !showDynamicFooter && !showToSFooter;
+    const showDefaultFooter = !showConnectedWalletProgress && !showDynamicFooter && !showToSFooter;
     return {
         displayBorderBelowHeader,
         isWalletListTypeView,

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

@@ -6,11 +6,11 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var createEmbeddedWalletWithPasskey = require('../../../views/Passkey/utils/createEmbeddedWalletWithPasskey/createEmbeddedWalletWithPasskey.cjs');
 var findPasskeyEmailWalletConnector = require('../../../views/Passkey/utils/findPasskeyEmailWalletConnector/findPasskeyEmailWalletConnector.cjs');
 var createPregeneratedWallet = require('../../../views/Passkey/utils/createPregeneratedWallet/createPregeneratedWallet.cjs');
+require('@dynamic-labs/wallet-connector-core');
 var createUserProfile = require('../../functions/createUserProfile/createUserProfile.cjs');
 require('@dynamic-labs/sdk-api');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('react');

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

@@ -2,11 +2,11 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { createEmbeddedWalletWithPasskey } from '../../../views/Passkey/utils/createEmbeddedWalletWithPasskey/createEmbeddedWalletWithPasskey.js';
 import { findPasskeyEmailWalletConnector } from '../../../views/Passkey/utils/findPasskeyEmailWalletConnector/findPasskeyEmailWalletConnector.js';
 import { createPregeneratedWallet } from '../../../views/Passkey/utils/createPregeneratedWallet/createPregeneratedWallet.js';
+import '@dynamic-labs/wallet-connector-core';
 import { createUserProfile } from '../../functions/createUserProfile/createUserProfile.js';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import 'react';

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

@@ -22,8 +22,11 @@ require('viem');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
+var isProviderEnabled = require('../../functions/isProviderEnabled/isProviderEnabled.cjs');
 var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 
+const checkMagicOrBloctoEnabled = (providers) => isProviderEnabled.isProviderEnabled(providers || [], sdkApi.ProviderEnum.MagicLink) ||
+    isProviderEnabled.isProviderEnabled(providers || [], sdkApi.ProviderEnum.Blocto);
 const useEmailProvider = ({ emailWalletConnector }) => {
     const { projectSettings, environmentId } = useInternalDynamicContext.useInternalDynamicContext();
     const { setEmail: setEmailForVerification, setVerificationUUID } = EmailVerificationContext.useEmailVerificationContext();
@@ -38,10 +41,7 @@ const useEmailProvider = ({ emailWalletConnector }) => {
     // this is enabled in the sense that we could use the given provider in the email form
     // for magic, as long as there are magic credentials available, then could have an email
     // address that is a magic address, even if magic was previously turned off in dashboard
-    const isMagicOrBloctoEnabled = isInjectedWalletProviderEnabled &&
-        Boolean(providers === null || providers === void 0 ? void 0 : providers.filter((provider) => (provider.provider === sdkApi.ProviderEnum.MagicLink &&
-            Boolean(provider.providerProjectId)) ||
-            (provider.enabledAt && provider.provider === sdkApi.ProviderEnum.Blocto)).length);
+    const isMagicOrBloctoEnabled = isInjectedWalletProviderEnabled && checkMagicOrBloctoEnabled(providers);
     const handleEmailOnlyLoginSubmit = (emailInput, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const { email, verificationUUID } = yield api.createEmailVerification({
             captchaToken,
@@ -89,4 +89,5 @@ const useEmailProvider = ({ emailWalletConnector }) => {
     };
 };
 
+exports.checkMagicOrBloctoEnabled = checkMagicOrBloctoEnabled;
 exports.useEmailProvider = useEmailProvider;

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

@@ -1,7 +1,9 @@
 import { IEmailWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { Provider } from '@dynamic-labs/sdk-api';
 type Props = {
     emailWalletConnector: IEmailWalletConnector | undefined;
 };
+export declare const checkMagicOrBloctoEnabled: (providers: Provider[] | undefined) => boolean;
 export declare const useEmailProvider: ({ emailWalletConnector }: Props) => {
     handleEmailSubmitWithOptionalCaptcha: (emailInput: string, captchaToken?: string) => Promise<void>;
     isEmailProviderLoading: boolean;

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

@@ -18,8 +18,11 @@ import 'viem';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
+import { isProviderEnabled } from '../../functions/isProviderEnabled/isProviderEnabled.js';
 import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 
+const checkMagicOrBloctoEnabled = (providers) => isProviderEnabled(providers || [], ProviderEnum.MagicLink) ||
+    isProviderEnabled(providers || [], ProviderEnum.Blocto);
 const useEmailProvider = ({ emailWalletConnector }) => {
     const { projectSettings, environmentId } = useInternalDynamicContext();
     const { setEmail: setEmailForVerification, setVerificationUUID } = useEmailVerificationContext();
@@ -34,10 +37,7 @@ const useEmailProvider = ({ emailWalletConnector }) => {
     // this is enabled in the sense that we could use the given provider in the email form
     // for magic, as long as there are magic credentials available, then could have an email
     // address that is a magic address, even if magic was previously turned off in dashboard
-    const isMagicOrBloctoEnabled = isInjectedWalletProviderEnabled &&
-        Boolean(providers === null || providers === void 0 ? void 0 : providers.filter((provider) => (provider.provider === ProviderEnum.MagicLink &&
-            Boolean(provider.providerProjectId)) ||
-            (provider.enabledAt && provider.provider === ProviderEnum.Blocto)).length);
+    const isMagicOrBloctoEnabled = isInjectedWalletProviderEnabled && checkMagicOrBloctoEnabled(providers);
     const handleEmailOnlyLoginSubmit = (emailInput, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
         const { email, verificationUUID } = yield createEmailVerification({
             captchaToken,
@@ -85,4 +85,4 @@ const useEmailProvider = ({ emailWalletConnector }) => {
     };
 };
 
-export { useEmailProvider };
+export { checkMagicOrBloctoEnabled, useEmailProvider };

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

@@ -27,14 +27,12 @@ var isEmbeddedWalletPresent = require('../../functions/isEmbeddedWalletPresent/i
 var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 var smartWallet = require('../useWalletConnectors/utils/smartWallet/smartWallet.cjs');
 var useCreateDynamicEmbeddedWalletMutation = require('../useCreateDynamicEmbeddedWalletMutation/useCreateDynamicEmbeddedWalletMutation.cjs');
-var useCreateUserProfileByJWTCallback = require('../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.cjs');
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useEmbeddedWallet = () => {
     const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, walletConnectorOptions, internalSetShowAuthFlow, internalEvents, primaryWallet, environmentId, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation.useCreateDynamicEmbeddedWalletMutation();
-    const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback.useCreateUserProfileByJWTCallback();
     const userHasEmbeddedWallet = () => {
         var _a;
         const jwt = (_a = getAuthToken.getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
@@ -87,7 +85,6 @@ const useEmbeddedWallet = () => {
         // if user already has embedded wallet, set it as primary wallet
         if (decodedJwt) {
             (_a = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _a === void 0 ? void 0 : _a.setVerifiedCredentials(decodedJwt.verifiedCredentials);
-            yield createUserProfileByJWT(jwt);
             const smartWallet$1 = smartWallet.findSmartWallet(embeddedWalletVerifiedCredential, decodedJwt.verifiedCredentials);
             if (smartWallet$1) {
                 yield smartWallet.initializeSmartWallet({

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

@@ -23,14 +23,12 @@ import { isEmbeddedWalletPresent } from '../../functions/isEmbeddedWalletPresent
 import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 import { findSmartWallet, initializeSmartWallet } from '../useWalletConnectors/utils/smartWallet/smartWallet.js';
 import { useCreateDynamicEmbeddedWalletMutation } from '../useCreateDynamicEmbeddedWalletMutation/useCreateDynamicEmbeddedWalletMutation.js';
-import { useCreateUserProfileByJWTCallback } from '../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.js';
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useEmbeddedWallet = () => {
     const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, walletConnectorOptions, internalSetShowAuthFlow, internalEvents, primaryWallet, environmentId, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation();
-    const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback();
     const userHasEmbeddedWallet = () => {
         var _a;
         const jwt = (_a = getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
@@ -83,7 +81,6 @@ const useEmbeddedWallet = () => {
         // if user already has embedded wallet, set it as primary wallet
         if (decodedJwt) {
             (_a = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _a === void 0 ? void 0 : _a.setVerifiedCredentials(decodedJwt.verifiedCredentials);
-            yield createUserProfileByJWT(jwt);
             const smartWallet = findSmartWallet(embeddedWalletVerifiedCredential, decodedJwt.verifiedCredentials);
             if (smartWallet) {
                 yield initializeSmartWallet({

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

@@ -27,9 +27,7 @@ require('@dynamic-labs/multi-wallet');
 var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
 var getOauthLoginUrl = require('../../functions/getOauthLoginUrl/getOauthLoginUrl.cjs');
 var getProviderByType = require('../../functions/getProviderByType/getProviderByType.cjs');
-var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 var randomString = require('../../functions/randomString/randomString.cjs');
-var index = require('../../functions/storeAuthToken/index.cjs');
 var stringifyURIQuery = require('../../functions/stringifyURIQuery/stringifyURIQuery.cjs');
 var useCreateUserProfileByJWTCallback = require('../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
@@ -60,7 +58,6 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
     const { createEmbeddedWallet } = useEmbeddedWallet.useEmbeddedWallet();
     const [isProcessing, setIsProcessing] = React.useState(false);
     const [error, setError] = React.useState();
-    const isTurnkeyProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
     const providersWaitingOauthMessage = React.useRef({});
     const authWindowInterval = React.useRef();
     const shouldPool = React.useRef(false);
@@ -150,25 +147,22 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                 return;
             }
             setCallback('authSuccess');
-            if (isTurnkeyProviderEnabled &&
-                ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation)) {
-                try {
-                    index.storeAuthToken(jwt);
-                    // this function will check turnkey wallet enabled and create wallet if needed
-                    // if not enabled, it will throw an error.
-                    yield createEmbeddedWallet();
-                    onSettled === null || onSettled === void 0 ? void 0 : onSettled();
-                }
-                catch (e) {
-                    yield createUserProfileByJWT(jwt);
-                    setShowAuthFlow(false);
-                    onSettled === null || onSettled === void 0 ? void 0 : onSettled();
-                }
+            yield createUserProfileByJWT(jwt);
+            if (!((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation)) {
+                setShowAuthFlow(false);
+                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
                 return;
             }
-            yield createUserProfileByJWT(jwt);
-            setShowAuthFlow(false);
-            onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+            try {
+                // this function will check turnkey wallet enabled and create wallet if needed
+                // if not enabled, it will throw an error.
+                yield createEmbeddedWallet();
+                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+            }
+            catch (e) {
+                setShowAuthFlow(false);
+                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+            }
         }
         catch (error) {
             if (error instanceof utils.NoAccessError) {

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

@@ -23,9 +23,7 @@ import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
 import { getOauthLoginUrl } from '../../functions/getOauthLoginUrl/getOauthLoginUrl.js';
 import { getProviderByType } from '../../functions/getProviderByType/getProviderByType.js';
-import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 import { randomString } from '../../functions/randomString/randomString.js';
-import { storeAuthToken } from '../../functions/storeAuthToken/index.js';
 import { stringifyURIQuery } from '../../functions/stringifyURIQuery/stringifyURIQuery.js';
 import { useCreateUserProfileByJWTCallback } from '../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
@@ -56,7 +54,6 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
     const { createEmbeddedWallet } = useEmbeddedWallet();
     const [isProcessing, setIsProcessing] = useState(false);
     const [error, setError] = useState();
-    const isTurnkeyProviderEnabled = isTurnkeyEnabled(projectSettings);
     const providersWaitingOauthMessage = useRef({});
     const authWindowInterval = useRef();
     const shouldPool = useRef(false);
@@ -146,25 +143,22 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                 return;
             }
             setCallback('authSuccess');
-            if (isTurnkeyProviderEnabled &&
-                ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation)) {
-                try {
-                    storeAuthToken(jwt);
-                    // this function will check turnkey wallet enabled and create wallet if needed
-                    // if not enabled, it will throw an error.
-                    yield createEmbeddedWallet();
-                    onSettled === null || onSettled === void 0 ? void 0 : onSettled();
-                }
-                catch (e) {
-                    yield createUserProfileByJWT(jwt);
-                    setShowAuthFlow(false);
-                    onSettled === null || onSettled === void 0 ? void 0 : onSettled();
-                }
+            yield createUserProfileByJWT(jwt);
+            if (!((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation)) {
+                setShowAuthFlow(false);
+                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
                 return;
             }
-            yield createUserProfileByJWT(jwt);
-            setShowAuthFlow(false);
-            onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+            try {
+                // this function will check turnkey wallet enabled and create wallet if needed
+                // if not enabled, it will throw an error.
+                yield createEmbeddedWallet();
+                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+            }
+            catch (e) {
+                setShowAuthFlow(false);
+                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+            }
         }
         catch (error) {
             if (error instanceof NoAccessError) {

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs

@@ -25,8 +25,6 @@ require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('@dynamic-labs/sdk-api');
-var isTurnkeyEnabled = require('../../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
-var index = require('../../../functions/storeAuthToken/index.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 var useEmailVerificationRequest = require('../../authenticationHooks/useEmailVerificationRequest/useEmailVerificationRequest.cjs');
@@ -56,14 +54,13 @@ const userFieldsSchema = yup.object().shape({
     username: yup.string(),
 });
 const useUpdateUser = (validationSchemaStripUnknown) => {
-    const { authToken, onboardingOnlyJwt, environmentId, projectSettings, primaryWallet, } = useInternalDynamicContext.useInternalDynamicContext();
-    const isTurnkeyProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
+    const { authToken, onboardingOnlyJwt, environmentId } = useInternalDynamicContext.useInternalDynamicContext();
     const jwtToken = onboardingOnlyJwt || authToken;
     const { setVerificationUUID, setEmail } = EmailVerificationContext.useEmailVerificationContext();
     const { verifyEmail } = useEmailVerificationRequest.useEmailVerificationRequest();
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback.useUpdateUserProfileByJWTCallback();
     return React.useCallback((userFields, userEnvironmentId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         // `stripUnknown: true` will automatically strip out any values in the metadata object
         // so we need to pull out the metadata object here and then re-add it after stripping unknown fields
         const { metadata } = userFields;
@@ -75,25 +72,6 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
         const decodedJwt = decodeJwt.decodeJwt(updateUserProfileResponse.jwt);
         const missingFields = (_a = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields) !== null && _a !== void 0 ? _a : [];
         const _isEmailVerificationRequired = isEmailVerificationRequired.isEmailVerificationRequired(updateUserProfileResponse);
-        // This is to handle properly the embedded wallet creation.
-        // In that case we shouldn't create a user. Only store the JWT in the localstorage
-        // The user will be created after generating the wallet.
-        // This should be called only when:
-        // Turnkey is enabled
-        // automaticEmbeddedWalletCreation is set to true
-        // there is no emailVerificationRequired -> it's already verified
-        // there is no primaryWallet -> it means that the user is already logged in
-        if (isTurnkeyProviderEnabled &&
-            ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation) &&
-            !_isEmailVerificationRequired &&
-            !primaryWallet) {
-            index.storeAuthToken(updateUserProfileResponse.jwt);
-            return {
-                isEmailVerificationRequired: false,
-                missingFields,
-                updateUserProfileResponse,
-            };
-        }
         if (!_isEmailVerificationRequired) {
             // If email verification is not needed then we can update the user profile immediately.
             yield updateUserProfileByJWT(updateUserProfileResponse.jwt);
@@ -104,8 +82,8 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
             };
         }
         // We update EmailContext to use this information in the Email Verification view
-        setEmail((_c = updateUserProfileResponse.emailVerification) === null || _c === void 0 ? void 0 : _c.email);
-        setVerificationUUID((_d = updateUserProfileResponse.emailVerification) === null || _d === void 0 ? void 0 : _d.verificationUUID);
+        setEmail((_b = updateUserProfileResponse.emailVerification) === null || _b === void 0 ? void 0 : _b.email);
+        setVerificationUUID((_c = updateUserProfileResponse.emailVerification) === null || _c === void 0 ? void 0 : _c.verificationUUID);
         // DYN-2046 - Customers have the opportunity to programmatically use our email verification and profile editing.
         // VerifyEmailFN was scoped to bypass the problem with memoization of the state at the beginning of Promise.
         // setEmail and setVerificationUUID in the above lines will are not visible in this promise.

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js

@@ -21,8 +21,6 @@ import '../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import '@dynamic-labs/sdk-api';
-import { isTurnkeyEnabled } from '../../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
-import { storeAuthToken } from '../../../functions/storeAuthToken/index.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import { useEmailVerificationRequest } from '../../authenticationHooks/useEmailVerificationRequest/useEmailVerificationRequest.js';
@@ -52,14 +50,13 @@ const userFieldsSchema = object().shape({
     username: string(),
 });
 const useUpdateUser = (validationSchemaStripUnknown) => {
-    const { authToken, onboardingOnlyJwt, environmentId, projectSettings, primaryWallet, } = useInternalDynamicContext();
-    const isTurnkeyProviderEnabled = isTurnkeyEnabled(projectSettings);
+    const { authToken, onboardingOnlyJwt, environmentId } = useInternalDynamicContext();
     const jwtToken = onboardingOnlyJwt || authToken;
     const { setVerificationUUID, setEmail } = useEmailVerificationContext();
     const { verifyEmail } = useEmailVerificationRequest();
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback();
     return useCallback((userFields, userEnvironmentId) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         // `stripUnknown: true` will automatically strip out any values in the metadata object
         // so we need to pull out the metadata object here and then re-add it after stripping unknown fields
         const { metadata } = userFields;
@@ -71,25 +68,6 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
         const decodedJwt = decodeJwt(updateUserProfileResponse.jwt);
         const missingFields = (_a = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields) !== null && _a !== void 0 ? _a : [];
         const _isEmailVerificationRequired = isEmailVerificationRequired(updateUserProfileResponse);
-        // This is to handle properly the embedded wallet creation.
-        // In that case we shouldn't create a user. Only store the JWT in the localstorage
-        // The user will be created after generating the wallet.
-        // This should be called only when:
-        // Turnkey is enabled
-        // automaticEmbeddedWalletCreation is set to true
-        // there is no emailVerificationRequired -> it's already verified
-        // there is no primaryWallet -> it means that the user is already logged in
-        if (isTurnkeyProviderEnabled &&
-            ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation) &&
-            !_isEmailVerificationRequired &&
-            !primaryWallet) {
-            storeAuthToken(updateUserProfileResponse.jwt);
-            return {
-                isEmailVerificationRequired: false,
-                missingFields,
-                updateUserProfileResponse,
-            };
-        }
         if (!_isEmailVerificationRequired) {
             // If email verification is not needed then we can update the user profile immediately.
             yield updateUserProfileByJWT(updateUserProfileResponse.jwt);
@@ -100,8 +78,8 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
             };
         }
         // We update EmailContext to use this information in the Email Verification view
-        setEmail((_c = updateUserProfileResponse.emailVerification) === null || _c === void 0 ? void 0 : _c.email);
-        setVerificationUUID((_d = updateUserProfileResponse.emailVerification) === null || _d === void 0 ? void 0 : _d.verificationUUID);
+        setEmail((_b = updateUserProfileResponse.emailVerification) === null || _b === void 0 ? void 0 : _b.email);
+        setVerificationUUID((_c = updateUserProfileResponse.emailVerification) === null || _c === void 0 ? void 0 : _c.verificationUUID);
         // DYN-2046 - Customers have the opportunity to programmatically use our email verification and profile editing.
         // VerifyEmailFN was scoped to bypass the problem with memoization of the state at the beginning of Promise.
         // setEmail and setVerificationUUID in the above lines will are not visible in this promise.

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

@@ -27,8 +27,6 @@ var useEffectOnce = require('../../shared/utils/hooks/useEffectOnce/useEffectOnc
 require('../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 require('@dynamic-labs/sdk-api');
-var isTurnkeyEnabled = require('../../utils/functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
-var index = require('../../utils/functions/storeAuthToken/index.cjs');
 require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 var AccountExistsContext = require('../../context/AccountExistsContext/AccountExistsContext.cjs');
 var api = require('../../data/api.cjs');
@@ -102,7 +100,6 @@ const EmailVerification = () => {
     const { loading, setLoading } = LoadingContext.useLoadingContext();
     const { t } = reactI18next.useTranslation();
     const { createEmbeddedWallet } = useEmbeddedWallet.useEmbeddedWallet();
-    const isTurnkeyProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
     const { remainingSeconds, startCountdown } = useCountdown.useCountdown({
         callback: () => setRetried(false),
         seconds: SECONDS_TO_RETRY,
@@ -135,7 +132,7 @@ const EmailVerification = () => {
             return;
         }
         try {
-            const { nextView, jwt } = yield verifyEmail(verificationToken, verificationUUID);
+            const { nextView } = yield verifyEmail(verificationToken, verificationUUID);
             if (onboardingOnlyJwt) {
                 setOnboardingOnlyJwt(undefined);
                 setCallback('authSuccess');
@@ -144,20 +141,18 @@ const EmailVerification = () => {
             if (nextView === 'verified-and-transferred') {
                 setShowTransferMessage(true);
             }
-            if (isTurnkeyProviderEnabled &&
-                ((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation)) {
-                try {
-                    index.storeAuthToken(jwt);
-                    // this function will check turnkey wallet enabled and create wallet if needed
-                    // if not enabled, it will throw an error.
-                    yield createEmbeddedWallet();
-                }
-                catch (e) {
-                    setShowAuthFlow(false);
-                }
+            if (!((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation)) {
+                setShowAuthFlow(false);
                 return;
             }
-            setShowAuthFlow(false);
+            try {
+                // this function will check turnkey wallet enabled and create wallet if needed
+                // if not enabled, it will throw an error.
+                yield createEmbeddedWallet();
+            }
+            catch (e) {
+                setShowAuthFlow(false);
+            }
         }
         catch (error) {
             logger.logger.debug(error);
@@ -185,8 +180,8 @@ const EmailVerification = () => {
         (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.automaticEmbeddedWalletCreation,
         createEmbeddedWallet,
         setShowAuthFlow,
+        setErrorMessage,
         setView,
-        isTurnkeyProviderEnabled,
     ]);
     const handleEmailLogin = React.useCallback((verificationToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _d;
@@ -219,24 +214,19 @@ const EmailVerification = () => {
             setCallback('authSuccess');
             // this timeout is set to make sure that the user will see success message
             yield sleepToShowSuccessMessage();
-            if (isTurnkeyProviderEnabled &&
-                ((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.automaticEmbeddedWalletCreation)) {
-                try {
-                    // Store the auth token in local storage so it can be used during embedded wallet creation
-                    index.storeAuthToken(jwt);
-                    // this function will check turnkey wallet enabled and create wallet if needed
-                    // if not enabled, it will throw an error.
-                    yield createEmbeddedWallet();
-                }
-                catch (e) {
-                    yield createUserProfileByJWT(jwt);
-                    setShowAuthFlow(false);
-                }
+            yield createUserProfileByJWT(jwt);
+            if (!((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.automaticEmbeddedWalletCreation)) {
+                setShowAuthFlow(false);
                 return;
             }
-            // If not creating embedded wallet automatically, create user profile
-            yield createUserProfileByJWT(jwt);
-            setShowAuthFlow(false);
+            try {
+                // this function will check turnkey wallet enabled and create wallet if needed
+                // if not enabled, it will throw an error.
+                yield createEmbeddedWallet();
+            }
+            catch (e) {
+                setShowAuthFlow(false);
+            }
         }
         catch (error) {
             if (error instanceof utils.NoAccessError) {
@@ -268,7 +258,6 @@ const EmailVerification = () => {
         setShowAuthFlow,
         setErrorMessage,
         setExistentAccountData,
-        isTurnkeyProviderEnabled,
     ]);
     const handleRetry = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         try {

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

@@ -23,8 +23,6 @@ import { useEffectOnce } from '../../shared/utils/hooks/useEffectOnce/useEffectO
 import '../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import '@dynamic-labs/sdk-api';
-import { isTurnkeyEnabled } from '../../utils/functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
-import { storeAuthToken } from '../../utils/functions/storeAuthToken/index.js';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import { useAccountExistsContext } from '../../context/AccountExistsContext/AccountExistsContext.js';
 import { signInWithEmailVerification, retryEmailVerification } from '../../data/api.js';
@@ -98,7 +96,6 @@ const EmailVerification = () => {
     const { loading, setLoading } = useLoadingContext();
     const { t } = useTranslation();
     const { createEmbeddedWallet } = useEmbeddedWallet();
-    const isTurnkeyProviderEnabled = isTurnkeyEnabled(projectSettings);
     const { remainingSeconds, startCountdown } = useCountdown({
         callback: () => setRetried(false),
         seconds: SECONDS_TO_RETRY,
@@ -131,7 +128,7 @@ const EmailVerification = () => {
             return;
         }
         try {
-            const { nextView, jwt } = yield verifyEmail(verificationToken, verificationUUID);
+            const { nextView } = yield verifyEmail(verificationToken, verificationUUID);
             if (onboardingOnlyJwt) {
                 setOnboardingOnlyJwt(undefined);
                 setCallback('authSuccess');
@@ -140,20 +137,18 @@ const EmailVerification = () => {
             if (nextView === 'verified-and-transferred') {
                 setShowTransferMessage(true);
             }
-            if (isTurnkeyProviderEnabled &&
-                ((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation)) {
-                try {
-                    storeAuthToken(jwt);
-                    // this function will check turnkey wallet enabled and create wallet if needed
-                    // if not enabled, it will throw an error.
-                    yield createEmbeddedWallet();
-                }
-                catch (e) {
-                    setShowAuthFlow(false);
-                }
+            if (!((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation)) {
+                setShowAuthFlow(false);
                 return;
             }
-            setShowAuthFlow(false);
+            try {
+                // this function will check turnkey wallet enabled and create wallet if needed
+                // if not enabled, it will throw an error.
+                yield createEmbeddedWallet();
+            }
+            catch (e) {
+                setShowAuthFlow(false);
+            }
         }
         catch (error) {
             logger.debug(error);
@@ -181,8 +176,8 @@ const EmailVerification = () => {
         (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.automaticEmbeddedWalletCreation,
         createEmbeddedWallet,
         setShowAuthFlow,
+        setErrorMessage,
         setView,
-        isTurnkeyProviderEnabled,
     ]);
     const handleEmailLogin = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
         var _d;
@@ -215,24 +210,19 @@ const EmailVerification = () => {
             setCallback('authSuccess');
             // this timeout is set to make sure that the user will see success message
             yield sleepToShowSuccessMessage();
-            if (isTurnkeyProviderEnabled &&
-                ((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.automaticEmbeddedWalletCreation)) {
-                try {
-                    // Store the auth token in local storage so it can be used during embedded wallet creation
-                    storeAuthToken(jwt);
-                    // this function will check turnkey wallet enabled and create wallet if needed
-                    // if not enabled, it will throw an error.
-                    yield createEmbeddedWallet();
-                }
-                catch (e) {
-                    yield createUserProfileByJWT(jwt);
-                    setShowAuthFlow(false);
-                }
+            yield createUserProfileByJWT(jwt);
+            if (!((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.automaticEmbeddedWalletCreation)) {
+                setShowAuthFlow(false);
                 return;
             }
-            // If not creating embedded wallet automatically, create user profile
-            yield createUserProfileByJWT(jwt);
-            setShowAuthFlow(false);
+            try {
+                // this function will check turnkey wallet enabled and create wallet if needed
+                // if not enabled, it will throw an error.
+                yield createEmbeddedWallet();
+            }
+            catch (e) {
+                setShowAuthFlow(false);
+            }
         }
         catch (error) {
             if (error instanceof NoAccessError) {
@@ -264,7 +254,6 @@ const EmailVerification = () => {
         setShowAuthFlow,
         setErrorMessage,
         setExistentAccountData,
-        isTurnkeyProviderEnabled,
     ]);
     const handleRetry = () => __awaiter(void 0, void 0, void 0, function* () {
         try {