npm - @dynamic-labs/sdk-react-core - Versions diffs - 4.6.3 → 4.7.1 - Mend

@dynamic-labs/sdk-react-core 4.6.3 → 4.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (704) hide show

package/src/lib/utils/hooks/useOpenFundingOptions/useOpenFundingOptions.js CHANGED Viewed

@@ -46,7 +46,6 @@ import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
-import '@dynamic-labs/store';
 import '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';

package/src/lib/utils/hooks/usePasskeyRecovery/usePasskeyRecovery.cjs CHANGED Viewed

@@ -62,7 +62,6 @@ require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
-require('@dynamic-labs/store');
 require('../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

package/src/lib/utils/hooks/usePasskeyRecovery/usePasskeyRecovery.js CHANGED Viewed

@@ -58,7 +58,6 @@ import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
-import '@dynamic-labs/store';
 import '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';

package/src/lib/utils/hooks/useRefreshUser/useRefreshUser.cjs CHANGED Viewed

@@ -51,7 +51,6 @@ require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
-require('@dynamic-labs/store');
 require('../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

package/src/lib/utils/hooks/useRefreshUser/useRefreshUser.js CHANGED Viewed

@@ -47,7 +47,6 @@ import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
-import '@dynamic-labs/store';
 import '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';

package/src/lib/utils/hooks/useRpcProviders/useRpcProviders.cjs CHANGED Viewed

@@ -50,7 +50,6 @@ require('../../../views/CollectUserDataView/useFields.cjs');
 require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('../../../store/state/loadingAndLifecycle.cjs');
-require('@dynamic-labs/store');
 require('../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

package/src/lib/utils/hooks/useRpcProviders/useRpcProviders.js CHANGED Viewed

@@ -46,7 +46,6 @@ import '../../../views/CollectUserDataView/useFields.js';
 import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '../../../store/state/loadingAndLifecycle.js';
-import '@dynamic-labs/store';
 import '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';

package/src/lib/utils/hooks/useSetWalletConnectorFetchers/useSetWalletConnectorFetchers.cjs CHANGED Viewed

@@ -51,7 +51,6 @@ require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
-require('@dynamic-labs/store');
 require('../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

package/src/lib/utils/hooks/useSetWalletConnectorFetchers/useSetWalletConnectorFetchers.js CHANGED Viewed

@@ -47,7 +47,6 @@ import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
-import '@dynamic-labs/store';
 import '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';

package/src/lib/utils/hooks/useSmartWallets/useSmartWallets.cjs CHANGED Viewed

@@ -50,7 +50,6 @@ require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
-require('@dynamic-labs/store');
 require('../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

package/src/lib/utils/hooks/useSmartWallets/useSmartWallets.js CHANGED Viewed

@@ -46,7 +46,6 @@ import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
-import '@dynamic-labs/store';
 import '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';

package/src/lib/utils/hooks/useSocialAccounts/useSocialAccounts.cjs CHANGED Viewed

@@ -52,7 +52,6 @@ require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
-require('@dynamic-labs/store');
 require('../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

package/src/lib/utils/hooks/useSocialAccounts/useSocialAccounts.js CHANGED Viewed

@@ -48,7 +48,6 @@ import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
-import '@dynamic-labs/store';
 import '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';

package/src/lib/utils/hooks/useSocialAuth/useSocialAuth.cjs CHANGED Viewed

@@ -57,7 +57,6 @@ require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
-require('@dynamic-labs/store');
 require('../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

package/src/lib/utils/hooks/useSocialAuth/useSocialAuth.js CHANGED Viewed

@@ -53,7 +53,6 @@ import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
-import '@dynamic-labs/store';
 import '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';

package/src/lib/utils/hooks/useSubdomainCheck/useSubdomainCheck.cjs CHANGED Viewed

@@ -51,7 +51,6 @@ require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
-require('@dynamic-labs/store');
 require('../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

package/src/lib/utils/hooks/useSubdomainCheck/useSubdomainCheck.js CHANGED Viewed

@@ -47,7 +47,6 @@ import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
-import '@dynamic-labs/store';
 import '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';

package/src/lib/utils/hooks/useSwitchWallet/useSwitchWallet.cjs CHANGED Viewed

@@ -51,7 +51,6 @@ require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
-require('@dynamic-labs/store');
 require('../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

package/src/lib/utils/hooks/useSwitchWallet/useSwitchWallet.js CHANGED Viewed

@@ -47,7 +47,6 @@ import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
-import '@dynamic-labs/store';
 import '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';

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

@@ -52,7 +52,6 @@ require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
-require('@dynamic-labs/store');
 require('../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

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

@@ -48,7 +48,6 @@ import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
-import '@dynamic-labs/store';
 import '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';

package/src/lib/utils/hooks/useSyncMfaFlow/useSyncMfaFlow.cjs CHANGED Viewed

@@ -52,7 +52,6 @@ require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
-require('@dynamic-labs/store');
 require('../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

package/src/lib/utils/hooks/useSyncMfaFlow/useSyncMfaFlow.js CHANGED Viewed

@@ -48,7 +48,6 @@ import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
-import '@dynamic-labs/store';
 import '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';

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

@@ -51,7 +51,6 @@ require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
-require('@dynamic-labs/store');
 require('../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

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

@@ -47,7 +47,6 @@ import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
-import '@dynamic-labs/store';
 import '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';

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

@@ -50,7 +50,6 @@ require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
-require('@dynamic-labs/store');
 require('../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

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

@@ -46,7 +46,6 @@ import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
-import '@dynamic-labs/store';
 import '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';

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

@@ -9,7 +9,7 @@ var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var tokenBalances = require('../../../store/state/tokenBalances.cjs');
 var balances = require('../../../data/api/chains/balances.cjs');
 require('../../../context/DynamicContext/DynamicContext.cjs');
-require('../../../shared/logger.cjs');
+var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
@@ -26,10 +26,10 @@ var errors = require('../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
-require('../../../store/state/projectSettings/projectSettings.cjs');
+var projectSettings = require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../config/ApiEndpoint.cjs');
 var utils = require('../../../data/api/utils.cjs');
-require('../../../store/state/user/user.cjs');
+var user = require('../../../store/state/user/user.cjs');
 require('../../../locale/locale.cjs');
 var dynamicContextProps = require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
@@ -55,7 +55,6 @@ require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
-require('@dynamic-labs/store');
 require('../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
@@ -101,48 +100,61 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 const useTokenBalances = ({ accountAddress, networkId, chainName = sdkApiCore.ChainEnum.Evm, tokenAddresses, includeFiat = false, includeNativeBalance = false, } = {}) => {
     const tokenBalancesState = tokenBalances.useTokenBalancesState();
     const { tokenBalances: tokenBalances$1, isLoading, error } = tokenBalancesState;
-    const { primaryWallet, environmentId, network, user, projectSettings, authMode, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { primaryWallet, authMode, network } = useInternalDynamicContext.useInternalDynamicContext();
     const walletConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
-    const requestChainName = chainName !== null && chainName !== void 0 ? chainName : walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain;
     const requestAccount = accountAddress !== null && accountAddress !== void 0 ? accountAddress : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
-    const requestNetwork = networkId !== null && networkId !== void 0 ? networkId : network;
+    const requestChainName = chainName !== null && chainName !== void 0 ? chainName : walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain;
     const fetchAccountBalances = React.useCallback((...args_1) => _tslib.__awaiter(void 0, [...args_1], void 0, function* (forceRefresh = false) {
         var _a;
-        if (authMode !== 'connect-only' && !user) {
+        const user$1 = user.getUser();
+        if (authMode !== 'connect-only' && !user$1) {
             tokenBalances.setTokenBalanceVariable('error', errors.USER_NOT_LOGGED_IN);
             return;
         }
+        const projectSettings$1 = projectSettings.getProjectSettings();
         if (authMode === 'connect-only' &&
-            !((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.featureFlags) === null || _a === void 0 ? void 0 : _a.connectOnlyMultiAsset)) {
+            !((_a = projectSettings$1 === null || projectSettings$1 === void 0 ? void 0 : projectSettings$1.sdk.featureFlags) === null || _a === void 0 ? void 0 : _a.connectOnlyMultiAsset)) {
             return;
         }
         if (![sdkApiCore.ChainEnum.Evm, sdkApiCore.ChainEnum.Sol].includes(requestChainName)) {
             tokenBalances.setTokenBalanceVariable('error', `Chain ${requestChainName} is not supported for token balances`);
             return;
         }
-        const isValidEvmRequest = chainName === sdkApiCore.ChainEnum.Evm &&
+        // the reason why we need to get the network here again insteaf of using the value
+        // from DynamicContext is because this function might run before the network state is
+        // properly set when switching wallets, so we want to make sure we have the latest network
+        const requestNetwork = networkId !== null && networkId !== void 0 ? networkId : (yield (walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getNetwork(true)));
+        const isValidEvmRequest = requestChainName === sdkApiCore.ChainEnum.Evm &&
             requestNetwork &&
             !isNaN(Number(requestNetwork));
-        const isValidRequest = isValidEvmRequest || chainName === sdkApiCore.ChainEnum.Sol;
+        const isValidRequest = isValidEvmRequest || requestChainName === sdkApiCore.ChainEnum.Sol;
+        logger.logger.logVerboseTroubleshootingMessage('[useTokenBalances] will try to fetch token balances', {
+            isLoading,
+            isValidRequest,
+            networkId,
+            requestAccount,
+            requestChainName,
+            requestNetwork,
+        });
         if (isLoading || !requestAccount || !isValidRequest) {
             tokenBalances.setTokenBalanceVariable('tokenBalances', undefined);
             return;
         }
         tokenBalances.setTokenBalanceVariable('isLoading', true);
+        let response = [];
         try {
-            const response = yield balances.getAccountTokenBalances({
+            response = yield balances.getAccountTokenBalances({
                 accountAddress: requestAccount,
                 chainName: requestChainName,
-                environmentId,
+                environmentId: dynamicContextProps.getEnvironmentId(),
                 forceRefresh,
                 includeNative: includeNativeBalance,
                 includePrices: includeFiat,
-                networkId: chainName === sdkApiCore.ChainEnum.Evm ? Number(requestNetwork) : 0,
+                networkId: requestChainName === sdkApiCore.ChainEnum.Evm ? Number(requestNetwork) : 0,
             });
             if (!response)
                 return;
             tokenBalances.setTokenBalanceVariable('error', undefined);
-            tokenBalances.setTokenBalanceVariable('tokenBalances', response);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
         }
         catch (e) {
@@ -151,23 +163,23 @@ const useTokenBalances = ({ accountAddress, networkId, chainName = sdkApiCore.Ch
             tokenBalances.setTokenBalanceVariable('error', errorMessage);
         }
         finally {
+            tokenBalances.setTokenBalanceVariable('tokenBalances', response);
             tokenBalances.setTokenBalanceVariable('isLoading', false);
         }
     }), [
-        user,
         requestChainName,
-        chainName,
-        requestNetwork,
         isLoading,
         requestAccount,
-        environmentId,
         includeNativeBalance,
         includeFiat,
+        authMode,
+        networkId,
+        walletConnector,
     ]);
     useDynamicEvents.useInternalDynamicEvents('tokenBalancesChanged', () => fetchAccountBalances(true));
     React.useEffect(() => {
         fetchAccountBalances();
-    }, [requestAccount, requestNetwork]);
+    }, [requestAccount, network, networkId]);
     const { tokensFilter } = dynamicContextProps.useDynamicSettings();
     const lowerTokenAddresses = tokenAddresses === null || tokenAddresses === void 0 ? void 0 : tokenAddresses.map((address) => address.toLowerCase());
     const initialTokenBalances = lowerTokenAddresses

package/src/lib/utils/hooks/useTokenBalances/useTokenBalances.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { ChainEnum } from '@dynamic-labs/sdk-api-core';
+import { ChainEnum, TokenBalance } from '@dynamic-labs/sdk-api-core';
 export declare const useTokenBalances: ({ accountAddress, networkId, chainName, tokenAddresses, includeFiat, includeNativeBalance, }?: {
     accountAddress?: string;
     networkId?: number;
@@ -11,5 +11,5 @@ export declare const useTokenBalances: ({ accountAddress, networkId, chainName,
     fetchAccountBalances: (forceRefresh?: boolean) => Promise<void>;
     isError: boolean;
     isLoading: boolean;
-    tokenBalances: import("@dynamic-labs/sdk-api-core").TokenBalance[];
+    tokenBalances: TokenBalance[];
 };

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

@@ -5,7 +5,7 @@ import { ChainEnum } from '@dynamic-labs/sdk-api-core';
 import { useTokenBalancesState, setTokenBalanceVariable } from '../../../store/state/tokenBalances.js';
 import { getAccountTokenBalances } from '../../../data/api/chains/balances.js';
 import '../../../context/DynamicContext/DynamicContext.js';
-import '../../../shared/logger.js';
+import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
@@ -22,12 +22,12 @@ 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 '../../../store/state/projectSettings/projectSettings.js';
+import { getProjectSettings } from '../../../store/state/projectSettings/projectSettings.js';
 import '../../../config/ApiEndpoint.js';
 import { logResponseError } from '../../../data/api/utils.js';
-import '../../../store/state/user/user.js';
+import { getUser } from '../../../store/state/user/user.js';
 import '../../../locale/locale.js';
-import { useDynamicSettings } from '../../../store/state/dynamicContextProps/dynamicContextProps.js';
+import { useDynamicSettings, getEnvironmentId } from '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
@@ -51,7 +51,6 @@ import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
-import '@dynamic-labs/store';
 import '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
@@ -97,17 +96,18 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 const useTokenBalances = ({ accountAddress, networkId, chainName = ChainEnum.Evm, tokenAddresses, includeFiat = false, includeNativeBalance = false, } = {}) => {
     const tokenBalancesState = useTokenBalancesState();
     const { tokenBalances, isLoading, error } = tokenBalancesState;
-    const { primaryWallet, environmentId, network, user, projectSettings, authMode, } = useInternalDynamicContext();
+    const { primaryWallet, authMode, network } = useInternalDynamicContext();
     const walletConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
-    const requestChainName = chainName !== null && chainName !== void 0 ? chainName : walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain;
     const requestAccount = accountAddress !== null && accountAddress !== void 0 ? accountAddress : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
-    const requestNetwork = networkId !== null && networkId !== void 0 ? networkId : network;
+    const requestChainName = chainName !== null && chainName !== void 0 ? chainName : walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain;
     const fetchAccountBalances = useCallback((...args_1) => __awaiter(void 0, [...args_1], void 0, function* (forceRefresh = false) {
         var _a;
+        const user = getUser();
         if (authMode !== 'connect-only' && !user) {
             setTokenBalanceVariable('error', USER_NOT_LOGGED_IN);
             return;
         }
+        const projectSettings = getProjectSettings();
         if (authMode === 'connect-only' &&
             !((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.featureFlags) === null || _a === void 0 ? void 0 : _a.connectOnlyMultiAsset)) {
             return;
@@ -116,29 +116,41 @@ const useTokenBalances = ({ accountAddress, networkId, chainName = ChainEnum.Evm
             setTokenBalanceVariable('error', `Chain ${requestChainName} is not supported for token balances`);
             return;
         }
-        const isValidEvmRequest = chainName === ChainEnum.Evm &&
+        // the reason why we need to get the network here again insteaf of using the value
+        // from DynamicContext is because this function might run before the network state is
+        // properly set when switching wallets, so we want to make sure we have the latest network
+        const requestNetwork = networkId !== null && networkId !== void 0 ? networkId : (yield (walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getNetwork(true)));
+        const isValidEvmRequest = requestChainName === ChainEnum.Evm &&
             requestNetwork &&
             !isNaN(Number(requestNetwork));
-        const isValidRequest = isValidEvmRequest || chainName === ChainEnum.Sol;
+        const isValidRequest = isValidEvmRequest || requestChainName === ChainEnum.Sol;
+        logger.logVerboseTroubleshootingMessage('[useTokenBalances] will try to fetch token balances', {
+            isLoading,
+            isValidRequest,
+            networkId,
+            requestAccount,
+            requestChainName,
+            requestNetwork,
+        });
         if (isLoading || !requestAccount || !isValidRequest) {
             setTokenBalanceVariable('tokenBalances', undefined);
             return;
         }
         setTokenBalanceVariable('isLoading', true);
+        let response = [];
         try {
-            const response = yield getAccountTokenBalances({
+            response = yield getAccountTokenBalances({
                 accountAddress: requestAccount,
                 chainName: requestChainName,
-                environmentId,
+                environmentId: getEnvironmentId(),
                 forceRefresh,
                 includeNative: includeNativeBalance,
                 includePrices: includeFiat,
-                networkId: chainName === ChainEnum.Evm ? Number(requestNetwork) : 0,
+                networkId: requestChainName === ChainEnum.Evm ? Number(requestNetwork) : 0,
             });
             if (!response)
                 return;
             setTokenBalanceVariable('error', undefined);
-            setTokenBalanceVariable('tokenBalances', response);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
         }
         catch (e) {
@@ -147,23 +159,23 @@ const useTokenBalances = ({ accountAddress, networkId, chainName = ChainEnum.Evm
             setTokenBalanceVariable('error', errorMessage);
         }
         finally {
+            setTokenBalanceVariable('tokenBalances', response);
             setTokenBalanceVariable('isLoading', false);
         }
     }), [
-        user,
         requestChainName,
-        chainName,
-        requestNetwork,
         isLoading,
         requestAccount,
-        environmentId,
         includeNativeBalance,
         includeFiat,
+        authMode,
+        networkId,
+        walletConnector,
     ]);
     useInternalDynamicEvents('tokenBalancesChanged', () => fetchAccountBalances(true));
     useEffect(() => {
         fetchAccountBalances();
-    }, [requestAccount, requestNetwork]);
+    }, [requestAccount, network, networkId]);
     const { tokensFilter } = useDynamicSettings();
     const lowerTokenAddresses = tokenAddresses === null || tokenAddresses === void 0 ? void 0 : tokenAddresses.map((address) => address.toLowerCase());
     const initialTokenBalances = lowerTokenAddresses

package/src/lib/utils/hooks/useTransactionSimulation/classes/useBaseTransactionSimulation.cjs CHANGED Viewed

@@ -51,7 +51,6 @@ require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../../store/state/loadingAndLifecycle.cjs');
-require('@dynamic-labs/store');
 require('../../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

package/src/lib/utils/hooks/useTransactionSimulation/classes/useBaseTransactionSimulation.js CHANGED Viewed

@@ -47,7 +47,6 @@ import '../../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../../store/state/loadingAndLifecycle.js';
-import '@dynamic-labs/store';
 import '../../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';

package/src/lib/utils/hooks/useTransactionSimulation/classes/useSVMTransactionSimulation.cjs CHANGED Viewed

@@ -43,7 +43,7 @@ const useSVMTransactionSimulation = () => {
             const fee = fees.reduce((acc, curr) => acc + curr, BigInt(0));
             const result = yield blockaid.simulateBlockaidSVMTransaction({
                 accountAddress: primaryWallet.address,
-                chain: (yield primaryWallet.connector.getNetwork()),
+                chain: (yield primaryWallet.connector.getNetwork(true)),
                 environmentId,
                 transactions: encodedTransactions,
             });

package/src/lib/utils/hooks/useTransactionSimulation/classes/useSVMTransactionSimulation.js CHANGED Viewed

@@ -35,7 +35,7 @@ const useSVMTransactionSimulation = () => {
             const fee = fees.reduce((acc, curr) => acc + curr, BigInt(0));
             const result = yield simulateBlockaidSVMTransaction({
                 accountAddress: primaryWallet.address,
-                chain: (yield primaryWallet.connector.getNetwork()),
+                chain: (yield primaryWallet.connector.getNetwork(true)),
                 environmentId,
                 transactions: encodedTransactions,
             });

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

@@ -55,7 +55,6 @@ require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
-require('@dynamic-labs/store');
 require('../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

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

@@ -51,7 +51,6 @@ import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
-import '@dynamic-labs/store';
 import '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';

package/src/lib/utils/hooks/useUpgradeEmbeddedWallet/useUpgradeEmbeddedWallet.cjs CHANGED Viewed

@@ -58,7 +58,6 @@ require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
-require('@dynamic-labs/store');
 require('../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

package/src/lib/utils/hooks/useUpgradeEmbeddedWallet/useUpgradeEmbeddedWallet.js CHANGED Viewed

@@ -54,7 +54,6 @@ import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
-import '@dynamic-labs/store';
 import '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';