@dynamic-labs/sdk-react-core 0.19.0-alpha.1 → 0.19.0-alpha.3

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

@@ -0,0 +1,14 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const randomString = (length) => {
+    const CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_';
+    let result = '';
+    for (let i = length; i > 0; --i) {
+        result += CHARS[Math.floor(Math.random() * CHARS.length)];
+    }
+    return result;
+};
+
+exports.randomString = randomString;

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

@@ -0,0 +1 @@
+export declare const randomString: (length: number) => string;

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

@@ -0,0 +1,10 @@
+const randomString = (length) => {
+    const CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_';
+    let result = '';
+    for (let i = length; i > 0; --i) {
+        result += CHARS[Math.floor(Math.random() * CHARS.length)];
+    }
+    return result;
+};
+
+export { randomString };

package/src/lib/utils/functions/sendTransactionWithAutoNonce/index.d.ts

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

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

@@ -0,0 +1,45 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
+
+const MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE = -32603;
+/**
+ * Sends a transaction with an automatically determined nonce, if not provided.
+ *
+ * In Ethereum, each transaction sent from a particular address must have a unique nonce.
+ * If the transaction does not already have a nonce, this function helps to automatically set it.
+ * If a transaction with a particular nonce fails due to a "could not replace transaction" error,
+ * this function will automatically retry with the next nonce.
+ *
+ * @param provider - An Ethereum provider to interact with the Ethereum network.
+ * @param transaction - The transaction details.
+ * @param sendTransactionHandler - A handler function to send the transaction.
+ *
+ * @returns A promise that resolves to the transaction response.
+ */
+const sendTransactionWithAutoNonce = (provider, transaction, sendTransactionHandler) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    if (transaction.nonce !== undefined) {
+        return sendTransactionHandler(transaction);
+    }
+    const signer = provider.getSigner();
+    const address = signer.getAddress();
+    const nonce = yield provider.getTransactionCount(address);
+    const transactionWithNonce = Object.assign(Object.assign({}, transaction), { nonce });
+    try {
+        const response = yield sendTransactionHandler(transactionWithNonce);
+        return response;
+    }
+    catch (err) {
+        if (err.code ===
+            MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE) {
+            const transactionWithNextNonce = Object.assign(Object.assign({}, transaction), { nonce: nonce + 1 });
+            return sendTransactionHandler(transactionWithNextNonce);
+        }
+        throw err;
+    }
+});
+
+exports.MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE = MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE;
+exports.sendTransactionWithAutoNonce = sendTransactionWithAutoNonce;

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

@@ -0,0 +1,17 @@
+import { ethers } from 'ethers';
+export declare const MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE = -32603;
+/**
+ * Sends a transaction with an automatically determined nonce, if not provided.
+ *
+ * In Ethereum, each transaction sent from a particular address must have a unique nonce.
+ * If the transaction does not already have a nonce, this function helps to automatically set it.
+ * If a transaction with a particular nonce fails due to a "could not replace transaction" error,
+ * this function will automatically retry with the next nonce.
+ *
+ * @param provider - An Ethereum provider to interact with the Ethereum network.
+ * @param transaction - The transaction details.
+ * @param sendTransactionHandler - A handler function to send the transaction.
+ *
+ * @returns A promise that resolves to the transaction response.
+ */
+export declare const sendTransactionWithAutoNonce: (provider: ethers.providers.Web3Provider, transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>, sendTransactionHandler: (transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>) => Promise<ethers.providers.TransactionResponse>) => Promise<ethers.providers.TransactionResponse>;

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

@@ -0,0 +1,40 @@
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+
+const MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE = -32603;
+/**
+ * Sends a transaction with an automatically determined nonce, if not provided.
+ *
+ * In Ethereum, each transaction sent from a particular address must have a unique nonce.
+ * If the transaction does not already have a nonce, this function helps to automatically set it.
+ * If a transaction with a particular nonce fails due to a "could not replace transaction" error,
+ * this function will automatically retry with the next nonce.
+ *
+ * @param provider - An Ethereum provider to interact with the Ethereum network.
+ * @param transaction - The transaction details.
+ * @param sendTransactionHandler - A handler function to send the transaction.
+ *
+ * @returns A promise that resolves to the transaction response.
+ */
+const sendTransactionWithAutoNonce = (provider, transaction, sendTransactionHandler) => __awaiter(void 0, void 0, void 0, function* () {
+    if (transaction.nonce !== undefined) {
+        return sendTransactionHandler(transaction);
+    }
+    const signer = provider.getSigner();
+    const address = signer.getAddress();
+    const nonce = yield provider.getTransactionCount(address);
+    const transactionWithNonce = Object.assign(Object.assign({}, transaction), { nonce });
+    try {
+        const response = yield sendTransactionHandler(transactionWithNonce);
+        return response;
+    }
+    catch (err) {
+        if (err.code ===
+            MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE) {
+            const transactionWithNextNonce = Object.assign(Object.assign({}, transaction), { nonce: nonce + 1 });
+            return sendTransactionHandler(transactionWithNextNonce);
+        }
+        throw err;
+    }
+});
+
+export { MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE, sendTransactionWithAutoNonce };

package/src/lib/utils/functions/stringifyURIQuery/index.d.ts

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

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

@@ -0,0 +1,13 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const stringifyURIQuery = (obj) => {
+    const str = [];
+    for (const prop in obj) {
+        str.push(encodeURIComponent(prop) + '=' + encodeURIComponent(obj[prop]));
+    }
+    return str.join('&');
+};
+
+exports.stringifyURIQuery = stringifyURIQuery;

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

@@ -0,0 +1 @@
+export declare const stringifyURIQuery: (obj: any) => string;

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

@@ -0,0 +1,9 @@
+const stringifyURIQuery = (obj) => {
+    const str = [];
+    for (const prop in obj) {
+        str.push(encodeURIComponent(prop) + '=' + encodeURIComponent(obj[prop]));
+    }
+    return str.join('&');
+};
+
+export { stringifyURIQuery };

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

@@ -1,3 +1,4 @@
 export { useConnectAndSign } from './useConnectAndSign';
 export { useSignConnectOnlyUser } from './useSignConnectOnlyUser';
 export { useConnectAndSignSplitSteps } from './useConnectAndSignSplitSteps';
+export { type VerifyEmailCallback, useEmailVerificationRequest, } from './useEmailVerificationRequest';

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

@@ -28,7 +28,7 @@ require('@dynamic-labs/multi-wallet');
 var isSupportedNetwork = require('../../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
 var isProgrammableNetworkSwitchSupported = require('../../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.cjs');
 
-const useConnectAndSign = ({ shouldUpdateWallets = true } = {}) => {
+const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = true, } = {}) => {
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { captchaToken } = CaptchaContext.useCaptchaContext();
@@ -55,7 +55,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true } = {}) => {
                     setView('wait-for-email-confirmation-view');
                 }
             }
-            const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
+            const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts, shouldCallCallback);
             if (!publicWalletAddress) {
                 return;
             }

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.d.ts

@@ -3,7 +3,8 @@ type Props = {
     fetchPublicAddressOpts?: FetchPublicAddressOpts;
     walletConnector: WalletConnector;
 };
-export declare const useConnectAndSign: ({ shouldUpdateWallets }?: {
+export declare const useConnectAndSign: ({ shouldUpdateWallets, shouldCallCallback, }?: {
     shouldUpdateWallets?: boolean | undefined;
+    shouldCallCallback?: boolean | undefined;
 }) => ({ walletConnector, fetchPublicAddressOpts, }: Props) => Promise<void>;
 export {};

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

@@ -24,7 +24,7 @@ import '@dynamic-labs/multi-wallet';
 import { isSupportedNetwork } from '../../../functions/isSupportedNetwork/isSupportedNetwork.js';
 import { isProgrammableNetworkSwitchSupported } from '../../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.js';
 
-const useConnectAndSign = ({ shouldUpdateWallets = true } = {}) => {
+const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = true, } = {}) => {
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
     const { captchaToken } = useCaptchaContext();
@@ -51,7 +51,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true } = {}) => {
                     setView('wait-for-email-confirmation-view');
                 }
             }
-            const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
+            const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts, shouldCallCallback);
             if (!publicWalletAddress) {
                 return;
             }

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

@@ -19,7 +19,6 @@ export { useDefaultQrCode } from './useDefaultQrCode';
 export { useWalletItemActions } from './useWalletItemActions';
 export { usePromise } from './usePromise';
 export { useMutation } from './useMutation';
-export { useUserUpdateRequest } from './useUserUpdateRequest/useUserUpdateRequest';
 export { useColorSchemePreference } from './useColorSchemePreference';
 export { useFindSocialIcon } from './useFindSocialIcon';
 export { useIconThemeVariant } from './useIconThemeVariant';
@@ -33,3 +32,9 @@ export { useEventListener } from './useEventListener';
 export { useWalletConnectorEvent } from './useWalletConnectorEvent';
 export { useTransactionWithGasPrice } from './useTransactionWithGasPrice';
 export { useTransactionEstimatedGas } from './useTransactionEstimatedGas';
+export { useDynamicScopes } from './useDynamicScopes';
+export { useAuthenticateConnectedUser } from './useAuthenticateConnectedUser';
+export { useSocialAccounts } from './useSocialAccounts';
+export * from './useUserUpdateRequest';
+export * from './useUserDataForm';
+export * from './useOnUnmount';

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

@@ -13,15 +13,20 @@ require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 var localStorage = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
-require('../../../../shared/utils/classes/storage/localStorage.cjs');
+var localStorage$1 = require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 var useLocalStorage = require('../../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 require('../../../../shared/consts/index.cjs');
 
-const useMultiWallet = (multiWalletSettings) => {
+const useMultiWallet = (toolkitEnabled, multiWalletSettings) => {
     const isMultiWalletEnabled = multiWalletSettings !== null && multiWalletSettings !== void 0 ? multiWalletSettings : false;
     const [multiWallet, setMultiWallet] = useLocalStorage.useLocalStorage(localStorage.IS_MULTI_WALLET_ENABLED, isMultiWalletEnabled);
     React.useEffect(() => {
+        // don't overwrite toolkit stored value after the refresh
+        if (toolkitEnabled &&
+            localStorage$1.LocalStorage.getFromLS(localStorage.IS_MULTI_WALLET_ENABLED) !== undefined) {
+            return;
+        }
         if (multiWalletSettings) {
             setMultiWallet(multiWalletSettings);
         }

package/src/lib/utils/hooks/multiWallet/useMultiWallet/useMultiWallet.d.ts

@@ -1,4 +1,4 @@
-export declare const useMultiWallet: (multiWalletSettings?: boolean) => {
+export declare const useMultiWallet: (toolkitEnabled: boolean, multiWalletSettings?: boolean) => {
     multiWallet: boolean;
     setMultiWallet: (value: boolean | ((val: boolean) => boolean)) => void;
 };

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

@@ -9,15 +9,20 @@ import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import { IS_MULTI_WALLET_ENABLED } from '../../../constants/localStorage.js';
 import '../../../constants/colors.js';
-import '../../../../shared/utils/classes/storage/localStorage.js';
+import { LocalStorage } from '../../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import { useLocalStorage } from '../../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import '../../../../shared/consts/index.js';
 
-const useMultiWallet = (multiWalletSettings) => {
+const useMultiWallet = (toolkitEnabled, multiWalletSettings) => {
     const isMultiWalletEnabled = multiWalletSettings !== null && multiWalletSettings !== void 0 ? multiWalletSettings : false;
     const [multiWallet, setMultiWallet] = useLocalStorage(IS_MULTI_WALLET_ENABLED, isMultiWalletEnabled);
     useEffect(() => {
+        // don't overwrite toolkit stored value after the refresh
+        if (toolkitEnabled &&
+            LocalStorage.getFromLS(IS_MULTI_WALLET_ENABLED) !== undefined) {
+            return;
+        }
         if (multiWalletSettings) {
             setMultiWallet(multiWalletSettings);
         }

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

@@ -4,15 +4,15 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var utils = require('@dynamic-labs/utils');
 var isWalletLinked = require('../../../functions/isWalletLinked/isWalletLinked.cjs');
 var ViewContext = require('../../../../context/ViewContext/ViewContext.cjs');
-var AccountExistsContext = require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
+var errors = require('../../../constants/errors.cjs');
 
 const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showWidgetStatePopup, canSync = true, authMode, }) => {
-    const { setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setShowAuthFlow, isAuthenticated } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
-    const { existentAccountData } = AccountExistsContext.useAccountExistsContext();
     const handlePrimaryWalletNotActive = React.useCallback((connectedAddress) => {
         if (!primaryWallet)
             return;
@@ -76,23 +76,24 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
             .getConnectedAccounts()
             .then((accounts) => {
             const [connectedAddress] = accounts;
+            if (!connectedAddress) {
+                throw new utils.DynamicError('Missing wallet address', errors.MISSING_ADDRESS_ERROR);
+            }
             if (walletConnectorCore.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 === errors.MISSING_ADDRESS_ERROR) {
+                setShowAuthFlow(true);
                 setView('wallet-locked-view');
             }
         });
@@ -109,6 +110,7 @@ const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets,
         setView,
         setShowAuthFlow,
         authMode,
+        isAuthenticated,
     ]);
 };
 

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.d.ts

@@ -4,7 +4,7 @@ import { AuthModeType, MultiWalletWidgetState, Wallet } from '../../../../shared
 import { MultiWalletWidgetStateSetter } from '../useMultiWalletWidgetState';
 export type UseSyncPrimaryWalletArgs = {
     canSync?: boolean;
-    connectWallet: (walletConnector: WalletConnector, fetchPublicAddressOpts?: FetchPublicAddressOpts) => Promise<string | undefined>;
+    connectWallet: (walletConnector: WalletConnector, fetchPublicAddressOpts?: FetchPublicAddressOpts, shouldCallCallback?: boolean) => Promise<string | undefined>;
     computeConnectedStateForWallets: () => Promise<void>;
     handleLogOut: () => Promise<void>;
     multiWalletWidgetState: MultiWalletWidgetState;

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

@@ -69,7 +69,7 @@ const useAuthLayoutChecks = (walletConnector) => {
         view === 'wallet-group' ||
         view === 'pending-connect' ||
         view === 'account-exists' ||
-        view === 'merge-user-accounts';
+        (view === 'merge-user-accounts' && !user);
     const showQrCodePreHeader = view === 'qr-code' && showQrCodeMessage && !showQrCodeImage;
     return {
         isWalletListTypeView,

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

@@ -65,7 +65,7 @@ const useAuthLayoutChecks = (walletConnector) => {
         view === 'wallet-group' ||
         view === 'pending-connect' ||
         view === 'account-exists' ||
-        view === 'merge-user-accounts';
+        (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,
     ]);
 };