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

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

@@ -8,24 +8,21 @@ var utils = require('@dynamic-labs/utils');
 var api = require('../../../data/api.cjs');
 var index = require('../../functions/storeAuthToken/index.cjs');
 require('@dynamic-labs/multi-wallet');
-var localStorage = require('../../constants/localStorage.cjs');
-require('../../constants/colors.cjs');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
-var logger = require('../../../shared/logger.cjs');
-require('../../../config/LSSuffix.cjs');
-var setToLS = require('../../../shared/utils/functions/storage/setToLS.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('react');
+var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
+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 getVerifyArgs = require('../../functions/getVerifyArgs/getVerifyArgs.cjs');
 var createUserProfile = require('../../functions/createUserProfile/createUserProfile.cjs');
-var isSupportedNetwork = require('../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
 require('@dynamic-labs/sdk-api');
-var isProgrammableNetworkSwitchSupported = require('../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 var getSiweStatement = require('../../functions/getSiweStatement/getSiweStatement.cjs');
@@ -39,7 +36,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
     const { setDeniedAddress, setDeniedOauthProvider } = AccessDeniedContext.useAccessDeniedContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage, setError } = ErrorContext.useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, } = useInternalDynamicContext.useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
@@ -92,6 +89,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
         }
     };
     const handleError = (e, walletConnector, address, oauth) => {
+        removeConnectedWalletsInfo();
         // This is a special case where the user is trying to link a wallet
         // and the wallet is already linked and we don't want to kill the session.
         if (e instanceof utils.WalletUsedError) {
@@ -131,11 +129,6 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
     };
     return ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const walletProvider = getWalletProvider.getWalletProvider(walletConnector);
-        const network = yield walletConnector.getNetwork();
-        const _isSupportedNetwork = isSupportedNetwork.isSupportedNetwork({
-            network,
-            walletConnector,
-        });
         try {
             const Jwt = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth);
             const decodedJwt = decodeJwt.decodeJwt(Jwt);
@@ -144,18 +137,9 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             const user = yield createUserProfile.createUserProfile(decodedJwt);
             const isKycRequired = decodedJwt.missingFields.length;
             setOnboardingOnlyJwt(Jwt);
-            setToLS.setToLS(localStorage.LAST_USED_WALLET, walletConnector.name);
+            localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.name);
+            setAuthMode('connect-and-sign');
             updatePrimaryWalletId(walletConnector, user);
-            // Routes user to "Not Supported Network" screen if the user is not on the supported network
-            if (projectSettings &&
-                verifyOnly &&
-                !_isSupportedNetwork &&
-                !isKycRequired) {
-                if (isProgrammableNetworkSwitchSupported.isProgrammableNetworkSwitchSupported(walletConnector)) {
-                    return setView('network-not-supported');
-                }
-                return setView('network-not-supported-manual');
-            }
             // TODO: how can projectSettings be undefined?
             if (verifyOnly && projectSettings && isKycRequired) {
                 setShowAuthFlow(true);

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

@@ -4,24 +4,21 @@ import { DynamicError, WalletUsedError, ChainalysisError, NoAccessError } from '
 import { verifyWallet, linkWallet } from '../../../data/api.js';
 import { storeAuthToken } from '../../functions/storeAuthToken/index.js';
 import '@dynamic-labs/multi-wallet';
-import { LAST_USED_WALLET } from '../../constants/localStorage.js';
-import '../../constants/colors.js';
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
-import { logger } from '../../../shared/logger.js';
-import '../../../config/LSSuffix.js';
-import { setToLS } from '../../../shared/utils/functions/storage/setToLS.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import 'react';
+import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
+import { LAST_USED_WALLET } from '../../constants/localStorage.js';
+import '../../constants/colors.js';
+import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../../../shared/consts/index.js';
 import { getVerifyArgs } from '../../functions/getVerifyArgs/getVerifyArgs.js';
 import { createUserProfile } from '../../functions/createUserProfile/createUserProfile.js';
-import { isSupportedNetwork } from '../../functions/isSupportedNetwork/isSupportedNetwork.js';
 import '@dynamic-labs/sdk-api';
-import { isProgrammableNetworkSwitchSupported } from '../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import { getSiweStatement } from '../../functions/getSiweStatement/getSiweStatement.js';
@@ -35,7 +32,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
     const { setDeniedAddress, setDeniedOauthProvider } = useAccessDeniedContext();
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage, setError } = useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, } = useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, } = useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
@@ -88,6 +85,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
         }
     };
     const handleError = (e, walletConnector, address, oauth) => {
+        removeConnectedWalletsInfo();
         // This is a special case where the user is trying to link a wallet
         // and the wallet is already linked and we don't want to kill the session.
         if (e instanceof WalletUsedError) {
@@ -127,11 +125,6 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
     };
     return ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth, }) => __awaiter(void 0, void 0, void 0, function* () {
         const walletProvider = getWalletProvider(walletConnector);
-        const network = yield walletConnector.getNetwork();
-        const _isSupportedNetwork = isSupportedNetwork({
-            network,
-            walletConnector,
-        });
         try {
             const Jwt = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth);
             const decodedJwt = decodeJwt(Jwt);
@@ -140,18 +133,9 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             const user = yield createUserProfile(decodedJwt);
             const isKycRequired = decodedJwt.missingFields.length;
             setOnboardingOnlyJwt(Jwt);
-            setToLS(LAST_USED_WALLET, walletConnector.name);
+            LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.name);
+            setAuthMode('connect-and-sign');
             updatePrimaryWalletId(walletConnector, user);
-            // Routes user to "Not Supported Network" screen if the user is not on the supported network
-            if (projectSettings &&
-                verifyOnly &&
-                !_isSupportedNetwork &&
-                !isKycRequired) {
-                if (isProgrammableNetworkSwitchSupported(walletConnector)) {
-                    return setView('network-not-supported');
-                }
-                return setView('network-not-supported-manual');
-            }
             // TODO: how can projectSettings be undefined?
             if (verifyOnly && projectSettings && isKycRequired) {
                 setShowAuthFlow(true);

package/src/lib/utils/hooks/useWalletConnectors/reconnectSocialWallet.cjs

@@ -6,7 +6,6 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 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');
@@ -14,6 +13,7 @@ require('react');
 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');
 require('@dynamic-labs/multi-wallet');

package/src/lib/utils/hooks/useWalletConnectors/reconnectSocialWallet.js

@@ -2,7 +2,6 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { isSocialWalletConnector } 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';
@@ -10,6 +9,7 @@ import 'react';
 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 '@dynamic-labs/multi-wallet';

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

@@ -8,25 +8,21 @@ var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
 require('@dynamic-labs/sdk-api');
 var logger = require('../../../shared/logger.cjs');
-require('../../../config/LSSuffix.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
-var localStorage$1 = 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');
 var isSameWalletName = require('../../functions/isSameWalletName/isSameWalletName.cjs');
 var useWalletsConnectionState = require('../useWalletsConnectionState/useWalletsConnectionState.cjs');
-var primaryWalletIdValidator = require('./utils/primaryWalletIdValidator/primaryWalletIdValidator.cjs');
 var createLinkedWalletsFromWalletOptions = require('./utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs');
 var reconnectSocialWallet = require('./reconnectSocialWallet.cjs');
 
-const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, }) => {
+const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = React.useState(false);
-    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletId] = useLocalStorage.useLocalStorage(localStorage$1.PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator.primaryWalletIdValidator);
     const linkedWallets = React.useMemo(() => {
         if (!authToken) {
             return [];
@@ -36,15 +32,13 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
             primaryWalletId,
             walletOptions: availableWallets,
         });
-    }, [availableWallets, primaryWalletId, authToken]);
-    const { connectedWalletMap, computeConnectedStateForWallets, didConnectedStateLoad, } = useWalletsConnectionState.useWalletsConnectionState(linkedWallets);
-    const wallets = React.useMemo(() => linkedWallets.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, linkedWallets]);
+    }, [authToken, primaryWalletId, availableWallets]);
+    const walletsBasedOnAuthMode = React.useMemo(() => (authMode === 'connect-only' ? connectedWallets : linkedWallets), [authMode, connectedWallets, linkedWallets]);
+    const { connectedWalletMap, computeConnectedStateForWallets, didConnectedStateLoad, } = useWalletsConnectionState.useWalletsConnectionState(walletsBasedOnAuthMode);
+    const wallets = React.useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
     React.useEffect(() => {
         computeConnectedStateForWallets();
     }, [primaryWalletId, computeConnectedStateForWallets]);
-    const setPrimaryWalletId = React.useCallback((walletId) => {
-        setPrimaryWalletIdState(walletId);
-    }, [setPrimaryWalletIdState]);
     const getPrimaryWallet = React.useCallback(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
     const getSecondaryWallets = React.useCallback(() => wallets.filter((wallet) => wallet.id !== primaryWalletId), [primaryWalletId, wallets]);
     const getSelectedWallet = React.useCallback((walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -143,16 +137,13 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
     ]);
     const walletConnectors = wallets.map((wallet) => wallet.connector);
     return {
-        clearPrimaryWalletId,
         computeConnectedStateForWallets,
         didConnectedStateLoad,
         getPrimaryWallet,
         getSecondaryWallets,
         primaryWallet: getPrimaryWallet(),
-        primaryWalletId,
         secondaryWallets: getSecondaryWallets(),
         setPrimaryWallet,
-        setPrimaryWalletId,
         setShowQrcodeModal,
         showQrcodeModal,
         walletConnectors,

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

@@ -1,30 +1,31 @@
 import { Dispatch, SetStateAction } from 'react';
-import { WalletOption, Wallet, MultiWalletWidgetState } from '../../../shared';
+import { WalletOption, Wallet, MultiWalletWidgetState, AuthModeType } from '../../../shared';
 import { MultiWalletWidgetStateSetter } from '../multiWallet';
 import { WalletConnector } from '../../../..';
 type Props = {
+    authMode: AuthModeType;
     authToken: string | undefined;
+    connectedWallets: Wallet[];
     multiWalletWidgetState: MultiWalletWidgetState;
     setDesktopUri: Dispatch<SetStateAction<string>>;
     setMultiWalletWidgetState: MultiWalletWidgetStateSetter;
     setQrcodeUri: Dispatch<SetStateAction<string>>;
     wallets: WalletOption[];
+    setPrimaryWalletId: (walletId: string) => void;
+    primaryWalletId: string | undefined;
 };
 export interface UseWalletConnectors {
-    clearPrimaryWalletId: () => void;
     computeConnectedStateForWallets: () => Promise<void>;
     didConnectedStateLoad: boolean;
     getPrimaryWallet: () => Wallet | null;
     getSecondaryWallets: () => Wallet[];
     primaryWallet: Wallet | null;
-    primaryWalletId: string | undefined;
     secondaryWallets: Wallet[];
     setPrimaryWallet: (walletId: string) => Promise<void>;
-    setPrimaryWalletId: (walletId: string) => void;
     setShowQrcodeModal: Dispatch<SetStateAction<boolean>>;
     showQrcodeModal: boolean;
     walletConnectors: WalletConnector[];
     wallets: Wallet[];
 }
-export declare const useWalletConnectors: ({ authToken, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, }: Props) => UseWalletConnectors;
+export declare const useWalletConnectors: ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, }: Props) => UseWalletConnectors;
 export {};

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

@@ -4,25 +4,21 @@ import { isEmailWalletConnector, isSocialWalletConnector } from '@dynamic-labs/w
 import { DynamicError } from '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../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 { PRIMARY_WALLET_ID } 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';
 import { isSameWalletName } from '../../functions/isSameWalletName/isSameWalletName.js';
 import { useWalletsConnectionState } from '../useWalletsConnectionState/useWalletsConnectionState.js';
-import { primaryWalletIdValidator } from './utils/primaryWalletIdValidator/primaryWalletIdValidator.js';
 import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
 import { reconnectSocialWallet } from './reconnectSocialWallet.js';
 
-const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, }) => {
+const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = useState(false);
-    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletId] = useLocalStorage(PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator);
     const linkedWallets = useMemo(() => {
         if (!authToken) {
             return [];
@@ -32,15 +28,13 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
             primaryWalletId,
             walletOptions: availableWallets,
         });
-    }, [availableWallets, primaryWalletId, authToken]);
-    const { connectedWalletMap, computeConnectedStateForWallets, didConnectedStateLoad, } = useWalletsConnectionState(linkedWallets);
-    const wallets = useMemo(() => linkedWallets.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, linkedWallets]);
+    }, [authToken, primaryWalletId, availableWallets]);
+    const walletsBasedOnAuthMode = useMemo(() => (authMode === 'connect-only' ? connectedWallets : linkedWallets), [authMode, connectedWallets, linkedWallets]);
+    const { connectedWalletMap, computeConnectedStateForWallets, didConnectedStateLoad, } = useWalletsConnectionState(walletsBasedOnAuthMode);
+    const wallets = useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
     useEffect(() => {
         computeConnectedStateForWallets();
     }, [primaryWalletId, computeConnectedStateForWallets]);
-    const setPrimaryWalletId = useCallback((walletId) => {
-        setPrimaryWalletIdState(walletId);
-    }, [setPrimaryWalletIdState]);
     const getPrimaryWallet = useCallback(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
     const getSecondaryWallets = useCallback(() => wallets.filter((wallet) => wallet.id !== primaryWalletId), [primaryWalletId, wallets]);
     const getSelectedWallet = useCallback((walletId) => __awaiter(void 0, void 0, void 0, function* () {
@@ -139,16 +133,13 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
     ]);
     const walletConnectors = wallets.map((wallet) => wallet.connector);
     return {
-        clearPrimaryWalletId,
         computeConnectedStateForWallets,
         didConnectedStateLoad,
         getPrimaryWallet,
         getSecondaryWallets,
         primaryWallet: getPrimaryWallet(),
-        primaryWalletId,
         secondaryWallets: getSecondaryWallets(),
         setPrimaryWallet,
-        setPrimaryWalletId,
         setShowQrcodeModal,
         showQrcodeModal,
         walletConnectors,

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs

@@ -3,16 +3,16 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 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('../../../../../context/ViewContext/ViewContext.cjs');
 require('react');
+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 isSameWalletName = require('../../../../functions/isSameWalletName/isSameWalletName.cjs');

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js

@@ -1,14 +1,14 @@
 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 '../../../../../context/ViewContext/ViewContext.js';
 import 'react';
+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 { isSameWalletName } from '../../../../functions/isSameWalletName/isSameWalletName.js';

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

@@ -7,13 +7,13 @@ var React = require('react');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api');
 var logger = require('../../../shared/logger.cjs');
-require('../../../config/LSSuffix.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 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');
 
@@ -62,6 +62,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         // eslint-disable-next-line react-hooks/exhaustive-deps
         orderedSecondaryWalletAddresses(secondaryWallets).join(),
         selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name,
+        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.isInitialized,
     ]);
     const handleAccountChangeWhenAwaitingAccountSwitch = React.useCallback((isPrimaryWallet, newAddress) => {
         const linkedSecondaryWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));

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

@@ -3,13 +3,13 @@ import { useState, useEffect, useCallback } from 'react';
 import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../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 '../../constants/colors.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../../../shared/consts/index.js';
 
@@ -58,6 +58,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         // eslint-disable-next-line react-hooks/exhaustive-deps
         orderedSecondaryWalletAddresses(secondaryWallets).join(),
         selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name,
+        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.isInitialized,
     ]);
     const handleAccountChangeWhenAwaitingAccountSwitch = useCallback((isPrimaryWallet, newAddress) => {
         const linkedSecondaryWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));

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

@@ -10,13 +10,13 @@ var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 var ViewContext = require('../../../context/ViewContext/ViewContext.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');
 require('react');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');

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

@@ -6,13 +6,13 @@ import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.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';
 import 'react';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';

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

@@ -9,13 +9,13 @@ var SignMessageConfirmationModal = require('../../../modals/SignMessageConfirmat
 var TransactionConfirmationModal = require('../../../modals/TransactionConfirmationModal/TransactionConfirmationModal.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('../../../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');
 require('../../../context/DynamicContext/DynamicContext.cjs');
@@ -29,6 +29,7 @@ require('../../../components/Transition/SlideInUpTransition/SlideInUpTransition.
 require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/rpc-providers');
+require('../useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 var useConfirmationModal = require('../useConfirmationModal/useConfirmationModal.cjs');

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

@@ -5,13 +5,13 @@ import { SignMessageConfirmationModal } from '../../../modals/SignMessageConfirm
 import { TransactionConfirmationModal } from '../../../modals/TransactionConfirmationModal/TransactionConfirmationModal.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 '../../../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 '../../../context/DynamicContext/DynamicContext.js';
@@ -25,6 +25,7 @@ import '../../../components/Transition/SlideInUpTransition/SlideInUpTransition.j
 import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/rpc-providers';
+import '../useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import { useConfirmationModal } from '../useConfirmationModal/useConfirmationModal.js';

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

@@ -4,10 +4,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
 var data = require('../../../views/WalletList/data.cjs');
+var verifyMagicIsSetup = require('./utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
 
-const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, networkConfigurations, walletUiUtils, walletConnectorsProp, }) => {
+const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }) => {
     const wallets = React.useMemo(() => {
-        if (!projectSettings)
+        if (!projectSettings || !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length)
             return [];
         const installedWallets = data.getInstalledWallets(projectSettings, {
             appLogoUrl,
@@ -16,6 +17,8 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, network
             flowNetwork,
             networkConfigurations,
             skipMemo: true,
+            walletBook,
+            walletConnectV1Bridge,
             walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
             walletUiUtils,
         });
@@ -26,6 +29,8 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, network
             flowNetwork,
             networkConfigurations,
             skipMemo: true,
+            walletBook,
+            walletConnectV1Bridge,
             walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
             walletUiUtils,
         });
@@ -37,8 +42,15 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, network
         networkConfigurations,
         projectSettings,
         walletConnectorsProp,
+        walletConnectV1Bridge,
         flowNetwork,
+        Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length,
     ]);
+    React.useEffect(() => {
+        if (!projectSettings || wallets.length === 0)
+            return;
+        verifyMagicIsSetup.verifyMagicIsSetup(projectSettings, wallets.map(({ walletConnector }) => walletConnector));
+    }, [wallets, projectSettings]);
     return { wallets };
 };
 

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

@@ -1,16 +1,19 @@
 import { ProjectSettings } from '@dynamic-labs/sdk-api';
 import { NetworkConfigurationMap, WalletUiUtils } from '@dynamic-labs/types';
 import { WalletConnectorsMethod } from '@dynamic-labs/wallet-connector-core';
+import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 type Props = {
     appLogoUrl?: string;
     appName?: string;
     flowNetwork?: 'mainnet' | 'testnet';
     networkConfigurations: NetworkConfigurationMap | undefined;
     projectSettings: ProjectSettings | undefined;
+    walletBook: WalletBookSchema;
+    walletConnectV1Bridge?: string;
     walletConnectorsProp?: WalletConnectorsMethod[];
     walletUiUtils: WalletUiUtils;
 };
-export declare const useWallets: ({ projectSettings, appLogoUrl, appName, flowNetwork, networkConfigurations, walletUiUtils, walletConnectorsProp, }: Props) => {
+export declare const useWallets: ({ projectSettings, appLogoUrl, appName, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }: Props) => {
     wallets: import("../../../shared").WalletOption[];
 };
 export {};