@dynamic-labs/sdk-react-core 4.92.2 → 4.92.4

package/src/lib/widgets/DynamicWidget/components/ActiveWalletInformation/ActiveMidnightWalletAddresses/ActiveMidnightWalletAddresses.js

@@ -124,12 +124,26 @@ const MIDNIGHT_ADDRESS_TYPE_UNSHIELDED = 'midnight_unshielded';
 const MIDNIGHT_ADDRESS_TYPE_DUST = 'midnight_dust';
 const MIDNIGHT_ADDRESS_TYPE_SHIELDED = 'midnight_shielded';
 /**
- * Gets a Midnight address from the wallet's additional addresses by type.
+ * Gets a Midnight address from the wallet's additional addresses by type,
+ * preferring the variant tagged with the selected network.
+ *
+ * Midnight stores one address per (type, network) — e.g. unshielded has both a
+ * mainnet and a preview encoding of the same key. When the user switches the
+ * network picker we surface the address tagged with that network. Legacy wallets
+ * created before per-network tagging have no `network`, so we fall back to the
+ * first address of the requested type.
+ *
  * @param type - The address type to find
+ * @param network - The selected network tag ('mainnet' | 'preview')
  * @param wallet - The wallet containing additional addresses
  * @returns The address string or undefined if not found
  */
-const getMidnightAddressByType = (type, wallet) => { var _a, _b; return (_b = (_a = wallet === null || wallet === void 0 ? void 0 : wallet.additionalAddresses) === null || _a === void 0 ? void 0 : _a.find((addr) => addr.type === type)) === null || _b === void 0 ? void 0 : _b.address; };
+const getMidnightAddressByType = (type, network, wallet) => {
+    var _a, _b, _c;
+    const matches = (_b = (_a = wallet === null || wallet === void 0 ? void 0 : wallet.additionalAddresses) === null || _a === void 0 ? void 0 : _a.filter((addr) => addr.type === type)) !== null && _b !== void 0 ? _b : [];
+    const networkMatch = matches.find((addr) => addr.network === network);
+    return (_c = (networkMatch !== null && networkMatch !== void 0 ? networkMatch : matches[0])) === null || _c === void 0 ? void 0 : _c.address;
+};
 /**
  * Component for displaying Midnight wallet addresses.
  * Midnight supports multiple address types:
@@ -137,12 +151,12 @@ const getMidnightAddressByType = (type, wallet) => { var _a, _b; return (_b = (_
  * - Dust: For gas/fee management
  * - Shielded: For private transfers (Phase 2)
  */
-const ActiveMidnightWalletAddresses = ({ menuOption, wallet, }) => {
+const ActiveMidnightWalletAddresses = ({ menuOption, wallet, network, }) => {
     var _a;
     const { t } = useTranslation();
-    const unshieldedAddress = (_a = getMidnightAddressByType(MIDNIGHT_ADDRESS_TYPE_UNSHIELDED, wallet)) !== null && _a !== void 0 ? _a : wallet === null || wallet === void 0 ? void 0 : wallet.address;
-    const dustAddress = getMidnightAddressByType(MIDNIGHT_ADDRESS_TYPE_DUST, wallet);
-    const shieldedAddress = getMidnightAddressByType(MIDNIGHT_ADDRESS_TYPE_SHIELDED, wallet);
+    const unshieldedAddress = (_a = getMidnightAddressByType(MIDNIGHT_ADDRESS_TYPE_UNSHIELDED, network, wallet)) !== null && _a !== void 0 ? _a : wallet === null || wallet === void 0 ? void 0 : wallet.address;
+    const dustAddress = getMidnightAddressByType(MIDNIGHT_ADDRESS_TYPE_DUST, network, wallet);
+    const shieldedAddress = getMidnightAddressByType(MIDNIGHT_ADDRESS_TYPE_SHIELDED, network, wallet);
     // Collapse dust + shielded behind a toggle so the header shows only the
     // primary (unshielded) address by default — the user reveals the rest on
     // click, instead of all three being shown at once.

package/src/lib/widgets/DynamicWidget/components/ActiveWalletInformation/ActiveWalletAddress/ActiveWalletAddress.cjs

@@ -152,8 +152,11 @@ const ActiveWalletAddress = ({ wallet, nameServiceName, menuOption, fullWidth =
     }, [setShowMenu]);
     const iconRef = React.useRef(null);
     const { data: address } = usePromise.usePromise(() => {
-        // COSMOS wallet address changes based on which network is selected
-        if ((wallet === null || wallet === void 0 ? void 0 : wallet.connector.connectedChain) === 'COSMOS') {
+        // COSMOS wallet address changes based on which network is selected;
+        // embedded Bitcoin wallets expose a per-network payment address too
+        if ((wallet === null || wallet === void 0 ? void 0 : wallet.connector.connectedChain) === 'COSMOS' ||
+            ((wallet === null || wallet === void 0 ? void 0 : wallet.connector.connectedChain) === 'BTC' &&
+                (wallet === null || wallet === void 0 ? void 0 : wallet.connector.isEmbeddedWallet))) {
             return wallet === null || wallet === void 0 ? void 0 : wallet.connector.getAddress();
         }
         return wallet === null || wallet === void 0 ? void 0 : wallet.address;

package/src/lib/widgets/DynamicWidget/components/ActiveWalletInformation/ActiveWalletAddress/ActiveWalletAddress.js

@@ -148,8 +148,11 @@ const ActiveWalletAddress = ({ wallet, nameServiceName, menuOption, fullWidth =
     }, [setShowMenu]);
     const iconRef = useRef(null);
     const { data: address } = usePromise(() => {
-        // COSMOS wallet address changes based on which network is selected
-        if ((wallet === null || wallet === void 0 ? void 0 : wallet.connector.connectedChain) === 'COSMOS') {
+        // COSMOS wallet address changes based on which network is selected;
+        // embedded Bitcoin wallets expose a per-network payment address too
+        if ((wallet === null || wallet === void 0 ? void 0 : wallet.connector.connectedChain) === 'COSMOS' ||
+            ((wallet === null || wallet === void 0 ? void 0 : wallet.connector.connectedChain) === 'BTC' &&
+                (wallet === null || wallet === void 0 ? void 0 : wallet.connector.isEmbeddedWallet))) {
             return wallet === null || wallet === void 0 ? void 0 : wallet.connector.getAddress();
         }
         return wallet === null || wallet === void 0 ? void 0 : wallet.address;

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

@@ -7,6 +7,7 @@ var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var reactI18next = require('react-i18next');
+var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 var copy = require('../../../../shared/assets/copy.cjs');
@@ -22,7 +23,6 @@ require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('../../../../utils/constants/colors.cjs');
 require('../../../../utils/constants/values.cjs');
-require('@dynamic-labs/sdk-api-core');
 require('../../../../shared/consts/index.cjs');
 var Alert = require('../../../../components/Alert/Alert.cjs');
 require('../../../../events/dynamicEvents.cjs');
@@ -39,6 +39,8 @@ require('eventemitter3');
 require('@dynamic-labs-sdk/client');
 require('../../../../config/ApiEndpoint.cjs');
 var useProjectSettings = require('../../../../client/extension/projectSettings/useProjectSettings/useProjectSettings.cjs');
+var getEmbeddedBitcoinActiveAddress = require('../../../../utils/functions/getEmbeddedBitcoinActiveAddress/getEmbeddedBitcoinActiveAddress.cjs');
+var getWalletAdditionalAddressByType = require('../../../../utils/functions/getWalletAdditionalAddressByType/getWalletAdditionalAddressByType.cjs');
 require('@dynamic-labs/locale');
 require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 var primaryWalletId = require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
@@ -139,7 +141,7 @@ var ActiveWalletAddress = require('./ActiveWalletAddress/ActiveWalletAddress.cjs
 const ICON_SIZE = 32;
 const DROPDOWN_ICON_SIZE = 16;
 const ActiveWalletInformation = ({ isLoading = false, }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e;
     const { t } = reactI18next.useTranslation();
     const [detailsCardOpen, setDetailsCardOpen] = React.useState(false);
     const { primaryWallet, network, user, removeWallet } = useInternalDynamicContext.useInternalDynamicContext();
@@ -148,17 +150,23 @@ const ActiveWalletInformation = ({ isLoading = false, }) => {
     const projectSettings = useProjectSettings.useProjectSettings();
     const { setDynamicWidgetView, headerAlert } = DynamicWidgetContext.useWidgetContext();
     const { isTurnkeyWalletWithoutAuthenticator } = useIsTurnkeyWallet.useIsTurnkeyWallet();
-    const address = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
+    // Per-network address: embedded Bitcoin swaps its active address on network
+    // switch (context `network` changes re-render this component).
+    const address = (_a = getEmbeddedBitcoinActiveAddress.getEmbeddedBitcoinActiveAddress(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector)) !== null && _a !== void 0 ? _a : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
     const nameService = useFetchNameService.useFetchNameService(primaryWallet !== null && primaryWallet !== void 0 ? primaryWallet : undefined);
     const { getEOAWallet } = useSmartWallets.useSmartWallets();
     const { data: testnet } = usePromise.usePromise(() => _tslib.__awaiter(void 0, void 0, void 0, function* () { return Boolean(yield (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.isTestnet())); }), { deps: [network], initialData: false });
     const exportKeysOption = helpers.getExportKeysOption(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers);
     const { showAlert } = PasskeyContext.usePasskeyContext();
-    const wallet = (_a = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _a !== void 0 ? _a : primaryWallet;
+    const wallet = (_b = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _b !== void 0 ? _b : primaryWallet;
     const isBitcoin = primaryWallet && walletConnectorCore.isBitcoinConnector(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector);
     const isMidnight = primaryWallet && walletConnectorCore.isMidnightConnector(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector);
+    // Midnight is one wallet (one MPC key) exposing a per-network address for
+    // each type. The connector resolves the selected network to the address tag
+    // ('mainnet' | 'preview'). Recomputed on every switch since `network` changes.
+    const midnightNetworkTag = walletConnectorCore.getMidnightNetworkTag(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector);
     const isWaasWallet = primaryWallet && walletConnectorCore.isDynamicWaasConnector(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector);
-    const isEmbeddedWallet = Boolean(wallet && ((_c = (_b = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _b === void 0 ? void 0 : _b.key) === null || _c === void 0 ? void 0 : _c.startsWith('turnkey')));
+    const isEmbeddedWallet = Boolean(wallet && ((_d = (_c = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _c === void 0 ? void 0 : _c.key) === null || _d === void 0 ? void 0 : _d.startsWith('turnkey')));
     const openDetailsCard = React.useCallback(() => {
         setTimeout(() => setDetailsCardOpen(true), 0);
     }, []);
@@ -220,7 +228,7 @@ const ActiveWalletInformation = ({ isLoading = false, }) => {
         // Midnight wallets (WaaS and external/injected alike) expose multiple
         // address types (Unshielded, Dust, Shielded) via additionalAddresses.
         if (isMidnight) {
-            return (jsxRuntime.jsx(ActiveMidnightWalletAddresses.ActiveMidnightWalletAddresses, { wallet: primaryWallet, menuOption: options }));
+            return (jsxRuntime.jsx(ActiveMidnightWalletAddresses.ActiveMidnightWalletAddresses, { wallet: primaryWallet, menuOption: options, network: midnightNetworkTag }));
         }
         return (jsxRuntime.jsx(ActiveWalletAddress.ActiveWalletAddress, { wallet: primaryWallet, nameServiceName: (nameService === null || nameService === void 0 ? void 0 : nameService.name) || (user === null || user === void 0 ? void 0 : user.email), menuOption: options, isLoading: isLoading, fullWidth: shouldHideNetwork, addressTypeLabel: getWaasAddressTypeLabel.getWaasAddressTypeLabel((primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain) || (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.connectedChain), Boolean(isWaasWallet), address) }));
     };
@@ -231,9 +239,9 @@ const ActiveWalletInformation = ({ isLoading = false, }) => {
                                             'active-wallet-information__addresses-container--centered': !(nameService === null || nameService === void 0 ? void 0 : nameService.name),
                                         }), children: activeWalletAddress() }), address && (jsxRuntime.jsx(WalletDetailsCard.WalletDetailsCard, { open: detailsCardOpen, address: address, onClose: () => setDetailsCardOpen(false), midnightAddresses: isMidnight
                                             ? {
-                                                dust: (_e = (_d = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.additionalAddresses) === null || _d === void 0 ? void 0 : _d.find((a) => a.type === 'midnight_dust')) === null || _e === void 0 ? void 0 : _e.address,
-                                                shielded: (_g = (_f = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.additionalAddresses) === null || _f === void 0 ? void 0 : _f.find((a) => a.type === 'midnight_shielded')) === null || _g === void 0 ? void 0 : _g.address,
-                                                unshielded: (_k = (_j = (_h = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.additionalAddresses) === null || _h === void 0 ? void 0 : _h.find((a) => a.type === 'midnight_unshielded')) === null || _j === void 0 ? void 0 : _j.address) !== null && _k !== void 0 ? _k : address,
+                                                dust: getWalletAdditionalAddressByType.getWalletAdditionalAddressByType(sdkApiCore.WalletAddressType.MidnightDust, primaryWallet, midnightNetworkTag),
+                                                shielded: getWalletAdditionalAddressByType.getWalletAdditionalAddressByType(sdkApiCore.WalletAddressType.MidnightShielded, primaryWallet, midnightNetworkTag),
+                                                unshielded: (_e = getWalletAdditionalAddressByType.getWalletAdditionalAddressByType(sdkApiCore.WalletAddressType.MidnightUnshielded, primaryWallet, midnightNetworkTag)) !== null && _e !== void 0 ? _e : address,
                                             }
                                             : undefined })), !shouldHideNetwork && (jsxRuntime.jsx(NetworkPicker.NetworkPicker, { currentNetwork: network, connector: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, mainClassName: 'active-wallet-information__network-picker', buttonClassName: 'active-wallet-information__network-picker-button', showNetworkName: true, isLoading: isLoading }))] })] }), headerAlert && (jsxRuntime.jsx(Alert.Alert, { variant: headerAlert.variant, children: headerAlert.content })), showTestnetAlert && (jsxRuntime.jsx(Alert.Alert, { variant: 'warning', copykey: 'dyn_active_wallet_info.testnet_warning', children: t('dyn_active_wallet_info.testnet_warning') }))] }), isMidnight ? jsxRuntime.jsx(ActiveMidnightWalletBalance.ActiveMidnightWalletBalance, {}) : jsxRuntime.jsx(ActiveWalletBalance.ActiveWalletBalance, {})] }));
 };

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

@@ -3,7 +3,8 @@ import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { useState, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
-import { isBitcoinConnector, isMidnightConnector, isDynamicWaasConnector } from '@dynamic-labs/wallet-connector-core';
+import { WalletAddressType } from '@dynamic-labs/sdk-api-core';
+import { isBitcoinConnector, isMidnightConnector, getMidnightNetworkTag, isDynamicWaasConnector } from '@dynamic-labs/wallet-connector-core';
 import '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import { ReactComponent as SvgCopy } from '../../../../shared/assets/copy.js';
 import { ReactComponent as SvgEyeOutline } from '../../../../shared/assets/eye-outline.js';
@@ -18,7 +19,6 @@ import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import '../../../../utils/constants/colors.js';
 import '../../../../utils/constants/values.js';
-import '@dynamic-labs/sdk-api-core';
 import '../../../../shared/consts/index.js';
 import { Alert } from '../../../../components/Alert/Alert.js';
 import '../../../../events/dynamicEvents.js';
@@ -35,6 +35,8 @@ import 'eventemitter3';
 import '@dynamic-labs-sdk/client';
 import '../../../../config/ApiEndpoint.js';
 import { useProjectSettings } from '../../../../client/extension/projectSettings/useProjectSettings/useProjectSettings.js';
+import { getEmbeddedBitcoinActiveAddress } from '../../../../utils/functions/getEmbeddedBitcoinActiveAddress/getEmbeddedBitcoinActiveAddress.js';
+import { getWalletAdditionalAddressByType } from '../../../../utils/functions/getWalletAdditionalAddressByType/getWalletAdditionalAddressByType.js';
 import '@dynamic-labs/locale';
 import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import { getPrimaryWalletId } from '../../../../store/state/primaryWalletId/primaryWalletId.js';
@@ -135,7 +137,7 @@ import { ActiveWalletAddress } from './ActiveWalletAddress/ActiveWalletAddress.j
 const ICON_SIZE = 32;
 const DROPDOWN_ICON_SIZE = 16;
 const ActiveWalletInformation = ({ isLoading = false, }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e;
     const { t } = useTranslation();
     const [detailsCardOpen, setDetailsCardOpen] = useState(false);
     const { primaryWallet, network, user, removeWallet } = useInternalDynamicContext();
@@ -144,17 +146,23 @@ const ActiveWalletInformation = ({ isLoading = false, }) => {
     const projectSettings = useProjectSettings();
     const { setDynamicWidgetView, headerAlert } = useWidgetContext();
     const { isTurnkeyWalletWithoutAuthenticator } = useIsTurnkeyWallet();
-    const address = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
+    // Per-network address: embedded Bitcoin swaps its active address on network
+    // switch (context `network` changes re-render this component).
+    const address = (_a = getEmbeddedBitcoinActiveAddress(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector)) !== null && _a !== void 0 ? _a : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
     const nameService = useFetchNameService(primaryWallet !== null && primaryWallet !== void 0 ? primaryWallet : undefined);
     const { getEOAWallet } = useSmartWallets();
     const { data: testnet } = usePromise(() => __awaiter(void 0, void 0, void 0, function* () { return Boolean(yield (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.isTestnet())); }), { deps: [network], initialData: false });
     const exportKeysOption = getExportKeysOption(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers);
     const { showAlert } = usePasskeyContext();
-    const wallet = (_a = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _a !== void 0 ? _a : primaryWallet;
+    const wallet = (_b = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _b !== void 0 ? _b : primaryWallet;
     const isBitcoin = primaryWallet && isBitcoinConnector(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector);
     const isMidnight = primaryWallet && isMidnightConnector(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector);
+    // Midnight is one wallet (one MPC key) exposing a per-network address for
+    // each type. The connector resolves the selected network to the address tag
+    // ('mainnet' | 'preview'). Recomputed on every switch since `network` changes.
+    const midnightNetworkTag = getMidnightNetworkTag(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector);
     const isWaasWallet = primaryWallet && isDynamicWaasConnector(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector);
-    const isEmbeddedWallet = Boolean(wallet && ((_c = (_b = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _b === void 0 ? void 0 : _b.key) === null || _c === void 0 ? void 0 : _c.startsWith('turnkey')));
+    const isEmbeddedWallet = Boolean(wallet && ((_d = (_c = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _c === void 0 ? void 0 : _c.key) === null || _d === void 0 ? void 0 : _d.startsWith('turnkey')));
     const openDetailsCard = useCallback(() => {
         setTimeout(() => setDetailsCardOpen(true), 0);
     }, []);
@@ -216,7 +224,7 @@ const ActiveWalletInformation = ({ isLoading = false, }) => {
         // Midnight wallets (WaaS and external/injected alike) expose multiple
         // address types (Unshielded, Dust, Shielded) via additionalAddresses.
         if (isMidnight) {
-            return (jsx(ActiveMidnightWalletAddresses, { wallet: primaryWallet, menuOption: options }));
+            return (jsx(ActiveMidnightWalletAddresses, { wallet: primaryWallet, menuOption: options, network: midnightNetworkTag }));
         }
         return (jsx(ActiveWalletAddress, { wallet: primaryWallet, nameServiceName: (nameService === null || nameService === void 0 ? void 0 : nameService.name) || (user === null || user === void 0 ? void 0 : user.email), menuOption: options, isLoading: isLoading, fullWidth: shouldHideNetwork, addressTypeLabel: getWaasAddressTypeLabel((primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain) || (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.connectedChain), Boolean(isWaasWallet), address) }));
     };
@@ -227,9 +235,9 @@ const ActiveWalletInformation = ({ isLoading = false, }) => {
                                             'active-wallet-information__addresses-container--centered': !(nameService === null || nameService === void 0 ? void 0 : nameService.name),
                                         }), children: activeWalletAddress() }), address && (jsx(WalletDetailsCard, { open: detailsCardOpen, address: address, onClose: () => setDetailsCardOpen(false), midnightAddresses: isMidnight
                                             ? {
-                                                dust: (_e = (_d = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.additionalAddresses) === null || _d === void 0 ? void 0 : _d.find((a) => a.type === 'midnight_dust')) === null || _e === void 0 ? void 0 : _e.address,
-                                                shielded: (_g = (_f = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.additionalAddresses) === null || _f === void 0 ? void 0 : _f.find((a) => a.type === 'midnight_shielded')) === null || _g === void 0 ? void 0 : _g.address,
-                                                unshielded: (_k = (_j = (_h = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.additionalAddresses) === null || _h === void 0 ? void 0 : _h.find((a) => a.type === 'midnight_unshielded')) === null || _j === void 0 ? void 0 : _j.address) !== null && _k !== void 0 ? _k : address,
+                                                dust: getWalletAdditionalAddressByType(WalletAddressType.MidnightDust, primaryWallet, midnightNetworkTag),
+                                                shielded: getWalletAdditionalAddressByType(WalletAddressType.MidnightShielded, primaryWallet, midnightNetworkTag),
+                                                unshielded: (_e = getWalletAdditionalAddressByType(WalletAddressType.MidnightUnshielded, primaryWallet, midnightNetworkTag)) !== null && _e !== void 0 ? _e : address,
                                             }
                                             : undefined })), !shouldHideNetwork && (jsx(NetworkPicker, { currentNetwork: network, connector: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, mainClassName: 'active-wallet-information__network-picker', buttonClassName: 'active-wallet-information__network-picker-button', showNetworkName: true, isLoading: isLoading }))] })] }), headerAlert && (jsx(Alert, { variant: headerAlert.variant, children: headerAlert.content })), showTestnetAlert && (jsx(Alert, { variant: 'warning', copykey: 'dyn_active_wallet_info.testnet_warning', children: t('dyn_active_wallet_info.testnet_warning') }))] }), isMidnight ? jsx(ActiveMidnightWalletBalance, {}) : jsx(ActiveWalletBalance, {})] }));
 };

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

@@ -178,7 +178,11 @@ 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;
+        // Pin the primary wallet's id: when the primary wallet is a smart wallet,
+        // the derived EOA wallet is not registered in userWallets, so its id
+        // would fail EmbeddedRevealView's lookup. The view derives the EOA from
+        // the pinned wallet itself.
+        const targetWalletId = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id;
         logger.logger.info('Starting embedded wallet export process', {
             userId: user === null || user === void 0 ? void 0 : user.userId,
             walletId: targetWalletId,
@@ -219,6 +223,7 @@ const EmbeddedWalletExportSection = () => {
         }
         return initExportProcess(recoveryPhrase, false, targetWalletId);
     }), [
+        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id,
         wallet,
         user,
         isStepUpRequired,

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

@@ -174,7 +174,11 @@ 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;
+        // Pin the primary wallet's id: when the primary wallet is a smart wallet,
+        // the derived EOA wallet is not registered in userWallets, so its id
+        // would fail EmbeddedRevealView's lookup. The view derives the EOA from
+        // the pinned wallet itself.
+        const targetWalletId = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id;
         logger.info('Starting embedded wallet export process', {
             userId: user === null || user === void 0 ? void 0 : user.userId,
             walletId: targetWalletId,
@@ -215,6 +219,7 @@ const EmbeddedWalletExportSection = () => {
         }
         return initExportProcess(recoveryPhrase, false, targetWalletId);
     }), [
+        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id,
         wallet,
         user,
         isStepUpRequired,

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

@@ -22,31 +22,46 @@ require('@dynamic-labs/iconic');
 require('../../../../context/ViewContext/ViewContext.cjs');
 var shortenWalletAddress = require('../../../../shared/utils/functions/shortenWalletAddress/shortenWalletAddress.cjs');
 var classNames = require('../../../../utils/functions/classNames/classNames.cjs');
+var getEmbeddedBitcoinActiveAddress = require('../../../../utils/functions/getEmbeddedBitcoinActiveAddress/getEmbeddedBitcoinActiveAddress.cjs');
 var getWalletAdditionalAddressByType = require('../../../../utils/functions/getWalletAdditionalAddressByType/getWalletAdditionalAddressByType.cjs');
 var usePromise = require('../../../../utils/hooks/usePromise/usePromise.cjs');
 var DynamicWidgetContext = require('../../context/DynamicWidgetContext.cjs');
 var useFetchChain = require('../../hooks/useFetchChain/useFetchChain.cjs');
 
 const DepositView = () => {
-    var _a;
+    var _a, _b;
     const { t } = reactI18next.useTranslation();
-    const { primaryWallet, getNameService } = useInternalDynamicContext.useInternalDynamicContext();
+    // Per-network address: embedded Bitcoin swaps its active address on network
+    // switch (context `network` changes re-render this view).
+    const { primaryWallet, getNameService, network } = useInternalDynamicContext.useInternalDynamicContext();
     const walletConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
     const { chain } = useFetchChain.useFetchChain(walletConnector);
     const { setDynamicWidgetView } = DynamicWidgetContext.useWidgetContext();
     const [midnightAddressType, setMidnightAddressType] = React.useState('unshielded');
-    const { data: ens } = usePromise.usePromise(() => getNameService(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address), { deps: [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address], initialData: undefined });
+    const { data: ens } = usePromise.usePromise(() => getNameService(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address), { deps: [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address, network], initialData: undefined });
     const ensName = (_a = ens === null || ens === void 0 ? void 0 : ens.name) !== null && _a !== void 0 ? _a : null;
     if (!primaryWallet) {
         return null;
     }
-    const shieldedAddress = walletConnectorCore.isMidnightWallet(primaryWallet)
-        ? getWalletAdditionalAddressByType.getWalletAdditionalAddressByType(sdkApiCore.WalletAddressType.MidnightShielded, primaryWallet)
+    // Midnight is one wallet exposing a per-network address for each type. The
+    // connector resolves the selected network so the deposit QR/address matches
+    // the chosen network — depositing to the wrong network's encoding would
+    // strand funds. `network` from context drives re-render on switch.
+    const isMidnight = walletConnectorCore.isMidnightWallet(primaryWallet);
+    const midnightNetworkTag = walletConnectorCore.getMidnightNetworkTag(primaryWallet.connector);
+    const shieldedAddress = isMidnight
+        ? getWalletAdditionalAddressByType.getWalletAdditionalAddressByType(sdkApiCore.WalletAddressType.MidnightShielded, primaryWallet, midnightNetworkTag)
         : undefined;
+    const unshieldedAddress = isMidnight
+        ? (_b = getWalletAdditionalAddressByType.getWalletAdditionalAddressByType(sdkApiCore.WalletAddressType.MidnightUnshielded, primaryWallet, midnightNetworkTag)) !== null && _b !== void 0 ? _b : primaryWallet.address
+        : primaryWallet.address;
     const showMidnightToggle = Boolean(shieldedAddress);
+    // Per-network address: the deposit QR/address must match the selected
+    // network — depositing to the wrong network's encoding would strand funds.
+    const bitcoinActiveAddress = getEmbeddedBitcoinActiveAddress.getEmbeddedBitcoinActiveAddress(primaryWallet.connector);
     const depositAddress = showMidnightToggle && midnightAddressType === 'shielded' && shieldedAddress
         ? shieldedAddress
-        : primaryWallet.address;
+        : bitcoinActiveAddress !== null && bitcoinActiveAddress !== void 0 ? bitcoinActiveAddress : unshieldedAddress;
     const backButton = (jsxRuntime.jsx(IconButton.IconButton, { type: 'button', id: 'back-button', "data-testid": 'back-button', onClick: () => setDynamicWidgetView('choose-wallet-funding-method'), children: jsxRuntime.jsx(arrowLeft.ReactComponent, {}) }));
     return (jsxRuntime.jsxs("div", { className: 'deposit-view', children: [jsxRuntime.jsx(ModalHeader.ModalHeader, { leading: backButton, children: jsxRuntime.jsx(Typography.Typography, { variant: 'title', copykey: 'dyn_deposit.title', children: t('dyn_deposit.title') }) }), jsxRuntime.jsxs("div", { className: 'deposit-view__content', children: [showMidnightToggle && (jsxRuntime.jsxs("div", { className: 'deposit-view__content__toggle', children: [jsxRuntime.jsx("button", { type: 'button', "data-testid": 'deposit-toggle-unshielded', className: classNames.classNames('deposit-view__content__toggle__option', {
                                     'deposit-view__content__toggle__option--active': midnightAddressType === 'unshielded',

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

@@ -3,7 +3,7 @@ import { jsx, jsxs } from 'react/jsx-runtime';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { WalletAddressType } from '@dynamic-labs/sdk-api-core';
-import { isMidnightWallet } from '@dynamic-labs/wallet-connector-core';
+import { isMidnightWallet, getMidnightNetworkTag } from '@dynamic-labs/wallet-connector-core';
 import { CopyButton } from '../../../../components/CopyButton/CopyButton.js';
 import { IconButton } from '../../../../components/IconButton/IconButton.js';
 import { ModalHeader } from '../../../../components/ModalHeader/ModalHeader.js';
@@ -18,31 +18,46 @@ import '@dynamic-labs/iconic';
 import '../../../../context/ViewContext/ViewContext.js';
 import { shortenWalletAddress } from '../../../../shared/utils/functions/shortenWalletAddress/shortenWalletAddress.js';
 import { classNames } from '../../../../utils/functions/classNames/classNames.js';
+import { getEmbeddedBitcoinActiveAddress } from '../../../../utils/functions/getEmbeddedBitcoinActiveAddress/getEmbeddedBitcoinActiveAddress.js';
 import { getWalletAdditionalAddressByType } from '../../../../utils/functions/getWalletAdditionalAddressByType/getWalletAdditionalAddressByType.js';
 import { usePromise } from '../../../../utils/hooks/usePromise/usePromise.js';
 import { useWidgetContext } from '../../context/DynamicWidgetContext.js';
 import { useFetchChain } from '../../hooks/useFetchChain/useFetchChain.js';
 
 const DepositView = () => {
-    var _a;
+    var _a, _b;
     const { t } = useTranslation();
-    const { primaryWallet, getNameService } = useInternalDynamicContext();
+    // Per-network address: embedded Bitcoin swaps its active address on network
+    // switch (context `network` changes re-render this view).
+    const { primaryWallet, getNameService, network } = useInternalDynamicContext();
     const walletConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
     const { chain } = useFetchChain(walletConnector);
     const { setDynamicWidgetView } = useWidgetContext();
     const [midnightAddressType, setMidnightAddressType] = useState('unshielded');
-    const { data: ens } = usePromise(() => getNameService(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address), { deps: [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address], initialData: undefined });
+    const { data: ens } = usePromise(() => getNameService(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address), { deps: [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address, network], initialData: undefined });
     const ensName = (_a = ens === null || ens === void 0 ? void 0 : ens.name) !== null && _a !== void 0 ? _a : null;
     if (!primaryWallet) {
         return null;
     }
-    const shieldedAddress = isMidnightWallet(primaryWallet)
-        ? getWalletAdditionalAddressByType(WalletAddressType.MidnightShielded, primaryWallet)
+    // Midnight is one wallet exposing a per-network address for each type. The
+    // connector resolves the selected network so the deposit QR/address matches
+    // the chosen network — depositing to the wrong network's encoding would
+    // strand funds. `network` from context drives re-render on switch.
+    const isMidnight = isMidnightWallet(primaryWallet);
+    const midnightNetworkTag = getMidnightNetworkTag(primaryWallet.connector);
+    const shieldedAddress = isMidnight
+        ? getWalletAdditionalAddressByType(WalletAddressType.MidnightShielded, primaryWallet, midnightNetworkTag)
         : undefined;
+    const unshieldedAddress = isMidnight
+        ? (_b = getWalletAdditionalAddressByType(WalletAddressType.MidnightUnshielded, primaryWallet, midnightNetworkTag)) !== null && _b !== void 0 ? _b : primaryWallet.address
+        : primaryWallet.address;
     const showMidnightToggle = Boolean(shieldedAddress);
+    // Per-network address: the deposit QR/address must match the selected
+    // network — depositing to the wrong network's encoding would strand funds.
+    const bitcoinActiveAddress = getEmbeddedBitcoinActiveAddress(primaryWallet.connector);
     const depositAddress = showMidnightToggle && midnightAddressType === 'shielded' && shieldedAddress
         ? shieldedAddress
-        : primaryWallet.address;
+        : bitcoinActiveAddress !== null && bitcoinActiveAddress !== void 0 ? bitcoinActiveAddress : unshieldedAddress;
     const backButton = (jsx(IconButton, { type: 'button', id: 'back-button', "data-testid": 'back-button', onClick: () => setDynamicWidgetView('choose-wallet-funding-method'), children: jsx(SvgArrowLeft, {}) }));
     return (jsxs("div", { className: 'deposit-view', children: [jsx(ModalHeader, { leading: backButton, children: jsx(Typography, { variant: 'title', copykey: 'dyn_deposit.title', children: t('dyn_deposit.title') }) }), jsxs("div", { className: 'deposit-view__content', children: [showMidnightToggle && (jsxs("div", { className: 'deposit-view__content__toggle', children: [jsx("button", { type: 'button', "data-testid": 'deposit-toggle-unshielded', className: classNames('deposit-view__content__toggle__option', {
                                     'deposit-view__content__toggle__option--active': midnightAddressType === 'unshielded',