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

package/CHANGELOG.md

@@ -1,4 +1,28 @@
 
+### [4.91.2](https://github.com/dynamic-labs/dynamic-auth/compare/v4.91.1...v4.91.2) (2026-06-26)
+
+
+### ⚠ BREAKING CHANGES
+
+* **waas:** require expectedAddresses on migrateFromFireblocks (#11730)
+
+### Features
+
+* **midnight:** support shielded/unshielded transfers and dust states in the embedded Send flow ([#11731](https://github.com/dynamic-labs/dynamic-auth/issues/11731)) ([663d171](https://github.com/dynamic-labs/dynamic-auth/commit/663d171a9628c634586831ee35c234e9331e3f80))
+* **react-native-extension:** instrument all embedded webview failure paths ([#11737](https://github.com/dynamic-labs/dynamic-auth/issues/11737)) ([172998b](https://github.com/dynamic-labs/dynamic-auth/commit/172998b56e9bee04fbb8da71e83ce8885bc378ff))
+* **waas:** migrateFromFireblocks connector method + demo panel (browser-wallet-client 1.0.46) ([#11702](https://github.com/dynamic-labs/dynamic-auth/issues/11702)) ([6bfc844](https://github.com/dynamic-labs/dynamic-auth/commit/6bfc8443fbaedabe1e7bee0ed78742cbbe5d0084))
+
+
+### Bug Fixes
+
+* add coverage for scenario with passkey re-login and smart account ([#11726](https://github.com/dynamic-labs/dynamic-auth/issues/11726)) ([5364a72](https://github.com/dynamic-labs/dynamic-auth/commit/5364a72a750d835b9b2da602a91e8b5d7d305db7))
+* remediate high-severity dependency vulnerabilities ([#11721](https://github.com/dynamic-labs/dynamic-auth/issues/11721)) ([cdb9306](https://github.com/dynamic-labs/dynamic-auth/commit/cdb93061365a20b8f73a1f8bea8352332e282c1e))
+* replace node-fetch v2 with native fetch to fix Node 22 stream failure ([#11732](https://github.com/dynamic-labs/dynamic-auth/issues/11732)) ([b98f801](https://github.com/dynamic-labs/dynamic-auth/commit/b98f801e307b52dbd7e4b241a9a4a2d34d89118e))
+* **zerodev-extension:** derive kernel 7702 vs 4337 per-wallet, not from global dashboard flag ([#11735](https://github.com/dynamic-labs/dynamic-auth/issues/11735)) ([72cf6a7](https://github.com/dynamic-labs/dynamic-auth/commit/72cf6a70a4857a4ea469faa555c485dbad8d0217))
+
+
+* **waas:** require expectedAddresses on migrateFromFireblocks ([#11730](https://github.com/dynamic-labs/dynamic-auth/issues/11730)) ([c94824e](https://github.com/dynamic-labs/dynamic-auth/commit/c94824ebe11e0433a6ffbd2a5a9dd4283aeed31e))
+
 ### [4.91.1](https://github.com/dynamic-labs/dynamic-auth/compare/v4.91.0...v4.91.1) (2026-06-24)
 
 

package/package.cjs

@@ -3,11 +3,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.91.1";
+var version = "4.91.2";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.1046",
 	"@dynamic-labs-sdk/client": "1.12.1",
-	"@dynamic-labs-wallet/browser-wallet-client": "1.0.44",
+	"@dynamic-labs-wallet/browser-wallet-client": "1.0.48",
 	"@dynamic-labs-wallet/forward-mpc-client": "0.12.0",
 	"@hcaptcha/react-hcaptcha": "1.4.4",
 	"@thumbmarkjs/thumbmarkjs": "0.16.0",

package/package.js

@@ -1,9 +1,9 @@
 'use client'
-var version = "4.91.1";
+var version = "4.91.2";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.1046",
 	"@dynamic-labs-sdk/client": "1.12.1",
-	"@dynamic-labs-wallet/browser-wallet-client": "1.0.44",
+	"@dynamic-labs-wallet/browser-wallet-client": "1.0.48",
 	"@dynamic-labs-wallet/forward-mpc-client": "0.12.0",
 	"@hcaptcha/react-hcaptcha": "1.4.4",
 	"@thumbmarkjs/thumbmarkjs": "0.16.0",

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "4.91.1",
+  "version": "4.91.2",
   "dependencies": {
     "@dynamic-labs/sdk-api-core": "0.0.1046",
     "@dynamic-labs-sdk/client": "1.12.1",
-    "@dynamic-labs-wallet/browser-wallet-client": "1.0.44",
+    "@dynamic-labs-wallet/browser-wallet-client": "1.0.48",
     "@dynamic-labs-wallet/forward-mpc-client": "0.12.0",
     "@hcaptcha/react-hcaptcha": "1.4.4",
     "@thumbmarkjs/thumbmarkjs": "0.16.0",
@@ -17,17 +17,17 @@
     "yup": "0.32.11",
     "react-international-phone": "4.5.0",
     "bs58": "5.0.0",
-    "@dynamic-labs/assert-package-version": "4.91.1",
-    "@dynamic-labs/iconic": "4.91.1",
-    "@dynamic-labs/locale": "4.91.1",
-    "@dynamic-labs/logger": "4.91.1",
-    "@dynamic-labs/multi-wallet": "4.91.1",
-    "@dynamic-labs/rpc-providers": "4.91.1",
-    "@dynamic-labs/store": "4.91.1",
-    "@dynamic-labs/types": "4.91.1",
-    "@dynamic-labs/utils": "4.91.1",
-    "@dynamic-labs/wallet-book": "4.91.1",
-    "@dynamic-labs/wallet-connector-core": "4.91.1",
+    "@dynamic-labs/assert-package-version": "4.91.2",
+    "@dynamic-labs/iconic": "4.91.2",
+    "@dynamic-labs/locale": "4.91.2",
+    "@dynamic-labs/logger": "4.91.2",
+    "@dynamic-labs/multi-wallet": "4.91.2",
+    "@dynamic-labs/rpc-providers": "4.91.2",
+    "@dynamic-labs/store": "4.91.2",
+    "@dynamic-labs/types": "4.91.2",
+    "@dynamic-labs/utils": "4.91.2",
+    "@dynamic-labs/wallet-book": "4.91.2",
+    "@dynamic-labs/wallet-connector-core": "4.91.2",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/components/SendBalanceForm/SendBalanceForm.cjs

@@ -82,7 +82,7 @@ const getDisplayErrorMessage = (errors, t, field, decimals) => {
     }
     return '';
 };
-const SendBalanceForm = ({ initialValues, onSubmit, decimals = 18, validateAddress = () => true, validateAmount = () => true, currentToken, transaction, tokenBalances, setCurrentToken, isLoading, supportsFeeTokenSelection = false, feeTokenOptions, currentFeeToken, setCurrentFeeToken, }) => {
+const SendBalanceForm = ({ initialValues, onSubmit, decimals = 18, validateAddress = () => true, validateAmount = () => true, currentToken, transaction, tokenBalances, setCurrentToken, isLoading, supportsFeeTokenSelection = false, feeTokenOptions, currentFeeToken, setCurrentFeeToken, fallbackTokenIcon, }) => {
     var _a;
     const { t } = reactI18next.useTranslation();
     const { showFiat } = useInternalDynamicContext.useInternalDynamicContext();
@@ -114,12 +114,34 @@ const SendBalanceForm = ({ initialValues, onSubmit, decimals = 18, validateAddre
         var _a;
         setMergeAction((_a = transaction === null || transaction === void 0 ? void 0 : transaction.getRecordMergeAction) === null || _a === void 0 ? void 0 : _a.call(transaction));
     };
+    // With a mode toggle + per-token pool (Midnight), filter the picker to the
+    // selected pool. Chains without `getTokenPool` show the full list unchanged.
+    const filteredTokenBalances = React.useMemo(() => {
+        if (!hasModes || !selectedModeId || !(transaction === null || transaction === void 0 ? void 0 : transaction.getTokenPool)) {
+            return tokenBalances;
+        }
+        return tokenBalances === null || tokenBalances === void 0 ? void 0 : tokenBalances.filter((token) => { var _a; return ((_a = transaction.getTokenPool) === null || _a === void 0 ? void 0 : _a.call(transaction, token.address)) === selectedModeId; });
+    }, [tokenBalances, hasModes, selectedModeId, transaction]);
     const handleModeChange = (modeId) => {
         var _a;
         setSelectedModeId(modeId);
+        // Set the mode + filter only — do NOT change `currentToken`, which would
+        // trip the Send view's transaction-recreation effect (reload). The picker
+        // resets to a placeholder + gates Preview until a valid token is picked.
         (_a = transaction === null || transaction === void 0 ? void 0 : transaction.setTransactionMode) === null || _a === void 0 ? void 0 : _a.call(transaction, modeId);
         refreshMergeAction();
     };
+    // The selected token must belong to the active pool; while it doesn't, the
+    // picker shows a placeholder and Preview is disabled so we never carry an
+    // incompatible token into a transfer.
+    const selectionMatchesMode = !hasModes ||
+        !selectedModeId ||
+        !(transaction === null || transaction === void 0 ? void 0 : transaction.getTokenPool) ||
+        (currentToken !== undefined &&
+            transaction.getTokenPool(currentToken.address) === selectedModeId);
+    // Token shown as "selected" in the picker — hidden when it doesn't match the
+    // active pool so the row reads as unset rather than showing the wrong token.
+    const pickerToken = selectionMatchesMode ? currentToken : undefined;
     const handleMergeAction = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         if (!mergeAction || isMerging)
             return;
@@ -139,7 +161,10 @@ const SendBalanceForm = ({ initialValues, onSubmit, decimals = 18, validateAddre
         }
     }, [currentToken]);
     const sendBalanceFormValidationSchema = React.useMemo(() => {
-        const decimalsRegex = new RegExp(`^\\d*(\\.\\d{1,${decimals}})?$`);
+        // For 0-decimal tokens (e.g. Midnight shielded tokens) only whole numbers
+        // are valid — a `\d{1,0}` quantifier is an invalid regex and throws, so
+        // build an integer-only pattern in that case.
+        const decimalsRegex = decimals > 0 ? new RegExp(`^\\d*(\\.\\d{1,${decimals}})?$`) : /^\d*$/;
         return yup.object().shape({
             amount: yup.string()
                 .required('required')
@@ -173,7 +198,7 @@ const SendBalanceForm = ({ initialValues, onSubmit, decimals = 18, validateAddre
     }, [decimals, validateAddress, validateAmount]);
     return (jsxRuntime.jsx(formik.Formik, { initialValues: initialValues || sendBalanceFormInitialValues, validationSchema: sendBalanceFormValidationSchema, onSubmit: (values) => onSubmit(values), validateOnChange: false, validateOnBlur: false, children: ({ errors, touched, values, handleChange, setFieldValue, setErrors, handleBlur, setFieldTouched, validateField, }) => {
             var _a;
-            return (jsxRuntime.jsxs(formik.Form, { className: 'send-balance-form', children: [jsxRuntime.jsxs("div", { className: 'send-balance-page-layout__balance-container', children: [jsxRuntime.jsx(FormFieldLabel.FormFieldLabel, { copykey: 'dyn_send_transaction.data.select_token', children: t('dyn_send_transaction.data.select_token') }), jsxRuntime.jsx(TokensBalanceDropdown.TokensBalanceDropdown, { tokenBalances: tokenBalances !== null && tokenBalances !== void 0 ? tokenBalances : (currentToken && [currentToken]), currentToken: currentToken, setCurrentToken: setCurrentToken, isLoading: isLoading, setFieldValue: setFieldValue, setErrors: setErrors })] }), jsxRuntime.jsxs("div", { className: 'send-balance-form__amount-container', children: [jsxRuntime.jsx(formik.Field, { variant: 'regular', className: `send-balance-form__amount-container__field ${showFiat ? 'fiat' : ''}`, name: 'amount', id: 'amount', onChange: (e) => {
+            return (jsxRuntime.jsxs(formik.Form, { className: 'send-balance-form', children: [jsxRuntime.jsxs("div", { className: 'send-balance-page-layout__balance-container', children: [jsxRuntime.jsx(FormFieldLabel.FormFieldLabel, { copykey: 'dyn_send_transaction.data.select_token', children: t('dyn_send_transaction.data.select_token') }), jsxRuntime.jsx(TokensBalanceDropdown.TokensBalanceDropdown, { tokenBalances: filteredTokenBalances !== null && filteredTokenBalances !== void 0 ? filteredTokenBalances : (pickerToken && [pickerToken]), currentToken: pickerToken, setCurrentToken: setCurrentToken, isLoading: isLoading, setFieldValue: setFieldValue, setErrors: setErrors, fallbackTokenIcon: fallbackTokenIcon, placeholder: t('dyn_send_transaction.data.select_token') })] }), jsxRuntime.jsxs("div", { className: 'send-balance-form__amount-container', children: [jsxRuntime.jsx(formik.Field, { variant: 'regular', className: `send-balance-form__amount-container__field ${showFiat ? 'fiat' : ''}`, name: 'amount', id: 'amount', onChange: (e) => {
                                     const newValue = e.target.value;
                                     // Matching 123, 123.45, .45, 123.
                                     if (newValue !== '' && !/^(?:\d+|\d*\.\d*|)$/.test(newValue)) {
@@ -200,8 +225,8 @@ const SendBalanceForm = ({ initialValues, onSubmit, decimals = 18, validateAddre
                                 }, placeholder: t('dyn_send_transaction.data.amount.placeholder'), as: Input.Input, error: errors['amount'], copykey: 'dyn_send_transaction.data.amount.label', message: touched['amount'] &&
                                     getDisplayErrorMessage(errors, t, 'amount', decimals), style: {
                                     paddingLeft: `${leftSymbolPadding}px`,
-                                } }), jsxRuntime.jsx("div", { className: 'send-balance-form__amount-container__floating_value', ref: floatingValueRef, children: jsxRuntime.jsx(Typography.Typography, { variant: 'title', weight: 'regular', color: 'secondary', children: currentToken === null || currentToken === void 0 ? void 0 : currentToken.symbol }) }), jsxRuntime.jsx("div", { className: 'send-balance-form__amount-container__balance', children: showFiat && !Number.isNaN(amount) && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_mini', weight: 'bold', color: 'secondary', children: "$" }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_mini', weight: 'regular', color: 'secondary', children: utils.getDisplayFiatPrice(amount, currentToken) })] })) })] }), jsxRuntime.jsx(Typography.Typography, { className: 'send-balance-form__amount_available', variant: 'body_small', weight: 'regular', color: 'secondary', as: 'div', children: jsxRuntime.jsxs("div", { style: { display: 'flex', gap: '0.225rem' }, children: [jsxRuntime.jsx(Typography.Typography, { className: 'send-balance-form__amount_available__line', variant: 'body_small', weight: 'bold', color: 'primary', as: 'div', children: (_a = currentToken === null || currentToken === void 0 ? void 0 : currentToken.balance) !== null && _a !== void 0 ? _a : 0 }), t('dyn_send_transaction.data.symbol_available', {
-                                    symbol: currentToken === null || currentToken === void 0 ? void 0 : currentToken.symbol,
+                                } }), jsxRuntime.jsx("div", { className: 'send-balance-form__amount-container__floating_value', ref: floatingValueRef, children: jsxRuntime.jsx(Typography.Typography, { variant: 'title', weight: 'regular', color: 'secondary', children: currentToken === null || currentToken === void 0 ? void 0 : currentToken.symbol }) }), jsxRuntime.jsx("div", { className: 'send-balance-form__amount-container__balance', children: showFiat && !Number.isNaN(amount) && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_mini', weight: 'bold', color: 'secondary', children: "$" }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_mini', weight: 'regular', color: 'secondary', children: utils.getDisplayFiatPrice(amount, currentToken) })] })) })] }), jsxRuntime.jsx(Typography.Typography, { className: 'send-balance-form__amount_available', variant: 'body_small', weight: 'regular', color: 'secondary', as: 'div', children: jsxRuntime.jsxs("div", { style: { display: 'flex', gap: '0.225rem' }, children: [jsxRuntime.jsx(Typography.Typography, { className: 'send-balance-form__amount_available__line', variant: 'body_small', weight: 'bold', color: 'primary', as: 'div', children: (_a = pickerToken === null || pickerToken === void 0 ? void 0 : pickerToken.balance) !== null && _a !== void 0 ? _a : 0 }), t('dyn_send_transaction.data.symbol_available', {
+                                    symbol: pickerToken === null || pickerToken === void 0 ? void 0 : pickerToken.symbol,
                                 })] }) }), supportsFeeTokenSelection &&
                         feeTokenOptions &&
                         feeTokenOptions.length > 0 &&
@@ -215,7 +240,10 @@ const SendBalanceForm = ({ initialValues, onSubmit, decimals = 18, validateAddre
                             refreshMergeAction();
                         } }), hasModes && (jsxRuntime.jsx(TransactionModeSegmentedControl.TransactionModeSegmentedControl, { options: transactionModes, selectedId: selectedModeId, onChange: handleModeChange, disabled: isMerging })), mergeAction && (jsxRuntime.jsx("div", { className: 'send-balance-form__inline-action', children: jsxRuntime.jsx(Alert.Alert, { icon: 'error', variant: 'warning', children: jsxRuntime.jsxs("div", { className: 'send-balance-form__inline-action-content', children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', weight: 'regular', children: mergeAction.message }), jsxRuntime.jsx(TypographyButton.TypographyButton, { dataTestId: 'sendBalanceFormMergeRecordsButton', type: 'button', buttonVariant: 'secondary', buttonPadding: 'small', onClick: handleMergeAction, disabled: isMerging, children: isMerging
                                             ? t('dyn_send_transaction.merging', 'Merging…')
-                                            : mergeAction.actionLabel })] }) }) })), jsxRuntime.jsx(TypographyButton.TypographyButton, { dataTestId: 'sendBalanceFormSubmitButton', expanded: true, type: 'submit', buttonVariant: 'primary', buttonPadding: 'small', buttonClassName: 'send-balance-form__button', copykey: 'dyn_send_transaction.preview_transaction', disabled: !modeReady || isMerging || Boolean(mergeAction), children: t('dyn_send_transaction.preview_transaction') })] }));
+                                            : mergeAction.actionLabel })] }) }) })), jsxRuntime.jsx(TypographyButton.TypographyButton, { dataTestId: 'sendBalanceFormSubmitButton', expanded: true, type: 'submit', buttonVariant: 'primary', buttonPadding: 'small', buttonClassName: 'send-balance-form__button', copykey: 'dyn_send_transaction.preview_transaction', disabled: !modeReady ||
+                            !selectionMatchesMode ||
+                            isMerging ||
+                            Boolean(mergeAction), children: t('dyn_send_transaction.preview_transaction') })] }));
         } }));
 };
 

package/src/lib/components/SendBalanceForm/SendBalanceForm.d.ts

@@ -1,4 +1,4 @@
-import { Dispatch, FC, SetStateAction } from 'react';
+import { Dispatch, FC, type ReactNode, SetStateAction } from 'react';
 import { TokenBalance } from '@dynamic-labs/sdk-api-core';
 import { IUITransaction } from '@dynamic-labs/types';
 export type SendBalanceFormValues = {
@@ -20,5 +20,6 @@ export type Props = {
     feeTokenOptions?: TokenBalance[];
     currentFeeToken?: TokenBalance;
     setCurrentFeeToken?: Dispatch<SetStateAction<TokenBalance | undefined>>;
+    fallbackTokenIcon?: ReactNode;
 };
 export declare const SendBalanceForm: FC<Props>;

package/src/lib/components/SendBalanceForm/SendBalanceForm.js

@@ -1,7 +1,7 @@
 'use client'
 import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { useRef, useState, useEffect, useMemo } from 'react';
+import { useRef, useState, useMemo, useEffect } from 'react';
 import { Formik, Form, Field } from 'formik';
 import { useTranslation } from 'react-i18next';
 import { object, string } from 'yup';
@@ -78,7 +78,7 @@ const getDisplayErrorMessage = (errors, t, field, decimals) => {
     }
     return '';
 };
-const SendBalanceForm = ({ initialValues, onSubmit, decimals = 18, validateAddress = () => true, validateAmount = () => true, currentToken, transaction, tokenBalances, setCurrentToken, isLoading, supportsFeeTokenSelection = false, feeTokenOptions, currentFeeToken, setCurrentFeeToken, }) => {
+const SendBalanceForm = ({ initialValues, onSubmit, decimals = 18, validateAddress = () => true, validateAmount = () => true, currentToken, transaction, tokenBalances, setCurrentToken, isLoading, supportsFeeTokenSelection = false, feeTokenOptions, currentFeeToken, setCurrentFeeToken, fallbackTokenIcon, }) => {
     var _a;
     const { t } = useTranslation();
     const { showFiat } = useInternalDynamicContext();
@@ -110,12 +110,34 @@ const SendBalanceForm = ({ initialValues, onSubmit, decimals = 18, validateAddre
         var _a;
         setMergeAction((_a = transaction === null || transaction === void 0 ? void 0 : transaction.getRecordMergeAction) === null || _a === void 0 ? void 0 : _a.call(transaction));
     };
+    // With a mode toggle + per-token pool (Midnight), filter the picker to the
+    // selected pool. Chains without `getTokenPool` show the full list unchanged.
+    const filteredTokenBalances = useMemo(() => {
+        if (!hasModes || !selectedModeId || !(transaction === null || transaction === void 0 ? void 0 : transaction.getTokenPool)) {
+            return tokenBalances;
+        }
+        return tokenBalances === null || tokenBalances === void 0 ? void 0 : tokenBalances.filter((token) => { var _a; return ((_a = transaction.getTokenPool) === null || _a === void 0 ? void 0 : _a.call(transaction, token.address)) === selectedModeId; });
+    }, [tokenBalances, hasModes, selectedModeId, transaction]);
     const handleModeChange = (modeId) => {
         var _a;
         setSelectedModeId(modeId);
+        // Set the mode + filter only — do NOT change `currentToken`, which would
+        // trip the Send view's transaction-recreation effect (reload). The picker
+        // resets to a placeholder + gates Preview until a valid token is picked.
         (_a = transaction === null || transaction === void 0 ? void 0 : transaction.setTransactionMode) === null || _a === void 0 ? void 0 : _a.call(transaction, modeId);
         refreshMergeAction();
     };
+    // The selected token must belong to the active pool; while it doesn't, the
+    // picker shows a placeholder and Preview is disabled so we never carry an
+    // incompatible token into a transfer.
+    const selectionMatchesMode = !hasModes ||
+        !selectedModeId ||
+        !(transaction === null || transaction === void 0 ? void 0 : transaction.getTokenPool) ||
+        (currentToken !== undefined &&
+            transaction.getTokenPool(currentToken.address) === selectedModeId);
+    // Token shown as "selected" in the picker — hidden when it doesn't match the
+    // active pool so the row reads as unset rather than showing the wrong token.
+    const pickerToken = selectionMatchesMode ? currentToken : undefined;
     const handleMergeAction = () => __awaiter(void 0, void 0, void 0, function* () {
         if (!mergeAction || isMerging)
             return;
@@ -135,7 +157,10 @@ const SendBalanceForm = ({ initialValues, onSubmit, decimals = 18, validateAddre
         }
     }, [currentToken]);
     const sendBalanceFormValidationSchema = useMemo(() => {
-        const decimalsRegex = new RegExp(`^\\d*(\\.\\d{1,${decimals}})?$`);
+        // For 0-decimal tokens (e.g. Midnight shielded tokens) only whole numbers
+        // are valid — a `\d{1,0}` quantifier is an invalid regex and throws, so
+        // build an integer-only pattern in that case.
+        const decimalsRegex = decimals > 0 ? new RegExp(`^\\d*(\\.\\d{1,${decimals}})?$`) : /^\d*$/;
         return object().shape({
             amount: string()
                 .required('required')
@@ -169,7 +194,7 @@ const SendBalanceForm = ({ initialValues, onSubmit, decimals = 18, validateAddre
     }, [decimals, validateAddress, validateAmount]);
     return (jsx(Formik, { initialValues: initialValues || sendBalanceFormInitialValues, validationSchema: sendBalanceFormValidationSchema, onSubmit: (values) => onSubmit(values), validateOnChange: false, validateOnBlur: false, children: ({ errors, touched, values, handleChange, setFieldValue, setErrors, handleBlur, setFieldTouched, validateField, }) => {
             var _a;
-            return (jsxs(Form, { className: 'send-balance-form', children: [jsxs("div", { className: 'send-balance-page-layout__balance-container', children: [jsx(FormFieldLabel, { copykey: 'dyn_send_transaction.data.select_token', children: t('dyn_send_transaction.data.select_token') }), jsx(TokensBalanceDropdown, { tokenBalances: tokenBalances !== null && tokenBalances !== void 0 ? tokenBalances : (currentToken && [currentToken]), currentToken: currentToken, setCurrentToken: setCurrentToken, isLoading: isLoading, setFieldValue: setFieldValue, setErrors: setErrors })] }), jsxs("div", { className: 'send-balance-form__amount-container', children: [jsx(Field, { variant: 'regular', className: `send-balance-form__amount-container__field ${showFiat ? 'fiat' : ''}`, name: 'amount', id: 'amount', onChange: (e) => {
+            return (jsxs(Form, { className: 'send-balance-form', children: [jsxs("div", { className: 'send-balance-page-layout__balance-container', children: [jsx(FormFieldLabel, { copykey: 'dyn_send_transaction.data.select_token', children: t('dyn_send_transaction.data.select_token') }), jsx(TokensBalanceDropdown, { tokenBalances: filteredTokenBalances !== null && filteredTokenBalances !== void 0 ? filteredTokenBalances : (pickerToken && [pickerToken]), currentToken: pickerToken, setCurrentToken: setCurrentToken, isLoading: isLoading, setFieldValue: setFieldValue, setErrors: setErrors, fallbackTokenIcon: fallbackTokenIcon, placeholder: t('dyn_send_transaction.data.select_token') })] }), jsxs("div", { className: 'send-balance-form__amount-container', children: [jsx(Field, { variant: 'regular', className: `send-balance-form__amount-container__field ${showFiat ? 'fiat' : ''}`, name: 'amount', id: 'amount', onChange: (e) => {
                                     const newValue = e.target.value;
                                     // Matching 123, 123.45, .45, 123.
                                     if (newValue !== '' && !/^(?:\d+|\d*\.\d*|)$/.test(newValue)) {
@@ -196,8 +221,8 @@ const SendBalanceForm = ({ initialValues, onSubmit, decimals = 18, validateAddre
                                 }, placeholder: t('dyn_send_transaction.data.amount.placeholder'), as: Input, error: errors['amount'], copykey: 'dyn_send_transaction.data.amount.label', message: touched['amount'] &&
                                     getDisplayErrorMessage(errors, t, 'amount', decimals), style: {
                                     paddingLeft: `${leftSymbolPadding}px`,
-                                } }), jsx("div", { className: 'send-balance-form__amount-container__floating_value', ref: floatingValueRef, children: jsx(Typography, { variant: 'title', weight: 'regular', color: 'secondary', children: currentToken === null || currentToken === void 0 ? void 0 : currentToken.symbol }) }), jsx("div", { className: 'send-balance-form__amount-container__balance', children: showFiat && !Number.isNaN(amount) && (jsxs(Fragment, { children: [jsx(Typography, { variant: 'body_mini', weight: 'bold', color: 'secondary', children: "$" }), jsx(Typography, { variant: 'body_mini', weight: 'regular', color: 'secondary', children: getDisplayFiatPrice(amount, currentToken) })] })) })] }), jsx(Typography, { className: 'send-balance-form__amount_available', variant: 'body_small', weight: 'regular', color: 'secondary', as: 'div', children: jsxs("div", { style: { display: 'flex', gap: '0.225rem' }, children: [jsx(Typography, { className: 'send-balance-form__amount_available__line', variant: 'body_small', weight: 'bold', color: 'primary', as: 'div', children: (_a = currentToken === null || currentToken === void 0 ? void 0 : currentToken.balance) !== null && _a !== void 0 ? _a : 0 }), t('dyn_send_transaction.data.symbol_available', {
-                                    symbol: currentToken === null || currentToken === void 0 ? void 0 : currentToken.symbol,
+                                } }), jsx("div", { className: 'send-balance-form__amount-container__floating_value', ref: floatingValueRef, children: jsx(Typography, { variant: 'title', weight: 'regular', color: 'secondary', children: currentToken === null || currentToken === void 0 ? void 0 : currentToken.symbol }) }), jsx("div", { className: 'send-balance-form__amount-container__balance', children: showFiat && !Number.isNaN(amount) && (jsxs(Fragment, { children: [jsx(Typography, { variant: 'body_mini', weight: 'bold', color: 'secondary', children: "$" }), jsx(Typography, { variant: 'body_mini', weight: 'regular', color: 'secondary', children: getDisplayFiatPrice(amount, currentToken) })] })) })] }), jsx(Typography, { className: 'send-balance-form__amount_available', variant: 'body_small', weight: 'regular', color: 'secondary', as: 'div', children: jsxs("div", { style: { display: 'flex', gap: '0.225rem' }, children: [jsx(Typography, { className: 'send-balance-form__amount_available__line', variant: 'body_small', weight: 'bold', color: 'primary', as: 'div', children: (_a = pickerToken === null || pickerToken === void 0 ? void 0 : pickerToken.balance) !== null && _a !== void 0 ? _a : 0 }), t('dyn_send_transaction.data.symbol_available', {
+                                    symbol: pickerToken === null || pickerToken === void 0 ? void 0 : pickerToken.symbol,
                                 })] }) }), supportsFeeTokenSelection &&
                         feeTokenOptions &&
                         feeTokenOptions.length > 0 &&
@@ -211,7 +236,10 @@ const SendBalanceForm = ({ initialValues, onSubmit, decimals = 18, validateAddre
                             refreshMergeAction();
                         } }), hasModes && (jsx(TransactionModeSegmentedControl, { options: transactionModes, selectedId: selectedModeId, onChange: handleModeChange, disabled: isMerging })), mergeAction && (jsx("div", { className: 'send-balance-form__inline-action', children: jsx(Alert, { icon: 'error', variant: 'warning', children: jsxs("div", { className: 'send-balance-form__inline-action-content', children: [jsx(Typography, { variant: 'body_small', weight: 'regular', children: mergeAction.message }), jsx(TypographyButton, { dataTestId: 'sendBalanceFormMergeRecordsButton', type: 'button', buttonVariant: 'secondary', buttonPadding: 'small', onClick: handleMergeAction, disabled: isMerging, children: isMerging
                                             ? t('dyn_send_transaction.merging', 'Merging…')
-                                            : mergeAction.actionLabel })] }) }) })), jsx(TypographyButton, { dataTestId: 'sendBalanceFormSubmitButton', expanded: true, type: 'submit', buttonVariant: 'primary', buttonPadding: 'small', buttonClassName: 'send-balance-form__button', copykey: 'dyn_send_transaction.preview_transaction', disabled: !modeReady || isMerging || Boolean(mergeAction), children: t('dyn_send_transaction.preview_transaction') })] }));
+                                            : mergeAction.actionLabel })] }) }) })), jsx(TypographyButton, { dataTestId: 'sendBalanceFormSubmitButton', expanded: true, type: 'submit', buttonVariant: 'primary', buttonPadding: 'small', buttonClassName: 'send-balance-form__button', copykey: 'dyn_send_transaction.preview_transaction', disabled: !modeReady ||
+                            !selectionMatchesMode ||
+                            isMerging ||
+                            Boolean(mergeAction), children: t('dyn_send_transaction.preview_transaction') })] }));
         } }));
 };
 

package/src/lib/components/SendBalancePageLayout/SendBalancePageLayout.cjs

@@ -126,7 +126,7 @@ require('../../store/state/multichainBalances.cjs');
 require('@dynamic-labs/store');
 require('../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 
-const SendBalancePageLayout = ({ error, onClickClose, onClickBack, onSubmit, displayPoweredByDynamicFooter = false, transaction, networkCurrencyDecimals, tokenBalances, currentToken, setCurrentToken, isLoading, isNativeToken, }) => {
+const SendBalancePageLayout = ({ error, onClickClose, onClickBack, onSubmit, displayPoweredByDynamicFooter = false, transaction, networkIcon, networkCurrencyDecimals, tokenBalances, currentToken, setCurrentToken, isLoading, isNativeToken, }) => {
     var _a, _b, _c;
     const { t } = reactI18next.useTranslation();
     const { primaryWallet, projectSettings, overrides } = useInternalDynamicContext.useInternalDynamicContext();
@@ -254,7 +254,7 @@ const SendBalancePageLayout = ({ error, onClickClose, onClickBack, onSubmit, dis
                                 return false;
                             const amount = Number(transaction.parseNonNativeToken(amountText, (currentToken === null || currentToken === void 0 ? void 0 : currentToken.decimals) || 18));
                             return amount <= currentToken.rawBalance;
-                        }, currentToken: currentToken, transaction: transaction }), displayPoweredByDynamicFooter && (jsxRuntime.jsx(PoweredByDynamic.PoweredByDynamic, { classNameRoot: 'send-balance-page-layout__footer' }))] })] }));
+                        }, currentToken: currentToken, transaction: transaction, fallbackTokenIcon: networkIcon }), displayPoweredByDynamicFooter && (jsxRuntime.jsx(PoweredByDynamic.PoweredByDynamic, { classNameRoot: 'send-balance-page-layout__footer' }))] })] }));
 };
 
 exports.SendBalancePageLayout = SendBalancePageLayout;

package/src/lib/components/SendBalancePageLayout/SendBalancePageLayout.js

@@ -122,7 +122,7 @@ import '../../store/state/multichainBalances.js';
 import '@dynamic-labs/store';
 import '../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 
-const SendBalancePageLayout = ({ error, onClickClose, onClickBack, onSubmit, displayPoweredByDynamicFooter = false, transaction, networkCurrencyDecimals, tokenBalances, currentToken, setCurrentToken, isLoading, isNativeToken, }) => {
+const SendBalancePageLayout = ({ error, onClickClose, onClickBack, onSubmit, displayPoweredByDynamicFooter = false, transaction, networkIcon, networkCurrencyDecimals, tokenBalances, currentToken, setCurrentToken, isLoading, isNativeToken, }) => {
     var _a, _b, _c;
     const { t } = useTranslation();
     const { primaryWallet, projectSettings, overrides } = useInternalDynamicContext();
@@ -250,7 +250,7 @@ const SendBalancePageLayout = ({ error, onClickClose, onClickBack, onSubmit, dis
                                 return false;
                             const amount = Number(transaction.parseNonNativeToken(amountText, (currentToken === null || currentToken === void 0 ? void 0 : currentToken.decimals) || 18));
                             return amount <= currentToken.rawBalance;
-                        }, currentToken: currentToken, transaction: transaction }), displayPoweredByDynamicFooter && (jsx(PoweredByDynamic, { classNameRoot: 'send-balance-page-layout__footer' }))] })] }));
+                        }, currentToken: currentToken, transaction: transaction, fallbackTokenIcon: networkIcon }), displayPoweredByDynamicFooter && (jsx(PoweredByDynamic, { classNameRoot: 'send-balance-page-layout__footer' }))] })] }));
 };
 
 export { SendBalancePageLayout };

package/src/lib/components/SendBalancePageLayout/components/TokensBalanceDropdown/TokensBalanceDropdown.cjs

@@ -121,7 +121,8 @@ require('../../../OverlayCard/OverlayCard.cjs');
 require('../../../Popper/Popper/Popper.cjs');
 require('../../../Popper/PopperContext/PopperContext.cjs');
 
-const TokensBalanceDropdown = ({ tokenBalances, currentToken, setCurrentToken, isLoading, setFieldValue, setErrors, }) => {
+const TokensBalanceDropdown = ({ tokenBalances, currentToken, setCurrentToken, isLoading, setFieldValue, setErrors, fallbackTokenIcon, placeholder, }) => {
+    var _a;
     const { t } = reactI18next.useTranslation();
     const [isDropdownOpen, setIsDropdownOpen] = React.useState(false);
     // Hide rows the user can't actually send from: anonymous tokens (no
@@ -155,7 +156,7 @@ const TokensBalanceDropdown = ({ tokenBalances, currentToken, setCurrentToken, i
             });
             [balance, decimals] = results.map((v) => Number(v.result));
         }
-        catch (_a) {
+        catch (_b) {
             if (publicClient.readContract) {
                 const [balanceResult, decimalsResult] = yield Promise.all([
                     publicClient.readContract(Object.assign(Object.assign({}, erc20Contract), { args: [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address], functionName: 'balanceOf' })),
@@ -183,14 +184,14 @@ const TokensBalanceDropdown = ({ tokenBalances, currentToken, setCurrentToken, i
         }
     });
     const handleTokenClick = (selectedTokenName) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _b, _c;
-        const selectedToken = (_b = tokenBalances === null || tokenBalances === void 0 ? void 0 : tokenBalances.find((t) => t.name === selectedTokenName)) !== null && _b !== void 0 ? _b : undefined;
+        var _c, _d;
+        const selectedToken = (_c = tokenBalances === null || tokenBalances === void 0 ? void 0 : tokenBalances.find((t) => t.name === selectedTokenName)) !== null && _c !== void 0 ? _c : undefined;
         // we dont need to refetch solana balances because we simulate before sending
         if ((selectedToken === null || selectedToken === void 0 ? void 0 : selectedToken.address) && (selectedToken === null || selectedToken === void 0 ? void 0 : selectedToken.address.startsWith('0x'))) {
             fetchTokenData(selectedToken);
         }
         if (selectedToken) {
-            if (tokenBalances && ((_c = tokenBalances[0]) === null || _c === void 0 ? void 0 : _c.price))
+            if (tokenBalances && ((_d = tokenBalances[0]) === null || _d === void 0 ? void 0 : _d.price))
                 sendBalances.setSendBalanceVariable('nativePrice', tokenBalances[0].price);
             setCurrentToken(selectedToken);
             setFieldValue('amount', '');
@@ -204,8 +205,8 @@ const TokensBalanceDropdown = ({ tokenBalances, currentToken, setCurrentToken, i
     }
     const tokenLogo = (token, size) => (jsxRuntime.jsx(Image.Image, { src: token === null || token === void 0 ? void 0 : token.logoURI, alt: token === null || token === void 0 ? void 0 : token.name, className: 'token-balance-item__icon', dataTestId: 'token-balance-item-icon', fallback: 
         // eslint-disable-next-line react/jsx-wrap-multilines
-        jsxRuntime.jsx("div", { className: 'token-balance-item__skeleton-icon', "data-testid": 'token-balance-item__skeleton-icon', style: { height: `${size}px`, width: `${size}px` } }) }));
-    return (jsxRuntime.jsxs("div", { className: 'tokens-balance-dropdown', ref: anchorRef, onClick: () => setIsDropdownOpen(!isDropdownOpen), "data-testid": 'tokens-balance-dropdown', children: [!isLoading && (jsxRuntime.jsxs("div", { className: 'tokens-balance-dropdown__selected', children: [tokenLogo(currentToken, '20'), jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'primary', children: currentToken === null || currentToken === void 0 ? void 0 : currentToken.name }), jsxRuntime.jsx(Icon.Icon, { color: 'text-primary', size: 'small', className: classNames.classNames('evm-network-control__arrow-icon', {
+        fallbackTokenIcon !== null && fallbackTokenIcon !== void 0 ? fallbackTokenIcon : (jsxRuntime.jsx("div", { className: 'token-balance-item__skeleton-icon', "data-testid": 'token-balance-item__skeleton-icon', style: { height: `${size}px`, width: `${size}px` } })) }));
+    return (jsxRuntime.jsxs("div", { className: 'tokens-balance-dropdown', ref: anchorRef, onClick: () => setIsDropdownOpen(!isDropdownOpen), "data-testid": 'tokens-balance-dropdown', children: [!isLoading && (jsxRuntime.jsxs("div", { className: 'tokens-balance-dropdown__selected', children: [tokenLogo(currentToken, '20'), jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'primary', children: (_a = currentToken === null || currentToken === void 0 ? void 0 : currentToken.name) !== null && _a !== void 0 ? _a : placeholder }), jsxRuntime.jsx(Icon.Icon, { color: 'text-primary', size: 'small', className: classNames.classNames('evm-network-control__arrow-icon', {
                             'evm-network-control__arrow-icon--active': isDropdownOpen,
                         }), children: jsxRuntime.jsx(stroke.ReactComponent, {}) })] })), jsxRuntime.jsx(MenuList.MenuList, { className: 'tokens-balance-dropdown__menu_list', isOpen: isDropdownOpen, popperProps: {
                     anchorOrigin: 'bottom-left',

package/src/lib/components/SendBalancePageLayout/components/TokensBalanceDropdown/TokensBalanceDropdown.d.ts

@@ -1,4 +1,4 @@
-import { Dispatch, FC, SetStateAction } from 'react';
+import { Dispatch, FC, type ReactNode, SetStateAction } from 'react';
 import { TokenBalance } from '@dynamic-labs/sdk-api-core';
 type TokensBalanceDropdownProps = {
     tokenBalances: TokenBalance[] | undefined;
@@ -7,6 +7,8 @@ type TokensBalanceDropdownProps = {
     isLoading?: boolean;
     setFieldValue: (field: string, value: string) => void;
     setErrors: (errors: any) => void;
+    fallbackTokenIcon?: ReactNode;
+    placeholder?: string;
 };
 export declare const TokensBalanceDropdown: FC<TokensBalanceDropdownProps>;
 export {};

package/src/lib/components/SendBalancePageLayout/components/TokensBalanceDropdown/TokensBalanceDropdown.js

@@ -117,7 +117,8 @@ import '../../../OverlayCard/OverlayCard.js';
 import '../../../Popper/Popper/Popper.js';
 import '../../../Popper/PopperContext/PopperContext.js';
 
-const TokensBalanceDropdown = ({ tokenBalances, currentToken, setCurrentToken, isLoading, setFieldValue, setErrors, }) => {
+const TokensBalanceDropdown = ({ tokenBalances, currentToken, setCurrentToken, isLoading, setFieldValue, setErrors, fallbackTokenIcon, placeholder, }) => {
+    var _a;
     const { t } = useTranslation();
     const [isDropdownOpen, setIsDropdownOpen] = useState(false);
     // Hide rows the user can't actually send from: anonymous tokens (no
@@ -151,7 +152,7 @@ const TokensBalanceDropdown = ({ tokenBalances, currentToken, setCurrentToken, i
             });
             [balance, decimals] = results.map((v) => Number(v.result));
         }
-        catch (_a) {
+        catch (_b) {
             if (publicClient.readContract) {
                 const [balanceResult, decimalsResult] = yield Promise.all([
                     publicClient.readContract(Object.assign(Object.assign({}, erc20Contract), { args: [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address], functionName: 'balanceOf' })),
@@ -179,14 +180,14 @@ const TokensBalanceDropdown = ({ tokenBalances, currentToken, setCurrentToken, i
         }
     });
     const handleTokenClick = (selectedTokenName) => __awaiter(void 0, void 0, void 0, function* () {
-        var _b, _c;
-        const selectedToken = (_b = tokenBalances === null || tokenBalances === void 0 ? void 0 : tokenBalances.find((t) => t.name === selectedTokenName)) !== null && _b !== void 0 ? _b : undefined;
+        var _c, _d;
+        const selectedToken = (_c = tokenBalances === null || tokenBalances === void 0 ? void 0 : tokenBalances.find((t) => t.name === selectedTokenName)) !== null && _c !== void 0 ? _c : undefined;
         // we dont need to refetch solana balances because we simulate before sending
         if ((selectedToken === null || selectedToken === void 0 ? void 0 : selectedToken.address) && (selectedToken === null || selectedToken === void 0 ? void 0 : selectedToken.address.startsWith('0x'))) {
             fetchTokenData(selectedToken);
         }
         if (selectedToken) {
-            if (tokenBalances && ((_c = tokenBalances[0]) === null || _c === void 0 ? void 0 : _c.price))
+            if (tokenBalances && ((_d = tokenBalances[0]) === null || _d === void 0 ? void 0 : _d.price))
                 setSendBalanceVariable('nativePrice', tokenBalances[0].price);
             setCurrentToken(selectedToken);
             setFieldValue('amount', '');
@@ -200,8 +201,8 @@ const TokensBalanceDropdown = ({ tokenBalances, currentToken, setCurrentToken, i
     }
     const tokenLogo = (token, size) => (jsx(Image, { src: token === null || token === void 0 ? void 0 : token.logoURI, alt: token === null || token === void 0 ? void 0 : token.name, className: 'token-balance-item__icon', dataTestId: 'token-balance-item-icon', fallback: 
         // eslint-disable-next-line react/jsx-wrap-multilines
-        jsx("div", { className: 'token-balance-item__skeleton-icon', "data-testid": 'token-balance-item__skeleton-icon', style: { height: `${size}px`, width: `${size}px` } }) }));
-    return (jsxs("div", { className: 'tokens-balance-dropdown', ref: anchorRef, onClick: () => setIsDropdownOpen(!isDropdownOpen), "data-testid": 'tokens-balance-dropdown', children: [!isLoading && (jsxs("div", { className: 'tokens-balance-dropdown__selected', children: [tokenLogo(currentToken, '20'), jsx(Typography, { variant: 'body_normal', color: 'primary', children: currentToken === null || currentToken === void 0 ? void 0 : currentToken.name }), jsx(Icon, { color: 'text-primary', size: 'small', className: classNames('evm-network-control__arrow-icon', {
+        fallbackTokenIcon !== null && fallbackTokenIcon !== void 0 ? fallbackTokenIcon : (jsx("div", { className: 'token-balance-item__skeleton-icon', "data-testid": 'token-balance-item__skeleton-icon', style: { height: `${size}px`, width: `${size}px` } })) }));
+    return (jsxs("div", { className: 'tokens-balance-dropdown', ref: anchorRef, onClick: () => setIsDropdownOpen(!isDropdownOpen), "data-testid": 'tokens-balance-dropdown', children: [!isLoading && (jsxs("div", { className: 'tokens-balance-dropdown__selected', children: [tokenLogo(currentToken, '20'), jsx(Typography, { variant: 'body_normal', color: 'primary', children: (_a = currentToken === null || currentToken === void 0 ? void 0 : currentToken.name) !== null && _a !== void 0 ? _a : placeholder }), jsx(Icon, { color: 'text-primary', size: 'small', className: classNames('evm-network-control__arrow-icon', {
                             'evm-network-control__arrow-icon--active': isDropdownOpen,
                         }), children: jsx(SvgStroke, {}) })] })), jsx(MenuList, { className: 'tokens-balance-dropdown__menu_list', isOpen: isDropdownOpen, popperProps: {
                     anchorOrigin: 'bottom-left',

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,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,