@dynamic-labs/sdk-react-core 2.1.0-alpha.24 → 2.1.0-alpha.26

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

@@ -17,8 +17,8 @@ import '../../../shared/consts/index.js';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
+import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
-import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
 import 'react-international-phone';
 import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 import { getEnabledEmbeddedWalletsAuthenticators } from '../../functions/getEnabledEmbeddedWalletsAuthenticators/getEnabledEmbeddedWalletsAuthenticators.js';
@@ -29,7 +29,6 @@ import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';
 import { updateUserProfileFields } from '../../../data/api/user/user.js';
-import { updateJWTAndCreateUserProfile } from '../../functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.js';
 import { getEmbeddedWalletSessionExpiration } from '../../functions/getEmbeddedWalletSessionExpiration/getEmbeddedWalletSessionExpiration.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
@@ -90,7 +89,7 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 // Hook exposed to customers and used internally to trigger passkey recovery
 const usePasskeyRecovery = () => {
     var _a, _b;
-    const { environmentId, primaryWallet, projectSettings, setShowAuthFlow, user, setUser, } = useInternalDynamicContext();
+    const { environmentId, primaryWallet, projectSettings, setShowAuthFlow, user, } = useInternalDynamicContext();
     const { createRootElement } = useElementById();
     const iframeContainerRef = createRootElement(iframeContainerId);
     const { userHasEmbeddedWallet } = useEmbeddedWallet();
@@ -141,17 +140,30 @@ const usePasskeyRecovery = () => {
     }), [wallet, isTurnkeyWalletWithoutAuthenticator, isSessionRestored]);
     const initPasskeyRecoveryProcess = useCallback((authenticatorType, currentAction) => __awaiter(void 0, void 0, void 0, function* () {
         var _e;
+        const validateRecoveryRequest = () => {
+            if (!user) {
+                throw new Error(USER_NOT_LOGGED_IN);
+            }
+            if (!isTurnkeyEnabled(projectSettings)) {
+                throw new Error('Dynamic embedded wallet is not enabled. Go to the dashboard and make sure to have both Dynamic embedded wallet and at least one EVM network enabled. Also, check if EthereumWalletConnectors is in the  DynamicContextProvider > settings > walletConnectors.');
+            }
+            if (!userHasEmbeddedWallet()) {
+                throw new Error('Dynamic embedded wallet not found');
+            }
+            if (wallet && !isPasskeyWalletConnector(wallet.connector)) {
+                throw new Error('Dynamic embedded wallet not found.');
+            }
+        };
         validateRecoveryRequest();
         const turnkeyRecoveryHandler = (wallet === null || wallet === void 0 ? void 0 : wallet.connector).getAuthenticatorHandler();
         // email auth - session is still up, so create passkey authenticator usign the same session
         if (authenticatorType === 'passkey' &&
             turnkeyRecoveryHandler.isSessionActive()) {
-            const { passkeyRecoveryResponse } = yield addNewPasskeyAuthenticator({
+            yield addNewPasskeyAuthenticator({
                 environmentId,
                 user,
                 wallet,
             });
-            setUser(updateJWTAndCreateUserProfile(passkeyRecoveryResponse.jwt, passkeyRecoveryResponse.minifiedJwt));
             setShowAuthFlow(false);
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             return wallet;
@@ -194,22 +206,18 @@ const usePasskeyRecovery = () => {
             dynamicEvents.once('passkeyRecoveryCompleted', (wallet) => resolve(wallet));
             dynamicEvents.once('passkeyRecoveryFailed', (error) => reject(error));
         });
-    }), [setShowAuthFlow, projectSettings, setView, userHasEmbeddedWallet]);
-    const validateRecoveryRequest = () => {
-        const jwt = getAuthToken();
-        if (!jwt) {
-            throw new Error('User is not logged in');
-        }
-        if (!isTurnkeyEnabled(projectSettings)) {
-            throw new Error('Passkey embedded wallet is not enabled. Go to the dashboard and make sure to have both Turnkey/Passkey Embedded wallets and at least one EVM network enabled. Also, check if EthereumWalletConnectors is in the  DynamicContextProvider > settings > walletConnectors.');
-        }
-        if (!userHasEmbeddedWallet()) {
-            throw new Error('Passkey embedded wallet not found');
-        }
-        if (wallet && !isPasskeyWalletConnector(wallet.connector)) {
-            throw new Error('Passkey embedded wallet not found.');
-        }
-    };
+    }), [
+        wallet,
+        projectSettings,
+        hasRecoveryEmail,
+        userHasEmbeddedWallet,
+        environmentId,
+        user,
+        setShowAuthFlow,
+        setView,
+        initAuthMethod,
+        iframeContainerRef,
+    ]);
     const addRecoveryEmail = (emailInput) => __awaiter(void 0, void 0, void 0, function* () {
         try {
             let updatedUser = user;

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

@@ -31,9 +31,9 @@ var isSocialKycEnabled = require('../../functions/isSocialKycEnabled/isSocialKyc
 require('viem');
 require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/store');
 var oauth = require('../../../data/api/oauth/oauth.cjs');
 require('../../../locale/locale.cjs');
-require('@dynamic-labs/store');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');

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

@@ -27,9 +27,9 @@ import { isSocialKycEnabled } from '../../functions/isSocialKycEnabled/isSocialK
 import 'viem';
 import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
+import '@dynamic-labs/store';
 import { unlinkOAuth } from '../../../data/api/oauth/oauth.js';
 import '../../../locale/locale.js';
-import '@dynamic-labs/store';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';

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

@@ -4,6 +4,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
+var utils = require('@dynamic-labs/utils');
 var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 require('@dynamic-labs/sdk-api-core');
 var logger = require('../../../shared/logger.cjs');
@@ -16,7 +17,6 @@ require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
-require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 
 const CONNECT_URL = 'https://relay.farcaster.xyz/v1/channel';
@@ -25,7 +25,7 @@ const STATUS_TIMEOUT = 300000;
 const STATUS_INTERVAL = 1000;
 const connect = (connectRequest) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     try {
-        const response = yield fetch(CONNECT_URL, {
+        const response = yield utils.FetchService.fetch(CONNECT_URL, {
             body: JSON.stringify(connectRequest),
             headers: {
                 'Content-Type': 'application/json',
@@ -44,7 +44,7 @@ const connect = (connectRequest) => _tslib.__awaiter(void 0, void 0, void 0, fun
 });
 const status = (connectStatusRequest) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     try {
-        const response = yield fetch(STATUS_URL, {
+        const response = yield utils.FetchService.fetch(STATUS_URL, {
             headers: {
                 Authorization: `Bearer ${connectStatusRequest.channelToken}`,
                 'Content-Type': 'application/json',
@@ -64,9 +64,18 @@ const status = (connectStatusRequest) => _tslib.__awaiter(void 0, void 0, void 0
 const watchStatus = (connectStatusRequest_1, ...args_1) => _tslib.__awaiter(void 0, [connectStatusRequest_1, ...args_1], void 0, function* (connectStatusRequest, { timeout = STATUS_TIMEOUT, interval = STATUS_INTERVAL } = {}) {
     const deadline = Date.now() + timeout;
     let shouldPoll = true;
+    let storedResolve = undefined;
+    // When we cancel, immediately resolve the current timeout promise and abort status watch
     dynamicEvents.dynamicEvents.on('farcasterConnectCancelled', () => {
         shouldPoll = false;
+        storedResolve === null || storedResolve === void 0 ? void 0 : storedResolve();
+        storedResolve = undefined;
     });
+    // Declaring the promise callback outside of loop to avoid unnecessary garbage generation
+    const timeoutCallback = (resolve) => {
+        storedResolve = resolve;
+        setTimeout(resolve, interval);
+    };
     while (shouldPoll && Date.now() < deadline) {
         const response = yield status(connectStatusRequest);
         if (!response) {
@@ -75,7 +84,7 @@ const watchStatus = (connectStatusRequest_1, ...args_1) => _tslib.__awaiter(void
         if (response.state === 'completed') {
             return response;
         }
-        yield new Promise((resolve) => setTimeout(resolve, STATUS_INTERVAL));
+        yield new Promise(timeoutCallback);
     }
     if (!shouldPoll) {
         return 'cancelled';

package/src/lib/utils/hooks/useSocialAuth/farcaster.d.ts

@@ -8,7 +8,9 @@ interface FarcasterConnectRequest {
     redirectUrl?: string;
 }
 interface FarcasterConnectResponse {
+    /** Connect relay channel token UUID */
     channelToken: string;
+    /** Sign in With Farcaster URL to present to the user */
     url: string;
 }
 interface FarcasterConnectStatusRequest {

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

@@ -1,5 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { FetchService } from '@dynamic-labs/utils';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../../shared/logger.js';
@@ -12,7 +13,6 @@ import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
-import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 
 const CONNECT_URL = 'https://relay.farcaster.xyz/v1/channel';
@@ -21,7 +21,7 @@ const STATUS_TIMEOUT = 300000;
 const STATUS_INTERVAL = 1000;
 const connect = (connectRequest) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const response = yield fetch(CONNECT_URL, {
+        const response = yield FetchService.fetch(CONNECT_URL, {
             body: JSON.stringify(connectRequest),
             headers: {
                 'Content-Type': 'application/json',
@@ -40,7 +40,7 @@ const connect = (connectRequest) => __awaiter(void 0, void 0, void 0, function*
 });
 const status = (connectStatusRequest) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const response = yield fetch(STATUS_URL, {
+        const response = yield FetchService.fetch(STATUS_URL, {
             headers: {
                 Authorization: `Bearer ${connectStatusRequest.channelToken}`,
                 'Content-Type': 'application/json',
@@ -60,9 +60,18 @@ const status = (connectStatusRequest) => __awaiter(void 0, void 0, void 0, funct
 const watchStatus = (connectStatusRequest_1, ...args_1) => __awaiter(void 0, [connectStatusRequest_1, ...args_1], void 0, function* (connectStatusRequest, { timeout = STATUS_TIMEOUT, interval = STATUS_INTERVAL } = {}) {
     const deadline = Date.now() + timeout;
     let shouldPoll = true;
+    let storedResolve = undefined;
+    // When we cancel, immediately resolve the current timeout promise and abort status watch
     dynamicEvents.on('farcasterConnectCancelled', () => {
         shouldPoll = false;
+        storedResolve === null || storedResolve === void 0 ? void 0 : storedResolve();
+        storedResolve = undefined;
     });
+    // Declaring the promise callback outside of loop to avoid unnecessary garbage generation
+    const timeoutCallback = (resolve) => {
+        storedResolve = resolve;
+        setTimeout(resolve, interval);
+    };
     while (shouldPoll && Date.now() < deadline) {
         const response = yield status(connectStatusRequest);
         if (!response) {
@@ -71,7 +80,7 @@ const watchStatus = (connectStatusRequest_1, ...args_1) => __awaiter(void 0, [co
         if (response.state === 'completed') {
             return response;
         }
-        yield new Promise((resolve) => setTimeout(resolve, STATUS_INTERVAL));
+        yield new Promise(timeoutCallback);
     }
     if (!shouldPoll) {
         return 'cancelled';

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

@@ -33,9 +33,9 @@ var stringifyURIQuery = require('../../functions/stringifyURIQuery/stringifyURIQ
 require('viem');
 require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/store');
 var oauth = require('../../../data/api/oauth/oauth.cjs');
 require('../../../locale/locale.cjs');
-require('@dynamic-labs/store');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -213,7 +213,7 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
             type: 'social',
         });
         if (provider === sdkApiCore.ProviderEnum.Farcaster)
-            return connectWithFarcaster(authMode, captchaToken);
+            return connectWithFarcaster(authMode, { captchaToken });
         const authWindow = window.open('', '_blank', 'width=500,height=600');
         const state = randomString.randomString(8);
         const verifier = randomString.randomString(43);
@@ -368,7 +368,7 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
             }), authWindowTimeout);
         }
     });
-    const connectWithFarcaster = (authMode, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const connectWithFarcaster = (authMode_1, _g) => _tslib.__awaiter(void 0, [authMode_1, _g], void 0, function* (authMode, { captchaToken }) {
         const dynamicNonce = consumeNonce();
         const domain = window.location.host;
         const data = yield farcaster.connect({
@@ -383,7 +383,7 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
         }
         // If on mobile, we want to redirect to the Warpcast app.
         if (utils.isMobile()) {
-            window.location.assign(data.url);
+            yield utils.PlatformService.openURL(data.url);
         }
         else {
             setShowAuthFlow(true);

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

@@ -8,14 +8,15 @@ type UseSocialAuthProps = {
     onError?: () => void;
     onFarcasterUrl?: (url: string) => void;
 };
+export type ConnectSocialAccountProps = {
+    authMode: SocialAuthMode;
+    provider: ProviderEnum;
+    validator?: (provider: ProviderEnum) => boolean;
+    captchaToken?: string;
+};
 export declare const useSocialAuth: ({ sessionTimeout, onSettled, onError, onFarcasterUrl, }: UseSocialAuthProps) => {
     readonly checkValidProvider: (provider: ProviderEnum, authMode: SocialAuthMode) => boolean;
-    readonly connectSocialAccount: ({ authMode, provider, validator, captchaToken, }: {
-        authMode: SocialAuthMode;
-        provider: ProviderEnum;
-        validator?: (provider: ProviderEnum) => boolean;
-        captchaToken?: string;
-    }) => Promise<void>;
+    readonly connectSocialAccount: ({ authMode, provider, validator, captchaToken, }: ConnectSocialAccountProps) => Promise<void>;
     readonly error: SocialOAuthError | undefined;
     readonly handleError: (provider: ProviderEnum | undefined, code: SocialOAuthErrorCode, message: string, options?: {
         raiseAuthFailure?: boolean | undefined;

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

@@ -3,7 +3,7 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useRef } from 'react';
 import { ProviderEnum, OauthResultStatus } from '@dynamic-labs/sdk-api-core';
 import { SocialOAuthErrorCode } from '@dynamic-labs/types';
-import { isMobile, SocialAccountAlreadyExistsError } from '@dynamic-labs/utils';
+import { isMobile, PlatformService, SocialAccountAlreadyExistsError } from '@dynamic-labs/utils';
 import '../../../context/DynamicContext/DynamicContext.js';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -29,9 +29,9 @@ import { stringifyURIQuery } from '../../functions/stringifyURIQuery/stringifyUR
 import 'viem';
 import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
+import '@dynamic-labs/store';
 import { getOAuthResult, signInOAuth, farcasterSignIn, verifyOAuth } from '../../../data/api/oauth/oauth.js';
 import '../../../locale/locale.js';
-import '@dynamic-labs/store';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -209,7 +209,7 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
             type: 'social',
         });
         if (provider === ProviderEnum.Farcaster)
-            return connectWithFarcaster(authMode, captchaToken);
+            return connectWithFarcaster(authMode, { captchaToken });
         const authWindow = window.open('', '_blank', 'width=500,height=600');
         const state = randomString(8);
         const verifier = randomString(43);
@@ -364,7 +364,7 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
             }), authWindowTimeout);
         }
     });
-    const connectWithFarcaster = (authMode, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
+    const connectWithFarcaster = (authMode_1, _g) => __awaiter(void 0, [authMode_1, _g], void 0, function* (authMode, { captchaToken }) {
         const dynamicNonce = consumeNonce();
         const domain = window.location.host;
         const data = yield connect({
@@ -379,7 +379,7 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
         }
         // If on mobile, we want to redirect to the Warpcast app.
         if (isMobile()) {
-            window.location.assign(data.url);
+            yield PlatformService.openURL(data.url);
         }
         else {
             setShowAuthFlow(true);

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

@@ -28,7 +28,7 @@ var getVerifyArgs = require('../../functions/getVerifyArgs/getVerifyArgs.cjs');
 require('viem');
 require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
-var storeAuthTokenAndUser = require('../../../store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.cjs');
+require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
 var wallets = require('../../../data/api/wallets/wallets.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
@@ -47,7 +47,6 @@ require('../../../context/MockContext/MockContext.cjs');
 require('../../../views/CollectUserDataView/useFields.cjs');
 require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
-require('@dynamic-labs/store');
 require('@dynamic-labs/rpc-providers');
 require('react-i18next');
 require('../../../components/Alert/Alert.cjs');
@@ -117,11 +116,10 @@ const useTransferWallet = () => {
             // and if props doesn't have nonce, that means it has messageToSignOverride and signedMessageOverride
             nonce: '', siweStatement: props.overrideSiweStatement, walletProvider: getWalletProvider.getWalletProvider(walletConnector) });
         const verifyArgs = yield getVerifyArgs.getVerifyArgs(args);
-        const response = yield wallets.transferWallet(environmentId, verifyArgs);
-        if (!response) {
+        const userProfile = yield wallets.transferWallet(environmentId, verifyArgs);
+        if (!userProfile) {
             throw new utils.DynamicError('Error transferring wallet.');
         }
-        const userProfile = storeAuthTokenAndUser.storeAuthTokenAndUser(response);
         updatePrimaryWalletId(walletConnector, userProfile);
         const walletId = userProfile.lastVerifiedCredentialId;
         if (walletId) {

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

@@ -24,7 +24,7 @@ import { getVerifyArgs } from '../../functions/getVerifyArgs/getVerifyArgs.js';
 import 'viem';
 import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
-import { storeAuthTokenAndUser } from '../../../store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.js';
+import '@dynamic-labs/store';
 import '../../../locale/locale.js';
 import { transferWallet } from '../../../data/api/wallets/wallets.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
@@ -43,7 +43,6 @@ import '../../../context/MockContext/MockContext.js';
 import '../../../views/CollectUserDataView/useFields.js';
 import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
-import '@dynamic-labs/store';
 import '@dynamic-labs/rpc-providers';
 import 'react-i18next';
 import '../../../components/Alert/Alert.js';
@@ -113,11 +112,10 @@ const useTransferWallet = () => {
             // and if props doesn't have nonce, that means it has messageToSignOverride and signedMessageOverride
             nonce: '', siweStatement: props.overrideSiweStatement, walletProvider: getWalletProvider(walletConnector) });
         const verifyArgs = yield getVerifyArgs(args);
-        const response = yield transferWallet(environmentId, verifyArgs);
-        if (!response) {
+        const userProfile = yield transferWallet(environmentId, verifyArgs);
+        if (!userProfile) {
             throw new DynamicError('Error transferring wallet.');
         }
-        const userProfile = storeAuthTokenAndUser(response);
         updatePrimaryWalletId(walletConnector, userProfile);
         const walletId = userProfile.lastVerifiedCredentialId;
         if (walletId) {

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

@@ -27,8 +27,8 @@ require('react-international-phone');
 require('viem');
 require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
-var mfa = require('../../../data/api/mfa/mfa.cjs');
 var storeAuthTokenAndUser = require('../../../store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.cjs');
+var mfa = require('../../../data/api/mfa/mfa.cjs');
 require('../../../locale/locale.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -178,6 +178,9 @@ const useUserAuth = ({ authMethod, }) => {
         onSettled === null || onSettled === void 0 ? void 0 : onSettled();
     });
     const handleError = (error, { options = {}, onError, }) => {
+        if (error instanceof utils.MfaInvalidOtpError) {
+            throw error;
+        }
         // these get caught in onboarding form and handled there
         if (error instanceof utils.EmailAlreadyExistsError ||
             error instanceof utils.CustomFieldNotUniqueError ||

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

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { DynamicError, EmailAlreadyExistsError, CustomFieldNotUniqueError, UsernameAlreadyExistsError, TooManyEmailVerificationsError, InvalidPhoneNumberError, NoAccessError, AccountExistsError, UserHasAccountWithEmailError, sleep } from '@dynamic-labs/utils';
+import { DynamicError, MfaInvalidOtpError, EmailAlreadyExistsError, CustomFieldNotUniqueError, UsernameAlreadyExistsError, TooManyEmailVerificationsError, InvalidPhoneNumberError, NoAccessError, AccountExistsError, UserHasAccountWithEmailError, sleep } from '@dynamic-labs/utils';
 import { useAccountExistsContext } from '../../../context/AccountExistsContext/AccountExistsContext.js';
 import 'react';
 import '../../../context/DynamicContext/DynamicContext.js';
@@ -23,8 +23,8 @@ import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
-import { getUserMfaDevices } from '../../../data/api/mfa/mfa.js';
 import { storeAuthTokenAndUser } from '../../../store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.js';
+import { getUserMfaDevices } from '../../../data/api/mfa/mfa.js';
 import '../../../locale/locale.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -174,6 +174,9 @@ const useUserAuth = ({ authMethod, }) => {
         onSettled === null || onSettled === void 0 ? void 0 : onSettled();
     });
     const handleError = (error, { options = {}, onError, }) => {
+        if (error instanceof MfaInvalidOtpError) {
+            throw error;
+        }
         // these get caught in onboarding form and handled there
         if (error instanceof EmailAlreadyExistsError ||
             error instanceof CustomFieldNotUniqueError ||

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

@@ -184,7 +184,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
                     id: embeddedWalletVerifiedCredential.id,
                 };
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
-                dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, updateUserProfileResponse.jwt);
+                dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, updateUserProfileResponse.jwt, user);
             }
             if (isUsingPregeneratedWallets || isManualMode) {
                 setShowAuthFlow(false);

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

@@ -180,7 +180,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
                     id: embeddedWalletVerifiedCredential.id,
                 };
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
-                dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, updateUserProfileResponse.jwt);
+                dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, updateUserProfileResponse.jwt, user);
             }
             if (isUsingPregeneratedWallets || isManualMode) {
                 setShowAuthFlow(false);

package/src/lib/views/MfaSecureDeviceView/MfaSecureDeviceView.cjs

@@ -15,8 +15,8 @@ require('../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 var ViewContext = require('../../context/ViewContext/ViewContext.cjs');
-var footerInfoIcon = require('../../shared/assets/footer-info-icon.cjs');
 var link = require('../../shared/assets/link.cjs');
+var passwordHero = require('../../shared/assets/password-hero.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../utils/constants/colors.cjs');
 require('../../utils/constants/values.cjs');
@@ -100,7 +100,7 @@ const MfaSecureDeviceView = ({ type }) => {
             onBackClick: onMfaVerificationBackClick,
         });
     };
-    return (jsxRuntime.jsxs("div", { className: 'mfa-secure-device-view__body', "data-testid": 'mfa-secure-device-view', children: [jsxRuntime.jsx(Typography.Typography, { className: 'mfa-secure-device-view__copy', variant: 'body_normal', weight: 'regular', color: 'secondary', children: t('dyn_mfa.secure_device_view.body') }), isLoading && (jsxRuntime.jsx(spinner.Spinner, { className: 'mfa-secure-device-view__loading-spinner' })), data && (jsxRuntime.jsxs("div", { className: 'mfa-secure-device-view__qrcode', children: [jsxRuntime.jsx(QRCode.QRCode, { Icon: jsxRuntime.jsx(footerInfoIcon.ReactComponent, {}), value: data.uri, logoSize: 50 }), jsxRuntime.jsx("div", { className: 'button-container', children: jsxRuntime.jsx(CopyButton.CopyButton, { variant: 'button', textToCopy: data.uri, buttonClassName: 'qr-code-button', copykey: 'dyn_qr_code.copy_button', startSlot: 
+    return (jsxRuntime.jsxs("div", { className: 'mfa-secure-device-view__body', "data-testid": 'mfa-secure-device-view', children: [jsxRuntime.jsx(Typography.Typography, { className: 'mfa-secure-device-view__copy', variant: 'body_normal', weight: 'regular', color: 'secondary', children: t('dyn_mfa.secure_device_view.body') }), isLoading && (jsxRuntime.jsx(spinner.Spinner, { className: 'mfa-secure-device-view__loading-spinner' })), data && (jsxRuntime.jsxs("div", { className: 'mfa-secure-device-view__qrcode', children: [jsxRuntime.jsx(QRCode.QRCode, { Icon: jsxRuntime.jsx(passwordHero.ReactComponent, {}), value: data.uri, logoSize: 50 }), jsxRuntime.jsx("div", { className: 'button-container', children: jsxRuntime.jsx(CopyButton.CopyButton, { variant: 'button', textToCopy: data.uri, buttonClassName: 'qr-code-button', copykey: 'dyn_qr_code.copy_button', startSlot: 
                             // eslint-disable-next-line react/jsx-wrap-multilines
                             jsxRuntime.jsx(Icon.Icon, { size: 'mini', color: 'text-tertiary', children: jsxRuntime.jsx(link.ReactComponent, {}) }), children: t('dyn_qr_code.copy_button') }) })] })), jsxRuntime.jsx(TypographyButton.TypographyButton, { className: 'mfa-secure-device-view__button', expanded: true, onClick: onContinue, children: t('dyn_mfa.secure_device_view.continue') })] }));
 };

package/src/lib/views/MfaSecureDeviceView/MfaSecureDeviceView.js

@@ -11,8 +11,8 @@ import '../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import { useViewContext } from '../../context/ViewContext/ViewContext.js';
-import { ReactComponent as SvgFooterInfoIcon } from '../../shared/assets/footer-info-icon.js';
 import { ReactComponent as SvgLink } from '../../shared/assets/link.js';
+import { ReactComponent as SvgPasswordHero } from '../../shared/assets/password-hero.js';
 import '@dynamic-labs/wallet-book';
 import '../../utils/constants/colors.js';
 import '../../utils/constants/values.js';
@@ -96,7 +96,7 @@ const MfaSecureDeviceView = ({ type }) => {
             onBackClick: onMfaVerificationBackClick,
         });
     };
-    return (jsxs("div", { className: 'mfa-secure-device-view__body', "data-testid": 'mfa-secure-device-view', children: [jsx(Typography, { className: 'mfa-secure-device-view__copy', variant: 'body_normal', weight: 'regular', color: 'secondary', children: t('dyn_mfa.secure_device_view.body') }), isLoading && (jsx(Spinner, { className: 'mfa-secure-device-view__loading-spinner' })), data && (jsxs("div", { className: 'mfa-secure-device-view__qrcode', children: [jsx(QRCode, { Icon: jsx(SvgFooterInfoIcon, {}), value: data.uri, logoSize: 50 }), jsx("div", { className: 'button-container', children: jsx(CopyButton, { variant: 'button', textToCopy: data.uri, buttonClassName: 'qr-code-button', copykey: 'dyn_qr_code.copy_button', startSlot: 
+    return (jsxs("div", { className: 'mfa-secure-device-view__body', "data-testid": 'mfa-secure-device-view', children: [jsx(Typography, { className: 'mfa-secure-device-view__copy', variant: 'body_normal', weight: 'regular', color: 'secondary', children: t('dyn_mfa.secure_device_view.body') }), isLoading && (jsx(Spinner, { className: 'mfa-secure-device-view__loading-spinner' })), data && (jsxs("div", { className: 'mfa-secure-device-view__qrcode', children: [jsx(QRCode, { Icon: jsx(SvgPasswordHero, {}), value: data.uri, logoSize: 50 }), jsx("div", { className: 'button-container', children: jsx(CopyButton, { variant: 'button', textToCopy: data.uri, buttonClassName: 'qr-code-button', copykey: 'dyn_qr_code.copy_button', startSlot: 
                             // eslint-disable-next-line react/jsx-wrap-multilines
                             jsx(Icon, { size: 'mini', color: 'text-tertiary', children: jsx(SvgLink, {}) }), children: t('dyn_qr_code.copy_button') }) })] })), jsx(TypographyButton, { className: 'mfa-secure-device-view__button', expanded: true, onClick: onContinue, children: t('dyn_mfa.secure_device_view.continue') })] }));
 };

package/src/lib/views/Passkey/PasskeyRecovery/CompleteRecovery/PasskeyCompleteRecovery.cjs

@@ -32,7 +32,6 @@ var getEOAWallet = require('../../../../utils/functions/getEOAWallet/getEOAWalle
 require('../../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../../locale/locale.cjs');
-var updateJWTAndCreateUserProfile = require('../../../../utils/functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -91,18 +90,20 @@ require('../../../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInS
 require('../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 
 const PasskeyCompleteRecovery = () => {
-    const { primaryWallet, environmentId, user, setShowAuthFlow, setUser, setPasskeySuccessPopup, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { primaryWallet, environmentId, user, setShowAuthFlow, setPasskeySuccessPopup, } = useInternalDynamicContext.useInternalDynamicContext();
     const { isTurnkeyWalletWithoutAuthenticator } = useIsTurnkeyWallet.useIsTurnkeyWallet();
     const { t } = reactI18next.useTranslation();
     const { mutate: completeRecovery, isLoading, error, } = useMutation.useMutation(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const wallet = getEOAWallet.getEOAWallet(primaryWallet, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
-        const { passkeyRecoveryResponse } = yield passkeyRecovery.completePasskeyRecovery({
+        const updatedUser = yield passkeyRecovery.completePasskeyRecovery({
             environmentId,
             user,
             wallet,
         });
+        if (!updatedUser) {
+            throw new utils.DynamicError('Error completing passkey recovery');
+        }
         dynamicEvents.dynamicEvents.emit('passkeyRecoveryCompleted', primaryWallet);
-        setUser(updateJWTAndCreateUserProfile.updateJWTAndCreateUserProfile(passkeyRecoveryResponse.jwt, passkeyRecoveryResponse.minifiedJwt));
         setShowAuthFlow(false);
         setPasskeySuccessPopup(PasskeyCreatedSuccessBanner.PasskeySuccessEnum.CREATED);
     }), {

package/src/lib/views/Passkey/PasskeyRecovery/CompleteRecovery/PasskeyCompleteRecovery.js

@@ -28,7 +28,6 @@ import { getEOAWallet } from '../../../../utils/functions/getEOAWallet/getEOAWal
 import '../../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../../locale/locale.js';
-import { updateJWTAndCreateUserProfile } from '../../../../utils/functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -87,18 +86,20 @@ import '../../../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSe
 import '../../../../context/IpConfigurationContext/IpConfigurationContext.js';
 
 const PasskeyCompleteRecovery = () => {
-    const { primaryWallet, environmentId, user, setShowAuthFlow, setUser, setPasskeySuccessPopup, } = useInternalDynamicContext();
+    const { primaryWallet, environmentId, user, setShowAuthFlow, setPasskeySuccessPopup, } = useInternalDynamicContext();
     const { isTurnkeyWalletWithoutAuthenticator } = useIsTurnkeyWallet();
     const { t } = useTranslation();
     const { mutate: completeRecovery, isLoading, error, } = useMutation(() => __awaiter(void 0, void 0, void 0, function* () {
         const wallet = getEOAWallet(primaryWallet, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
-        const { passkeyRecoveryResponse } = yield completePasskeyRecovery({
+        const updatedUser = yield completePasskeyRecovery({
             environmentId,
             user,
             wallet,
         });
+        if (!updatedUser) {
+            throw new DynamicError('Error completing passkey recovery');
+        }
         dynamicEvents.emit('passkeyRecoveryCompleted', primaryWallet);
-        setUser(updateJWTAndCreateUserProfile(passkeyRecoveryResponse.jwt, passkeyRecoveryResponse.minifiedJwt));
         setShowAuthFlow(false);
         setPasskeySuccessPopup(PasskeySuccessEnum.CREATED);
     }), {