@dynamic-labs/sdk-react-core 0.19.0-alpha.0 → 0.19.0-alpha.2

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

@@ -1,14 +1,14 @@
 import { useCallback, useEffect } from 'react';
 import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
+import { DynamicError } from '@dynamic-labs/utils';
 import { isWalletLinked } from '../../../functions/isWalletLinked/isWalletLinked.js';
 import { useViewContext } from '../../../../context/ViewContext/ViewContext.js';
-import { useAccountExistsContext } from '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
+import { MISSING_ADDRESS_ERROR } from '../../../constants/errors.js';
 
 const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showWidgetStatePopup, canSync = true, authMode, }) => {
-    const { setShowAuthFlow } = useInternalDynamicContext();
+    const { setShowAuthFlow, isAuthenticated } = useInternalDynamicContext();
     const { setView } = useViewContext();
-    const { existentAccountData } = useAccountExistsContext();
     const handlePrimaryWalletNotActive = useCallback((connectedAddress) => {
         if (!primaryWallet)
             return;
@@ -72,23 +72,24 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
             .getConnectedAccounts()
             .then((accounts) => {
             const [connectedAddress] = accounts;
+            if (!connectedAddress) {
+                throw new DynamicError('Missing wallet address', MISSING_ADDRESS_ERROR);
+            }
             if (isSameAddress(connectedAddress, primaryWallet.address, primaryWallet.chain)) {
                 return;
             }
             handlePrimaryWalletNotActive(connectedAddress);
         })
-            .catch(() => {
+            .catch((e) => {
             const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected);
             if (connectedSecondaryWallet) {
                 setPrimaryWallet(connectedSecondaryWallet.id);
                 computeConnectedStateForWallets();
                 return;
             }
-            // no wallet is connected
-            setShowAuthFlow(true);
-            // check needed so 'wallet-locked-view'
-            // doesn't overwrite 'account-exists' view
-            if (!existentAccountData) {
+            // user is logged in (has valid jwt), but no wallet is connected
+            if (isAuthenticated && e.code === MISSING_ADDRESS_ERROR) {
+                setShowAuthFlow(true);
                 setView('wallet-locked-view');
             }
         });
@@ -105,6 +106,7 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
         setView,
         setShowAuthFlow,
         authMode,
+        isAuthenticated,
     ]);
 };
 

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

@@ -24,6 +24,7 @@ require('../../../../config/ApiEndpoint.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
 
 const useVerifyOnAwaitingSignature = () => {
     const { awaitingSignatureState, multiWalletWidgetState, setMultiWalletWidgetState, legacyIsVerifying, setLegacyIsVerifying, selectedWalletConnector, } = useInternalDynamicContext.useInternalDynamicContext();

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

@@ -20,6 +20,7 @@ import '../../../../config/ApiEndpoint.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../../context/EmailVerificationContext/EmailVerificationContext.js';
 
 const useVerifyOnAwaitingSignature = () => {
     const { awaitingSignatureState, multiWalletWidgetState, setMultiWalletWidgetState, legacyIsVerifying, setLegacyIsVerifying, selectedWalletConnector, } = useInternalDynamicContext();

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

@@ -68,7 +68,8 @@ const useAuthLayoutChecks = (walletConnector) => {
         view === 'login-with-email-or-wallet-full-wallet-list' ||
         view === 'wallet-group' ||
         view === 'pending-connect' ||
-        view === 'account-exists';
+        view === 'account-exists' ||
+        (view === 'merge-user-accounts' && !user);
     const showQrCodePreHeader = view === 'qr-code' && showQrCodeMessage && !showQrCodeImage;
     return {
         isWalletListTypeView,

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

@@ -64,7 +64,8 @@ const useAuthLayoutChecks = (walletConnector) => {
         view === 'login-with-email-or-wallet-full-wallet-list' ||
         view === 'wallet-group' ||
         view === 'pending-connect' ||
-        view === 'account-exists';
+        view === 'account-exists' ||
+        (view === 'merge-user-accounts' && !user);
     const showQrCodePreHeader = view === 'qr-code' && showQrCodeMessage && !showQrCodeImage;
     return {
         isWalletListTypeView,

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

@@ -24,6 +24,7 @@ require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 var useSignConnectOnlyUser = require('../authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.cjs');
+require('../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
 
 const useAuthenticateConnectedUser = () => {
     const signConnectOnlyUser = useSignConnectOnlyUser.useSignConnectOnlyUser();

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

@@ -20,6 +20,7 @@ import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import { useSignConnectOnlyUser } from '../authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.js';
+import '../../../context/EmailVerificationContext/EmailVerificationContext.js';
 
 const useAuthenticateConnectedUser = () => {
     const signConnectOnlyUser = useSignConnectOnlyUser();

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

@@ -8,6 +8,13 @@ var React = require('react');
 var reactDom = require('react-dom');
 var useElementById = require('../useElementById/useElementById.cjs');
 
+// eslint-disable-next-line multiline-comment-style
+/** Allows showing a modal for the user to confirm or cancel.
+ * @param {string} elementId The id of the modal root, to which the modal will be portalled
+ * @returns {ConfirmationModalHookResult} An object with a method to open a modal and a reference to the modal itself.
+ * The open method accepts a callback which receives a (resolve, reject) pair to be called if the user
+ * confirms or cancels the operation, and must return the ReactNode for the modal to be displayed.
+ */
 const useConfirmationModal = ({ elementId, }) => {
     const modalRootElementRef = useElementById.useElementById(elementId);
     const [node, setNode] = React.useState(null);

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

@@ -1,2 +1,8 @@
 import { ConfirmationModalHookProps, ConfirmationModalHookResult } from './useConfirmationModal.types';
+/** Allows showing a modal for the user to confirm or cancel.
+ * @param {string} elementId The id of the modal root, to which the modal will be portalled
+ * @returns {ConfirmationModalHookResult} An object with a method to open a modal and a reference to the modal itself.
+ * The open method accepts a callback which receives a (resolve, reject) pair to be called if the user
+ * confirms or cancels the operation, and must return the ReactNode for the modal to be displayed.
+ */
 export declare const useConfirmationModal: <T, E = unknown>({ elementId, }: ConfirmationModalHookProps) => ConfirmationModalHookResult<T, E>;

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

@@ -4,6 +4,13 @@ import { useState, useCallback } from 'react';
 import { createPortal } from 'react-dom';
 import { useElementById } from '../useElementById/useElementById.js';
 
+// eslint-disable-next-line multiline-comment-style
+/** Allows showing a modal for the user to confirm or cancel.
+ * @param {string} elementId The id of the modal root, to which the modal will be portalled
+ * @returns {ConfirmationModalHookResult} An object with a method to open a modal and a reference to the modal itself.
+ * The open method accepts a callback which receives a (resolve, reject) pair to be called if the user
+ * confirms or cancels the operation, and must return the ReactNode for the modal to be displayed.
+ */
 const useConfirmationModal = ({ elementId, }) => {
     const modalRootElementRef = useElementById(elementId);
     const [node, setNode] = useState(null);

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

@@ -132,14 +132,14 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
     });
     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 connectWallet = (walletConnector, fetchPublicAddressOpts, shouldCallCallback = true) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const publicWalletAddress = yield walletConnector.fetchPublicAddress(fetchPublicAddressOpts);
         if (!publicWalletAddress) {
             const error = new Error();
             error.code = 'missing-public-address';
             throw error;
         }
-        if (onBeforeConnectSuccessConfirmation) {
+        if (onBeforeConnectSuccessConfirmation && shouldCallCallback) {
             const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
                 address: publicWalletAddress,
                 chain: walletConnector.connectedChain,

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

@@ -21,7 +21,7 @@ type Props = {
     setShowAuthFlow: Dispatch<SetStateAction<boolean>>;
 };
 export declare const useConnectWallet: ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onUnlink, onBeforeConnectSuccessConfirmation, setShowAuthFlow, }: Props) => {
-    connectWallet: (walletConnector: WalletConnector, fetchPublicAddressOpts?: FetchPublicAddressOpts) => Promise<string | undefined>;
+    connectWallet: (walletConnector: WalletConnector, fetchPublicAddressOpts?: FetchPublicAddressOpts, shouldCallCallback?: boolean) => Promise<string | undefined>;
     connectedWallet: Wallet;
     connectedWallets: Wallet[];
     connectedWalletsInfo: ConnectedWalletConnectorType[] | [];

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

@@ -128,14 +128,14 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
     });
     const shouldSkipCreatingVisit = useMemo(() => (authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly) ||
         connectedWallet, [authMode, connectedWallet, enableVisitTrackingOnConnectOnly]);
-    const connectWallet = (walletConnector, fetchPublicAddressOpts) => __awaiter(void 0, void 0, void 0, function* () {
+    const connectWallet = (walletConnector, fetchPublicAddressOpts, shouldCallCallback = true) => __awaiter(void 0, void 0, void 0, function* () {
         const publicWalletAddress = yield walletConnector.fetchPublicAddress(fetchPublicAddressOpts);
         if (!publicWalletAddress) {
             const error = new Error();
             error.code = 'missing-public-address';
             throw error;
         }
-        if (onBeforeConnectSuccessConfirmation) {
+        if (onBeforeConnectSuccessConfirmation && shouldCallCallback) {
             const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
                 address: publicWalletAddress,
                 chain: walletConnector.connectedChain,

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

@@ -22,7 +22,7 @@ var isProgrammableNetworkSwitchSupported = require('../../functions/isProgrammab
 
 const useConnectedWalletsNetworkValidation = () => {
     const { connectedWallets, selectedWalletConnector, setSelectedWalletConnector, setShowAuthFlow, showAuthFlow, walletsToConnectByChain, isBridgeFlow, } = useInternalDynamicContext.useInternalDynamicContext();
-    const { view, setView } = ViewContext.useViewContext();
+    const { setView } = ViewContext.useViewContext();
     React.useEffect(() => {
         if (!isBridgeFlow) {
             return;
@@ -53,16 +53,17 @@ const useConnectedWalletsNetworkValidation = () => {
             }
             setView(networkNotSupportedView);
         }
+        // we need it to remove 'showAuthFlow' property. we don't want to react to it,
+        // because closing modal on network switch causes it to re-open
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
-        isBridgeFlow,
         connectedWallets,
-        view,
+        isBridgeFlow,
         selectedWalletConnector,
-        walletsToConnectByChain,
-        showAuthFlow,
-        setView,
         setSelectedWalletConnector,
         setShowAuthFlow,
+        setView,
+        walletsToConnectByChain,
     ]);
 };
 

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

@@ -18,7 +18,7 @@ import { isProgrammableNetworkSwitchSupported } from '../../functions/isProgramm
 
 const useConnectedWalletsNetworkValidation = () => {
     const { connectedWallets, selectedWalletConnector, setSelectedWalletConnector, setShowAuthFlow, showAuthFlow, walletsToConnectByChain, isBridgeFlow, } = useInternalDynamicContext();
-    const { view, setView } = useViewContext();
+    const { setView } = useViewContext();
     useEffect(() => {
         if (!isBridgeFlow) {
             return;
@@ -49,16 +49,17 @@ const useConnectedWalletsNetworkValidation = () => {
             }
             setView(networkNotSupportedView);
         }
+        // we need it to remove 'showAuthFlow' property. we don't want to react to it,
+        // because closing modal on network switch causes it to re-open
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
-        isBridgeFlow,
         connectedWallets,
-        view,
+        isBridgeFlow,
         selectedWalletConnector,
-        walletsToConnectByChain,
-        showAuthFlow,
-        setView,
         setSelectedWalletConnector,
         setShowAuthFlow,
+        setView,
+        walletsToConnectByChain,
     ]);
 };
 

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

@@ -19,6 +19,7 @@ require('ethers');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 require('../../../shared/consts/index.cjs');
 var validators = require('../../../context/DynamicContext/validators.cjs');
+var mergeCustomerEvmNetworksWithServerNetworks = require('./utils/mergeCustomerEvmNetworksWithServerNetworks/mergeCustomerEvmNetworksWithServerNetworks.cjs');
 
 const MAX_RETRIES = 2;
 const useFetchNetworkConfigurations = ({ authToken, environmentId, evmNetworks: customerEvmNetworks, maxRetries = MAX_RETRIES, }) => {
@@ -113,13 +114,7 @@ const useFetchNetworkConfigurations = ({ authToken, environmentId, evmNetworks:
                     serverNetworks.length &&
                     customerEvmNetworks !== undefined &&
                     customerEvmNetworks.length) {
-                    mergedEvmNetworks = customerEvmNetworks.slice();
-                    serverNetworks.forEach((network) => {
-                        const existingNetwork = mergedEvmNetworks === null || mergedEvmNetworks === void 0 ? void 0 : mergedEvmNetworks.find((item) => item.chainId === network.chainId);
-                        if (!existingNetwork) {
-                            mergedEvmNetworks === null || mergedEvmNetworks === void 0 ? void 0 : mergedEvmNetworks.push(network);
-                        }
-                    });
+                    mergedEvmNetworks = mergeCustomerEvmNetworksWithServerNetworks.mergeCustomerEvmNetworksWithServerNetworks(customerEvmNetworks, serverNetworks);
                 }
                 setLsNetworks({
                     configurations: {

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

@@ -15,6 +15,7 @@ import 'ethers';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import '../../../shared/consts/index.js';
 import { validateLocalStorageExpiry } from '../../../context/DynamicContext/validators.js';
+import { mergeCustomerEvmNetworksWithServerNetworks } from './utils/mergeCustomerEvmNetworksWithServerNetworks/mergeCustomerEvmNetworksWithServerNetworks.js';
 
 const MAX_RETRIES = 2;
 const useFetchNetworkConfigurations = ({ authToken, environmentId, evmNetworks: customerEvmNetworks, maxRetries = MAX_RETRIES, }) => {
@@ -109,13 +110,7 @@ const useFetchNetworkConfigurations = ({ authToken, environmentId, evmNetworks:
                     serverNetworks.length &&
                     customerEvmNetworks !== undefined &&
                     customerEvmNetworks.length) {
-                    mergedEvmNetworks = customerEvmNetworks.slice();
-                    serverNetworks.forEach((network) => {
-                        const existingNetwork = mergedEvmNetworks === null || mergedEvmNetworks === void 0 ? void 0 : mergedEvmNetworks.find((item) => item.chainId === network.chainId);
-                        if (!existingNetwork) {
-                            mergedEvmNetworks === null || mergedEvmNetworks === void 0 ? void 0 : mergedEvmNetworks.push(network);
-                        }
-                    });
+                    mergedEvmNetworks = mergeCustomerEvmNetworksWithServerNetworks(customerEvmNetworks, serverNetworks);
                 }
                 setLsNetworks({
                     configurations: {

package/src/lib/utils/hooks/useFetchNetworkConfigurations/utils/index.d.ts

@@ -0,0 +1 @@
+export * from './mergeCustomerEvmNetworksWithServerNetworks';

package/src/lib/utils/hooks/useFetchNetworkConfigurations/utils/mergeCustomerEvmNetworksWithServerNetworks/index.d.ts

@@ -0,0 +1 @@
+export { mergeCustomerEvmNetworksWithServerNetworks } from './mergeCustomerEvmNetworksWithServerNetworks';

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

@@ -0,0 +1,16 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const mergeCustomerEvmNetworksWithServerNetworks = (customerEvmNetworks, serverNetworks) => {
+    const evmNetworks = [...customerEvmNetworks];
+    serverNetworks.forEach((network) => {
+        const existingNetwork = evmNetworks === null || evmNetworks === void 0 ? void 0 : evmNetworks.find((item) => item.chainId === network.chainId);
+        if (!existingNetwork) {
+            evmNetworks === null || evmNetworks === void 0 ? void 0 : evmNetworks.unshift(network);
+        }
+    });
+    return evmNetworks;
+};
+
+exports.mergeCustomerEvmNetworksWithServerNetworks = mergeCustomerEvmNetworksWithServerNetworks;

package/src/lib/utils/hooks/useFetchNetworkConfigurations/utils/mergeCustomerEvmNetworksWithServerNetworks/mergeCustomerEvmNetworksWithServerNetworks.d.ts

@@ -0,0 +1,2 @@
+import { GenericNetwork } from '@dynamic-labs/types';
+export declare const mergeCustomerEvmNetworksWithServerNetworks: (customerEvmNetworks: GenericNetwork[], serverNetworks: GenericNetwork[]) => GenericNetwork[];

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

@@ -0,0 +1,12 @@
+const mergeCustomerEvmNetworksWithServerNetworks = (customerEvmNetworks, serverNetworks) => {
+    const evmNetworks = [...customerEvmNetworks];
+    serverNetworks.forEach((network) => {
+        const existingNetwork = evmNetworks === null || evmNetworks === void 0 ? void 0 : evmNetworks.find((item) => item.chainId === network.chainId);
+        if (!existingNetwork) {
+            evmNetworks === null || evmNetworks === void 0 ? void 0 : evmNetworks.unshift(network);
+        }
+    });
+    return evmNetworks;
+};
+
+export { mergeCustomerEvmNetworksWithServerNetworks };

package/src/lib/utils/hooks/useFindSocialIcon/index.d.ts

@@ -0,0 +1 @@
+export * from './useFindSocialIcon';

package/src/lib/utils/hooks/{useGetSocialIcon/useGetSocialIcon.cjs → useFindSocialIcon/useFindSocialIcon.cjs}

@@ -6,9 +6,9 @@ var React = require('react');
 var iconic = require('@dynamic-labs/iconic');
 var useIconThemeVariant = require('../useIconThemeVariant/useIconThemeVariant.cjs');
 
-const useGetSocialIcon = () => {
+const useFindSocialIcon = () => {
     const variant = useIconThemeVariant.useIconThemeVariant();
-    return React.useCallback((provider) => iconic.getSocialIcon(provider, variant), [variant]);
+    return React.useCallback((provider) => iconic.findSocialIcon(provider, variant), [variant]);
 };
 
-exports.useGetSocialIcon = useGetSocialIcon;
+exports.useFindSocialIcon = useFindSocialIcon;

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

@@ -0,0 +1,3 @@
+import { Iconic } from '@dynamic-labs/iconic';
+import { SocialProvider } from '@dynamic-labs/wallet-connector-core';
+export declare const useFindSocialIcon: () => (provider: SocialProvider) => Iconic | null;

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

@@ -0,0 +1,10 @@
+import { useCallback } from 'react';
+import { findSocialIcon } from '@dynamic-labs/iconic';
+import { useIconThemeVariant } from '../useIconThemeVariant/useIconThemeVariant.js';
+
+const useFindSocialIcon = () => {
+    const variant = useIconThemeVariant();
+    return useCallback((provider) => findSocialIcon(provider, variant), [variant]);
+};
+
+export { useFindSocialIcon };

package/src/lib/utils/hooks/useOnUnmount/index.d.ts

@@ -0,0 +1 @@
+export * from './useOnUnmount';

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

@@ -0,0 +1,21 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+
+/** Min ms that need to pass before the component is able to call the callback on unmount */
+const MIN_EVENT_TIME = 10;
+const useOnUnmount = (callback) => {
+    React.useEffect(() => {
+        const mountedAt = new Date();
+        return () => {
+            // Avoid calling callback as cause of a React Strict Mode rerender
+            if (new Date().getTime() - mountedAt.getTime() < MIN_EVENT_TIME)
+                return;
+            callback();
+        };
+    }, []);
+};
+
+exports.useOnUnmount = useOnUnmount;

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

@@ -0,0 +1 @@
+export declare const useOnUnmount: (callback: () => void) => void;

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

@@ -0,0 +1,17 @@
+import { useEffect } from 'react';
+
+/** Min ms that need to pass before the component is able to call the callback on unmount */
+const MIN_EVENT_TIME = 10;
+const useOnUnmount = (callback) => {
+    useEffect(() => {
+        const mountedAt = new Date();
+        return () => {
+            // Avoid calling callback as cause of a React Strict Mode rerender
+            if (new Date().getTime() - mountedAt.getTime() < MIN_EVENT_TIME)
+                return;
+            callback();
+        };
+    }, []);
+};
+
+export { useOnUnmount };

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

@@ -20,11 +20,15 @@ require('../../../shared/consts/index.cjs');
 var primaryWalletIdValidator = require('../useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.cjs');
 require('@dynamic-labs/multi-wallet');
 
-const usePrimaryWalletId = () => {
-    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletId] = useLocalStorage.useLocalStorage(localStorage.PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator.primaryWalletIdValidator);
+const usePrimaryWalletId = (internalEvents) => {
+    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletIdStorage,] = useLocalStorage.useLocalStorage(localStorage.PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator.primaryWalletIdValidator);
     const setPrimaryWalletId = React.useCallback((walletId) => {
         setPrimaryWalletIdState(walletId);
     }, [setPrimaryWalletIdState]);
+    const clearPrimaryWalletId = () => {
+        clearPrimaryWalletIdStorage();
+        internalEvents.emit('clearPrimaryWallet');
+    };
     return {
         clearPrimaryWalletId,
         primaryWalletId,

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

@@ -1,4 +1,5 @@
-export declare const usePrimaryWalletId: () => {
+import { InternalEventEmitter } from '../../../context/DynamicContext/internalEvents';
+export declare const usePrimaryWalletId: (internalEvents: InternalEventEmitter) => {
     clearPrimaryWalletId: () => void;
     primaryWalletId: string | undefined;
     setPrimaryWalletId: (walletId: string) => void;

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

@@ -16,11 +16,15 @@ import '../../../shared/consts/index.js';
 import { primaryWalletIdValidator } from '../useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.js';
 import '@dynamic-labs/multi-wallet';
 
-const usePrimaryWalletId = () => {
-    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletId] = useLocalStorage(PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator);
+const usePrimaryWalletId = (internalEvents) => {
+    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletIdStorage,] = useLocalStorage(PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator);
     const setPrimaryWalletId = useCallback((walletId) => {
         setPrimaryWalletIdState(walletId);
     }, [setPrimaryWalletIdState]);
+    const clearPrimaryWalletId = () => {
+        clearPrimaryWalletIdStorage();
+        internalEvents.emit('clearPrimaryWallet');
+    };
     return {
         clearPrimaryWalletId,
         primaryWalletId,