@dynamic-labs/sdk-react-core 2.2.7 → 2.2.9

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

@@ -7,9 +7,10 @@ var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var constants = require('./constants.cjs');
 
 const isMultiAssetSupportedNetwork = (walletConnector, network) => {
-    const isNetworkMultiAssetSupported = (walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain) === sdkApiCore.ChainEnum.Evm &&
-        typeof network === 'number' &&
-        constants.MULTI_ASSET_SUPPORTED_NETWORKS.includes(network);
+    const isNetworkMultiAssetSupported = (walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain) === sdkApiCore.ChainEnum.Sol ||
+        ((walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain) === sdkApiCore.ChainEnum.Evm &&
+            typeof network === 'number' &&
+            constants.MULTI_ASSET_SUPPORTED_NETWORKS.includes(network));
     return Boolean(isNetworkMultiAssetSupported);
 };
 

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

@@ -3,9 +3,10 @@ import { ChainEnum } from '@dynamic-labs/sdk-api-core';
 import { MULTI_ASSET_SUPPORTED_NETWORKS } from './constants.js';
 
 const isMultiAssetSupportedNetwork = (walletConnector, network) => {
-    const isNetworkMultiAssetSupported = (walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain) === ChainEnum.Evm &&
-        typeof network === 'number' &&
-        MULTI_ASSET_SUPPORTED_NETWORKS.includes(network);
+    const isNetworkMultiAssetSupported = (walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain) === ChainEnum.Sol ||
+        ((walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain) === ChainEnum.Evm &&
+            typeof network === 'number' &&
+            MULTI_ASSET_SUPPORTED_NETWORKS.includes(network));
     return Boolean(isNetworkMultiAssetSupported);
 };
 

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

@@ -5,12 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var reactInternationalPhone = require('react-international-phone');
 
-/** Whether phone number length matches the expectation for this country */
-const validatePhoneLength = (phone, country) => reactInternationalPhone.removeDialCode({ dialCode: country.dialCode, phone }).length ===
-    reactInternationalPhone.getActiveFormattingMask({
-        country,
-        disableFormatting: true,
-        phone,
-    }).length;
+/** Whether phone number is not empty */
+const validatePhoneLength = (phone, country) => reactInternationalPhone.removeDialCode({ dialCode: country.dialCode, phone }).length > 0;
 
 exports.validatePhoneLength = validatePhoneLength;

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

@@ -1,3 +1,3 @@
 import { ParsedCountry } from 'react-international-phone';
-/** Whether phone number length matches the expectation for this country */
+/** Whether phone number is not empty */
 export declare const validatePhoneLength: (phone: string, country: ParsedCountry) => boolean;

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

@@ -1,12 +1,7 @@
 'use client'
-import { removeDialCode, getActiveFormattingMask } from 'react-international-phone';
+import { removeDialCode } from 'react-international-phone';
 
-/** Whether phone number length matches the expectation for this country */
-const validatePhoneLength = (phone, country) => removeDialCode({ dialCode: country.dialCode, phone }).length ===
-    getActiveFormattingMask({
-        country,
-        disableFormatting: true,
-        phone,
-    }).length;
+/** Whether phone number is not empty */
+const validatePhoneLength = (phone, country) => removeDialCode({ dialCode: country.dialCode, phone }).length > 0;
 
 export { validatePhoneLength };

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

@@ -29,6 +29,7 @@ require('viem/chains');
 require('../../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../../locale/locale.cjs');
+var logVerboseTroubleshootingMessage = require('../../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -78,63 +79,57 @@ require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
-var isWalletLinked = require('../../../functions/isWalletLinked/isWalletLinked.cjs');
 
 const useSyncPrimaryWallet = (canSync = true) => {
-    const { setShowAuthFlow, isAuthenticated, authMode, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showLockedWalletView, showWidgetStatePopup, setSelectedWalletWithAction, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setShowAuthFlow, isAuthenticated, authMode, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, setMultiWalletWidgetState, showLockedWalletView, secondaryWallets, setPrimaryWallet, setSelectedWalletWithAction, multiWallet, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const handlePrimaryWalletNotActive = React.useCallback((connectedAddress) => {
+        logVerboseTroubleshootingMessage.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.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 &&
-            walletConnectorCore.isSameAddress(wallet.address, connectedAddress, wallet.chain));
-        if (connectedWallet) {
-            setPrimaryWallet(connectedWallet.id);
+        const connectedWalletWithSameProvider = connectedAddress &&
+            secondaryWallets.find((wallet) => wallet.connected &&
+                wallet.connector.key === primaryWallet.connector.key &&
+                walletConnectorCore.isSameAddress(wallet.address, connectedAddress, wallet.chain));
+        logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] handlePrimaryWalletNotActive', {
+            connectedWalletWithSameProvider,
+            multiWallet,
+        });
+        if (multiWallet && connectedWalletWithSameProvider) {
+            setPrimaryWallet(connectedWalletWithSameProvider.id);
             return;
         }
-        setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
+        logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] handlePrimaryWalletNotActive - setSelectedWalletWithAction(primaryWallet)');
+        setSelectedWalletWithAction({
+            action: 'select',
+            wallet: primaryWallet,
+        });
+        setMultiWalletWidgetState('awaiting_account_switch', 'switching_primary');
     }, [
-        primaryWallet,
         authMode,
+        primaryWallet,
         secondaryWallets,
-        showWidgetStatePopup,
+        multiWallet,
+        setSelectedWalletWithAction,
         setMultiWalletWidgetState,
-        setPrimaryWallet,
-        setShowWidgetStatePopup,
         connectWallet,
+        setPrimaryWallet,
     ]);
     React.useEffect(() => {
+        logVerboseTroubleshootingMessage.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')
@@ -147,6 +142,10 @@ const useSyncPrimaryWallet = (canSync = true) => {
             .getConnectedAccounts()
             .then((accounts) => {
             const [connectedAddress] = accounts;
+            logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] getConnectedAccounts', {
+                accounts,
+                connectedAddress,
+            });
             if (!connectedAddress) {
                 throw new utils.DynamicError('Missing wallet address', errors.MISSING_ADDRESS_ERROR);
             }
@@ -156,31 +155,32 @@ const useSyncPrimaryWallet = (canSync = true) => {
             handlePrimaryWalletNotActive(connectedAddress);
         })
             .catch((e) => {
-            const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected);
-            if (connectedSecondaryWallet) {
-                setPrimaryWallet(connectedSecondaryWallet.id);
-                return;
-            }
+            logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] getConnectedAccounts error', {
+                error: e,
+                isAuthenticated,
+            });
             // user is logged in (has valid jwt), but no wallet is connected
             if (isAuthenticated && e.code === errors.MISSING_ADDRESS_ERROR) {
                 if (!primaryWallet.connector.isInstalledOnBrowser()) {
+                    logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] getConnectedAccounts error - not installed in browser - will log out');
                     handleLogOut();
                     return;
                 }
                 if (showLockedWalletView) {
+                    logVerboseTroubleshootingMessage.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/useSyncPrimaryWallet/useSyncPrimaryWallet.js

@@ -25,6 +25,7 @@ import 'viem/chains';
 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';
@@ -74,63 +75,57 @@ import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.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, isAuthenticated, authMode, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, setMultiWalletWidgetState, showLockedWalletView, secondaryWallets, setPrimaryWallet, setSelectedWalletWithAction, multiWallet, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     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.connected &&
+                wallet.connector.key === primaryWallet.connector.key &&
+                isSameAddress(wallet.address, connectedAddress, wallet.chain));
+        logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] handlePrimaryWalletNotActive', {
+            connectedWalletWithSameProvider,
+            multiWallet,
+        });
+        if (multiWallet && connectedWalletWithSameProvider) {
+            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,
+        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')
@@ -143,6 +138,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);
             }
@@ -152,31 +151,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/useNetworkNotSupported/useNetworkNotSupported.cjs

@@ -3,48 +3,48 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var React = require('react');
-var useWalletConnectorNetwork = require('../useWalletConnectorNetwork/useWalletConnectorNetwork.cjs');
-require('@dynamic-labs/wallet-connector-core');
+require('react');
+require('../../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/sdk-api-core');
-require('../../constants/values.cjs');
-require('@dynamic-labs/utils');
-require('../../../../../_virtual/_tslib.cjs');
-require('@dynamic-labs/multi-wallet');
 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('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
+require('../../../events/dynamicEvents.cjs');
+require('../../../../../_virtual/_tslib.cjs');
+var useConnectAndSign = require('../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
+require('../../../context/ErrorContext/ErrorContext.cjs');
+require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
+require('../../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 var isSupportedNetwork = require('../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
 require('viem');
 require('viem/chains');
-require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
-var useConnectAndSign = require('../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
-require('../../../context/DynamicContext/DynamicContext.cjs');
-require('../../../events/dynamicEvents.cjs');
+require('../../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../context/WalletContext/WalletContext.cjs');
-require('../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
-require('../../../context/VerificationContext/VerificationContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
-require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../../context/MockContext/MockContext.cjs');
 require('../../../views/CollectUserDataView/useFields.cjs');
 require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
-require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
-require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
@@ -67,7 +67,6 @@ require('qrcode');
 require('formik');
 require('../../../views/WalletList/WalletList.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
-require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../../context/FooterAnimationContext/index.cjs');
@@ -79,38 +78,40 @@ require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWi
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+var useWalletConnectorNetwork = require('../useWalletConnectorNetwork/useWalletConnectorNetwork.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useNetworkNotSupported = () => {
-    const { selectedWalletConnector: walletConnector, setShowAuthFlow, bridgeChainsToConnect, bridgeOnboardingCompleted, isBridgeFlow, } = useInternalDynamicContext.useInternalDynamicContext();
-    const { network: walletConnectorNetwork } = useWalletConnectorNetwork.useWalletConnectorNetwork(walletConnector);
+    const { selectedWalletConnector: walletConnector, setShowAuthFlow, bridgeChainsToConnect, bridgeOnboardingCompleted, isBridgeFlow, user, authMode, } = useInternalDynamicContext.useInternalDynamicContext();
     const finishConnectAndSign = useConnectAndSign.useConnectAndSign({
         shouldCallCallback: false,
         shouldUpdateWallets: Boolean(bridgeChainsToConnect === null || bridgeChainsToConnect === void 0 ? void 0 : bridgeChainsToConnect.length),
     });
-    // Finishes auth flow when wallet switches to proper network
-    React.useEffect(() => {
-        if (!isSupportedNetwork.isSupportedNetwork({ network: walletConnectorNetwork, walletConnector })) {
-            return;
-        }
-        finishConnectAndSign({
-            walletConnector: walletConnector,
-        });
-        // we're checking for bridgeChainsToConnect because in some scenarios,
-        // bridgeOnboardingCompleted might have not been set yet
-        if (!isBridgeFlow ||
-            bridgeOnboardingCompleted ||
-            !(bridgeChainsToConnect === null || bridgeChainsToConnect === void 0 ? void 0 : bridgeChainsToConnect.length)) {
-            setShowAuthFlow(false);
-        }
-    }, [
-        isBridgeFlow,
-        walletConnectorNetwork,
-        setShowAuthFlow,
-        bridgeOnboardingCompleted,
-        finishConnectAndSign,
-        bridgeChainsToConnect,
-    ]);
+    const { network: walletConnectorNetwork } = useWalletConnectorNetwork.useWalletConnectorNetwork(walletConnector, {
+        onChange: (walletConnectorNetwork) => {
+            if (!isSupportedNetwork.isSupportedNetwork({
+                network: walletConnectorNetwork,
+                walletConnector,
+            })) {
+                return;
+            }
+            finishConnectAndSign({
+                walletConnector: walletConnector,
+            }).then(() => {
+                // if user still has to do onboarding, we should not hide the auth flow
+                if (!user && authMode === 'connect-and-sign') {
+                    return;
+                }
+                // we're checking for bridgeChainsToConnect because in some scenarios,
+                // bridgeOnboardingCompleted might have not been set yet
+                if (!isBridgeFlow ||
+                    bridgeOnboardingCompleted ||
+                    !(bridgeChainsToConnect === null || bridgeChainsToConnect === void 0 ? void 0 : bridgeChainsToConnect.length)) {
+                    setShowAuthFlow(false);
+                }
+            });
+        },
+    });
     return { currentNetwork: walletConnectorNetwork };
 };