@dynamic-labs/sdk-react-core 4.64.0 → 4.66.0

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

@@ -0,0 +1,193 @@
+'use client'
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { useState, useRef, useCallback } from 'react';
+import { verifyOTP, sendEmailOTP, supportedCountries, sendSmsOTP } from '@dynamic-labs-sdk/client';
+import { JwtVerifiedCredentialFormatEnum } from '@dynamic-labs/sdk-api-core';
+import '@dynamic-labs-sdk/client/core';
+import '../../../client/client.js';
+import '../../../config/ApiEndpoint.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import { logger } from '../../../shared/logger.js';
+import '@dynamic-labs/wallet-book';
+import '@dynamic-labs/utils';
+import '../../constants/colors.js';
+import '../../constants/values.js';
+import '../../../shared/consts/index.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import '../../../store/state/nonce/nonce.js';
+import '@dynamic-labs/locale';
+import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
+import '../../../store/state/primaryWalletId/primaryWalletId.js';
+import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
+import '../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
+import '../../../events/dynamicEvents.js';
+import { useUser } from '../../../client/extension/user/useUser/useUser.js';
+import { useConnectAndSign } from '../authenticationHooks/useConnectAndSign/useConnectAndSign.js';
+import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
+
+const INITIAL_STATE = {
+    error: null,
+    isLoading: false,
+    otpVerification: null,
+};
+const isCountryCode = (value) => value !== undefined && value in supportedCountries;
+const isOtpCapableCredential = (cred) => cred.format === JwtVerifiedCredentialFormatEnum.Email ||
+    cred.format === JwtVerifiedCredentialFormatEnum.PhoneNumber;
+const resolveTargetCredential = (credentials, credentialId) => {
+    var _a, _b;
+    if (credentialId) {
+        return ((_a = credentials.find((cred) => cred.id === credentialId)) !== null && _a !== void 0 ? _a : `Credential with id "${credentialId}" not found`);
+    }
+    return ((_b = credentials.find((cred) => cred.signInEnabled && isOtpCapableCredential(cred))) !== null && _b !== void 0 ? _b : 'No sign-in enabled email or SMS credential found for step-up authentication');
+};
+const sendEmailOtp = (credential) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!credential.email) {
+        throw new Error('Email credential is missing email address');
+    }
+    return sendEmailOTP({ email: credential.email });
+});
+const sendSmsOtp = (credential) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const normalizedPhoneCountryCode = (_a = credential.phoneCountryCode) === null || _a === void 0 ? void 0 : _a.replace(/^\+/, '');
+    const matchedCountryCode = Object.keys(supportedCountries).find((key) => supportedCountries[key].code === normalizedPhoneCountryCode);
+    const isoCountryCode = isCountryCode(credential.isoCountryCode)
+        ? credential.isoCountryCode
+        : matchedCountryCode;
+    if (!credential.phoneNumber || !isoCountryCode) {
+        throw new Error('SMS credential is missing phone number or country code');
+    }
+    return sendSmsOTP({ isoCountryCode, phoneNumber: credential.phoneNumber });
+});
+const dispatchOtp = (credential) => __awaiter(void 0, void 0, void 0, function* () {
+    return credential.format === JwtVerifiedCredentialFormatEnum.Email
+        ? sendEmailOtp(credential)
+        : sendSmsOtp(credential);
+});
+/**
+ * Perform step-up authentication for an already-authenticated user via OTP.
+ *
+ * Automatically selects the first sign-in enabled email or SMS credential on
+ * the user, or targets a specific credential when `credentialId` is provided.
+ *
+ * @param params.credentialId - Optional id of a specific verified credential to
+ *   use. Must be an email or SMS credential. Defaults to the first sign-in
+ *   enabled email or SMS credential on the authenticated user.
+ *
+ * @returns `sendOtp` – sends the OTP to the resolved credential.
+ * @returns `verifyOtp` – verifies the OTP code supplied by the user.
+ * @returns `state` – current loading / error / otpVerification state.
+ * @returns `resetState` – resets state back to its initial value.
+ *
+ * @example
+ * ```tsx
+ * const { sendOtp, verifyOtp, state } = useStepUpAuthentication();
+ *
+ * // Step 1: send OTP
+ * await sendOtp();
+ *
+ * // Step 2: after the user enters the code
+ * const result = await verifyOtp({ verificationToken: '123456' });
+ * ```
+ */
+const useStepUpAuthentication = ({ credentialId, } = {}) => {
+    const user = useUser();
+    const [state, setState] = useState(INITIAL_STATE);
+    const connectAndSign = useConnectAndSign();
+    const { userWallets } = useInternalUserWallets();
+    // Ref keeps the latest otpVerification available inside the verifyOtp
+    // callback without creating a stale closure over state.
+    const otpVerificationRef = useRef(null);
+    const resetState = useCallback(() => {
+        otpVerificationRef.current = null;
+        setState(INITIAL_STATE);
+    }, []);
+    const setError = useCallback((errorMessage) => {
+        setState((prev) => (Object.assign(Object.assign({}, prev), { error: errorMessage, isLoading: false })));
+        logger.error(errorMessage);
+    }, []);
+    const sendOtp = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+        const credentials = user === null || user === void 0 ? void 0 : user.verifiedCredentials;
+        if (!(credentials === null || credentials === void 0 ? void 0 : credentials.length)) {
+            setError('No verified credentials found for the authenticated user');
+            return null;
+        }
+        const result = resolveTargetCredential(credentials, credentialId);
+        if (typeof result === 'string') {
+            setError(result);
+            return null;
+        }
+        if (!isOtpCapableCredential(result)) {
+            setError(`Credential format "${result.format}" does not support OTP verification. Only email and SMS credentials are supported`);
+            return null;
+        }
+        setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: true })));
+        try {
+            const otpVerification = yield dispatchOtp(result);
+            otpVerificationRef.current = otpVerification;
+            setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: false, otpVerification })));
+            return otpVerification;
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : 'Failed to send OTP';
+            setState((prev) => (Object.assign(Object.assign({}, prev), { error: errorMessage, isLoading: false })));
+            logger.error('Failed to send OTP for step-up authentication', { error });
+            return null;
+        }
+    }), [credentialId, setError, user === null || user === void 0 ? void 0 : user.verifiedCredentials]);
+    const verifyOtp = useCallback((_a) => __awaiter(void 0, [_a], void 0, function* ({ requestedScopes, verificationToken, }) {
+        const otpVerification = otpVerificationRef.current;
+        if (!otpVerification) {
+            setError('OTP verification has not been initiated. Call sendOtp() first');
+            return null;
+        }
+        setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: true })));
+        try {
+            const response = yield verifyOTP({
+                otpVerification,
+                requestedScopes,
+                verificationToken,
+            });
+            setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: false })));
+            return response;
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : 'Failed to verify OTP';
+            setState((prev) => (Object.assign(Object.assign({}, prev), { error: errorMessage, isLoading: false })));
+            logger.error('Failed to verify OTP for step-up authentication', {
+                error,
+            });
+            return null;
+        }
+    }), [setError]);
+    const verifyWallet = useCallback((_b) => __awaiter(void 0, [_b], void 0, function* ({ requestedScopes }) {
+        setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: true })));
+        const wallet = userWallets.find((w) => w.id === credentialId);
+        if (!wallet) {
+            setError(`Wallet with id "${credentialId}" not found`);
+            return;
+        }
+        try {
+            yield connectAndSign({
+                requestedScopes,
+                walletConnector: wallet.connector,
+            });
+            setState((prev) => (Object.assign(Object.assign({}, prev), { isLoading: false })));
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error
+                ? error.message
+                : 'Failed to verify wallet for step-up authentication';
+            setState((prev) => (Object.assign(Object.assign({}, prev), { error: errorMessage, isLoading: false })));
+            logger.error('Failed to verify wallet for step-up authentication', {
+                error,
+            });
+        }
+    }), [connectAndSign, credentialId, setError, userWallets]);
+    return { resetState, sendOtp, state, verifyOtp, verifyWallet };
+};
+
+export { useStepUpAuthentication };

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

@@ -160,7 +160,9 @@ const useWalletCreation = () => {
         try {
             // If passcodeRequired is enabled, prompt user to set up password first
             const password = yield setupPassword();
-            yield createWalletAccount(requirements, password);
+            yield createWalletAccount(requirements, password, undefined, {
+                skipCloseAuthFlow: Boolean(password),
+            });
             const duration = Date.now() - startTime;
             // Log successful wallet creation to DataDog
             logger.logger.instrument('Auto wallet creation successful', {

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

@@ -156,7 +156,9 @@ const useWalletCreation = () => {
         try {
             // If passcodeRequired is enabled, prompt user to set up password first
             const password = yield setupPassword();
-            yield createWalletAccount(requirements, password);
+            yield createWalletAccount(requirements, password, undefined, {
+                skipCloseAuthFlow: Boolean(password),
+            });
             const duration = Date.now() - startTime;
             // Log successful wallet creation to DataDog
             logger.instrument('Auto wallet creation successful', {

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

@@ -134,7 +134,7 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
     // We need this boolean to distinguish between logic for verify or linking.
     const verifyOnly = !user;
     const shouldFallbackToConnectOnly = enableConnectOnlyFallback && (verifyOnly || !multiWalletEnabled);
-    const generateJWT = (walletConnector, walletProvider, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const generateJWT = (walletConnector, walletProvider, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride, requestedScopes) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const verifyArgs = yield getVerifyArgs.getVerifyArgs({
             displaySiweStatement,
             environmentId,
@@ -156,6 +156,11 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
             verifyResponse = wallets.verifyWallet(environmentId, Object.assign(Object.assign({}, verifyArgs), { captchaToken,
                 oauth }));
         }
+        else if (user && requestedScopes) {
+            verifyResponse = wallets.walletsVerify(environmentId, Object.assign(Object.assign({}, verifyArgs), { captchaToken,
+                oauth,
+                requestedScopes }));
+        }
         else {
             verifyResponse = wallets.linkWallet(environmentId, verifyArgs);
         }
@@ -285,7 +290,7 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
             setErrorMessage(e.code);
         }
     };
-    return (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ walletConnector, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride, }) {
+    return (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ walletConnector, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride, requestedScopes, }) {
         const walletProvider = walletConnectorCore.getWalletProvider(walletConnector);
         dynamicEvents.dynamicEvents.emit('authInit', {
             address: publicWalletAddress,
@@ -294,7 +299,7 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
             type: 'wallet',
         });
         try {
-            const { verifyFunction, verifyArgs } = yield generateJWT(walletConnector, walletProvider, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride);
+            const { verifyFunction, verifyArgs } = yield generateJWT(walletConnector, walletProvider, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride, requestedScopes);
             yield initAuth({
                 isSignIn: verifyOnly,
                 onError: (e) => {

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

@@ -7,5 +7,5 @@ type UseVerifyWalletArgs = {
     displaySiweStatement: boolean;
     setIsSingleWalletAccount: Dispatch<SetStateAction<boolean>>;
 };
-export declare const useVerifyWallet: ({ displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, }: UseVerifyWalletArgs) => ({ walletConnector, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride, }: VerifyCallbackArgs) => Promise<void>;
+export declare const useVerifyWallet: ({ displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, }: UseVerifyWalletArgs) => ({ walletConnector, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride, requestedScopes, }: VerifyCallbackArgs) => Promise<void>;
 export {};

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

@@ -34,7 +34,7 @@ import '../../../client/client.js';
 import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/locale';
-import { verifyWallet, linkWallet } from '../../../data/api/wallets/wallets.js';
+import { verifyWallet, walletsVerify, linkWallet } from '../../../data/api/wallets/wallets.js';
 import '../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import { useAccessDeniedContext } from '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import { useAccountExistsContext } from '../../../context/AccountExistsContext/AccountExistsContext.js';
@@ -130,7 +130,7 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
     // We need this boolean to distinguish between logic for verify or linking.
     const verifyOnly = !user;
     const shouldFallbackToConnectOnly = enableConnectOnlyFallback && (verifyOnly || !multiWalletEnabled);
-    const generateJWT = (walletConnector, walletProvider, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride) => __awaiter(void 0, void 0, void 0, function* () {
+    const generateJWT = (walletConnector, walletProvider, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride, requestedScopes) => __awaiter(void 0, void 0, void 0, function* () {
         const verifyArgs = yield getVerifyArgs({
             displaySiweStatement,
             environmentId,
@@ -152,6 +152,11 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
             verifyResponse = verifyWallet(environmentId, Object.assign(Object.assign({}, verifyArgs), { captchaToken,
                 oauth }));
         }
+        else if (user && requestedScopes) {
+            verifyResponse = walletsVerify(environmentId, Object.assign(Object.assign({}, verifyArgs), { captchaToken,
+                oauth,
+                requestedScopes }));
+        }
         else {
             verifyResponse = linkWallet(environmentId, verifyArgs);
         }
@@ -281,7 +286,7 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
             setErrorMessage(e.code);
         }
     };
-    return (_a) => __awaiter(void 0, [_a], void 0, function* ({ walletConnector, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride, }) {
+    return (_a) => __awaiter(void 0, [_a], void 0, function* ({ walletConnector, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride, requestedScopes, }) {
         const walletProvider = getWalletProvider(walletConnector);
         dynamicEvents.emit('authInit', {
             address: publicWalletAddress,
@@ -290,7 +295,7 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
             type: 'wallet',
         });
         try {
-            const { verifyFunction, verifyArgs } = yield generateJWT(walletConnector, walletProvider, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride);
+            const { verifyFunction, verifyArgs } = yield generateJWT(walletConnector, walletProvider, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride, requestedScopes);
             yield initAuth({
                 isSignIn: verifyOnly,
                 onError: (e) => {

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

@@ -18,6 +18,7 @@ require('../../constants/values.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('../../../shared/consts/index.cjs');
 var useDynamicWaas = require('../useDynamicWaas/useDynamicWaas.cjs');
+var useRefreshUser = require('../useRefreshUser/useRefreshUser.cjs');
 
 const INITIAL_STATE = {
     error: null,
@@ -26,10 +27,50 @@ const INITIAL_STATE = {
 };
 const useWalletPassword = () => {
     const { getWaasWalletConnector } = useDynamicWaas.useDynamicWaas();
+    const refreshUser = useRefreshUser.useRefreshUser();
     const [state, setState] = React.useState(INITIAL_STATE);
     const resetState = React.useCallback(() => {
         setState(INITIAL_STATE);
     }, []);
+    const setPassword = React.useCallback((params) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const { accountAddress, chainName, newPassword } = params;
+        setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: true })));
+        try {
+            const connector = getWaasWalletConnector(chainName);
+            if (!connector) {
+                const errorMessage = 'Wallet connector not found';
+                setState((prev) => (Object.assign(Object.assign({}, prev), { error: errorMessage, isLoading: false })));
+                logger.logger.error(errorMessage, { accountAddress, chainName });
+                return false;
+            }
+            yield connector.setPassword({
+                accountAddress,
+                newPassword,
+            });
+            setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: false })));
+            try {
+                yield refreshUser();
+            }
+            catch (refreshError) {
+                logger.logger.warn('Failed to refresh user after setting password', {
+                    accountAddress,
+                    chainName,
+                    refreshError,
+                });
+            }
+            return true;
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : 'Failed to set password';
+            setState((prev) => (Object.assign(Object.assign({}, prev), { error: errorMessage, isLoading: false })));
+            logger.logger.error('Failed to set wallet password', {
+                accountAddress,
+                chainName,
+                error,
+            });
+            return false;
+        }
+    }), [getWaasWalletConnector, refreshUser]);
     const updatePassword = React.useCallback((params) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const { accountAddress, chainName, newPassword, existingPassword } = params;
         setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: true })));
@@ -47,6 +88,16 @@ const useWalletPassword = () => {
                 newPassword,
             });
             setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: false })));
+            try {
+                yield refreshUser();
+            }
+            catch (refreshError) {
+                logger.logger.warn('Failed to refresh user after updating password', {
+                    accountAddress,
+                    chainName,
+                    refreshError,
+                });
+            }
             return true;
         }
         catch (error) {
@@ -59,7 +110,7 @@ const useWalletPassword = () => {
             });
             return false;
         }
-    }), [getWaasWalletConnector]);
+    }), [getWaasWalletConnector, refreshUser]);
     const unlockWallet = React.useCallback((params) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const { accountAddress, chainName, password } = params;
         setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: true })));
@@ -143,6 +194,7 @@ const useWalletPassword = () => {
     return {
         checkWalletLockState,
         resetState,
+        setPassword,
         state,
         unlockWallet,
         updatePassword,

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

@@ -1,5 +1,10 @@
 import { WalletRecoveryState } from '@dynamic-labs-wallet/browser-wallet-client';
 import { ChainEnum } from '@dynamic-labs/sdk-api-core';
+export type SetPasswordParams = {
+    accountAddress: string;
+    chainName: ChainEnum;
+    newPassword: string;
+};
 export type UpdatePasswordParams = {
     accountAddress: string;
     chainName: ChainEnum;
@@ -21,6 +26,7 @@ export type WalletPasswordState = {
     recoveryState: WalletRecoveryState | null;
 };
 export type UseWalletPasswordReturn = {
+    setPassword: (params: SetPasswordParams) => Promise<boolean>;
     updatePassword: (params: UpdatePasswordParams) => Promise<boolean>;
     unlockWallet: (params: UnlockWalletParams) => Promise<boolean>;
     checkWalletLockState: (params: CheckWalletLockStateParams) => Promise<WalletRecoveryState | null>;

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

@@ -14,6 +14,7 @@ import '../../constants/values.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../../shared/consts/index.js';
 import { useDynamicWaas } from '../useDynamicWaas/useDynamicWaas.js';
+import { useRefreshUser } from '../useRefreshUser/useRefreshUser.js';
 
 const INITIAL_STATE = {
     error: null,
@@ -22,10 +23,50 @@ const INITIAL_STATE = {
 };
 const useWalletPassword = () => {
     const { getWaasWalletConnector } = useDynamicWaas();
+    const refreshUser = useRefreshUser();
     const [state, setState] = useState(INITIAL_STATE);
     const resetState = useCallback(() => {
         setState(INITIAL_STATE);
     }, []);
+    const setPassword = useCallback((params) => __awaiter(void 0, void 0, void 0, function* () {
+        const { accountAddress, chainName, newPassword } = params;
+        setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: true })));
+        try {
+            const connector = getWaasWalletConnector(chainName);
+            if (!connector) {
+                const errorMessage = 'Wallet connector not found';
+                setState((prev) => (Object.assign(Object.assign({}, prev), { error: errorMessage, isLoading: false })));
+                logger.error(errorMessage, { accountAddress, chainName });
+                return false;
+            }
+            yield connector.setPassword({
+                accountAddress,
+                newPassword,
+            });
+            setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: false })));
+            try {
+                yield refreshUser();
+            }
+            catch (refreshError) {
+                logger.warn('Failed to refresh user after setting password', {
+                    accountAddress,
+                    chainName,
+                    refreshError,
+                });
+            }
+            return true;
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : 'Failed to set password';
+            setState((prev) => (Object.assign(Object.assign({}, prev), { error: errorMessage, isLoading: false })));
+            logger.error('Failed to set wallet password', {
+                accountAddress,
+                chainName,
+                error,
+            });
+            return false;
+        }
+    }), [getWaasWalletConnector, refreshUser]);
     const updatePassword = useCallback((params) => __awaiter(void 0, void 0, void 0, function* () {
         const { accountAddress, chainName, newPassword, existingPassword } = params;
         setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: true })));
@@ -43,6 +84,16 @@ const useWalletPassword = () => {
                 newPassword,
             });
             setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: false })));
+            try {
+                yield refreshUser();
+            }
+            catch (refreshError) {
+                logger.warn('Failed to refresh user after updating password', {
+                    accountAddress,
+                    chainName,
+                    refreshError,
+                });
+            }
             return true;
         }
         catch (error) {
@@ -55,7 +106,7 @@ const useWalletPassword = () => {
             });
             return false;
         }
-    }), [getWaasWalletConnector]);
+    }), [getWaasWalletConnector, refreshUser]);
     const unlockWallet = useCallback((params) => __awaiter(void 0, void 0, void 0, function* () {
         const { accountAddress, chainName, password } = params;
         setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: true })));
@@ -139,6 +190,7 @@ const useWalletPassword = () => {
     return {
         checkWalletLockState,
         resetState,
+        setPassword,
         state,
         unlockWallet,
         updatePassword,

package/src/lib/views/MfaDisplayBackupCodesView/MfaDisplayBackupCodesView.cjs

@@ -124,8 +124,8 @@ const MfaDisplayBackupCodesView = ({ regenerateCodes = false, }) => {
     const { data: codes, isLoading } = usePromise.usePromise(() => getRecoveryCodes(regenerateCodes));
     const codesAsString = (codes || []).join('\n');
     const handleCompleteAcknowledgement = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        setShowAuthFlow(false);
         yield completeAcknowledgement();
+        setShowAuthFlow(false);
     });
     const handleDownload = (e) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         e.preventDefault();

package/src/lib/views/MfaDisplayBackupCodesView/MfaDisplayBackupCodesView.js

@@ -120,8 +120,8 @@ const MfaDisplayBackupCodesView = ({ regenerateCodes = false, }) => {
     const { data: codes, isLoading } = usePromise(() => getRecoveryCodes(regenerateCodes));
     const codesAsString = (codes || []).join('\n');
     const handleCompleteAcknowledgement = () => __awaiter(void 0, void 0, void 0, function* () {
-        setShowAuthFlow(false);
         yield completeAcknowledgement();
+        setShowAuthFlow(false);
     });
     const handleDownload = (e) => __awaiter(void 0, void 0, void 0, function* () {
         e.preventDefault();

package/src/lib/views/ResetPasswordForSettingsView/ResetPasswordForSettingsView.cjs

@@ -3,7 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _tslib = require('../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 require('../../context/DynamicContext/DynamicContext.cjs');
@@ -11,7 +10,7 @@ require('../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('../../context/ViewContext/ViewContext.cjs');
-var logger = require('../../shared/logger.cjs');
+require('../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('../../utils/constants/colors.cjs');
@@ -19,6 +18,7 @@ require('../../utils/constants/values.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('../../shared/consts/index.cjs');
 require('../../events/dynamicEvents.cjs');
+require('../../../../_virtual/_tslib.cjs');
 require('../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
@@ -42,7 +42,6 @@ require('react-dom');
 require('../../utils/functions/compareChains/compareChains.cjs');
 require('../Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../context/ThemeContext/ThemeContext.cjs');
-var useSmartWallets = require('../../utils/hooks/useSmartWallets/useSmartWallets.cjs');
 require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');
 require('@dynamic-labs/types');
@@ -92,7 +91,6 @@ require('../../context/ErrorContext/hooks/useErrorText/useErrorText.cjs');
 require('../../context/FooterAnimationContext/index.cjs');
 require('../MfaChooseDeviceView/useGetMfaOptions/useGetMfaOptions.cjs');
 require('../../context/PasskeyContext/PasskeyContext.cjs');
-var useWalletPassword = require('../../utils/hooks/useWalletPassword/useWalletPassword.cjs');
 var ResetPasswordView = require('../../widgets/DynamicWidget/views/ResetPasswordView/ResetPasswordView.cjs');
 require('../../context/OnrampContext/OnrampContext.cjs');
 require('../../store/state/sendBalances.cjs');
@@ -110,24 +108,10 @@ require('../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useInternalDynamicContext = require('../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 
 const ResetPasswordForSettingsView = () => {
-    const { primaryWallet, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
-    const { getEOAWallet } = useSmartWallets.useSmartWallets();
-    const { updatePassword } = useWalletPassword.useWalletPassword();
-    const eoaWallet = primaryWallet && getEOAWallet(primaryWallet);
-    const wallet = eoaWallet !== null && eoaWallet !== void 0 ? eoaWallet : primaryWallet;
-    const handleComplete = React.useCallback((oldPassword, newPassword) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        if (!(wallet === null || wallet === void 0 ? void 0 : wallet.address) || !(wallet === null || wallet === void 0 ? void 0 : wallet.chain)) {
-            logger.logger.error('No wallet address or chain available for password reset');
-            return;
-        }
-        yield updatePassword({
-            accountAddress: wallet.address,
-            chainName: wallet.chain,
-            existingPassword: oldPassword,
-            newPassword,
-        });
+    const { setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
+    const handleComplete = React.useCallback(() => {
         setShowAuthFlow(false);
-    }), [wallet, updatePassword, setShowAuthFlow]);
+    }, [setShowAuthFlow]);
     return jsxRuntime.jsx(ResetPasswordView.ResetPasswordView, { onComplete: handleComplete });
 };