@dynamic-labs/sdk-react-core 5.0.0-rc.0 → 5.0.0-rc.1

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var utils = require('@dynamic-labs/utils');
 var client = require('../../../client/client.cjs');
 require('../../../context/DynamicContext/useDynamicContext/useDynamicContext.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
@@ -17,6 +16,7 @@ require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
+require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('@dynamic-labs/sdk-api-core');
@@ -36,14 +36,9 @@ require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
+var reconcilePrimaryWallet = require('../../functions/reconcilePrimaryWallet/reconcilePrimaryWallet.cjs');
 var useDynamicEvents = require('../events/useDynamicEvents/useDynamicEvents.cjs');
 var useEmbeddedReveal = require('../useEmbeddedReveal/useEmbeddedReveal.cjs');
-var useEmbeddedWallet = require('../useEmbeddedWallet/useEmbeddedWallet.cjs');
-require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
-require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
-require('../../functions/compareChains/compareChains.cjs');
-require('../../../context/VerificationContext/VerificationContext.cjs');
-require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 
 let acknowledgedExportPrompt = false;
 const useSyncEmbeddedWalletFlow = () => {
@@ -52,45 +47,48 @@ const useSyncEmbeddedWalletFlow = () => {
     const { loading: globalLoading } = LoadingContext.useLoadingContext();
     const { initExportProcess } = useEmbeddedReveal.useEmbeddedReveal();
     const [wasShownExportPrompt, setWasShownExportPrompt] = useLocalStorage.useLocalStorage(`dynamic_export_prompt-${contextUser === null || contextUser === void 0 ? void 0 : contextUser.userId}`, false, (data) => Boolean(data));
-    const { createEmbeddedWallet, shouldAutoCreateEmbeddedWallet, shouldPromptForKeyExport, } = useEmbeddedWallet.useEmbeddedWallet();
-    const triggeredCreate = React.useRef(false);
     const handleAcknowledgeExportPrompt = React.useCallback((value = true) => {
         acknowledgedExportPrompt = value;
         setWasShownExportPrompt(value);
     }, [setWasShownExportPrompt]);
     useDynamicEvents.useInternalDynamicEvents('logout', () => {
-        triggeredCreate.current = false;
         acknowledgedExportPrompt = false;
     });
-    // this is used to trigger createEmbeddedWallet
-    // when user didn't create a passkey after login,
-    // we force them to created it before they can use the app
+    // Prompts the user to export their legacy embedded wallet key when the
+    // project is configured to prompt for key export.
     // ** It must be an useEffect because some of the dependencies are async
     React.useEffect(() => {
+        var _a, _b;
         // Explanation: if the user just logged out, the user from the hook might still be set
         // but the client will be null.
         // And if the user is not onboarding complete yet, the hook won't be set even though the client.user is set.
         // This is why we check for the user AND the client.user.
         const user = contextUser && client.getDynamicClient().user;
+        // Legacy wallet creation used to set the primary wallet as a side-effect on
+        // login. That path is gone in v5, so reconcile the primary wallet here from
+        // the user's verified credentials on login/session restore. No wallet is
+        // created — this only selects the primary wallet.
+        const clientUser = client.getDynamicClient().user;
+        if (clientUser === null || clientUser === void 0 ? void 0 : clientUser.verifiedCredentials) {
+            reconcilePrimaryWallet.reconcilePrimaryWallet(clientUser);
+        }
+        if (wasShownExportPrompt && !acknowledgedExportPrompt) {
+            acknowledgedExportPrompt = true;
+        }
+        const shouldPromptKeyExport = Boolean((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.promptForKeyExport);
+        const shouldSyncPromptKeyExport = shouldPromptKeyExport && !acknowledgedExportPrompt;
+        if (!shouldSyncPromptKeyExport ||
+            !user ||
+            !projectSettings ||
+            !walletConnectorOptions.length || // no connectors to use for the embedded wallet
+            isLoadingEmbeddedWallet || // already has a wallet
+            globalLoading // this will be true if auth is in progress
+        ) {
+            return;
+        }
         const syncEmbeddedWallet = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
             const isNewUser = user === null || user === void 0 ? void 0 : user.newUser;
-            if (shouldSyncCreateWallet) {
-                triggeredCreate.current = true;
-                try {
-                    yield createEmbeddedWallet();
-                }
-                catch (error) {
-                    if (error instanceof utils.EmbeddedWalletException) {
-                        logger.logger.debug('[useSyncEmbeddedWalletFlow][EmbeddedWalletException] Error creating embedded wallet', error);
-                    }
-                    else {
-                        logger.logger.error('[useSyncEmbeddedWalletFlow] Error creating embedded wallet', error);
-                    }
-                    setShowAuthFlow(false);
-                }
-            }
-            if (shouldSyncPromptKeyExport &&
-                isNewUser &&
+            if (isNewUser &&
                 findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user) &&
                 primaryWallet) {
                 try {
@@ -103,42 +101,22 @@ const useSyncEmbeddedWalletFlow = () => {
                 }
             }
         });
-        const shouldCreateWallet = shouldAutoCreateEmbeddedWallet();
-        const shouldSyncCreateWallet = shouldCreateWallet && !triggeredCreate.current;
-        if (wasShownExportPrompt && !acknowledgedExportPrompt)
-            acknowledgedExportPrompt = true;
-        const shouldPromptKeyExport = shouldPromptForKeyExport();
-        const shouldSyncPromptKeyExport = shouldPromptKeyExport && !acknowledgedExportPrompt;
-        const shouldSyncEmbeddedWallet = shouldSyncCreateWallet || shouldSyncPromptKeyExport;
-        if (!shouldSyncEmbeddedWallet ||
-            !user ||
-            !projectSettings ||
-            !walletConnectorOptions.length || // no connectors to use for the embedded wallet
-            isLoadingEmbeddedWallet || // already has a wallet
-            globalLoading // this will be true if auth is in progress
-        ) {
-            return;
-        }
         syncEmbeddedWallet();
     }, [
         contextUser,
         projectSettings,
         primaryWalletId,
-        createEmbeddedWallet,
         isLoadingEmbeddedWallet,
         walletConnectorOptions,
         globalLoading,
-        shouldAutoCreateEmbeddedWallet,
         setShowAuthFlow,
         initExportProcess,
         primaryWallet,
-        shouldPromptForKeyExport,
         setWasShownExportPrompt,
         handleAcknowledgeExportPrompt,
         wasShownExportPrompt,
     ]);
     return {
-        acknowledgedExportPrompt,
         handleAcknowledgeExportPrompt,
     };
 };

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

@@ -1,4 +1,3 @@
 export declare const useSyncEmbeddedWalletFlow: () => {
-    acknowledgedExportPrompt: boolean;
     handleAcknowledgeExportPrompt: (value?: boolean) => void;
 };

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

@@ -1,7 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useRef, useCallback, useEffect } from 'react';
-import { EmbeddedWalletException } from '@dynamic-labs/utils';
+import { useCallback, useEffect } from 'react';
 import { getDynamicClient } from '../../../client/client.js';
 import '../../../context/DynamicContext/useDynamicContext/useDynamicContext.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
@@ -13,6 +12,7 @@ import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
+import '@dynamic-labs/utils';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import '@dynamic-labs/sdk-api-core';
@@ -32,14 +32,9 @@ import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
+import { reconcilePrimaryWallet } from '../../functions/reconcilePrimaryWallet/reconcilePrimaryWallet.js';
 import { useInternalDynamicEvents } from '../events/useDynamicEvents/useDynamicEvents.js';
 import { useEmbeddedReveal } from '../useEmbeddedReveal/useEmbeddedReveal.js';
-import { useEmbeddedWallet } from '../useEmbeddedWallet/useEmbeddedWallet.js';
-import '../../../context/UserWalletsContext/UserWalletsContext.js';
-import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
-import '../../functions/compareChains/compareChains.js';
-import '../../../context/VerificationContext/VerificationContext.js';
-import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 
 let acknowledgedExportPrompt = false;
 const useSyncEmbeddedWalletFlow = () => {
@@ -48,45 +43,48 @@ const useSyncEmbeddedWalletFlow = () => {
     const { loading: globalLoading } = useLoadingContext();
     const { initExportProcess } = useEmbeddedReveal();
     const [wasShownExportPrompt, setWasShownExportPrompt] = useLocalStorage(`dynamic_export_prompt-${contextUser === null || contextUser === void 0 ? void 0 : contextUser.userId}`, false, (data) => Boolean(data));
-    const { createEmbeddedWallet, shouldAutoCreateEmbeddedWallet, shouldPromptForKeyExport, } = useEmbeddedWallet();
-    const triggeredCreate = useRef(false);
     const handleAcknowledgeExportPrompt = useCallback((value = true) => {
         acknowledgedExportPrompt = value;
         setWasShownExportPrompt(value);
     }, [setWasShownExportPrompt]);
     useInternalDynamicEvents('logout', () => {
-        triggeredCreate.current = false;
         acknowledgedExportPrompt = false;
     });
-    // this is used to trigger createEmbeddedWallet
-    // when user didn't create a passkey after login,
-    // we force them to created it before they can use the app
+    // Prompts the user to export their legacy embedded wallet key when the
+    // project is configured to prompt for key export.
     // ** It must be an useEffect because some of the dependencies are async
     useEffect(() => {
+        var _a, _b;
         // Explanation: if the user just logged out, the user from the hook might still be set
         // but the client will be null.
         // And if the user is not onboarding complete yet, the hook won't be set even though the client.user is set.
         // This is why we check for the user AND the client.user.
         const user = contextUser && getDynamicClient().user;
+        // Legacy wallet creation used to set the primary wallet as a side-effect on
+        // login. That path is gone in v5, so reconcile the primary wallet here from
+        // the user's verified credentials on login/session restore. No wallet is
+        // created — this only selects the primary wallet.
+        const clientUser = getDynamicClient().user;
+        if (clientUser === null || clientUser === void 0 ? void 0 : clientUser.verifiedCredentials) {
+            reconcilePrimaryWallet(clientUser);
+        }
+        if (wasShownExportPrompt && !acknowledgedExportPrompt) {
+            acknowledgedExportPrompt = true;
+        }
+        const shouldPromptKeyExport = Boolean((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.promptForKeyExport);
+        const shouldSyncPromptKeyExport = shouldPromptKeyExport && !acknowledgedExportPrompt;
+        if (!shouldSyncPromptKeyExport ||
+            !user ||
+            !projectSettings ||
+            !walletConnectorOptions.length || // no connectors to use for the embedded wallet
+            isLoadingEmbeddedWallet || // already has a wallet
+            globalLoading // this will be true if auth is in progress
+        ) {
+            return;
+        }
         const syncEmbeddedWallet = () => __awaiter(void 0, void 0, void 0, function* () {
             const isNewUser = user === null || user === void 0 ? void 0 : user.newUser;
-            if (shouldSyncCreateWallet) {
-                triggeredCreate.current = true;
-                try {
-                    yield createEmbeddedWallet();
-                }
-                catch (error) {
-                    if (error instanceof EmbeddedWalletException) {
-                        logger.debug('[useSyncEmbeddedWalletFlow][EmbeddedWalletException] Error creating embedded wallet', error);
-                    }
-                    else {
-                        logger.error('[useSyncEmbeddedWalletFlow] Error creating embedded wallet', error);
-                    }
-                    setShowAuthFlow(false);
-                }
-            }
-            if (shouldSyncPromptKeyExport &&
-                isNewUser &&
+            if (isNewUser &&
                 findEmbeddedWalletFromVerifiedCredentials(user) &&
                 primaryWallet) {
                 try {
@@ -99,42 +97,22 @@ const useSyncEmbeddedWalletFlow = () => {
                 }
             }
         });
-        const shouldCreateWallet = shouldAutoCreateEmbeddedWallet();
-        const shouldSyncCreateWallet = shouldCreateWallet && !triggeredCreate.current;
-        if (wasShownExportPrompt && !acknowledgedExportPrompt)
-            acknowledgedExportPrompt = true;
-        const shouldPromptKeyExport = shouldPromptForKeyExport();
-        const shouldSyncPromptKeyExport = shouldPromptKeyExport && !acknowledgedExportPrompt;
-        const shouldSyncEmbeddedWallet = shouldSyncCreateWallet || shouldSyncPromptKeyExport;
-        if (!shouldSyncEmbeddedWallet ||
-            !user ||
-            !projectSettings ||
-            !walletConnectorOptions.length || // no connectors to use for the embedded wallet
-            isLoadingEmbeddedWallet || // already has a wallet
-            globalLoading // this will be true if auth is in progress
-        ) {
-            return;
-        }
         syncEmbeddedWallet();
     }, [
         contextUser,
         projectSettings,
         primaryWalletId,
-        createEmbeddedWallet,
         isLoadingEmbeddedWallet,
         walletConnectorOptions,
         globalLoading,
-        shouldAutoCreateEmbeddedWallet,
         setShowAuthFlow,
         initExportProcess,
         primaryWallet,
-        shouldPromptForKeyExport,
         setWasShownExportPrompt,
         handleAcknowledgeExportPrompt,
         wasShownExportPrompt,
     ]);
     return {
-        acknowledgedExportPrompt,
         handleAcknowledgeExportPrompt,
     };
 };

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

@@ -46,9 +46,8 @@ require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../store/state/authMode/authMode.cjs');
 require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('react-dom');
-require('../../functions/compareChains/compareChains.cjs');
-require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
+require('../../functions/compareChains/compareChains.cjs');
 require('bs58');
 require('@dynamic-labs/types');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
@@ -82,14 +81,16 @@ require('../useSubdomainCheck/useSubdomainCheck.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../useGetMfaToken/useGetMfaToken.cjs');
+require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../useWalletBackup/useWalletBackup.cjs');
 require('../useWalletBackup/BackupError.cjs');
 require('../useWalletBackup/types.cjs');
 require('../useWalletBackup/cloudProviders.cjs');
+require('@hcaptcha/react-hcaptcha');
+require('@marsidev/react-turnstile');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
-require('@hcaptcha/react-hcaptcha');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.cjs');
 require('../../../views/ExchangeWhitelistWarning/ExchangeWhitelistWarning.cjs');
@@ -105,7 +106,6 @@ require('../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
 require('../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.cjs');
-require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../widgets/DynamicWidget/views/CryptoComOnramp/CryptoComOnramp.cjs');
 require('../../../../index.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysMfaWidgetView/ManagePasskeysMfaWidgetView.cjs');

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

@@ -42,9 +42,8 @@ import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../store/state/authMode/authMode.js';
 import '../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import 'react-dom';
-import '../../functions/compareChains/compareChains.js';
-import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../context/ThemeContext/ThemeContext.js';
+import '../../functions/compareChains/compareChains.js';
 import 'bs58';
 import '@dynamic-labs/types';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
@@ -78,14 +77,16 @@ import '../useSubdomainCheck/useSubdomainCheck.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../useGetMfaToken/useGetMfaToken.js';
+import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../useWalletBackup/useWalletBackup.js';
 import '../useWalletBackup/BackupError.js';
 import '../useWalletBackup/types.js';
 import '../useWalletBackup/cloudProviders.js';
+import '@hcaptcha/react-hcaptcha';
+import '@marsidev/react-turnstile';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
-import '@hcaptcha/react-hcaptcha';
 import '../../../context/LoadingContext/LoadingContext.js';
 import '../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.js';
 import '../../../views/ExchangeWhitelistWarning/ExchangeWhitelistWarning.js';
@@ -101,7 +102,6 @@ import '../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../views/TransactionConfirmationView/TransactionConfirmationView.js';
 import '../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.js';
-import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../widgets/DynamicWidget/views/CryptoComOnramp/CryptoComOnramp.js';
 import '../../../../index.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysMfaWidgetView/ManagePasskeysMfaWidgetView.js';

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 require('../../constants/values.cjs');
-require('@dynamic-labs/utils');
 require('@dynamic-labs/multi-wallet');
+require('@dynamic-labs/utils');
 var logger = require('../../../shared/logger.cjs');
 require('react-international-phone');
 require('../../constants/colors.cjs');

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

@@ -2,8 +2,8 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { ProviderEnum } from '@dynamic-labs/sdk-api-core';
 import '../../constants/values.js';
-import '@dynamic-labs/utils';
 import '@dynamic-labs/multi-wallet';
+import '@dynamic-labs/utils';
 import { logger } from '../../../shared/logger.js';
 import 'react-international-phone';
 import '../../constants/colors.js';

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

@@ -20,11 +20,11 @@ require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/consts/index.cjs');
-var errors = require('../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
 require('@dynamic-labs-wallet/browser-wallet-client');
+var getEmbeddedBitcoinActiveAddress = require('../../functions/getEmbeddedBitcoinActiveAddress/getEmbeddedBitcoinActiveAddress.cjs');
 var utils$1 = require('../../../data/api/utils.cjs');
 require('@dynamic-labs/locale');
 var dynamicContextProps = require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
@@ -39,20 +39,22 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 var balances = require('../../../data/api/chains/balances.cjs');
 var authMode = require('../../../store/state/authMode/authMode.cjs');
 var tokenBalances = require('../../../store/state/tokenBalances.cjs');
+var errors = require('../../constants/errors.cjs');
 var useDynamicEvents = require('../events/useDynamicEvents/useDynamicEvents.cjs');
 var utils = require('./utils.cjs');
 
 // Hook exposed to customers and used internally to fetch account balances
 const useTokenBalances = ({ accountAddress, networkId, chainName, tokenAddresses, includeFiat = false, includeNativeBalance = false, filterSpamTokens = true, forceRefresh = false, whitelistedContracts, } = {}) => {
-    var _a;
+    var _a, _b;
     const tokenBalancesState = tokenBalances.useTokenBalancesState();
     const { tokenBalances: tokenBalances$1, isLoading, error } = tokenBalancesState;
     const { primaryWallet, network } = useInternalDynamicContext.useInternalDynamicContext();
     const walletConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
-    const requestAccount = accountAddress !== null && accountAddress !== void 0 ? accountAddress : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
-    const requestChainName = (_a = chainName !== null && chainName !== void 0 ? chainName : walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain) !== null && _a !== void 0 ? _a : sdkApiCore.ChainEnum.Evm;
+    // Per-network address: balances must query the selected network's encoding.
+    const requestAccount = (_a = accountAddress !== null && accountAddress !== void 0 ? accountAddress : getEmbeddedBitcoinActiveAddress.getEmbeddedBitcoinActiveAddress(walletConnector)) !== null && _a !== void 0 ? _a : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
+    const requestChainName = (_b = chainName !== null && chainName !== void 0 ? chainName : walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain) !== null && _b !== void 0 ? _b : sdkApiCore.ChainEnum.Evm;
     const fetchAccountBalances = React.useCallback((...args_1) => _tslib.__awaiter(void 0, [...args_1], void 0, function* (forceRefresh = false) {
-        var _b;
+        var _c;
         const user = getUserProfile.getUserProfile();
         const authMode$1 = authMode.getAuthMode();
         if (authMode$1 !== 'connect-only' && !user) {
@@ -61,7 +63,7 @@ const useTokenBalances = ({ accountAddress, networkId, chainName, tokenAddresses
         }
         const projectSettings = getProjectSettings.getProjectSettings();
         if (authMode$1 === 'connect-only' &&
-            !((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.featureFlags) === null || _b === void 0 ? void 0 : _b.connectOnlyMultiAsset)) {
+            !((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.featureFlags) === null || _c === void 0 ? void 0 : _c.connectOnlyMultiAsset)) {
             return;
         }
         // the reason why we need to get the network here again instead of using the value
@@ -126,6 +128,8 @@ const useTokenBalances = ({ accountAddress, networkId, chainName, tokenAddresses
         filterSpamTokens,
         networkId,
         walletConnector,
+        // re-fetch when the picker's network changes (per-network addresses)
+        network,
     ]);
     useDynamicEvents.useInternalDynamicEvents('tokenBalancesChanged', () => fetchAccountBalances(true));
     React.useEffect(() => {

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

@@ -16,11 +16,11 @@ import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/consts/index.js';
-import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
 import '@dynamic-labs-wallet/browser-wallet-client';
+import { getEmbeddedBitcoinActiveAddress } from '../../functions/getEmbeddedBitcoinActiveAddress/getEmbeddedBitcoinActiveAddress.js';
 import { logResponseError } from '../../../data/api/utils.js';
 import '@dynamic-labs/locale';
 import { useDynamicSettings, getEnvironmentId } from '../../../store/state/dynamicContextProps/dynamicContextProps.js';
@@ -35,20 +35,22 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 import { getAccountTokenBalances } from '../../../data/api/chains/balances.js';
 import { getAuthMode } from '../../../store/state/authMode/authMode.js';
 import { useTokenBalancesState, setTokenBalanceVariable } from '../../../store/state/tokenBalances.js';
+import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import { useInternalDynamicEvents } from '../events/useDynamicEvents/useDynamicEvents.js';
 import { resolveNetworkIdForRequest, getTokenBalanceErrorMessage } from './utils.js';
 
 // Hook exposed to customers and used internally to fetch account balances
 const useTokenBalances = ({ accountAddress, networkId, chainName, tokenAddresses, includeFiat = false, includeNativeBalance = false, filterSpamTokens = true, forceRefresh = false, whitelistedContracts, } = {}) => {
-    var _a;
+    var _a, _b;
     const tokenBalancesState = useTokenBalancesState();
     const { tokenBalances, isLoading, error } = tokenBalancesState;
     const { primaryWallet, network } = useInternalDynamicContext();
     const walletConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
-    const requestAccount = accountAddress !== null && accountAddress !== void 0 ? accountAddress : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
-    const requestChainName = (_a = chainName !== null && chainName !== void 0 ? chainName : walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain) !== null && _a !== void 0 ? _a : ChainEnum.Evm;
+    // Per-network address: balances must query the selected network's encoding.
+    const requestAccount = (_a = accountAddress !== null && accountAddress !== void 0 ? accountAddress : getEmbeddedBitcoinActiveAddress(walletConnector)) !== null && _a !== void 0 ? _a : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
+    const requestChainName = (_b = chainName !== null && chainName !== void 0 ? chainName : walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain) !== null && _b !== void 0 ? _b : ChainEnum.Evm;
     const fetchAccountBalances = useCallback((...args_1) => __awaiter(void 0, [...args_1], void 0, function* (forceRefresh = false) {
-        var _b;
+        var _c;
         const user = getUserProfile();
         const authMode = getAuthMode();
         if (authMode !== 'connect-only' && !user) {
@@ -57,7 +59,7 @@ const useTokenBalances = ({ accountAddress, networkId, chainName, tokenAddresses
         }
         const projectSettings = getProjectSettings();
         if (authMode === 'connect-only' &&
-            !((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.featureFlags) === null || _b === void 0 ? void 0 : _b.connectOnlyMultiAsset)) {
+            !((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.featureFlags) === null || _c === void 0 ? void 0 : _c.connectOnlyMultiAsset)) {
             return;
         }
         // the reason why we need to get the network here again instead of using the value
@@ -122,6 +124,8 @@ const useTokenBalances = ({ accountAddress, networkId, chainName, tokenAddresses
         filterSpamTokens,
         networkId,
         walletConnector,
+        // re-fetch when the picker's network changes (per-network addresses)
+        network,
     ]);
     useInternalDynamicEvents('tokenBalancesChanged', () => fetchAccountBalances(true));
     useEffect(() => {

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

@@ -20,7 +20,6 @@ require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/consts/index.cjs');
-var errors = require('../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 var getVerifyArgs = require('../../functions/getVerifyArgs/getVerifyArgs.cjs');
@@ -29,14 +28,14 @@ var updatePrimaryWalletId = require('../../functions/updatePrimaryWalletId/updat
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 var dynamicContextProps = require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
-require('@dynamic-labs/locale');
-var wallets = require('../../../data/api/wallets/wallets.cjs');
 require('../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
 require('../../../events/dynamicEvents.cjs');
 var useOnboardingCompleteUser = require('../../../client/extension/user/useOnboardingCompleteUser/useOnboardingCompleteUser.cjs');
 require('../../../context/DynamicContext/useDynamicContext/useDynamicContext.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
+var wallets = require('../../../data/api/wallets/wallets.cjs');
+var errors = require('../../constants/errors.cjs');
 
 const useTransferWallet = () => {
     const user = useOnboardingCompleteUser.useOnboardingCompleteUser();

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

@@ -16,7 +16,6 @@ import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/consts/index.js';
-import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import { getVerifyArgs } from '../../functions/getVerifyArgs/getVerifyArgs.js';
@@ -25,14 +24,14 @@ import { updatePrimaryWalletId } from '../../functions/updatePrimaryWalletId/upd
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import { useDynamicSettings, useEnvironmentId } from '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
-import '@dynamic-labs/locale';
-import { transferWallet } from '../../../data/api/wallets/wallets.js';
 import '../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import '../../../events/dynamicEvents.js';
 import { useOnboardingCompleteUser } from '../../../client/extension/user/useOnboardingCompleteUser/useOnboardingCompleteUser.js';
 import '../../../context/DynamicContext/useDynamicContext/useDynamicContext.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
+import { transferWallet } from '../../../data/api/wallets/wallets.js';
+import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 
 const useTransferWallet = () => {
     const user = useOnboardingCompleteUser();