merge: Fixed conflicts between main and dev

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

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/apps/eo_web/src/router/Router.tsx b/apps/eo_web/src/router/Router.tsx
@@ -99,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} />

diff --git a/apps/eo_web/src/screens/Cancer/SurveyForm.tsx b/apps/eo_web/src/screens/Cancer/SurveyForm.tsx
@@ -27,7 +27,7 @@ export const SurveyForm = () => {
 
   useEffect(() => {
     jotformScript(formId);
-  }, []);
+  }, [formId]);
   return (
     <LayoutDefault>
       <div className="mb-10 flex h-screen flex-col">