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

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/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,6 +27,7 @@ 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);
@@ -46,6 +48,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 setting password', {
+                    accountAddress,
+                    chainName,
+                    refreshError,
+                });
+            }
             return true;
         }
         catch (error) {
@@ -58,7 +70,7 @@ const useWalletPassword = () => {
             });
             return false;
         }
-    }), [getWaasWalletConnector]);
+    }), [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 })));
@@ -76,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) {
@@ -88,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 })));

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,6 +23,7 @@ const INITIAL_STATE = {
 };
 const useWalletPassword = () => {
     const { getWaasWalletConnector } = useDynamicWaas();
+    const refreshUser = useRefreshUser();
     const [state, setState] = useState(INITIAL_STATE);
     const resetState = useCallback(() => {
         setState(INITIAL_STATE);
@@ -42,6 +44,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 setting password', {
+                    accountAddress,
+                    chainName,
+                    refreshError,
+                });
+            }
             return true;
         }
         catch (error) {
@@ -54,7 +66,7 @@ const useWalletPassword = () => {
             });
             return false;
         }
-    }), [getWaasWalletConnector]);
+    }), [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 })));
@@ -72,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) {
@@ -84,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 })));

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 });
 };
 

package/src/lib/views/ResetPasswordForSettingsView/ResetPasswordForSettingsView.js

@@ -1,5 +1,4 @@
 'use client'
-import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
 import { useCallback } from 'react';
 import '../../context/DynamicContext/DynamicContext.js';
@@ -7,7 +6,7 @@ import '../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import '../../context/ViewContext/ViewContext.js';
-import { logger } from '../../shared/logger.js';
+import '../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import '../../utils/constants/colors.js';
@@ -15,6 +14,7 @@ import '../../utils/constants/values.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../shared/consts/index.js';
 import '../../events/dynamicEvents.js';
+import '../../../../_virtual/_tslib.js';
 import '../../context/CaptchaContext/CaptchaContext.js';
 import '../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
@@ -38,7 +38,6 @@ import 'react-dom';
 import '../../utils/functions/compareChains/compareChains.js';
 import '../Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../context/ThemeContext/ThemeContext.js';
-import { useSmartWallets } from '../../utils/hooks/useSmartWallets/useSmartWallets.js';
 import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';
 import '@dynamic-labs/types';
@@ -88,7 +87,6 @@ import '../../context/ErrorContext/hooks/useErrorText/useErrorText.js';
 import '../../context/FooterAnimationContext/index.js';
 import '../MfaChooseDeviceView/useGetMfaOptions/useGetMfaOptions.js';
 import '../../context/PasskeyContext/PasskeyContext.js';
-import { useWalletPassword } from '../../utils/hooks/useWalletPassword/useWalletPassword.js';
 import { ResetPasswordView } from '../../widgets/DynamicWidget/views/ResetPasswordView/ResetPasswordView.js';
 import '../../context/OnrampContext/OnrampContext.js';
 import '../../store/state/sendBalances.js';
@@ -106,24 +104,10 @@ import '../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useInternalDynamicContext } from '../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 
 const ResetPasswordForSettingsView = () => {
-    const { primaryWallet, setShowAuthFlow } = useInternalDynamicContext();
-    const { getEOAWallet } = useSmartWallets();
-    const { updatePassword } = useWalletPassword();
-    const eoaWallet = primaryWallet && getEOAWallet(primaryWallet);
-    const wallet = eoaWallet !== null && eoaWallet !== void 0 ? eoaWallet : primaryWallet;
-    const handleComplete = useCallback((oldPassword, newPassword) => __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.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();
+    const handleComplete = useCallback(() => {
         setShowAuthFlow(false);
-    }), [wallet, updatePassword, setShowAuthFlow]);
+    }, [setShowAuthFlow]);
     return jsx(ResetPasswordView, { onComplete: handleComplete });
 };
 

package/src/lib/views/SetupPasswordForWalletCreationView/SetupPasswordForWalletCreationView.cjs

@@ -115,9 +115,17 @@ const SetupPasswordForWalletCreationView = () => {
     }, [setShowAuthFlow]);
     const handleComplete = React.useCallback((password) => {
         dynamicEvents.dynamicEvents.emit('embeddedWalletPasswordSetupCompleted', password);
+        // Return a Promise that resolves when embeddedWalletCreated fires.
+        // This keeps the knowledge check screen in loading state while wallet creation
+        // is in progress, then transitions to the done screen on success.
+        return new Promise((resolve) => {
+            dynamicEvents.dynamicEvents.once('embeddedWalletCreated', () => resolve());
+        });
+    }, []);
+    const handleDone = React.useCallback(() => {
         setShowAuthFlow(false);
     }, [setShowAuthFlow]);
-    return (jsxRuntime.jsx(SetupPasswordView.SetupPasswordView, { onComplete: handleComplete, onCancel: handleCancel }));
+    return (jsxRuntime.jsx(SetupPasswordView.SetupPasswordView, { onComplete: handleComplete, onCancel: handleCancel, onDone: handleDone }));
 };
 
 exports.SetupPasswordForWalletCreationView = SetupPasswordForWalletCreationView;

package/src/lib/views/SetupPasswordForWalletCreationView/SetupPasswordForWalletCreationView.js

@@ -111,9 +111,17 @@ const SetupPasswordForWalletCreationView = () => {
     }, [setShowAuthFlow]);
     const handleComplete = useCallback((password) => {
         dynamicEvents.emit('embeddedWalletPasswordSetupCompleted', password);
+        // Return a Promise that resolves when embeddedWalletCreated fires.
+        // This keeps the knowledge check screen in loading state while wallet creation
+        // is in progress, then transitions to the done screen on success.
+        return new Promise((resolve) => {
+            dynamicEvents.once('embeddedWalletCreated', () => resolve());
+        });
+    }, []);
+    const handleDone = useCallback(() => {
         setShowAuthFlow(false);
     }, [setShowAuthFlow]);
-    return (jsx(SetupPasswordView, { onComplete: handleComplete, onCancel: handleCancel }));
+    return (jsx(SetupPasswordView, { onComplete: handleComplete, onCancel: handleCancel, onDone: handleDone }));
 };
 
 export { SetupPasswordForWalletCreationView };

package/src/lib/widgets/DynamicWidget/views/ResetPasswordView/ResetPasswordView.cjs

@@ -116,7 +116,7 @@ const ResetPasswordView = ({ onComplete, }) => {
     const { t } = reactI18next.useTranslation();
     const { primaryWallet, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
     const { getEOAWallet } = useSmartWallets.useSmartWallets();
-    const { unlockWallet } = useWalletPassword.useWalletPassword();
+    const { unlockWallet, updatePassword } = useWalletPassword.useWalletPassword();
     const eoaWallet = primaryWallet && getEOAWallet(primaryWallet);
     const wallet = eoaWallet !== null && eoaWallet !== void 0 ? eoaWallet : primaryWallet;
     const [currentStep, setCurrentStep] = React.useState('current');
@@ -124,6 +124,8 @@ const ResetPasswordView = ({ onComplete, }) => {
     const [newPassword, setNewPassword] = React.useState('');
     const [verifyError, setVerifyError] = React.useState(null);
     const [isVerifying, setIsVerifying] = React.useState(false);
+    const [isSubmitting, setIsSubmitting] = React.useState(false);
+    const [submitError, setSubmitError] = React.useState(null);
     const handleCurrentPasswordContinue = React.useCallback((password) => _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 verification');
@@ -156,9 +158,28 @@ const ResetPasswordView = ({ onComplete, }) => {
     const handleEnterBack = React.useCallback(() => {
         setCurrentStep('current');
     }, []);
-    const handleConfirmContinue = React.useCallback(() => {
-        setCurrentStep('success');
-    }, []);
+    const handleConfirmContinue = React.useCallback(() => _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');
+            setSubmitError(t('dyn_reset_password.confirm.error.failed'));
+            return;
+        }
+        setIsSubmitting(true);
+        setSubmitError(null);
+        const success = yield updatePassword({
+            accountAddress: wallet.address,
+            chainName: wallet.chain,
+            existingPassword: currentPassword,
+            newPassword,
+        });
+        setIsSubmitting(false);
+        if (success) {
+            setCurrentStep('success');
+        }
+        else {
+            setSubmitError(t('dyn_reset_password.confirm.error.failed'));
+        }
+    }), [wallet, updatePassword, currentPassword, newPassword, t]);
     const handleConfirmBack = React.useCallback(() => {
         setCurrentStep('enter');
     }, []);
@@ -171,7 +192,7 @@ const ResetPasswordView = ({ onComplete, }) => {
         case 'enter':
             return (jsxRuntime.jsx(SetupPasswordEnterView.SetupPasswordEnterView, { onContinue: handleEnterContinue, onBack: handleEnterBack, title: t('dyn_reset_password.enter.title'), description: t('dyn_reset_password.enter.description'), oldPassword: currentPassword }));
         case 'confirm':
-            return (jsxRuntime.jsx(SetupPasswordConfirmView.SetupPasswordConfirmView, { password: newPassword, onContinue: handleConfirmContinue, onBack: handleConfirmBack, title: t('dyn_reset_password.confirm.title'), description: t('dyn_reset_password.confirm.description'), showAcknowledgment: true }));
+            return (jsxRuntime.jsx(SetupPasswordConfirmView.SetupPasswordConfirmView, { password: newPassword, onContinue: handleConfirmContinue, onBack: handleConfirmBack, title: t('dyn_reset_password.confirm.title'), description: t('dyn_reset_password.confirm.description'), showAcknowledgment: true, isLoading: isSubmitting, error: submitError }));
         case 'success':
             return (jsxRuntime.jsx(SetupPasswordSuccessView.SetupPasswordSuccessView, { onDone: handleSuccess, title: t('dyn_reset_password.success.title'), description: t('dyn_reset_password.success.description') }));
         default:

package/src/lib/widgets/DynamicWidget/views/ResetPasswordView/ResetPasswordView.js

@@ -112,7 +112,7 @@ const ResetPasswordView = ({ onComplete, }) => {
     const { t } = useTranslation();
     const { primaryWallet, setShowAuthFlow } = useInternalDynamicContext();
     const { getEOAWallet } = useSmartWallets();
-    const { unlockWallet } = useWalletPassword();
+    const { unlockWallet, updatePassword } = useWalletPassword();
     const eoaWallet = primaryWallet && getEOAWallet(primaryWallet);
     const wallet = eoaWallet !== null && eoaWallet !== void 0 ? eoaWallet : primaryWallet;
     const [currentStep, setCurrentStep] = useState('current');
@@ -120,6 +120,8 @@ const ResetPasswordView = ({ onComplete, }) => {
     const [newPassword, setNewPassword] = useState('');
     const [verifyError, setVerifyError] = useState(null);
     const [isVerifying, setIsVerifying] = useState(false);
+    const [isSubmitting, setIsSubmitting] = useState(false);
+    const [submitError, setSubmitError] = useState(null);
     const handleCurrentPasswordContinue = useCallback((password) => __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.error('No wallet address or chain available for password verification');
@@ -152,9 +154,28 @@ const ResetPasswordView = ({ onComplete, }) => {
     const handleEnterBack = useCallback(() => {
         setCurrentStep('current');
     }, []);
-    const handleConfirmContinue = useCallback(() => {
-        setCurrentStep('success');
-    }, []);
+    const handleConfirmContinue = useCallback(() => __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.error('No wallet address or chain available for password reset');
+            setSubmitError(t('dyn_reset_password.confirm.error.failed'));
+            return;
+        }
+        setIsSubmitting(true);
+        setSubmitError(null);
+        const success = yield updatePassword({
+            accountAddress: wallet.address,
+            chainName: wallet.chain,
+            existingPassword: currentPassword,
+            newPassword,
+        });
+        setIsSubmitting(false);
+        if (success) {
+            setCurrentStep('success');
+        }
+        else {
+            setSubmitError(t('dyn_reset_password.confirm.error.failed'));
+        }
+    }), [wallet, updatePassword, currentPassword, newPassword, t]);
     const handleConfirmBack = useCallback(() => {
         setCurrentStep('enter');
     }, []);
@@ -167,7 +188,7 @@ const ResetPasswordView = ({ onComplete, }) => {
         case 'enter':
             return (jsx(SetupPasswordEnterView, { onContinue: handleEnterContinue, onBack: handleEnterBack, title: t('dyn_reset_password.enter.title'), description: t('dyn_reset_password.enter.description'), oldPassword: currentPassword }));
         case 'confirm':
-            return (jsx(SetupPasswordConfirmView, { password: newPassword, onContinue: handleConfirmContinue, onBack: handleConfirmBack, title: t('dyn_reset_password.confirm.title'), description: t('dyn_reset_password.confirm.description'), showAcknowledgment: true }));
+            return (jsx(SetupPasswordConfirmView, { password: newPassword, onContinue: handleConfirmContinue, onBack: handleConfirmBack, title: t('dyn_reset_password.confirm.title'), description: t('dyn_reset_password.confirm.description'), showAcknowledgment: true, isLoading: isSubmitting, error: submitError }));
         case 'success':
             return (jsx(SetupPasswordSuccessView, { onDone: handleSuccess, title: t('dyn_reset_password.success.title'), description: t('dyn_reset_password.success.description') }));
         default:

package/src/lib/widgets/DynamicWidget/views/SetupPasswordConfirmView/SetupPasswordConfirmView.cjs

@@ -6,6 +6,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var reactI18next = require('react-i18next');
+var Alert = require('../../../../components/Alert/Alert.cjs');
 var Checkbox = require('../../../../components/Checkbox/Checkbox.cjs');
 var Icon = require('../../../../components/Icon/Icon.cjs');
 var IconButton = require('../../../../components/IconButton/IconButton.cjs');
@@ -21,7 +22,7 @@ var secureAction = require('../../../../shared/assets/secure-action.cjs');
 require('@dynamic-labs/iconic');
 require('../../../../context/ViewContext/ViewContext.cjs');
 
-const SetupPasswordConfirmView = ({ password, onContinue, onBack, title, description, showAcknowledgment = false, }) => {
+const SetupPasswordConfirmView = ({ password, onContinue, onBack, title, description, showAcknowledgment = false, isLoading = false, error = null, }) => {
     const { t } = reactI18next.useTranslation();
     const [confirmPassword, setConfirmPassword] = React.useState('');
     const [showPassword, setShowPassword] = React.useState(false);
@@ -53,7 +54,7 @@ const SetupPasswordConfirmView = ({ password, onContinue, onBack, title, descrip
         : t('dyn_setup_password.confirm.mismatch');
     return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ModalHeader.ModalHeader, { leading: backButton, children: jsxRuntime.jsx(Typography.Typography, { variant: 'title', color: 'primary', copykey: 'dyn_setup_password.confirm.title', children: title !== null && title !== void 0 ? title : t('dyn_setup_password.confirm.title') }) }), jsxRuntime.jsxs("div", { className: 'setup-password-confirm-view', children: [jsxRuntime.jsxs("div", { className: 'setup-password-confirm-view__body', children: [jsxRuntime.jsx("div", { className: 'setup-password-confirm-view__icon-container', children: jsxRuntime.jsx(Icon.Icon, { color: 'brand-primary', children: jsxRuntime.jsx(secureAction.ReactComponent, { width: 64, height: 64 }) }) }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'primary', copykey: 'dyn_setup_password.confirm.description', className: 'setup-password-confirm-view__description', children: description !== null && description !== void 0 ? description : t('dyn_setup_password.confirm.description') }), jsxRuntime.jsxs("div", { className: 'setup-password-confirm-view__input-container', children: [jsxRuntime.jsx(Input.Input, { id: 'setup-password-confirm-password-input', type: showPassword ? 'text' : 'password', label: t('dyn_setup_password.confirm.label'), placeholder: t('dyn_setup_password.confirm.placeholder'), value: confirmPassword, onChange: handlePasswordChange, variant: 'regular', error: !passwordsMatch && hasInteracted && confirmPassword.length > 0, suffix: 
                                         // eslint-disable-next-line react/jsx-wrap-multilines
-                                        jsxRuntime.jsx(ToggleVisibilityButton.ToggleVisibilityButton, { initialState: true, onClick: handleToggleVisibility }) }), showMatchMessage && (jsxRuntime.jsxs("div", { className: 'setup-password-confirm-view__match-indicator', children: [jsxRuntime.jsx(Icon.Icon, { color: passwordsMatch ? 'success-1' : 'text-error', size: 'medium', children: passwordsMatch ? (jsxRuntime.jsx(checkCircle.ReactComponent, {})) : (jsxRuntime.jsx(exclamationCircle.ReactComponent, {})) }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', color: passwordsMatch ? 'secondary' : 'error-1', children: matchMessage })] }))] })] }), showAcknowledgment && (jsxRuntime.jsxs("label", { className: 'setup-password-confirm-view__acknowledgment', children: [jsxRuntime.jsx(Checkbox.Checkbox, { checked: acknowledged, onChange: handleAcknowledgmentChange, ariaLabel: t('dyn_reset_password.confirm.acknowledgment') }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', color: 'secondary', copykey: 'dyn_reset_password.confirm.acknowledgment', children: t('dyn_reset_password.confirm.acknowledgment') })] })), jsxRuntime.jsx("div", { className: 'setup-password-confirm-view__actions', children: jsxRuntime.jsx(TypographyButton.TypographyButton, { dataTestId: 'setup-password-confirm-continue-button', onClick: handleContinue, disabled: !isValid, copykey: 'dyn_setup_password.button.continue', buttonVariant: 'brand-primary', typographyProps: {
+                                        jsxRuntime.jsx(ToggleVisibilityButton.ToggleVisibilityButton, { initialState: true, onClick: handleToggleVisibility }) }), showMatchMessage && (jsxRuntime.jsxs("div", { className: 'setup-password-confirm-view__match-indicator', children: [jsxRuntime.jsx(Icon.Icon, { color: passwordsMatch ? 'success-1' : 'text-error', size: 'medium', children: passwordsMatch ? (jsxRuntime.jsx(checkCircle.ReactComponent, {})) : (jsxRuntime.jsx(exclamationCircle.ReactComponent, {})) }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', color: passwordsMatch ? 'secondary' : 'error-1', children: matchMessage })] }))] })] }), showAcknowledgment && (jsxRuntime.jsxs("label", { className: 'setup-password-confirm-view__acknowledgment', children: [jsxRuntime.jsx(Checkbox.Checkbox, { checked: acknowledged, onChange: handleAcknowledgmentChange, ariaLabel: t('dyn_reset_password.confirm.acknowledgment') }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', color: 'secondary', copykey: 'dyn_reset_password.confirm.acknowledgment', children: t('dyn_reset_password.confirm.acknowledgment') })] })), error && (jsxRuntime.jsx(Alert.Alert, { variant: 'error', icon: jsxRuntime.jsx(exclamationCircle.ReactComponent, {}), className: 'setup-password-confirm-view__error', children: error })), jsxRuntime.jsx("div", { className: 'setup-password-confirm-view__actions', children: jsxRuntime.jsx(TypographyButton.TypographyButton, { dataTestId: 'setup-password-confirm-continue-button', onClick: handleContinue, disabled: !isValid || isLoading, loading: isLoading, copykey: 'dyn_setup_password.button.continue', buttonVariant: 'brand-primary', typographyProps: {
                                 color: 'inherit',
                             }, expanded: true, children: t('dyn_setup_password.button.continue') }) })] })] }));
 };

package/src/lib/widgets/DynamicWidget/views/SetupPasswordConfirmView/SetupPasswordConfirmView.d.ts

@@ -6,5 +6,7 @@ export type SetupPasswordConfirmViewProps = {
     title?: string;
     description?: string;
     showAcknowledgment?: boolean;
+    isLoading?: boolean;
+    error?: string | null;
 };
 export declare const SetupPasswordConfirmView: FC<SetupPasswordConfirmViewProps>;

package/src/lib/widgets/DynamicWidget/views/SetupPasswordConfirmView/SetupPasswordConfirmView.js

@@ -2,6 +2,7 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useState, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
+import { Alert } from '../../../../components/Alert/Alert.js';
 import { Checkbox } from '../../../../components/Checkbox/Checkbox.js';
 import { Icon } from '../../../../components/Icon/Icon.js';
 import { IconButton } from '../../../../components/IconButton/IconButton.js';
@@ -17,7 +18,7 @@ import { ReactComponent as SvgSecureAction } from '../../../../shared/assets/sec
 import '@dynamic-labs/iconic';
 import '../../../../context/ViewContext/ViewContext.js';
 
-const SetupPasswordConfirmView = ({ password, onContinue, onBack, title, description, showAcknowledgment = false, }) => {
+const SetupPasswordConfirmView = ({ password, onContinue, onBack, title, description, showAcknowledgment = false, isLoading = false, error = null, }) => {
     const { t } = useTranslation();
     const [confirmPassword, setConfirmPassword] = useState('');
     const [showPassword, setShowPassword] = useState(false);
@@ -49,7 +50,7 @@ const SetupPasswordConfirmView = ({ password, onContinue, onBack, title, descrip
         : t('dyn_setup_password.confirm.mismatch');
     return (jsxs(Fragment, { children: [jsx(ModalHeader, { leading: backButton, children: jsx(Typography, { variant: 'title', color: 'primary', copykey: 'dyn_setup_password.confirm.title', children: title !== null && title !== void 0 ? title : t('dyn_setup_password.confirm.title') }) }), jsxs("div", { className: 'setup-password-confirm-view', children: [jsxs("div", { className: 'setup-password-confirm-view__body', children: [jsx("div", { className: 'setup-password-confirm-view__icon-container', children: jsx(Icon, { color: 'brand-primary', children: jsx(SvgSecureAction, { width: 64, height: 64 }) }) }), jsx(Typography, { variant: 'body_normal', color: 'primary', copykey: 'dyn_setup_password.confirm.description', className: 'setup-password-confirm-view__description', children: description !== null && description !== void 0 ? description : t('dyn_setup_password.confirm.description') }), jsxs("div", { className: 'setup-password-confirm-view__input-container', children: [jsx(Input, { id: 'setup-password-confirm-password-input', type: showPassword ? 'text' : 'password', label: t('dyn_setup_password.confirm.label'), placeholder: t('dyn_setup_password.confirm.placeholder'), value: confirmPassword, onChange: handlePasswordChange, variant: 'regular', error: !passwordsMatch && hasInteracted && confirmPassword.length > 0, suffix: 
                                         // eslint-disable-next-line react/jsx-wrap-multilines
-                                        jsx(ToggleVisibilityButton, { initialState: true, onClick: handleToggleVisibility }) }), showMatchMessage && (jsxs("div", { className: 'setup-password-confirm-view__match-indicator', children: [jsx(Icon, { color: passwordsMatch ? 'success-1' : 'text-error', size: 'medium', children: passwordsMatch ? (jsx(SvgCheckCircle, {})) : (jsx(SvgExclamationCircle, {})) }), jsx(Typography, { variant: 'body_small', color: passwordsMatch ? 'secondary' : 'error-1', children: matchMessage })] }))] })] }), showAcknowledgment && (jsxs("label", { className: 'setup-password-confirm-view__acknowledgment', children: [jsx(Checkbox, { checked: acknowledged, onChange: handleAcknowledgmentChange, ariaLabel: t('dyn_reset_password.confirm.acknowledgment') }), jsx(Typography, { variant: 'body_small', color: 'secondary', copykey: 'dyn_reset_password.confirm.acknowledgment', children: t('dyn_reset_password.confirm.acknowledgment') })] })), jsx("div", { className: 'setup-password-confirm-view__actions', children: jsx(TypographyButton, { dataTestId: 'setup-password-confirm-continue-button', onClick: handleContinue, disabled: !isValid, copykey: 'dyn_setup_password.button.continue', buttonVariant: 'brand-primary', typographyProps: {
+                                        jsx(ToggleVisibilityButton, { initialState: true, onClick: handleToggleVisibility }) }), showMatchMessage && (jsxs("div", { className: 'setup-password-confirm-view__match-indicator', children: [jsx(Icon, { color: passwordsMatch ? 'success-1' : 'text-error', size: 'medium', children: passwordsMatch ? (jsx(SvgCheckCircle, {})) : (jsx(SvgExclamationCircle, {})) }), jsx(Typography, { variant: 'body_small', color: passwordsMatch ? 'secondary' : 'error-1', children: matchMessage })] }))] })] }), showAcknowledgment && (jsxs("label", { className: 'setup-password-confirm-view__acknowledgment', children: [jsx(Checkbox, { checked: acknowledged, onChange: handleAcknowledgmentChange, ariaLabel: t('dyn_reset_password.confirm.acknowledgment') }), jsx(Typography, { variant: 'body_small', color: 'secondary', copykey: 'dyn_reset_password.confirm.acknowledgment', children: t('dyn_reset_password.confirm.acknowledgment') })] })), error && (jsx(Alert, { variant: 'error', icon: jsx(SvgExclamationCircle, {}), className: 'setup-password-confirm-view__error', children: error })), jsx("div", { className: 'setup-password-confirm-view__actions', children: jsx(TypographyButton, { dataTestId: 'setup-password-confirm-continue-button', onClick: handleContinue, disabled: !isValid || isLoading, loading: isLoading, copykey: 'dyn_setup_password.button.continue', buttonVariant: 'brand-primary', typographyProps: {
                                 color: 'inherit',
                             }, expanded: true, children: t('dyn_setup_password.button.continue') }) })] })] }));
 };

package/src/lib/widgets/DynamicWidget/views/SetupPasswordKnowledgeCheckView/SetupPasswordKnowledgeCheckView.cjs

@@ -36,7 +36,7 @@ const OPTIONS = [
         value: 'c',
     },
 ];
-const SetupPasswordKnowledgeCheckView = ({ onContinue, onBack }) => {
+const SetupPasswordKnowledgeCheckView = ({ onContinue, onBack, isLoading = false, error = null }) => {
     const { t } = reactI18next.useTranslation();
     const [selectedAnswer, setSelectedAnswer] = React.useState('');
     const [showError, setShowError] = React.useState(false);
@@ -67,7 +67,7 @@ const SetupPasswordKnowledgeCheckView = ({ onContinue, onBack }) => {
                                                                 : isSelected
                                                                     ? 'brand-primary'
                                                                     : 'tertiary', weight: 'bold', className: 'setup-password-knowledge-check-view__option-label', children: option.label }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', color: 'primary', children: t(option.translationKey) })] }, option.value));
-                                            }) })] })] }), jsxRuntime.jsxs("div", { children: [showError && (jsxRuntime.jsx(Alert.Alert, { variant: 'error', icon: jsxRuntime.jsx(exclamationCircle.ReactComponent, {}), className: 'setup-password-knowledge-check-view__error', children: t('dyn_setup_password.knowledge_check.error') })), jsxRuntime.jsx("div", { className: 'setup-password-knowledge-check-view__actions', children: jsxRuntime.jsx(TypographyButton.TypographyButton, { dataTestId: 'setup-password-knowledge-check-continue-button', onClick: handleContinue, disabled: !selectedAnswer, copykey: 'dyn_setup_password.button.confirm', buttonVariant: 'brand-primary', typographyProps: {
+                                            }) })] })] }), jsxRuntime.jsxs("div", { children: [showError && (jsxRuntime.jsx(Alert.Alert, { variant: 'error', icon: jsxRuntime.jsx(exclamationCircle.ReactComponent, {}), className: 'setup-password-knowledge-check-view__error', children: t('dyn_setup_password.knowledge_check.error') })), error && (jsxRuntime.jsx(Alert.Alert, { variant: 'error', icon: jsxRuntime.jsx(exclamationCircle.ReactComponent, {}), className: 'setup-password-knowledge-check-view__error', children: error })), jsxRuntime.jsx("div", { className: 'setup-password-knowledge-check-view__actions', children: jsxRuntime.jsx(TypographyButton.TypographyButton, { dataTestId: 'setup-password-knowledge-check-continue-button', onClick: handleContinue, disabled: !selectedAnswer || isLoading, loading: isLoading, copykey: 'dyn_setup_password.button.confirm', buttonVariant: 'brand-primary', typographyProps: {
                                             color: 'inherit',
                                         }, expanded: true, children: t('dyn_setup_password.button.confirm') }) })] })] }) })] }));
 };

package/src/lib/widgets/DynamicWidget/views/SetupPasswordKnowledgeCheckView/SetupPasswordKnowledgeCheckView.d.ts

@@ -2,5 +2,7 @@ import { FC } from 'react';
 export type SetupPasswordKnowledgeCheckViewProps = {
     onContinue: () => void;
     onBack: () => void;
+    isLoading?: boolean;
+    error?: string | null;
 };
 export declare const SetupPasswordKnowledgeCheckView: FC<SetupPasswordKnowledgeCheckViewProps>;

package/src/lib/widgets/DynamicWidget/views/SetupPasswordKnowledgeCheckView/SetupPasswordKnowledgeCheckView.js

@@ -32,7 +32,7 @@ const OPTIONS = [
         value: 'c',
     },
 ];
-const SetupPasswordKnowledgeCheckView = ({ onContinue, onBack }) => {
+const SetupPasswordKnowledgeCheckView = ({ onContinue, onBack, isLoading = false, error = null }) => {
     const { t } = useTranslation();
     const [selectedAnswer, setSelectedAnswer] = useState('');
     const [showError, setShowError] = useState(false);
@@ -63,7 +63,7 @@ const SetupPasswordKnowledgeCheckView = ({ onContinue, onBack }) => {
                                                                 : isSelected
                                                                     ? 'brand-primary'
                                                                     : 'tertiary', weight: 'bold', className: 'setup-password-knowledge-check-view__option-label', children: option.label }), jsx(Typography, { variant: 'body_small', color: 'primary', children: t(option.translationKey) })] }, option.value));
-                                            }) })] })] }), jsxs("div", { children: [showError && (jsx(Alert, { variant: 'error', icon: jsx(SvgExclamationCircle, {}), className: 'setup-password-knowledge-check-view__error', children: t('dyn_setup_password.knowledge_check.error') })), jsx("div", { className: 'setup-password-knowledge-check-view__actions', children: jsx(TypographyButton, { dataTestId: 'setup-password-knowledge-check-continue-button', onClick: handleContinue, disabled: !selectedAnswer, copykey: 'dyn_setup_password.button.confirm', buttonVariant: 'brand-primary', typographyProps: {
+                                            }) })] })] }), jsxs("div", { children: [showError && (jsx(Alert, { variant: 'error', icon: jsx(SvgExclamationCircle, {}), className: 'setup-password-knowledge-check-view__error', children: t('dyn_setup_password.knowledge_check.error') })), error && (jsx(Alert, { variant: 'error', icon: jsx(SvgExclamationCircle, {}), className: 'setup-password-knowledge-check-view__error', children: error })), jsx("div", { className: 'setup-password-knowledge-check-view__actions', children: jsx(TypographyButton, { dataTestId: 'setup-password-knowledge-check-continue-button', onClick: handleContinue, disabled: !selectedAnswer || isLoading, loading: isLoading, copykey: 'dyn_setup_password.button.confirm', buttonVariant: 'brand-primary', typographyProps: {
                                             color: 'inherit',
                                         }, expanded: true, children: t('dyn_setup_password.button.confirm') }) })] })] }) })] }));
 };