@dynamic-labs/sdk-react-core 4.6.2 → 4.7.0

package/src/lib/utils/constants/localStorage.cjs

@@ -19,6 +19,7 @@ const EMBEDDED_WALLET_SESSION_SETTINGS = 'dynamic_embedded_wallet_session_settin
 const EMBEDDED_WALLET_SECURE_BANNER = 'dynamic_embedded_secure_banner';
 const PHONE_INPUT_DEFAULT_COUNTRY = 'dynamic_phone_input_default_country';
 const CAPTCHA_TOKEN = 'dynamic_captcha_token';
+const ZERODEV_AUTHORIZATION = 'zerodev_authorization';
 /**
  * Used to identify the purpose of a signature after phantom redirects back to the app in mobile
  */
@@ -49,3 +50,4 @@ exports.SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS = SECURE_ENCLAVE_WALL
 exports.STORE_STORAGE_KEY = STORE_STORAGE_KEY;
 exports.WAGMI_LAST_SESSION_SETTINGS = WAGMI_LAST_SESSION_SETTINGS;
 exports.WALLET_PICKER_SEARCH_KEY = WALLET_PICKER_SEARCH_KEY;
+exports.ZERODEV_AUTHORIZATION = ZERODEV_AUTHORIZATION;

package/src/lib/utils/constants/localStorage.d.ts

@@ -17,6 +17,7 @@ export declare const EMBEDDED_WALLET_SESSION_SETTINGS = "dynamic_embedded_wallet
 export declare const EMBEDDED_WALLET_SECURE_BANNER = "dynamic_embedded_secure_banner";
 export declare const PHONE_INPUT_DEFAULT_COUNTRY = "dynamic_phone_input_default_country";
 export declare const CAPTCHA_TOKEN = "dynamic_captcha_token";
+export declare const ZERODEV_AUTHORIZATION = "zerodev_authorization";
 export type PhantomSignatureState = {
     /**
      * Whether the user has agreed to transfer a wallet even if that means

package/src/lib/utils/constants/localStorage.js

@@ -15,6 +15,7 @@ const EMBEDDED_WALLET_SESSION_SETTINGS = 'dynamic_embedded_wallet_session_settin
 const EMBEDDED_WALLET_SECURE_BANNER = 'dynamic_embedded_secure_banner';
 const PHONE_INPUT_DEFAULT_COUNTRY = 'dynamic_phone_input_default_country';
 const CAPTCHA_TOKEN = 'dynamic_captcha_token';
+const ZERODEV_AUTHORIZATION = 'zerodev_authorization';
 /**
  * Used to identify the purpose of a signature after phantom redirects back to the app in mobile
  */
@@ -25,4 +26,4 @@ const SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS = {
     priority: ['secureStorage', 'localStorage'],
 };
 
-export { AUTH_EXPIRES_AT, AUTH_MIN_TOKEN, AUTH_TOKEN, BRIDGE_ONBOARDING_COMPLETED, CAPTCHA_TOKEN, CONNECTED_WALLETS_INFO, CONNECTED_WALLET_NAME_SERVICE, DEVICE_FINGERPRINT, DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, EMBEDDED_WALLET_SECURE_BANNER, EMBEDDED_WALLET_SESSION_SETTINGS, LAST_USED_WALLET, NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY, PHANTOM_SIGNATURE_STATE, PHONE_INPUT_DEFAULT_COUNTRY, SECURE_ENCLAVE_WALLET_SESSION_KEYS, SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS, STORE_STORAGE_KEY, WAGMI_LAST_SESSION_SETTINGS, WALLET_PICKER_SEARCH_KEY };
+export { AUTH_EXPIRES_AT, AUTH_MIN_TOKEN, AUTH_TOKEN, BRIDGE_ONBOARDING_COMPLETED, CAPTCHA_TOKEN, CONNECTED_WALLETS_INFO, CONNECTED_WALLET_NAME_SERVICE, DEVICE_FINGERPRINT, DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, EMBEDDED_WALLET_SECURE_BANNER, EMBEDDED_WALLET_SESSION_SETTINGS, LAST_USED_WALLET, NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY, PHANTOM_SIGNATURE_STATE, PHONE_INPUT_DEFAULT_COUNTRY, SECURE_ENCLAVE_WALLET_SESSION_KEYS, SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS, STORE_STORAGE_KEY, WAGMI_LAST_SESSION_SETTINGS, WALLET_PICKER_SEARCH_KEY, ZERODEV_AUTHORIZATION };

package/src/lib/utils/functions/generateMessages/index.cjs

@@ -14,7 +14,7 @@ const generateMessages = (publicWalletAddress, walletConnector, nonce, projectEn
     if (!walletConnector.connectedChain) {
         throw new utils.DynamicError('Wallet is not connected');
     }
-    let chainId = yield walletConnector.getNetwork();
+    let chainId = yield walletConnector.getNetwork(true);
     if (chainId === undefined) {
         if (walletConnector.key === 'bloctoevm') {
             chainId = 137;

package/src/lib/utils/functions/generateMessages/index.js

@@ -10,7 +10,7 @@ const generateMessages = (publicWalletAddress, walletConnector, nonce, projectEn
     if (!walletConnector.connectedChain) {
         throw new DynamicError('Wallet is not connected');
     }
-    let chainId = yield walletConnector.getNetwork();
+    let chainId = yield walletConnector.getNetwork(true);
     if (chainId === undefined) {
         if (walletConnector.key === 'bloctoevm') {
             chainId = 137;

package/src/lib/utils/functions/getVerifyArgs/getVerifyArgs.cjs

@@ -18,7 +18,7 @@ const getVerifyArgs = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* (
     const chain = walletConnector.connectedChain;
     if (signedMessageOverride && messageToSignOverride) {
         const [network, additionalWalletAddresses] = yield Promise.all([
-            walletConnector.getNetwork(),
+            walletConnector.getNetwork(true),
             walletConnector.getAdditionalAddresses(publicWalletAddress),
         ]);
         return {
@@ -37,7 +37,7 @@ const getVerifyArgs = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* (
     // generate message to sign and then initiate signing step to prove ownership
     const { messageToSign, signedMessage } = yield index.generateMessages(publicWalletAddress, walletConnector, nonce$1, environmentId, displaySiweStatement, siweStatement);
     const [network, additionalWalletAddresses] = yield Promise.all([
-        walletConnector.getNetwork(),
+        walletConnector.getNetwork(true),
         walletConnector.getAdditionalAddresses(publicWalletAddress),
     ]);
     return {

package/src/lib/utils/functions/getVerifyArgs/getVerifyArgs.js

@@ -14,7 +14,7 @@ const getVerifyArgs = (_a) => __awaiter(void 0, [_a], void 0, function* ({ walle
     const chain = walletConnector.connectedChain;
     if (signedMessageOverride && messageToSignOverride) {
         const [network, additionalWalletAddresses] = yield Promise.all([
-            walletConnector.getNetwork(),
+            walletConnector.getNetwork(true),
             walletConnector.getAdditionalAddresses(publicWalletAddress),
         ]);
         return {
@@ -33,7 +33,7 @@ const getVerifyArgs = (_a) => __awaiter(void 0, [_a], void 0, function* ({ walle
     // generate message to sign and then initiate signing step to prove ownership
     const { messageToSign, signedMessage } = yield generateMessages(publicWalletAddress, walletConnector, nonce, environmentId, displaySiweStatement, siweStatement);
     const [network, additionalWalletAddresses] = yield Promise.all([
-        walletConnector.getNetwork(),
+        walletConnector.getNetwork(true),
         walletConnector.getAdditionalAddresses(publicWalletAddress),
     ]);
     return {

package/src/lib/utils/functions/index.d.ts

@@ -32,7 +32,6 @@ export * from './getSocialSignInProviderFromString';
 export * from './getUserProfileFields';
 export * from './getUserWalletsFromVerifiedCredentials';
 export * from './getVerifyArgs';
-export * from './getWalletConnectorNetworks/getWalletConnectorNetworks';
 export * from './getWalletIdentifier';
 export * from './groupBy';
 export * from './isAccountAbstractionWallet';

package/src/lib/utils/functions/isSupportedNetwork/isSupportedNetwork.cjs

@@ -3,10 +3,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var getWalletConnectorNetworks = require('../getWalletConnectorNetworks/getWalletConnectorNetworks.cjs');
-
 const isSupportedNetwork = ({ walletConnector, network }) => {
-    const supportedNetworks = getWalletConnectorNetworks.getWalletConnectorNetworks(walletConnector);
+    const supportedNetworks = walletConnector.getEnabledNetworks();
     if (!supportedNetworks.length) {
         return true;
     }

package/src/lib/utils/functions/isSupportedNetwork/isSupportedNetwork.d.ts

@@ -1,6 +1,7 @@
+import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
 type Props = {
     network: number | string | undefined;
-    walletConnector: any;
+    walletConnector: WalletConnector;
 };
 export declare const isSupportedNetwork: ({ walletConnector, network }: Props) => boolean;
 export {};

package/src/lib/utils/functions/isSupportedNetwork/isSupportedNetwork.js

@@ -1,8 +1,6 @@
 'use client'
-import { getWalletConnectorNetworks } from '../getWalletConnectorNetworks/getWalletConnectorNetworks.js';
-
 const isSupportedNetwork = ({ walletConnector, network }) => {
-    const supportedNetworks = getWalletConnectorNetworks(walletConnector);
+    const supportedNetworks = walletConnector.getEnabledNetworks();
     if (!supportedNetworks.length) {
         return true;
     }

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs

@@ -153,7 +153,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 return;
             }
             const { address } = connectionResult;
-            const walletNetwork = yield walletConnector.getNetwork();
+            const walletNetwork = yield walletConnector.getNetwork(true);
             const usesSupportedNetwork = isSupportedNetwork.isSupportedNetwork({
                 network: walletNetwork,
                 walletConnector,

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js

@@ -149,7 +149,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 return;
             }
             const { address } = connectionResult;
-            const walletNetwork = yield walletConnector.getNetwork();
+            const walletNetwork = yield walletConnector.getNetwork(true);
             const usesSupportedNetwork = isSupportedNetwork({
                 network: walletNetwork,
                 walletConnector,

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.cjs

@@ -166,7 +166,7 @@ const useConnectAndSignSplitSteps = () => {
             if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
-            const walletNetwork = yield walletConnector.getNetwork();
+            const walletNetwork = yield walletConnector.getNetwork(true);
             const usesSupportedNetwork = isSupportedNetwork.isSupportedNetwork({
                 network: walletNetwork,
                 walletConnector,

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.js

@@ -162,7 +162,7 @@ const useConnectAndSignSplitSteps = () => {
             if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
-            const walletNetwork = yield walletConnector.getNetwork();
+            const walletNetwork = yield walletConnector.getNetwork(true);
             const usesSupportedNetwork = isSupportedNetwork({
                 network: walletNetwork,
                 walletConnector,

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

@@ -204,13 +204,16 @@ const useAuthLayoutChecks = () => {
         view.type !== 'qr-code' &&
         view.type !== 'mfa-verification' &&
         view.type !== 'mfa-display-backup-codes' &&
-        view.type !== 'mfa-recovery';
+        view.type !== 'mfa-recovery' &&
+        view.type !== 'user-delete-account';
+    const showBackButton = view.type !== 'user-delete-account';
     const showDefaultFooter = !showConnectedWalletProgress && !showDynamicFooter && !showToSFooter;
     const shouldHideDynamicFooterSeparator = showDynamicFooter && showToSFooter;
     return {
         displayBorderBelowHeader,
         isWalletListTypeView,
         shouldHideDynamicFooterSeparator,
+        showBackButton,
         showCloseButton,
         showConnectedWalletProgress,
         showDefaultFooter,

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

@@ -2,6 +2,7 @@ export declare const useAuthLayoutChecks: () => {
     displayBorderBelowHeader: boolean;
     isWalletListTypeView: boolean;
     shouldHideDynamicFooterSeparator: boolean;
+    showBackButton: boolean;
     showCloseButton: boolean;
     showConnectedWalletProgress: boolean;
     showDefaultFooter: boolean;

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

@@ -200,13 +200,16 @@ const useAuthLayoutChecks = () => {
         view.type !== 'qr-code' &&
         view.type !== 'mfa-verification' &&
         view.type !== 'mfa-display-backup-codes' &&
-        view.type !== 'mfa-recovery';
+        view.type !== 'mfa-recovery' &&
+        view.type !== 'user-delete-account';
+    const showBackButton = view.type !== 'user-delete-account';
     const showDefaultFooter = !showConnectedWalletProgress && !showDynamicFooter && !showToSFooter;
     const shouldHideDynamicFooterSeparator = showDynamicFooter && showToSFooter;
     return {
         displayBorderBelowHeader,
         isWalletListTypeView,
         shouldHideDynamicFooterSeparator,
+        showBackButton,
         showCloseButton,
         showConnectedWalletProgress,
         showDefaultFooter,

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

@@ -105,7 +105,7 @@ const useConnectedWalletsNetworkValidation = () => {
         const connectedWalletsWithInvalidNetwork = [];
         for (const connectedWallet of connectedWallets) {
             const isChainInWalletsToConnect = bridgeChainsToConnect === null || bridgeChainsToConnect === void 0 ? void 0 : bridgeChainsToConnect.some((walletToConnectByChain) => walletToConnectByChain.chain === connectedWallet.chain);
-            const network = yield connectedWallet.connector.getNetwork();
+            const network = yield connectedWallet.connector.getNetwork(true);
             const isSupported = isSupportedNetwork.isSupportedNetwork({
                 network,
                 walletConnector: connectedWallet.connector,

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

@@ -101,7 +101,7 @@ const useConnectedWalletsNetworkValidation = () => {
         const connectedWalletsWithInvalidNetwork = [];
         for (const connectedWallet of connectedWallets) {
             const isChainInWalletsToConnect = bridgeChainsToConnect === null || bridgeChainsToConnect === void 0 ? void 0 : bridgeChainsToConnect.some((walletToConnectByChain) => walletToConnectByChain.chain === connectedWallet.chain);
-            const network = yield connectedWallet.connector.getNetwork();
+            const network = yield connectedWallet.connector.getNetwork(true);
             const isSupported = isSupportedNetwork({
                 network,
                 walletConnector: connectedWallet.connector,

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

@@ -271,6 +271,10 @@ const useDynamicLayoutData = ({ view, authMode, }) => {
                 copykey: 'dyn_login.select_wallet_in_wallet_group.title',
                 heading: t('dyn_login.select_wallet_in_wallet_group.title'),
             },
+            'user-delete-account': {
+                copykey: 'dyn_settings.delete_account.title',
+                heading: t('dyn_settings.delete_account.title'),
+            },
             'verify-email': {
                 copykey: 'dyn_otp_verification.confirm_code',
                 heading: t('dyn_otp_verification.confirm_code'),

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

@@ -267,6 +267,10 @@ const useDynamicLayoutData = ({ view, authMode, }) => {
                 copykey: 'dyn_login.select_wallet_in_wallet_group.title',
                 heading: t('dyn_login.select_wallet_in_wallet_group.title'),
             },
+            'user-delete-account': {
+                copykey: 'dyn_settings.delete_account.title',
+                heading: t('dyn_settings.delete_account.title'),
+            },
             'verify-email': {
                 copykey: 'dyn_otp_verification.confirm_code',
                 heading: t('dyn_otp_verification.confirm_code'),

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

@@ -4,108 +4,16 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var usePromise = require('../usePromise/usePromise.cjs');
-require('react');
-require('../../../context/DynamicContext/DynamicContext.cjs');
-require('@dynamic-labs/sdk-api-core');
-require('../../../shared/logger.cjs');
-require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
-require('react/jsx-runtime');
-require('../../../context/ViewContext/ViewContext.cjs');
-require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
-require('../../constants/colors.cjs');
-require('../../constants/values.cjs');
-require('../../../shared/consts/index.cjs');
-require('../../../events/dynamicEvents.cjs');
-require('../../../../../_virtual/_tslib.cjs');
-require('../../../context/CaptchaContext/CaptchaContext.cjs');
-require('../../../context/ErrorContext/ErrorContext.cjs');
-require('@dynamic-labs/multi-wallet');
-require('react-international-phone');
-require('../../../store/state/nonce/nonce.cjs');
-require('../../../store/state/projectSettings/projectSettings.cjs');
-require('../../../config/ApiEndpoint.cjs');
-require('../../../store/state/user/user.cjs');
-require('../../../locale/locale.cjs');
-require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
-require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
-require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
-require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
-require('../../../context/VerificationContext/VerificationContext.cjs');
-require('react-dom');
-require('../../functions/compareChains/compareChains.cjs');
-require('../../../context/ThemeContext/ThemeContext.cjs');
-require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
-require('bs58');
-require('@dynamic-labs/types');
-require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
-require('../../../context/LoadingContext/LoadingContext.cjs');
-require('../../../context/WalletContext/WalletContext.cjs');
-require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
-require('yup');
-require('../../../context/MockContext/MockContext.cjs');
-require('../../../views/CollectUserDataView/useFields.cjs');
-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');
-require('../../../components/Alert/Alert.cjs');
-require('../../../components/ShadowDOM/ShadowDOM.cjs');
-require('../../../components/IconButton/IconButton.cjs');
-require('../../../components/InlineWidget/InlineWidget.cjs');
-require('../../../components/Input/Input.cjs');
-require('../../../components/IsBrowser/IsBrowser.cjs');
-require('../../../components/MenuList/Dropdown/Dropdown.cjs');
-require('../../../components/OverlayCard/OverlayCard.cjs');
-require('../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
-require('../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
-require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
-require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
-require('../../../components/Popper/Popper/Popper.cjs');
-require('../../../components/Popper/PopperContext/PopperContext.cjs');
-require('react-focus-lock');
-require('qrcode');
-require('formik');
-require('../useSubdomainCheck/useSubdomainCheck.cjs');
-require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
-require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
-require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
-require('../../../context/ConnectWithOtpContext/constants.cjs');
-require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
-require('@hcaptcha/react-hcaptcha');
-require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
-require('../../../context/FooterAnimationContext/index.cjs');
-require('../../../context/PasskeyContext/PasskeyContext.cjs');
-require('../../../store/state/sendBalances.cjs');
-require('../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
-require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
-require('../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
-require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
-require('../../../context/OnrampContext/OnrampContext.cjs');
-require('../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
-require('../../../../index.cjs');
-require('../../../store/state/tokenBalances.cjs');
-require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
-var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useNetworkDataFromWallet = (wallet) => {
-    var _a, _b;
-    const { data: network } = usePromise.usePromise(() => wallet === null || wallet === void 0 ? void 0 : wallet.connector.getNetwork(), {
+    const { data: network } = usePromise.usePromise(() => wallet === null || wallet === void 0 ? void 0 : wallet.connector.getNetwork(true), {
         enabled: Boolean(wallet),
     });
-    const { networkConfigurations } = useInternalDynamicContext.useInternalDynamicContext();
     if (!wallet || !network)
         return undefined;
-    if (wallet.chain === 'SOL') {
-        return (_a = networkConfigurations === null || networkConfigurations === void 0 ? void 0 : networkConfigurations.solana) === null || _a === void 0 ? void 0 : _a[0];
-    }
-    return (_b = networkConfigurations === null || networkConfigurations === void 0 ? void 0 : networkConfigurations[wallet.connector.connectedChain.toLowerCase()]) === null || _b === void 0 ? void 0 : _b.find((_network) => _network.chainId === network);
+    return wallet.connector
+        .getEnabledNetworks()
+        .find((_network) => _network.chainId === network);
 };
 
 exports.useNetworkDataFromWallet = useNetworkDataFromWallet;

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

@@ -1,107 +1,15 @@
 'use client'
 import { usePromise } from '../usePromise/usePromise.js';
-import 'react';
-import '../../../context/DynamicContext/DynamicContext.js';
-import '@dynamic-labs/sdk-api-core';
-import '../../../shared/logger.js';
-import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
-import 'react/jsx-runtime';
-import '../../../context/ViewContext/ViewContext.js';
-import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
-import '../../constants/colors.js';
-import '../../constants/values.js';
-import '../../../shared/consts/index.js';
-import '../../../events/dynamicEvents.js';
-import '../../../../../_virtual/_tslib.js';
-import '../../../context/CaptchaContext/CaptchaContext.js';
-import '../../../context/ErrorContext/ErrorContext.js';
-import '@dynamic-labs/multi-wallet';
-import 'react-international-phone';
-import '../../../store/state/nonce/nonce.js';
-import '../../../store/state/projectSettings/projectSettings.js';
-import '../../../config/ApiEndpoint.js';
-import '../../../store/state/user/user.js';
-import '../../../locale/locale.js';
-import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
-import '../../../store/state/primaryWalletId/primaryWalletId.js';
-import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
-import '../../../context/AccountExistsContext/AccountExistsContext.js';
-import '../../../context/UserWalletsContext/UserWalletsContext.js';
-import '../../../context/VerificationContext/VerificationContext.js';
-import 'react-dom';
-import '../../functions/compareChains/compareChains.js';
-import '../../../context/ThemeContext/ThemeContext.js';
-import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
-import 'bs58';
-import '@dynamic-labs/types';
-import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
-import '../../../context/LoadingContext/LoadingContext.js';
-import '../../../context/WalletContext/WalletContext.js';
-import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
-import 'yup';
-import '../../../context/MockContext/MockContext.js';
-import '../../../views/CollectUserDataView/useFields.js';
-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';
-import '../../../components/Alert/Alert.js';
-import '../../../components/ShadowDOM/ShadowDOM.js';
-import '../../../components/IconButton/IconButton.js';
-import '../../../components/InlineWidget/InlineWidget.js';
-import '../../../components/Input/Input.js';
-import '../../../components/IsBrowser/IsBrowser.js';
-import '../../../components/MenuList/Dropdown/Dropdown.js';
-import '../../../components/OverlayCard/OverlayCard.js';
-import '../../../components/Transition/ZoomTransition/ZoomTransition.js';
-import '../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
-import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
-import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
-import '../../../components/Popper/Popper/Popper.js';
-import '../../../components/Popper/PopperContext/PopperContext.js';
-import 'react-focus-lock';
-import 'qrcode';
-import 'formik';
-import '../useSubdomainCheck/useSubdomainCheck.js';
-import '../../../context/WalletGroupContext/WalletGroupContext.js';
-import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
-import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
-import '../../../context/ConnectWithOtpContext/constants.js';
-import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
-import '@hcaptcha/react-hcaptcha';
-import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
-import '../../../context/FooterAnimationContext/index.js';
-import '../../../context/PasskeyContext/PasskeyContext.js';
-import '../../../store/state/sendBalances.js';
-import '../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';
-import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
-import '../../../views/TransactionConfirmationView/TransactionConfirmationView.js';
-import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
-import '../../../context/OnrampContext/OnrampContext.js';
-import '../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
-import '../../../../index.js';
-import '../../../store/state/tokenBalances.js';
-import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
-import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useNetworkDataFromWallet = (wallet) => {
-    var _a, _b;
-    const { data: network } = usePromise(() => wallet === null || wallet === void 0 ? void 0 : wallet.connector.getNetwork(), {
+    const { data: network } = usePromise(() => wallet === null || wallet === void 0 ? void 0 : wallet.connector.getNetwork(true), {
         enabled: Boolean(wallet),
     });
-    const { networkConfigurations } = useInternalDynamicContext();
     if (!wallet || !network)
         return undefined;
-    if (wallet.chain === 'SOL') {
-        return (_a = networkConfigurations === null || networkConfigurations === void 0 ? void 0 : networkConfigurations.solana) === null || _a === void 0 ? void 0 : _a[0];
-    }
-    return (_b = networkConfigurations === null || networkConfigurations === void 0 ? void 0 : networkConfigurations[wallet.connector.connectedChain.toLowerCase()]) === null || _b === void 0 ? void 0 : _b.find((_network) => _network.chainId === network);
+    return wallet.connector
+        .getEnabledNetworks()
+        .find((_network) => _network.chainId === network);
 };
 
 export { useNetworkDataFromWallet };

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

@@ -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');
@@ -101,48 +101,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 +164,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