@dynamic-labs/sdk-react-core 0.17.0-RC.0 → 0.17.0-RC.10

package/src/lib/utils/functions/walletListBuilder/{index.cjs → walletListBuilder.cjs}

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var getCalculatedOffset = require('./utils/getCalculatedOffset/getCalculatedOffset.cjs');
 
 const PRIORITY_WALLET_LIST = [
@@ -19,7 +19,6 @@ const PRIORITY_WALLET_LIST = [
     'rainbow',
     'dapper',
     'glow',
-    'fortmatic',
     'lilico',
 ];
 const SIGN_IN_WITH_EMAIL_WALLET_NAME = 'Sign In With Email';
@@ -28,7 +27,7 @@ const sortedInputList = (inputList) => {
     const unsortedPriorityWallets = [];
     const unsortedOtherWallets = [];
     inputList.forEach((wallet) => {
-        if (PRIORITY_WALLET_LIST.includes(multiWallet.normalizeWalletName(wallet.name))) {
+        if (PRIORITY_WALLET_LIST.includes(walletConnectorCore.normalizeWalletName(wallet.name))) {
             unsortedPriorityWallets.push(wallet);
         }
         else {
@@ -37,8 +36,8 @@ const sortedInputList = (inputList) => {
     });
     const sortedPriorityWallets = unsortedPriorityWallets
         .slice()
-        .sort((a, b) => PRIORITY_WALLET_LIST.indexOf(multiWallet.normalizeWalletName(a.name)) -
-        PRIORITY_WALLET_LIST.indexOf(multiWallet.normalizeWalletName(b.name)));
+        .sort((a, b) => PRIORITY_WALLET_LIST.indexOf(walletConnectorCore.normalizeWalletName(a.name)) -
+        PRIORITY_WALLET_LIST.indexOf(walletConnectorCore.normalizeWalletName(b.name)));
     return [...sortedPriorityWallets, ...unsortedOtherWallets];
 };
 const walletListBuilder = ({ numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletName, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, }) => {
@@ -53,7 +52,10 @@ const walletListBuilder = ({ numberOfWalletsToShow, inputList, isWalletConnectLi
     const otherWallets = [];
     const orderedInputList = orderAndFilterList(walletList, walletsFilter, isWalletConnectList);
     orderedInputList.forEach((wallet) => {
-        if (multiWallet.isEmailWalletConnector(wallet.walletConnector)) ;
+        if (walletConnectorCore.isEmailWalletConnector(wallet.walletConnector) ||
+            walletConnectorCore.isSocialWalletConnector(wallet.walletConnector)) {
+            return;
+        }
         else if ((lastUsedWalletName === null || lastUsedWalletName === void 0 ? void 0 : lastUsedWalletName.toLowerCase()) === wallet.name.toLowerCase()) {
             lastUsedWallet = wallet;
         }

package/src/lib/utils/functions/walletListBuilder/walletListBuilder.d.ts

@@ -0,0 +1,19 @@
+import { WalletOption } from '../../../shared/types';
+type BuilderParams = {
+    inputList: WalletOption[];
+    isWalletConnectList: boolean;
+    lastUsedWalletName: string | undefined;
+    loginWithEmail?: boolean;
+    numberOfWalletsToShow: number;
+    searchFilter: string | undefined;
+    signWithEmailWalletName: string | undefined;
+    walletsFilter: ((options: WalletOption[]) => WalletOption[]) | undefined;
+};
+type BuilderResult = {
+    numberOfWallets: number;
+    walletsList: WalletOption[];
+};
+export declare const PRIORITY_WALLET_LIST: string[];
+export declare const SIGN_IN_WITH_EMAIL_WALLET_NAME = "Sign In With Email";
+export declare const walletListBuilder: ({ numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletName, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, }: BuilderParams) => BuilderResult;
+export {};

package/src/lib/utils/functions/walletListBuilder/{index.js → walletListBuilder.js}

@@ -1,4 +1,4 @@
-import { isEmailWalletConnector, normalizeWalletName } from '@dynamic-labs/multi-wallet';
+import { isEmailWalletConnector, isSocialWalletConnector, normalizeWalletName } from '@dynamic-labs/wallet-connector-core';
 import { getCalculatedOffset } from './utils/getCalculatedOffset/getCalculatedOffset.js';
 
 const PRIORITY_WALLET_LIST = [
@@ -15,7 +15,6 @@ const PRIORITY_WALLET_LIST = [
     'rainbow',
     'dapper',
     'glow',
-    'fortmatic',
     'lilico',
 ];
 const SIGN_IN_WITH_EMAIL_WALLET_NAME = 'Sign In With Email';
@@ -49,7 +48,10 @@ const walletListBuilder = ({ numberOfWalletsToShow, inputList, isWalletConnectLi
     const otherWallets = [];
     const orderedInputList = orderAndFilterList(walletList, walletsFilter, isWalletConnectList);
     orderedInputList.forEach((wallet) => {
-        if (isEmailWalletConnector(wallet.walletConnector)) ;
+        if (isEmailWalletConnector(wallet.walletConnector) ||
+            isSocialWalletConnector(wallet.walletConnector)) {
+            return;
+        }
         else if ((lastUsedWalletName === null || lastUsedWalletName === void 0 ? void 0 : lastUsedWalletName.toLowerCase()) === wallet.name.toLowerCase()) {
             lastUsedWallet = wallet;
         }

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var showPendingConnectView = require('../helpers/showPendingConnectView.cjs');
 var isConnectOnly = require('../helpers/isConnectOnly.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
@@ -15,8 +15,10 @@ var setToLS = require('../../../../shared/utils/functions/storage/setToLS.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('react');
+require('@dynamic-labs/utils');
 var localStorage = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
+require('ethers');
 require('../../../../shared/consts/index.cjs');
 var useVerifyWallet = require('../../useVerifyWallet/useVerifyWallet.cjs');
 var CaptchaContext = require('../../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -37,8 +39,8 @@ const useConnectAndSign = () => {
         var _a, _b;
         yield showPendingConnectView.showPendingConnectView(walletConnector, setView);
         try {
-            if (multiWallet.isEmailWalletConnector(walletConnector)) {
-                if (multiWallet.isEmailOTPWalletConnector(walletConnector)) {
+            if (walletConnectorCore.isEmailWalletConnector(walletConnector)) {
+                if (walletConnectorCore.isEmailOTPWalletConnector(walletConnector)) {
                     setView('email-wallet-otp-verification-view');
                 }
                 else {
@@ -56,7 +58,7 @@ const useConnectAndSign = () => {
                 setView('captcha');
                 return;
             }
-            if (!multiWallet.isEmailWalletConnector(walletConnector)) {
+            if (!walletConnectorCore.isEmailWalletConnector(walletConnector)) {
                 setView('pending-signature');
             }
             else {

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js

@@ -1,5 +1,5 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
-import { isEmailWalletConnector, isEmailOTPWalletConnector } from '@dynamic-labs/multi-wallet';
+import { isEmailWalletConnector, isEmailOTPWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { showPendingConnectView } from '../helpers/showPendingConnectView.js';
 import { isConnectOnly } from '../helpers/isConnectOnly.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
@@ -11,8 +11,10 @@ import { setToLS } from '../../../../shared/utils/functions/storage/setToLS.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import 'react';
+import '@dynamic-labs/utils';
 import { LAST_USED_WALLET } from '../../../constants/localStorage.js';
 import '../../../constants/colors.js';
+import 'ethers';
 import '../../../../shared/consts/index.js';
 import { useVerifyWallet } from '../../useVerifyWallet/useVerifyWallet.js';
 import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.cjs

@@ -13,11 +13,13 @@ require('@dynamic-labs/sdk-api');
 require('../../../../shared/logger.cjs');
 var setToLS = require('../../../../shared/utils/functions/storage/setToLS.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/multi-wallet');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('react');
+require('@dynamic-labs/utils');
 var localStorage = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
+require('ethers');
 require('../../../../shared/consts/index.cjs');
 var CaptchaContext = require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.js

@@ -9,11 +9,13 @@ import '@dynamic-labs/sdk-api';
 import '../../../../shared/logger.js';
 import { setToLS } from '../../../../shared/utils/functions/storage/setToLS.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/multi-wallet';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import 'react';
+import '@dynamic-labs/utils';
 import { LAST_USED_WALLET } from '../../../constants/localStorage.js';
 import '../../../constants/colors.js';
+import 'ethers';
 import '../../../../shared/consts/index.js';
 import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
 

package/src/lib/utils/hooks/authenticationHooks/useEmailVerificationRequest/useEmailVerificationRequest.cjs

@@ -8,12 +8,15 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useI
 var api = require('../../../../data/api.cjs');
 var index = require('../../../functions/storeAuthToken/index.cjs');
 require('@dynamic-labs/multi-wallet');
+require('@dynamic-labs/utils');
 require('../../../constants/colors.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../../context/ViewContext/ViewContext.cjs');
+require('ethers');
 var useUpdateUserProfileByJWTCallback = require('../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.cjs');
 var EmailVerificationContext = require('../../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
 

package/src/lib/utils/hooks/authenticationHooks/useEmailVerificationRequest/useEmailVerificationRequest.js

@@ -4,12 +4,15 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
 import { verifyEmail } from '../../../../data/api.js';
 import { storeAuthToken } from '../../../functions/storeAuthToken/index.js';
 import '@dynamic-labs/multi-wallet';
+import '@dynamic-labs/utils';
 import '../../../constants/colors.js';
 import '@dynamic-labs/sdk-api';
 import '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../../context/ViewContext/ViewContext.js';
+import 'ethers';
 import { useUpdateUserProfileByJWTCallback } from '../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
 import { useEmailVerificationContext } from '../../../../context/EmailVerificationContext/EmailVerificationContext.js';
 

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.cjs

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 
 const useSyncPrimaryWallet = ({ primaryWallet, setMultiWalletWidgetState, multiWalletWidgetState, }) => {
     React.useEffect(() => {
@@ -18,7 +18,7 @@ const useSyncPrimaryWallet = ({ primaryWallet, setMultiWalletWidgetState, multiW
             .then(([selectedAddress]) => {
             if (!selectedAddress)
                 return;
-            if (!multiWallet.isSameAddress(selectedAddress, primaryWallet.address, primaryWallet.chain)) {
+            if (!walletConnectorCore.isSameAddress(selectedAddress, primaryWallet.address, primaryWallet.chain)) {
                 setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
             }
         })

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.js

@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-import { isSameAddress } from '@dynamic-labs/multi-wallet';
+import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
 
 const useSyncPrimaryWallet = ({ primaryWallet, setMultiWalletWidgetState, multiWalletWidgetState, }) => {
     useEffect(() => {

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.cjs

@@ -7,11 +7,14 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useI
 require('@dynamic-labs/sdk-api');
 var logger = require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/multi-wallet');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/utils');
 require('../../../constants/colors.cjs');
+require('ethers');
 require('../../../../shared/consts/index.cjs');
+require('@dynamic-labs/multi-wallet');
 var requiresTwoStepAuthentication = require('../../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.cjs');
 var useConnectAndSign = require('../../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.js

@@ -3,11 +3,14 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/multi-wallet';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/utils';
 import '../../../constants/colors.js';
+import 'ethers';
 import '../../../../shared/consts/index.js';
+import '@dynamic-labs/multi-wallet';
 import { requiresTwoStepAuthentication } from '../../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.js';
 import { useConnectAndSign } from '../../authenticationHooks/useConnectAndSign/useConnectAndSign.js';
 import '../../../../context/ErrorContext/ErrorContext.js';

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

@@ -4,8 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var utils = require('@dynamic-labs/utils');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
+require('@dynamic-labs/wallet-connector-core');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/sdk-api');
@@ -13,8 +14,10 @@ require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../constants/colors.cjs');
+require('ethers');
 require('../../../shared/consts/index.cjs');
 require('../../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/multi-wallet');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 var useSignConnectOnlyUser = require('../authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.cjs');
 
@@ -24,10 +27,10 @@ const useAuthenticateConnectedUser = () => {
     const [isAuthenticating, setIsAuthenticating] = React.useState(false);
     const authenticateUser = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         if (user) {
-            throw new multiWallet.DynamicError('User is already authenticated');
+            throw new utils.DynamicError('User is already authenticated');
         }
         if (!connectedWallet) {
-            throw new multiWallet.DynamicError('No connected wallet');
+            throw new utils.DynamicError('No connected wallet');
         }
         setIsAuthenticating(true);
         yield signConnectOnlyUser({

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

@@ -1,7 +1,8 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useCallback } from 'react';
-import { DynamicError } from '@dynamic-labs/multi-wallet';
+import { DynamicError } from '@dynamic-labs/utils';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
+import '@dynamic-labs/wallet-connector-core';
 import '../../../context/ViewContext/ViewContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/sdk-api';
@@ -9,8 +10,10 @@ import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import '../../constants/colors.js';
+import 'ethers';
 import '../../../shared/consts/index.js';
 import '../../../config/ApiEndpoint.js';
+import '@dynamic-labs/multi-wallet';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import { useSignConnectOnlyUser } from '../authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.js';
 

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 
 const useClearWalletConnectSessions = ({ connectors }) => {
     const clearOphanedWalletConnectSessions = React.useCallback(() => {
@@ -11,7 +11,7 @@ const useClearWalletConnectSessions = ({ connectors }) => {
             return;
         if (connectors.length === 0)
             return;
-        const names = new Set(connectors.map((connector) => multiWallet.normalizeWalletName(connector.name)));
+        const names = new Set(connectors.map((connector) => walletConnectorCore.normalizeWalletName(connector.name)));
         for (const key of Object.keys(localStorage)) {
             if (key.startsWith('walletconnect') &&
                 !names.has(key.replace('walletconnect-', ''))) {

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

@@ -1,5 +1,5 @@
 import { useCallback } from 'react';
-import { normalizeWalletName } from '@dynamic-labs/multi-wallet';
+import { normalizeWalletName } from '@dynamic-labs/wallet-connector-core';
 
 const useClearWalletConnectSessions = ({ connectors }) => {
     const clearOphanedWalletConnectSessions = useCallback(() => {

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

@@ -4,54 +4,52 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/utils');
 var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
+require('ethers');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 require('../../../shared/consts/index.cjs');
 var getWalletProvider = require('../../functions/getWalletProvider/getWalletProvider.cjs');
 var api = require('../../../data/api.cjs');
+require('@dynamic-labs/multi-wallet');
 var shouldManuallyReconnectOnRefresh = require('../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
 
 const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingOnConnectOnly) => {
     const [connectedInfo, setConnectedInfo, removeConnectedInfo] = useLocalStorage.useLocalStorage(localStorage.CONNECTED_WALLET_CONNECTOR_DATA, null);
     const [connectedWallet, setConnectedWallet] = React.useState(null);
-    React.useEffect(() => {
-        const fetchBasicInfo = (connectedWallet) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            const provider = getWalletProvider.getWalletProvider(connectedWallet.connector);
-            setConnectedInfo({
-                chain: connectedWallet.chain,
-                name: connectedWallet.connector.name,
-                provider,
-                walletPublicKey: connectedWallet.address,
-            });
+    const setConnectedStates = React.useCallback((walletConnector, address, chain) => {
+        setConnectedWallet({
+            address,
+            chain,
+            connected: true,
+            connector: walletConnector,
+            id: 'connect-only-wallet',
         });
-        if (connectedWallet) {
-            fetchBasicInfo(connectedWallet);
-        }
-    }, [connectedWallet === null || connectedWallet === void 0 ? void 0 : connectedWallet.address]);
-    const connectWalletByAddressAndChain = (name, address, chain) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const walletConnector = multiWallet.getWalletConnectorByName(wallets.map((wallet) => wallet.walletConnector), name);
+        setConnectedInfo({
+            chain,
+            name: walletConnector.name,
+            provider: getWalletProvider.getWalletProvider(walletConnector),
+            walletPublicKey: address,
+        });
+    }, [setConnectedInfo]);
+    const connectWalletByAddressAndChain = React.useCallback((name, address, chain) => _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)) {
                 yield walletConnector.connect();
             }
             const connectedAccounts = yield walletConnector.getConnectedAccounts();
-            const result = connectedAccounts.filter((account) => multiWallet.isSameAddress(account, address, chain));
+            const result = connectedAccounts.filter((account) => walletConnectorCore.isSameAddress(account, address, chain));
             if (result.length > 0) {
                 walletConnector.connect();
-                setConnectedWallet({
-                    address,
-                    chain,
-                    connected: true,
-                    connector: walletConnector,
-                    id: 'connect-only-wallet',
-                });
+                setConnectedStates(walletConnector, address, chain);
             }
             else {
                 setConnectedWallet(null);
@@ -60,9 +58,9 @@ const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingO
         else {
             setConnectedWallet(null);
         }
-    });
+    }), [setConnectedStates, wallets]);
     React.useEffect(() => {
-        if (authMode === 'connect-only' && connectedInfo) {
+        if (authMode === 'connect-only' && connectedInfo && !connectedWallet) {
             if (connectedInfo.walletPublicKey &&
                 connectedInfo.name &&
                 connectedInfo.chain) {
@@ -70,7 +68,14 @@ const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingO
                 connectWalletByAddressAndChain(name, walletPublicKey, chain);
             }
         }
-    }, [connectedInfo, wallets.length]);
+    }, [
+        authMode,
+        connectWalletByAddressAndChain,
+        connectedInfo,
+        connectedWallet,
+    ]);
+    const shouldSkipCreatingVisit = React.useMemo(() => (authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly) ||
+        connectedWallet, [authMode, connectedWallet, enableVisitTrackingOnConnectOnly]);
     const connectWallet = (walletConnector, fetchPublicAddressOpts) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const publicWalletAddress = yield walletConnector.fetchPublicAddress(fetchPublicAddressOpts);
         if (!publicWalletAddress) {
@@ -79,14 +84,8 @@ const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingO
             throw error;
         }
         const chain = walletConnector.connectedChain || '';
-        setConnectedWallet({
-            address: publicWalletAddress,
-            chain,
-            connected: true,
-            connector: walletConnector,
-            id: 'connect-only-wallet',
-        });
-        if (authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly) {
+        setConnectedStates(walletConnector, publicWalletAddress, chain);
+        if (shouldSkipCreatingVisit) {
             return publicWalletAddress;
         }
         // send information to backend to kick off background jobs

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

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

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

@@ -1,37 +1,41 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState, useEffect } from 'react';
-import { getWalletConnectorByName, isSameAddress } from '@dynamic-labs/multi-wallet';
+import { useState, useCallback, useEffect, useMemo } from 'react';
+import { getWalletConnectorByName, isSameAddress } from '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/utils';
 import { CONNECTED_WALLET_CONNECTOR_DATA } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
+import 'ethers';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import '../../../shared/consts/index.js';
 import { getWalletProvider } from '../../functions/getWalletProvider/getWalletProvider.js';
 import { createVisit } from '../../../data/api.js';
+import '@dynamic-labs/multi-wallet';
 import { shouldManuallyReconnectOnRefresh } from '../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
 
 const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingOnConnectOnly) => {
     const [connectedInfo, setConnectedInfo, removeConnectedInfo] = useLocalStorage(CONNECTED_WALLET_CONNECTOR_DATA, null);
     const [connectedWallet, setConnectedWallet] = useState(null);
-    useEffect(() => {
-        const fetchBasicInfo = (connectedWallet) => __awaiter(void 0, void 0, void 0, function* () {
-            const provider = getWalletProvider(connectedWallet.connector);
-            setConnectedInfo({
-                chain: connectedWallet.chain,
-                name: connectedWallet.connector.name,
-                provider,
-                walletPublicKey: connectedWallet.address,
-            });
+    const setConnectedStates = useCallback((walletConnector, address, chain) => {
+        setConnectedWallet({
+            address,
+            chain,
+            connected: true,
+            connector: walletConnector,
+            id: 'connect-only-wallet',
         });
-        if (connectedWallet) {
-            fetchBasicInfo(connectedWallet);
-        }
-    }, [connectedWallet === null || connectedWallet === void 0 ? void 0 : connectedWallet.address]);
-    const connectWalletByAddressAndChain = (name, address, chain) => __awaiter(void 0, void 0, void 0, function* () {
+        setConnectedInfo({
+            chain,
+            name: walletConnector.name,
+            provider: getWalletProvider(walletConnector),
+            walletPublicKey: address,
+        });
+    }, [setConnectedInfo]);
+    const connectWalletByAddressAndChain = useCallback((name, address, chain) => __awaiter(void 0, void 0, void 0, function* () {
         const walletConnector = getWalletConnectorByName(wallets.map((wallet) => wallet.walletConnector), name);
         if (walletConnector) {
             if (shouldManuallyReconnectOnRefresh(walletConnector)) {
@@ -41,13 +45,7 @@ const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingO
             const result = connectedAccounts.filter((account) => isSameAddress(account, address, chain));
             if (result.length > 0) {
                 walletConnector.connect();
-                setConnectedWallet({
-                    address,
-                    chain,
-                    connected: true,
-                    connector: walletConnector,
-                    id: 'connect-only-wallet',
-                });
+                setConnectedStates(walletConnector, address, chain);
             }
             else {
                 setConnectedWallet(null);
@@ -56,9 +54,9 @@ const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingO
         else {
             setConnectedWallet(null);
         }
-    });
+    }), [setConnectedStates, wallets]);
     useEffect(() => {
-        if (authMode === 'connect-only' && connectedInfo) {
+        if (authMode === 'connect-only' && connectedInfo && !connectedWallet) {
             if (connectedInfo.walletPublicKey &&
                 connectedInfo.name &&
                 connectedInfo.chain) {
@@ -66,7 +64,14 @@ const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingO
                 connectWalletByAddressAndChain(name, walletPublicKey, chain);
             }
         }
-    }, [connectedInfo, wallets.length]);
+    }, [
+        authMode,
+        connectWalletByAddressAndChain,
+        connectedInfo,
+        connectedWallet,
+    ]);
+    const shouldSkipCreatingVisit = useMemo(() => (authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly) ||
+        connectedWallet, [authMode, connectedWallet, enableVisitTrackingOnConnectOnly]);
     const connectWallet = (walletConnector, fetchPublicAddressOpts) => __awaiter(void 0, void 0, void 0, function* () {
         const publicWalletAddress = yield walletConnector.fetchPublicAddress(fetchPublicAddressOpts);
         if (!publicWalletAddress) {
@@ -75,14 +80,8 @@ const useConnectWallet = (wallets, authMode, environmentId, enableVisitTrackingO
             throw error;
         }
         const chain = walletConnector.connectedChain || '';
-        setConnectedWallet({
-            address: publicWalletAddress,
-            chain,
-            connected: true,
-            connector: walletConnector,
-            id: 'connect-only-wallet',
-        });
-        if (authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly) {
+        setConnectedStates(walletConnector, publicWalletAddress, chain);
+        if (shouldSkipCreatingVisit) {
             return publicWalletAddress;
         }
         // send information to backend to kick off background jobs