Merge branch 'dev' into feat/termsAndConditions

hackmcgill · Nov 15, 2024 · 6b90368 · 6b90368
2 parents 2be7b52 + 5b6abd6
commit 6b90368
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/middlewares/validators/validator.helper.js b/middlewares/validators/validator.helper.js
@@ -506,6 +506,7 @@ function applicationValidator(fieldLocation, fieldname, optional = true) {
                     hasValid.sendEmail &&
                     hasValid.country &&
                     hasValid.sendEmail &&
+                    hasValid.country &&
                     hasValid.privacyPolicy &&
                     hasValid.codeOfConduct
                 );
@@ -616,6 +617,7 @@ function applicationValidator(fieldLocation, fieldname, optional = true) {
                     hasValid.shirtSize &&
                     hasValid.other &&
                     hasValid.ethnicity &&
+                    hasValid.country &&
                     hasValid.privacyPolicy &&
                     hasValid.codeOfConduct
                 );

diff --git a/routes/api/hacker.js b/routes/api/hacker.js
@@ -126,7 +126,6 @@ module.exports = {
                         "ethnicity": "Asian or Pacific Islander",
                         "sendEmail": true,
                         "country": "Canada",
-                        "sendEmail": true,
                         "privacyPolicy": true,
                         "codeOfConduct": true,
                       }