From a316bb616f1eae2f8530c06b8aae6962ed73232c Mon Sep 17 00:00:00 2001
From: Colin Toft <cwt1078@gmail.com>
Date: Fri, 23 Aug 2024 15:34:06 -0400
Subject: [PATCH] Fix validation for edit meal request modal

---
 frontend/src/pages/EditMealRequestForm.tsx | 24 ++++++++--------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/frontend/src/pages/EditMealRequestForm.tsx b/frontend/src/pages/EditMealRequestForm.tsx
index 2aeb2a27..a3bafe92 100644
--- a/frontend/src/pages/EditMealRequestForm.tsx
+++ b/frontend/src/pages/EditMealRequestForm.tsx
@@ -290,13 +290,6 @@ const EditMealRequestForm = ({
       }
     }
 
-    if (!isEditDonation) {
-      if (deliveryInstructions === "") {
-        setAttemptedSubmit(true);
-        return false;
-      }
-    }
-
     setAttemptedSubmit(false);
     return true;
   };
@@ -527,16 +520,17 @@ const EditMealRequestForm = ({
               </Text>
 
               {!isUpcoming ? (
-                <FormControl mt={3} mb={6} isRequired>
+                <FormControl
+                  mt={3}
+                  mb={6}
+                  isRequired
+                  isInvalid={attemptedSubmit && numberOfMeals <= 0}
+                >
                   <FormLabel
                     variant={{
                       base: "mobile-form-label-bold",
                       md: "form-label-bold",
                     }}
-
-                    // TODO: Hook this up to a state variable
-                    // TODO: Setup correct validation for this
-                    // isInvalid={attemptedSubmit && }
                   >
                     Number of meals
                   </FormLabel>
@@ -552,7 +546,7 @@ const EditMealRequestForm = ({
               ) : null}
 
               {!isUpcoming ? (
-                <FormControl mt={3} mb={6} isRequired>
+                <FormControl mt={3} mb={6}>
                   <FormLabel
                     variant={{
                       base: "mobile-form-label-bold",
@@ -569,14 +563,12 @@ const EditMealRequestForm = ({
                 </FormControl>
               ) : null}
 
-              <FormControl mt={3} mb={6} isRequired>
+              <FormControl mt={3} mb={6}>
                 <FormLabel
                   variant={{
                     base: "mobile-form-label-bold",
                     md: "form-label-bold",
                   }}
-                  // TODO: Setup correct validation for this
-                  // isInvalid={attemptedSubmit && }
                 >
                   Delivery Notes
                 </FormLabel>