Fix input validation with email and binary choice fields

TritonSE · Mar 19, 2024 · dd076f3 · dd076f3
1 parent 2d1127b
commit dd076f3
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/frontend/src/app/vsr/page.tsx b/frontend/src/app/vsr/page.tsx
@@ -726,10 +726,6 @@ const VeteranServiceRequest: React.FC = () => {
                         placeholder="e.g. [email protected]"
                         {...register("email", {
                           required: "Email Address is required",
-                          pattern: {
-                            value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
-                            message: "Invalid Email Address",
-                          },
                         })}
                         required
                         error={!!errors.email}
@@ -835,7 +831,8 @@ const VeteranServiceRequest: React.FC = () => {
                     name="serviceConnected"
                     control={control}
                     rules={{
-                      validate: (value) => value !== null || "Service connected is required",
+                      validate: (value) =>
+                        [true, false].includes(value) || "Service connected is required",
                     }}
                     render={({ field }) => (
                       <BinaryChoice
@@ -893,7 +890,8 @@ const VeteranServiceRequest: React.FC = () => {
                     name="petCompanion"
                     control={control}
                     rules={{
-                      validate: (value) => value !== null || "Service connected is required",
+                      validate: (value) =>
+                        [true, false].includes(value) || "Companionship animal is required",
                     }}
                     render={({ field }) => (
                       <BinaryChoice