@dynamic-labs/sdk-react-core 0.17.0-RC.2 → 0.17.0-RC.20

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

@@ -9,7 +9,12 @@ const useConfirmationModal = ({ elementId, }) => {
     const [node, setNode] = useState(null);
     const open = useCallback((builder) => __awaiter(void 0, void 0, void 0, function* () {
         const promise = new Promise((resolve, reject) => {
-            setNode(builder(resolve, reject));
+            try {
+                setNode(builder(resolve, reject));
+            }
+            catch (err) {
+                reject(err);
+            }
         });
         return promise.finally(() => {
             setNode(undefined);

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

@@ -4,18 +4,21 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/utils');
 var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
+require('ethers');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 require('../../../shared/consts/index.cjs');
 var getWalletProvider = require('../../functions/getWalletProvider/getWalletProvider.cjs');
 var api = require('../../../data/api.cjs');
+require('@dynamic-labs/multi-wallet');
 var shouldManuallyReconnectOnRefresh = require('../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
 
 const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingOnConnectOnly) => {
@@ -37,13 +40,13 @@ const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingO
         });
     }, [setConnectedInfo]);
     const connectWalletByAddressAndChain = React.useCallback((name, address, chain) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const walletConnector = multiWallet.getWalletConnectorByName(wallets.map((wallet) => wallet.walletConnector), name);
+        const walletConnector = walletConnectorCore.getWalletConnectorByName(wallets.map((wallet) => wallet.walletConnector), name);
         if (walletConnector) {
             if (shouldManuallyReconnectOnRefresh.shouldManuallyReconnectOnRefresh(walletConnector)) {
                 yield walletConnector.connect();
             }
             const connectedAccounts = yield walletConnector.getConnectedAccounts();
-            const result = connectedAccounts.filter((account) => multiWallet.isSameAddress(account, address, chain));
+            const result = connectedAccounts.filter((account) => walletConnectorCore.isSameAddress(account, address, chain));
             if (result.length > 0) {
                 walletConnector.connect();
                 setConnectedStates(walletConnector, address, chain);

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

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import type { Chain, FetchPublicAddressOpts, WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { Chain, FetchPublicAddressOpts, WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { AuthModeType, Wallet, WalletOption } from '../../../shared';
-type ConnectedWalletConnectorType = {
+export type ConnectedWalletConnectorType = {
     chain: Chain | undefined;
     name: string;
     provider: string;
@@ -16,4 +16,3 @@ export declare const useConnectWallet: (wallets: WalletOption[], authMode: AuthM
     setConnectedInfo: (value: ConnectedWalletConnectorType | ((val: ConnectedWalletConnectorType | null) => ConnectedWalletConnectorType | null) | null) => void;
     setConnectedWallet: import("react").Dispatch<import("react").SetStateAction<Wallet | null>>;
 };
-export {};

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

@@ -1,17 +1,20 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useCallback, useEffect, useMemo } from 'react';
-import { getWalletConnectorByName, isSameAddress } from '@dynamic-labs/multi-wallet';
+import { getWalletConnectorByName, isSameAddress } from '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/utils';
 import { CONNECTED_WALLET_CONNECTOR_DATA } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
+import 'ethers';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import '../../../shared/consts/index.js';
 import { getWalletProvider } from '../../functions/getWalletProvider/getWalletProvider.js';
 import { createVisit } from '../../../data/api.js';
+import '@dynamic-labs/multi-wallet';
 import { shouldManuallyReconnectOnRefresh } from '../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
 
 const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingOnConnectOnly) => {

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

@@ -7,10 +7,12 @@ var React = require('react');
 require('@dynamic-labs/sdk-api');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/multi-wallet');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
+require('ethers');
 require('../../../shared/consts/index.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 

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

@@ -3,10 +3,12 @@ import { useState, useEffect } from 'react';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/multi-wallet';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/utils';
 import '../../constants/colors.js';
+import 'ethers';
 import '../../../shared/consts/index.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 

package/src/lib/utils/hooks/useConnectedAccountWallet/index.d.ts

@@ -0,0 +1 @@
+export { useConnectedAccountWallet } from './useConnectedAccountWallet';

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

@@ -0,0 +1,30 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
+var React = require('react');
+
+const useConnectedAccountWallet = (connector, secondaryWallets) => {
+    const [wallet, setWallet] = React.useState();
+    React.useEffect(() => {
+        const getConnectedAccounts = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+            var _a;
+            if (!connector) {
+                setWallet(undefined);
+                return;
+            }
+            const connectedAccounts = (_a = (yield connector.getConnectedAccounts())) !== null && _a !== void 0 ? _a : [];
+            const connectedWallet = secondaryWallets.find((secondaryWallet) => {
+                var _a;
+                return secondaryWallet.address.toLowerCase() ===
+                    ((_a = connectedAccounts[0]) === null || _a === void 0 ? void 0 : _a.toLowerCase());
+            });
+            setWallet(connectedWallet);
+        });
+        getConnectedAccounts();
+    }, [connector, secondaryWallets]);
+    return wallet;
+};
+
+exports.useConnectedAccountWallet = useConnectedAccountWallet;

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

@@ -0,0 +1,2 @@
+import { Wallet, WalletConnector } from '../../../..';
+export declare const useConnectedAccountWallet: (connector: WalletConnector | undefined, secondaryWallets: Wallet[]) => Wallet | undefined;

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

@@ -0,0 +1,26 @@
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { useState, useEffect } from 'react';
+
+const useConnectedAccountWallet = (connector, secondaryWallets) => {
+    const [wallet, setWallet] = useState();
+    useEffect(() => {
+        const getConnectedAccounts = () => __awaiter(void 0, void 0, void 0, function* () {
+            var _a;
+            if (!connector) {
+                setWallet(undefined);
+                return;
+            }
+            const connectedAccounts = (_a = (yield connector.getConnectedAccounts())) !== null && _a !== void 0 ? _a : [];
+            const connectedWallet = secondaryWallets.find((secondaryWallet) => {
+                var _a;
+                return secondaryWallet.address.toLowerCase() ===
+                    ((_a = connectedAccounts[0]) === null || _a === void 0 ? void 0 : _a.toLowerCase());
+            });
+            setWallet(connectedWallet);
+        });
+        getConnectedAccounts();
+    }, [connector, secondaryWallets]);
+    return wallet;
+};
+
+export { useConnectedAccountWallet };

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

@@ -8,11 +8,14 @@ var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/multi-wallet');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
+require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
+require('ethers');
 require('../../../shared/consts/index.cjs');
 var index = require('../../functions/storeAuthToken/index.cjs');
+require('@dynamic-labs/multi-wallet');
 var createUserProfile = require('../../functions/createUserProfile/createUserProfile.cjs');
 require('@dynamic-labs/sdk-api');
 

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

@@ -4,11 +4,14 @@ import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/multi-wallet';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
+import '@dynamic-labs/utils';
 import '../../constants/colors.js';
+import 'ethers';
 import '../../../shared/consts/index.js';
 import { storeAuthToken } from '../../functions/storeAuthToken/index.js';
+import '@dynamic-labs/multi-wallet';
 import { createUserProfile } from '../../functions/createUserProfile/createUserProfile.js';
 import '@dynamic-labs/sdk-api';
 

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

@@ -3,94 +3,114 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var utils = require('@dynamic-labs/utils');
 var api = require('../../../data/api.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
+require('ethers');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 require('../../../shared/consts/index.cjs');
 var validators = require('../../../context/DynamicContext/validators.cjs');
 
 const MAX_RETRIES = 2;
-const useFetchNetworkConfigurations = ({ authToken, environmentId, localNetworks, maxRetries = MAX_RETRIES, }) => {
+const useFetchNetworkConfigurations = ({ authToken, environmentId, evmNetworks: customerEvmNetworks, maxRetries = MAX_RETRIES, }) => {
     var _a;
+    /**
+     * This is the version of the local storage object. If the version changes, the local storage object will be removed.
+     * This is used in case we need to change the structure of the local storage object.
+     */
+    const VERSION = 2;
     const [lsNetworks, setLsNetworks, removeLsNetworks] = useLocalStorage.useLocalStorage(localStorage.NETWORKS_STORAGE_KEY, undefined, validators.validateLocalStorageExpiry);
     const [loading, setLoading] = React.useState(false);
     const [retries, setRetries] = React.useState(0);
-    const lsNetworksExists = Boolean(lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.configurations);
+    const [completed, setCompleted] = React.useState(false);
+    const [lsNetworksExists, setlsNetworksExists] = React.useState(Boolean(lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.configurations) && (lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.version) === VERSION);
     // Stringify the objects for easy comparison
-    const localNetworksJson = localNetworks === null || localNetworks === void 0 ? void 0 : localNetworks.map((network) => JSON.stringify(network));
+    const customerEvmNetworksJson = customerEvmNetworks === null || customerEvmNetworks === void 0 ? void 0 : customerEvmNetworks.map((network) => JSON.stringify(network));
+    const handleRemoveLsNetworks = React.useCallback(() => {
+        removeLsNetworks();
+        setlsNetworksExists(false);
+    }, [removeLsNetworks]);
     React.useEffect(() => {
         if (lsNetworks && (lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.environmentId) !== environmentId) {
-            removeLsNetworks();
+            handleRemoveLsNetworks();
         }
-    }, [environmentId, lsNetworks, removeLsNetworks]);
+        if (lsNetworks && lsNetworks.version !== VERSION) {
+            handleRemoveLsNetworks();
+        }
+    }, [environmentId, handleRemoveLsNetworks, lsNetworks, removeLsNetworks]);
     React.useEffect(() => {
         if (!authToken) {
-            removeLsNetworks();
+            handleRemoveLsNetworks();
         }
-    }, [authToken]);
+    }, [authToken, handleRemoveLsNetworks]);
     React.useEffect(() => {
         var _a, _b;
-        if (lsNetworksExists && localNetworksJson) {
+        if (lsNetworksExists && customerEvmNetworksJson && !completed) {
             const localStorageNetworksJson = (_b = (_a = lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.configurations) === null || _a === void 0 ? void 0 : _a.evm) === null || _b === void 0 ? void 0 : _b.map((network) => JSON.stringify(network));
             if (localStorageNetworksJson) {
-                const fullMatch = localNetworksJson.every((network) => localStorageNetworksJson.indexOf(network) !== -1);
+                const fullMatch = customerEvmNetworksJson.every((network) => localStorageNetworksJson.indexOf(network) !== -1);
                 if (!fullMatch) {
-                    removeLsNetworks();
+                    handleRemoveLsNetworks();
                 }
+                setCompleted(true);
             }
         }
     }, [
         lsNetworksExists,
-        localNetworksJson,
-        removeLsNetworks,
+        customerEvmNetworksJson,
         (_a = lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.configurations) === null || _a === void 0 ? void 0 : _a.evm,
+        completed,
+        setCompleted,
+        handleRemoveLsNetworks,
     ]);
     React.useEffect(() => {
         if (!lsNetworksExists && !loading && retries < maxRetries) {
             setLoading(true);
             api.fetchNetworkSettings(environmentId)
                 .then((response) => {
-                var _a, _b;
+                var _a, _b, _c, _d;
                 if (!response)
-                    throw new multiWallet.DynamicError('Configuration is not defined');
+                    throw new utils.DynamicError('Configuration is not defined');
                 const expiry = new Date().getTime() + 60000 * 5;
                 const evm = response.find((configurations) => configurations.chainName === 'evm');
                 const solana = response.find((configurations) => configurations.chainName === 'solana');
                 const cosmos = response.find((configurations) => configurations.chainName === 'cosmos');
                 const starknet = response.find((configurations) => configurations.chainName === 'starknet');
                 let mergedEvmNetworks;
-                const createEvmNetwork = (network) => ({
+                const createNetwork = (network, parser = (input) => input) => ({
                     blockExplorerUrls: network.blockExplorerUrls,
-                    chainId: parseInt(network.chainId),
-                    chainName: network.name,
+                    chainId: parser(network.chainId),
                     iconUrls: network.iconUrls,
                     lcdUrl: network.lcdUrl,
+                    name: network.name,
                     nativeCurrency: network.nativeCurrency,
-                    networkId: parseInt(network.networkId),
+                    networkId: parser(network.networkId),
                     privateCustomerRpcUrls: network.privateCustomerRpcUrls,
                     rpcUrls: network.rpcUrls,
                     vanityName: network.vanityName,
                 });
-                const cosmosNetworks = (_a = cosmos === null || cosmos === void 0 ? void 0 : cosmos.networks) === null || _a === void 0 ? void 0 : _a.map(createEvmNetwork);
-                const serverNetworks = (_b = evm === null || evm === void 0 ? void 0 : evm.networks) === null || _b === void 0 ? void 0 : _b.map(createEvmNetwork);
-                if (!serverNetworks && (localNetworks === null || localNetworks === void 0 ? void 0 : localNetworks.length)) {
-                    mergedEvmNetworks = localNetworks;
+                const cosmosNetworks = (_a = cosmos === null || cosmos === void 0 ? void 0 : cosmos.networks) === null || _a === void 0 ? void 0 : _a.map((net) => createNetwork(net, parseInt));
+                const serverNetworks = (_b = evm === null || evm === void 0 ? void 0 : evm.networks) === null || _b === void 0 ? void 0 : _b.map((net) => createNetwork(net, parseInt));
+                const starknetNetworks = (_c = starknet === null || starknet === void 0 ? void 0 : starknet.networks) === null || _c === void 0 ? void 0 : _c.map((net) => createNetwork(net));
+                const solanaNetworks = (_d = solana === null || solana === void 0 ? void 0 : solana.networks) === null || _d === void 0 ? void 0 : _d.map((net) => createNetwork(net));
+                if (!serverNetworks && (customerEvmNetworks === null || customerEvmNetworks === void 0 ? void 0 : customerEvmNetworks.length)) {
+                    mergedEvmNetworks = customerEvmNetworks;
                 }
-                if (!localNetworks && (serverNetworks === null || serverNetworks === void 0 ? void 0 : serverNetworks.length)) {
+                if (!customerEvmNetworks && (serverNetworks === null || serverNetworks === void 0 ? void 0 : serverNetworks.length)) {
                     mergedEvmNetworks = serverNetworks;
                 }
                 if (serverNetworks !== undefined &&
                     serverNetworks.length &&
-                    localNetworks !== undefined &&
-                    localNetworks.length) {
-                    mergedEvmNetworks = localNetworks.slice();
+                    customerEvmNetworks !== undefined &&
+                    customerEvmNetworks.length) {
+                    mergedEvmNetworks = customerEvmNetworks.slice();
                     serverNetworks.forEach((network) => {
                         const existingNetwork = mergedEvmNetworks === null || mergedEvmNetworks === void 0 ? void 0 : mergedEvmNetworks.find((item) => item.chainId === network.chainId);
                         if (!existingNetwork) {
@@ -102,12 +122,14 @@ const useFetchNetworkConfigurations = ({ authToken, environmentId, localNetworks
                     configurations: {
                         cosmos: cosmosNetworks,
                         evm: mergedEvmNetworks,
-                        solana: solana === null || solana === void 0 ? void 0 : solana.networks,
-                        starknet: starknet === null || starknet === void 0 ? void 0 : starknet.networks,
+                        solana: solanaNetworks,
+                        starknet: starknetNetworks,
                     },
                     environmentId,
                     expiry,
+                    version: VERSION,
                 });
+                setlsNetworksExists(true);
             })
                 .catch((e) => {
                 setRetries((currentRetries) => currentRetries + 1);
@@ -120,7 +142,7 @@ const useFetchNetworkConfigurations = ({ authToken, environmentId, localNetworks
         authToken,
         environmentId,
         loading,
-        localNetworks,
+        customerEvmNetworks,
         lsNetworksExists,
         maxRetries,
         retries,
@@ -128,7 +150,7 @@ const useFetchNetworkConfigurations = ({ authToken, environmentId, localNetworks
     ]);
     return {
         configurations: lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.configurations,
-        removeLsNetworks,
+        handleRemoveLsNetworks,
     };
 };
 

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

@@ -1,11 +1,11 @@
-import { EvmNetwork } from '@dynamic-labs/multi-wallet';
+import { GenericNetwork } from '@dynamic-labs/types';
 export type fetchNetworkConfigurationsProps = {
     authToken: string | undefined;
     environmentId: string;
-    localNetworks?: EvmNetwork[];
+    evmNetworks?: GenericNetwork[];
     maxRetries?: number;
 };
-export declare const useFetchNetworkConfigurations: ({ authToken, environmentId, localNetworks, maxRetries, }: fetchNetworkConfigurationsProps) => {
-    configurations: import("@dynamic-labs/multi-wallet").NetworkConfigurationMap | undefined;
-    removeLsNetworks: () => void;
+export declare const useFetchNetworkConfigurations: ({ authToken, environmentId, evmNetworks: customerEvmNetworks, maxRetries, }: fetchNetworkConfigurationsProps) => {
+    configurations: import("@dynamic-labs/types").NetworkConfigurationMap | undefined;
+    handleRemoveLsNetworks: () => void;
 };

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

@@ -1,59 +1,77 @@
-import { useState, useEffect } from 'react';
-import { DynamicError } from '@dynamic-labs/multi-wallet';
+import { useState, useCallback, useEffect } from 'react';
+import { DynamicError } from '@dynamic-labs/utils';
 import { fetchNetworkSettings } from '../../../data/api.js';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import { NETWORKS_STORAGE_KEY } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
+import 'ethers';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import '../../../shared/consts/index.js';
 import { validateLocalStorageExpiry } from '../../../context/DynamicContext/validators.js';
 
 const MAX_RETRIES = 2;
-const useFetchNetworkConfigurations = ({ authToken, environmentId, localNetworks, maxRetries = MAX_RETRIES, }) => {
+const useFetchNetworkConfigurations = ({ authToken, environmentId, evmNetworks: customerEvmNetworks, maxRetries = MAX_RETRIES, }) => {
     var _a;
+    /**
+     * This is the version of the local storage object. If the version changes, the local storage object will be removed.
+     * This is used in case we need to change the structure of the local storage object.
+     */
+    const VERSION = 2;
     const [lsNetworks, setLsNetworks, removeLsNetworks] = useLocalStorage(NETWORKS_STORAGE_KEY, undefined, validateLocalStorageExpiry);
     const [loading, setLoading] = useState(false);
     const [retries, setRetries] = useState(0);
-    const lsNetworksExists = Boolean(lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.configurations);
+    const [completed, setCompleted] = useState(false);
+    const [lsNetworksExists, setlsNetworksExists] = useState(Boolean(lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.configurations) && (lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.version) === VERSION);
     // Stringify the objects for easy comparison
-    const localNetworksJson = localNetworks === null || localNetworks === void 0 ? void 0 : localNetworks.map((network) => JSON.stringify(network));
+    const customerEvmNetworksJson = customerEvmNetworks === null || customerEvmNetworks === void 0 ? void 0 : customerEvmNetworks.map((network) => JSON.stringify(network));
+    const handleRemoveLsNetworks = useCallback(() => {
+        removeLsNetworks();
+        setlsNetworksExists(false);
+    }, [removeLsNetworks]);
     useEffect(() => {
         if (lsNetworks && (lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.environmentId) !== environmentId) {
-            removeLsNetworks();
+            handleRemoveLsNetworks();
         }
-    }, [environmentId, lsNetworks, removeLsNetworks]);
+        if (lsNetworks && lsNetworks.version !== VERSION) {
+            handleRemoveLsNetworks();
+        }
+    }, [environmentId, handleRemoveLsNetworks, lsNetworks, removeLsNetworks]);
     useEffect(() => {
         if (!authToken) {
-            removeLsNetworks();
+            handleRemoveLsNetworks();
         }
-    }, [authToken]);
+    }, [authToken, handleRemoveLsNetworks]);
     useEffect(() => {
         var _a, _b;
-        if (lsNetworksExists && localNetworksJson) {
+        if (lsNetworksExists && customerEvmNetworksJson && !completed) {
             const localStorageNetworksJson = (_b = (_a = lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.configurations) === null || _a === void 0 ? void 0 : _a.evm) === null || _b === void 0 ? void 0 : _b.map((network) => JSON.stringify(network));
             if (localStorageNetworksJson) {
-                const fullMatch = localNetworksJson.every((network) => localStorageNetworksJson.indexOf(network) !== -1);
+                const fullMatch = customerEvmNetworksJson.every((network) => localStorageNetworksJson.indexOf(network) !== -1);
                 if (!fullMatch) {
-                    removeLsNetworks();
+                    handleRemoveLsNetworks();
                 }
+                setCompleted(true);
             }
         }
     }, [
         lsNetworksExists,
-        localNetworksJson,
-        removeLsNetworks,
+        customerEvmNetworksJson,
         (_a = lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.configurations) === null || _a === void 0 ? void 0 : _a.evm,
+        completed,
+        setCompleted,
+        handleRemoveLsNetworks,
     ]);
     useEffect(() => {
         if (!lsNetworksExists && !loading && retries < maxRetries) {
             setLoading(true);
             fetchNetworkSettings(environmentId)
                 .then((response) => {
-                var _a, _b;
+                var _a, _b, _c, _d;
                 if (!response)
                     throw new DynamicError('Configuration is not defined');
                 const expiry = new Date().getTime() + 60000 * 5;
@@ -62,31 +80,33 @@ const useFetchNetworkConfigurations = ({ authToken, environmentId, localNetworks
                 const cosmos = response.find((configurations) => configurations.chainName === 'cosmos');
                 const starknet = response.find((configurations) => configurations.chainName === 'starknet');
                 let mergedEvmNetworks;
-                const createEvmNetwork = (network) => ({
+                const createNetwork = (network, parser = (input) => input) => ({
                     blockExplorerUrls: network.blockExplorerUrls,
-                    chainId: parseInt(network.chainId),
-                    chainName: network.name,
+                    chainId: parser(network.chainId),
                     iconUrls: network.iconUrls,
                     lcdUrl: network.lcdUrl,
+                    name: network.name,
                     nativeCurrency: network.nativeCurrency,
-                    networkId: parseInt(network.networkId),
+                    networkId: parser(network.networkId),
                     privateCustomerRpcUrls: network.privateCustomerRpcUrls,
                     rpcUrls: network.rpcUrls,
                     vanityName: network.vanityName,
                 });
-                const cosmosNetworks = (_a = cosmos === null || cosmos === void 0 ? void 0 : cosmos.networks) === null || _a === void 0 ? void 0 : _a.map(createEvmNetwork);
-                const serverNetworks = (_b = evm === null || evm === void 0 ? void 0 : evm.networks) === null || _b === void 0 ? void 0 : _b.map(createEvmNetwork);
-                if (!serverNetworks && (localNetworks === null || localNetworks === void 0 ? void 0 : localNetworks.length)) {
-                    mergedEvmNetworks = localNetworks;
+                const cosmosNetworks = (_a = cosmos === null || cosmos === void 0 ? void 0 : cosmos.networks) === null || _a === void 0 ? void 0 : _a.map((net) => createNetwork(net, parseInt));
+                const serverNetworks = (_b = evm === null || evm === void 0 ? void 0 : evm.networks) === null || _b === void 0 ? void 0 : _b.map((net) => createNetwork(net, parseInt));
+                const starknetNetworks = (_c = starknet === null || starknet === void 0 ? void 0 : starknet.networks) === null || _c === void 0 ? void 0 : _c.map((net) => createNetwork(net));
+                const solanaNetworks = (_d = solana === null || solana === void 0 ? void 0 : solana.networks) === null || _d === void 0 ? void 0 : _d.map((net) => createNetwork(net));
+                if (!serverNetworks && (customerEvmNetworks === null || customerEvmNetworks === void 0 ? void 0 : customerEvmNetworks.length)) {
+                    mergedEvmNetworks = customerEvmNetworks;
                 }
-                if (!localNetworks && (serverNetworks === null || serverNetworks === void 0 ? void 0 : serverNetworks.length)) {
+                if (!customerEvmNetworks && (serverNetworks === null || serverNetworks === void 0 ? void 0 : serverNetworks.length)) {
                     mergedEvmNetworks = serverNetworks;
                 }
                 if (serverNetworks !== undefined &&
                     serverNetworks.length &&
-                    localNetworks !== undefined &&
-                    localNetworks.length) {
-                    mergedEvmNetworks = localNetworks.slice();
+                    customerEvmNetworks !== undefined &&
+                    customerEvmNetworks.length) {
+                    mergedEvmNetworks = customerEvmNetworks.slice();
                     serverNetworks.forEach((network) => {
                         const existingNetwork = mergedEvmNetworks === null || mergedEvmNetworks === void 0 ? void 0 : mergedEvmNetworks.find((item) => item.chainId === network.chainId);
                         if (!existingNetwork) {
@@ -98,12 +118,14 @@ const useFetchNetworkConfigurations = ({ authToken, environmentId, localNetworks
                     configurations: {
                         cosmos: cosmosNetworks,
                         evm: mergedEvmNetworks,
-                        solana: solana === null || solana === void 0 ? void 0 : solana.networks,
-                        starknet: starknet === null || starknet === void 0 ? void 0 : starknet.networks,
+                        solana: solanaNetworks,
+                        starknet: starknetNetworks,
                     },
                     environmentId,
                     expiry,
+                    version: VERSION,
                 });
+                setlsNetworksExists(true);
             })
                 .catch((e) => {
                 setRetries((currentRetries) => currentRetries + 1);
@@ -116,7 +138,7 @@ const useFetchNetworkConfigurations = ({ authToken, environmentId, localNetworks
         authToken,
         environmentId,
         loading,
-        localNetworks,
+        customerEvmNetworks,
         lsNetworksExists,
         maxRetries,
         retries,
@@ -124,7 +146,7 @@ const useFetchNetworkConfigurations = ({ authToken, environmentId, localNetworks
     ]);
     return {
         configurations: lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.configurations,
-        removeLsNetworks,
+        handleRemoveLsNetworks,
     };
 };
 

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

@@ -3,15 +3,17 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var utils = require('@dynamic-labs/utils');
 var api = require('../../../data/api.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
+require('ethers');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 require('../../../shared/consts/index.cjs');
 var validators = require('../../../context/DynamicContext/validators.cjs');
@@ -32,7 +34,7 @@ const useFetchNonce = (environmentId, maxRetries = 2) => {
             api.fetchNonce(environmentId)
                 .then((response) => {
                 if (!response)
-                    throw new multiWallet.DynamicError('Nonce is not defined');
+                    throw new utils.DynamicError('Nonce is not defined');
                 const expiry = new Date().getTime() + 60000 * 60 * 24;
                 setLsNonce({ environmentId, expiry: expiry, value: response });
             })