touchstudy-core 0.1.84 → 0.1.85

package/dist/index.modern.js

@@ -798,16 +798,11 @@ var BlockLogin = function BlockLogin(_ref3) {
     onSubmit: onSubmit
   }, function (_ref4) {
     var errors = _ref4.errors,
-      values = _ref4.values,
       setFieldValue = _ref4.setFieldValue;
-    console.log({
-      errors: errors,
-      values: values
-    });
     useEffect(function () {
-      if (isOTP) {
+      if (isEmail) setFieldValue("otp", "");
+      if (!isOTP && !isEmail) {
         setFieldValue("email", "");
-      } else {
         setFieldValue("otp", "");
       }
     }, [isOTP, isEmail]);
@@ -843,8 +838,9 @@ var BlockLogin = function BlockLogin(_ref3) {
       fontSize: "14px",
       fontWeight: 700,
       color: blue[700]
-    }, t("sign_in_with_email"))))), (isEmail || isOTP) && React__default.createElement(Stack, null, !isOTP ? React__default.createElement(Stack, {
+    }, t("sign_in_with_email"))))), (isEmail || isOTP) && React__default.createElement(Stack, null, React__default.createElement(Stack, {
       flexDirection: "column",
+      display: isOTP ? "none" : "flex",
       gap: 1
     }, React__default.createElement(Typography, {
       fontWeight: 700,
@@ -860,8 +856,9 @@ var BlockLogin = function BlockLogin(_ref3) {
       fontSize: "10px",
       lineHeight: "11.93px",
       color: !(errors !== null && errors !== void 0 && errors.email) ? "#97A1AF" : "#F34B4B"
-    }, errors === null || errors === void 0 ? void 0 : errors.email)) : React__default.createElement(Stack, {
+    }, errors === null || errors === void 0 ? void 0 : errors.email)), React__default.createElement(Stack, {
       flexDirection: "column",
+      display: !isOTP ? "none" : "flex",
       gap: 1
     }, React__default.createElement(Typography, {
       fontWeight: 700,
@@ -900,10 +897,18 @@ var BlockLogin = function BlockLogin(_ref3) {
       color: blue[700]
     }, t("sign_in_with_google_account"))), React__default.createElement(Stack, {
       flexDirection: "row",
-      justifyContent: "end",
+      justifyContent: isOTP ? "space-between" : "end",
       gap: 1,
       mt: 2
-    }, React__default.createElement(Button, {
+    }, isOTP && React__default.createElement(Button, {
+      variant: "contained",
+      color: "secondary",
+      className: "bg-secondary",
+      onClick: function onClick() {
+        handleSwitchEmail(true);
+        handleSwitchOTP(false);
+      }
+    }, t("back")), React__default.createElement(Button, {
       variant: "contained",
       color: "primary",
       type: "submit",
@@ -940,10 +945,14 @@ var signInWithEmailApi = function signInWithEmailApi(_ref2) {
 var signInWithOTPApi = function signInWithOTPApi(_ref3) {
   var academyDomain = _ref3.academyDomain,
     otp = _ref3.otp,
+    email = _ref3.email,
+    reCaptcha = _ref3.reCaptcha,
     role = _ref3.role;
   return api.post((academyDomain ? SIGN_IN_URL : SIGN_IN_SUPER_ADMIN_URL) + "/otp", {
     otp: otp,
-    role: role
+    email: email,
+    role: role,
+    reCaptcha: reCaptcha
   });
 };
 var signInWithKeyApi = function signInWithKeyApi(_ref4) {
@@ -1030,6 +1039,9 @@ var useLogin$1 = function useLogin(_ref) {
   var handleSubmit = function handleSubmit(values) {
     try {
       var _temp5 = function _temp5() {
+        setRefreshReCaptcha(function (b) {
+          return !b;
+        });
         dispatch(setLoading(false));
       };
       if (!tokenReCaptcha) return Promise.resolve();
@@ -1039,11 +1051,13 @@ var useLogin$1 = function useLogin(_ref) {
       var _temp4 = _catch(function () {
         function _temp3() {
           var _temp = function () {
-            if (otp) {
+            if (email && otp) {
               return Promise.resolve(signInWithOTPApi({
                 academyDomain: academyDomain,
+                email: email,
                 otp: otp,
-                role: role
+                role: role,
+                reCaptcha: tokenReCaptcha
               })).then(function (res) {
                 var loginResponse = res === null || res === void 0 ? void 0 : res.data;
                 var isFirstLogin = loginResponse.isFirstLogin,
@@ -1060,7 +1074,7 @@ var useLogin$1 = function useLogin(_ref) {
           if (_temp && _temp.then) return _temp.then(function () {});
         }
         var _temp2 = function () {
-          if (email) {
+          if (email && !otp) {
             return Promise.resolve(signInWithEmailApi({
               academyDomain: academyDomain,
               email: email,
@@ -1069,9 +1083,6 @@ var useLogin$1 = function useLogin(_ref) {
               toast.success(t("please_check_your_mailbox"));
               handleSwitchOTP(true);
               handleSwitchEmail(false);
-              setRefreshReCaptcha(function (b) {
-                return !b;
-              });
             });
           }
         }();