@dynamic-labs/sdk-react-core 2.0.0-alpha.20 → 2.0.0-alpha.22

package/src/lib/views/LoginView/sections/WalletSignInSection/WalletSignInSection.cjs

@@ -66,14 +66,13 @@ require('../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/Passke
 var IconListTile = require('../../../../components/IconListTile/IconListTile.cjs');
 require('../../../../components/InlineWidget/InlineWidget.cjs');
 require('../../../../components/IsBrowser/IsBrowser.cjs');
-require('../../../../components/PhoneNumberField/usePhoneInputLogic/usePhoneInputLogic.cjs');
 require('../../../../components/Popper/Popper/Popper.cjs');
 require('../../../../components/Popper/PopperContext/PopperContext.cjs');
 require('qrcode');
 require('../../../WalletList/WalletList.cjs');
 require('../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
-require('../../../../locale/locale.cjs');
+require('../PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 var WalletSimpleSignIn = require('./WalletSimpleSignIn/WalletSimpleSignIn.cjs');
 
 const WalletSignInSection = ({ numberOfItensToShow, isLoading, onSubmit, }) => {

package/src/lib/views/LoginView/sections/WalletSignInSection/WalletSignInSection.js

@@ -62,14 +62,13 @@ import '../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/Passkey
 import { IconListTile } from '../../../../components/IconListTile/IconListTile.js';
 import '../../../../components/InlineWidget/InlineWidget.js';
 import '../../../../components/IsBrowser/IsBrowser.js';
-import '../../../../components/PhoneNumberField/usePhoneInputLogic/usePhoneInputLogic.js';
 import '../../../../components/Popper/Popper/Popper.js';
 import '../../../../components/Popper/PopperContext/PopperContext.js';
 import 'qrcode';
 import '../../../WalletList/WalletList.js';
 import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
-import '../../../../locale/locale.js';
+import '../PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import { WalletSimpleSignIn } from './WalletSimpleSignIn/WalletSimpleSignIn.js';
 
 const WalletSignInSection = ({ numberOfItensToShow, isLoading, onSubmit, }) => {

package/src/lib/views/LoginView/sections/WalletSignInSection/WalletSimpleSignIn/WalletSimpleSignIn.cjs

@@ -54,7 +54,6 @@ require('../../../../../components/Transition/SlideInUpTransition/SlideInUpTrans
 require('../../../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
 require('../../../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
-require('../../../../../components/PhoneNumberField/usePhoneInputLogic/usePhoneInputLogic.cjs');
 require('../../../../../components/Popper/Popper/Popper.cjs');
 require('../../../../../components/Popper/PopperContext/PopperContext.cjs');
 require('react-focus-lock');
@@ -67,7 +66,7 @@ require('i18next');
 require('@hcaptcha/react-hcaptcha');
 require('../../../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../../../context/FooterAnimationContext/index.cjs');
-require('../../../../../locale/locale.cjs');
+require('../../PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 var WalletListItem = require('../../../../WalletList/WalletListItem/WalletListItem.cjs');
 var ListItemButton = require('../ListItemButton/ListItemButton.cjs');
 var walletListBuilder = require('../../../../../utils/functions/walletListBuilder/walletListBuilder.cjs');
@@ -99,7 +98,7 @@ const WalletSimpleSignIn = ({ previewWalletsNumber, disabled = false, onshowAllW
         walletBook: walletBook$1,
         walletsFilter,
     });
-    return !projectSettings ? (jsxRuntime.jsx(Skeleton.Skeleton, { count: previewWalletsNumber + 1, className: 'login-with-email-wallet-list__skeleton' })) : (jsxRuntime.jsxs("div", { className: 'login-with-email-wallet-list__container', "data-testid": 'top-wallets-list', children: [walletsList.map((wallet, index) => (jsxRuntime.jsx(WalletListItem.WalletListItem, { wallet: wallet, disabled: disabled }, `${wallet.key}_${index}`))), jsxRuntime.jsx(ListItemButton.ListItemButton, { copykey: 'dyn_wallet_list.view_all', text: t('dyn_wallet_list.view_all'), onClick: onshowAllWallets, numberOfWallets: numberOfWallets, disabled: disabled })] }));
+    return !projectSettings ? (jsxRuntime.jsx(Skeleton.Skeleton, { count: previewWalletsNumber + 1, className: 'login-with-email-wallet-list__skeleton' })) : (jsxRuntime.jsxs("div", { className: 'login-with-email-wallet-list__container', "data-testid": 'top-wallets-list', children: [walletsList.map((wallet, index) => (jsxRuntime.jsx(WalletListItem.WalletListItem, { wallet: wallet, disabled: disabled, recommendedWallets: recommendedWallets }, `${wallet.key}_${index}`))), jsxRuntime.jsx(ListItemButton.ListItemButton, { copykey: 'dyn_wallet_list.view_all', text: t('dyn_wallet_list.view_all'), onClick: onshowAllWallets, numberOfWallets: numberOfWallets, disabled: disabled })] }));
 };
 
 exports.WalletSimpleSignIn = WalletSimpleSignIn;

package/src/lib/views/LoginView/sections/WalletSignInSection/WalletSimpleSignIn/WalletSimpleSignIn.js

@@ -50,7 +50,6 @@ import '../../../../../components/Transition/SlideInUpTransition/SlideInUpTransi
 import '../../../../../components/Transition/OpacityTransition/OpacityTransition.js';
 import '../../../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.js';
 import '../../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
-import '../../../../../components/PhoneNumberField/usePhoneInputLogic/usePhoneInputLogic.js';
 import '../../../../../components/Popper/Popper/Popper.js';
 import '../../../../../components/Popper/PopperContext/PopperContext.js';
 import 'react-focus-lock';
@@ -63,7 +62,7 @@ import 'i18next';
 import '@hcaptcha/react-hcaptcha';
 import '../../../../../context/LoadingContext/LoadingContext.js';
 import '../../../../../context/FooterAnimationContext/index.js';
-import '../../../../../locale/locale.js';
+import '../../PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import { WalletListItem } from '../../../../WalletList/WalletListItem/WalletListItem.js';
 import { ListItemButton } from '../ListItemButton/ListItemButton.js';
 import { walletListBuilder } from '../../../../../utils/functions/walletListBuilder/walletListBuilder.js';
@@ -95,7 +94,7 @@ const WalletSimpleSignIn = ({ previewWalletsNumber, disabled = false, onshowAllW
         walletBook,
         walletsFilter,
     });
-    return !projectSettings ? (jsx(Skeleton, { count: previewWalletsNumber + 1, className: 'login-with-email-wallet-list__skeleton' })) : (jsxs("div", { className: 'login-with-email-wallet-list__container', "data-testid": 'top-wallets-list', children: [walletsList.map((wallet, index) => (jsx(WalletListItem, { wallet: wallet, disabled: disabled }, `${wallet.key}_${index}`))), jsx(ListItemButton, { copykey: 'dyn_wallet_list.view_all', text: t('dyn_wallet_list.view_all'), onClick: onshowAllWallets, numberOfWallets: numberOfWallets, disabled: disabled })] }));
+    return !projectSettings ? (jsx(Skeleton, { count: previewWalletsNumber + 1, className: 'login-with-email-wallet-list__skeleton' })) : (jsxs("div", { className: 'login-with-email-wallet-list__container', "data-testid": 'top-wallets-list', children: [walletsList.map((wallet, index) => (jsx(WalletListItem, { wallet: wallet, disabled: disabled, recommendedWallets: recommendedWallets }, `${wallet.key}_${index}`))), jsx(ListItemButton, { copykey: 'dyn_wallet_list.view_all', text: t('dyn_wallet_list.view_all'), onClick: onshowAllWallets, numberOfWallets: numberOfWallets, disabled: disabled })] }));
 };
 
 export { WalletSimpleSignIn };

package/src/lib/views/LoginView/useLoginView/useLoginView.cjs

@@ -54,7 +54,6 @@ require('../../../components/Transition/SlideInUpTransition/SlideInUpTransition.
 require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
 require('../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
-require('../../../components/PhoneNumberField/usePhoneInputLogic/usePhoneInputLogic.cjs');
 require('../../../components/Popper/Popper/Popper.cjs');
 require('../../../components/Popper/PopperContext/PopperContext.cjs');
 require('react-focus-lock');
@@ -67,7 +66,7 @@ require('i18next');
 require('@hcaptcha/react-hcaptcha');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
-require('../../../locale/locale.cjs');
+require('../sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 var getLoginViewStructure = require('./getLoginViewStructure/getLoginViewStructure.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');

package/src/lib/views/LoginView/useLoginView/useLoginView.js

@@ -50,7 +50,6 @@ import '../../../components/Transition/SlideInUpTransition/SlideInUpTransition.j
 import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
 import '../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.js';
 import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
-import '../../../components/PhoneNumberField/usePhoneInputLogic/usePhoneInputLogic.js';
 import '../../../components/Popper/Popper/Popper.js';
 import '../../../components/Popper/PopperContext/PopperContext.js';
 import 'react-focus-lock';
@@ -63,7 +62,7 @@ import 'i18next';
 import '@hcaptcha/react-hcaptcha';
 import '../../../context/LoadingContext/LoadingContext.js';
 import '../../../context/FooterAnimationContext/index.js';
-import '../../../locale/locale.js';
+import '../sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import { getLoginViewStructure } from './getLoginViewStructure/getLoginViewStructure.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';

package/src/lib/views/MergeUserAccountsView/MergeUserAccountsView.cjs

@@ -72,7 +72,6 @@ require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 require('../../components/InlineWidget/InlineWidget.cjs');
 require('../../components/IsBrowser/IsBrowser.cjs');
-require('../../components/PhoneNumberField/usePhoneInputLogic/usePhoneInputLogic.cjs');
 require('../../components/Popper/Popper/Popper.cjs');
 require('../../components/Popper/PopperContext/PopperContext.cjs');
 require('qrcode');
@@ -80,7 +79,7 @@ require('../WalletList/WalletList.cjs');
 require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../config/ApiEndpoint.cjs');
-require('../../locale/locale.cjs');
+require('../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 
 const MergeUserAccountsView = () => {
     const { environmentId, setUser, setOnboardingOnlyJwt, setShowAuthFlow, setCallback, primaryWallet, user, authToken, onboardingOnlyJwt, } = useInternalDynamicContext.useInternalDynamicContext();
@@ -96,9 +95,9 @@ const MergeUserAccountsView = () => {
             return;
         }
         try {
-            const newJwt = yield api.mergeUserAccounts(jwtToken, environmentId);
-            if (newJwt) {
-                const newUser = updateJWTAndCreateUserProfile.updateJWTAndCreateUserProfile(newJwt);
+            const response = yield api.mergeUserAccounts(jwtToken, environmentId);
+            if (response) {
+                const newUser = updateJWTAndCreateUserProfile.updateJWTAndCreateUserProfile(response.jwt, response.minifiedJwt);
                 setOnboardingOnlyJwt(undefined);
                 setUser(newUser);
                 setShowAuthFlow(false);

package/src/lib/views/MergeUserAccountsView/MergeUserAccountsView.js

@@ -68,7 +68,6 @@ import '../../context/PasskeyContext/PasskeyContext.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import '../../components/InlineWidget/InlineWidget.js';
 import '../../components/IsBrowser/IsBrowser.js';
-import '../../components/PhoneNumberField/usePhoneInputLogic/usePhoneInputLogic.js';
 import '../../components/Popper/Popper/Popper.js';
 import '../../components/Popper/PopperContext/PopperContext.js';
 import 'qrcode';
@@ -76,7 +75,7 @@ import '../WalletList/WalletList.js';
 import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../config/ApiEndpoint.js';
-import '../../locale/locale.js';
+import '../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 
 const MergeUserAccountsView = () => {
     const { environmentId, setUser, setOnboardingOnlyJwt, setShowAuthFlow, setCallback, primaryWallet, user, authToken, onboardingOnlyJwt, } = useInternalDynamicContext();
@@ -92,9 +91,9 @@ const MergeUserAccountsView = () => {
             return;
         }
         try {
-            const newJwt = yield mergeUserAccounts(jwtToken, environmentId);
-            if (newJwt) {
-                const newUser = updateJWTAndCreateUserProfile(newJwt);
+            const response = yield mergeUserAccounts(jwtToken, environmentId);
+            if (response) {
+                const newUser = updateJWTAndCreateUserProfile(response.jwt, response.minifiedJwt);
                 setOnboardingOnlyJwt(undefined);
                 setUser(newUser);
                 setShowAuthFlow(false);

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

@@ -21,17 +21,16 @@ require('../../utils/constants/values.cjs');
 require('../../shared/utils/classes/storage/localStorage.cjs');
 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');
 require('react-international-phone');
 var isSupportedNetwork = require('../../utils/functions/isSupportedNetwork/isSupportedNetwork.cjs');
 require('viem');
 require('viem/chains');
-require('../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../config/ApiEndpoint.cjs');
+require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../context/WalletContext/WalletContext.cjs');
@@ -68,10 +67,9 @@ require('../../components/Input/Input.cjs');
 require('../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../context/PasskeyContext/PasskeyContext.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/PhoneNumberField/usePhoneInputLogic/usePhoneInputLogic.cjs');
 require('../../components/Popper/Popper/Popper.cjs');
 require('../../components/Popper/PopperContext/PopperContext.cjs');
 require('qrcode');
@@ -79,36 +77,15 @@ var NetworkPicker = require('../../components/NetworkPicker/NetworkPicker.cjs');
 require('../WalletList/WalletList.cjs');
 require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
-require('../../locale/locale.cjs');
+require('../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 var UserAddress = require('../../components/UserAddress/UserAddress.cjs');
 var SelectNetworkButton = require('../../components/SelectNetworkButton/SelectNetworkButton.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;
     }
@@ -124,12 +101,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';
@@ -17,17 +17,16 @@ import '../../utils/constants/values.js';
 import '../../shared/utils/classes/storage/localStorage.js';
 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 'react-international-phone';
 import { isSupportedNetwork } from '../../utils/functions/isSupportedNetwork/isSupportedNetwork.js';
 import 'viem';
 import 'viem/chains';
-import '../../context/CaptchaContext/CaptchaContext.js';
+import '../../config/ApiEndpoint.js';
+import '../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../context/WalletContext/WalletContext.js';
@@ -64,10 +63,9 @@ import '../../components/Input/Input.js';
 import '../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '../../context/PasskeyContext/PasskeyContext.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/PhoneNumberField/usePhoneInputLogic/usePhoneInputLogic.js';
 import '../../components/Popper/Popper/Popper.js';
 import '../../components/Popper/PopperContext/PopperContext.js';
 import 'qrcode';
@@ -75,36 +73,15 @@ import { NetworkPicker } from '../../components/NetworkPicker/NetworkPicker.js';
 import '../WalletList/WalletList.js';
 import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
-import '../../locale/locale.js';
+import '../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import { UserAddress } from '../../components/UserAddress/UserAddress.js';
 import { SelectNetworkButton } from '../../components/SelectNetworkButton/SelectNetworkButton.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;
     }
@@ -120,12 +97,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');
@@ -20,19 +20,17 @@ require('../../utils/constants/values.cjs');
 require('../../shared/utils/classes/storage/localStorage.cjs');
 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');
 require('react-international-phone');
 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');
 require('viem/chains');
-require('../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../config/ApiEndpoint.cjs');
+require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../context/WalletContext/WalletContext.cjs');
@@ -69,46 +67,24 @@ require('../../components/Input/Input.cjs');
 require('../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../context/PasskeyContext/PasskeyContext.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/PhoneNumberField/usePhoneInputLogic/usePhoneInputLogic.cjs');
 require('../../components/Popper/Popper/Popper.cjs');
 require('../../components/Popper/PopperContext/PopperContext.cjs');
 require('qrcode');
 require('../WalletList/WalletList.cjs');
 require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
-require('../../locale/locale.cjs');
+require('../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 
 //   The component notifies the user about the required manual network change,
 //   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),

package/src/lib/views/NetworkNotSupportedSwitchManual/NetworkNotSupportedSwitchManual.js

@@ -1,7 +1,7 @@
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { WalletIcon } from '@dynamic-labs/wallet-book';
+import 'react';
 import '../../events/dynamicEvents.js';
 import '../../../../_virtual/_tslib.js';
 import '@dynamic-labs/utils';
@@ -16,19 +16,17 @@ import '../../utils/constants/values.js';
 import '../../shared/utils/classes/storage/localStorage.js';
 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 'react-international-phone';
 import { getWalletConnectorNetworks } from '../../utils/functions/getWalletConnectorNetworks/getWalletConnectorNetworks.js';
-import { isSupportedNetwork } from '../../utils/functions/isSupportedNetwork/isSupportedNetwork.js';
 import { pixelToRem } from '../../utils/functions/pixelToRem/pixelToRem.js';
 import 'viem';
 import 'viem/chains';
-import '../../context/CaptchaContext/CaptchaContext.js';
+import '../../config/ApiEndpoint.js';
+import '../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../context/WalletContext/WalletContext.js';
@@ -65,46 +63,24 @@ import '../../components/Input/Input.js';
 import '../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '../../context/PasskeyContext/PasskeyContext.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/PhoneNumberField/usePhoneInputLogic/usePhoneInputLogic.js';
 import '../../components/Popper/Popper/Popper.js';
 import '../../components/Popper/PopperContext/PopperContext.js';
 import 'qrcode';
 import '../WalletList/WalletList.js';
 import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
-import '../../locale/locale.js';
+import '../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 
 //   The component notifies the user about the required manual network change,
 //   as the wallet does not support programmatic network change.
 const NetworkNotSupportedSwitchManual = () => {
     var _a, _b;
-    const { user, selectedWalletConnector: walletConnector, isFullyConnected, setShowAuthFlow, bridgeChainsToConnect, } = useInternalDynamicContext();
+    const { user, selectedWalletConnector: walletConnector } = useInternalDynamicContext();
+    useNetworkNotSupported();
     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)),
-    });
-    // 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]);
     const iconSize = 80;
     const icon = (jsx(WalletIcon, { walletKey: walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.key, style: {
             height: pixelToRem(iconSize * iconRatio),

package/src/lib/views/NoAccess/NoAccess.cjs

@@ -72,7 +72,6 @@ require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 require('../../components/InlineWidget/InlineWidget.cjs');
 require('../../components/IsBrowser/IsBrowser.cjs');
-require('../../components/PhoneNumberField/usePhoneInputLogic/usePhoneInputLogic.cjs');
 require('../../components/Popper/Popper/Popper.cjs');
 require('../../components/Popper/PopperContext/PopperContext.cjs');
 require('qrcode');
@@ -82,7 +81,7 @@ var useNoAccessText = require('./useNoAccessText.cjs');
 require('../WalletList/WalletList.cjs');
 require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
-require('../../locale/locale.cjs');
+require('../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 
 const NoAccess = () => {
     const { deniedAddress, setDeniedAddress, setDeniedOauthProvider } = AccessDeniedContext.useAccessDeniedContext();

package/src/lib/views/NoAccess/NoAccess.js

@@ -68,7 +68,6 @@ import '../../context/PasskeyContext/PasskeyContext.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import '../../components/InlineWidget/InlineWidget.js';
 import '../../components/IsBrowser/IsBrowser.js';
-import '../../components/PhoneNumberField/usePhoneInputLogic/usePhoneInputLogic.js';
 import '../../components/Popper/Popper/Popper.js';
 import '../../components/Popper/PopperContext/PopperContext.js';
 import 'qrcode';
@@ -78,7 +77,7 @@ import { useNoAccessText } from './useNoAccessText.js';
 import '../WalletList/WalletList.js';
 import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
-import '../../locale/locale.js';
+import '../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 
 const NoAccess = () => {
     const { deniedAddress, setDeniedAddress, setDeniedOauthProvider } = useAccessDeniedContext();