@dynamic-labs/sdk-react-core 0.18.0-RC.1 → 0.18.0-RC.3

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

@@ -7,7 +7,6 @@ var React = require('react');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
-require('../../../config/LSSuffix.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
@@ -15,6 +14,7 @@ require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 require('../../../shared/consts/index.cjs');
@@ -23,10 +23,11 @@ var api = require('../../../data/api.cjs');
 require('@dynamic-labs/multi-wallet');
 var shouldManuallyReconnectOnRefresh = require('../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
 
-const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingOnConnectOnly) => {
-    const [connectedInfo, setConnectedInfo, removeConnectedInfo] = useLocalStorage.useLocalStorage(localStorage.CONNECTED_WALLET_CONNECTOR_DATA, null);
+const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingOnConnectOnly, primaryWalletId, setPrimaryWalletId) => {
+    const [connectedWalletsInfo, setConnectedWalletsInfo, removeConnectedWalletsInfo,] = useLocalStorage.useLocalStorage(localStorage.CONNECTED_WALLETS_INFO, []);
     const [connectedWallet, setConnectedWallet] = React.useState(null);
-    const setConnectedStates = React.useCallback((walletConnector, address, chain) => {
+    const [connectedWallets, setConnectedWallets] = React.useState([]);
+    const setConnectedStates = React.useCallback((walletConnector, address, chain, id) => {
         setConnectedWallet({
             address,
             chain,
@@ -34,14 +35,44 @@ const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingO
             connector: walletConnector,
             id: 'connect-only-wallet',
         });
-        setConnectedInfo({
-            chain,
-            name: walletConnector.name,
-            provider: getWalletProvider.getWalletProvider(walletConnector),
-            walletPublicKey: address,
+        setConnectedWallets((currentWallets) => {
+            const exists = currentWallets.some((currentWallet) => walletConnectorCore.isSameAddress(currentWallet.address, address, chain));
+            if (currentWallets.length === 0 &&
+                authMode === 'connect-only' &&
+                !primaryWalletId) {
+                setPrimaryWalletId(`connect-only-wallet-${0}`);
+            }
+            if (exists) {
+                return currentWallets;
+            }
+            return [
+                ...currentWallets,
+                {
+                    address,
+                    chain,
+                    connected: true,
+                    connector: walletConnector,
+                    id: `connect-only-wallet-${id}`,
+                },
+            ];
         });
-    }, [setConnectedInfo]);
-    const connectWalletByAddressAndChain = React.useCallback((name, address, chain) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        setConnectedWalletsInfo((currentWallets) => {
+            const exists = currentWallets.some((currentWallet) => currentWallet.walletPublicKey === address);
+            if (exists) {
+                return currentWallets;
+            }
+            return [
+                ...currentWallets,
+                {
+                    chain,
+                    name: walletConnector.name,
+                    provider: getWalletProvider.getWalletProvider(walletConnector),
+                    walletPublicKey: address,
+                },
+            ];
+        });
+    }, [authMode, primaryWalletId, setConnectedWalletsInfo, setPrimaryWalletId]);
+    const connectWalletByAddressAndChain = React.useCallback((name, address, chain, id) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const walletConnector = walletConnectorCore.getWalletConnectorByName(wallets.map((wallet) => wallet.walletConnector), name);
         if (walletConnector) {
             if (shouldManuallyReconnectOnRefresh.shouldManuallyReconnectOnRefresh(walletConnector)) {
@@ -51,7 +82,7 @@ const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingO
             const result = connectedAccounts.filter((account) => walletConnectorCore.isSameAddress(account, address, chain));
             if (result.length > 0) {
                 walletConnector.connect();
-                setConnectedStates(walletConnector, address, chain);
+                setConnectedStates(walletConnector, address, chain, id);
             }
             else {
                 setConnectedWallet(null);
@@ -62,19 +93,20 @@ const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingO
         }
     }), [setConnectedStates, wallets]);
     React.useEffect(() => {
-        if (authMode === 'connect-only' && connectedInfo && !connectedWallet) {
-            if (connectedInfo.walletPublicKey &&
-                connectedInfo.name &&
-                connectedInfo.chain) {
-                const { name, walletPublicKey, chain } = connectedInfo;
-                connectWalletByAddressAndChain(name, walletPublicKey, chain);
-            }
+        if (authMode === 'connect-only' &&
+            connectedWalletsInfo.length &&
+            !connectedWallets.length) {
+            connectedWalletsInfo.forEach(({ name, walletPublicKey, chain }, id) => {
+                if (chain) {
+                    connectWalletByAddressAndChain(name, walletPublicKey, chain, id);
+                }
+            });
         }
     }, [
         authMode,
         connectWalletByAddressAndChain,
-        connectedInfo,
-        connectedWallet,
+        connectedWallets.length,
+        connectedWalletsInfo,
     ]);
     const shouldSkipCreatingVisit = React.useMemo(() => (authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly) ||
         connectedWallet, [authMode, connectedWallet, enableVisitTrackingOnConnectOnly]);
@@ -86,7 +118,7 @@ const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingO
             throw error;
         }
         const chain = walletConnector.connectedChain || '';
-        setConnectedStates(walletConnector, publicWalletAddress, chain);
+        setConnectedStates(walletConnector, publicWalletAddress, chain, connectedWalletsInfo.length);
         if (shouldSkipCreatingVisit) {
             return publicWalletAddress;
         }
@@ -106,11 +138,12 @@ const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingO
     return {
         connectWallet,
         connectWalletByAddressAndChain,
-        connectedInfo,
         connectedWallet,
-        removeConnectedInfo,
-        setConnectedInfo,
+        connectedWallets,
+        connectedWalletsInfo,
+        removeConnectedWalletsInfo,
         setConnectedWallet,
+        setConnectedWallets,
     };
 };
 

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

@@ -7,12 +7,13 @@ export type ConnectedWalletConnectorType = {
     provider: string;
     walletPublicKey: string;
 };
-export declare const useConnectWallet: (wallets: WalletOption[], authMode: AuthModeType, environmentId: string, enableVisitTrackingOnConnectOnly: boolean) => {
+export declare const useConnectWallet: (wallets: WalletOption[], authMode: AuthModeType, environmentId: string, enableVisitTrackingOnConnectOnly: boolean, primaryWalletId: string | undefined, setPrimaryWalletId: (walletId: string) => void) => {
     connectWallet: (walletConnector: WalletConnector, fetchPublicAddressOpts?: FetchPublicAddressOpts) => Promise<string>;
-    connectWalletByAddressAndChain: (name: string, address: string, chain: Chain) => Promise<void>;
-    connectedInfo: ConnectedWalletConnectorType | null;
+    connectWalletByAddressAndChain: (name: string, address: string, chain: Chain, id?: number) => Promise<void>;
     connectedWallet: Wallet | null;
-    removeConnectedInfo: () => void;
-    setConnectedInfo: (value: ConnectedWalletConnectorType | ((val: ConnectedWalletConnectorType | null) => ConnectedWalletConnectorType | null) | null) => void;
+    connectedWallets: [] | Wallet[];
+    connectedWalletsInfo: [] | ConnectedWalletConnectorType[];
+    removeConnectedWalletsInfo: () => void;
     setConnectedWallet: import("react").Dispatch<import("react").SetStateAction<Wallet | null>>;
+    setConnectedWallets: import("react").Dispatch<import("react").SetStateAction<[] | Wallet[]>>;
 };

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

@@ -1,16 +1,16 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useCallback, useEffect, useMemo } from 'react';
-import { getWalletConnectorByName, isSameAddress } from '@dynamic-labs/wallet-connector-core';
+import { isSameAddress, getWalletConnectorByName } from '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
-import '../../../config/LSSuffix.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
-import { CONNECTED_WALLET_CONNECTOR_DATA } from '../../constants/localStorage.js';
+import { CONNECTED_WALLETS_INFO } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import '../../../shared/consts/index.js';
@@ -19,10 +19,11 @@ import { createVisit } from '../../../data/api.js';
 import '@dynamic-labs/multi-wallet';
 import { shouldManuallyReconnectOnRefresh } from '../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
 
-const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingOnConnectOnly) => {
-    const [connectedInfo, setConnectedInfo, removeConnectedInfo] = useLocalStorage(CONNECTED_WALLET_CONNECTOR_DATA, null);
+const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingOnConnectOnly, primaryWalletId, setPrimaryWalletId) => {
+    const [connectedWalletsInfo, setConnectedWalletsInfo, removeConnectedWalletsInfo,] = useLocalStorage(CONNECTED_WALLETS_INFO, []);
     const [connectedWallet, setConnectedWallet] = useState(null);
-    const setConnectedStates = useCallback((walletConnector, address, chain) => {
+    const [connectedWallets, setConnectedWallets] = useState([]);
+    const setConnectedStates = useCallback((walletConnector, address, chain, id) => {
         setConnectedWallet({
             address,
             chain,
@@ -30,14 +31,44 @@ const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingO
             connector: walletConnector,
             id: 'connect-only-wallet',
         });
-        setConnectedInfo({
-            chain,
-            name: walletConnector.name,
-            provider: getWalletProvider(walletConnector),
-            walletPublicKey: address,
+        setConnectedWallets((currentWallets) => {
+            const exists = currentWallets.some((currentWallet) => isSameAddress(currentWallet.address, address, chain));
+            if (currentWallets.length === 0 &&
+                authMode === 'connect-only' &&
+                !primaryWalletId) {
+                setPrimaryWalletId(`connect-only-wallet-${0}`);
+            }
+            if (exists) {
+                return currentWallets;
+            }
+            return [
+                ...currentWallets,
+                {
+                    address,
+                    chain,
+                    connected: true,
+                    connector: walletConnector,
+                    id: `connect-only-wallet-${id}`,
+                },
+            ];
         });
-    }, [setConnectedInfo]);
-    const connectWalletByAddressAndChain = useCallback((name, address, chain) => __awaiter(void 0, void 0, void 0, function* () {
+        setConnectedWalletsInfo((currentWallets) => {
+            const exists = currentWallets.some((currentWallet) => currentWallet.walletPublicKey === address);
+            if (exists) {
+                return currentWallets;
+            }
+            return [
+                ...currentWallets,
+                {
+                    chain,
+                    name: walletConnector.name,
+                    provider: getWalletProvider(walletConnector),
+                    walletPublicKey: address,
+                },
+            ];
+        });
+    }, [authMode, primaryWalletId, setConnectedWalletsInfo, setPrimaryWalletId]);
+    const connectWalletByAddressAndChain = useCallback((name, address, chain, id) => __awaiter(void 0, void 0, void 0, function* () {
         const walletConnector = getWalletConnectorByName(wallets.map((wallet) => wallet.walletConnector), name);
         if (walletConnector) {
             if (shouldManuallyReconnectOnRefresh(walletConnector)) {
@@ -47,7 +78,7 @@ const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingO
             const result = connectedAccounts.filter((account) => isSameAddress(account, address, chain));
             if (result.length > 0) {
                 walletConnector.connect();
-                setConnectedStates(walletConnector, address, chain);
+                setConnectedStates(walletConnector, address, chain, id);
             }
             else {
                 setConnectedWallet(null);
@@ -58,19 +89,20 @@ const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingO
         }
     }), [setConnectedStates, wallets]);
     useEffect(() => {
-        if (authMode === 'connect-only' && connectedInfo && !connectedWallet) {
-            if (connectedInfo.walletPublicKey &&
-                connectedInfo.name &&
-                connectedInfo.chain) {
-                const { name, walletPublicKey, chain } = connectedInfo;
-                connectWalletByAddressAndChain(name, walletPublicKey, chain);
-            }
+        if (authMode === 'connect-only' &&
+            connectedWalletsInfo.length &&
+            !connectedWallets.length) {
+            connectedWalletsInfo.forEach(({ name, walletPublicKey, chain }, id) => {
+                if (chain) {
+                    connectWalletByAddressAndChain(name, walletPublicKey, chain, id);
+                }
+            });
         }
     }, [
         authMode,
         connectWalletByAddressAndChain,
-        connectedInfo,
-        connectedWallet,
+        connectedWallets.length,
+        connectedWalletsInfo,
     ]);
     const shouldSkipCreatingVisit = useMemo(() => (authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly) ||
         connectedWallet, [authMode, connectedWallet, enableVisitTrackingOnConnectOnly]);
@@ -82,7 +114,7 @@ const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingO
             throw error;
         }
         const chain = walletConnector.connectedChain || '';
-        setConnectedStates(walletConnector, publicWalletAddress, chain);
+        setConnectedStates(walletConnector, publicWalletAddress, chain, connectedWalletsInfo.length);
         if (shouldSkipCreatingVisit) {
             return publicWalletAddress;
         }
@@ -102,11 +134,12 @@ const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingO
     return {
         connectWallet,
         connectWalletByAddressAndChain,
-        connectedInfo,
         connectedWallet,
-        removeConnectedInfo,
-        setConnectedInfo,
+        connectedWallets,
+        connectedWalletsInfo,
+        removeConnectedWalletsInfo,
         setConnectedWallet,
+        setConnectedWallets,
     };
 };
 

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

@@ -6,7 +6,6 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 require('@dynamic-labs/sdk-api');
 var logger = require('../../../shared/logger.cjs');
-require('../../../config/LSSuffix.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
@@ -14,6 +13,7 @@ require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 require('../../../shared/consts/index.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');

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

@@ -2,7 +2,6 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useEffect } from 'react';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../shared/logger.js';
-import '../../../config/LSSuffix.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
@@ -10,6 +9,7 @@ import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import '../../constants/colors.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../../../shared/consts/index.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';

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

@@ -6,14 +6,14 @@ var React = require('react');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
-require('../../../shared/logger.cjs');
-require('../../../config/LSSuffix.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
+require('../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 require('../../../shared/consts/index.cjs');
 var index = require('../../functions/storeAuthToken/index.cjs');
@@ -23,12 +23,12 @@ require('@dynamic-labs/sdk-api');
 
 const useCreateUserProfileByJWTCallback = () => {
     const { setUser, handleLogOut } = useInternalDynamicContext.useInternalDynamicContext();
-    const { setView } = ViewContext.useViewContext();
+    const { goToInitialView } = ViewContext.useViewContext();
     const createUserProfileByJWT = React.useCallback((jwt) => {
         const decodedJWT = decodeJwt.decodeJwt(jwt);
         if (!decodedJWT) {
             handleLogOut();
-            setView('wallet-list');
+            goToInitialView();
             return;
         }
         const userProfile = createUserProfile.createUserProfile(decodedJWT);

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

@@ -2,14 +2,14 @@ import { useCallback } from 'react';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
-import '../../../shared/logger.js';
-import '../../../config/LSSuffix.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
+import '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import '../../constants/colors.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../../../shared/consts/index.js';
 import { storeAuthToken } from '../../functions/storeAuthToken/index.js';
@@ -19,12 +19,12 @@ import '@dynamic-labs/sdk-api';
 
 const useCreateUserProfileByJWTCallback = () => {
     const { setUser, handleLogOut } = useInternalDynamicContext();
-    const { setView } = useViewContext();
+    const { goToInitialView } = useViewContext();
     const createUserProfileByJWT = useCallback((jwt) => {
         const decodedJWT = decodeJwt(jwt);
         if (!decodedJWT) {
             handleLogOut();
-            setView('wallet-list');
+            goToInitialView();
             return;
         }
         const userProfile = createUserProfile(decodedJWT);

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

@@ -7,8 +7,6 @@ var utils = require('@dynamic-labs/utils');
 var api = require('../../../data/api.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
-var getFromLS = require('../../../shared/utils/functions/storage/getFromLS.cjs');
-require('../../../config/LSSuffix.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
@@ -16,6 +14,7 @@ require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
+var localStorage$1 = require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 require('../../../shared/consts/index.cjs');
@@ -49,8 +48,8 @@ const useFetchNetworkConfigurations = ({ authToken, environmentId, evmNetworks:
         }
     }, [environmentId, handleRemoveLsNetworks, lsNetworks, removeLsNetworks]);
     React.useEffect(() => {
-        const connectedWalletData = getFromLS.getFromLS(localStorage.CONNECTED_WALLET_CONNECTOR_DATA);
-        if (!authToken && !connectedWalletData) {
+        const connectedWalletData = localStorage$1.LocalStorage.getFromLS(localStorage.CONNECTED_WALLETS_INFO) || [];
+        if (!authToken && !(connectedWalletData === null || connectedWalletData === void 0 ? void 0 : connectedWalletData.length)) {
             handleRemoveLsNetworks();
         }
     }, [authToken, handleRemoveLsNetworks]);

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

@@ -3,15 +3,14 @@ import { DynamicError } from '@dynamic-labs/utils';
 import { fetchNetworkSettings } from '../../../data/api.js';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
-import { getFromLS } from '../../../shared/utils/functions/storage/getFromLS.js';
-import '../../../config/LSSuffix.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 { NETWORKS_STORAGE_KEY, CONNECTED_WALLET_CONNECTOR_DATA } from '../../constants/localStorage.js';
+import { NETWORKS_STORAGE_KEY, CONNECTED_WALLETS_INFO } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
+import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import '../../../shared/consts/index.js';
@@ -45,8 +44,8 @@ const useFetchNetworkConfigurations = ({ authToken, environmentId, evmNetworks:
         }
     }, [environmentId, handleRemoveLsNetworks, lsNetworks, removeLsNetworks]);
     useEffect(() => {
-        const connectedWalletData = getFromLS(CONNECTED_WALLET_CONNECTOR_DATA);
-        if (!authToken && !connectedWalletData) {
+        const connectedWalletData = LocalStorage.getFromLS(CONNECTED_WALLETS_INFO) || [];
+        if (!authToken && !(connectedWalletData === null || connectedWalletData === void 0 ? void 0 : connectedWalletData.length)) {
             handleRemoveLsNetworks();
         }
     }, [authToken, handleRemoveLsNetworks]);

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

@@ -7,7 +7,6 @@ var utils = require('@dynamic-labs/utils');
 var api = require('../../../data/api.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
-require('../../../config/LSSuffix.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
@@ -15,6 +14,7 @@ require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 require('../../../shared/consts/index.cjs');

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

@@ -3,7 +3,6 @@ import { DynamicError } from '@dynamic-labs/utils';
 import { fetchNonce } from '../../../data/api.js';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
-import '../../../config/LSSuffix.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
@@ -11,6 +10,7 @@ import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import { NONCE_STORAGE_KEY } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import '../../../shared/consts/index.js';

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

@@ -7,8 +7,6 @@ var utils = require('@dynamic-labs/utils');
 var api = require('../../../data/api.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
-var getFromLS = require('../../../shared/utils/functions/storage/getFromLS.cjs');
-require('../../../config/LSSuffix.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
@@ -16,6 +14,7 @@ require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
+var localStorage$1 = require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 require('../../../shared/consts/index.cjs');
@@ -34,7 +33,7 @@ const useFetchProjectSettings = ({ authToken, environmentId, maxRetries = 2, })
         removeLsSettings();
     }
     React.useEffect(() => {
-        const connectedWalletData = getFromLS.getFromLS(localStorage.CONNECTED_WALLET_CONNECTOR_DATA);
+        const [connectedWalletData] = localStorage$1.LocalStorage.getFromLS(localStorage.CONNECTED_WALLETS_INFO) || [];
         if (!authToken && !connectedWalletData) {
             removeLsSettings();
         }

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

@@ -3,15 +3,14 @@ import { DynamicError } from '@dynamic-labs/utils';
 import { fetchProjectSettings } from '../../../data/api.js';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
-import { getFromLS } from '../../../shared/utils/functions/storage/getFromLS.js';
-import '../../../config/LSSuffix.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 { PROJECT_SETTINGS_STORAGE_KEY, CONNECTED_WALLET_CONNECTOR_DATA } from '../../constants/localStorage.js';
+import { PROJECT_SETTINGS_STORAGE_KEY, CONNECTED_WALLETS_INFO } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
+import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import '../../../shared/consts/index.js';
@@ -30,7 +29,7 @@ const useFetchProjectSettings = ({ authToken, environmentId, maxRetries = 2, })
         removeLsSettings();
     }
     useEffect(() => {
-        const connectedWalletData = getFromLS(CONNECTED_WALLET_CONNECTOR_DATA);
+        const [connectedWalletData] = LocalStorage.getFromLS(CONNECTED_WALLETS_INFO) || [];
         if (!authToken && !connectedWalletData) {
             removeLsSettings();
         }

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var React = require('react');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
-require('../../../config/LSSuffix.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
@@ -13,6 +12,7 @@ require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 var index = require('../../../shared/consts/index.cjs');
 

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

@@ -1,7 +1,6 @@
 import { useEffect } from 'react';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
-import '../../../config/LSSuffix.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
@@ -9,6 +8,7 @@ import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import '../../constants/colors.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import { defaultWalletsForChains } from '../../../shared/consts/index.js';
 

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

@@ -6,16 +6,15 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
-var getFromLS = require('../../../shared/utils/functions/storage/getFromLS.cjs');
-require('../../../config/LSSuffix.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');
-var localStorage = require('../../constants/localStorage.cjs');
+var localStorage$1 = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
+var localStorage = require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 require('../../../shared/consts/index.cjs');
 var handleUnlinkHelper = require('../../functions/handleUnlinkHelper/handleUnlinkHelper.cjs');
@@ -33,7 +32,7 @@ const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWall
         //  handleUnlinkWallet('1234');
         // }
         // without fetching from LS, primaryWalletId would still be 1234 when handleUnlinkWallet runs in the example above
-        const currentPrimaryWalletId = (_a = getFromLS.getFromLS(localStorage.PRIMARY_WALLET_ID)) !== null && _a !== void 0 ? _a : primaryWalletId;
+        const currentPrimaryWalletId = (_a = localStorage.LocalStorage.getFromLS(localStorage$1.PRIMARY_WALLET_ID)) !== null && _a !== void 0 ? _a : primaryWalletId;
         if (walletId === currentPrimaryWalletId)
             return;
         const newUser = yield handleUnlinkHelper.handleUnlinkHelper({