@dynamic-labs/sdk-react-core 4.91.1 → 4.91.3

package/src/lib/views/SmsVerification/useSmsVerification/useSmsVerification.cjs

@@ -6,11 +6,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var reactInternationalPhone = require('react-international-phone');
+var utils = require('@dynamic-labs/utils');
 require('../../../context/DynamicContext/useDynamicContext/useDynamicContext.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 var VerificationContext = require('../../../context/VerificationContext/VerificationContext.cjs');
 require('@dynamic-labs-sdk/client');
-require('@dynamic-labs/utils');
 require('@dynamic-labs/sdk-api-core');
 require('@dynamic-labs-sdk/client/core');
 require('eventemitter3');
@@ -144,7 +144,7 @@ const useSmsVerification = (type) => {
             logger.logger.warn('WARNING: emitted smsVerificationResult with incomplete params because retryData was undefined');
         dynamicEvents.dynamicEvents.emit('smsVerificationResult', isValidatedRef.current, phone);
         if (!isValidatedRef.current)
-            dynamicEvents.dynamicEvents.emit('authFailure', { option: phone, phone, type: 'sms' }, 'user-cancelled');
+            dynamicEvents.dynamicEvents.emit('authFailure', { option: phone, phone, type: 'sms' }, utils.SdkErrorCode.USER_CANCELLED);
     });
     const retryOneTimePassword = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         setError(undefined);

package/src/lib/views/SmsVerification/useSmsVerification/useSmsVerification.js

@@ -2,11 +2,11 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useRef, useCallback } from 'react';
 import { removeDialCode } from 'react-international-phone';
+import { SdkErrorCode } from '@dynamic-labs/utils';
 import '../../../context/DynamicContext/useDynamicContext/useDynamicContext.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 import { useVerification } from '../../../context/VerificationContext/VerificationContext.js';
 import '@dynamic-labs-sdk/client';
-import '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api-core';
 import '@dynamic-labs-sdk/client/core';
 import 'eventemitter3';
@@ -140,7 +140,7 @@ const useSmsVerification = (type) => {
             logger.warn('WARNING: emitted smsVerificationResult with incomplete params because retryData was undefined');
         dynamicEvents.emit('smsVerificationResult', isValidatedRef.current, phone);
         if (!isValidatedRef.current)
-            dynamicEvents.emit('authFailure', { option: phone, phone, type: 'sms' }, 'user-cancelled');
+            dynamicEvents.emit('authFailure', { option: phone, phone, type: 'sms' }, SdkErrorCode.USER_CANCELLED);
     });
     const retryOneTimePassword = () => __awaiter(void 0, void 0, void 0, function* () {
         setError(undefined);

package/src/lib/widgets/DynamicWidget/components/ActiveMidnightWalletBalance/ActiveMidnightWalletBalance.cjs

@@ -16,7 +16,7 @@ require('@dynamic-labs/iconic');
 var midnightShielded = require('../../../../shared/assets/midnight-shielded.cjs');
 var midnightUnshielded = require('../../../../shared/assets/midnight-unshielded.cjs');
 require('../../../../context/ViewContext/ViewContext.cjs');
-require('../../../../shared/logger.cjs');
+var logger = require('../../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('../../../../utils/constants/colors.cjs');
@@ -80,7 +80,7 @@ const ActiveMidnightWalletBalance = ({ isLoading = false, }) => {
         deps: [walletAddress, primaryWallet, dustPollTick],
         enabled,
     });
-    const { dustBalance, shieldedBalance, unshieldedBalance, dustSyncing } = balances !== null && balances !== void 0 ? balances : {};
+    const { dustBalance, shieldedTokenCount, unshieldedBalance, dustSyncing } = balances !== null && balances !== void 0 ? balances : {};
     React.useEffect(() => {
         if (!dustSyncing)
             return undefined;
@@ -94,13 +94,29 @@ const ActiveMidnightWalletBalance = ({ isLoading = false, }) => {
     // wallets manage dust themselves). When the embedded wallet has no dust
     // registered yet, we surface a "Register DUST" button instead of the gauge.
     const isWaasWallet = Boolean(primaryWallet && walletConnectorCore.isDynamicWaasConnector(primaryWallet.connector));
+    // True once registered. balance/cap can't tell us this on load (cap reads 0
+    // on current wallet-client builds), so we track it after a register call to
+    // flip from the "Register DUST" prompt to the generating state.
+    const [dustRegistered, setDustRegistered] = React.useState(false);
+    // Returns the promise so <Button> shows its built-in spinner while the heavy
+    // registerDust call runs.
     const handleRegisterDust = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const connector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
         if (!(connector === null || connector === void 0 ? void 0 : connector.registerDust))
             return;
-        yield connector.registerDust();
-        // Dust generation begins after registration; re-fetch so the gauge appears.
-        setDustPollTick((tick) => tick + 1);
+        try {
+            const result = yield connector.registerDust();
+            if ((result === null || result === void 0 ? void 0 : result.status) === 'registered' ||
+                (result === null || result === void 0 ? void 0 : result.status) === 'already_registered' ||
+                (result === null || result === void 0 ? void 0 : result.status) === 'already_has_dust') {
+                setDustRegistered(true);
+            }
+            setDustPollTick((tick) => tick + 1);
+        }
+        catch (err) {
+            // Leave the prompt up so the user can retry rather than failing silently.
+            logger.logger.error('Failed to register dust', err);
+        }
     });
     // Only show the full skeleton on the very first load; background dust polls
     // keep `balances` populated so the view never flashes back to a skeleton.
@@ -116,7 +132,10 @@ const ActiveMidnightWalletBalance = ({ isLoading = false, }) => {
             cap: truncateToDecimals(dustBalance.cap, 2),
         }
         : undefined;
-    const activeBalance = activeTab === 'shielded' ? shieldedBalance : unshieldedBalance;
+    // Unshielded shows the native NIGHT amount; shielded has no NIGHT, so it
+    // shows the count of token types held in the pool instead.
+    const tokenCount = shieldedTokenCount !== null && shieldedTokenCount !== void 0 ? shieldedTokenCount : 0;
+    const shieldedDisplay = `${tokenCount} ${tokenCount === 1 ? 'token' : 'tokens'}`;
     // Dust section has three mutually exclusive states (syncing, generating with
     // a balance, and the WaaS "register dust" prompt). Resolved via a helper to
     // avoid nesting ternaries in the JSX below.
@@ -124,8 +143,11 @@ const ActiveMidnightWalletBalance = ({ isLoading = false, }) => {
         if (dustSyncing) {
             return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx("div", { className: 'active-midnight-balance__dust', children: jsxRuntime.jsx("div", { className: 'active-midnight-balance__dust-header', children: jsxRuntime.jsxs("div", { className: 'active-midnight-balance__dust-title', children: [jsxRuntime.jsx("svg", { className: 'active-midnight-balance__dust-icon', width: '12', height: '12', viewBox: '0 0 24 24', children: jsxRuntime.jsx("path", { d: 'M13 2L3 14h9l-1 8 10-12h-9l1-8z' }) }), jsxRuntime.jsx("span", { className: 'active-midnight-balance__dust-label', "data-copykey": 'dyn_active_wallet_info.midnight_dust_syncing', children: t('dyn_active_wallet_info.midnight_dust_syncing') })] }) }) }), jsxRuntime.jsx("div", { className: 'active-midnight-balance__divider' })] }));
         }
-        if (dustBalance) {
-            return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsxs("div", { className: 'active-midnight-balance__dust', children: [jsxRuntime.jsxs("div", { className: 'active-midnight-balance__dust-header', children: [jsxRuntime.jsxs("div", { className: 'active-midnight-balance__dust-title', children: [jsxRuntime.jsx("svg", { className: 'active-midnight-balance__dust-icon', width: '12', height: '12', viewBox: '0 0 24 24', children: jsxRuntime.jsx("path", { d: 'M13 2L3 14h9l-1 8 10-12h-9l1-8z' }) }), jsxRuntime.jsx("span", { className: 'active-midnight-balance__dust-label', "data-copykey": 'dyn_active_wallet_info.midnight_dust_generating', children: t('dyn_active_wallet_info.midnight_dust_generating') })] }), jsxRuntime.jsxs("span", { className: 'active-midnight-balance__dust-count', children: [dustBalanceDisplay === null || dustBalanceDisplay === void 0 ? void 0 : dustBalanceDisplay.balance, "/", dustBalanceDisplay === null || dustBalanceDisplay === void 0 ? void 0 : dustBalanceDisplay.cap] })] }), jsxRuntime.jsx("div", { className: 'active-midnight-balance__dust-bar', children: DUST_SEGMENT_KEYS.map((segmentKey, i) => (jsxRuntime.jsx("div", { className: [
+        // Generating gauge: shown with a dust balance, or once registered (balance
+        // still 0 during the grace period). Bar renders either way; count only
+        // shows with a real balance.
+        if (dustBalance || (isWaasWallet && dustRegistered)) {
+            return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsxs("div", { className: 'active-midnight-balance__dust', children: [jsxRuntime.jsxs("div", { className: 'active-midnight-balance__dust-header', children: [jsxRuntime.jsxs("div", { className: 'active-midnight-balance__dust-title', children: [jsxRuntime.jsx("svg", { className: 'active-midnight-balance__dust-icon', width: '12', height: '12', viewBox: '0 0 24 24', children: jsxRuntime.jsx("path", { d: 'M13 2L3 14h9l-1 8 10-12h-9l1-8z' }) }), jsxRuntime.jsx("span", { className: 'active-midnight-balance__dust-label', "data-copykey": 'dyn_active_wallet_info.midnight_dust_generating', children: t('dyn_active_wallet_info.midnight_dust_generating') })] }), dustBalanceDisplay && (jsxRuntime.jsxs("span", { className: 'active-midnight-balance__dust-count', children: [dustBalanceDisplay.balance, "/", dustBalanceDisplay.cap] }))] }), jsxRuntime.jsx("div", { className: 'active-midnight-balance__dust-bar', children: DUST_SEGMENT_KEYS.map((segmentKey, i) => (jsxRuntime.jsx("div", { className: [
                                         'active-midnight-balance__dust-segment',
                                         i === 0 && 'active-midnight-balance__dust-segment--first',
                                         i === DUST_SEGMENTS - 1 &&
@@ -143,7 +165,9 @@ const ActiveMidnightWalletBalance = ({ isLoading = false, }) => {
     };
     return (jsxRuntime.jsx("div", { className: 'active-midnight-balance', children: jsxRuntime.jsxs("div", { className: 'active-midnight-balance__card', children: [renderDustSection(), jsxRuntime.jsx("div", { className: 'active-midnight-balance__tab-bar', children: TABS.map(({ id, copykey }) => (jsxRuntime.jsx("button", { className: classNames.classNames('active-midnight-balance__tab', {
                             'active-midnight-balance__tab--active': activeTab === id,
-                        }), "data-copykey": copykey, onClick: () => setActiveTab(id), children: t(copykey) }, id))) }), jsxRuntime.jsxs("div", { className: 'active-midnight-balance__pocket', children: [activeTab === 'shielded' ? (jsxRuntime.jsx(midnightShielded.ReactComponent, { className: 'active-midnight-balance__pocket-icon' })) : (jsxRuntime.jsx(midnightUnshielded.ReactComponent, { className: 'active-midnight-balance__pocket-icon' })), jsxRuntime.jsxs("span", { className: 'active-midnight-balance__amount', children: [activeBalance !== null && activeBalance !== void 0 ? activeBalance : '—', " NIGHT"] })] })] }) }));
+                        }), "data-copykey": copykey, onClick: () => setActiveTab(id), children: t(copykey) }, id))) }), jsxRuntime.jsxs("div", { className: 'active-midnight-balance__pocket', children: [activeTab === 'shielded' ? (jsxRuntime.jsx(midnightShielded.ReactComponent, { className: 'active-midnight-balance__pocket-icon' })) : (jsxRuntime.jsx(midnightUnshielded.ReactComponent, { className: 'active-midnight-balance__pocket-icon' })), jsxRuntime.jsx("span", { className: 'active-midnight-balance__amount', children: activeTab === 'shielded'
+                                ? shieldedDisplay
+                                : `${unshieldedBalance !== null && unshieldedBalance !== void 0 ? unshieldedBalance : '—'} NIGHT` })] })] }) }));
 };
 
 exports.ActiveMidnightWalletBalance = ActiveMidnightWalletBalance;

package/src/lib/widgets/DynamicWidget/components/ActiveMidnightWalletBalance/ActiveMidnightWalletBalance.js

@@ -12,7 +12,7 @@ import '@dynamic-labs/iconic';
 import { ReactComponent as SvgMidnightShielded } from '../../../../shared/assets/midnight-shielded.js';
 import { ReactComponent as SvgMidnightUnshielded } from '../../../../shared/assets/midnight-unshielded.js';
 import '../../../../context/ViewContext/ViewContext.js';
-import '../../../../shared/logger.js';
+import { logger } from '../../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import '../../../../utils/constants/colors.js';
@@ -76,7 +76,7 @@ const ActiveMidnightWalletBalance = ({ isLoading = false, }) => {
         deps: [walletAddress, primaryWallet, dustPollTick],
         enabled,
     });
-    const { dustBalance, shieldedBalance, unshieldedBalance, dustSyncing } = balances !== null && balances !== void 0 ? balances : {};
+    const { dustBalance, shieldedTokenCount, unshieldedBalance, dustSyncing } = balances !== null && balances !== void 0 ? balances : {};
     useEffect(() => {
         if (!dustSyncing)
             return undefined;
@@ -90,13 +90,29 @@ const ActiveMidnightWalletBalance = ({ isLoading = false, }) => {
     // wallets manage dust themselves). When the embedded wallet has no dust
     // registered yet, we surface a "Register DUST" button instead of the gauge.
     const isWaasWallet = Boolean(primaryWallet && isDynamicWaasConnector(primaryWallet.connector));
+    // True once registered. balance/cap can't tell us this on load (cap reads 0
+    // on current wallet-client builds), so we track it after a register call to
+    // flip from the "Register DUST" prompt to the generating state.
+    const [dustRegistered, setDustRegistered] = useState(false);
+    // Returns the promise so <Button> shows its built-in spinner while the heavy
+    // registerDust call runs.
     const handleRegisterDust = () => __awaiter(void 0, void 0, void 0, function* () {
         const connector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
         if (!(connector === null || connector === void 0 ? void 0 : connector.registerDust))
             return;
-        yield connector.registerDust();
-        // Dust generation begins after registration; re-fetch so the gauge appears.
-        setDustPollTick((tick) => tick + 1);
+        try {
+            const result = yield connector.registerDust();
+            if ((result === null || result === void 0 ? void 0 : result.status) === 'registered' ||
+                (result === null || result === void 0 ? void 0 : result.status) === 'already_registered' ||
+                (result === null || result === void 0 ? void 0 : result.status) === 'already_has_dust') {
+                setDustRegistered(true);
+            }
+            setDustPollTick((tick) => tick + 1);
+        }
+        catch (err) {
+            // Leave the prompt up so the user can retry rather than failing silently.
+            logger.error('Failed to register dust', err);
+        }
     });
     // Only show the full skeleton on the very first load; background dust polls
     // keep `balances` populated so the view never flashes back to a skeleton.
@@ -112,7 +128,10 @@ const ActiveMidnightWalletBalance = ({ isLoading = false, }) => {
             cap: truncateToDecimals(dustBalance.cap, 2),
         }
         : undefined;
-    const activeBalance = activeTab === 'shielded' ? shieldedBalance : unshieldedBalance;
+    // Unshielded shows the native NIGHT amount; shielded has no NIGHT, so it
+    // shows the count of token types held in the pool instead.
+    const tokenCount = shieldedTokenCount !== null && shieldedTokenCount !== void 0 ? shieldedTokenCount : 0;
+    const shieldedDisplay = `${tokenCount} ${tokenCount === 1 ? 'token' : 'tokens'}`;
     // Dust section has three mutually exclusive states (syncing, generating with
     // a balance, and the WaaS "register dust" prompt). Resolved via a helper to
     // avoid nesting ternaries in the JSX below.
@@ -120,8 +139,11 @@ const ActiveMidnightWalletBalance = ({ isLoading = false, }) => {
         if (dustSyncing) {
             return (jsxs(Fragment, { children: [jsx("div", { className: 'active-midnight-balance__dust', children: jsx("div", { className: 'active-midnight-balance__dust-header', children: jsxs("div", { className: 'active-midnight-balance__dust-title', children: [jsx("svg", { className: 'active-midnight-balance__dust-icon', width: '12', height: '12', viewBox: '0 0 24 24', children: jsx("path", { d: 'M13 2L3 14h9l-1 8 10-12h-9l1-8z' }) }), jsx("span", { className: 'active-midnight-balance__dust-label', "data-copykey": 'dyn_active_wallet_info.midnight_dust_syncing', children: t('dyn_active_wallet_info.midnight_dust_syncing') })] }) }) }), jsx("div", { className: 'active-midnight-balance__divider' })] }));
         }
-        if (dustBalance) {
-            return (jsxs(Fragment, { children: [jsxs("div", { className: 'active-midnight-balance__dust', children: [jsxs("div", { className: 'active-midnight-balance__dust-header', children: [jsxs("div", { className: 'active-midnight-balance__dust-title', children: [jsx("svg", { className: 'active-midnight-balance__dust-icon', width: '12', height: '12', viewBox: '0 0 24 24', children: jsx("path", { d: 'M13 2L3 14h9l-1 8 10-12h-9l1-8z' }) }), jsx("span", { className: 'active-midnight-balance__dust-label', "data-copykey": 'dyn_active_wallet_info.midnight_dust_generating', children: t('dyn_active_wallet_info.midnight_dust_generating') })] }), jsxs("span", { className: 'active-midnight-balance__dust-count', children: [dustBalanceDisplay === null || dustBalanceDisplay === void 0 ? void 0 : dustBalanceDisplay.balance, "/", dustBalanceDisplay === null || dustBalanceDisplay === void 0 ? void 0 : dustBalanceDisplay.cap] })] }), jsx("div", { className: 'active-midnight-balance__dust-bar', children: DUST_SEGMENT_KEYS.map((segmentKey, i) => (jsx("div", { className: [
+        // Generating gauge: shown with a dust balance, or once registered (balance
+        // still 0 during the grace period). Bar renders either way; count only
+        // shows with a real balance.
+        if (dustBalance || (isWaasWallet && dustRegistered)) {
+            return (jsxs(Fragment, { children: [jsxs("div", { className: 'active-midnight-balance__dust', children: [jsxs("div", { className: 'active-midnight-balance__dust-header', children: [jsxs("div", { className: 'active-midnight-balance__dust-title', children: [jsx("svg", { className: 'active-midnight-balance__dust-icon', width: '12', height: '12', viewBox: '0 0 24 24', children: jsx("path", { d: 'M13 2L3 14h9l-1 8 10-12h-9l1-8z' }) }), jsx("span", { className: 'active-midnight-balance__dust-label', "data-copykey": 'dyn_active_wallet_info.midnight_dust_generating', children: t('dyn_active_wallet_info.midnight_dust_generating') })] }), dustBalanceDisplay && (jsxs("span", { className: 'active-midnight-balance__dust-count', children: [dustBalanceDisplay.balance, "/", dustBalanceDisplay.cap] }))] }), jsx("div", { className: 'active-midnight-balance__dust-bar', children: DUST_SEGMENT_KEYS.map((segmentKey, i) => (jsx("div", { className: [
                                         'active-midnight-balance__dust-segment',
                                         i === 0 && 'active-midnight-balance__dust-segment--first',
                                         i === DUST_SEGMENTS - 1 &&
@@ -139,7 +161,9 @@ const ActiveMidnightWalletBalance = ({ isLoading = false, }) => {
     };
     return (jsx("div", { className: 'active-midnight-balance', children: jsxs("div", { className: 'active-midnight-balance__card', children: [renderDustSection(), jsx("div", { className: 'active-midnight-balance__tab-bar', children: TABS.map(({ id, copykey }) => (jsx("button", { className: classNames('active-midnight-balance__tab', {
                             'active-midnight-balance__tab--active': activeTab === id,
-                        }), "data-copykey": copykey, onClick: () => setActiveTab(id), children: t(copykey) }, id))) }), jsxs("div", { className: 'active-midnight-balance__pocket', children: [activeTab === 'shielded' ? (jsx(SvgMidnightShielded, { className: 'active-midnight-balance__pocket-icon' })) : (jsx(SvgMidnightUnshielded, { className: 'active-midnight-balance__pocket-icon' })), jsxs("span", { className: 'active-midnight-balance__amount', children: [activeBalance !== null && activeBalance !== void 0 ? activeBalance : '—', " NIGHT"] })] })] }) }));
+                        }), "data-copykey": copykey, onClick: () => setActiveTab(id), children: t(copykey) }, id))) }), jsxs("div", { className: 'active-midnight-balance__pocket', children: [activeTab === 'shielded' ? (jsx(SvgMidnightShielded, { className: 'active-midnight-balance__pocket-icon' })) : (jsx(SvgMidnightUnshielded, { className: 'active-midnight-balance__pocket-icon' })), jsx("span", { className: 'active-midnight-balance__amount', children: activeTab === 'shielded'
+                                ? shieldedDisplay
+                                : `${unshieldedBalance !== null && unshieldedBalance !== void 0 ? unshieldedBalance : '—'} NIGHT` })] })] }) }));
 };
 
 export { ActiveMidnightWalletBalance };

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

@@ -177,9 +177,10 @@ const EmbeddedWalletExportSection = () => {
     }, [setShowAuthFlow, pushView]);
     const handleExportClick = React.useCallback((recoveryPhrase) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _l;
+        const targetWalletId = wallet === null || wallet === void 0 ? void 0 : wallet.id;
         logger.logger.info('Starting embedded wallet export process', {
             userId: user === null || user === void 0 ? void 0 : user.userId,
-            walletId: wallet === null || wallet === void 0 ? void 0 : wallet.id,
+            walletId: targetWalletId,
             walletName: (_l = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _l === void 0 ? void 0 : _l.name,
         });
         const stepUpRequired = yield isStepUpRequired({
@@ -215,8 +216,10 @@ const EmbeddedWalletExportSection = () => {
                 });
             }
         }
-        return initExportProcess(recoveryPhrase);
+        return initExportProcess(recoveryPhrase, false, targetWalletId);
     }), [
+        wallet,
+        user,
         isStepUpRequired,
         promptStepUpAuth,
         isMfaRequiredForAction,

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

@@ -173,9 +173,10 @@ const EmbeddedWalletExportSection = () => {
     }, [setShowAuthFlow, pushView]);
     const handleExportClick = useCallback((recoveryPhrase) => __awaiter(void 0, void 0, void 0, function* () {
         var _l;
+        const targetWalletId = wallet === null || wallet === void 0 ? void 0 : wallet.id;
         logger.info('Starting embedded wallet export process', {
             userId: user === null || user === void 0 ? void 0 : user.userId,
-            walletId: wallet === null || wallet === void 0 ? void 0 : wallet.id,
+            walletId: targetWalletId,
             walletName: (_l = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _l === void 0 ? void 0 : _l.name,
         });
         const stepUpRequired = yield isStepUpRequired({
@@ -211,8 +212,10 @@ const EmbeddedWalletExportSection = () => {
                 });
             }
         }
-        return initExportProcess(recoveryPhrase);
+        return initExportProcess(recoveryPhrase, false, targetWalletId);
     }), [
+        wallet,
+        user,
         isStepUpRequired,
         promptStepUpAuth,
         isMfaRequiredForAction,

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

@@ -42,6 +42,7 @@ const ExportAndRecoveryView = () => {
     const isV3WaasWallet = Boolean(wallet && ((_b = (_a = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _a === void 0 ? void 0 : _a.key) === null || _b === void 0 ? void 0 : _b.startsWith('dynamicwaas')));
     const handleBackClick = React.useCallback(() => setDynamicWidgetView('account-and-security-settings'), [setDynamicWidgetView]);
     const handlePrivateKeyClick = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const targetWalletId = wallet === null || wallet === void 0 ? void 0 : wallet.id;
         if (!isSessionKeyCompatible) {
             if (yield shouldInitRecovery()) {
                 yield initPasskeyRecoveryProcess(undefined, {
@@ -49,8 +50,9 @@ const ExportAndRecoveryView = () => {
                 });
             }
         }
-        return initExportProcess();
+        return initExportProcess(false, false, targetWalletId);
     }), [
+        wallet === null || wallet === void 0 ? void 0 : wallet.id,
         isSessionKeyCompatible,
         shouldInitRecovery,
         initPasskeyRecoveryProcess,

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

@@ -38,6 +38,7 @@ const ExportAndRecoveryView = () => {
     const isV3WaasWallet = Boolean(wallet && ((_b = (_a = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _a === void 0 ? void 0 : _a.key) === null || _b === void 0 ? void 0 : _b.startsWith('dynamicwaas')));
     const handleBackClick = useCallback(() => setDynamicWidgetView('account-and-security-settings'), [setDynamicWidgetView]);
     const handlePrivateKeyClick = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+        const targetWalletId = wallet === null || wallet === void 0 ? void 0 : wallet.id;
         if (!isSessionKeyCompatible) {
             if (yield shouldInitRecovery()) {
                 yield initPasskeyRecoveryProcess(undefined, {
@@ -45,8 +46,9 @@ const ExportAndRecoveryView = () => {
                 });
             }
         }
-        return initExportProcess();
+        return initExportProcess(false, false, targetWalletId);
     }), [
+        wallet === null || wallet === void 0 ? void 0 : wallet.id,
         isSessionKeyCompatible,
         shouldInitRecovery,
         initPasskeyRecoveryProcess,