@dynamic-labs/sdk-react-core 0.18.0-RC.9 → 0.18.0-beta.29

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

@@ -25,11 +25,11 @@ const useConnectAndSignSplitSteps = () => {
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
     const { captchaToken } = useCaptchaContext();
-    const { connectWallet, consumeNonce, displayTermsOfService, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setCallback, } = useInternalDynamicContext();
+    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
-        displayTermsOfService,
+        displaySiweStatement,
         environmentId,
         projectSettings,
         setIsSingleWalletAccount,
@@ -40,6 +40,8 @@ const useConnectAndSignSplitSteps = () => {
     // or in Dapper
     const onlyConnectUser = ({ walletConnector, fetchPublicAddressOpts = undefined, }) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
+        // Raise verification ongoing flag
+        setIsVerificationInProgress(true);
         yield showPendingConnectView(walletConnector, setView);
         try {
             yield connectWallet(walletConnector, fetchPublicAddressOpts);
@@ -60,14 +62,20 @@ const useConnectAndSignSplitSteps = () => {
             logger.debug(err);
             setErrorMessage(err.toString());
             goToInitialView();
+            setIsVerificationInProgress(false);
             return;
         }
     });
     // This method is similar to useConnectAndSign, but it does not call showPendingConnectView
     // This is because we already called it in onlyConnectUser and now we just want to sign
     const signAlreadyConnectedUser = ({ walletConnector, fetchPublicAddressOpts = undefined, }) => __awaiter(void 0, void 0, void 0, function* () {
+        // Raise verification ongoing flag
+        setIsVerificationInProgress(true);
         try {
             const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
+            if (!publicWalletAddress) {
+                return;
+            }
             yield verifyWallet({
                 captchaToken,
                 publicWalletAddress,
@@ -78,6 +86,7 @@ const useConnectAndSignSplitSteps = () => {
             logger.debug(err);
             setErrorMessage(err.toString());
             goToInitialView();
+            setIsVerificationInProgress(false);
             return;
         }
     });

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

@@ -6,20 +6,6 @@ var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var api = require('../../../../data/api.cjs');
-var index = require('../../../functions/storeAuthToken/index.cjs');
-require('@dynamic-labs/multi-wallet');
-require('@dynamic-labs/utils');
-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('@dynamic-labs/wallet-book');
-require('../../../constants/colors.cjs');
-require('../../../../shared/utils/classes/storage/localStorage.cjs');
-require('ethers');
-require('../../../../shared/consts/index.cjs');
 var useUpdateUserProfileByJWTCallback = require('../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.cjs');
 var EmailVerificationContext = require('../../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
 
@@ -41,8 +27,7 @@ const useEmailVerificationRequest = () => {
             verificationToken,
             verificationUUID: String(verificationUUID || emailVerificationContextVerificationUUID),
         }, jwtToken);
-        updateUserProfileByJWT(verifyEmailResponse.jwt);
-        index.storeAuthToken(verifyEmailResponse.jwt);
+        yield updateUserProfileByJWT(verifyEmailResponse.jwt);
         return verifyEmailResponse;
     }), [
         emailVerificationContextVerificationUUID,

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

@@ -2,20 +2,6 @@ import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
 import { verifyEmail } from '../../../../data/api.js';
-import { storeAuthToken } from '../../../functions/storeAuthToken/index.js';
-import '@dynamic-labs/multi-wallet';
-import '@dynamic-labs/utils';
-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 '@dynamic-labs/wallet-book';
-import '../../../constants/colors.js';
-import '../../../../shared/utils/classes/storage/localStorage.js';
-import 'ethers';
-import '../../../../shared/consts/index.js';
 import { useUpdateUserProfileByJWTCallback } from '../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
 import { useEmailVerificationContext } from '../../../../context/EmailVerificationContext/EmailVerificationContext.js';
 
@@ -37,8 +23,7 @@ const useEmailVerificationRequest = () => {
             verificationToken,
             verificationUUID: String(verificationUUID || emailVerificationContextVerificationUUID),
         }, jwtToken);
-        updateUserProfileByJWT(verifyEmailResponse.jwt);
-        storeAuthToken(verifyEmailResponse.jwt);
+        yield updateUserProfileByJWT(verifyEmailResponse.jwt);
         return verifyEmailResponse;
     }), [
         emailVerificationContextVerificationUUID,

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

@@ -23,10 +23,10 @@ require('../../../../shared/consts/index.cjs');
 const useSignConnectOnlyUser = () => {
     const { setView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
-    const { connectWallet, consumeNonce, displayTermsOfService, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
-        displayTermsOfService,
+        displaySiweStatement,
         environmentId,
         projectSettings,
         setIsSingleWalletAccount,
@@ -43,6 +43,9 @@ const useSignConnectOnlyUser = () => {
             // Wallet should be already connected at this point
             // We just need to verify it
             const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
+            if (!publicWalletAddress) {
+                return;
+            }
             yield verifyWallet({
                 publicWalletAddress,
                 walletConnector,

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

@@ -19,10 +19,10 @@ import '../../../../shared/consts/index.js';
 const useSignConnectOnlyUser = () => {
     const { setView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
-    const { connectWallet, consumeNonce, displayTermsOfService, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnector, } = useInternalDynamicContext();
+    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnector, } = useInternalDynamicContext();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
-        displayTermsOfService,
+        displaySiweStatement,
         environmentId,
         projectSettings,
         setIsSingleWalletAccount,
@@ -39,6 +39,9 @@ const useSignConnectOnlyUser = () => {
             // Wallet should be already connected at this point
             // We just need to verify it
             const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
+            if (!publicWalletAddress) {
+                return;
+            }
             yield verifyWallet({
                 publicWalletAddress,
                 walletConnector,

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

@@ -28,3 +28,5 @@ export { useIsomorphicLayoutEffect } from './useIsomorphicLayoutEffect/useIsomor
 export { useTimeout } from './useTimeout/useTimeout';
 export { useInterval } from './useInterval/useInterval';
 export { useCountdown } from './useCountdown/useCountdown';
+export { useValidateSession } from './useValidateSession';
+export { useEventListener } from './useEventListener';

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

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

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

@@ -0,0 +1,16 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+
+const useMultiWallet = (multiWalletSettings) => {
+    const isMultiWalletEnabled = multiWalletSettings !== null && multiWalletSettings !== void 0 ? multiWalletSettings : false;
+    const [multiWallet, setMultiWallet] = React.useState(isMultiWalletEnabled);
+    React.useEffect(() => {
+        setMultiWallet(isMultiWalletEnabled);
+    }, [isMultiWalletEnabled]);
+    return { multiWallet, setMultiWallet };
+};
+
+exports.useMultiWallet = useMultiWallet;

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

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+export declare const useMultiWallet: (multiWalletSettings?: boolean) => {
+    multiWallet: boolean;
+    setMultiWallet: import("react").Dispatch<import("react").SetStateAction<boolean>>;
+};

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

@@ -0,0 +1,12 @@
+import { useState, useEffect } from 'react';
+
+const useMultiWallet = (multiWalletSettings) => {
+    const isMultiWalletEnabled = multiWalletSettings !== null && multiWalletSettings !== void 0 ? multiWalletSettings : false;
+    const [multiWallet, setMultiWallet] = useState(isMultiWalletEnabled);
+    useEffect(() => {
+        setMultiWallet(isMultiWalletEnabled);
+    }, [isMultiWalletEnabled]);
+    return { multiWallet, setMultiWallet };
+};
+
+export { useMultiWallet };

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

@@ -6,20 +6,29 @@ var React = require('react');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 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');
 
-const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showWidgetStatePopup, canSync = true, }) => {
+const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showWidgetStatePopup, canSync = true, authMode, }) => {
     const { setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
+    const { existentAccountData } = AccountExistsContext.useAccountExistsContext();
     const handlePrimaryWalletNotActive = React.useCallback((connectedAddress) => {
         if (!primaryWallet)
             return;
+        if (authMode === 'connect-only') {
+            connectWallet(primaryWallet.connector);
+            return;
+        }
         const connectedWalletIsLinked = isWalletLinked.isWalletLinked(connectedAddress, [
             primaryWallet,
             ...secondaryWallets,
         ]);
         if (!connectedWalletIsLinked) {
-            const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected);
+            // MM returns all connected wallets now, so we need to check if the active account
+            // is not in the same wallet as the primary wallet before automatically switching
+            // to a connected secondary wallet as it was causing an infinite loop
+            const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected && primaryWallet.connector !== wallet.connector);
             if (!connectedSecondaryWallet) {
                 setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
                 return;
@@ -45,12 +54,14 @@ const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, m
         setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
     }, [
         primaryWallet,
+        authMode,
         secondaryWallets,
         showWidgetStatePopup,
-        setShowWidgetStatePopup,
         setMultiWalletWidgetState,
         setPrimaryWallet,
         computeConnectedStateForWallets,
+        setShowWidgetStatePopup,
+        connectWallet,
     ]);
     React.useEffect(() => {
         if (!canSync)
@@ -63,7 +74,8 @@ const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, m
             return;
         primaryWallet.connector
             .getConnectedAccounts()
-            .then(([connectedAddress]) => {
+            .then((accounts) => {
+            const [connectedAddress] = accounts;
             if (walletConnectorCore.isSameAddress(connectedAddress, primaryWallet.address, primaryWallet.chain)) {
                 return;
             }
@@ -78,7 +90,11 @@ const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, m
             }
             // no wallet is connected
             setShowAuthFlow(true);
-            setView('wallet-locked-view');
+            // check needed so 'wallet-locked-view'
+            // doesn't overwrite 'account-exists' view
+            if (!existentAccountData) {
+                setView('wallet-locked-view');
+            }
         });
     }, [
         primaryWallet,
@@ -92,6 +108,7 @@ const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, m
         canSync,
         setView,
         setShowAuthFlow,
+        authMode,
     ]);
 };
 

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

@@ -1,8 +1,10 @@
 import { Dispatch, SetStateAction } from 'react';
-import { MultiWalletWidgetState, Wallet } from '../../../../shared/types';
+import { FetchPublicAddressOpts, WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { AuthModeType, MultiWalletWidgetState, Wallet } from '../../../../shared/types';
 import { MultiWalletWidgetStateSetter } from '../useMultiWalletWidgetState';
 export type UseSyncPrimaryWalletArgs = {
     canSync?: boolean;
+    connectWallet: (walletConnector: WalletConnector, fetchPublicAddressOpts?: FetchPublicAddressOpts) => Promise<string | undefined>;
     computeConnectedStateForWallets: () => Promise<void>;
     handleLogOut: () => Promise<void>;
     multiWalletWidgetState: MultiWalletWidgetState;
@@ -12,5 +14,6 @@ export type UseSyncPrimaryWalletArgs = {
     setPrimaryWallet: (walletId: string) => Promise<void>;
     setShowWidgetStatePopup: Dispatch<SetStateAction<boolean>>;
     showWidgetStatePopup: boolean;
+    authMode: AuthModeType;
 };
-export declare const useSyncPrimaryWallet: ({ computeConnectedStateForWallets, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showWidgetStatePopup, canSync, }: UseSyncPrimaryWalletArgs) => void;
+export declare const useSyncPrimaryWallet: ({ connectWallet, computeConnectedStateForWallets, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showWidgetStatePopup, canSync, authMode, }: UseSyncPrimaryWalletArgs) => void;

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

@@ -2,20 +2,29 @@ import { useCallback, useEffect } from 'react';
 import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
 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';
 
-const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showWidgetStatePopup, canSync = true, }) => {
+const useSyncPrimaryWallet = ({ connectWallet, computeConnectedStateForWallets, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showWidgetStatePopup, canSync = true, authMode, }) => {
     const { setShowAuthFlow } = useInternalDynamicContext();
     const { setView } = useViewContext();
+    const { existentAccountData } = useAccountExistsContext();
     const handlePrimaryWalletNotActive = useCallback((connectedAddress) => {
         if (!primaryWallet)
             return;
+        if (authMode === 'connect-only') {
+            connectWallet(primaryWallet.connector);
+            return;
+        }
         const connectedWalletIsLinked = isWalletLinked(connectedAddress, [
             primaryWallet,
             ...secondaryWallets,
         ]);
         if (!connectedWalletIsLinked) {
-            const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected);
+            // MM returns all connected wallets now, so we need to check if the active account
+            // is not in the same wallet as the primary wallet before automatically switching
+            // to a connected secondary wallet as it was causing an infinite loop
+            const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected && primaryWallet.connector !== wallet.connector);
             if (!connectedSecondaryWallet) {
                 setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
                 return;
@@ -41,12 +50,14 @@ const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, m
         setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
     }, [
         primaryWallet,
+        authMode,
         secondaryWallets,
         showWidgetStatePopup,
-        setShowWidgetStatePopup,
         setMultiWalletWidgetState,
         setPrimaryWallet,
         computeConnectedStateForWallets,
+        setShowWidgetStatePopup,
+        connectWallet,
     ]);
     useEffect(() => {
         if (!canSync)
@@ -59,7 +70,8 @@ const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, m
             return;
         primaryWallet.connector
             .getConnectedAccounts()
-            .then(([connectedAddress]) => {
+            .then((accounts) => {
+            const [connectedAddress] = accounts;
             if (isSameAddress(connectedAddress, primaryWallet.address, primaryWallet.chain)) {
                 return;
             }
@@ -74,7 +86,11 @@ const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, m
             }
             // no wallet is connected
             setShowAuthFlow(true);
-            setView('wallet-locked-view');
+            // check needed so 'wallet-locked-view'
+            // doesn't overwrite 'account-exists' view
+            if (!existentAccountData) {
+                setView('wallet-locked-view');
+            }
         });
     }, [
         primaryWallet,
@@ -88,6 +104,7 @@ const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, m
         canSync,
         setView,
         setShowAuthFlow,
+        authMode,
     ]);
 };
 

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

@@ -22,27 +22,26 @@ var useConnectAndSign = require('../../authenticationHooks/useConnectAndSign/use
 require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../../config/ApiEndpoint.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 
 const useVerifyOnAwaitingSignature = () => {
-    const { awaitingSignatureState, multiWalletWidgetState, setMultiWalletWidgetState, isVerifying, setIsVerifying, selectedWalletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { awaitingSignatureState, multiWalletWidgetState, setMultiWalletWidgetState, legacyIsVerifying, setLegacyIsVerifying, selectedWalletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
     const triggerConnectAndSign = useConnectAndSign.useConnectAndSign();
     React.useEffect(() => {
-        if (!isVerifying &&
+        if (!legacyIsVerifying &&
             multiWalletWidgetState === 'awaiting_signature' &&
             selectedWalletConnector &&
             awaitingSignatureState === 'linking_new_wallet' &&
             !requiresTwoStepAuthentication.requiresTwoStepAuthentication(selectedWalletConnector)) {
-            setIsVerifying(true);
+            setLegacyIsVerifying(true);
             triggerConnectAndSign({ walletConnector: selectedWalletConnector })
-                .then(() => {
-                setMultiWalletWidgetState('idle');
-                setIsVerifying(false);
-            })
                 .catch((e) => {
-                setMultiWalletWidgetState('idle');
-                setIsVerifying(false);
                 logger.logger.error(e);
+            })
+                .finally(() => {
+                setMultiWalletWidgetState('idle');
+                setLegacyIsVerifying(false);
             });
         }
     }, [
@@ -50,8 +49,7 @@ const useVerifyOnAwaitingSignature = () => {
         selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name,
         multiWalletWidgetState,
         setMultiWalletWidgetState,
-        isVerifying,
-        setIsVerifying,
+        legacyIsVerifying,
     ]);
 };
 

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

@@ -18,27 +18,26 @@ import { useConnectAndSign } from '../../authenticationHooks/useConnectAndSign/u
 import '../../../../context/ErrorContext/ErrorContext.js';
 import '../../../../config/ApiEndpoint.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
 
 const useVerifyOnAwaitingSignature = () => {
-    const { awaitingSignatureState, multiWalletWidgetState, setMultiWalletWidgetState, isVerifying, setIsVerifying, selectedWalletConnector, } = useInternalDynamicContext();
+    const { awaitingSignatureState, multiWalletWidgetState, setMultiWalletWidgetState, legacyIsVerifying, setLegacyIsVerifying, selectedWalletConnector, } = useInternalDynamicContext();
     const triggerConnectAndSign = useConnectAndSign();
     useEffect(() => {
-        if (!isVerifying &&
+        if (!legacyIsVerifying &&
             multiWalletWidgetState === 'awaiting_signature' &&
             selectedWalletConnector &&
             awaitingSignatureState === 'linking_new_wallet' &&
             !requiresTwoStepAuthentication(selectedWalletConnector)) {
-            setIsVerifying(true);
+            setLegacyIsVerifying(true);
             triggerConnectAndSign({ walletConnector: selectedWalletConnector })
-                .then(() => {
-                setMultiWalletWidgetState('idle');
-                setIsVerifying(false);
-            })
                 .catch((e) => {
-                setMultiWalletWidgetState('idle');
-                setIsVerifying(false);
                 logger.error(e);
+            })
+                .finally(() => {
+                setMultiWalletWidgetState('idle');
+                setLegacyIsVerifying(false);
             });
         }
     }, [
@@ -46,8 +45,7 @@ const useVerifyOnAwaitingSignature = () => {
         selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name,
         multiWalletWidgetState,
         setMultiWalletWidgetState,
-        isVerifying,
-        setIsVerifying,
+        legacyIsVerifying,
     ]);
 };
 

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

@@ -0,0 +1,29 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
+
+//  This is temporary workaround what should be removed after refactoring the useWalletEventListeners.
+//  https://linear.app/dynamic-labs/issue/QNTM-74/cleanup-attached-events-to-wallet-connector-in-network-not-supported
+//  Currently the events and context properties f.e. `network` are based on primaryWallet
+//  which is define after signing the message
+const useApplyWalletConnectorNetwork = ({ walletConnector }) => {
+    const { network, setNetwork } = useInternalDynamicContext.useInternalDynamicContext();
+    // Updates the contexts 'network' based on the selected wallet connector.
+    // It helps ensure that the 'network' is always in sync with the wallet's actual network,
+    // Prevents 'network' from being 'undefined'.
+    React.useEffect(() => {
+        if (walletConnector) {
+            walletConnector.getNetwork().then((walletConnectorNetwork) => {
+                if (network !== walletConnectorNetwork) {
+                    setNetwork(walletConnectorNetwork);
+                }
+            });
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [network, walletConnector]);
+};
+
+exports.useApplyWalletConnectorNetwork = useApplyWalletConnectorNetwork;

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

@@ -0,0 +1,5 @@
+import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+export type Props = {
+    walletConnector?: WalletConnector | null;
+};
+export declare const useApplyWalletConnectorNetwork: ({ walletConnector }: Props) => void;

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

@@ -0,0 +1,25 @@
+import { useEffect } from 'react';
+import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
+
+//  This is temporary workaround what should be removed after refactoring the useWalletEventListeners.
+//  https://linear.app/dynamic-labs/issue/QNTM-74/cleanup-attached-events-to-wallet-connector-in-network-not-supported
+//  Currently the events and context properties f.e. `network` are based on primaryWallet
+//  which is define after signing the message
+const useApplyWalletConnectorNetwork = ({ walletConnector }) => {
+    const { network, setNetwork } = useInternalDynamicContext();
+    // Updates the contexts 'network' based on the selected wallet connector.
+    // It helps ensure that the 'network' is always in sync with the wallet's actual network,
+    // Prevents 'network' from being 'undefined'.
+    useEffect(() => {
+        if (walletConnector) {
+            walletConnector.getNetwork().then((walletConnectorNetwork) => {
+                if (network !== walletConnectorNetwork) {
+                    setNetwork(walletConnectorNetwork);
+                }
+            });
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [network, walletConnector]);
+};
+
+export { useApplyWalletConnectorNetwork };

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

@@ -11,7 +11,7 @@ var getDynamicLayoutData = require('../../functions/getDynamicLayoutData/getDyna
 
 const useAuthLayoutChecks = (walletConnector) => {
     const { view } = ViewContext.useViewContext();
-    const { user, privacyPolicyUrl, termsOfServiceUrl, isBridgeFlow } = useInternalDynamicContext.useInternalDynamicContext();
+    const { user, customPrivacyPolicy, customTermsOfServices, privacyPolicyUrl, termsOfServiceUrl, isBridgeFlow, } = useInternalDynamicContext.useInternalDynamicContext();
     const { showQrCodeMessage, showQrCodeImage } = QrCodeContext.useQrCodeContext();
     const { mockedSDK } = MockContext.useMockContext();
     const { helpHeaderData } = getDynamicLayoutData.getDynamicLayoutData({ view });
@@ -34,23 +34,29 @@ const useAuthLayoutChecks = (walletConnector) => {
         view !== 'verify-email' &&
         view !== 'network-not-supported' &&
         view !== 'wallet-locked-view' &&
+        view !== 'gate-blocked-wallet' &&
         view !== 'email-wallet-otp-verification-view' &&
         view !== 'bridge-welcome' &&
-        view !== 'bridge-summary';
+        view !== 'bridge-summary' &&
+        view !== 'bridge-next-wallet-connection';
     const showConnectedWalletProgress = isBridgeFlow &&
         (view === 'wallet-list' ||
             view === 'qr-code' ||
             view === 'wallet-connect-mobile-wallets-list' ||
             view === 'pending-connect' ||
             view === 'pending-signature' ||
-            view === 'pending-signature-without-back-button');
+            view === 'pending-signature-without-back-button' ||
+            view === 'bridge-next-wallet-connection' ||
+            view === 'bridge-summary');
     const showToSFooter = Boolean(!isUserLinkingWallet.isUserLinkingWallet(user, view, mockedSDK) &&
         (view === 'wallet-list' ||
             view === 'wallet-connect-mobile-wallets-list' ||
             // Don't show empty footer on login-with-email-or-wallet-full-wallet-list
             (view === 'login-with-email-or-wallet' &&
-                termsOfServiceUrl &&
-                privacyPolicyUrl) ||
+                (termsOfServiceUrl ||
+                    privacyPolicyUrl ||
+                    customPrivacyPolicy ||
+                    customTermsOfServices)) ||
             view === 'login-with-email-or-wallet-full-wallet-list'));
     const showCloseButton = view !== 'login-with-email-or-wallet-full-wallet-list' &&
         view !== 'login-with-email-verification';
@@ -61,7 +67,8 @@ const useAuthLayoutChecks = (walletConnector) => {
         view === 'login-with-email-verification' ||
         view === 'login-with-email-or-wallet-full-wallet-list' ||
         view === 'wallet-group' ||
-        view === 'pending-connect';
+        view === 'pending-connect' ||
+        view === 'account-exists';
     const showQrCodePreHeader = view === 'qr-code' && showQrCodeMessage && !showQrCodeImage;
     return {
         isWalletListTypeView,