[RELEASE]

apps/eo_web/dist/manifest.json

@@ -8,17 +8,17 @@
     "src": "../../packages/ui/src/assets/avatar.svg"
   },
   "src/main.css": {
-    "file": "assets/main-f8165bac.css",
+    "file": "assets/main-e8b543da.css",
     "src": "src/main.css"
   },
   "src/main.tsx": {
     "assets": [
       "assets/UploadFile-694e44b5.svg"
     ],
     "css": [
-      "assets/main-f8165bac.css"
+      "assets/main-e8b543da.css"
     ],
-    "file": "assets/main-65de2abd.js",
+    "file": "assets/main-1ee8dd76.js",
     "isEntry": true,
     "src": "src/main.tsx"
   }

apps/eo_web/src/App.tsx

@@ -24,7 +24,8 @@ interface EnvironmentsConfigs {
   CANCER_INTRO_QUESTION_CAREGIVER_ID: string;
   CANCER_PROFILE_PATIENT_ID: string;
   CANCER_PROFILE_CAREGIVER_ID: string;
-  CANCER_SURVEY_FORM: string;
+  CANCER_PATIENT_SURVEY_ID: string;
+  CANCER_CAREGIVER_SURVEY_ID: string;
   ATHLETE_PROFILE_FORM: string;
   ATHLETE_SURVEY_FORM: string;
   SENIOR_INTRO_QUESTION_PATIENT_ID: string;

apps/eo_web/src/components/Header.tsx

@@ -36,7 +36,7 @@ export const Header = () => {
         viewBox="0 0 42 20"
         fill="none"
         onClick={() => {
-          window.open("https://www.eo.care/you/privacy-policy", "_blank");
+          window.open("https://www.eo.care/web/privacy-policy", "_blank");
         }}
       >
         <path
@@ -53,7 +53,7 @@ export const Header = () => {
           <>
             <icons.PrivacyPolicyIcon
               onClick={() => {
-                window.open("https://www.eo.care/you/privacy-policy", "_blank");
+                window.open("https://www.eo.care/web/privacy-policy", "_blank");
               }}
               className="h-8 w-8 rounded-full stroke-2"
             />
@@ -67,7 +67,7 @@ export const Header = () => {
             <Button
               variant="tertiary-link"
               onClick={() => {
-                window.open("https://www.eo.care/you/privacy-policy", "_blank");
+                window.open("https://www.eo.care/web/privacy-policy", "_blank");
               }}
               font="regular"
             >
@@ -90,7 +90,7 @@ export const Header = () => {
         )}
       </div>
       {/* eslint-disable-next-line @typescript-eslint/no-empty-function */}
-      <Modal isOpen={openModal} onClose={() => {}} controller={setOpenModal}>
+      <Modal isOpen={openModal} onClose={() => { }} controller={setOpenModal}>
         <div
           className="flex h-full w-full flex-col justify-center rounded-3xl bg-white px-10 py-[50px] leading-[48px]
                     shadow-lg md:px-[60px] md:py-20"
@@ -99,7 +99,6 @@ export const Header = () => {
             variant="large"
             className="mb-4 text-[32px] font-bold leading-7 md:mb-6"
           >
-            {}
             We’re here.
           </Typography>
           <Typography
@@ -145,10 +144,10 @@ export const Header = () => {
               >
                 Email{" "}
                 <a
-                  href="mailto:members@eo.care"
+                  href="mailto:support@eo.care"
                   className="underline decoration-1 underline-offset-8"
                 >
-                  members@eo.care
+                  support@eo.care
                 </a>
               </Typography>
             </li>

apps/eo_web/src/configs/env.ts

@@ -13,8 +13,10 @@ export const CANCER_PROFILE_PATIENT_ID =
   window.data.getEnv("CANCER_PROFILE_PATIENT_ID") || 232564063321650;
 export const CANCER_PROFILE_CAREGIVER_ID =
   window.data.getEnv("CANCER_PROFILE_CAREGIVER_ID") || 232564208467662;
-export const CANCER_SURVEY_ID =
-  window.data.getEnv("CANCER_SURVEY_FORM") || 232885421299668;
+export const CANCER_PATIENT_SURVEY_ID =
+  window.data.getEnv("CANCER_PATIENT_SURVEY_ID") || 232885421299668;
+export const CANCER_CAREGIVER_SURVEY_ID =
+  window.data.getEnv("CANCER_CAREGIVER_SURVEY_ID") || 233415093176152;
 
 export const ATHLETE_PROFILE_FORM =
   window.data.getEnv("ATHLETE_PROFILE_FORM") || 233115151709146;

apps/eo_web/src/copy/copy.tsx

@@ -60,7 +60,7 @@ export const faqs: Copy[] = [
   {
     title: "How much does eo cost?",
     content:
-      "Your care is completely free. And we’ll reimburse you for the cost of your products. Just send a picture of your receipt to members@eo.care each time you make a purchase and we’ll provide you with an Amazon gift card in an equal amount.",
+      "Your care is completely free. And we’ll reimburse you for the cost of your products. Just send a picture of your receipt to support@eo.care each time you make a purchase and we’ll provide you with an Amazon gift card in an equal amount.",
   },
   {
     title:
@@ -145,11 +145,11 @@ export const faqs: Copy[] = [
     title:
       "Can I use a different dispensary or delivery provider than the one you’ve recommended?",
     content:
-      "The answer is an honest “maybe”. If you’d like to make a change just email us at members@eo.care or call 877-707-0706. We’ll do everything we can to accommodate your request.",
+      "The answer is an honest “maybe”. If you’d like to make a change just email us at support@eo.care or call 877-707-0706. We’ll do everything we can to accommodate your request.",
   },
   {
     title: "What happens if I run out of a particular product?",
     content:
-      "No problem. Just email us at members@eo.care or call 877-707-0706. We’ll update your care plan in the very near term to accommodate the absence of that product if/as appropriate and coordinate the ordering of the needed product or a responsible replacement.",
+      "No problem. Just email us at support@eo.care or call 877-707-0706. We’ll update your care plan in the very near term to accommodate the absence of that product if/as appropriate and coordinate the ordering of the needed product or a responsible replacement.",
   },
 ];

apps/eo_web/src/router/Router.tsx

@@ -22,7 +22,6 @@ import { RegisterComplete } from "~/screens/RegisterComplete";
 import { Profiling as SeniorProfiling } from "~/screens/Senior/Profiling";
 import { SeniorSurveyForm } from "~/screens/Senior/SeniorSurveyForm";
 import { SeniorSurveyThankYou } from "~/screens/Senior/SeniorSurveyThankYou";
-import { SurveyThankYou } from "~/screens/SurveyThankYou";
 import { UnavailableZipCode } from "~/screens/UnavailableZipCode";
 import { UserRolSelector } from "~/screens/UserRolSelector";
 import { ZipCodeValidation } from "~/screens/ZipCodeValidation";
@@ -100,7 +99,7 @@ export const Router = () => {
       <Route element={<Profiling />} path={ROUTES.cancerForm} />
 
       <Route element={<SurveyForm />} path={ROUTES.cancerSurvey} />
-      <Route element={<SurveyThankYou />} path={ROUTES.cancerSurveyThankYou} />
+      <Route element={<SeniorSurveyThankYou />} path={ROUTES.cancerSurveyThankYou} />
 
       {/* ATHLETES */}
       <Route element={<AthleteSurveyForm />} path={ROUTES.athleteSurvey} />

apps/eo_web/src/screens/AccountCreation.tsx

@@ -25,9 +25,16 @@ export const signUpSchema = z.object({
     .min(1, { message: "Email is required" })
     .email({ message: "Enter a valid email." }),
   phoneNumber: z
-    .string()
-    .length(10, { message: "Contact number must be 10 digits" })
-    .regex(/^[0-9]+$/, { message: "Enter a valid phone number." }),
+    .string().superRefine((phoneNumber, ctx) => {
+      const phoneWithOnlyNumbers = phoneNumber.replace(/\D/g, "");
+      const numberOfDigits = phoneWithOnlyNumbers.length;
+      if (numberOfDigits !== 10) {
+        ctx.addIssue({
+          code: "custom",
+          message: "Contact number must be 10 digits"
+        });
+      }
+    }),
   password: z
     .string()
     .regex(
@@ -91,7 +98,7 @@ export const AccountCreation = () => {
       setValidatingForm(false);
       return;
     } else {
-      setAccountData(data);
+      setAccountData({ ...data, phoneNumber: data.phoneNumber.replace(/\D/g, "") });
 
       switch (channel) {
         case "cancer":
@@ -204,7 +211,7 @@ export const AccountCreation = () => {
                       className={tw(
                         "font-nunito text-[11px] font-light ",
                         errors.agreeReceiveNotifications?.message &&
-                          "text-red-500",
+                        "text-red-500",
                       )}
                     >
                       I agree to receive emails and text messages.
@@ -225,7 +232,7 @@ export const AccountCreation = () => {
                       className={tw(
                         "font-nunito text-[11px] font-light !leading-4",
                         errors.agreeTermsAndConditions?.message &&
-                          "text-red-500",
+                        "text-red-500",
                       )}
                     >
                       I have read and agree to the{" "}

apps/eo_web/src/screens/Athlete/AthleteSurveyThankYou.tsx

@@ -61,7 +61,7 @@ export const AthleteSurveyThankYou = () => {
           <br />
           Thank you! <br />
           <br />
-          Have questions? We’re here. Email members@eo.care, call{" "}
+          Have questions? We’re here. Email support@eo.care, call{" "}
           <a href="tel:+1-877-707-0706">877-707-0706</a>, or schedule a free
           consultation.
         </Typography>

apps/eo_web/src/screens/Cancer/SurveyForm.tsx

@@ -1,33 +1,44 @@
 import { useEffect } from "react";
 import { useSearchParams } from "react-router-dom";
 
-import { CANCER_SURVEY_ID } from "~/configs/env";
+import {
+  CANCER_CAREGIVER_SURVEY_ID,
+  CANCER_PATIENT_SURVEY_ID,
+} from "~/configs/env";
 import { jotformScript } from "~/helpers/jotform_script";
 import { LayoutDefault } from "~/layouts";
 
 
-
-
-
 export const SurveyForm = () => {
   const [searchParams] = useSearchParams();
+  const email = searchParams.get("email") ?? "";
+  const profiled = searchParams.get("profiled") ?? "patient";
+  const symptoms = searchParams.get("symptoms") ?? "";
+
+  const formId =
+    profiled === "patient"
+      ? CANCER_PATIENT_SURVEY_ID
+      : CANCER_CAREGIVER_SURVEY_ID;
 
-  const email = searchParams.get("email") || "";
+  const params = new URLSearchParams({
+    email,
+    symptoms,
+  });
 
   useEffect(() => {
-    jotformScript(CANCER_SURVEY_ID);
-  }, []);
+    jotformScript(formId);
+  }, [formId]);
   return (
     <LayoutDefault>
       <div className="mb-10 flex h-screen flex-col">
         <iframe
-          id={`JotFormIFrame-${CANCER_SURVEY_ID}`}
+          id={`JotFormIFrame-${formId}`}
           title=""
           onLoad={() => window.parent.scrollTo(0, 0)}
           allow="geolocation; microphone; camera"
           allowTransparency={true}
           allowFullScreen={true}
-          src={`https://form.jotform.com/${CANCER_SURVEY_ID}?email=${email}`}
+          src={`https://form.jotform.com/${formId}?${params.toString()}`}
           className="h-full w-full"
           style={{
             minWidth: "100%",

apps/eo_web/src/screens/PrePlanV2.tsx

@@ -250,7 +250,7 @@ export const PrePlanV2 = () => {
                     following phone number: 877-707-0706. Our representatives
                     will be delighted to assist you and address any inquiries
                     you may have. Alternatively, you can also send us an email
-                    at members@eo.care. Our support team regularly checks this
+                    at support@eo.care. Our support team regularly checks this
                     email and will respond to you as soon as possible.
                   </Typography>
                 </div>
@@ -291,9 +291,8 @@ export const PrePlanV2 = () => {
                     }
                     className="mx-auto my-3"
                     onClick={() => {
-                      window.location.href = `/${union}/profile-onboarding?malady=${
-                        jotformAnswers?.malady || "Pain"
-                      }&union=${union}`;
+                      window.location.href = `/${union}/profile-onboarding?malady=${jotformAnswers?.malady || "Pain"
+                        }&union=${union}`;
                     }}
                   >
                     <Typography font="medium">Redirect</Typography>

apps/eo_web/src/screens/ProfilingThankYou.tsx

@@ -86,23 +86,26 @@ export const ProfilingThankYou = () => {
           font="regular"
           className="text-center text-[22px] font-normal leading-[36px]"
         >
-          You’ll be able to review your your initial, personalized,
+          You’ll be able to review your initial, personalized,
           clinician-approved
-          <br /> care plan within 24 hours. When you’re care plan is ready, we
+          <br /> care plan within 24 hours. When your care plan is ready, we
           will send you an email
           <br /> with a link to{" "}
           <span className="cursor-pointer underline" onClick={goToWebApp}>
             log into your account.
           </span>
           <br />
           <br />
-          Have questions? We’re here. Email members@eo.care, call
+          Have questions? We’re here. Email support@eo.care, call
           <br />
           <a href="tel:+1-877-707-0706">877-707-0706</a>, or schedule a free
           consultation.
         </Typography>
       </section>
       <section className="bg-white px-6 py-12 md:px-[50px] md:py-[100px] ">
+        <Typography font="bold" variant="large" className="mb-20 text-center">
+          How eo care plans work
+        </Typography>
         <EoCarousel>
           {CarrouselItems.map(({ title, content, step, icon: Icon }) => (
             <article
@@ -146,7 +149,7 @@ export const ProfilingThankYou = () => {
           </div>
         </div>
       </section>
-      <section className="w-full bg-white px-6 py-12 md:px-[50px] md:py-[100px]">
+      <section className="hidden w-full bg-white px-6 py-12 md:px-[50px] md:py-[100px]">
         <div className="flex flex-col items-center">
           <Typography
             font="bold"

apps/eo_web/src/screens/Senior/SeniorSurveyThankYou.tsx

@@ -58,7 +58,7 @@ export const SeniorSurveyThankYou = () => {
           <br />
           Thank you! <br />
           <br />
-          Have questions? We’re here. Email members@eo.care, call{" "}
+          Have questions? We’re here. Email support@eo.care, call{" "}
           <a href="tel:+1-877-707-0706">877-707-0706</a>, or schedule a free
           consultation.
         </Typography>

apps/eo_web/src/screens/SurveyThankYou.tsx

@@ -10,10 +10,7 @@ import { useMount } from "~/hooks/useMount";
 import { LayoutDefault } from "~/layouts";
 
 
-
-
-
-export const SurveyThankYou = () => {
+export const SeniorSurveyThankYou = () => {
   const [searchParams] = useSearchParams();
 
   const submission_id = searchParams.get("submission_id") || "";
@@ -24,11 +21,11 @@ export const SurveyThankYou = () => {
     navigate("/");
   }
 
-  const { postCancerSurveyFormSubmission } = useApi();
+  const { postSeniorSurveyFormSubmission } = useApi();
 
   const { mutate } = useMutation({
-    mutationFn: postCancerSurveyFormSubmission,
-    mutationKey: ["postCancerSurveyFormSubmission", submission_id],
+    mutationFn: postSeniorSurveyFormSubmission,
+    mutationKey: ["postSeniorSurveyFormSubmission", submission_id],
     onError: (result) => {
       if (axios.isAxiosError(result)) {
         if (result.response?.status !== 200) {
@@ -55,16 +52,16 @@ export const SurveyThankYou = () => {
         <Typography
           variant="base"
           font="regular"
-          className="font-nunito text-center text-[28px] font-light leading-[40px]"
+          className="text-center font-nunito text-[28px] font-light leading-[40px]"
         >
           We receive your feedback! <br />
           <br />
           Thank you! <br />
           <br />
           Have a question? We’re here to help.
-          Email members@eo.care, call 877.707.0706, or schedule a free consultation.
+          Email support@eo.care, call 877.707.0706, or schedule a free consultation.
           <br />
-          Have questions? We’re here to help. Email <a href="mailto:members@eo.care">members@eo.care</a>, call&nbsp;
+          Have questions? We’re here to help. Email <a href="mailto:support@eo.care">support@eo.care</a>, call&nbsp;
           <a href="tel:+1-877-707-0706">877.707.0706</a>, or&nbsp;
           <span className="underline">schedule a free consultation</span>.
         </Typography>