@dynamic-labs/sdk-react-core 1.0.6 → 1.0.8

package/src/lib/shared/utils/hooks/useThrottle/useThrottle.cjs

@@ -0,0 +1,29 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+
+/**
+ * useThrottle hook to throttle a callback function.
+ *
+ * @param callback - The callback function to be throttled. It must return void.
+ * @param delay - The time in milliseconds to wait before the next call.
+ * @returns A throttled version of the callback function.
+ */
+const useThrottle = (callback, delay) => {
+    const isThrottled = React.useRef(false);
+    const savedCallback = React.useRef(callback);
+    // Remember the latest callback if it changes.
+    savedCallback.current = callback;
+    return React.useCallback((...args) => {
+        if (!isThrottled.current) {
+            savedCallback.current(...args);
+            isThrottled.current = true;
+            // Set the throttle off after the delay
+            setTimeout(() => (isThrottled.current = false), delay);
+        }
+    }, [delay]);
+};
+
+exports.useThrottle = useThrottle;

package/src/lib/shared/utils/hooks/useThrottle/useThrottle.d.ts

@@ -0,0 +1,8 @@
+/**
+ * useThrottle hook to throttle a callback function.
+ *
+ * @param callback - The callback function to be throttled. It must return void.
+ * @param delay - The time in milliseconds to wait before the next call.
+ * @returns A throttled version of the callback function.
+ */
+export declare const useThrottle: <T extends (...args: unknown[]) => void>(callback: T, delay: number) => (...args: Parameters<T>) => void;

package/src/lib/shared/utils/hooks/useThrottle/useThrottle.js

@@ -0,0 +1,25 @@
+import { useRef, useCallback } from 'react';
+
+/**
+ * useThrottle hook to throttle a callback function.
+ *
+ * @param callback - The callback function to be throttled. It must return void.
+ * @param delay - The time in milliseconds to wait before the next call.
+ * @returns A throttled version of the callback function.
+ */
+const useThrottle = (callback, delay) => {
+    const isThrottled = useRef(false);
+    const savedCallback = useRef(callback);
+    // Remember the latest callback if it changes.
+    savedCallback.current = callback;
+    return useCallback((...args) => {
+        if (!isThrottled.current) {
+            savedCallback.current(...args);
+            isThrottled.current = true;
+            // Set the throttle off after the delay
+            setTimeout(() => (isThrottled.current = false), delay);
+        }
+    }, [delay]);
+};
+
+export { useThrottle };

package/src/lib/utils/functions/getWalletIdentifier/getWalletIdentifier.cjs

@@ -2,6 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const getWalletIdentifier = ({ address, connector }) => `${address}+${connector.key}`;
+const getWalletIdentifier = ({ address, connector, }) => `${address}+${connector.key}`;
 
 exports.getWalletIdentifier = getWalletIdentifier;

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

@@ -1,2 +1,2 @@
 import { Wallet } from '../../../shared';
-export declare const getWalletIdentifier: ({ address, connector }: Wallet) => `${string}+${string}`;
+export declare const getWalletIdentifier: ({ address, connector, }: Pick<Wallet, 'address' | 'connector'>) => `${string}+${string}`;

package/src/lib/utils/functions/getWalletIdentifier/getWalletIdentifier.js

@@ -1,3 +1,3 @@
-const getWalletIdentifier = ({ address, connector }) => `${address}+${connector.key}`;
+const getWalletIdentifier = ({ address, connector, }) => `${address}+${connector.key}`;
 
 export { getWalletIdentifier };

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

@@ -9,6 +9,15 @@ var isWalletLinked = require('../../../functions/isWalletLinked/isWalletLinked.c
 var ViewContext = require('../../../../context/ViewContext/ViewContext.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var errors = require('../../../constants/errors.cjs');
+require('@dynamic-labs/sdk-api');
+var logger = require('../../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('react/jsx-runtime');
+require('@dynamic-labs/wallet-book');
+require('../../../constants/colors.cjs');
+require('../../../../shared/utils/classes/storage/localStorage.cjs');
+require('viem');
+require('../../../../shared/consts/index.cjs');
 
 const useSyncPrimaryWallet = (canSync = true) => {
     const { setShowAuthFlow, isAuthenticated, authMode, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showLockedWalletView, showWidgetStatePopup, setSelectedWalletWithAction, } = useInternalDynamicContext.useInternalDynamicContext();
@@ -76,6 +85,10 @@ const useSyncPrimaryWallet = (canSync = true) => {
         primaryWallet.connector
             .getConnectedAccounts()
             .then((accounts) => {
+            logger.logger.debug('Sync primary wallet - getConnectedAccounts', {
+                accounts,
+                primaryWalletAddress: primaryWallet.address,
+            });
             const [connectedAddress] = accounts;
             if (!connectedAddress) {
                 throw new utils.DynamicError('Missing wallet address', errors.MISSING_ADDRESS_ERROR);
@@ -100,9 +113,7 @@ const useSyncPrimaryWallet = (canSync = true) => {
                 if (showLockedWalletView) {
                     setShowAuthFlow(true);
                     setView('wallet-locked-view');
-                    return;
                 }
-                handleLogOut();
             }
         });
     }, [

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

@@ -5,6 +5,15 @@ import { isWalletLinked } from '../../../functions/isWalletLinked/isWalletLinked
 import { useViewContext } from '../../../../context/ViewContext/ViewContext.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
 import { MISSING_ADDRESS_ERROR } from '../../../constants/errors.js';
+import '@dynamic-labs/sdk-api';
+import { logger } from '../../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import 'react/jsx-runtime';
+import '@dynamic-labs/wallet-book';
+import '../../../constants/colors.js';
+import '../../../../shared/utils/classes/storage/localStorage.js';
+import 'viem';
+import '../../../../shared/consts/index.js';
 
 const useSyncPrimaryWallet = (canSync = true) => {
     const { setShowAuthFlow, isAuthenticated, authMode, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showLockedWalletView, showWidgetStatePopup, setSelectedWalletWithAction, } = useInternalDynamicContext();
@@ -72,6 +81,10 @@ const useSyncPrimaryWallet = (canSync = true) => {
         primaryWallet.connector
             .getConnectedAccounts()
             .then((accounts) => {
+            logger.debug('Sync primary wallet - getConnectedAccounts', {
+                accounts,
+                primaryWalletAddress: primaryWallet.address,
+            });
             const [connectedAddress] = accounts;
             if (!connectedAddress) {
                 throw new DynamicError('Missing wallet address', MISSING_ADDRESS_ERROR);
@@ -96,9 +109,7 @@ const useSyncPrimaryWallet = (canSync = true) => {
                 if (showLockedWalletView) {
                     setShowAuthFlow(true);
                     setView('wallet-locked-view');
-                    return;
                 }
-                handleLogOut();
             }
         });
     }, [

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

@@ -13,8 +13,8 @@ require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
-require('@dynamic-labs/utils');
 var useMediaQuery = require('../../../shared/utils/hooks/useMediaQuery/useMediaQuery.cjs');
+require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 
 const useColorSchemePreference = () => {

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

@@ -9,8 +9,8 @@ import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
-import '@dynamic-labs/utils';
 import { useMediaQuery } from '../../../shared/utils/hooks/useMediaQuery/useMediaQuery.js';
+import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 
 const useColorSchemePreference = () => {

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

@@ -61,7 +61,7 @@ const useEmbeddedWallet = () => {
         internalSetShowAuthFlow,
         internalEvents,
     ]);
-    const startEmbeddedWalletCreationFlow = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const startEmbeddedWalletCreationFlow = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         internalSetShowAuthFlow(true);
         setView('passkey-intro');
         return new Promise((resolve, reject) => {
@@ -70,15 +70,16 @@ const useEmbeddedWallet = () => {
                 // when creating a passkey, if user cancels the passkey modal more than once
                 // it will throw this DOMException, but we don't want to let user to have access
                 // to the app before they've a passkey correctly setup
-                if (error instanceof DOMException && error.name === 'NotAllowedError') {
+                if (error instanceof DOMException &&
+                    error.name === 'NotAllowedError') {
                     logger.logger.error('User cancelled the passkey creation.', error);
                     return;
                 }
                 reject(error);
             });
         });
-    });
-    const returnEmbeddedWallet = (jwt, embeddedWalletVerifiedCredential) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    }), [internalEvents, internalSetShowAuthFlow, setView]);
+    const returnEmbeddedWallet = React.useCallback((jwt, embeddedWalletVerifiedCredential) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         const decodedJwt = decodeJwt.decodeJwt(jwt);
         const turnkeyWallet = findTurnkeyWallet.findTurnkeyWallet(walletConnectorOptions);
@@ -109,7 +110,7 @@ const useEmbeddedWallet = () => {
             id: embeddedWalletVerifiedCredential.id,
         };
         return Promise.resolve(passkeyWallet);
-    });
+    }), [setPrimaryWalletId, walletConnectorOptions]);
     const createEmbeddedWallet = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _e, _f, _g;
         const jwt = (_e = getAuthToken.getAuthToken()) !== null && _e !== void 0 ? _e : onboardingOnlyJwt;
@@ -132,14 +133,21 @@ const useEmbeddedWallet = () => {
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt);
         // if user logged in with MM for example, just continue the flow
         if (!embeddedWalletVerifiedCredential) {
+            // user logged in through an email linked to a third party wallet
+            // at this point primary wallet is still undefined and we need to set it
+            if (!primaryWallet) {
+                setPrimaryWalletId(userWaletsCredentials[0].id);
+            }
             return Promise.resolve(primaryWallet);
         }
         // if user already has embedded wallet, returns it
         return returnEmbeddedWallet(jwt, embeddedWalletVerifiedCredential);
     }), [
-        internalSetShowAuthFlow,
         onboardingOnlyJwt,
         projectSettings,
+        internalSetShowAuthFlow,
+        returnEmbeddedWallet,
+        startEmbeddedWalletCreationFlow,
         startPregeneratedWalletCreationFlow,
         primaryWallet,
     ]);

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

@@ -57,7 +57,7 @@ const useEmbeddedWallet = () => {
         internalSetShowAuthFlow,
         internalEvents,
     ]);
-    const startEmbeddedWalletCreationFlow = () => __awaiter(void 0, void 0, void 0, function* () {
+    const startEmbeddedWalletCreationFlow = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
         internalSetShowAuthFlow(true);
         setView('passkey-intro');
         return new Promise((resolve, reject) => {
@@ -66,15 +66,16 @@ const useEmbeddedWallet = () => {
                 // when creating a passkey, if user cancels the passkey modal more than once
                 // it will throw this DOMException, but we don't want to let user to have access
                 // to the app before they've a passkey correctly setup
-                if (error instanceof DOMException && error.name === 'NotAllowedError') {
+                if (error instanceof DOMException &&
+                    error.name === 'NotAllowedError') {
                     logger.error('User cancelled the passkey creation.', error);
                     return;
                 }
                 reject(error);
             });
         });
-    });
-    const returnEmbeddedWallet = (jwt, embeddedWalletVerifiedCredential) => __awaiter(void 0, void 0, void 0, function* () {
+    }), [internalEvents, internalSetShowAuthFlow, setView]);
+    const returnEmbeddedWallet = useCallback((jwt, embeddedWalletVerifiedCredential) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         const decodedJwt = decodeJwt(jwt);
         const turnkeyWallet = findTurnkeyWallet(walletConnectorOptions);
@@ -105,7 +106,7 @@ const useEmbeddedWallet = () => {
             id: embeddedWalletVerifiedCredential.id,
         };
         return Promise.resolve(passkeyWallet);
-    });
+    }), [setPrimaryWalletId, walletConnectorOptions]);
     const createEmbeddedWallet = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
         var _e, _f, _g;
         const jwt = (_e = getAuthToken()) !== null && _e !== void 0 ? _e : onboardingOnlyJwt;
@@ -128,14 +129,21 @@ const useEmbeddedWallet = () => {
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt);
         // if user logged in with MM for example, just continue the flow
         if (!embeddedWalletVerifiedCredential) {
+            // user logged in through an email linked to a third party wallet
+            // at this point primary wallet is still undefined and we need to set it
+            if (!primaryWallet) {
+                setPrimaryWalletId(userWaletsCredentials[0].id);
+            }
             return Promise.resolve(primaryWallet);
         }
         // if user already has embedded wallet, returns it
         return returnEmbeddedWallet(jwt, embeddedWalletVerifiedCredential);
     }), [
-        internalSetShowAuthFlow,
         onboardingOnlyJwt,
         projectSettings,
+        internalSetShowAuthFlow,
+        returnEmbeddedWallet,
+        startEmbeddedWalletCreationFlow,
         startPregeneratedWalletCreationFlow,
         primaryWallet,
     ]);

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

@@ -16,8 +16,8 @@ var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
 var localStorage$1 = require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
-var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 var useEffectOnce = require('../../../shared/utils/hooks/useEffectOnce/useEffectOnce.cjs');
+var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 require('../../../shared/consts/index.cjs');
 var validators = require('../../../context/DynamicContext/validators.cjs');
 
@@ -61,6 +61,7 @@ const useFetchProjectSettings = ({ authToken, environmentId, maxRetries = 2, dyn
             const serializedDynamicContextProps = Object.assign(Object.assign({}, updatedDynamicProps), { settings: Object.assign(Object.assign({}, updatedDynamicProps.settings), { eventsCallbacks: serializedEventsCallbacks, walletConnectors: serializedWalletConnectors }) });
             api.sendDynamicProps(environmentId, {
                 dynamicContextProps: serializedDynamicContextProps,
+                frameworkSettings: getFrameworkSettings(),
             });
             api.fetchProjectSettings(environmentId)
                 .then((response) => {
@@ -123,6 +124,19 @@ const serializeWalletConnectors = (walletConnectors) => {
         return undefined;
     }
 };
+const getFrameworkSettings = () => {
+    var _a;
+    return ({
+        nextJs: {
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            version: (_a = window.next) === null || _a === void 0 ? void 0 : _a.version,
+        },
+        react: {
+            version: React.version,
+        },
+    });
+};
 
 exports.serializeEventsCallbacks = serializeEventsCallbacks;
 exports.serializeWalletConnectors = serializeWalletConnectors;

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

@@ -1,4 +1,4 @@
-import { useState, useEffect, useMemo } from 'react';
+import { useState, useEffect, useMemo, version } from 'react';
 import { DynamicError } from '@dynamic-labs/utils';
 import { sendDynamicProps, fetchProjectSettings } from '../../../data/api.js';
 import '@dynamic-labs/sdk-api';
@@ -12,8 +12,8 @@ import { PROJECT_SETTINGS_STORAGE_KEY, CONNECTED_WALLETS_INFO } from '../../cons
 import '../../constants/colors.js';
 import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
-import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import { useEffectOnce } from '../../../shared/utils/hooks/useEffectOnce/useEffectOnce.js';
+import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import '../../../shared/consts/index.js';
 import { validateLocalStorageExpiry } from '../../../context/DynamicContext/validators.js';
 
@@ -57,6 +57,7 @@ const useFetchProjectSettings = ({ authToken, environmentId, maxRetries = 2, dyn
             const serializedDynamicContextProps = Object.assign(Object.assign({}, updatedDynamicProps), { settings: Object.assign(Object.assign({}, updatedDynamicProps.settings), { eventsCallbacks: serializedEventsCallbacks, walletConnectors: serializedWalletConnectors }) });
             sendDynamicProps(environmentId, {
                 dynamicContextProps: serializedDynamicContextProps,
+                frameworkSettings: getFrameworkSettings(),
             });
             fetchProjectSettings(environmentId)
                 .then((response) => {
@@ -119,5 +120,18 @@ const serializeWalletConnectors = (walletConnectors) => {
         return undefined;
     }
 };
+const getFrameworkSettings = () => {
+    var _a;
+    return ({
+        nextJs: {
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            version: (_a = window.next) === null || _a === void 0 ? void 0 : _a.version,
+        },
+        react: {
+            version,
+        },
+    });
+};
 
 export { serializeEventsCallbacks, serializeWalletConnectors, useFetchProjectSettings };

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

@@ -17,10 +17,10 @@ require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../../shared/consts/index.cjs');
-var isSameWalletName = require('../../functions/isSameWalletName/isSameWalletName.cjs');
-var useWalletsConnectionState = require('../useWalletsConnectionState/useWalletsConnectionState.cjs');
 require('@dynamic-labs/multi-wallet');
 var getWalletIdentifier = require('../../functions/getWalletIdentifier/getWalletIdentifier.cjs');
+var isSameWalletName = require('../../functions/isSameWalletName/isSameWalletName.cjs');
+var useWalletsConnectionState = require('../useWalletsConnectionState/useWalletsConnectionState.cjs');
 var reconnectSocialWallet = require('./reconnectSocialWallet.cjs');
 var createLinkedWalletsFromWalletOptions = require('./utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs');
 var updateUserWalletsFromLinkedWallets = require('./utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.cjs');
@@ -66,14 +66,14 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConn
     React.useEffect(() => walletsBasedOnAuthMode.forEach((wallet) => {
         wallet.connector.initEventListener();
     }), [walletsBasedOnAuthMode]);
-    const { connectedWalletMap, didConnectedStateLoad } = useWalletsConnectionState.useWalletsConnectionState(walletsBasedOnAuthMode);
-    const wallets = React.useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[getWalletIdentifier.getWalletIdentifier(wallet)]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
+    const { connectedWalletsMap, didConnectedStateLoad } = useWalletsConnectionState.useWalletsConnectionState(walletsBasedOnAuthMode);
+    const wallets = React.useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletsMap[getWalletIdentifier.getWalletIdentifier(wallet)]) }))), [connectedWalletsMap, walletsBasedOnAuthMode]);
     const { setUserWallets } = UserWalletsContext.useInternalUserWallets();
     // Keep userWallets in sync whenever linkedWallets changes
     React.useEffect(() => {
-        setUserWallets((userWallets) => didConnectedStateLoad
-            ? updateUserWalletsFromLinkedWallets.updateUserWalletsFromLinkedWallets(userWallets, wallets)
-            : userWallets);
+        if (!didConnectedStateLoad.current)
+            return;
+        setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets.updateUserWalletsFromLinkedWallets(userWallets, wallets));
     }, [didConnectedStateLoad, setUserWallets, wallets]);
     const primaryWallet = React.useMemo(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
     const secondaryWallets = React.useMemo(() => canHaveMultipleWalletsConnected
@@ -173,7 +173,7 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConn
         setQrcodeUri,
     ]);
     return {
-        didConnectedStateLoad,
+        didConnectedStateLoad: didConnectedStateLoad.current,
         primaryWallet,
         secondaryWallets,
         setPrimaryWallet,

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

@@ -13,10 +13,10 @@ import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../shared/consts/index.js';
-import { isSameWalletName } from '../../functions/isSameWalletName/isSameWalletName.js';
-import { useWalletsConnectionState } from '../useWalletsConnectionState/useWalletsConnectionState.js';
 import '@dynamic-labs/multi-wallet';
 import { getWalletIdentifier } from '../../functions/getWalletIdentifier/getWalletIdentifier.js';
+import { isSameWalletName } from '../../functions/isSameWalletName/isSameWalletName.js';
+import { useWalletsConnectionState } from '../useWalletsConnectionState/useWalletsConnectionState.js';
 import { reconnectSocialWallet } from './reconnectSocialWallet.js';
 import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
 import { updateUserWalletsFromLinkedWallets } from './utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.js';
@@ -62,14 +62,14 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConn
     useEffect(() => walletsBasedOnAuthMode.forEach((wallet) => {
         wallet.connector.initEventListener();
     }), [walletsBasedOnAuthMode]);
-    const { connectedWalletMap, didConnectedStateLoad } = useWalletsConnectionState(walletsBasedOnAuthMode);
-    const wallets = useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[getWalletIdentifier(wallet)]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
+    const { connectedWalletsMap, didConnectedStateLoad } = useWalletsConnectionState(walletsBasedOnAuthMode);
+    const wallets = useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletsMap[getWalletIdentifier(wallet)]) }))), [connectedWalletsMap, walletsBasedOnAuthMode]);
     const { setUserWallets } = useInternalUserWallets();
     // Keep userWallets in sync whenever linkedWallets changes
     useEffect(() => {
-        setUserWallets((userWallets) => didConnectedStateLoad
-            ? updateUserWalletsFromLinkedWallets(userWallets, wallets)
-            : userWallets);
+        if (!didConnectedStateLoad.current)
+            return;
+        setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets(userWallets, wallets));
     }, [didConnectedStateLoad, setUserWallets, wallets]);
     const primaryWallet = useMemo(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
     const secondaryWallets = useMemo(() => canHaveMultipleWalletsConnected
@@ -169,7 +169,7 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConn
         setQrcodeUri,
     ]);
     return {
-        didConnectedStateLoad,
+        didConnectedStateLoad: didConnectedStateLoad.current,
         primaryWallet,
         secondaryWallets,
         setPrimaryWallet,

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

@@ -65,12 +65,13 @@ const useWalletEventListeners = ({ handleLogOut, multiWallet, multiWalletWidgetS
         if (!primaryWallet)
             return;
         const [newAddress] = accounts;
-        const newWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
-        if (authMode === 'connect-only') {
+        const changedAddress = !walletConnectorCore.isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain);
+        if (changedAddress && authMode === 'connect-only') {
             refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
             return;
         }
-        if (walletConnectorCore.isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain)) {
+        const newWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
+        if (!changedAddress) {
             setMultiWalletWidgetState('idle');
         }
         else if (!multiWallet) {

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

@@ -61,12 +61,13 @@ const useWalletEventListeners = ({ handleLogOut, multiWallet, multiWalletWidgetS
         if (!primaryWallet)
             return;
         const [newAddress] = accounts;
-        const newWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
-        if (authMode === 'connect-only') {
+        const changedAddress = !isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain);
+        if (changedAddress && authMode === 'connect-only') {
             refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
             return;
         }
-        if (isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain)) {
+        const newWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
+        if (!changedAddress) {
             setMultiWalletWidgetState('idle');
         }
         else if (!multiWallet) {