From 02ff7fb2292e2ef892d627a1ce6b8709f5640f37 Mon Sep 17 00:00:00 2001
From: Kshitij Verma <kshitijv250@gmail.com>
Date: Mon, 20 Nov 2023 23:36:27 +0530
Subject: [PATCH 1/5] showing errors wrong number in PhoneNumberFormField

---
 src/Components/Shifting/ListFilter.tsx | 1 -
 src/Components/Users/UserFilter.tsx    | 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/Components/Shifting/ListFilter.tsx b/src/Components/Shifting/ListFilter.tsx
index c5b3555e8c4..ef366d5b038 100644
--- a/src/Components/Shifting/ListFilter.tsx
+++ b/src/Components/Shifting/ListFilter.tsx
@@ -410,7 +410,6 @@ export default function ListFilter(props: any) {
         name="patient_phone_number"
         value={filterState.patient_phone_number}
         onChange={handleFormFieldChange}
-        errorClassName="hidden"
         types={["mobile", "landline"]}
       />
       <DateRangeFormField
diff --git a/src/Components/Users/UserFilter.tsx b/src/Components/Users/UserFilter.tsx
index 1450e6b6f79..0bfd1d1bc87 100644
--- a/src/Components/Users/UserFilter.tsx
+++ b/src/Components/Users/UserFilter.tsx
@@ -141,7 +141,6 @@ export default function UserFilter(props: any) {
         placeholder="Phone Number"
         value={filterState.phone_number}
         onChange={handleChange}
-        errorClassName="hidden"
         types={["mobile", "landline"]}
       />
 
@@ -151,7 +150,6 @@ export default function UserFilter(props: any) {
         placeholder="WhatsApp Phone Number"
         value={filterState.alt_phone_number}
         onChange={handleChange}
-        errorClassName="hidden"
         types={["mobile"]}
       />
     </FiltersSlideover>

From 68be61d5e073e527a606b6571482c2a8bb368e0e Mon Sep 17 00:00:00 2001
From: Kshitij Verma <kshitijv250@gmail.com>
Date: Sat, 25 Nov 2023 22:21:15 +0530
Subject: [PATCH 2/5] made error field show only when there is an error

---
 src/Components/Form/FormFields/FormField.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Components/Form/FormFields/FormField.tsx b/src/Components/Form/FormFields/FormField.tsx
index af5a3e91804..d1efb79a8c3 100644
--- a/src/Components/Form/FormFields/FormField.tsx
+++ b/src/Components/Form/FormFields/FormField.tsx
@@ -71,7 +71,12 @@ const FormField = ({
         )}
       </div>
       <div className={field?.className}>{children}</div>
-      <FieldErrorText error={field?.error} className={field?.errorClassName} />
+      {field?.error ? (
+        <FieldErrorText
+          error={field?.error}
+          className={field?.errorClassName}
+        />
+      ) : null}
     </div>
   );
 };

From 82f7c9e5d0c285fd0f637fe1b871a603c7882b77 Mon Sep 17 00:00:00 2001
From: Kshitij Verma <101321276+kshitijv256@users.noreply.github.com>
Date: Sat, 25 Nov 2023 23:52:08 +0530
Subject: [PATCH 3/5] Update src/Components/Form/FormFields/FormField.tsx

Co-authored-by: Rithvik Nishad <rithvikn2001@gmail.com>
---
 src/Components/Form/FormFields/FormField.tsx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Components/Form/FormFields/FormField.tsx b/src/Components/Form/FormFields/FormField.tsx
index d1efb79a8c3..af5a3e91804 100644
--- a/src/Components/Form/FormFields/FormField.tsx
+++ b/src/Components/Form/FormFields/FormField.tsx
@@ -71,12 +71,7 @@ const FormField = ({
         )}
       </div>
       <div className={field?.className}>{children}</div>
-      {field?.error ? (
-        <FieldErrorText
-          error={field?.error}
-          className={field?.errorClassName}
-        />
-      ) : null}
+      <FieldErrorText error={field?.error} className={field?.errorClassName} />
     </div>
   );
 };

From 1d3e348e386864f48e213339d3a76c6b0d6f2e67 Mon Sep 17 00:00:00 2001
From: Kshitij Verma <kshitijv250@gmail.com>
Date: Sun, 26 Nov 2023 00:05:33 +0530
Subject: [PATCH 4/5] changed margin to remove extra space in userfilter

---
 src/Components/Users/UserFilter.tsx | 38 +++++++++++++++--------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/Components/Users/UserFilter.tsx b/src/Components/Users/UserFilter.tsx
index 0bfd1d1bc87..e380f5eaa07 100644
--- a/src/Components/Users/UserFilter.tsx
+++ b/src/Components/Users/UserFilter.tsx
@@ -134,24 +134,26 @@ export default function UserFilter(props: any) {
           errors={""}
         />
       </div>
-
-      <PhoneNumberFormField
-        label="Phone Number"
-        name="phone_number"
-        placeholder="Phone Number"
-        value={filterState.phone_number}
-        onChange={handleChange}
-        types={["mobile", "landline"]}
-      />
-
-      <PhoneNumberFormField
-        label="Whatsapp Number"
-        name="alt_phone_number"
-        placeholder="WhatsApp Phone Number"
-        value={filterState.alt_phone_number}
-        onChange={handleChange}
-        types={["mobile"]}
-      />
+      <div className="mb-[-16px]">
+        <PhoneNumberFormField
+          label="Phone Number"
+          name="phone_number"
+          placeholder="Phone Number"
+          value={filterState.phone_number}
+          onChange={handleChange}
+          types={["mobile", "landline"]}
+        />
+      </div>
+      <div className="mb-[-16px]">
+        <PhoneNumberFormField
+          label="Whatsapp Number"
+          name="alt_phone_number"
+          placeholder="WhatsApp Phone Number"
+          value={filterState.alt_phone_number}
+          onChange={handleChange}
+          types={["mobile"]}
+        />
+      </div>
     </FiltersSlideover>
   );
 }

From 21d33aba0e86e3583357033bc2a95e89f111dfd9 Mon Sep 17 00:00:00 2001
From: Rithvik Nishad <rithvikn2001@gmail.com>
Date: Sun, 26 Nov 2023 00:25:56 +0530
Subject: [PATCH 5/5] Apply suggestions from code review

---
 src/Components/Users/UserFilter.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Components/Users/UserFilter.tsx b/src/Components/Users/UserFilter.tsx
index e380f5eaa07..3dca52d2463 100644
--- a/src/Components/Users/UserFilter.tsx
+++ b/src/Components/Users/UserFilter.tsx
@@ -134,7 +134,7 @@ export default function UserFilter(props: any) {
           errors={""}
         />
       </div>
-      <div className="mb-[-16px]">
+      <div className="-mb-4">
         <PhoneNumberFormField
           label="Phone Number"
           name="phone_number"
@@ -144,7 +144,7 @@ export default function UserFilter(props: any) {
           types={["mobile", "landline"]}
         />
       </div>
-      <div className="mb-[-16px]">
+      <div className="-mb-4">
         <PhoneNumberFormField
           label="Whatsapp Number"
           name="alt_phone_number"