change the message validation data and add alkhalil area in the quest…

…ion file #183
GSG-G8 · Jun 9, 2020 · 2264f55 · 2264f55
1 parent 82d2740
commit 2264f55
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/client/src/components/application/NonlinearStepper/GeneralInfo.js b/client/src/components/application/NonlinearStepper/GeneralInfo.js
@@ -21,9 +21,9 @@ const GereralInfos = ({ handleFormInput, formValues, errorMsg }) => {
     advertisement,
     codeExperience,
     primaryMotivationForm,
+    KhalilAreas,
   } = selectBoxQuestions;
 
-  const KhalilAreas = ['Old Town', 'New Town'];
   return (
     <div className="availability">
       <div className={classes.gender}>
@@ -121,7 +121,7 @@ const GereralInfos = ({ handleFormInput, formValues, errorMsg }) => {
         }
         setVal={handleFormInput}
         value={formValues.university}
-        isError={errorMsg.includes('Chose your university')}
+        isError={errorMsg.includes('Select your university')}
       />
       <InputText
         className="nonlinearSelect"
@@ -158,7 +158,7 @@ const GereralInfos = ({ handleFormInput, formValues, errorMsg }) => {
         items={advertisement}
         setVal={handleFormInput}
         value={formValues.caReading}
-        isError={errorMsg.includes('Select how you here about Us first')}
+        isError={errorMsg.includes('Select how did you hear about Us first')}
       />
       <InputText
         className="nonlinearSelect"

diff --git a/client/src/components/application/NonlinearStepper/ProInfos.js b/client/src/components/application/NonlinearStepper/ProInfos.js
@@ -56,7 +56,7 @@ const ProInfos = ({ handleFormInput, formValues, errorMsg }) => (
       name="jobTitle"
       message="Write [No] if you are not employed"
       onChange={handleFormInput}
-      isError={errorMsg.includes(`if you don't have job just write [ No ]`)}
+      isError={errorMsg.includes(`if you don't have job just write N/A`)}
     />
   </div>
 );

diff --git a/client/src/components/application/NonlinearStepper/questions.js b/client/src/components/application/NonlinearStepper/questions.js
@@ -53,6 +53,7 @@ const primaryMotivationForm = [
   "I want to learn something new - I don't know if I want a coding career",
   'I want to be part of the GSG and Code Academy community',
 ];
+const KhalilAreas = ['Old Town', 'New Town'];
 
 export default {
   GazaAreas,
@@ -61,4 +62,5 @@ export default {
   advertisement,
   codeExperience,
   primaryMotivationForm,
+  KhalilAreas,
 };
diff --git a/client/src/utils/application/nLinearStepperValidation.js b/client/src/utils/application/nLinearStepperValidation.js
@@ -20,7 +20,10 @@ const generalInfosSchema = yup.object().shape({
     .string()
     .required(`Select your primary motivation first`)
     .trim(),
-  caReading: yup.string().required(`Select how you here about Us first`).trim(),
+  caReading: yup
+    .string()
+    .required(`Select how did you hear about Us first`)
+    .trim(),
   cvLink: yup
     .string()
     .matches(