@stokr/components-library 3.0.45 → 3.0.47

package/dist/components/Modal/NewVentureModal/NewVentureModal.js

@@ -29,6 +29,7 @@ const defaultProject = {
 const NewVentureModal = (props) => {
   const navigate = useNavigate();
   const { user } = useContext(AuthContext);
+  const isLoggedIn = !!user?._id;
   const {
     title = "Register Your Interest",
     description = "Register your interest and learn more about this investment opportunity.",
@@ -66,7 +67,10 @@ const NewVentureModal = (props) => {
     salesChannel,
     customSuccessMessage
   });
-  const validationSchema = Yup.object().shape({
+  const validationSchema = isLoggedIn ? Yup.object().shape({
+    email: Yup.string().nullable(),
+    name: Yup.string().nullable()
+  }) : Yup.object().shape({
     email: Yup.string().matches(emailRegex, "Oops, that's not a valid address").required("Oops, this can't be blank"),
     name: Yup.string().required("Oops, this can't be blank")
   });
@@ -112,6 +116,7 @@ const NewVentureModal = (props) => {
         ] }) : /* @__PURE__ */ jsx(
           Formik,
           {
+            enableReinitialize: true,
             initialValues: {
               email: email || "",
               name: name || "",
@@ -133,20 +138,6 @@ const NewVentureModal = (props) => {
               };
               const oneOfCheckbox = values.mailingList && !mailingListDisabled || values.privateInvestorList && !privateInvestorListDisabled;
               const optionalCheckBoxForm = optionalCheckBox ? values.optionalCheckBoxChecked : true;
-              if (email && !values.email) {
-                setFieldValue("email", email);
-                setFieldTouched("email");
-              }
-              if (name && !values.name) {
-                setFieldValue("name", name);
-                setFieldTouched("name");
-              }
-              if (mailingList && !values.mailingList) {
-                setFieldValue("mailingList", mailingList);
-              }
-              if (privateInvestorList && !values.privateInvestorList) {
-                setFieldValue("privateInvestorList", privateInvestorList);
-              }
               const handleCheckboxChange = (e) => {
                 handleChange(e);
                 if (e.target.checked) {
@@ -155,10 +146,11 @@ const NewVentureModal = (props) => {
                   updateCheckedCheckboxes(checkedCheckboxes.filter((item) => item !== e.target.id));
                 }
               };
-              var submitDisabled = !touched.email || !!errors.email || !touched.name || !!errors.name || isSubmitting || !oneOfCheckbox || !optionalCheckBoxForm;
+              const requiresIdentityFields = !isLoggedIn;
+              const submitDisabled = requiresIdentityFields && (!values.email || !!errors.email || !values.name || !!errors.name) || isSubmitting || !oneOfCheckbox || !optionalCheckBoxForm;
               return /* @__PURE__ */ jsxs(stdin_default, { children: [
                 /* @__PURE__ */ jsx(ComponentWrapper, { noPadding: true, children: /* @__PURE__ */ jsxs(FormField, { children: [
-                  !user?._id && /* @__PURE__ */ jsxs(Fragment, { children: [
+                  !isLoggedIn && /* @__PURE__ */ jsxs(Fragment, { children: [
                     /* @__PURE__ */ jsx(
                       Input,
                       {

package/dist/hooks/useNewVentureForm.js

@@ -1,5 +1,5 @@
 import { jsxs, Fragment, jsx } from "react/jsx-runtime";
-import { useState, useContext, useEffect, useCallback } from "react";
+import { useState, useContext, useCallback, useEffect } from "react";
 import { AuthContext } from "../context/AuthContext.js";
 import fetchDataPublic from "../api/fetchDataPublic.js";
 import parse from "html-react-parser";
@@ -75,52 +75,25 @@ const updateUserSubscription = (user, project, updates) => {
   }
   return { ...user, ...updates };
 };
+const resolveUserDisplayName = (user) => {
+  if (!user) return "";
+  const fullNameFromParts = `${user.firstName || ""} ${user.lastName || ""}`.trim();
+  return user.username || user.name || user.fullName || fullNameFromParts || "";
+};
 const useNewVentureForm = ({ project, user, salesChannel, customSuccessMessage }) => {
   const [formValues, setFormValues] = useState(initialState);
   const { setUser, checkPrivateInvestorAll, checkIfUserSubscribedAll } = useContext(AuthContext);
   const { checkboxes, isLoading: isLoadingCheckboxes } = useCheckboxes("newVentureModal", {
     group: "newVentureModal"
   });
-  useEffect(() => {
-    let formValuesCopy = { ...formValues };
-    if (checkboxes) {
-      Object.values(checkboxes).forEach((checkbox) => {
-        if (checkbox.label === "createPrivateInvestor" && !formValuesCopy.privateInvestorListDisabled) {
-          formValuesCopy.privateInvestorListText = parse(checkbox.agreementText);
-        } else if (checkbox.label === "subscribeToProject" && !formValuesCopy.mailingListDisabled) {
-          formValuesCopy.mailingListText = parse(checkbox.agreementText);
-        }
-      });
-    }
-    if (user?._id) {
-      formValuesCopy.email = user.email;
-      formValuesCopy.name = user.username;
-      const projectSubscription = getProjectSubscription(user, project);
-      if (projectSubscription.isPrivateInvestor) {
-        formValuesCopy.privateInvestorListText = "You are already registered on the whitelist.";
-        formValuesCopy.privateInvestorList = true;
-        formValuesCopy.privateInvestorListDisabled = true;
-      } else if (projectSubscription.privateInvestorStatus && projectSubscription.privateInvestorStatus !== "Admitted") {
-        formValuesCopy.privateInvestorListText = "Your profile is under review. An account manager will reach out to you to confirm your eligibility.";
-        formValuesCopy.privateInvestorList = true;
-        formValuesCopy.privateInvestorListDisabled = true;
-      }
-      if (projectSubscription.isSubscribed) {
-        formValuesCopy.mailingList = true;
-        formValuesCopy.mailingListText = "You already subscribed to the email notification list.";
-        formValuesCopy.mailingListDisabled = true;
-      }
-    }
-    setFormValues(formValuesCopy);
-  }, [user, checkboxes, project, formValues]);
   const handleSubmit = useCallback(
     async (values) => {
       setFormValues((prev) => ({ ...prev, isSubmitting: true }));
       try {
         const dataToSend = {
-          email: values.email,
+          email: values.email || user?.email || "",
           projectId: project._id,
-          name: values.name,
+          name: values.name || resolveUserDisplayName(user),
           checkedCheckboxes: formValues.checkedCheckboxes,
           salesChannel: salesChannel ? salesChannel : window.location.pathname.includes("featured-assets") ? "featuredAssets" : "investor"
         };
@@ -224,8 +197,8 @@ const useNewVentureForm = ({ project, user, salesChannel, customSuccessMessage }
       });
     }
     if (user?._id) {
-      formValuesCopy.email = user.email;
-      formValuesCopy.name = user.username;
+      formValuesCopy.email = user.email || "";
+      formValuesCopy.name = resolveUserDisplayName(user);
       const projectSubscription = getProjectSubscription(user, project);
       if (projectSubscription.isPrivateInvestor) {
         formValuesCopy.privateInvestorListText = "You are already registered on the whitelist.";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stokr/components-library",
-  "version": "3.0.45",
+  "version": "3.0.47",
   "description": "STOKR - Components Library",
   "author": "Bilal Hodzic <bilal@stokr.io>",
   "license": "MIT",