@dynamic-labs/sdk-react-core 4.60.0 → 4.61.0

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

@@ -0,0 +1,152 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
+var React = require('react');
+var dynamicEvents = require('../../../events/dynamicEvents.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../context/ViewContext/ViewContext.cjs');
+var logger = require('../../../shared/logger.cjs');
+require('@dynamic-labs/wallet-book');
+require('@dynamic-labs/utils');
+require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
+require('@dynamic-labs/sdk-api-core');
+require('../../../shared/consts/index.cjs');
+var useDynamicWaas = require('../useDynamicWaas/useDynamicWaas.cjs');
+
+const INITIAL_STATE = {
+    error: null,
+    isLoading: false,
+    recoveryState: null,
+};
+const useWalletPassword = () => {
+    const { getWaasWalletConnector } = useDynamicWaas.useDynamicWaas();
+    const [state, setState] = React.useState(INITIAL_STATE);
+    const resetState = React.useCallback(() => {
+        setState(INITIAL_STATE);
+    }, []);
+    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 })));
+        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.updatePassword({
+                accountAddress,
+                existingPassword,
+                newPassword,
+            });
+            setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: false })));
+            return true;
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : 'Failed to update password';
+            setState((prev) => (Object.assign(Object.assign({}, prev), { error: errorMessage, isLoading: false })));
+            logger.logger.error('Failed to update wallet password', {
+                accountAddress,
+                chainName,
+                error,
+            });
+            return false;
+        }
+    }), [getWaasWalletConnector]);
+    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 })));
+        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;
+            }
+            dynamicEvents.dynamicEvents.emit('walletUnlockAttempt', {
+                accountAddress,
+                chainName,
+            });
+            yield connector.unlockWallet({
+                accountAddress,
+                password,
+            });
+            setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: false })));
+            dynamicEvents.dynamicEvents.emit('walletUnlockCompleted', {
+                accountAddress,
+                chainName,
+            });
+            return true;
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : 'Failed to unlock wallet';
+            setState((prev) => (Object.assign(Object.assign({}, prev), { error: errorMessage, isLoading: false })));
+            logger.logger.error('Failed to unlock wallet', {
+                accountAddress,
+                chainName,
+                error,
+            });
+            dynamicEvents.dynamicEvents.emit('walletUnlockFailed', {
+                accountAddress,
+                chainName,
+                error,
+            });
+            return false;
+        }
+    }), [getWaasWalletConnector]);
+    const checkWalletLockState = React.useCallback((params) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const { accountAddress, chainName } = 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 null;
+            }
+            const recoveryState = yield connector.getWalletRecoveryState({
+                accountAddress,
+            });
+            setState({
+                error: null,
+                isLoading: false,
+                recoveryState,
+            });
+            return recoveryState;
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error
+                ? error.message
+                : 'Failed to check wallet state';
+            setState({
+                error: errorMessage,
+                isLoading: false,
+                recoveryState: null,
+            });
+            logger.logger.error('Failed to check wallet lock state', {
+                accountAddress,
+                chainName,
+                error,
+            });
+            return null;
+        }
+    }), [getWaasWalletConnector]);
+    return {
+        checkWalletLockState,
+        resetState,
+        state,
+        unlockWallet,
+        updatePassword,
+    };
+};
+
+exports.useWalletPassword = useWalletPassword;

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

@@ -0,0 +1,30 @@
+import { WalletRecoveryState } from '@dynamic-labs-wallet/browser-wallet-client';
+import { ChainEnum } from '@dynamic-labs/sdk-api-core';
+export type UpdatePasswordParams = {
+    accountAddress: string;
+    chainName: ChainEnum;
+    newPassword: string;
+    existingPassword?: string;
+};
+export type UnlockWalletParams = {
+    accountAddress: string;
+    chainName: ChainEnum;
+    password: string;
+};
+export type CheckWalletLockStateParams = {
+    accountAddress: string;
+    chainName: ChainEnum;
+};
+export type WalletPasswordState = {
+    isLoading: boolean;
+    error: string | null;
+    recoveryState: WalletRecoveryState | null;
+};
+export type UseWalletPasswordReturn = {
+    updatePassword: (params: UpdatePasswordParams) => Promise<boolean>;
+    unlockWallet: (params: UnlockWalletParams) => Promise<boolean>;
+    checkWalletLockState: (params: CheckWalletLockStateParams) => Promise<WalletRecoveryState | null>;
+    state: WalletPasswordState;
+    resetState: () => void;
+};
+export declare const useWalletPassword: () => UseWalletPasswordReturn;

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

@@ -0,0 +1,148 @@
+'use client'
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { useState, useCallback } from 'react';
+import { dynamicEvents } from '../../../events/dynamicEvents.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 '@dynamic-labs/sdk-api-core';
+import '../../../shared/consts/index.js';
+import { useDynamicWaas } from '../useDynamicWaas/useDynamicWaas.js';
+
+const INITIAL_STATE = {
+    error: null,
+    isLoading: false,
+    recoveryState: null,
+};
+const useWalletPassword = () => {
+    const { getWaasWalletConnector } = useDynamicWaas();
+    const [state, setState] = useState(INITIAL_STATE);
+    const resetState = useCallback(() => {
+        setState(INITIAL_STATE);
+    }, []);
+    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 })));
+        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.updatePassword({
+                accountAddress,
+                existingPassword,
+                newPassword,
+            });
+            setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: false })));
+            return true;
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : 'Failed to update password';
+            setState((prev) => (Object.assign(Object.assign({}, prev), { error: errorMessage, isLoading: false })));
+            logger.error('Failed to update wallet password', {
+                accountAddress,
+                chainName,
+                error,
+            });
+            return false;
+        }
+    }), [getWaasWalletConnector]);
+    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 })));
+        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;
+            }
+            dynamicEvents.emit('walletUnlockAttempt', {
+                accountAddress,
+                chainName,
+            });
+            yield connector.unlockWallet({
+                accountAddress,
+                password,
+            });
+            setState((prev) => (Object.assign(Object.assign({}, prev), { error: null, isLoading: false })));
+            dynamicEvents.emit('walletUnlockCompleted', {
+                accountAddress,
+                chainName,
+            });
+            return true;
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : 'Failed to unlock wallet';
+            setState((prev) => (Object.assign(Object.assign({}, prev), { error: errorMessage, isLoading: false })));
+            logger.error('Failed to unlock wallet', {
+                accountAddress,
+                chainName,
+                error,
+            });
+            dynamicEvents.emit('walletUnlockFailed', {
+                accountAddress,
+                chainName,
+                error,
+            });
+            return false;
+        }
+    }), [getWaasWalletConnector]);
+    const checkWalletLockState = useCallback((params) => __awaiter(void 0, void 0, void 0, function* () {
+        const { accountAddress, chainName } = 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 null;
+            }
+            const recoveryState = yield connector.getWalletRecoveryState({
+                accountAddress,
+            });
+            setState({
+                error: null,
+                isLoading: false,
+                recoveryState,
+            });
+            return recoveryState;
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error
+                ? error.message
+                : 'Failed to check wallet state';
+            setState({
+                error: errorMessage,
+                isLoading: false,
+                recoveryState: null,
+            });
+            logger.error('Failed to check wallet lock state', {
+                accountAddress,
+                chainName,
+                error,
+            });
+            return null;
+        }
+    }), [getWaasWalletConnector]);
+    return {
+        checkWalletLockState,
+        resetState,
+        state,
+        unlockWallet,
+        updatePassword,
+    };
+};
+
+export { useWalletPassword };

package/src/lib/views/UnlockWalletView/UnlockWalletView.cjs

@@ -77,6 +77,7 @@ require('qrcode');
 require('formik');
 require('../../utils/hooks/useSubdomainCheck/useSubdomainCheck.cjs');
 require('../../context/WalletGroupContext/WalletGroupContext.cjs');
+var useDynamicWaas = require('../../utils/hooks/useDynamicWaas/useDynamicWaas.cjs');
 var EnterPasswordView = require('../../widgets/DynamicWidget/views/EnterPasswordView/EnterPasswordView.cjs');
 require('../../utils/hooks/useWalletBackup/useWalletBackup.cjs');
 require('../../utils/hooks/useWalletBackup/types.cjs');
@@ -110,18 +111,48 @@ var useInternalDynamicContext = require('../../context/DynamicContext/useDynamic
 const UnlockWalletView = ({ accountAddress, chainName, }) => {
     const { t } = reactI18next.useTranslation();
     const { setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
+    const { getWaasWalletConnector } = useDynamicWaas.useDynamicWaas();
     const handleContinue = React.useCallback((password) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const connector = getWaasWalletConnector(chainName);
+        if (!connector) {
+            const error = new Error(t('dyn_enter_password.error.failed'));
+            dynamicEvents.dynamicEvents.emit('walletUnlockAttempt', {
+                accountAddress,
+                chainName,
+            });
+            dynamicEvents.dynamicEvents.emit('walletUnlockFailed', {
+                accountAddress,
+                chainName,
+                error,
+            });
+            throw error;
+        }
         dynamicEvents.dynamicEvents.emit('walletUnlockAttempt', {
             accountAddress,
             chainName,
         });
+        try {
+            yield connector.unlockWallet({ accountAddress, password });
+        }
+        catch (error) {
+            dynamicEvents.dynamicEvents.emit('walletUnlockFailed', {
+                accountAddress,
+                chainName,
+                error,
+            });
+            throw error;
+        }
+        dynamicEvents.dynamicEvents.emit('walletUnlockCompleted', {
+            accountAddress,
+            chainName,
+        });
         dynamicEvents.dynamicEvents.emit('walletUnlockPasswordProvided', {
             accountAddress,
             chainName,
             password,
         });
         setShowAuthFlow(false);
-    }), [accountAddress, chainName, setShowAuthFlow]);
+    }), [accountAddress, chainName, getWaasWalletConnector, setShowAuthFlow, t]);
     return (jsxRuntime.jsx(EnterPasswordView.EnterPasswordView, { onContinue: handleContinue, title: t('dyn_unlock_wallet.title'), description: t('dyn_unlock_wallet.description'), buttonLabel: t('dyn_unlock_wallet.button.continue') }));
 };
 

package/src/lib/views/UnlockWalletView/UnlockWalletView.js

@@ -73,6 +73,7 @@ import 'qrcode';
 import 'formik';
 import '../../utils/hooks/useSubdomainCheck/useSubdomainCheck.js';
 import '../../context/WalletGroupContext/WalletGroupContext.js';
+import { useDynamicWaas } from '../../utils/hooks/useDynamicWaas/useDynamicWaas.js';
 import { EnterPasswordView } from '../../widgets/DynamicWidget/views/EnterPasswordView/EnterPasswordView.js';
 import '../../utils/hooks/useWalletBackup/useWalletBackup.js';
 import '../../utils/hooks/useWalletBackup/types.js';
@@ -106,18 +107,48 @@ import { useInternalDynamicContext } from '../../context/DynamicContext/useDynam
 const UnlockWalletView = ({ accountAddress, chainName, }) => {
     const { t } = useTranslation();
     const { setShowAuthFlow } = useInternalDynamicContext();
+    const { getWaasWalletConnector } = useDynamicWaas();
     const handleContinue = useCallback((password) => __awaiter(void 0, void 0, void 0, function* () {
+        const connector = getWaasWalletConnector(chainName);
+        if (!connector) {
+            const error = new Error(t('dyn_enter_password.error.failed'));
+            dynamicEvents.emit('walletUnlockAttempt', {
+                accountAddress,
+                chainName,
+            });
+            dynamicEvents.emit('walletUnlockFailed', {
+                accountAddress,
+                chainName,
+                error,
+            });
+            throw error;
+        }
         dynamicEvents.emit('walletUnlockAttempt', {
             accountAddress,
             chainName,
         });
+        try {
+            yield connector.unlockWallet({ accountAddress, password });
+        }
+        catch (error) {
+            dynamicEvents.emit('walletUnlockFailed', {
+                accountAddress,
+                chainName,
+                error,
+            });
+            throw error;
+        }
+        dynamicEvents.emit('walletUnlockCompleted', {
+            accountAddress,
+            chainName,
+        });
         dynamicEvents.emit('walletUnlockPasswordProvided', {
             accountAddress,
             chainName,
             password,
         });
         setShowAuthFlow(false);
-    }), [accountAddress, chainName, setShowAuthFlow]);
+    }), [accountAddress, chainName, getWaasWalletConnector, setShowAuthFlow, t]);
     return (jsx(EnterPasswordView, { onContinue: handleContinue, title: t('dyn_unlock_wallet.title'), description: t('dyn_unlock_wallet.description'), buttonLabel: t('dyn_unlock_wallet.button.continue') }));
 };
 

package/src/lib/widgets/DynamicWidget/components/DynamicWidgetViews/mapViewToComponent.cjs

@@ -25,6 +25,8 @@ var SetupPasswordConfirmView = require('../../views/SetupPasswordConfirmView/Set
 var SetupPasswordKnowledgeCheckView = require('../../views/SetupPasswordKnowledgeCheckView/SetupPasswordKnowledgeCheckView.cjs');
 var SetupPasswordSuccessView = require('../../views/SetupPasswordSuccessView/SetupPasswordSuccessView.cjs');
 require('react-i18next');
+require('../../../../components/Input/Input.cjs');
+require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('@dynamic-labs/wallet-connector-core');
 require('../../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
@@ -32,8 +34,6 @@ require('../../../../utils/constants/colors.cjs');
 require('../../../../utils/constants/values.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('../../../../shared/consts/index.cjs');
-require('../../../../components/Input/Input.cjs');
-require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../../components/Alert/Alert.cjs');
 require('../../../../events/dynamicEvents.cjs');
 require('../../../../context/DynamicContext/DynamicContext.cjs');

package/src/lib/widgets/DynamicWidget/components/DynamicWidgetViews/mapViewToComponent.js

@@ -21,6 +21,8 @@ import { SetupPasswordConfirmView } from '../../views/SetupPasswordConfirmView/S
 import { SetupPasswordKnowledgeCheckView } from '../../views/SetupPasswordKnowledgeCheckView/SetupPasswordKnowledgeCheckView.js';
 import { SetupPasswordSuccessView } from '../../views/SetupPasswordSuccessView/SetupPasswordSuccessView.js';
 import 'react-i18next';
+import '../../../../components/Input/Input.js';
+import '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '@dynamic-labs/wallet-connector-core';
 import '../../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
@@ -28,8 +30,6 @@ import '../../../../utils/constants/colors.js';
 import '../../../../utils/constants/values.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../../../shared/consts/index.js';
-import '../../../../components/Input/Input.js';
-import '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../../components/Alert/Alert.js';
 import '../../../../events/dynamicEvents.js';
 import '../../../../context/DynamicContext/DynamicContext.js';

package/src/lib/widgets/DynamicWidget/views/AccountAndSecuritySettingsView/MfaSection/MfaSection.cjs

@@ -114,6 +114,7 @@ require('../../../../../store/state/tokenBalances.cjs');
 require('../../../../../store/state/multichainBalances.cjs');
 require('../../../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useIsPasskeysMfaEnabled = require('../../../../../utils/hooks/useIsPasskeysMfaEnabled/useIsPasskeysMfaEnabled.cjs');
+var useWalletPassword = require('../../../../../utils/hooks/useWalletPassword/useWalletPassword.cjs');
 var useInternalDynamicContext = require('../../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 
 const MfaSection = ({ isLoading }) => {
@@ -123,6 +124,7 @@ const MfaSection = ({ isLoading }) => {
     const { primaryWallet } = useInternalDynamicContext.useInternalDynamicContext();
     const { getEOAWallet } = useSmartWallets.useSmartWallets();
     const projectSettings = useProjectSettings.useProjectSettings();
+    const { updatePassword } = useWalletPassword.useWalletPassword();
     const isMfaEnabled = useIsMfaEnabled.useIsMfaEnabled();
     const isTotpMfaEnabled = useIsTotpMfaEnabled.useIsTotpMfaEnabled();
     const isPasskeyMfaEnabled = useIsPasskeysMfaEnabled.useIsPasskeysMfaEnabled();
@@ -136,24 +138,19 @@ const MfaSection = ({ isLoading }) => {
     const handlePasscodeClick = React.useCallback(() => {
         setDynamicWidgetView('setup-password', {
             onComplete: (password) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                if (!(wallet === null || wallet === void 0 ? void 0 : wallet.address)) {
-                    logger.logger.error('No wallet address available for password setup');
+                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 setup');
                     return;
                 }
-                try {
-                    const connector = wallet.connector;
-                    yield connector.updatePassword({
-                        accountAddress: wallet.address,
-                        existingPassword: '',
-                        newPassword: password,
-                    });
-                }
-                catch (error) {
-                    logger.logger.error('Failed to update password on modal', error);
-                }
+                yield updatePassword({
+                    accountAddress: wallet.address,
+                    chainName: wallet.chain,
+                    existingPassword: '',
+                    newPassword: password,
+                });
             }),
         });
-    }, [setDynamicWidgetView, wallet]);
+    }, [setDynamicWidgetView, wallet, updatePassword]);
     if (!isMfaEnabled && !isWaasWallet) {
         return null;
     }

package/src/lib/widgets/DynamicWidget/views/AccountAndSecuritySettingsView/MfaSection/MfaSection.js

@@ -110,6 +110,7 @@ import '../../../../../store/state/tokenBalances.js';
 import '../../../../../store/state/multichainBalances.js';
 import '../../../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useIsPasskeysMfaEnabled } from '../../../../../utils/hooks/useIsPasskeysMfaEnabled/useIsPasskeysMfaEnabled.js';
+import { useWalletPassword } from '../../../../../utils/hooks/useWalletPassword/useWalletPassword.js';
 import { useInternalDynamicContext } from '../../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 
 const MfaSection = ({ isLoading }) => {
@@ -119,6 +120,7 @@ const MfaSection = ({ isLoading }) => {
     const { primaryWallet } = useInternalDynamicContext();
     const { getEOAWallet } = useSmartWallets();
     const projectSettings = useProjectSettings();
+    const { updatePassword } = useWalletPassword();
     const isMfaEnabled = useIsMfaEnabled();
     const isTotpMfaEnabled = useIsTotpMfaEnabled();
     const isPasskeyMfaEnabled = useIsPasskeysMfaEnabled();
@@ -132,24 +134,19 @@ const MfaSection = ({ isLoading }) => {
     const handlePasscodeClick = useCallback(() => {
         setDynamicWidgetView('setup-password', {
             onComplete: (password) => __awaiter(void 0, void 0, void 0, function* () {
-                if (!(wallet === null || wallet === void 0 ? void 0 : wallet.address)) {
-                    logger.error('No wallet address available for password setup');
+                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 setup');
                     return;
                 }
-                try {
-                    const connector = wallet.connector;
-                    yield connector.updatePassword({
-                        accountAddress: wallet.address,
-                        existingPassword: '',
-                        newPassword: password,
-                    });
-                }
-                catch (error) {
-                    logger.error('Failed to update password on modal', error);
-                }
+                yield updatePassword({
+                    accountAddress: wallet.address,
+                    chainName: wallet.chain,
+                    existingPassword: '',
+                    newPassword: password,
+                });
             }),
         });
-    }, [setDynamicWidgetView, wallet]);
+    }, [setDynamicWidgetView, wallet, updatePassword]);
     if (!isMfaEnabled && !isWaasWallet) {
         return null;
     }

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

@@ -7,16 +7,17 @@ var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var reactI18next = require('react-i18next');
-var ErrorContainer = require('../../../../components/ErrorContainer/ErrorContainer.cjs');
 var Icon = require('../../../../components/Icon/Icon.cjs');
 var Input = require('../../../../components/Input/Input.cjs');
 var ToggleVisibilityButton = require('../../../../components/ToggleVisibilityButton/ToggleVisibilityButton.cjs');
 var Typography = require('../../../../components/Typography/Typography.cjs');
 var TypographyButton = require('../../../../components/TypographyButton/TypographyButton.cjs');
+var errorCircleX = require('../../../../shared/assets/error-circle-x.cjs');
 var passwordLockIcon = require('../../../../shared/assets/password-lock-icon.cjs');
 require('@dynamic-labs/iconic');
 require('../../../../context/ViewContext/ViewContext.cjs');
 
+const INVALID_PASSWORD_ERROR_MESSAGE = 'Decryption failed: Invalid password';
 const EnterPasswordView = ({ onContinue, title, description, buttonLabel, isLoading: externalLoading, }) => {
     const { t } = reactI18next.useTranslation();
     const [password, setPassword] = React.useState('');
@@ -41,9 +42,18 @@ const EnterPasswordView = ({ onContinue, title, description, buttonLabel, isLoad
             yield onContinue(password);
         }
         catch (err) {
-            const errorMessage = err instanceof Error
-                ? err.message
-                : t('dyn_enter_password.error.failed');
+            let errorMessage;
+            if (err instanceof Error) {
+                if (err.message.includes(INVALID_PASSWORD_ERROR_MESSAGE)) {
+                    errorMessage = t('dyn_enter_password.error.invalid_password');
+                }
+                else {
+                    errorMessage = err.message;
+                }
+            }
+            else {
+                errorMessage = t('dyn_enter_password.error.failed');
+            }
             setError(errorMessage);
         }
         finally {
@@ -51,7 +61,7 @@ const EnterPasswordView = ({ onContinue, title, description, buttonLabel, isLoad
         }
     }), [password, onContinue, t]);
     const loading = externalLoading || isLoading;
-    return (jsxRuntime.jsx("div", { className: 'enter-password-view', children: jsxRuntime.jsxs("div", { className: 'enter-password-view__body', children: [jsxRuntime.jsx(Typography.Typography, { variant: 'title', color: 'primary', copykey: 'dyn_enter_password.title', className: 'enter-password-view__title', style: { marginBottom: '24px', textAlign: 'center' }, children: title !== null && title !== void 0 ? title : t('dyn_enter_password.title') }), jsxRuntime.jsx("div", { className: 'enter-password-view__icon-container', children: jsxRuntime.jsx(Icon.Icon, { color: 'brand-primary', children: jsxRuntime.jsx(passwordLockIcon.ReactComponent, { width: 64, height: 64 }) }) }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'secondary', copykey: 'dyn_enter_password.description', className: 'enter-password-view__description', children: description !== null && description !== void 0 ? description : t('dyn_enter_password.description') }), error && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, { className: 'enter-password-view__error', variant: 'error', withIcon: false, children: error })), jsxRuntime.jsx(Input.Input, { id: 'enter-password-input', type: showPassword ? 'text' : 'password', label: t('dyn_enter_password.label'), placeholder: t('dyn_enter_password.placeholder'), value: password, onChange: handlePasswordChange, variant: 'regular', suffix: 
+    return (jsxRuntime.jsx("div", { className: 'enter-password-view', children: jsxRuntime.jsxs("div", { className: 'enter-password-view__body', children: [jsxRuntime.jsx(Typography.Typography, { variant: 'title', color: 'primary', copykey: 'dyn_enter_password.title', className: 'enter-password-view__title', style: { marginBottom: '24px', textAlign: 'center' }, children: title !== null && title !== void 0 ? title : t('dyn_enter_password.title') }), jsxRuntime.jsx("div", { className: 'enter-password-view__icon-container', children: jsxRuntime.jsx(Icon.Icon, { color: 'brand-primary', children: jsxRuntime.jsx(passwordLockIcon.ReactComponent, { width: 64, height: 64 }) }) }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'secondary', copykey: 'dyn_enter_password.description', className: 'enter-password-view__description', children: description !== null && description !== void 0 ? description : t('dyn_enter_password.description') }), jsxRuntime.jsx(Input.Input, { id: 'enter-password-input', type: showPassword ? 'text' : 'password', label: t('dyn_enter_password.label'), placeholder: t('dyn_enter_password.placeholder'), value: password, onChange: handlePasswordChange, variant: 'regular', error: Boolean(error), message: error ? (jsxRuntime.jsxs("span", { className: 'enter-password-view__error-message', children: [jsxRuntime.jsx(errorCircleX.ReactComponent, { width: 14, height: 14 }), error] })) : undefined, suffix: 
                     // eslint-disable-next-line react/jsx-wrap-multilines
                     jsxRuntime.jsx(ToggleVisibilityButton.ToggleVisibilityButton, { initialState: true, onClick: handleToggleVisibility }) }), jsxRuntime.jsx("div", { className: 'enter-password-view__actions', children: jsxRuntime.jsx(TypographyButton.TypographyButton, { dataTestId: 'enter-password-continue-button', onClick: handleContinue, disabled: !password || loading, copykey: 'dyn_enter_password.button.continue', buttonVariant: 'brand-primary', typographyProps: {
                             color: 'inherit',