@dynamic-labs/sdk-react-core 0.17.0-RC.5 → 0.17.0-RC.7

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

@@ -17,47 +17,69 @@ 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));
     React.useEffect(() => {
         if (lsNetworks && (lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.environmentId) !== environmentId) {
             removeLsNetworks();
+            setlsNetworksExists(false);
         }
-    }, [environmentId, lsNetworks, removeLsNetworks]);
+        if (lsNetworks && lsNetworks.version !== VERSION) {
+            removeLsNetworks();
+            setlsNetworksExists(false);
+        }
+    }, [
+        environmentId,
+        lsNetworks,
+        lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.configurations,
+        lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.version,
+        removeLsNetworks,
+    ]);
     React.useEffect(() => {
         if (!authToken) {
             removeLsNetworks();
+            setlsNetworksExists(false);
         }
-    }, [authToken]);
+    }, [authToken, removeLsNetworks, setlsNetworksExists]);
     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();
+                    setlsNetworksExists(false);
                 }
+                setCompleted(true);
             }
         }
     }, [
         lsNetworksExists,
-        localNetworksJson,
+        customerEvmNetworksJson,
         removeLsNetworks,
         (_a = lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.configurations) === null || _a === void 0 ? void 0 : _a.evm,
+        completed,
+        setCompleted,
     ]);
     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');
                 const expiry = new Date().getTime() + 60000 * 5;
@@ -66,31 +88,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) {
@@ -102,12 +126,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 +146,7 @@ const useFetchNetworkConfigurations = ({ authToken, environmentId, localNetworks
         authToken,
         environmentId,
         loading,
-        localNetworks,
+        customerEvmNetworks,
         lsNetworksExists,
         maxRetries,
         retries,

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;
+export declare const useFetchNetworkConfigurations: ({ authToken, environmentId, evmNetworks: customerEvmNetworks, maxRetries, }: fetchNetworkConfigurationsProps) => {
+    configurations: import("@dynamic-labs/types").NetworkConfigurationMap | undefined;
     removeLsNetworks: () => void;
 };

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

@@ -13,47 +13,69 @@ 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));
     useEffect(() => {
         if (lsNetworks && (lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.environmentId) !== environmentId) {
             removeLsNetworks();
+            setlsNetworksExists(false);
         }
-    }, [environmentId, lsNetworks, removeLsNetworks]);
+        if (lsNetworks && lsNetworks.version !== VERSION) {
+            removeLsNetworks();
+            setlsNetworksExists(false);
+        }
+    }, [
+        environmentId,
+        lsNetworks,
+        lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.configurations,
+        lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.version,
+        removeLsNetworks,
+    ]);
     useEffect(() => {
         if (!authToken) {
             removeLsNetworks();
+            setlsNetworksExists(false);
         }
-    }, [authToken]);
+    }, [authToken, removeLsNetworks, setlsNetworksExists]);
     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();
+                    setlsNetworksExists(false);
                 }
+                setCompleted(true);
             }
         }
     }, [
         lsNetworksExists,
-        localNetworksJson,
+        customerEvmNetworksJson,
         removeLsNetworks,
         (_a = lsNetworks === null || lsNetworks === void 0 ? void 0 : lsNetworks.configurations) === null || _a === void 0 ? void 0 : _a.evm,
+        completed,
+        setCompleted,
     ]);
     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 +84,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 +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);
@@ -116,7 +142,7 @@ const useFetchNetworkConfigurations = ({ authToken, environmentId, localNetworks
         authToken,
         environmentId,
         loading,
-        localNetworks,
+        customerEvmNetworks,
         lsNetworksExists,
         maxRetries,
         retries,

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

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var rpcProviders = require('@dynamic-labs/rpc-providers');
 require('@dynamic-labs/sdk-api');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/multi-wallet');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('../../constants/colors.cjs');
@@ -19,7 +20,7 @@ const useRpcProviders = ({ networkConfigurations, }) => {
     React.useEffect(() => {
         try {
             if (networkConfigurations) {
-                setProviders(multiWallet.getRpcProviders(networkConfigurations));
+                setProviders(rpcProviders.ChainRpcProviders.getProviders(networkConfigurations));
             }
         }
         catch (error) {
@@ -30,12 +31,12 @@ const useRpcProviders = ({ networkConfigurations, }) => {
         if (!networkConfigurations) {
             return undefined;
         }
-        return multiWallet.getEvmRpcProviderByChainId(networkConfigurations, chainId);
+        return rpcProviders.ChainRpcProviders.getEvmProviderByChainId(networkConfigurations, chainId);
     }, [networkConfigurations]);
     React.useEffect(() => {
         try {
             if (networkConfigurations) {
-                setEvmDefaultProvider(multiWallet.getEvmDefaultRpcProvider(networkConfigurations));
+                setEvmDefaultProvider(rpcProviders.ChainRpcProviders.getEvmProviderByChainId(networkConfigurations, 1));
             }
         }
         catch (error) {
@@ -45,7 +46,7 @@ const useRpcProviders = ({ networkConfigurations, }) => {
     React.useEffect(() => {
         try {
             if (networkConfigurations) {
-                setSolanaDefaultProvider(multiWallet.getSolanaDefaultRpcProvider(networkConfigurations));
+                setSolanaDefaultProvider(rpcProviders.ChainRpcProviders.getSolanaRpcProviderByChainId(networkConfigurations, '101'));
             }
         }
         catch (error) {

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

@@ -1,8 +1,8 @@
-import { NetworkConfigurationMap } from '@dynamic-labs/multi-wallet';
+import { NetworkConfigurationMap } from '@dynamic-labs/types';
 import { DynamicRPCProviders } from '../../../shared';
 type Props = {
     networkConfigurations: NetworkConfigurationMap | undefined;
-    networkId: number | undefined;
+    networkId: string | number | undefined;
 };
 export declare const useRpcProviders: ({ networkConfigurations, }: Props) => DynamicRPCProviders;
 export {};

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

@@ -1,8 +1,9 @@
 import { useState, useEffect, useCallback } from 'react';
-import { getRpcProviders, getEvmRpcProviderByChainId, getEvmDefaultRpcProvider, getSolanaDefaultRpcProvider } from '@dynamic-labs/multi-wallet';
+import { ChainRpcProviders } from '@dynamic-labs/rpc-providers';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/multi-wallet';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '../../constants/colors.js';
@@ -15,23 +16,23 @@ const useRpcProviders = ({ networkConfigurations, }) => {
     useEffect(() => {
         try {
             if (networkConfigurations) {
-                setProviders(getRpcProviders(networkConfigurations));
+                setProviders(ChainRpcProviders.getProviders(networkConfigurations));
             }
         }
         catch (error) {
             logger.error(error);
         }
     }, [networkConfigurations]);
-    const getEvmRpcProviderByChainId$1 = useCallback((chainId) => {
+    const getEvmRpcProviderByChainId = useCallback((chainId) => {
         if (!networkConfigurations) {
             return undefined;
         }
-        return getEvmRpcProviderByChainId(networkConfigurations, chainId);
+        return ChainRpcProviders.getEvmProviderByChainId(networkConfigurations, chainId);
     }, [networkConfigurations]);
     useEffect(() => {
         try {
             if (networkConfigurations) {
-                setEvmDefaultProvider(getEvmDefaultRpcProvider(networkConfigurations));
+                setEvmDefaultProvider(ChainRpcProviders.getEvmProviderByChainId(networkConfigurations, 1));
             }
         }
         catch (error) {
@@ -41,7 +42,7 @@ const useRpcProviders = ({ networkConfigurations, }) => {
     useEffect(() => {
         try {
             if (networkConfigurations) {
-                setSolanaDefaultProvider(getSolanaDefaultRpcProvider(networkConfigurations));
+                setSolanaDefaultProvider(ChainRpcProviders.getSolanaRpcProviderByChainId(networkConfigurations, '101'));
             }
         }
         catch (error) {
@@ -51,7 +52,7 @@ const useRpcProviders = ({ networkConfigurations, }) => {
     return {
         evmDefaultProvider,
         evmProviders: providers === null || providers === void 0 ? void 0 : providers.evm,
-        getEvmRpcProviderByChainId: getEvmRpcProviderByChainId$1,
+        getEvmRpcProviderByChainId,
         solanaDefaultProvider,
         solanaProviders: providers === null || providers === void 0 ? void 0 : providers.solana,
     };

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

@@ -138,8 +138,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
                 verifyOnly &&
                 !_isSupportedNetwork &&
                 !isKycRequired) {
-                const _isProgrammableNetworkSwitchSupported = isProgrammableNetworkSwitchSupported.isProgrammableNetworkSwitchSupported(walletConnector);
-                if (_isProgrammableNetworkSwitchSupported) {
+                if (isProgrammableNetworkSwitchSupported.isProgrammableNetworkSwitchSupported(walletConnector)) {
                     return setView('network-not-supported');
                 }
                 return setView('network-not-supported-manual');

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

@@ -134,8 +134,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
                 verifyOnly &&
                 !_isSupportedNetwork &&
                 !isKycRequired) {
-                const _isProgrammableNetworkSwitchSupported = isProgrammableNetworkSwitchSupported(walletConnector);
-                if (_isProgrammableNetworkSwitchSupported) {
+                if (isProgrammableNetworkSwitchSupported(walletConnector)) {
                     return setView('network-not-supported');
                 }
                 return setView('network-not-supported-manual');

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

@@ -18,6 +18,6 @@ export type UseWalletEventListenersArgs = {
 };
 export declare const useWalletEventListeners: ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, setSelectedWalletConnector, setMultiWalletWidgetState, user, setPrimaryWalletId, connectWalletByAddressAndChain, }: UseWalletEventListenersArgs) => {
     loadingNetwork: boolean;
-    network: number | undefined;
-    setNetwork: import("react").Dispatch<import("react").SetStateAction<number | undefined>>;
+    network: string | number | undefined;
+    setNetwork: import("react").Dispatch<import("react").SetStateAction<string | number | undefined>>;
 };

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

@@ -5,20 +5,18 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var data = require('../../../views/WalletList/data.cjs');
-var getMagicLinkApiKeyFromProviders = require('./utils/getMagicLinkApiKeyFromProviders/getMagicLinkApiKeyFromProviders.cjs');
 
 const useWallets = ({ projectSettings, appLogoUrl, appName, networkConfigurations, vendorCredentials, walletUiUtils, magicLinkConfig, }) => {
     const [wallets, setWallets] = React.useState([]);
     React.useEffect(() => {
         const getWalletList = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
             if (projectSettings) {
-                const magicLinkApiKey = getMagicLinkApiKeyFromProviders.getMagicLinkApiKeyFromProviders((projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) || []);
                 const installedWallets = yield data.getInstalledWallets(projectSettings, {
                     appLogoUrl,
                     appName,
-                    magicLinkApiKey,
                     magicLinkConfig,
                     networkConfigurations,
+                    providers: projectSettings.providers || [],
                     skipMemo: true,
                     vendorCredentials,
                     walletUiUtils,
@@ -26,9 +24,9 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, networkConfiguration
                 const notInstalledWallets = yield data.getNotInstalledWallets(projectSettings, {
                     appLogoUrl,
                     appName,
-                    magicLinkApiKey,
                     magicLinkConfig,
                     networkConfigurations,
+                    providers: projectSettings.providers || [],
                     skipMemo: true,
                     vendorCredentials,
                     walletUiUtils,

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

@@ -1,5 +1,6 @@
-import { MagicLinkConfig, NetworkConfigurationMap, VendorCredentials, WalletUiUtils } from '@dynamic-labs/multi-wallet';
+import { MagicLinkConfig, VendorCredentials, WalletUiUtils } from '@dynamic-labs/multi-wallet';
 import { ProjectSettings } from '@dynamic-labs/sdk-api';
+import { NetworkConfigurationMap } from '@dynamic-labs/types';
 import { WalletOption } from '../../../shared';
 type Props = {
     appLogoUrl?: string;

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

@@ -1,20 +1,18 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useEffect } from 'react';
 import { getInstalledWallets, getNotInstalledWallets } from '../../../views/WalletList/data.js';
-import { getMagicLinkApiKeyFromProviders } from './utils/getMagicLinkApiKeyFromProviders/getMagicLinkApiKeyFromProviders.js';
 
 const useWallets = ({ projectSettings, appLogoUrl, appName, networkConfigurations, vendorCredentials, walletUiUtils, magicLinkConfig, }) => {
     const [wallets, setWallets] = useState([]);
     useEffect(() => {
         const getWalletList = () => __awaiter(void 0, void 0, void 0, function* () {
             if (projectSettings) {
-                const magicLinkApiKey = getMagicLinkApiKeyFromProviders((projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) || []);
                 const installedWallets = yield getInstalledWallets(projectSettings, {
                     appLogoUrl,
                     appName,
-                    magicLinkApiKey,
                     magicLinkConfig,
                     networkConfigurations,
+                    providers: projectSettings.providers || [],
                     skipMemo: true,
                     vendorCredentials,
                     walletUiUtils,
@@ -22,9 +20,9 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, networkConfiguration
                 const notInstalledWallets = yield getNotInstalledWallets(projectSettings, {
                     appLogoUrl,
                     appName,
-                    magicLinkApiKey,
                     magicLinkConfig,
                     networkConfigurations,
+                    providers: projectSettings.providers || [],
                     skipMemo: true,
                     vendorCredentials,
                     walletUiUtils,

package/src/lib/views/CaptchaVerifyUser/CaptchaVerifyUser.cjs

@@ -23,6 +23,7 @@ require('../../components/Transition/ZoomTransition/ZoomTransition.cjs');
 require('../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
 require('../../components/Transition/OpacityTransition/OpacityTransition.cjs');
 require('../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/rpc-providers');
 var useVerifyWallet = require('../../utils/hooks/useVerifyWallet/useVerifyWallet.cjs');
 require('ethers');
 require('../../context/MockContext/MockContext.cjs');

package/src/lib/views/CaptchaVerifyUser/CaptchaVerifyUser.js

@@ -19,6 +19,7 @@ import '../../components/Transition/ZoomTransition/ZoomTransition.js';
 import '../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
 import '../../components/Transition/OpacityTransition/OpacityTransition.js';
 import '../../config/ApiEndpoint.js';
+import '@dynamic-labs/rpc-providers';
 import { useVerifyWallet } from '../../utils/hooks/useVerifyWallet/useVerifyWallet.js';
 import 'ethers';
 import '../../context/MockContext/MockContext.js';

package/src/lib/views/CollectUserDataView/CollectUserDataView.cjs

@@ -25,6 +25,7 @@ require('../../components/Transition/ZoomTransition/ZoomTransition.cjs');
 require('../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
 require('../../components/Transition/OpacityTransition/OpacityTransition.cjs');
 require('../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/rpc-providers');
 require('../../context/ErrorContext/ErrorContext.cjs');
 require('ethers');
 require('../../context/MockContext/MockContext.cjs');
@@ -35,19 +36,20 @@ require('../../components/IconButton/IconButton.cjs');
 var ErrorContainer = require('../../components/ErrorContainer/ErrorContainer.cjs');
 var NetworkPicker = require('../../components/NetworkPicker/NetworkPicker.cjs');
 var UserAddress = require('../../components/UserAddress/UserAddress.cjs');
-var UserDataForm = require('./UserDataForm/UserDataForm.cjs');
+var useFetchNameService = require('../../widgets/DynamicWidget/hooks/useFetchNameService/useFetchNameService.cjs');
+var OnboardingUserDataForm = require('./OnboardingUserDataForm/OnboardingUserDataForm.cjs');
 
 const CollectUserDataView = () => {
-    var _a, _b;
     const { appName, handleLogOut, projectSettings, network, decodedOnboardingOnlyToken, selectedWalletConnector: walletConnector, onboardingImageUrl, } = useInternalDynamicContext.useInternalDynamicContext();
     const [isNetworkPickerOpen, setIsNetworkPickerOpen] = React.useState(false);
+    const nameService = useFetchNameService.useFetchNameService();
     if (!walletConnector || !decodedOnboardingOnlyToken) {
         return null;
     }
     const userProfile = createUserProfile.createUserProfile(decodedOnboardingOnlyToken);
     const evmNetworks = walletConnector.evmNetworks || [];
     const _isSupportedNetwork = isSupportedNetwork.isSupportedNetwork({ network, walletConnector });
-    return (jsxRuntime.jsxs("div", Object.assign({ className: 'collect-user-data', "data-testid": 'collect-user-data-view' }, { children: [onboardingImageUrl && (jsxRuntime.jsx("img", { className: 'collect-user-data__main-img', src: onboardingImageUrl, alt: 'onboarding' })), !_isSupportedNetwork && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, Object.assign({ withIcon: false, className: 'collect-user-data__error--not-supported' }, { children: "This network is not available, please update." }))), jsxRuntime.jsxs("div", Object.assign({ className: 'collect-user-data__form' }, { children: [jsxRuntime.jsxs(UserDataForm.UserDataForm, Object.assign({ disableSubmit: !_isSupportedNetwork, userProfile: userProfile }, { children: [jsxRuntime.jsx("div", Object.assign({ className: 'collect-user-data__img-container' }, { children: ((_a = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _a === void 0 ? void 0 : _a.avatar) ? (jsxRuntime.jsx("img", { src: (_b = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _b === void 0 ? void 0 : _b.avatar, alt: '', className: 'collect-user-data__img collect-user-data__img--rounded' })) : (jsxRuntime.jsx(walletBook.WalletIcon, { walletName: walletConnector.name, style: { height: pixelToRem.pixelToRem(64), width: pixelToRem.pixelToRem(64) } })) })), jsxRuntime.jsx(UserAddress.UserAddress, { userProfile: userProfile }), jsxRuntime.jsx("div", Object.assign({ className: 'collect-user-data__network-container' }, { children: jsxRuntime.jsx(NetworkPicker.NetworkPicker, { evmNetworks: evmNetworks, connector: walletConnector, showNetworkName: true, isNetworkPickerOpen: isNetworkPickerOpen, setIsNetworkPickerOpen: setIsNetworkPickerOpen, buttonClassName: 'collect-user-data__network-picker-button', mainClassName: 'collect-user-data__network-picker' }) })), !_isSupportedNetwork ? (jsxRuntime.jsxs("div", Object.assign({ className: 'collect-user-data__welcome-container' }, { children: [jsxRuntime.jsx(Typography.Typography, Object.assign({ variant: 'title', color: 'primary', className: 'collect-user-data__welcome-title' }, { children: "Update Network" })), jsxRuntime.jsx(Typography.Typography, Object.assign({ variant: 'body_normal', weight: 'regular', color: 'secondary' }, { children: "Your wallet is not connected to a supported network. Please update before continuing." }))] }))) : (jsxRuntime.jsxs("div", Object.assign({ className: 'collect-user-data__welcome-container' }, { children: [jsxRuntime.jsx(Typography.Typography, Object.assign({ variant: 'title', color: 'primary', className: 'collect-user-data__welcome-title' }, { children: (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.general.collectUserDataWelcomeHeader) ||
+    return (jsxRuntime.jsxs("div", Object.assign({ className: 'collect-user-data', "data-testid": 'collect-user-data-view' }, { children: [onboardingImageUrl && (jsxRuntime.jsx("img", { className: 'collect-user-data__main-img', src: onboardingImageUrl, alt: 'onboarding' })), !_isSupportedNetwork && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, Object.assign({ withIcon: false, className: 'collect-user-data__error--not-supported' }, { children: "This network is not available, please update." }))), jsxRuntime.jsxs("div", Object.assign({ className: 'collect-user-data__form' }, { children: [jsxRuntime.jsxs(OnboardingUserDataForm.OnboardingUserDataForm, Object.assign({ disableSubmit: !_isSupportedNetwork, userProfile: userProfile }, { children: [jsxRuntime.jsx("div", Object.assign({ className: 'collect-user-data__img-container' }, { children: (nameService === null || nameService === void 0 ? void 0 : nameService.avatar) ? (jsxRuntime.jsx("img", { src: nameService.avatar, alt: '', className: 'collect-user-data__img collect-user-data__img--rounded' })) : (jsxRuntime.jsx(walletBook.WalletIcon, { walletName: walletConnector.name, style: { height: pixelToRem.pixelToRem(64), width: pixelToRem.pixelToRem(64) } })) })), jsxRuntime.jsx(UserAddress.UserAddress, { userProfile: userProfile }), jsxRuntime.jsx("div", Object.assign({ className: 'collect-user-data__network-container' }, { children: jsxRuntime.jsx(NetworkPicker.NetworkPicker, { evmNetworks: evmNetworks, connector: walletConnector, showNetworkName: true, isNetworkPickerOpen: isNetworkPickerOpen, setIsNetworkPickerOpen: setIsNetworkPickerOpen, buttonClassName: 'collect-user-data__network-picker-button', mainClassName: 'collect-user-data__network-picker' }) })), !_isSupportedNetwork ? (jsxRuntime.jsxs("div", Object.assign({ className: 'collect-user-data__welcome-container' }, { children: [jsxRuntime.jsx(Typography.Typography, Object.assign({ variant: 'title', color: 'primary', className: 'collect-user-data__welcome-title' }, { children: "Update Network" })), jsxRuntime.jsx(Typography.Typography, Object.assign({ variant: 'body_normal', weight: 'regular', color: 'secondary' }, { children: "Your wallet is not connected to a supported network. Please update before continuing." }))] }))) : (jsxRuntime.jsxs("div", Object.assign({ className: 'collect-user-data__welcome-container' }, { children: [jsxRuntime.jsx(Typography.Typography, Object.assign({ variant: 'title', color: 'primary', className: 'collect-user-data__welcome-title' }, { children: (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.general.collectUserDataWelcomeHeader) ||
                                             `Welcome to ${appName}` })), jsxRuntime.jsx(Typography.Typography, Object.assign({ variant: 'body_normal', weight: 'regular', color: 'secondary' }, { children: (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.general.collectUserDataWelcomeMessage) ||
                                             'We need a bit of information to get started' }))] })))] })), jsxRuntime.jsx(TextButton.TextButton, Object.assign({ className: 'collect-user-data__log-out', onClick: () => handleLogOut() }, { children: "Log out" }))] }))] })));
 };