@dynamic-labs/sdk-react-core 3.0.0-alpha.5 → 3.0.0-alpha.51

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

@@ -24,12 +24,14 @@ import 'react-international-phone';
 import '../../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../../locale/locale.js';
+import { logVerboseTroubleshootingMessage } from '../../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../../context/WalletContext/WalletContext.js';
+import '../../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
@@ -63,73 +65,83 @@ import '../../../../views/WalletList/WalletList.js';
 import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
+import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';
-import '../../../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../../context/PasskeyContext/PasskeyContext.js';
+import '@dynamic-labs/ethereum-core';
 import '../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
-import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import '../../../../../polyfills.js';
+import '../../../../context/ErrorBoundary/ErrorBoundaryBase.js';
+import '../../../../context/ErrorBoundary/ErrorBoundaryContext.js';
+import '../../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
+import '../../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.js';
+import '../../../../context/WidgetRegistry/WidgetRegistryContextProvider.js';
+import '../../../../context/FundingContext/FundingContext.js';
+import '../../../../context/SendBalanceContext/SendBalanceContext.js';
+import '../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
+import '../../../../context/ConnectWithOtpContext/constants.js';
+import '../../../../context/ReinitializeContext/ReinitializeContextProvider.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
-import { isWalletLinked } from '../../../functions/isWalletLinked/isWalletLinked.js';
 
 const useSyncPrimaryWallet = (canSync = true) => {
-    const { setShowAuthFlow, isAuthenticated, authMode, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showLockedWalletView, showWidgetStatePopup, setSelectedWalletWithAction, } = useInternalDynamicContext();
+    const { setShowAuthFlow, authMode, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, setMultiWalletWidgetState, showLockedWalletView, secondaryWallets, setPrimaryWallet, setSelectedWalletWithAction, multiWallet, selectedWalletWithAction, user, } = useInternalDynamicContext();
     const { setView } = useViewContext();
+    const isAuthenticated = Boolean(user);
     const handlePrimaryWalletNotActive = useCallback((connectedAddress) => {
+        logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] handlePrimaryWalletNotActive', {
+            authMode,
+            connectedAddress,
+            primaryWallet: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address,
+        });
         if (!primaryWallet)
             return;
         if (authMode === 'connect-only') {
             connectWallet(primaryWallet.connector);
             return;
         }
-        const connectedWalletIsLinked = isWalletLinked(connectedAddress, [
-            primaryWallet,
-            ...secondaryWallets,
-        ]);
-        if (!connectedWalletIsLinked) {
-            // 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) {
-                setSelectedWalletWithAction({
-                    action: 'select',
-                    wallet: primaryWallet,
-                });
-                setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
-                return;
-            }
-            setPrimaryWallet(connectedSecondaryWallet.id);
-            return;
-        }
-        if (showWidgetStatePopup) {
-            // user updates wallet address in the widget
-            setShowWidgetStatePopup(false);
-            setMultiWalletWidgetState('awaiting_account_switch', 'switching_primary');
-            return;
-        }
-        // !showWidgetStatePopup - user comes back to site with different wallet address
-        const connectedWallet = secondaryWallets.find((wallet) => wallet.connected &&
-            isSameAddress(wallet.address, connectedAddress, wallet.chain));
-        if (connectedWallet) {
-            setPrimaryWallet(connectedWallet.id);
+        const connectedWalletWithSameProvider = connectedAddress &&
+            secondaryWallets.find((wallet) => wallet.connector.key === primaryWallet.connector.key &&
+                isSameAddress(wallet.address, connectedAddress, wallet.chain));
+        logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] handlePrimaryWalletNotActive', {
+            connectedWalletWithSameProvider,
+            multiWallet,
+        });
+        // If user was explicitly trying to switch to this new wallet, let it be
+        const wasExplicitWalletChange = (selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.address) === primaryWallet.address;
+        if (multiWallet &&
+            connectedWalletWithSameProvider &&
+            !wasExplicitWalletChange) {
+            setPrimaryWallet(connectedWalletWithSameProvider.id);
             return;
         }
-        setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
+        logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] handlePrimaryWalletNotActive - setSelectedWalletWithAction(primaryWallet)');
+        setSelectedWalletWithAction({
+            action: 'select',
+            wallet: primaryWallet,
+        });
+        setMultiWalletWidgetState('awaiting_account_switch', 'switching_primary');
     }, [
-        primaryWallet,
         authMode,
+        primaryWallet,
         secondaryWallets,
-        showWidgetStatePopup,
+        multiWallet,
+        selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.address,
+        setSelectedWalletWithAction,
         setMultiWalletWidgetState,
-        setPrimaryWallet,
-        setShowWidgetStatePopup,
         connectWallet,
+        setPrimaryWallet,
     ]);
     useEffect(() => {
+        logVerboseTroubleshootingMessage('[useSyncPrimaryWallet]', {
+            canSync,
+            connectedChain: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.connectedChain,
+            multiWalletWidgetState,
+            primaryWallet: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address,
+        });
         if (!canSync)
             return;
         if (!primaryWallet || multiWalletWidgetState !== 'idle')
@@ -142,6 +154,10 @@ const useSyncPrimaryWallet = (canSync = true) => {
             .getConnectedAccounts()
             .then((accounts) => {
             const [connectedAddress] = accounts;
+            logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] getConnectedAccounts', {
+                accounts,
+                connectedAddress,
+            });
             if (!connectedAddress) {
                 throw new DynamicError('Missing wallet address', MISSING_ADDRESS_ERROR);
             }
@@ -151,31 +167,32 @@ const useSyncPrimaryWallet = (canSync = true) => {
             handlePrimaryWalletNotActive(connectedAddress);
         })
             .catch((e) => {
-            const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected);
-            if (connectedSecondaryWallet) {
-                setPrimaryWallet(connectedSecondaryWallet.id);
-                return;
-            }
+            logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] getConnectedAccounts error', {
+                error: e,
+                isAuthenticated,
+            });
             // user is logged in (has valid jwt), but no wallet is connected
             if (isAuthenticated && e.code === MISSING_ADDRESS_ERROR) {
                 if (!primaryWallet.connector.isInstalledOnBrowser()) {
+                    logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] getConnectedAccounts error - not installed in browser - will log out');
                     handleLogOut();
                     return;
                 }
                 if (showLockedWalletView) {
+                    logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] getConnectedAccounts error - will show locked wallet view');
                     setShowAuthFlow(true);
                     setView('wallet-locked-view');
+                    return;
                 }
+                handlePrimaryWalletNotActive();
             }
         });
     }, [
         primaryWallet,
-        secondaryWallets,
         multiWalletWidgetState,
         setMultiWalletWidgetState,
         handlePrimaryWalletNotActive,
         handleLogOut,
-        setPrimaryWallet,
         canSync,
         setView,
         setShowAuthFlow,

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

@@ -3,6 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 require('../../../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/sdk-api-core');
@@ -18,8 +19,7 @@ require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
-require('../../../../events/dynamicEvents.cjs');
-require('../../../../../../_virtual/_tslib.cjs');
+var useDynamicEvents = require('../../events/useDynamicEvents/useDynamicEvents.cjs');
 var useConnectAndSign = require('../../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
@@ -31,10 +31,12 @@ require('react-international-phone');
 var requiresTwoStepAuthentication = require('../../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.cjs');
 require('@dynamic-labs/store');
 require('../../../../locale/locale.cjs');
+require('../../../../events/dynamicEvents.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../../context/WalletContext/WalletContext.cjs');
+require('../../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
@@ -68,43 +70,79 @@ require('../../../../views/WalletList/WalletList.cjs');
 require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
+require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
-require('../../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
 require('../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../../context/PasskeyContext/PasskeyContext.cjs');
+require('@dynamic-labs/ethereum-core');
 require('../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
-require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+require('../../../../../polyfills.cjs');
+require('../../../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
+require('../../../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
+require('../../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
+require('../../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
+require('../../../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
+require('../../../../context/FundingContext/FundingContext.cjs');
+require('../../../../context/SendBalanceContext/SendBalanceContext.cjs');
+require('../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
+require('../../../../context/ConnectWithOtpContext/constants.cjs');
+require('../../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useVerifyOnAwaitingSignature = () => {
     const { awaitingSignatureState, multiWalletWidgetState, setMultiWalletWidgetState, legacyIsVerifying, setLegacyIsVerifying, selectedWalletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
     const triggerConnectAndSign = useConnectAndSign.useConnectAndSign();
+    // this is to prevent calling runConnectAndSign multiple times
+    // due to changes in legacyIsVerifying
+    const isVerifying = React.useRef(false);
+    const runConnectAndSign = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        logger.logger.debug('runConnectAndSign', {
+            selectedWalletConnector,
+        });
+        if (!selectedWalletConnector) {
+            return;
+        }
+        isVerifying.current = true;
+        setLegacyIsVerifying(true);
+        try {
+            yield triggerConnectAndSign({
+                walletConnector: selectedWalletConnector,
+            });
+        }
+        catch (e) {
+            logger.logger.error(e);
+        }
+        setMultiWalletWidgetState('idle');
+        setLegacyIsVerifying(false);
+        isVerifying.current = false;
+    }), [
+        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key,
+        setLegacyIsVerifying,
+        setMultiWalletWidgetState,
+        triggerConnectAndSign,
+    ]);
     React.useEffect(() => {
         if (!legacyIsVerifying &&
+            !isVerifying.current &&
             multiWalletWidgetState === 'awaiting_signature' &&
             selectedWalletConnector &&
             awaitingSignatureState === 'linking_new_wallet' &&
             !requiresTwoStepAuthentication.requiresTwoStepAuthentication(selectedWalletConnector)) {
-            setLegacyIsVerifying(true);
-            triggerConnectAndSign({ walletConnector: selectedWalletConnector })
-                .catch((e) => {
-                logger.logger.error(e);
-            })
-                .finally(() => {
-                setMultiWalletWidgetState('idle');
-                setLegacyIsVerifying(false);
-            });
+            runConnectAndSign();
         }
     }, [
+        runConnectAndSign,
         awaitingSignatureState,
-        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key,
+        legacyIsVerifying,
         multiWalletWidgetState,
+        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key,
+        setLegacyIsVerifying,
         setMultiWalletWidgetState,
-        legacyIsVerifying,
     ]);
+    useDynamicEvents.useInternalDynamicEvents('triggerConnectAndSign', runConnectAndSign);
 };
 
 exports.useVerifyOnAwaitingSignature = useVerifyOnAwaitingSignature;

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

@@ -1,5 +1,6 @@
 'use client'
-import { useEffect } from 'react';
+import { __awaiter } from '../../../../../../_virtual/_tslib.js';
+import { useRef, useCallback, useEffect } from 'react';
 import '../../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../../../shared/logger.js';
@@ -14,8 +15,7 @@ import '../../../../shared/utils/classes/storage/localStorage.js';
 import '../../../../shared/utils/classes/storage/sessionStorage.js';
 import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
-import '../../../../events/dynamicEvents.js';
-import '../../../../../../_virtual/_tslib.js';
+import { useInternalDynamicEvents } from '../../events/useDynamicEvents/useDynamicEvents.js';
 import { useConnectAndSign } from '../../authenticationHooks/useConnectAndSign/useConnectAndSign.js';
 import '../../../../context/ErrorContext/ErrorContext.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
@@ -27,10 +27,12 @@ import 'react-international-phone';
 import { requiresTwoStepAuthentication } from '../../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.js';
 import '@dynamic-labs/store';
 import '../../../../locale/locale.js';
+import '../../../../events/dynamicEvents.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../../context/WalletContext/WalletContext.js';
+import '../../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
@@ -64,43 +66,79 @@ import '../../../../views/WalletList/WalletList.js';
 import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
+import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';
-import '../../../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../../context/PasskeyContext/PasskeyContext.js';
+import '@dynamic-labs/ethereum-core';
 import '../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
-import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import '../../../../../polyfills.js';
+import '../../../../context/ErrorBoundary/ErrorBoundaryBase.js';
+import '../../../../context/ErrorBoundary/ErrorBoundaryContext.js';
+import '../../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
+import '../../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.js';
+import '../../../../context/WidgetRegistry/WidgetRegistryContextProvider.js';
+import '../../../../context/FundingContext/FundingContext.js';
+import '../../../../context/SendBalanceContext/SendBalanceContext.js';
+import '../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
+import '../../../../context/ConnectWithOtpContext/constants.js';
+import '../../../../context/ReinitializeContext/ReinitializeContextProvider.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useVerifyOnAwaitingSignature = () => {
     const { awaitingSignatureState, multiWalletWidgetState, setMultiWalletWidgetState, legacyIsVerifying, setLegacyIsVerifying, selectedWalletConnector, } = useInternalDynamicContext();
     const triggerConnectAndSign = useConnectAndSign();
+    // this is to prevent calling runConnectAndSign multiple times
+    // due to changes in legacyIsVerifying
+    const isVerifying = useRef(false);
+    const runConnectAndSign = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+        logger.debug('runConnectAndSign', {
+            selectedWalletConnector,
+        });
+        if (!selectedWalletConnector) {
+            return;
+        }
+        isVerifying.current = true;
+        setLegacyIsVerifying(true);
+        try {
+            yield triggerConnectAndSign({
+                walletConnector: selectedWalletConnector,
+            });
+        }
+        catch (e) {
+            logger.error(e);
+        }
+        setMultiWalletWidgetState('idle');
+        setLegacyIsVerifying(false);
+        isVerifying.current = false;
+    }), [
+        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key,
+        setLegacyIsVerifying,
+        setMultiWalletWidgetState,
+        triggerConnectAndSign,
+    ]);
     useEffect(() => {
         if (!legacyIsVerifying &&
+            !isVerifying.current &&
             multiWalletWidgetState === 'awaiting_signature' &&
             selectedWalletConnector &&
             awaitingSignatureState === 'linking_new_wallet' &&
             !requiresTwoStepAuthentication(selectedWalletConnector)) {
-            setLegacyIsVerifying(true);
-            triggerConnectAndSign({ walletConnector: selectedWalletConnector })
-                .catch((e) => {
-                logger.error(e);
-            })
-                .finally(() => {
-                setMultiWalletWidgetState('idle');
-                setLegacyIsVerifying(false);
-            });
+            runConnectAndSign();
         }
     }, [
+        runConnectAndSign,
         awaitingSignatureState,
-        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key,
+        legacyIsVerifying,
         multiWalletWidgetState,
+        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key,
+        setLegacyIsVerifying,
         setMultiWalletWidgetState,
-        legacyIsVerifying,
     ]);
+    useInternalDynamicEvents('triggerConnectAndSign', runConnectAndSign);
 };
 
 export { useVerifyOnAwaitingSignature };

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

@@ -33,6 +33,7 @@ require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../context/WalletContext/WalletContext.cjs');
+require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
@@ -66,17 +67,28 @@ require('../../../views/WalletList/WalletList.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
+require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 var isUserLinkingWallet = require('../../../shared/utils/functions/isUserLinkingWallet/isUserLinkingWallet.cjs');
 var useDynamicLayoutData = require('../useDynamicLayoutData/useDynamicLayoutData.cjs');
 var index = require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
-require('../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
+require('@dynamic-labs/ethereum-core');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
-require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+require('../../../../polyfills.cjs');
+require('../../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
+require('../../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
+require('../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
+require('../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
+require('../../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
+require('../../../context/FundingContext/FundingContext.cjs');
+require('../../../context/SendBalanceContext/SendBalanceContext.cjs');
+require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
+require('../../../context/ConnectWithOtpContext/constants.cjs');
+require('../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useAuthLayoutChecks = () => {
@@ -129,7 +141,10 @@ const useAuthLayoutChecks = () => {
         view.type !== 'create-password-view' &&
         view.type !== 'embedded-wallet-auth-choice' &&
         view.type !== 'wallet-claim-intro' &&
-        view.type !== 'passkey-recovery-add-email';
+        view.type !== 'passkey-recovery-add-email' &&
+        view.type !== 'global-wallet-confirm' &&
+        view.type !== 'mfa-choose-device' &&
+        view.type !== 'mfa-verification';
     const showConnectedWalletProgress = isBridgeFlow &&
         (view.type === 'wallet-list' ||
             view.type === 'qr-code' ||
@@ -200,6 +215,7 @@ const useAuthLayoutChecks = () => {
         view.type === 'qr-code' ||
         view.type === 'farcaster-connect-view' ||
         view.type === 'mfa-verification' ||
+        view.type === 'mfa-secure-device-help' ||
         view.type === 'merge-user-accounts-conflicts' ||
         view.type === 'mfa-recovery' ||
         (view.type === 'merge-user-accounts-with-same-email' && !user);

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

@@ -29,6 +29,7 @@ import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../context/WalletContext/WalletContext.js';
+import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
@@ -62,17 +63,28 @@ import '../../../views/WalletList/WalletList.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
+import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import { isUserLinkingWallet } from '../../../shared/utils/functions/isUserLinkingWallet/isUserLinkingWallet.js';
 import { useDynamicLayoutData } from '../useDynamicLayoutData/useDynamicLayoutData.js';
 import { useFooterAnimationContext } from '../../../context/FooterAnimationContext/index.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
-import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
+import '@dynamic-labs/ethereum-core';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
-import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import '../../../../polyfills.js';
+import '../../../context/ErrorBoundary/ErrorBoundaryBase.js';
+import '../../../context/ErrorBoundary/ErrorBoundaryContext.js';
+import '../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
+import '../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.js';
+import '../../../context/WidgetRegistry/WidgetRegistryContextProvider.js';
+import '../../../context/FundingContext/FundingContext.js';
+import '../../../context/SendBalanceContext/SendBalanceContext.js';
+import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
+import '../../../context/ConnectWithOtpContext/constants.js';
+import '../../../context/ReinitializeContext/ReinitializeContextProvider.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useAuthLayoutChecks = () => {
@@ -125,7 +137,10 @@ const useAuthLayoutChecks = () => {
         view.type !== 'create-password-view' &&
         view.type !== 'embedded-wallet-auth-choice' &&
         view.type !== 'wallet-claim-intro' &&
-        view.type !== 'passkey-recovery-add-email';
+        view.type !== 'passkey-recovery-add-email' &&
+        view.type !== 'global-wallet-confirm' &&
+        view.type !== 'mfa-choose-device' &&
+        view.type !== 'mfa-verification';
     const showConnectedWalletProgress = isBridgeFlow &&
         (view.type === 'wallet-list' ||
             view.type === 'qr-code' ||
@@ -196,6 +211,7 @@ const useAuthLayoutChecks = () => {
         view.type === 'qr-code' ||
         view.type === 'farcaster-connect-view' ||
         view.type === 'mfa-verification' ||
+        view.type === 'mfa-secure-device-help' ||
         view.type === 'merge-user-accounts-conflicts' ||
         view.type === 'mfa-recovery' ||
         (view.type === 'merge-user-accounts-with-same-email' && !user);

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

@@ -34,6 +34,7 @@ var useSignConnectOnlyUser = require('../authenticationHooks/useSignConnectOnlyU
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../context/WalletContext/WalletContext.cjs');
+require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
@@ -67,15 +68,26 @@ require('../../../views/WalletList/WalletList.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
+require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
-require('../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
+require('@dynamic-labs/ethereum-core');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
-require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+require('../../../../polyfills.cjs');
+require('../../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
+require('../../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
+require('../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
+require('../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
+require('../../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
+require('../../../context/FundingContext/FundingContext.cjs');
+require('../../../context/SendBalanceContext/SendBalanceContext.cjs');
+require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
+require('../../../context/ConnectWithOtpContext/constants.cjs');
+require('../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useAuthenticateConnectedUser = () => {

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

@@ -30,6 +30,7 @@ import { useSignConnectOnlyUser } from '../authenticationHooks/useSignConnectOnl
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../context/WalletContext/WalletContext.js';
+import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
@@ -63,15 +64,26 @@ import '../../../views/WalletList/WalletList.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
+import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
-import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
+import '@dynamic-labs/ethereum-core';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
-import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import '../../../../polyfills.js';
+import '../../../context/ErrorBoundary/ErrorBoundaryBase.js';
+import '../../../context/ErrorBoundary/ErrorBoundaryContext.js';
+import '../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
+import '../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.js';
+import '../../../context/WidgetRegistry/WidgetRegistryContextProvider.js';
+import '../../../context/FundingContext/FundingContext.js';
+import '../../../context/SendBalanceContext/SendBalanceContext.js';
+import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
+import '../../../context/ConnectWithOtpContext/constants.js';
+import '../../../context/ReinitializeContext/ReinitializeContextProvider.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useAuthenticateConnectedUser = () => {