merge: Fixed conflicts between main and dev:

Light-it-labs · Dec 28, 2023 · 1d37166 · 1d37166
1 parent c30fe8a
commit 1d37166
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 159 deletions.
diff --git a/apps/eo_web/dist/assets/main-68403277.js → apps/eo_web/dist/assets/main-1ee8dd76.js b/apps/eo_web/dist/assets/main-68403277.js → apps/eo_web/dist/assets/main-1ee8dd76.js
diff --git a/apps/eo_web/dist/assets/main-65de2abd.js b/apps/eo_web/dist/assets/main-65de2abd.js
diff --git a/apps/eo_web/dist/assets/main-f8165bac.css b/apps/eo_web/dist/assets/main-f8165bac.css
diff --git a/apps/eo_web/dist/manifest.json b/apps/eo_web/dist/manifest.json
@@ -18,7 +18,7 @@
     "css": [
       "assets/main-e8b543da.css"
     ],
-    "file": "assets/main-68403277.js",
+    "file": "assets/main-1ee8dd76.js",
     "isEntry": true,
     "src": "src/main.tsx"
   }

diff --git a/apps/eo_web/src/router/Router.tsx b/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";

diff --git a/apps/eo_web/src/screens/SurveyThankYou.tsx b/apps/eo_web/src/screens/SurveyThankYou.tsx
@@ -21,11 +21,7 @@ export const SeniorSurveyThankYou = () => {
     navigate("/");
   }
 
-<<<<<<<< HEAD:apps/eo_web/src/screens/SurveyThankYou.tsx
-  const { postCancerSurveyFormSubmission } = useApi();
-========
   const { postSeniorSurveyFormSubmission } = useApi();
->>>>>>>> main:apps/eo_web/src/screens/Senior/SeniorSurveyThankYou.tsx
 
   const { mutate } = useMutation({
     mutationFn: postSeniorSurveyFormSubmission,
@@ -56,11 +52,7 @@ export const SeniorSurveyThankYou = () => {
         <Typography
           variant="base"
           font="regular"
-<<<<<<<< HEAD:apps/eo_web/src/screens/SurveyThankYou.tsx
-          className="font-nunito text-center text-[28px] font-light leading-[40px]"
-========
           className="text-center font-nunito text-[28px] font-light leading-[40px]"
->>>>>>>> main:apps/eo_web/src/screens/Senior/SeniorSurveyThankYou.tsx
         >
           We receive your feedback! <br />
           <br />