@dynamic-labs/sdk-react-core 3.0.0-alpha.9 → 3.0.0

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

@@ -16,11 +16,7 @@ const updateUserWalletsFromConnectedWallets = (userWallets, connectedWallets) =>
         // Catch new wallets
         if (!userWallet) {
             userWalletsCopy.push(connectedWallet);
-            continue;
         }
-        // If already present, just update properties that might have changed
-        userWallet.connected = connectedWallet.connected;
-        userWallet.network = connectedWallet.network;
     }
     // This filter is to remove a wallet that was previously added to userWallets but is not present
     // among the connected wallets (it should not be removed if it's authenticated to the suer tho)
@@ -28,7 +24,7 @@ const updateUserWalletsFromConnectedWallets = (userWallets, connectedWallets) =>
     // Keep wallets that are still in the new list
     newWalletsAddresses.has(userWallet.address) ||
         // Or are linked to the current user
-        userWallet.authenticated);
+        userWallet.isAuthenticated);
 };
 
 export { updateUserWalletsFromConnectedWallets };

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

@@ -7,8 +7,8 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var utils = require('@dynamic-labs/utils');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
-require('@dynamic-labs/sdk-api-core');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
@@ -17,70 +17,19 @@ require('@dynamic-labs/wallet-book');
 var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
-require('../../../shared/utils/classes/storage/localStorage.cjs');
-require('../../../shared/utils/classes/storage/sessionStorage.cjs');
+require('../../../store/state/loadingAndLifecycle.cjs');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 require('../../../shared/consts/index.cjs');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 var shouldManuallyReconnectOnRefresh = require('../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
-require('@dynamic-labs/store');
-require('../../../events/dynamicEvents.cjs');
-require('../../../context/DynamicContext/DynamicContext.cjs');
-require('../../../context/CaptchaContext/CaptchaContext.cjs');
-require('../../../context/ErrorContext/ErrorContext.cjs');
-require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
-require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../../store/state/projectSettings/projectSettings.cjs');
+require('../../../store/state/user/user.cjs');
+var session = require('../../../data/api/session/session.cjs');
+require('../../../locale/locale.cjs');
 var getWalletProvider = require('../../functions/getWalletProvider/getWalletProvider.cjs');
 var isConnectOnly = require('../authenticationHooks/helpers/isConnectOnly.cjs');
-require('../../../context/VerificationContext/VerificationContext.cjs');
-require('react-dom');
-require('../../../context/WalletContext/WalletContext.cjs');
-require('../../../context/ThemeContext/ThemeContext.cjs');
-require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
-require('@dynamic-labs/types');
-require('../../../context/LoadingContext/LoadingContext.cjs');
-require('yup');
-require('../../../context/MockContext/MockContext.cjs');
-require('../../../views/CollectUserDataView/useFields.cjs');
-require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
-require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
-require('@dynamic-labs/rpc-providers');
-require('react-i18next');
-require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
-require('../../../components/Alert/Alert.cjs');
-require('../../../components/ShadowDOM/ShadowDOM.cjs');
-require('../../../components/IconButton/IconButton.cjs');
-require('../../../components/InlineWidget/InlineWidget.cjs');
-require('../../../components/Input/Input.cjs');
-require('../../../components/IsBrowser/IsBrowser.cjs');
-require('../../../components/MenuList/Dropdown/Dropdown.cjs');
-require('../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
-require('../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
-require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
-require('../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
-require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
-require('../../../components/Popper/Popper/Popper.cjs');
-require('../../../components/Popper/PopperContext/PopperContext.cjs');
-require('react-focus-lock');
-require('qrcode');
-require('formik');
-require('../../../views/WalletList/WalletList.cjs');
-require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
-require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
-require('../../../locale/locale.cjs');
-require('@hcaptcha/react-hcaptcha');
-require('../../../context/FooterAnimationContext/index.cjs');
-require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
-require('../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
-require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
-require('../../../context/PasskeyContext/PasskeyContext.cjs');
-require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
-require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
-require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
-require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
-var session = require('../../../data/api/session/session.cjs');
 var updateUserWalletsFromConnectedWallets = require('./updateUserWalletsFromConnectedWallets/updateUserWalletsFromConnectedWallets.cjs');
 
 const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, walletConnectorOptions, handleConnectedWallet, setShowAuthFlow, isBridgeFlow, user, }) => {
@@ -114,6 +63,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         connectedWalletsInfo,
         isBridgeFlow,
         primaryWalletId,
+        removedWalletsIds,
         setConnectedWalletsInfo,
         setPrimaryWalletId,
     ]);
@@ -135,27 +85,27 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 yield disconnectWallet(storedConnectedWalletInfo.id);
                 return null;
             }
+            if (walletConnectorCore.isHardwareWalletConnector(walletConnector) &&
+                storedConnectedWalletInfo.hardwareWallet ===
+                    sdkApiCore.HardwareWalletEnum.Ledger) {
+                walletConnector.isHardwareWalletEnabled = true;
+            }
             const [walletAddress] = yield walletConnector.getConnectedAccounts();
             if (!walletAddress) {
                 yield disconnectWallet(storedConnectedWalletInfo.id);
                 return null;
             }
-            const [walletNetwork, additionalAddresses] = yield Promise.all([
-                walletConnector.getNetwork(),
-                walletConnector.getAdditionalAddresses(walletAddress),
-            ]);
+            const additionalAddresses = yield walletConnector.getAdditionalAddresses(walletAddress);
             const walletChain = walletConnector.connectedChain;
-            const walletObject = {
+            const walletObject = walletConnector.createWallet({
                 additionalAddresses,
-                address: walletAddress || '',
-                authenticated: false,
-                chain: walletChain || '',
-                connected: true,
+                address: walletAddress,
+                chain: walletChain,
                 connector: walletConnector,
                 id: storedConnectedWalletInfo.id,
+                isAuthenticated: false,
                 key: walletConnector.key,
-                network: walletNetwork,
-            };
+            });
             return walletObject;
         })))).filter((wallet) => Boolean(wallet));
         setConnectedWallets(updatedConnectedWallets);
@@ -183,25 +133,27 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         return sortedIds.length;
     }, []);
     const updateConnectedWalletById = React.useCallback((walletId, walletObject) => {
+        var _a;
         const clonedConnectedWalletsList = [...connectedWallets];
         const connectedWalletIndex = clonedConnectedWalletsList.findIndex((connectedWallet) => connectedWallet.id === walletId);
         if (connectedWalletIndex > -1) {
-            if (walletObject.address && walletObject.network) {
-                clonedConnectedWalletsList[connectedWalletIndex] = Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { address: walletObject.address, network: walletObject.network });
-            }
-            else if (walletObject.address) {
-                clonedConnectedWalletsList[connectedWalletIndex] = Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { address: walletObject.address });
-            }
-            else {
-                clonedConnectedWalletsList[connectedWalletIndex] = Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { network: walletObject.network });
-            }
-            setConnectedWallets(clonedConnectedWalletsList);
+            clonedConnectedWalletsList[connectedWalletIndex].address =
+                (_a = walletObject.address) !== null && _a !== void 0 ? _a : clonedConnectedWalletsList[connectedWalletIndex].address;
         }
-    }, [connectedWallets]);
+        setConnectedWallets(clonedConnectedWalletsList);
+    }, [connectedWallets, setConnectedWallets]);
     // Keeps connected wallet data inside localStorage
     const applyConnectedWalletToStore = ({ walletId, walletConnectorKey, walletChain, provider, }) => {
         const updatedConnectedWalletsInfo = [...connectedWalletsInfo];
+        const walletConnectors = walletConnectorOptions.map((wallet) => wallet.walletConnector);
+        const walletConnector = walletConnectorCore.getWalletConnectorByKey(walletConnectors, walletConnectorKey);
+        const hardwareWallet = walletConnector &&
+            walletConnectorCore.isHardwareWalletConnector(walletConnector) &&
+            walletConnector.isHardwareWalletEnabled
+            ? sdkApiCore.HardwareWalletEnum.Ledger
+            : undefined;
         updatedConnectedWalletsInfo.push({
+            hardwareWallet,
             id: walletId,
             provider,
             walletChain,
@@ -228,13 +180,10 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 return;
             }
         }
-        const currentWalletConnectorNetwork = yield walletConnector.getNetwork();
         updateConnectedWalletById(walletId, {
             address: currentWalletConnectorAddress,
-            network: currentWalletConnectorNetwork,
         });
     });
-    const shouldSkipCreatingVisit = authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly;
     const connectWallet = (walletConnector, getAddressOpts, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const { applyHandleConnectedWallet = true } = options !== null && options !== void 0 ? options : {};
         const walletAddress = yield walletConnector.getAddress(getAddressOpts);
@@ -253,6 +202,23 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 return;
             }
         }
+        const isWalletStored = connectedWalletsInfo.some(({ walletConnectorKey: storedWalletConnectorKey }) => storedWalletConnectorKey === walletConnector.key);
+        const walletChain = walletConnector.connectedChain;
+        const shouldCreateVisit = !isWalletStored &&
+            (authMode !== 'connect-only' || enableVisitTrackingOnConnectOnly);
+        if (shouldCreateVisit) {
+            // send information to backend to kick off background jobs
+            // so verify/sign on the next step could go by more quickly
+            // this is async work, but DO NOT AWAIT
+            session.createVisit({
+                authMode,
+                chain: walletChain || '',
+                environmentId,
+                publicWalletAddress: walletAddress,
+                walletName: walletConnector.key,
+                walletProvider: getWalletProvider.getWalletProvider(walletConnector),
+            });
+        }
         // On connect and sign, we don't want to add this wallet to userWallets
         // until it has been signed. Therefore, we don't add it to
         // the connectedWallets array because userWallets draws from it.
@@ -266,8 +232,6 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             setPrimaryWalletId(walletId);
         }
         addedWalletsIds.current.push(walletId);
-        const walletChain = walletConnector.connectedChain;
-        const isWalletStored = connectedWalletsInfo.some(({ walletConnectorKey: storedWalletConnectorKey }) => storedWalletConnectorKey === walletConnector.key);
         if (isWalletStored) {
             yield updateConnectedWalletsList();
         }
@@ -279,19 +243,6 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 walletConnectorKey: walletConnector.key,
                 walletId,
             });
-            if (!shouldSkipCreatingVisit) {
-                // send information to backend to kick off background jobs
-                // so verify/sign on the next step could go by more quickly
-                // this is async work, but DO NOT AWAIT
-                session.createVisit({
-                    authMode,
-                    chain: walletChain || '',
-                    environmentId,
-                    publicWalletAddress: walletAddress,
-                    walletName: walletConnector.key,
-                    walletProvider: getWalletProvider.getWalletProvider(walletConnector),
-                });
-            }
         }
         return { address: walletAddress, id: walletId };
     });

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

@@ -1,13 +1,15 @@
 import { UserProfile } from '@dynamic-labs/types';
 import { Chain, GetAddressOpts, WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { HardwareWalletEnum } from '@dynamic-labs/sdk-api-core';
 import { SetShowAuthFlow } from '../../../context/DynamicContext/hooks';
 import { ConnectWalletResult } from '../../../context/DynamicContext/types';
-import { AuthModeType, HandleConnectedWallet, Wallet, WalletOption } from '../../../shared';
+import { AuthModeType, HandleConnectedWallet, WalletOption, Wallet } from '../../../shared';
 export type ConnectedWalletConnectorType = {
     id: string;
     walletChain?: Chain;
     walletConnectorKey: string;
     provider: string;
+    hardwareWallet: HardwareWalletEnum | undefined;
 };
 export type UseConnectWalletProps = {
     authMode: AuthModeType;

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

@@ -2,9 +2,9 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useCallback, useEffect } from 'react';
 import { MissingPublicAddressError } from '@dynamic-labs/utils';
-import { getWalletConnectorByKey, logger } from '@dynamic-labs/wallet-connector-core';
+import { getWalletConnectorByKey, logger, isHardwareWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { HardwareWalletEnum } from '@dynamic-labs/sdk-api-core';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
-import '@dynamic-labs/sdk-api-core';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
@@ -13,70 +13,19 @@ import '@dynamic-labs/wallet-book';
 import { CONNECTED_WALLETS_INFO } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
 import '../../constants/values.js';
-import '../../../shared/utils/classes/storage/localStorage.js';
-import '../../../shared/utils/classes/storage/sessionStorage.js';
+import '../../../store/state/loadingAndLifecycle.js';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import '../../../shared/consts/index.js';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import { shouldManuallyReconnectOnRefresh } from '../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
-import '@dynamic-labs/store';
-import '../../../events/dynamicEvents.js';
-import '../../../context/DynamicContext/DynamicContext.js';
-import '../../../context/CaptchaContext/CaptchaContext.js';
-import '../../../context/ErrorContext/ErrorContext.js';
-import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
-import '../../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../../store/state/projectSettings/projectSettings.js';
+import '../../../store/state/user/user.js';
+import { createVisit } from '../../../data/api/session/session.js';
+import '../../../locale/locale.js';
 import { getWalletProvider } from '../../functions/getWalletProvider/getWalletProvider.js';
 import { isConnectOnly } from '../authenticationHooks/helpers/isConnectOnly.js';
-import '../../../context/VerificationContext/VerificationContext.js';
-import 'react-dom';
-import '../../../context/WalletContext/WalletContext.js';
-import '../../../context/ThemeContext/ThemeContext.js';
-import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
-import '@dynamic-labs/types';
-import '../../../context/LoadingContext/LoadingContext.js';
-import 'yup';
-import '../../../context/MockContext/MockContext.js';
-import '../../../views/CollectUserDataView/useFields.js';
-import '../../../context/FieldsStateContext/FieldsStateContext.js';
-import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
-import '@dynamic-labs/rpc-providers';
-import 'react-i18next';
-import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
-import '../../../components/Alert/Alert.js';
-import '../../../components/ShadowDOM/ShadowDOM.js';
-import '../../../components/IconButton/IconButton.js';
-import '../../../components/InlineWidget/InlineWidget.js';
-import '../../../components/Input/Input.js';
-import '../../../components/IsBrowser/IsBrowser.js';
-import '../../../components/MenuList/Dropdown/Dropdown.js';
-import '../../../components/Transition/ZoomTransition/ZoomTransition.js';
-import '../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
-import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
-import '../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.js';
-import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
-import '../../../components/Popper/Popper/Popper.js';
-import '../../../components/Popper/PopperContext/PopperContext.js';
-import 'react-focus-lock';
-import 'qrcode';
-import 'formik';
-import '../../../views/WalletList/WalletList.js';
-import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
-import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
-import '../../../locale/locale.js';
-import '@hcaptcha/react-hcaptcha';
-import '../../../context/FooterAnimationContext/index.js';
-import '../../../context/WalletGroupContext/WalletGroupContext.js';
-import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
-import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
-import '../../../context/PasskeyContext/PasskeyContext.js';
-import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
-import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
-import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
-import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
-import { createVisit } from '../../../data/api/session/session.js';
 import { updateUserWalletsFromConnectedWallets } from './updateUserWalletsFromConnectedWallets/updateUserWalletsFromConnectedWallets.js';
 
 const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, walletConnectorOptions, handleConnectedWallet, setShowAuthFlow, isBridgeFlow, user, }) => {
@@ -110,6 +59,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         connectedWalletsInfo,
         isBridgeFlow,
         primaryWalletId,
+        removedWalletsIds,
         setConnectedWalletsInfo,
         setPrimaryWalletId,
     ]);
@@ -131,27 +81,27 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 yield disconnectWallet(storedConnectedWalletInfo.id);
                 return null;
             }
+            if (isHardwareWalletConnector(walletConnector) &&
+                storedConnectedWalletInfo.hardwareWallet ===
+                    HardwareWalletEnum.Ledger) {
+                walletConnector.isHardwareWalletEnabled = true;
+            }
             const [walletAddress] = yield walletConnector.getConnectedAccounts();
             if (!walletAddress) {
                 yield disconnectWallet(storedConnectedWalletInfo.id);
                 return null;
             }
-            const [walletNetwork, additionalAddresses] = yield Promise.all([
-                walletConnector.getNetwork(),
-                walletConnector.getAdditionalAddresses(walletAddress),
-            ]);
+            const additionalAddresses = yield walletConnector.getAdditionalAddresses(walletAddress);
             const walletChain = walletConnector.connectedChain;
-            const walletObject = {
+            const walletObject = walletConnector.createWallet({
                 additionalAddresses,
-                address: walletAddress || '',
-                authenticated: false,
-                chain: walletChain || '',
-                connected: true,
+                address: walletAddress,
+                chain: walletChain,
                 connector: walletConnector,
                 id: storedConnectedWalletInfo.id,
+                isAuthenticated: false,
                 key: walletConnector.key,
-                network: walletNetwork,
-            };
+            });
             return walletObject;
         })))).filter((wallet) => Boolean(wallet));
         setConnectedWallets(updatedConnectedWallets);
@@ -179,25 +129,27 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         return sortedIds.length;
     }, []);
     const updateConnectedWalletById = useCallback((walletId, walletObject) => {
+        var _a;
         const clonedConnectedWalletsList = [...connectedWallets];
         const connectedWalletIndex = clonedConnectedWalletsList.findIndex((connectedWallet) => connectedWallet.id === walletId);
         if (connectedWalletIndex > -1) {
-            if (walletObject.address && walletObject.network) {
-                clonedConnectedWalletsList[connectedWalletIndex] = Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { address: walletObject.address, network: walletObject.network });
-            }
-            else if (walletObject.address) {
-                clonedConnectedWalletsList[connectedWalletIndex] = Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { address: walletObject.address });
-            }
-            else {
-                clonedConnectedWalletsList[connectedWalletIndex] = Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { network: walletObject.network });
-            }
-            setConnectedWallets(clonedConnectedWalletsList);
+            clonedConnectedWalletsList[connectedWalletIndex].address =
+                (_a = walletObject.address) !== null && _a !== void 0 ? _a : clonedConnectedWalletsList[connectedWalletIndex].address;
         }
-    }, [connectedWallets]);
+        setConnectedWallets(clonedConnectedWalletsList);
+    }, [connectedWallets, setConnectedWallets]);
     // Keeps connected wallet data inside localStorage
     const applyConnectedWalletToStore = ({ walletId, walletConnectorKey, walletChain, provider, }) => {
         const updatedConnectedWalletsInfo = [...connectedWalletsInfo];
+        const walletConnectors = walletConnectorOptions.map((wallet) => wallet.walletConnector);
+        const walletConnector = getWalletConnectorByKey(walletConnectors, walletConnectorKey);
+        const hardwareWallet = walletConnector &&
+            isHardwareWalletConnector(walletConnector) &&
+            walletConnector.isHardwareWalletEnabled
+            ? HardwareWalletEnum.Ledger
+            : undefined;
         updatedConnectedWalletsInfo.push({
+            hardwareWallet,
             id: walletId,
             provider,
             walletChain,
@@ -224,13 +176,10 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 return;
             }
         }
-        const currentWalletConnectorNetwork = yield walletConnector.getNetwork();
         updateConnectedWalletById(walletId, {
             address: currentWalletConnectorAddress,
-            network: currentWalletConnectorNetwork,
         });
     });
-    const shouldSkipCreatingVisit = authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly;
     const connectWallet = (walletConnector, getAddressOpts, options) => __awaiter(void 0, void 0, void 0, function* () {
         const { applyHandleConnectedWallet = true } = options !== null && options !== void 0 ? options : {};
         const walletAddress = yield walletConnector.getAddress(getAddressOpts);
@@ -249,6 +198,23 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 return;
             }
         }
+        const isWalletStored = connectedWalletsInfo.some(({ walletConnectorKey: storedWalletConnectorKey }) => storedWalletConnectorKey === walletConnector.key);
+        const walletChain = walletConnector.connectedChain;
+        const shouldCreateVisit = !isWalletStored &&
+            (authMode !== 'connect-only' || enableVisitTrackingOnConnectOnly);
+        if (shouldCreateVisit) {
+            // send information to backend to kick off background jobs
+            // so verify/sign on the next step could go by more quickly
+            // this is async work, but DO NOT AWAIT
+            createVisit({
+                authMode,
+                chain: walletChain || '',
+                environmentId,
+                publicWalletAddress: walletAddress,
+                walletName: walletConnector.key,
+                walletProvider: getWalletProvider(walletConnector),
+            });
+        }
         // On connect and sign, we don't want to add this wallet to userWallets
         // until it has been signed. Therefore, we don't add it to
         // the connectedWallets array because userWallets draws from it.
@@ -262,8 +228,6 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             setPrimaryWalletId(walletId);
         }
         addedWalletsIds.current.push(walletId);
-        const walletChain = walletConnector.connectedChain;
-        const isWalletStored = connectedWalletsInfo.some(({ walletConnectorKey: storedWalletConnectorKey }) => storedWalletConnectorKey === walletConnector.key);
         if (isWalletStored) {
             yield updateConnectedWalletsList();
         }
@@ -275,19 +239,6 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 walletConnectorKey: walletConnector.key,
                 walletId,
             });
-            if (!shouldSkipCreatingVisit) {
-                // send information to backend to kick off background jobs
-                // so verify/sign on the next step could go by more quickly
-                // this is async work, but DO NOT AWAIT
-                createVisit({
-                    authMode,
-                    chain: walletChain || '',
-                    environmentId,
-                    publicWalletAddress: walletAddress,
-                    walletName: walletConnector.key,
-                    walletProvider: getWalletProvider(walletConnector),
-                });
-            }
         }
         return { address: walletAddress, id: walletId };
     });

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

@@ -13,11 +13,10 @@ require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
+require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
-require('../../../shared/utils/classes/storage/localStorage.cjs');
-require('../../../shared/utils/classes/storage/sessionStorage.cjs');
-require('@dynamic-labs/utils');
+require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../shared/consts/index.cjs');
 
 const useConnectWithEmail = ({ emailWalletConnector, handleConnect, }) => {

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

@@ -1,7 +1,7 @@
-import { IEmailWalletConnector, WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { IEmailWalletConnector, InternalWalletConnector } from '@dynamic-labs/wallet-connector-core';
 type ConnectWithEmailProps = {
     emailWalletConnector: IEmailWalletConnector | undefined;
-    handleConnect: (walletConnector: WalletConnector) => Promise<void>;
+    handleConnect: (walletConnector: InternalWalletConnector) => Promise<void>;
 };
 export declare const useConnectWithEmail: ({ emailWalletConnector, handleConnect, }: ConnectWithEmailProps) => {
     connectWithEmail: (email: string) => Promise<void>;

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

@@ -9,11 +9,10 @@ import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
+import '@dynamic-labs/utils';
 import '../../constants/colors.js';
 import '../../constants/values.js';
-import '../../../shared/utils/classes/storage/localStorage.js';
-import '../../../shared/utils/classes/storage/sessionStorage.js';
-import '@dynamic-labs/utils';
+import '../../../store/state/loadingAndLifecycle.js';
 import '../../../shared/consts/index.js';
 
 const useConnectWithEmail = ({ emailWalletConnector, handleConnect, }) => {

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

@@ -1,2 +1,2 @@
 import { Wallet, WalletConnector } from '../../../..';
-export declare const useConnectedAccountWallet: (connector: WalletConnector | undefined, secondaryWallets: Wallet[]) => import("../usePromise").PromiseState<Wallet | undefined, Error>;
+export declare const useConnectedAccountWallet: (connector: WalletConnector | undefined, secondaryWallets: Wallet[]) => import("../usePromise").PromiseState<Wallet<import("dist/packages/wallet-connector-core/src").WalletConnectorCore.WalletConnector> | undefined, Error>;