@dynamic-labs/sdk-react-core 4.91.0 → 4.91.2

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

@@ -454,7 +454,24 @@ const useDynamicWaas = () => {
         });
         yield refresh();
     });
-    const upgradeToDynamicWaas = React.useCallback((_h) => _tslib.__awaiter(void 0, [_h], void 0, function* ({ privateKey, wallet, password, }) {
+    const migrateFromFireblocks = (_h) => _tslib.__awaiter(void 0, [_h], void 0, function* ({ deviceId, jwt, password, storage, expectedAddresses, }) {
+        const [chainName] = enabledChainNames !== null && enabledChainNames !== void 0 ? enabledChainNames : [];
+        if (!chainName)
+            return undefined;
+        const walletConnector = getWaasWalletConnector(chainName);
+        if (!walletConnector)
+            return undefined;
+        const result = yield walletConnector.migrateFromFireblocks({
+            deviceId,
+            expectedAddresses,
+            jwt,
+            ncwStorage: storage,
+            walletPassword: password,
+        });
+        yield refresh();
+        return result;
+    });
+    const upgradeToDynamicWaas = React.useCallback((_j) => _tslib.__awaiter(void 0, [_j], void 0, function* ({ privateKey, wallet, password, }) {
         isUpgrading.current = true;
         if (!wallet) {
             throw new utils.DynamicError('Wallet to upgrade was not provided');
@@ -534,14 +551,14 @@ const useDynamicWaas = () => {
             values.VerifiedCredentialNameToChainEnum[cred.chain]);
     }, [user === null || user === void 0 ? void 0 : user.verifiedCredentials]);
     const processSignOnWalletSettings = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _j;
+        var _k;
         if (!(user === null || user === void 0 ? void 0 : user.verifiedCredentials)) {
             return;
         }
         const waasWallets = user.verifiedCredentials.filter((vc) => { var _a; return vc.walletName === 'dynamicwaas' && ((_a = vc.walletProperties) === null || _a === void 0 ? void 0 : _a.settings); });
         for (const wallet of waasWallets) {
             try {
-                const settings = (_j = wallet.walletProperties) === null || _j === void 0 ? void 0 : _j.settings;
+                const settings = (_k = wallet.walletProperties) === null || _k === void 0 ? void 0 : _k.settings;
                 const { address, chain } = wallet;
                 if (!settings || !address || !chain) {
                     continue;
@@ -612,6 +629,7 @@ const useDynamicWaas = () => {
         getWaasWalletsByCredentials,
         importPrivateKey,
         initializeWaas,
+        migrateFromFireblocks,
         needsAutoCreateWalletChains,
         needsSettingsProcessing,
         processSignOnWalletSettings,

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

@@ -54,6 +54,13 @@ export declare const useDynamicWaas: () => {
     initializeWaas: ({ forceClientRebuild, }?: {
         forceClientRebuild?: boolean;
     }) => Promise<void>;
+    migrateFromFireblocks: ({ deviceId, jwt, password, storage, expectedAddresses, }: {
+        deviceId: string;
+        jwt: string;
+        password: string;
+        storage: Record<string, string>;
+        expectedAddresses: Record<string, string>;
+    }) => Promise<import("@dynamic-labs-wallet/browser-wallet-client").MigrateFromFireblocksResponse | undefined>;
     needsAutoCreateWalletChains: WalletCreationRequirement[];
     needsSettingsProcessing: boolean;
     processSignOnWalletSettings: () => Promise<void>;

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

@@ -450,7 +450,24 @@ const useDynamicWaas = () => {
         });
         yield refresh();
     });
-    const upgradeToDynamicWaas = useCallback((_h) => __awaiter(void 0, [_h], void 0, function* ({ privateKey, wallet, password, }) {
+    const migrateFromFireblocks = (_h) => __awaiter(void 0, [_h], void 0, function* ({ deviceId, jwt, password, storage, expectedAddresses, }) {
+        const [chainName] = enabledChainNames !== null && enabledChainNames !== void 0 ? enabledChainNames : [];
+        if (!chainName)
+            return undefined;
+        const walletConnector = getWaasWalletConnector(chainName);
+        if (!walletConnector)
+            return undefined;
+        const result = yield walletConnector.migrateFromFireblocks({
+            deviceId,
+            expectedAddresses,
+            jwt,
+            ncwStorage: storage,
+            walletPassword: password,
+        });
+        yield refresh();
+        return result;
+    });
+    const upgradeToDynamicWaas = useCallback((_j) => __awaiter(void 0, [_j], void 0, function* ({ privateKey, wallet, password, }) {
         isUpgrading.current = true;
         if (!wallet) {
             throw new DynamicError('Wallet to upgrade was not provided');
@@ -530,14 +547,14 @@ const useDynamicWaas = () => {
             VerifiedCredentialNameToChainEnum[cred.chain]);
     }, [user === null || user === void 0 ? void 0 : user.verifiedCredentials]);
     const processSignOnWalletSettings = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _j;
+        var _k;
         if (!(user === null || user === void 0 ? void 0 : user.verifiedCredentials)) {
             return;
         }
         const waasWallets = user.verifiedCredentials.filter((vc) => { var _a; return vc.walletName === 'dynamicwaas' && ((_a = vc.walletProperties) === null || _a === void 0 ? void 0 : _a.settings); });
         for (const wallet of waasWallets) {
             try {
-                const settings = (_j = wallet.walletProperties) === null || _j === void 0 ? void 0 : _j.settings;
+                const settings = (_k = wallet.walletProperties) === null || _k === void 0 ? void 0 : _k.settings;
                 const { address, chain } = wallet;
                 if (!settings || !address || !chain) {
                     continue;
@@ -608,6 +625,7 @@ const useDynamicWaas = () => {
         getWaasWalletsByCredentials,
         importPrivateKey,
         initializeWaas,
+        migrateFromFireblocks,
         needsAutoCreateWalletChains,
         needsSettingsProcessing,
         processSignOnWalletSettings,

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

@@ -63,9 +63,10 @@ const useEmbeddedReveal = () => {
             throw new Error('Wallet is non-HD and does not have a recovery phrase');
         }
     };
-    const initExportProcess = React.useCallback((...args_1) => _tslib.__awaiter(void 0, [...args_1], void 0, function* (recoveryPhrase = false, isPromptForExport = false) {
-        if (!primaryWallet) {
-            throw new Error('No primary wallet');
+    const initExportProcess = React.useCallback((...args_1) => _tslib.__awaiter(void 0, [...args_1], void 0, function* (recoveryPhrase = false, isPromptForExport = false, walletId) {
+        const targetWalletId = walletId !== null && walletId !== void 0 ? walletId : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id;
+        if (!targetWalletId) {
+            throw new Error('No wallet available for export');
         }
         if (!user) {
             throw new Error(errors.USER_NOT_LOGGED_IN);
@@ -83,6 +84,7 @@ const useEmbeddedReveal = () => {
         pushView('embedded-reveal-view', {
             exportPrivateKey: !recoveryPhrase,
             isPromptForExport,
+            walletId: targetWalletId,
         });
         return new Promise((resolve, reject) => {
             dynamicEvents.dynamicEvents.once('embeddedWalletRevealCompleted', (wallet) => resolve(wallet));

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

@@ -1,4 +1,4 @@
 import { Wallet } from '../../../shared';
 export declare const useEmbeddedReveal: () => {
-    readonly initExportProcess: (recoveryPhrase?: boolean, isPromptForExport?: boolean) => Promise<Wallet>;
+    readonly initExportProcess: (recoveryPhrase?: boolean, isPromptForExport?: boolean, walletId?: string) => Promise<Wallet>;
 };

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

@@ -59,9 +59,10 @@ const useEmbeddedReveal = () => {
             throw new Error('Wallet is non-HD and does not have a recovery phrase');
         }
     };
-    const initExportProcess = useCallback((...args_1) => __awaiter(void 0, [...args_1], void 0, function* (recoveryPhrase = false, isPromptForExport = false) {
-        if (!primaryWallet) {
-            throw new Error('No primary wallet');
+    const initExportProcess = useCallback((...args_1) => __awaiter(void 0, [...args_1], void 0, function* (recoveryPhrase = false, isPromptForExport = false, walletId) {
+        const targetWalletId = walletId !== null && walletId !== void 0 ? walletId : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id;
+        if (!targetWalletId) {
+            throw new Error('No wallet available for export');
         }
         if (!user) {
             throw new Error(USER_NOT_LOGGED_IN);
@@ -79,6 +80,7 @@ const useEmbeddedReveal = () => {
         pushView('embedded-reveal-view', {
             exportPrivateKey: !recoveryPhrase,
             isPromptForExport,
+            walletId: targetWalletId,
         });
         return new Promise((resolve, reject) => {
             dynamicEvents.once('embeddedWalletRevealCompleted', (wallet) => resolve(wallet));

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

@@ -95,7 +95,7 @@ const useSyncEmbeddedWalletFlow = () => {
                 primaryWallet) {
                 try {
                     setShowAuthFlow(true);
-                    yield initExportProcess(true, true);
+                    yield initExportProcess(true, true, primaryWallet.id);
                 }
                 catch (error) {
                     logger.logger.error('Error initializing embedded wallet export', error);

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

@@ -91,7 +91,7 @@ const useSyncEmbeddedWalletFlow = () => {
                 primaryWallet) {
                 try {
                     setShowAuthFlow(true);
-                    yield initExportProcess(true, true);
+                    yield initExportProcess(true, true, primaryWallet.id);
                 }
                 catch (error) {
                     logger.error('Error initializing embedded wallet export', error);

package/src/lib/views/EmbeddedReveal/EmbeddedRevealView/EmbeddedRevealView.cjs

@@ -55,7 +55,7 @@ require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../utils/functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
+var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../store/state/authMode/authMode.cjs');
 require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
@@ -66,7 +66,6 @@ require('../../../context/ThemeContext/ThemeContext.cjs');
 var useSmartWallets = require('../../../utils/hooks/useSmartWallets/useSmartWallets.cjs');
 require('../../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 var useMutation = require('../../../utils/hooks/useMutation/useMutation.cjs');
-var useIsTurnkeyWallet = require('../../../utils/hooks/useIsTurnkeyWallet/useIsTurnkeyWallet.cjs');
 require('bs58');
 require('@dynamic-labs/types');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
@@ -136,32 +135,40 @@ var useSyncEmbeddedWalletFlow = require('../../../utils/hooks/useSyncEmbeddedWal
 require('@dynamic-labs/store');
 require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 
-const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) => {
-    var _a, _b, _c;
+const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, walletId, }) => {
+    var _a, _b, _c, _d, _e;
     const { primaryWallet, user, setShowAuthFlow, environmentId } = useInternalDynamicContext.useInternalDynamicContext();
+    const { userWallets } = UserWalletsContext.useInternalUserWallets();
     const { handleAcknowledgeExportPrompt } = useSyncEmbeddedWalletFlow.useSyncEmbeddedWalletFlow();
-    const { isTurnkeyWallet } = useIsTurnkeyWallet.useIsTurnkeyWallet();
     const isWaasWallet = Boolean(user === null || user === void 0 ? void 0 : user.verifiedCredentials.find((vc) => { var _a; return (_a = vc.walletName) === null || _a === void 0 ? void 0 : _a.startsWith('dynamicwaas'); }));
     const { setDynamicWidgetView } = DynamicWidgetContext.useWidgetContext();
     const { pushView } = ViewContext.useViewContext();
     const { getEOAWallet, isSmartWallet } = useSmartWallets.useSmartWallets();
     const [isAcknowledged, setIsAcknowledged] = React.useState(false);
     const [iframeContainerRef, setIframeContainerRef] = React.useState(null);
-    if (!primaryWallet) {
+    const walletFromId = walletId
+        ? userWallets.find((w) => w.id === walletId)
+        : undefined;
+    if (walletId && !walletFromId) {
+        throw new utils.DynamicError('Wallet not found. Please try again.', errors.INVALID_WALLET_DATA);
+    }
+    const targetWallet = walletFromId !== null && walletFromId !== void 0 ? walletFromId : primaryWallet;
+    if (!targetWallet) {
         throw new utils.DynamicError('No primary wallet found', errors.INVALID_WALLET_DATA);
     }
     let primaryTurnkeyWalletId;
     try {
-        primaryTurnkeyWalletId = getTurnkeyWalletId.getTurnkeyWalletId(primaryWallet.id, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
+        primaryTurnkeyWalletId = getTurnkeyWalletId.getTurnkeyWalletId(targetWallet.id, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
     }
     catch (error) {
         // waas wallet
     }
     const turnkeyCredential = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === primaryTurnkeyWalletId);
     const walletProperties = turnkeyCredential === null || turnkeyCredential === void 0 ? void 0 : turnkeyCredential.walletProperties;
-    const walletCredential = (_b = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _b === void 0 ? void 0 : _b.find((cred) => cred.address === primaryWallet.address);
+    const walletCredential = (_b = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _b === void 0 ? void 0 : _b.find((cred) => cred.address === targetWallet.address);
     const isTurnkeyHDWallet = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeyHDWalletId;
-    const wallet = (_c = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _c !== void 0 ? _c : primaryWallet;
+    const wallet = (_c = (targetWallet && getEOAWallet(targetWallet))) !== null && _c !== void 0 ? _c : targetWallet;
+    const isTurnkeyWallet = Boolean((_e = (_d = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _d === void 0 ? void 0 : _d.key) === null || _e === void 0 ? void 0 : _e.startsWith('turnkey'));
     // eslint-disable-next-line arrow-body-style
     React.useEffect(() => {
         return () => {
@@ -252,8 +259,8 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
         }
         return baseClass;
     };
-    const isEip7702SmartWallet = Boolean(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id.endsWith('-zerodev'));
-    const isErc4337SmartWallet = Boolean(primaryWallet && isSmartWallet(primaryWallet)) &&
+    const isEip7702SmartWallet = Boolean(targetWallet === null || targetWallet === void 0 ? void 0 : targetWallet.id.endsWith('-zerodev'));
+    const isErc4337SmartWallet = Boolean(targetWallet && isSmartWallet(targetWallet)) &&
         !isEip7702SmartWallet;
     const shouldShowAaWarning = isErc4337SmartWallet && !isLoading && Boolean(data) && !error;
     const aaWarning = shouldShowAaWarning && (jsxRuntime.jsxs("div", { className: 'embedded-reveal-view__zerodev-warning', children: [jsxRuntime.jsxs("div", { className: 'embedded-reveal-view__zerodev-warning__title-row', children: [jsxRuntime.jsx(info.ReactComponent, { className: 'embedded-reveal-view__zerodev-warning__icon' }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'bold', copykey: 'dyn_embedded_reveal.aa_warning.title', children: t('dyn_embedded_reveal.aa_warning.title') })] }), jsxRuntime.jsxs(Typography.Typography, { variant: 'body_normal', weight: 'regular', copykey: 'dyn_embedded_reveal.aa_warning.subtitle', children: [t('dyn_embedded_reveal.aa_warning.subtitle'), jsxRuntime.jsx("button", { onClick: () => {

package/src/lib/views/EmbeddedReveal/EmbeddedRevealView/EmbeddedRevealView.d.ts

@@ -2,5 +2,6 @@ import { FC } from 'react';
 export type EmbeddedRevealViewProps = {
     exportPrivateKey?: boolean;
     isPromptForExport?: boolean;
+    walletId?: string;
 };
 export declare const EmbeddedRevealView: FC<EmbeddedRevealViewProps>;

package/src/lib/views/EmbeddedReveal/EmbeddedRevealView/EmbeddedRevealView.js

@@ -51,7 +51,7 @@ import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../utils/functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
-import '../../../context/UserWalletsContext/UserWalletsContext.js';
+import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../store/state/authMode/authMode.js';
 import '../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import '../../../context/VerificationContext/VerificationContext.js';
@@ -62,7 +62,6 @@ import '../../../context/ThemeContext/ThemeContext.js';
 import { useSmartWallets } from '../../../utils/hooks/useSmartWallets/useSmartWallets.js';
 import '../../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import { useMutation } from '../../../utils/hooks/useMutation/useMutation.js';
-import { useIsTurnkeyWallet } from '../../../utils/hooks/useIsTurnkeyWallet/useIsTurnkeyWallet.js';
 import 'bs58';
 import '@dynamic-labs/types';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
@@ -132,32 +131,40 @@ import { useSyncEmbeddedWalletFlow } from '../../../utils/hooks/useSyncEmbeddedW
 import '@dynamic-labs/store';
 import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 
-const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) => {
-    var _a, _b, _c;
+const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, walletId, }) => {
+    var _a, _b, _c, _d, _e;
     const { primaryWallet, user, setShowAuthFlow, environmentId } = useInternalDynamicContext();
+    const { userWallets } = useInternalUserWallets();
     const { handleAcknowledgeExportPrompt } = useSyncEmbeddedWalletFlow();
-    const { isTurnkeyWallet } = useIsTurnkeyWallet();
     const isWaasWallet = Boolean(user === null || user === void 0 ? void 0 : user.verifiedCredentials.find((vc) => { var _a; return (_a = vc.walletName) === null || _a === void 0 ? void 0 : _a.startsWith('dynamicwaas'); }));
     const { setDynamicWidgetView } = useWidgetContext();
     const { pushView } = useViewContext();
     const { getEOAWallet, isSmartWallet } = useSmartWallets();
     const [isAcknowledged, setIsAcknowledged] = useState(false);
     const [iframeContainerRef, setIframeContainerRef] = useState(null);
-    if (!primaryWallet) {
+    const walletFromId = walletId
+        ? userWallets.find((w) => w.id === walletId)
+        : undefined;
+    if (walletId && !walletFromId) {
+        throw new DynamicError('Wallet not found. Please try again.', INVALID_WALLET_DATA);
+    }
+    const targetWallet = walletFromId !== null && walletFromId !== void 0 ? walletFromId : primaryWallet;
+    if (!targetWallet) {
         throw new DynamicError('No primary wallet found', INVALID_WALLET_DATA);
     }
     let primaryTurnkeyWalletId;
     try {
-        primaryTurnkeyWalletId = getTurnkeyWalletId(primaryWallet.id, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
+        primaryTurnkeyWalletId = getTurnkeyWalletId(targetWallet.id, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
     }
     catch (error) {
         // waas wallet
     }
     const turnkeyCredential = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === primaryTurnkeyWalletId);
     const walletProperties = turnkeyCredential === null || turnkeyCredential === void 0 ? void 0 : turnkeyCredential.walletProperties;
-    const walletCredential = (_b = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _b === void 0 ? void 0 : _b.find((cred) => cred.address === primaryWallet.address);
+    const walletCredential = (_b = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _b === void 0 ? void 0 : _b.find((cred) => cred.address === targetWallet.address);
     const isTurnkeyHDWallet = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeyHDWalletId;
-    const wallet = (_c = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _c !== void 0 ? _c : primaryWallet;
+    const wallet = (_c = (targetWallet && getEOAWallet(targetWallet))) !== null && _c !== void 0 ? _c : targetWallet;
+    const isTurnkeyWallet = Boolean((_e = (_d = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _d === void 0 ? void 0 : _d.key) === null || _e === void 0 ? void 0 : _e.startsWith('turnkey'));
     // eslint-disable-next-line arrow-body-style
     useEffect(() => {
         return () => {
@@ -248,8 +255,8 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
         }
         return baseClass;
     };
-    const isEip7702SmartWallet = Boolean(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id.endsWith('-zerodev'));
-    const isErc4337SmartWallet = Boolean(primaryWallet && isSmartWallet(primaryWallet)) &&
+    const isEip7702SmartWallet = Boolean(targetWallet === null || targetWallet === void 0 ? void 0 : targetWallet.id.endsWith('-zerodev'));
+    const isErc4337SmartWallet = Boolean(targetWallet && isSmartWallet(targetWallet)) &&
         !isEip7702SmartWallet;
     const shouldShowAaWarning = isErc4337SmartWallet && !isLoading && Boolean(data) && !error;
     const aaWarning = shouldShowAaWarning && (jsxs("div", { className: 'embedded-reveal-view__zerodev-warning', children: [jsxs("div", { className: 'embedded-reveal-view__zerodev-warning__title-row', children: [jsx(SvgInfo, { className: 'embedded-reveal-view__zerodev-warning__icon' }), jsx(Typography, { variant: 'body_normal', weight: 'bold', copykey: 'dyn_embedded_reveal.aa_warning.title', children: t('dyn_embedded_reveal.aa_warning.title') })] }), jsxs(Typography, { variant: 'body_normal', weight: 'regular', copykey: 'dyn_embedded_reveal.aa_warning.subtitle', children: [t('dyn_embedded_reveal.aa_warning.subtitle'), jsx("button", { onClick: () => {

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,24 +80,43 @@ 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;
-        const id = setInterval(() => setDustPollTick((tick) => tick + 1), 15000);
+        // Poll frequently while syncing so the gauge appears within a couple
+        // seconds of dust completing (sync now finishes in ~4s). The effect stops
+        // the moment `dustSyncing` flips false, so this adds no steady-state load.
+        const id = setInterval(() => setDustPollTick((tick) => tick + 1), 2500);
         return () => clearInterval(id);
     }, [dustSyncing]);
     // `registerDust` is a WaaS-only connector method (external/injected Midnight
     // 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.
@@ -113,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.
@@ -121,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 &&
@@ -134,13 +159,15 @@ const ActiveMidnightWalletBalance = ({ isLoading = false, }) => {
                                         .join(' ') }, segmentKey))) })] }), jsxRuntime.jsx("div", { className: 'active-midnight-balance__divider' })] }));
         }
         if (isWaasWallet) {
-            return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsxs("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_generating', children: t('dyn_active_wallet_info.midnight_dust_generating') })] }) }), jsxRuntime.jsx(Button.Button, { buttonPadding: 'small', buttonVariant: 'secondary', buttonClassName: 'active-midnight-balance__register-dust-button', onClick: handleRegisterDust, "data-copykey": 'dyn_active_wallet_info.midnight_register_dust', children: t('dyn_active_wallet_info.midnight_register_dust') })] }), jsxRuntime.jsx("div", { className: 'active-midnight-balance__divider' })] }));
+            return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsxs("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_not_registered', children: t('dyn_active_wallet_info.midnight_dust_not_registered') })] }) }), jsxRuntime.jsx(Button.Button, { buttonPadding: 'small', buttonVariant: 'secondary', buttonClassName: 'active-midnight-balance__register-dust-button', onClick: handleRegisterDust, "data-copykey": 'dyn_active_wallet_info.midnight_register_dust', children: t('dyn_active_wallet_info.midnight_register_dust') })] }), jsxRuntime.jsx("div", { className: 'active-midnight-balance__divider' })] }));
         }
         return null;
     };
     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,24 +76,43 @@ 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;
-        const id = setInterval(() => setDustPollTick((tick) => tick + 1), 15000);
+        // Poll frequently while syncing so the gauge appears within a couple
+        // seconds of dust completing (sync now finishes in ~4s). The effect stops
+        // the moment `dustSyncing` flips false, so this adds no steady-state load.
+        const id = setInterval(() => setDustPollTick((tick) => tick + 1), 2500);
         return () => clearInterval(id);
     }, [dustSyncing]);
     // `registerDust` is a WaaS-only connector method (external/injected Midnight
     // 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.
@@ -109,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.
@@ -117,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 &&
@@ -130,13 +155,15 @@ const ActiveMidnightWalletBalance = ({ isLoading = false, }) => {
                                         .join(' ') }, segmentKey))) })] }), jsx("div", { className: 'active-midnight-balance__divider' })] }));
         }
         if (isWaasWallet) {
-            return (jsxs(Fragment, { children: [jsxs("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_generating', children: t('dyn_active_wallet_info.midnight_dust_generating') })] }) }), jsx(Button, { buttonPadding: 'small', buttonVariant: 'secondary', buttonClassName: 'active-midnight-balance__register-dust-button', onClick: handleRegisterDust, "data-copykey": 'dyn_active_wallet_info.midnight_register_dust', children: t('dyn_active_wallet_info.midnight_register_dust') })] }), jsx("div", { className: 'active-midnight-balance__divider' })] }));
+            return (jsxs(Fragment, { children: [jsxs("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_not_registered', children: t('dyn_active_wallet_info.midnight_dust_not_registered') })] }) }), jsx(Button, { buttonPadding: 'small', buttonVariant: 'secondary', buttonClassName: 'active-midnight-balance__register-dust-button', onClick: handleRegisterDust, "data-copykey": 'dyn_active_wallet_info.midnight_register_dust', children: t('dyn_active_wallet_info.midnight_register_dust') })] }), jsx("div", { className: 'active-midnight-balance__divider' })] }));
         }
         return null;
     };
     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,