@dynamic-labs/sdk-react-core 1.4.1 → 1.4.3

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

@@ -72,11 +72,11 @@ require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCa
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useHandleWalletsToConnect = () => {
-    const { bridgeChainsToConnect, setBridgeChainsToConnect, setShowAuthFlow, setIsFullyConnected, isFullyConnected, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { bridgeChainsToConnect, setShowAuthFlow, bridgeOnboardingCompleted, setBridgeOnboardingCompleted, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const handleWalletsToConnect = ({ walletConnector, }) => {
         if (!bridgeChainsToConnect) {
-            setIsFullyConnected(true);
+            setBridgeOnboardingCompleted(true);
             setShowAuthFlow(false);
             return;
         }
@@ -90,11 +90,10 @@ const useHandleWalletsToConnect = () => {
             return goToInitialView();
         }
         const restOfWallets = bridgeChainsToConnect.filter((wallet) => wallet.chain !== (walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain));
-        setBridgeChainsToConnect(restOfWallets);
         const allWalletsConnected = restOfWallets.length === 0;
         if (allWalletsConnected) {
-            if (!isFullyConnected) {
-                setIsFullyConnected(true);
+            if (!bridgeOnboardingCompleted) {
+                setBridgeOnboardingCompleted(true);
                 setView('bridge-summary');
             }
             else {

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

@@ -68,11 +68,11 @@ import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCar
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useHandleWalletsToConnect = () => {
-    const { bridgeChainsToConnect, setBridgeChainsToConnect, setShowAuthFlow, setIsFullyConnected, isFullyConnected, } = useInternalDynamicContext();
+    const { bridgeChainsToConnect, setShowAuthFlow, bridgeOnboardingCompleted, setBridgeOnboardingCompleted, } = useInternalDynamicContext();
     const { setView, goToInitialView } = useViewContext();
     const handleWalletsToConnect = ({ walletConnector, }) => {
         if (!bridgeChainsToConnect) {
-            setIsFullyConnected(true);
+            setBridgeOnboardingCompleted(true);
             setShowAuthFlow(false);
             return;
         }
@@ -86,11 +86,10 @@ const useHandleWalletsToConnect = () => {
             return goToInitialView();
         }
         const restOfWallets = bridgeChainsToConnect.filter((wallet) => wallet.chain !== (walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain));
-        setBridgeChainsToConnect(restOfWallets);
         const allWalletsConnected = restOfWallets.length === 0;
         if (allWalletsConnected) {
-            if (!isFullyConnected) {
-                setIsFullyConnected(true);
+            if (!bridgeOnboardingCompleted) {
+                setBridgeOnboardingCompleted(true);
                 setView('bridge-summary');
             }
             else {

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

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

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

@@ -0,0 +1,104 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+var useWalletConnectorNetwork = require('../useWalletConnectorNetwork/useWalletConnectorNetwork.cjs');
+require('@dynamic-labs/wallet-connector-core');
+require('@dynamic-labs/sdk-api');
+require('../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+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('viem');
+require('@dynamic-labs/utils');
+require('../../../shared/consts/index.cjs');
+require('../../../../../_virtual/_tslib.cjs');
+require('@dynamic-labs/multi-wallet');
+var isSupportedNetwork = require('../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
+require('viem/chains');
+var useConnectAndSign = require('../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
+require('../../../context/DynamicContext/DynamicContext.cjs');
+require('../../../events/dynamicEvents.cjs');
+require('react-dom');
+require('../../../config/ApiEndpoint.cjs');
+require('../../../context/ThemeContext/ThemeContext.cjs');
+require('@dynamic-labs/types');
+require('../../../context/ErrorContext/ErrorContext.cjs');
+require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('yup');
+require('react-i18next');
+require('../../../context/MockContext/MockContext.cjs');
+require('../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
+require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('@dynamic-labs/rpc-providers');
+require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
+require('../../../components/Alert/Alert.cjs');
+require('../../../components/ShadowDOM/ShadowDOM.cjs');
+require('../../../components/IconButton/IconButton.cjs');
+require('../../../components/InlineWidget/InlineWidget.cjs');
+require('../../../components/IsBrowser/IsBrowser.cjs');
+require('../../../components/MenuList/Dropdown/Dropdown.cjs');
+require('../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
+require('../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
+require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
+require('../../../components/Popper/Popper/Popper.cjs');
+require('../../../components/Popper/PopperContext/PopperContext.cjs');
+require('react-focus-lock');
+require('qrcode');
+require('formik');
+require('i18next');
+require('../../../components/OverlayCard/OverlayCard.context.cjs');
+require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
+require('../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../views/WalletList/WalletList.cjs');
+require('../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
+require('@hcaptcha/react-hcaptcha');
+require('../../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../../context/LoadingContext/LoadingContext.cjs');
+require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
+require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
+require('../../../context/FooterAnimationContext/index.cjs');
+require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
+require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
+require('../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.cjs');
+require('@dynamic-labs/viem-utils');
+require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../useTransactionWithGasPrice/useTransactionWithGasPrice.cjs');
+require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
+
+const useNetworkNotSupported = () => {
+    const { selectedWalletConnector: walletConnector, setShowAuthFlow, bridgeChainsToConnect, bridgeOnboardingCompleted, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { network: walletConnectorNetwork } = useWalletConnectorNetwork.useWalletConnectorNetwork(walletConnector);
+    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,
+        });
+        // there are two scenarios here, one in not connected state and the other one in connected state.
+        // previously we were calling setShowAuthFlow(false) in useHandleWalletsToConnect.
+        // now, we don't call it in network-not-supported view, so we need to handle that scenario and close modal here
+        // this should be gone, once we're done with the useConnectAndSign hook refactor.
+        // TODO: https://linear.app/dynamic-labs/issue/QNTM-117/break-useconnectandsign-hook-to-small-parts
+        if (bridgeOnboardingCompleted) {
+            setShowAuthFlow(false);
+        }
+    }, [walletConnectorNetwork, setShowAuthFlow, bridgeOnboardingCompleted]);
+    return { currentNetwork: walletConnectorNetwork };
+};
+
+exports.useNetworkNotSupported = useNetworkNotSupported;

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

@@ -0,0 +1,3 @@
+export declare const useNetworkNotSupported: () => {
+    currentNetwork: string | number | undefined;
+};

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

@@ -0,0 +1,100 @@
+import { useEffect } from 'react';
+import { useWalletConnectorNetwork } from '../useWalletConnectorNetwork/useWalletConnectorNetwork.js';
+import '@dynamic-labs/wallet-connector-core';
+import '@dynamic-labs/sdk-api';
+import '../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/wallet-book';
+import '../../constants/colors.js';
+import '../../constants/values.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
+import 'viem';
+import '@dynamic-labs/utils';
+import '../../../shared/consts/index.js';
+import '../../../../../_virtual/_tslib.js';
+import '@dynamic-labs/multi-wallet';
+import { isSupportedNetwork } from '../../functions/isSupportedNetwork/isSupportedNetwork.js';
+import 'viem/chains';
+import { useConnectAndSign } from '../authenticationHooks/useConnectAndSign/useConnectAndSign.js';
+import '../../../context/DynamicContext/DynamicContext.js';
+import '../../../events/dynamicEvents.js';
+import 'react-dom';
+import '../../../config/ApiEndpoint.js';
+import '../../../context/ThemeContext/ThemeContext.js';
+import '@dynamic-labs/types';
+import '../../../context/ErrorContext/ErrorContext.js';
+import '../../../context/AccountExistsContext/AccountExistsContext.js';
+import 'yup';
+import 'react-i18next';
+import '../../../context/MockContext/MockContext.js';
+import '../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '@dynamic-labs/rpc-providers';
+import '../../../context/UserWalletsContext/UserWalletsContext.js';
+import '../../../components/Alert/Alert.js';
+import '../../../components/ShadowDOM/ShadowDOM.js';
+import '../../../components/IconButton/IconButton.js';
+import '../../../components/InlineWidget/InlineWidget.js';
+import '../../../components/IsBrowser/IsBrowser.js';
+import '../../../components/MenuList/Dropdown/Dropdown.js';
+import '../../../components/Transition/ZoomTransition/ZoomTransition.js';
+import '../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
+import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
+import '../../../components/Popper/Popper/Popper.js';
+import '../../../components/Popper/PopperContext/PopperContext.js';
+import 'react-focus-lock';
+import 'qrcode';
+import 'formik';
+import 'i18next';
+import '../../../components/OverlayCard/OverlayCard.context.js';
+import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
+import '../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../views/WalletList/WalletList.js';
+import '../../../context/EmailVerificationContext/EmailVerificationContext.js';
+import '@hcaptcha/react-hcaptcha';
+import '../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../context/LoadingContext/LoadingContext.js';
+import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
+import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
+import '../../../context/FooterAnimationContext/index.js';
+import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
+import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
+import '../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.js';
+import '@dynamic-labs/viem-utils';
+import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
+import '../useTransactionWithGasPrice/useTransactionWithGasPrice.js';
+import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
+
+const useNetworkNotSupported = () => {
+    const { selectedWalletConnector: walletConnector, setShowAuthFlow, bridgeChainsToConnect, bridgeOnboardingCompleted, } = useInternalDynamicContext();
+    const { network: walletConnectorNetwork } = useWalletConnectorNetwork(walletConnector);
+    const finishConnectAndSign = useConnectAndSign({
+        shouldCallCallback: false,
+        shouldUpdateWallets: Boolean(bridgeChainsToConnect === null || bridgeChainsToConnect === void 0 ? void 0 : bridgeChainsToConnect.length),
+    });
+    // Finishes auth flow when wallet switches to proper network
+    useEffect(() => {
+        if (!isSupportedNetwork({ network: walletConnectorNetwork, walletConnector })) {
+            return;
+        }
+        finishConnectAndSign({
+            walletConnector: walletConnector,
+        });
+        // there are two scenarios here, one in not connected state and the other one in connected state.
+        // previously we were calling setShowAuthFlow(false) in useHandleWalletsToConnect.
+        // now, we don't call it in network-not-supported view, so we need to handle that scenario and close modal here
+        // this should be gone, once we're done with the useConnectAndSign hook refactor.
+        // TODO: https://linear.app/dynamic-labs/issue/QNTM-117/break-useconnectandsign-hook-to-small-parts
+        if (bridgeOnboardingCompleted) {
+            setShowAuthFlow(false);
+        }
+    }, [walletConnectorNetwork, setShowAuthFlow, bridgeOnboardingCompleted]);
+    return { currentNetwork: walletConnectorNetwork };
+};
+
+export { useNetworkNotSupported };

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

@@ -69,6 +69,11 @@ const useUserDataForm = ({ onSubmit, onError, userProfile, shouldEnforcePolicies
             if (e instanceof utils.EmailAlreadyExistsError) {
                 formikHelper.setErrors({ email: 'Email already exists' });
             }
+            else if (e instanceof utils.TooManyEmailVerificationsError) {
+                formikHelper.setErrors({
+                    email: 'Too many email verification attempts.',
+                });
+            }
             else if (e instanceof utils.UsernameAlreadyExistsError) {
                 formikHelper.setErrors({ username: 'Username already exists' });
             }

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

@@ -1,7 +1,7 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useMemo, useCallback } from 'react';
 import { object } from 'yup';
-import { DynamicError, EmailAlreadyExistsError, UsernameAlreadyExistsError } from '@dynamic-labs/utils';
+import { DynamicError, EmailAlreadyExistsError, TooManyEmailVerificationsError, UsernameAlreadyExistsError } from '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -65,6 +65,11 @@ const useUserDataForm = ({ onSubmit, onError, userProfile, shouldEnforcePolicies
             if (e instanceof EmailAlreadyExistsError) {
                 formikHelper.setErrors({ email: 'Email already exists' });
             }
+            else if (e instanceof TooManyEmailVerificationsError) {
+                formikHelper.setErrors({
+                    email: 'Too many email verification attempts.',
+                });
+            }
             else if (e instanceof UsernameAlreadyExistsError) {
                 formikHelper.setErrors({ username: 'Username already exists' });
             }

package/src/lib/views/NetworkNotSupported/NetworkNotSupported.cjs

@@ -22,15 +22,14 @@ require('../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../shared/consts/index.cjs');
 var useInternalDynamicContext = require('../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
-var useConnectAndSign = require('../../utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
+require('../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../context/ErrorContext/ErrorContext.cjs');
-require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
-require('../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/multi-wallet');
 var isSupportedNetwork = require('../../utils/functions/isSupportedNetwork/isSupportedNetwork.cjs');
 require('viem/chains');
-require('../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../config/ApiEndpoint.cjs');
 require('../../context/EmailVerificationContext/EmailVerificationContext.cjs');
 require('react-dom');
 require('../../context/ThemeContext/ThemeContext.cjs');
@@ -66,7 +65,7 @@ require('@dynamic-labs/viem-utils');
 require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
-var useWalletConnectorNetwork = require('../../utils/hooks/useWalletConnectorNetwork/useWalletConnectorNetwork.cjs');
+var useNetworkNotSupported = require('../../utils/hooks/useNetworkNotSupported/useNetworkNotSupported.cjs');
 require('../../components/InlineWidget/InlineWidget.cjs');
 require('../../components/IsBrowser/IsBrowser.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
@@ -81,31 +80,10 @@ var SelectNetworkButton = require('../../components/SelectNetworkButton/SelectNe
 require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 
 const NetworkNotSupported = () => {
-    const { onboardingImageUrl, selectedWalletConnector: walletConnector, isFullyConnected, setShowAuthFlow, bridgeChainsToConnect, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { onboardingImageUrl, selectedWalletConnector: walletConnector } = useInternalDynamicContext.useInternalDynamicContext();
     const { t } = reactI18next.useTranslation();
-    const { network: walletConnectorNetwork } = useWalletConnectorNetwork.useWalletConnectorNetwork(walletConnector);
-    const finishConnectAndSign = useConnectAndSign.useConnectAndSign({
-        shouldCallCallback: false,
-        shouldUpdateWallets: !isFullyConnected ||
-            (isFullyConnected && Boolean(bridgeChainsToConnect === null || bridgeChainsToConnect === void 0 ? void 0 : bridgeChainsToConnect.length)),
-    });
+    const { currentNetwork } = useNetworkNotSupported.useNetworkNotSupported();
     const [isNetworkPickerOpen, setIsNetworkPickerOpen] = React.useState(false);
-    // Finishes auth flow when wallet switches to proper network
-    React.useEffect(() => {
-        if (isSupportedNetwork.isSupportedNetwork({ network: walletConnectorNetwork, walletConnector })) {
-            finishConnectAndSign({
-                walletConnector: walletConnector,
-            });
-            // there are two scenarios here, one in not connected state and the other one in connected state.
-            // previously we were calling setShowAuthFlow(false) in useHandleWalletsToConnect.
-            // now, we don't call it in network-not-supported view, so we need to handle that scenario and close modal here
-            // this should be gone, once we're done with the useConnectAndSign hook refactor.
-            // TODO: https://linear.app/dynamic-labs/issue/QNTM-117/break-useconnectandsign-hook-to-small-parts
-            if (isFullyConnected) {
-                setShowAuthFlow(false);
-            }
-        }
-    }, [walletConnectorNetwork, setShowAuthFlow, isFullyConnected]);
     if (!walletConnector) {
         return null;
     }
@@ -121,12 +99,12 @@ const NetworkNotSupported = () => {
     });
     const evmNetworks = walletConnector.evmNetworks || [];
     const _isSupportedNetwork = isSupportedNetwork.isSupportedNetwork({
-        network: walletConnectorNetwork,
+        network: currentNetwork,
         walletConnector,
     });
     return (jsxRuntime.jsxs("div", { className: 'network-not-supported', "data-testid": 'network-not-supported', children: [onboardingImageUrl && (jsxRuntime.jsx("img", { className: 'network-not-supported__main-img', src: onboardingImageUrl, alt: 'onboarding' })), !_isSupportedNetwork && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, { variant: 'info', withIcon: false, className: 'network-not-supported__error--not-supported', copykey: 'dyn_network_not_supported.warning_message', children: t('dyn_network_not_supported.warning_message') })), jsxRuntime.jsxs("div", { className: classNames.classNames('network-not-supported__content-container', {
                     'network-not-supported__content-container--error': !_isSupportedNetwork,
-                }), children: [jsxRuntime.jsx("div", { className: 'network-not-supported__img-container', children: jsxRuntime.jsx(walletBook.WalletIcon, { style: { height: 64, width: 64 }, walletKey: walletConnector.key }) }), jsxRuntime.jsx(UserAddress.UserAddress, { walletConnector: walletConnector }), jsxRuntime.jsx("div", { className: 'network-not-supported__network-container', children: evmNetworks.length > 1 && (jsxRuntime.jsx(NetworkPicker.NetworkPicker, { currentNetwork: walletConnectorNetwork, evmNetworks: evmNetworks, connector: walletConnector, isNetworkPickerOpen: isNetworkPickerOpen, setIsNetworkPickerOpen: setIsNetworkPickerOpen, showNetworkName: true, buttonClassName: 'network-not-supported__network-picker-button', mainClassName: 'network-not-supported__network-picker' })) }), jsxRuntime.jsx("div", { className: 'network-not-supported__welcome-container', children: jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', copykey: 'dyn_network_not_supported.subtitle', children: t('dyn_network_not_supported.subtitle') }) }), evmNetworks.length === 1 && (jsxRuntime.jsx(SelectNetworkButton.SelectNetworkButton, { onClick: onSelectNetworkButtonClick, networkId: evmNetworks[0].networkId, networkName: evmNetworks[0].vanityName || evmNetworks[0].name, networkIconUrl: evmNetworks[0].iconUrls[0] }))] })] }));
+                }), children: [jsxRuntime.jsx("div", { className: 'network-not-supported__img-container', children: jsxRuntime.jsx(walletBook.WalletIcon, { style: { height: 64, width: 64 }, walletKey: walletConnector.key }) }), jsxRuntime.jsx(UserAddress.UserAddress, { walletConnector: walletConnector }), jsxRuntime.jsx("div", { className: 'network-not-supported__network-container', children: evmNetworks.length > 1 && (jsxRuntime.jsx(NetworkPicker.NetworkPicker, { currentNetwork: currentNetwork, evmNetworks: evmNetworks, connector: walletConnector, isNetworkPickerOpen: isNetworkPickerOpen, setIsNetworkPickerOpen: setIsNetworkPickerOpen, showNetworkName: true, buttonClassName: 'network-not-supported__network-picker-button', mainClassName: 'network-not-supported__network-picker' })) }), jsxRuntime.jsx("div", { className: 'network-not-supported__welcome-container', children: jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', copykey: 'dyn_network_not_supported.subtitle', children: t('dyn_network_not_supported.subtitle') }) }), evmNetworks.length === 1 && (jsxRuntime.jsx(SelectNetworkButton.SelectNetworkButton, { onClick: onSelectNetworkButtonClick, networkId: evmNetworks[0].networkId, networkName: evmNetworks[0].vanityName || evmNetworks[0].name, networkIconUrl: evmNetworks[0].iconUrls[0] }))] })] }));
 };
 
 exports.NetworkNotSupported = NetworkNotSupported;

package/src/lib/views/NetworkNotSupported/NetworkNotSupported.js

@@ -1,6 +1,6 @@
 import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
-import { useState, useEffect } from 'react';
+import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { WalletIcon } from '@dynamic-labs/wallet-book';
 import { classNames } from '../../utils/functions/classNames/classNames.js';
@@ -18,15 +18,14 @@ import '../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../shared/consts/index.js';
 import { useInternalDynamicContext } from '../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
-import { useConnectAndSign } from '../../utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js';
+import '../../context/CaptchaContext/CaptchaContext.js';
 import '../../context/ErrorContext/ErrorContext.js';
-import '../../context/AccessDeniedContext/AccessDeniedContext.js';
-import '../../context/AccountExistsContext/AccountExistsContext.js';
-import '../../config/ApiEndpoint.js';
 import '@dynamic-labs/multi-wallet';
 import { isSupportedNetwork } from '../../utils/functions/isSupportedNetwork/isSupportedNetwork.js';
 import 'viem/chains';
-import '../../context/CaptchaContext/CaptchaContext.js';
+import '../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../config/ApiEndpoint.js';
 import '../../context/EmailVerificationContext/EmailVerificationContext.js';
 import 'react-dom';
 import '../../context/ThemeContext/ThemeContext.js';
@@ -62,7 +61,7 @@ import '@dynamic-labs/viem-utils';
 import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
-import { useWalletConnectorNetwork } from '../../utils/hooks/useWalletConnectorNetwork/useWalletConnectorNetwork.js';
+import { useNetworkNotSupported } from '../../utils/hooks/useNetworkNotSupported/useNetworkNotSupported.js';
 import '../../components/InlineWidget/InlineWidget.js';
 import '../../components/IsBrowser/IsBrowser.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
@@ -77,31 +76,10 @@ import { SelectNetworkButton } from '../../components/SelectNetworkButton/Select
 import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 
 const NetworkNotSupported = () => {
-    const { onboardingImageUrl, selectedWalletConnector: walletConnector, isFullyConnected, setShowAuthFlow, bridgeChainsToConnect, } = useInternalDynamicContext();
+    const { onboardingImageUrl, selectedWalletConnector: walletConnector } = useInternalDynamicContext();
     const { t } = useTranslation();
-    const { network: walletConnectorNetwork } = useWalletConnectorNetwork(walletConnector);
-    const finishConnectAndSign = useConnectAndSign({
-        shouldCallCallback: false,
-        shouldUpdateWallets: !isFullyConnected ||
-            (isFullyConnected && Boolean(bridgeChainsToConnect === null || bridgeChainsToConnect === void 0 ? void 0 : bridgeChainsToConnect.length)),
-    });
+    const { currentNetwork } = useNetworkNotSupported();
     const [isNetworkPickerOpen, setIsNetworkPickerOpen] = useState(false);
-    // Finishes auth flow when wallet switches to proper network
-    useEffect(() => {
-        if (isSupportedNetwork({ network: walletConnectorNetwork, walletConnector })) {
-            finishConnectAndSign({
-                walletConnector: walletConnector,
-            });
-            // there are two scenarios here, one in not connected state and the other one in connected state.
-            // previously we were calling setShowAuthFlow(false) in useHandleWalletsToConnect.
-            // now, we don't call it in network-not-supported view, so we need to handle that scenario and close modal here
-            // this should be gone, once we're done with the useConnectAndSign hook refactor.
-            // TODO: https://linear.app/dynamic-labs/issue/QNTM-117/break-useconnectandsign-hook-to-small-parts
-            if (isFullyConnected) {
-                setShowAuthFlow(false);
-            }
-        }
-    }, [walletConnectorNetwork, setShowAuthFlow, isFullyConnected]);
     if (!walletConnector) {
         return null;
     }
@@ -117,12 +95,12 @@ const NetworkNotSupported = () => {
     });
     const evmNetworks = walletConnector.evmNetworks || [];
     const _isSupportedNetwork = isSupportedNetwork({
-        network: walletConnectorNetwork,
+        network: currentNetwork,
         walletConnector,
     });
     return (jsxs("div", { className: 'network-not-supported', "data-testid": 'network-not-supported', children: [onboardingImageUrl && (jsx("img", { className: 'network-not-supported__main-img', src: onboardingImageUrl, alt: 'onboarding' })), !_isSupportedNetwork && (jsx(ErrorContainer, { variant: 'info', withIcon: false, className: 'network-not-supported__error--not-supported', copykey: 'dyn_network_not_supported.warning_message', children: t('dyn_network_not_supported.warning_message') })), jsxs("div", { className: classNames('network-not-supported__content-container', {
                     'network-not-supported__content-container--error': !_isSupportedNetwork,
-                }), children: [jsx("div", { className: 'network-not-supported__img-container', children: jsx(WalletIcon, { style: { height: 64, width: 64 }, walletKey: walletConnector.key }) }), jsx(UserAddress, { walletConnector: walletConnector }), jsx("div", { className: 'network-not-supported__network-container', children: evmNetworks.length > 1 && (jsx(NetworkPicker, { currentNetwork: walletConnectorNetwork, evmNetworks: evmNetworks, connector: walletConnector, isNetworkPickerOpen: isNetworkPickerOpen, setIsNetworkPickerOpen: setIsNetworkPickerOpen, showNetworkName: true, buttonClassName: 'network-not-supported__network-picker-button', mainClassName: 'network-not-supported__network-picker' })) }), jsx("div", { className: 'network-not-supported__welcome-container', children: jsx(Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', copykey: 'dyn_network_not_supported.subtitle', children: t('dyn_network_not_supported.subtitle') }) }), evmNetworks.length === 1 && (jsx(SelectNetworkButton, { onClick: onSelectNetworkButtonClick, networkId: evmNetworks[0].networkId, networkName: evmNetworks[0].vanityName || evmNetworks[0].name, networkIconUrl: evmNetworks[0].iconUrls[0] }))] })] }));
+                }), children: [jsx("div", { className: 'network-not-supported__img-container', children: jsx(WalletIcon, { style: { height: 64, width: 64 }, walletKey: walletConnector.key }) }), jsx(UserAddress, { walletConnector: walletConnector }), jsx("div", { className: 'network-not-supported__network-container', children: evmNetworks.length > 1 && (jsx(NetworkPicker, { currentNetwork: currentNetwork, evmNetworks: evmNetworks, connector: walletConnector, isNetworkPickerOpen: isNetworkPickerOpen, setIsNetworkPickerOpen: setIsNetworkPickerOpen, showNetworkName: true, buttonClassName: 'network-not-supported__network-picker-button', mainClassName: 'network-not-supported__network-picker' })) }), jsx("div", { className: 'network-not-supported__welcome-container', children: jsx(Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', copykey: 'dyn_network_not_supported.subtitle', children: t('dyn_network_not_supported.subtitle') }) }), evmNetworks.length === 1 && (jsx(SelectNetworkButton, { onClick: onSelectNetworkButtonClick, networkId: evmNetworks[0].networkId, networkName: evmNetworks[0].vanityName || evmNetworks[0].name, networkIconUrl: evmNetworks[0].iconUrls[0] }))] })] }));
 };
 
 export { NetworkNotSupported };

package/src/lib/views/NetworkNotSupportedSwitchManual/NetworkNotSupportedSwitchManual.cjs

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsxRuntime = require('react/jsx-runtime');
-var React = require('react');
 var reactI18next = require('react-i18next');
 var walletBook = require('@dynamic-labs/wallet-book');
+require('react');
 require('../../events/dynamicEvents.cjs');
 require('../../../../_virtual/_tslib.cjs');
 require('@dynamic-labs/utils');
@@ -21,17 +21,15 @@ require('../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../shared/consts/index.cjs');
 var useInternalDynamicContext = require('../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
-var useConnectAndSign = require('../../utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
+require('../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../context/ErrorContext/ErrorContext.cjs');
-require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
-require('../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/multi-wallet');
 var getWalletConnectorNetworks = require('../../utils/functions/getWalletConnectorNetworks/getWalletConnectorNetworks.cjs');
-var isSupportedNetwork = require('../../utils/functions/isSupportedNetwork/isSupportedNetwork.cjs');
 var pixelToRem = require('../../utils/functions/pixelToRem/pixelToRem.cjs');
 require('viem/chains');
-require('../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../config/ApiEndpoint.cjs');
 require('../../context/EmailVerificationContext/EmailVerificationContext.cjs');
 require('react-dom');
 require('../../context/ThemeContext/ThemeContext.cjs');
@@ -67,7 +65,7 @@ require('@dynamic-labs/viem-utils');
 require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
-var useWalletConnectorNetwork = require('../../utils/hooks/useWalletConnectorNetwork/useWalletConnectorNetwork.cjs');
+var useNetworkNotSupported = require('../../utils/hooks/useNetworkNotSupported/useNetworkNotSupported.cjs');
 require('../../components/InlineWidget/InlineWidget.cjs');
 require('../../components/IsBrowser/IsBrowser.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
@@ -82,30 +80,9 @@ require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/Secondar
 //   as the wallet does not support programmatic network change.
 const NetworkNotSupportedSwitchManual = () => {
     var _a, _b;
-    const { user, selectedWalletConnector: walletConnector, isFullyConnected, setShowAuthFlow, bridgeChainsToConnect, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { user, selectedWalletConnector: walletConnector } = useInternalDynamicContext.useInternalDynamicContext();
+    useNetworkNotSupported.useNetworkNotSupported();
     const { t } = reactI18next.useTranslation();
-    const { network: walletConnectorNetwork } = useWalletConnectorNetwork.useWalletConnectorNetwork(walletConnector);
-    const finishConnectAndSign = useConnectAndSign.useConnectAndSign({
-        shouldCallCallback: false,
-        shouldUpdateWallets: !isFullyConnected ||
-            (isFullyConnected && 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 })) {
-            finishConnectAndSign({
-                walletConnector: walletConnector,
-            });
-            // there are two scenarios here, one in not connected state and the other one in connected state.
-            // previously we were calling setShowAuthFlow(false) in useHandleWalletsToConnect.
-            // now, we don't call it in network-not-supported view, so we need to handle that scenario and close modal here
-            // this should be gone, once we're done with the useConnectAndSign hook refactor.
-            // TODO: https://linear.app/dynamic-labs/issue/QNTM-117/break-useconnectandsign-hook-to-small-parts
-            if (isFullyConnected) {
-                setShowAuthFlow(false);
-            }
-        }
-    }, [walletConnectorNetwork, setShowAuthFlow, isFullyConnected]);
     const iconSize = 80;
     const icon = (jsxRuntime.jsx(walletBook.WalletIcon, { walletKey: walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.key, style: {
             height: pixelToRem.pixelToRem(iconSize * IconWithSpinner.iconRatio),