@dynamic-labs/sdk-react-core 0.19.3 → 1.0.0-alpha.1

package/src/lib/views/CaptchaVerifyUser/CaptchaVerifyUser.cjs

@@ -5,21 +5,20 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 var iconic = require('@dynamic-labs/iconic');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('react');
 var Typography = require('../../components/Typography/Typography.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../shared/logger.cjs');
-var ViewContext = require('../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/wallet-connector-core');
+require('../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../utils/constants/colors.cjs');
 require('../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('@dynamic-labs/utils');
 require('../../shared/consts/index.cjs');
-var useInternalDynamicContext = require('../../context/DynamicContext/useInternalDynamicContext.cjs');
+require('../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/multi-wallet');
-var requiresTwoStepAuthentication = require('../../utils/functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.cjs');
 require('../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../context/ThemeContext/ThemeContext.cjs');
 require('react-dom');
@@ -30,22 +29,21 @@ require('../../components/Transition/OpacityTransition/OpacityTransition.cjs');
 require('../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
-var useVerifyWallet = require('../../utils/hooks/useVerifyWallet/useVerifyWallet.cjs');
+require('../../context/ErrorContext/ErrorContext.cjs');
+require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('react-i18next');
 require('../../components/OverlayCard/OverlayCard.context.cjs');
 require('../../context/FooterAnimationContext/index.cjs');
 require('../../context/MockContext/MockContext.cjs');
 require('../../context/QrCodeContext/QrCodeContext.cjs');
 var PoweredByDynamic = require('../../components/PoweredByDynamic/PoweredByDynamic.cjs');
-require('../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../context/ErrorContext/ErrorContext.cjs');
 require('../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 var CaptchaContext = require('../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../context/EmailVerificationContext/EmailVerificationContext.cjs');
 require('qrcode');
 require('../../context/LoadingContext/LoadingContext.cjs');
-require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('yup');
 require('../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.cjs');
@@ -62,40 +60,10 @@ require('../../components/MenuList/Dropdown/Dropdown.cjs');
 var Captcha = require('../../components/Captcha/Captcha.cjs');
 
 const CaptchaVerifyUser = () => {
-    const { consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, selectedWalletConnector: walletConnector, walletUiUtils, } = useInternalDynamicContext.useInternalDynamicContext();
-    const { setView } = ViewContext.useViewContext();
-    const { setCaptchaToken } = CaptchaContext.useCaptchaContext();
-    const verifyWallet = useVerifyWallet.useVerifyWallet({
-        consumeNonce,
-        displaySiweStatement,
-        environmentId,
-        projectSettings,
-        setIsSingleWalletAccount,
-    });
-    if (!walletConnector) {
-        return null;
-    }
+    const { captchaAuthState } = CaptchaContext.useCaptchaContext();
     const handleSuccess = (captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const publicWalletAddress = yield walletConnector.fetchPublicAddress();
-        if (!publicWalletAddress) {
-            return;
-        }
-        if (!walletConnectorCore.isEmbeddedConnector(walletConnector) ||
-            walletConnectorCore.isBloctoConnector(walletConnector)) {
-            setView('pending-signature');
-        }
-        else {
-            walletUiUtils.disabledConfirmationOnce();
-        }
-        if (requiresTwoStepAuthentication.requiresTwoStepAuthentication(walletConnector)) {
-            setCaptchaToken(captchaToken);
-            return;
-        }
-        yield verifyWallet({
-            captchaToken,
-            publicWalletAddress,
-            walletConnector,
-        });
+        var _a;
+        yield ((_a = captchaAuthState === null || captchaAuthState === void 0 ? void 0 : captchaAuthState.onCaptchaSuccess) === null || _a === void 0 ? void 0 : _a.call(captchaAuthState, captchaToken));
     });
     return (jsxRuntime.jsxs("div", { className: 'captcha-verify-user__container', children: [jsxRuntime.jsx(iconic.CaptchaWaveIcon, { className: 'captcha-verify-user__icon' }), jsxRuntime.jsx(Typography.Typography, { weight: 'medium', variant: 'title', color: 'primary', className: 'captcha-verify-user__title', children: "Let\u2019s verify you\u2019re human" }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'captcha-verify-user__subtitle', children: "We need to quickly verify you\u2019re human before we proceed." }), jsxRuntime.jsx(Captcha.Captcha, { handleSuccess: handleSuccess }), jsxRuntime.jsx(PoweredByDynamic.PoweredByDynamic, { classNameRoot: 'captcha-verify-user__dynamic-logo' })] }));
 };

package/src/lib/views/CaptchaVerifyUser/CaptchaVerifyUser.d.ts

@@ -1,2 +1,2 @@
 /// <reference types="react" />
-export declare const CaptchaVerifyUser: () => JSX.Element | null;
+export declare const CaptchaVerifyUser: () => JSX.Element;

package/src/lib/views/CaptchaVerifyUser/CaptchaVerifyUser.js

@@ -1,21 +1,20 @@
 import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { CaptchaWaveIcon } from '@dynamic-labs/iconic';
-import { isEmbeddedConnector, isBloctoConnector } from '@dynamic-labs/wallet-connector-core';
 import 'react';
 import { Typography } from '../../components/Typography/Typography.js';
 import '@dynamic-labs/sdk-api';
 import '../../shared/logger.js';
-import { useViewContext } from '../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/wallet-connector-core';
+import '../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../utils/constants/colors.js';
 import '../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '@dynamic-labs/utils';
 import '../../shared/consts/index.js';
-import { useInternalDynamicContext } from '../../context/DynamicContext/useInternalDynamicContext.js';
+import '../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/multi-wallet';
-import { requiresTwoStepAuthentication } from '../../utils/functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.js';
 import '../../components/ShadowDOM/ShadowDOM.js';
 import '../../context/ThemeContext/ThemeContext.js';
 import 'react-dom';
@@ -26,22 +25,21 @@ import '../../components/Transition/OpacityTransition/OpacityTransition.js';
 import '../../config/ApiEndpoint.js';
 import '@dynamic-labs/rpc-providers';
 import '../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
-import { useVerifyWallet } from '../../utils/hooks/useVerifyWallet/useVerifyWallet.js';
+import '../../context/ErrorContext/ErrorContext.js';
+import '../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '../../context/AccountExistsContext/AccountExistsContext.js';
 import 'react-i18next';
 import '../../components/OverlayCard/OverlayCard.context.js';
 import '../../context/FooterAnimationContext/index.js';
 import '../../context/MockContext/MockContext.js';
 import '../../context/QrCodeContext/QrCodeContext.js';
 import { PoweredByDynamic } from '../../components/PoweredByDynamic/PoweredByDynamic.js';
-import '../../context/AccountExistsContext/AccountExistsContext.js';
-import '../../context/ErrorContext/ErrorContext.js';
 import '../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import { useCaptchaContext } from '../../context/CaptchaContext/CaptchaContext.js';
 import '../../context/EmailVerificationContext/EmailVerificationContext.js';
 import 'qrcode';
 import '../../context/LoadingContext/LoadingContext.js';
-import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import 'yup';
 import '../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.js';
@@ -58,40 +56,10 @@ import '../../components/MenuList/Dropdown/Dropdown.js';
 import { Captcha } from '../../components/Captcha/Captcha.js';
 
 const CaptchaVerifyUser = () => {
-    const { consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, selectedWalletConnector: walletConnector, walletUiUtils, } = useInternalDynamicContext();
-    const { setView } = useViewContext();
-    const { setCaptchaToken } = useCaptchaContext();
-    const verifyWallet = useVerifyWallet({
-        consumeNonce,
-        displaySiweStatement,
-        environmentId,
-        projectSettings,
-        setIsSingleWalletAccount,
-    });
-    if (!walletConnector) {
-        return null;
-    }
+    const { captchaAuthState } = useCaptchaContext();
     const handleSuccess = (captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
-        const publicWalletAddress = yield walletConnector.fetchPublicAddress();
-        if (!publicWalletAddress) {
-            return;
-        }
-        if (!isEmbeddedConnector(walletConnector) ||
-            isBloctoConnector(walletConnector)) {
-            setView('pending-signature');
-        }
-        else {
-            walletUiUtils.disabledConfirmationOnce();
-        }
-        if (requiresTwoStepAuthentication(walletConnector)) {
-            setCaptchaToken(captchaToken);
-            return;
-        }
-        yield verifyWallet({
-            captchaToken,
-            publicWalletAddress,
-            walletConnector,
-        });
+        var _a;
+        yield ((_a = captchaAuthState === null || captchaAuthState === void 0 ? void 0 : captchaAuthState.onCaptchaSuccess) === null || _a === void 0 ? void 0 : _a.call(captchaAuthState, captchaToken));
     });
     return (jsxs("div", { className: 'captcha-verify-user__container', children: [jsx(CaptchaWaveIcon, { className: 'captcha-verify-user__icon' }), jsx(Typography, { weight: 'medium', variant: 'title', color: 'primary', className: 'captcha-verify-user__title', children: "Let\u2019s verify you\u2019re human" }), jsx(Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'captcha-verify-user__subtitle', children: "We need to quickly verify you\u2019re human before we proceed." }), jsx(Captcha, { handleSuccess: handleSuccess }), jsx(PoweredByDynamic, { classNameRoot: 'captcha-verify-user__dynamic-logo' })] }));
 };

package/src/lib/views/CollectUserDataView/OnboardingUserDataForm/OnboardingUserDataForm.cjs

@@ -120,7 +120,7 @@ const OnboardingUserDataForm = ({ children, userProfile, disableSubmit, }) => {
                 (enforcePolicies &&
                     (policiesConsentInnerComponentArray === null || policiesConsentInnerComponentArray === void 0 ? void 0 : policiesConsentInnerComponentArray.length) !==
                         ((_a = values.policiesConsentArray) === null || _a === void 0 ? void 0 : _a.length));
-            return (jsxRuntime.jsx(formik.Form, { className: 'user-data-form__form', children: jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [children, jsxRuntime.jsx(index.UserDataFields, { fields: decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields, errors: errors, touched: touched, policiesConsentInnerComponentArray: policiesConsentInnerComponentArray }), jsxRuntime.jsx(Button.Button, { type: 'submit', loading: loading, disabled: isSubmitBtnDisabled, buttonVariant: 'primary', expanded: true, buttonPadding: 'large', children: "Continue" })] }) }));
+            return (jsxRuntime.jsx(formik.Form, { className: 'user-data-form__form', children: jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [children, jsxRuntime.jsx(index.UserDataFields, { fields: decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields, errors: errors, touched: touched, policiesConsentInnerComponentArray: policiesConsentInnerComponentArray }), jsxRuntime.jsx(Button.Button, { type: 'submit', loading: loading, disabled: isSubmitBtnDisabled, buttonVariant: 'primary', expanded: true, buttonPadding: 'login-screen-height', children: "Continue" })] }) }));
         } }));
 };
 

package/src/lib/views/CollectUserDataView/OnboardingUserDataForm/OnboardingUserDataForm.js

@@ -116,7 +116,7 @@ const OnboardingUserDataForm = ({ children, userProfile, disableSubmit, }) => {
                 (enforcePolicies &&
                     (policiesConsentInnerComponentArray === null || policiesConsentInnerComponentArray === void 0 ? void 0 : policiesConsentInnerComponentArray.length) !==
                         ((_a = values.policiesConsentArray) === null || _a === void 0 ? void 0 : _a.length));
-            return (jsx(Form, { className: 'user-data-form__form', children: jsxs(Fragment, { children: [children, jsx(UserDataFields, { fields: decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields, errors: errors, touched: touched, policiesConsentInnerComponentArray: policiesConsentInnerComponentArray }), jsx(Button, { type: 'submit', loading: loading, disabled: isSubmitBtnDisabled, buttonVariant: 'primary', expanded: true, buttonPadding: 'large', children: "Continue" })] }) }));
+            return (jsx(Form, { className: 'user-data-form__form', children: jsxs(Fragment, { children: [children, jsx(UserDataFields, { fields: decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields, errors: errors, touched: touched, policiesConsentInnerComponentArray: policiesConsentInnerComponentArray }), jsx(Button, { type: 'submit', loading: loading, disabled: isSubmitBtnDisabled, buttonVariant: 'primary', expanded: true, buttonPadding: 'login-screen-height', children: "Continue" })] }) }));
         } }));
 };
 

package/src/lib/views/LoginView/sections/EmailSignInSection/LoginEmailForm.cjs

@@ -7,10 +7,10 @@ var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var reactI18next = require('react-i18next');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var sdkApi = require('@dynamic-labs/sdk-api');
+require('@dynamic-labs/sdk-api');
 var logger = require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('../../../../context/ViewContext/ViewContext.cjs');
+var ViewContext = require('../../../../context/ViewContext/ViewContext.cjs');
 var arrowRightCircle = require('../../../../shared/assets/arrow-right-circle.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../../../utils/constants/colors.cjs');
@@ -20,7 +20,6 @@ require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
 require('@dynamic-labs/multi-wallet');
-var isTurnkeyEnabled = require('../../../../utils/functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 require('../../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 var Input = require('../../../../components/Input/Input.cjs');
@@ -29,7 +28,7 @@ require('react-focus-lock');
 require('../../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
 require('../../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
 require('../../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
-var api = require('../../../../data/api.cjs');
+require('../../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
 var ErrorContext = require('../../../../context/ErrorContext/ErrorContext.cjs');
@@ -41,7 +40,7 @@ require('../../../../context/MockContext/MockContext.cjs');
 require('../../../../context/QrCodeContext/QrCodeContext.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
-require('../../../../context/CaptchaContext/CaptchaContext.cjs');
+var CaptchaContext = require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
 require('qrcode');
 require('../../../../context/LoadingContext/LoadingContext.cjs');
@@ -65,14 +64,16 @@ const EMAIL_REGEX = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i;
 const LoginEmailForm = ({ isLoading: isExternalLoading, onSubmit, onSubmitError, currentEmail, }) => {
     var _a, _b, _c;
     const { t } = reactI18next.useTranslation();
-    const { environmentId, wallets, projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
+    const { wallets, projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
+    const { view, setView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
+    const { engageCaptcha } = CaptchaContext.useCaptchaContext();
     const [emailInput, setEmailInput] = React.useState(currentEmail !== null && currentEmail !== void 0 ? currentEmail : '');
     const [invalidEmail, setInvalidEmail] = React.useState(false);
     const emailWalletConnector = wallets
         .map(({ walletConnector }) => walletConnector)
         .find(walletConnectorCore.isEmailWalletConnector);
-    const { handleEmailOnlyLoginSubmit, submitEmail, isEmailProviderLoading } = useEmailProvider.useEmailProvider({
+    const { handleEmailSubmitWithOptionalCaptcha, isEmailProviderLoading } = useEmailProvider.useEmailProvider({
         emailWalletConnector,
     });
     const isLoading = React.useMemo(() => isEmailProviderLoading || isExternalLoading, [isEmailProviderLoading, isExternalLoading]);
@@ -80,10 +81,19 @@ const LoginEmailForm = ({ isLoading: isExternalLoading, onSubmit, onSubmitError,
         const { value } = event.currentTarget;
         setEmailInput(value);
     };
-    // will be true if blocto or magic email are enabled
-    const isEmailWalletProviderEnabled = emailWalletConnector !== undefined;
+    const handleEmailSubmitError = (error) => {
+        if (error.code === 'invalid_email_address') {
+            setInvalidEmail(true);
+        }
+        else {
+            setErrorMessage(error.code);
+        }
+        logger.logger.debug(error);
+        onSubmitError === null || onSubmitError === void 0 ? void 0 : onSubmitError();
+    };
     const emailInputSuffixIcon = (jsxRuntime.jsx(IconButton.IconButton, { "data-testid": 'email_submit_button', type: 'submit', className: `icon-button${((_a = emailInput === null || emailInput === void 0 ? void 0 : emailInput.trim()) === null || _a === void 0 ? void 0 : _a.length) ? '--visible' : ''}`, disabled: isLoading, children: jsxRuntime.jsx(arrowRightCircle.ReactComponent, {}) }));
     const handleSubmit = (e) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _d;
         e.preventDefault();
         if (!EMAIL_REGEX.test(emailInput)) {
             setInvalidEmail(true);
@@ -91,40 +101,34 @@ const LoginEmailForm = ({ isLoading: isExternalLoading, onSubmit, onSubmitError,
         }
         try {
             onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit();
-            if ((isEmailWalletProviderEnabled || isTurnkeyEnabled.isTurnkeyEnabled(projectSettings)) &&
-                (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.confirmEmailProviderForVerify)) {
-                // see: https://linear.app/dynamic-labs/issue/DYN-2517
-                // if confirmWalletTransfers setting is true, check api first to confirm emailProvider
-                const { emailProvider } = yield api.getEmailProvider({
-                    email: emailInput,
-                    environmentId,
+            // we are making sure that the wallet connect is not magic as to not show captcha
+            // until we have a request to our backend (useConnectAndSign)
+            if (((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _d === void 0 ? void 0 : _d.enabled) &&
+                (emailWalletConnector === null || emailWalletConnector === void 0 ? void 0 : emailWalletConnector.key) !== 'magicemailotp') {
+                engageCaptcha({
+                    authMethod: 'email',
+                    onCaptchaSuccess: (captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+                        try {
+                            yield handleEmailSubmitWithOptionalCaptcha(emailInput, captchaToken);
+                        }
+                        catch (e) {
+                            setView(view);
+                            handleEmailSubmitError(e);
+                        }
+                    }),
                 });
-                // For v0.19 we will support emailOnly and Dynamic as email providers
-                // For v0.20/v1 we need to remove emailOnly and leave Dynamic as the only one email provider
-                // Ticket: https://linear.app/dynamic-labs/issue/GVTY-213/remove-emailonly-as-a-provider-from-sdk
-                if (emailProvider === sdkApi.ProviderEnum.EmailOnly ||
-                    emailProvider === sdkApi.ProviderEnum.Dynamic) {
-                    yield handleEmailOnlyLoginSubmit(emailInput);
-                    return;
-                }
+                return;
             }
-            yield submitEmail(emailInput);
+            yield handleEmailSubmitWithOptionalCaptcha(emailInput);
         }
         catch (error) {
-            if (error.code === 'invalid_email_address') {
-                setInvalidEmail(true);
-            }
-            else {
-                setErrorMessage(error.code);
-            }
-            logger.logger.debug(error);
-            onSubmitError === null || onSubmitError === void 0 ? void 0 : onSubmitError();
+            handleEmailSubmitError(error);
         }
     });
     // social sign in currently coupled to email... might be better to decouple
     return (jsxRuntime.jsxs("form", { className: 'login-with-email-form', onSubmit: (e) => handleSubmit(e), children: [jsxRuntime.jsx(Input.Input, { id: 'email_field', value: emailInput, onChange: handleEmailOnChangeEvent, label: 'Enter your email', error: invalidEmail, message: invalidEmail && t('dyn_login.helper.email_form.invalid_email'), suffix: ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _b === void 0 ? void 0 : _b.emailSubmitButtonInsideInput)
                     ? emailInputSuffixIcon
-                    : null, disabled: isLoading }), !((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _c === void 0 ? void 0 : _c.emailSubmitButtonInsideInput) && (jsxRuntime.jsx(Button.Button, { dataTestId: 'email_submit_button', buttonClassName: 'login-with-email-form__button', type: 'submit', loading: isLoading, disabled: isLoading, buttonVariant: 'brand-primary', buttonPadding: 'login-screen-height', expanded: true, typographyProps: {
+                    : null, disabled: isLoading, type: 'email' }), !((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _c === void 0 ? void 0 : _c.emailSubmitButtonInsideInput) && (jsxRuntime.jsx(Button.Button, { dataTestId: 'email_submit_button', buttonClassName: 'login-with-email-form__button', type: 'submit', loading: isLoading, disabled: isLoading, buttonVariant: 'brand-primary', buttonPadding: 'login-screen-height', expanded: true, typographyProps: {
                     color: 'inherit',
                 }, children: "Continue" }))] }));
 };

package/src/lib/views/LoginView/sections/EmailSignInSection/LoginEmailForm.js

@@ -3,10 +3,10 @@ import { jsx, jsxs } from 'react/jsx-runtime';
 import { useState, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { isEmailWalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { ProviderEnum } from '@dynamic-labs/sdk-api';
+import '@dynamic-labs/sdk-api';
 import { logger } from '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '../../../../context/ViewContext/ViewContext.js';
+import { useViewContext } from '../../../../context/ViewContext/ViewContext.js';
 import { ReactComponent as SvgArrowRightCircle } from '../../../../shared/assets/arrow-right-circle.js';
 import '@dynamic-labs/wallet-book';
 import '../../../../utils/constants/colors.js';
@@ -16,7 +16,6 @@ import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
 import '@dynamic-labs/multi-wallet';
-import { isTurnkeyEnabled } from '../../../../utils/functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 import '../../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import { Input } from '../../../../components/Input/Input.js';
@@ -25,7 +24,7 @@ import 'react-focus-lock';
 import '../../../../components/Transition/ZoomTransition/ZoomTransition.js';
 import '../../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
 import '../../../../components/Transition/OpacityTransition/OpacityTransition.js';
-import { getEmailProvider } from '../../../../data/api.js';
+import '../../../../config/ApiEndpoint.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
 import { useErrorContext } from '../../../../context/ErrorContext/ErrorContext.js';
@@ -37,7 +36,7 @@ import '../../../../context/MockContext/MockContext.js';
 import '../../../../context/QrCodeContext/QrCodeContext.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
-import '../../../../context/CaptchaContext/CaptchaContext.js';
+import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../context/EmailVerificationContext/EmailVerificationContext.js';
 import 'qrcode';
 import '../../../../context/LoadingContext/LoadingContext.js';
@@ -61,14 +60,16 @@ const EMAIL_REGEX = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i;
 const LoginEmailForm = ({ isLoading: isExternalLoading, onSubmit, onSubmitError, currentEmail, }) => {
     var _a, _b, _c;
     const { t } = useTranslation();
-    const { environmentId, wallets, projectSettings } = useInternalDynamicContext();
+    const { wallets, projectSettings } = useInternalDynamicContext();
+    const { view, setView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
+    const { engageCaptcha } = useCaptchaContext();
     const [emailInput, setEmailInput] = useState(currentEmail !== null && currentEmail !== void 0 ? currentEmail : '');
     const [invalidEmail, setInvalidEmail] = useState(false);
     const emailWalletConnector = wallets
         .map(({ walletConnector }) => walletConnector)
         .find(isEmailWalletConnector);
-    const { handleEmailOnlyLoginSubmit, submitEmail, isEmailProviderLoading } = useEmailProvider({
+    const { handleEmailSubmitWithOptionalCaptcha, isEmailProviderLoading } = useEmailProvider({
         emailWalletConnector,
     });
     const isLoading = useMemo(() => isEmailProviderLoading || isExternalLoading, [isEmailProviderLoading, isExternalLoading]);
@@ -76,10 +77,19 @@ const LoginEmailForm = ({ isLoading: isExternalLoading, onSubmit, onSubmitError,
         const { value } = event.currentTarget;
         setEmailInput(value);
     };
-    // will be true if blocto or magic email are enabled
-    const isEmailWalletProviderEnabled = emailWalletConnector !== undefined;
+    const handleEmailSubmitError = (error) => {
+        if (error.code === 'invalid_email_address') {
+            setInvalidEmail(true);
+        }
+        else {
+            setErrorMessage(error.code);
+        }
+        logger.debug(error);
+        onSubmitError === null || onSubmitError === void 0 ? void 0 : onSubmitError();
+    };
     const emailInputSuffixIcon = (jsx(IconButton, { "data-testid": 'email_submit_button', type: 'submit', className: `icon-button${((_a = emailInput === null || emailInput === void 0 ? void 0 : emailInput.trim()) === null || _a === void 0 ? void 0 : _a.length) ? '--visible' : ''}`, disabled: isLoading, children: jsx(SvgArrowRightCircle, {}) }));
     const handleSubmit = (e) => __awaiter(void 0, void 0, void 0, function* () {
+        var _d;
         e.preventDefault();
         if (!EMAIL_REGEX.test(emailInput)) {
             setInvalidEmail(true);
@@ -87,40 +97,34 @@ const LoginEmailForm = ({ isLoading: isExternalLoading, onSubmit, onSubmitError,
         }
         try {
             onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit();
-            if ((isEmailWalletProviderEnabled || isTurnkeyEnabled(projectSettings)) &&
-                (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.confirmEmailProviderForVerify)) {
-                // see: https://linear.app/dynamic-labs/issue/DYN-2517
-                // if confirmWalletTransfers setting is true, check api first to confirm emailProvider
-                const { emailProvider } = yield getEmailProvider({
-                    email: emailInput,
-                    environmentId,
+            // we are making sure that the wallet connect is not magic as to not show captcha
+            // until we have a request to our backend (useConnectAndSign)
+            if (((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _d === void 0 ? void 0 : _d.enabled) &&
+                (emailWalletConnector === null || emailWalletConnector === void 0 ? void 0 : emailWalletConnector.key) !== 'magicemailotp') {
+                engageCaptcha({
+                    authMethod: 'email',
+                    onCaptchaSuccess: (captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
+                        try {
+                            yield handleEmailSubmitWithOptionalCaptcha(emailInput, captchaToken);
+                        }
+                        catch (e) {
+                            setView(view);
+                            handleEmailSubmitError(e);
+                        }
+                    }),
                 });
-                // For v0.19 we will support emailOnly and Dynamic as email providers
-                // For v0.20/v1 we need to remove emailOnly and leave Dynamic as the only one email provider
-                // Ticket: https://linear.app/dynamic-labs/issue/GVTY-213/remove-emailonly-as-a-provider-from-sdk
-                if (emailProvider === ProviderEnum.EmailOnly ||
-                    emailProvider === ProviderEnum.Dynamic) {
-                    yield handleEmailOnlyLoginSubmit(emailInput);
-                    return;
-                }
+                return;
             }
-            yield submitEmail(emailInput);
+            yield handleEmailSubmitWithOptionalCaptcha(emailInput);
         }
         catch (error) {
-            if (error.code === 'invalid_email_address') {
-                setInvalidEmail(true);
-            }
-            else {
-                setErrorMessage(error.code);
-            }
-            logger.debug(error);
-            onSubmitError === null || onSubmitError === void 0 ? void 0 : onSubmitError();
+            handleEmailSubmitError(error);
         }
     });
     // social sign in currently coupled to email... might be better to decouple
     return (jsxs("form", { className: 'login-with-email-form', onSubmit: (e) => handleSubmit(e), children: [jsx(Input, { id: 'email_field', value: emailInput, onChange: handleEmailOnChangeEvent, label: 'Enter your email', error: invalidEmail, message: invalidEmail && t('dyn_login.helper.email_form.invalid_email'), suffix: ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _b === void 0 ? void 0 : _b.emailSubmitButtonInsideInput)
                     ? emailInputSuffixIcon
-                    : null, disabled: isLoading }), !((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _c === void 0 ? void 0 : _c.emailSubmitButtonInsideInput) && (jsx(Button, { dataTestId: 'email_submit_button', buttonClassName: 'login-with-email-form__button', type: 'submit', loading: isLoading, disabled: isLoading, buttonVariant: 'brand-primary', buttonPadding: 'login-screen-height', expanded: true, typographyProps: {
+                    : null, disabled: isLoading, type: 'email' }), !((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _c === void 0 ? void 0 : _c.emailSubmitButtonInsideInput) && (jsx(Button, { dataTestId: 'email_submit_button', buttonClassName: 'login-with-email-form__button', type: 'submit', loading: isLoading, disabled: isLoading, buttonVariant: 'brand-primary', buttonPadding: 'login-screen-height', expanded: true, typographyProps: {
                     color: 'inherit',
                 }, children: "Continue" }))] }));
 };

package/src/lib/views/LoginView/sections/SocialSignInSection/DynamicSocialSignIn/DynamicSocialSignIn.cjs

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _tslib = require('../../../../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 require('react');
 require('@dynamic-labs/sdk-api');
@@ -38,7 +39,7 @@ require('../../../../../context/MockContext/MockContext.cjs');
 require('../../../../../context/QrCodeContext/QrCodeContext.cjs');
 require('../../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
-require('../../../../../context/CaptchaContext/CaptchaContext.cjs');
+var CaptchaContext = require('../../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
 require('qrcode');
 require('../../../../../context/LoadingContext/LoadingContext.cjs');
@@ -60,9 +61,10 @@ var SocialSignIn = require('../../../../../components/SocialSignIn/SocialSignIn.
 var SocialRedirectContext = require('../../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 
 const DynamicSocialSignIn = ({ defaultProvider, numOfItemsToDisplay, collapsedLayout, }) => {
-    const { setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setShowAuthFlow, projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
     const { setSocialProvider, socialProvider, enabledSocialProviders } = SocialRedirectContext.useSocialRedirectContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
+    const { engageCaptcha } = CaptchaContext.useCaptchaContext();
     const { isProcessing, connectSocialAccount } = useSocialAuth.useSocialAuth({
         authMode: 'signin',
         onError: () => {
@@ -74,11 +76,26 @@ const DynamicSocialSignIn = ({ defaultProvider, numOfItemsToDisplay, collapsedLa
         sessionTimeout: 10000,
     });
     const onSelectProvider = (provider) => {
+        var _a;
         const providerEnum = getProviderEnumForSocialSignInProvider.getProviderEnumForSocialSignInProvider(provider);
         setSocialProvider(provider);
+        if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
+            engageCaptcha({
+                authMethod: 'social',
+                onCaptchaSuccess: (captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+                    setView('social-redirect-view');
+                    setShowAuthFlow(true);
+                    connectSocialAccount({
+                        captchaToken,
+                        provider: providerEnum,
+                    });
+                }),
+            });
+            return;
+        }
         setView('social-redirect-view');
         setShowAuthFlow(true);
-        connectSocialAccount(providerEnum);
+        connectSocialAccount({ provider: providerEnum });
     };
     return (jsxRuntime.jsx(SocialSignIn.SocialSignIn, { onSelectProvider: onSelectProvider, providers: enabledSocialProviders, selectedProvider: socialProvider, isLoading: isProcessing, testId: 'dynamic-social-sign-in', defaultProvider: defaultProvider, numOfItemsToDisplay: numOfItemsToDisplay, collapsedLayout: collapsedLayout }));
 };

package/src/lib/views/LoginView/sections/SocialSignInSection/DynamicSocialSignIn/DynamicSocialSignIn.js

@@ -1,3 +1,4 @@
+import { __awaiter } from '../../../../../../../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
 import 'react';
 import '@dynamic-labs/sdk-api';
@@ -34,7 +35,7 @@ import '../../../../../context/MockContext/MockContext.js';
 import '../../../../../context/QrCodeContext/QrCodeContext.js';
 import '../../../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
-import '../../../../../context/CaptchaContext/CaptchaContext.js';
+import { useCaptchaContext } from '../../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../../context/EmailVerificationContext/EmailVerificationContext.js';
 import 'qrcode';
 import '../../../../../context/LoadingContext/LoadingContext.js';
@@ -56,9 +57,10 @@ import { SocialSignIn } from '../../../../../components/SocialSignIn/SocialSignI
 import { useSocialRedirectContext } from '../../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 
 const DynamicSocialSignIn = ({ defaultProvider, numOfItemsToDisplay, collapsedLayout, }) => {
-    const { setShowAuthFlow } = useInternalDynamicContext();
+    const { setShowAuthFlow, projectSettings } = useInternalDynamicContext();
     const { setSocialProvider, socialProvider, enabledSocialProviders } = useSocialRedirectContext();
     const { setView, goToInitialView } = useViewContext();
+    const { engageCaptcha } = useCaptchaContext();
     const { isProcessing, connectSocialAccount } = useSocialAuth({
         authMode: 'signin',
         onError: () => {
@@ -70,11 +72,26 @@ const DynamicSocialSignIn = ({ defaultProvider, numOfItemsToDisplay, collapsedLa
         sessionTimeout: 10000,
     });
     const onSelectProvider = (provider) => {
+        var _a;
         const providerEnum = getProviderEnumForSocialSignInProvider(provider);
         setSocialProvider(provider);
+        if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
+            engageCaptcha({
+                authMethod: 'social',
+                onCaptchaSuccess: (captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
+                    setView('social-redirect-view');
+                    setShowAuthFlow(true);
+                    connectSocialAccount({
+                        captchaToken,
+                        provider: providerEnum,
+                    });
+                }),
+            });
+            return;
+        }
         setView('social-redirect-view');
         setShowAuthFlow(true);
-        connectSocialAccount(providerEnum);
+        connectSocialAccount({ provider: providerEnum });
     };
     return (jsx(SocialSignIn, { onSelectProvider: onSelectProvider, providers: enabledSocialProviders, selectedProvider: socialProvider, isLoading: isProcessing, testId: 'dynamic-social-sign-in', defaultProvider: defaultProvider, numOfItemsToDisplay: numOfItemsToDisplay, collapsedLayout: collapsedLayout }));
 };