From 1fd83f98c4bd75088af061dff902e5209350ef38 Mon Sep 17 00:00:00 2001
From: AdityaJ2305 <adityajindal2305@gmail.com>
Date: Fri, 27 Dec 2024 16:26:09 +0530
Subject: [PATCH 01/10] fix note card issue

---
 src/components/Facility/PatientNoteCard.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/Facility/PatientNoteCard.tsx b/src/components/Facility/PatientNoteCard.tsx
index 7896cbada4d..c1ea28276ff 100644
--- a/src/components/Facility/PatientNoteCard.tsx
+++ b/src/components/Facility/PatientNoteCard.tsx
@@ -207,7 +207,9 @@ const PatientNoteCard = ({
                 </div>
               </div>
             ) : (
-              <div className="text-sm text-secondary-700">{noteField}</div>
+              <div className="text-sm text-secondary-700 break-words">
+                {noteField}
+              </div>
             )}
           </div>
         }

From 70edafeedcaed5d4e9d8d2292ea4bcd6f68c9b7f Mon Sep 17 00:00:00 2001
From: AdityaJ2305 <adityajindal2305@gmail.com>
Date: Fri, 27 Dec 2024 16:37:50 +0530
Subject: [PATCH 02/10] fix current address issue

---
 src/components/Form/FormFields/TextAreaFormField.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/Form/FormFields/TextAreaFormField.tsx b/src/components/Form/FormFields/TextAreaFormField.tsx
index f26717810d4..c6b0071c9b2 100644
--- a/src/components/Form/FormFields/TextAreaFormField.tsx
+++ b/src/components/Form/FormFields/TextAreaFormField.tsx
@@ -44,6 +44,11 @@ const TextAreaFormField = forwardRef(
           )}
           onFocus={props.onFocus}
           onBlur={props.onBlur}
+          onKeyDown={(e) => {
+            if (e.key === "Enter") {
+              e.stopPropagation();
+            }
+          }}
         />
       </FormField>
     );

From 0e72cb16787d6a13572594dd22a13732b9426376 Mon Sep 17 00:00:00 2001
From: AdityaJ2305 <adityajindal2305@gmail.com>
Date: Fri, 27 Dec 2024 18:58:07 +0530
Subject: [PATCH 03/10] fix shift enter not working

---
 src/components/Form/FormFields/TextAreaFormField.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Form/FormFields/TextAreaFormField.tsx b/src/components/Form/FormFields/TextAreaFormField.tsx
index c6b0071c9b2..00307d6ca03 100644
--- a/src/components/Form/FormFields/TextAreaFormField.tsx
+++ b/src/components/Form/FormFields/TextAreaFormField.tsx
@@ -45,7 +45,7 @@ const TextAreaFormField = forwardRef(
           onFocus={props.onFocus}
           onBlur={props.onBlur}
           onKeyDown={(e) => {
-            if (e.key === "Enter") {
+            if (e.key === "Enter" && !e.shiftKey && !e.metaKey) {
               e.stopPropagation();
             }
           }}

From 4e905b42b575ed297de17613d3d801f90748dc82 Mon Sep 17 00:00:00 2001
From: AdityaJ2305 <adityajindal2305@gmail.com>
Date: Sat, 28 Dec 2024 01:00:29 +0530
Subject: [PATCH 04/10] fix broken action button

---
 src/components/Patient/PatientHome.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/Patient/PatientHome.tsx b/src/components/Patient/PatientHome.tsx
index b50c73ece88..3abe3a50fab 100644
--- a/src/components/Patient/PatientHome.tsx
+++ b/src/components/Patient/PatientHome.tsx
@@ -7,7 +7,6 @@ import CareIcon from "@/CAREUI/icons/CareIcon";
 
 import { Button } from "@/components/ui/button";
 
-import { AuthorizedButton } from "@/components/Common/AuthorizedButton";
 import ConfirmDialog from "@/components/Common/ConfirmDialog";
 import UserAutocomplete from "@/components/Common/UserAutocompleteFormField";
 
@@ -37,6 +36,7 @@ import {
   relativeDate,
 } from "../../Utils/utils";
 import { Avatar } from "../Common/Avatar";
+import ButtonV2 from "../Common/ButtonV2";
 import Loading from "../Common/Loading";
 import Page from "../Common/Page";
 import { SkillModel, UserBareMinimum } from "../Users/models";
@@ -523,7 +523,7 @@ export const PatientHome = (props: {
 
                     {NonReadOnlyUsers(authUser.user_type) && (
                       <div>
-                        <AuthorizedButton
+                        <ButtonV2
                           id="assign-volunteer"
                           onClick={() => setOpenAssignVolunteerDialog(true)}
                           disabled={false}
@@ -536,12 +536,12 @@ export const PatientHome = (props: {
                               ? t("update_volunteer")
                               : t("assign_to_volunteer")}
                           </span>
-                        </AuthorizedButton>
+                        </ButtonV2>
                       </div>
                     )}
 
                     <div>
-                      <AuthorizedButton
+                      <ButtonV2
                         id="patient-allow-transfer"
                         className="flex w-full flex-row bg-white font-semibold text-green-800 hover:bg-secondary-200"
                         disabled={
@@ -564,7 +564,7 @@ export const PatientHome = (props: {
                             ? t("disable_transfer")
                             : t("allow_transfer")}
                         </span>
-                      </AuthorizedButton>
+                      </ButtonV2>
                     </div>
                   </div>
                 </div>

From 559b3e31f64950fbb042055d49377f3017761da8 Mon Sep 17 00:00:00 2001
From: AdityaJ2305 <adityajindal2305@gmail.com>
Date: Sat, 28 Dec 2024 12:28:22 +0530
Subject: [PATCH 05/10] browser default submit

---
 src/components/Common/Breadcrumbs.tsx                | 1 +
 src/components/Form/Form.tsx                         | 5 -----
 src/components/Form/FormFields/TextAreaFormField.tsx | 5 -----
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/components/Common/Breadcrumbs.tsx b/src/components/Common/Breadcrumbs.tsx
index f55edd4ccf6..3ccc5494f75 100644
--- a/src/components/Common/Breadcrumbs.tsx
+++ b/src/components/Common/Breadcrumbs.tsx
@@ -97,6 +97,7 @@ export default function Breadcrumbs({
               <li className="mr-3 flex items-center">
                 <Button
                   variant="link"
+                  type="button"
                   className="rounded bg-gray-200/50 px-1 text-sm font-normal text-gray-800 transition hover:bg-gray-200/75 hover:no-underline"
                   size="xs"
                   onClick={() => {
diff --git a/src/components/Form/Form.tsx b/src/components/Form/Form.tsx
index 18f190ccc3c..5a3bf552b26 100644
--- a/src/components/Form/Form.tsx
+++ b/src/components/Form/Form.tsx
@@ -98,11 +98,6 @@ const Form = <T extends FormDetails>({
   return (
     <form
       onSubmit={handleSubmit}
-      onKeyDown={(e) => {
-        if (e.key === "Enter") {
-          handleSubmit(e);
-        }
-      }}
       className={classNames(
         "mx-auto w-full",
         !props.noPadding && "px-8 py-5 md:px-16 md:py-11",
diff --git a/src/components/Form/FormFields/TextAreaFormField.tsx b/src/components/Form/FormFields/TextAreaFormField.tsx
index 00307d6ca03..f26717810d4 100644
--- a/src/components/Form/FormFields/TextAreaFormField.tsx
+++ b/src/components/Form/FormFields/TextAreaFormField.tsx
@@ -44,11 +44,6 @@ const TextAreaFormField = forwardRef(
           )}
           onFocus={props.onFocus}
           onBlur={props.onBlur}
-          onKeyDown={(e) => {
-            if (e.key === "Enter" && !e.shiftKey && !e.metaKey) {
-              e.stopPropagation();
-            }
-          }}
         />
       </FormField>
     );

From 82fcb57f53131711e758929eca13ca911ad9795c Mon Sep 17 00:00:00 2001
From: AdityaJ2305 <adityajindal2305@gmail.com>
Date: Sun, 29 Dec 2024 21:24:42 +0530
Subject: [PATCH 06/10] Fix:on note tab

---
 src/components/Facility/PatientNoteCard.tsx | 50 +++++++++------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/components/Facility/PatientNoteCard.tsx b/src/components/Facility/PatientNoteCard.tsx
index 419dbdbf134..6dff025dd4a 100644
--- a/src/components/Facility/PatientNoteCard.tsx
+++ b/src/components/Facility/PatientNoteCard.tsx
@@ -1,7 +1,6 @@
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import dayjs from "dayjs";
 import { t } from "i18next";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 
 import CareIcon from "@/CAREUI/icons/CareIcon";
 
@@ -20,8 +19,7 @@ import { USER_TYPES_MAP } from "@/common/constants";
 
 import { Error, Success } from "@/Utils/Notifications";
 import routes from "@/Utils/request/api";
-import mutate from "@/Utils/request/mutate";
-import query from "@/Utils/request/query";
+import request from "@/Utils/request/request";
 import {
   classNames,
   formatDateTime,
@@ -31,6 +29,7 @@ import {
 
 const PatientNoteCard = ({
   note,
+  setReload,
   disableEdit,
   setReplyTo,
 }: {
@@ -45,25 +44,15 @@ const PatientNoteCard = ({
   const [showEditHistory, setShowEditHistory] = useState(false);
   const [editHistory, setEditHistory] = useState<PatientNotesEditModel[]>([]);
   const authUser = useAuthUser();
-  const queryClient = useQueryClient();
 
-  const { data, refetch } = useQuery({
-    queryKey: [patientId, note.id],
-    queryFn: query(routes.getPatientNoteEditHistory, {
+  const fetchEditHistory = async () => {
+    const { res, data } = await request(routes.getPatientNoteEditHistory, {
       pathParams: { patientId, noteId: note.id },
-    }),
-  });
-
-  const { mutate: updateNote } = useMutation({
-    mutationFn: mutate(routes.updatePatientNote, {
-      pathParams: { patientId, noteId: note.id },
-    }),
-    onSuccess: () => {
-      Success({ msg: "Note updated successfully" });
-      queryClient.invalidateQueries({ queryKey: ["notes", patientId] });
-      setIsEditing(false);
-    },
-  });
+    });
+    if (res?.status === 200) {
+      setEditHistory(data?.results ?? []);
+    }
+  };
 
   const onUpdateNote = async () => {
     if (noteField === note.note) {
@@ -80,15 +69,20 @@ const PatientNoteCard = ({
       return;
     }
 
-    updateNote(payload);
+    const { res } = await request(routes.updatePatientNote, {
+      pathParams: { patientId, noteId: note.id },
+      body: payload,
+    });
+    if (res?.status === 200) {
+      Success({ msg: "Note updated successfully" });
+      setIsEditing(false);
+      setReload(true);
+    }
   };
 
-  useEffect(() => {
-    setEditHistory(data?.results ?? []);
-  }, [data]);
-
   return (
     <>
+      {" "}
       <div
         className={classNames(
           "mt-4 flex w-full flex-col rounded-lg border border-secondary-300 bg-white p-3 text-secondary-800",
@@ -125,7 +119,7 @@ const PatientNoteCard = ({
                   <div
                     className="cursor-pointer text-xs text-secondary-600"
                     onClick={() => {
-                      refetch();
+                      fetchEditHistory();
                       setShowEditHistory(true);
                     }}
                   >
@@ -213,7 +207,7 @@ const PatientNoteCard = ({
                 </div>
               </div>
             ) : (
-              <div className="text-sm text-secondary-700 break-words">
+              <div className="text-sm text-secondary-700 break-all ">
                 {noteField}
               </div>
             )}

From d3b1d6031edacebfc606ece1a4f0c440cf4561d0 Mon Sep 17 00:00:00 2001
From: AdityaJ2305 <adityajindal2305@gmail.com>
Date: Mon, 30 Dec 2024 12:02:55 +0530
Subject: [PATCH 07/10] Fix:on note tab

---
 src/components/Facility/PatientNoteCard.tsx | 50 ++++++++++++---------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/components/Facility/PatientNoteCard.tsx b/src/components/Facility/PatientNoteCard.tsx
index 6dff025dd4a..ebcdc9a1d9a 100644
--- a/src/components/Facility/PatientNoteCard.tsx
+++ b/src/components/Facility/PatientNoteCard.tsx
@@ -1,6 +1,7 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import dayjs from "dayjs";
 import { t } from "i18next";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 
 import CareIcon from "@/CAREUI/icons/CareIcon";
 
@@ -19,7 +20,8 @@ import { USER_TYPES_MAP } from "@/common/constants";
 
 import { Error, Success } from "@/Utils/Notifications";
 import routes from "@/Utils/request/api";
-import request from "@/Utils/request/request";
+import mutate from "@/Utils/request/mutate";
+import query from "@/Utils/request/query";
 import {
   classNames,
   formatDateTime,
@@ -29,7 +31,6 @@ import {
 
 const PatientNoteCard = ({
   note,
-  setReload,
   disableEdit,
   setReplyTo,
 }: {
@@ -44,15 +45,25 @@ const PatientNoteCard = ({
   const [showEditHistory, setShowEditHistory] = useState(false);
   const [editHistory, setEditHistory] = useState<PatientNotesEditModel[]>([]);
   const authUser = useAuthUser();
+  const queryClient = useQueryClient();
 
-  const fetchEditHistory = async () => {
-    const { res, data } = await request(routes.getPatientNoteEditHistory, {
+  const { data, refetch } = useQuery({
+    queryKey: [patientId, note.id],
+    queryFn: query(routes.getPatientNoteEditHistory, {
       pathParams: { patientId, noteId: note.id },
-    });
-    if (res?.status === 200) {
-      setEditHistory(data?.results ?? []);
-    }
-  };
+    }),
+  });
+
+  const { mutate: updateNote } = useMutation({
+    mutationFn: mutate(routes.updatePatientNote, {
+      pathParams: { patientId, noteId: note.id },
+    }),
+    onSuccess: () => {
+      Success({ msg: "Note updated successfully" });
+      queryClient.invalidateQueries({ queryKey: ["notes", patientId] });
+      setIsEditing(false);
+    },
+  });
 
   const onUpdateNote = async () => {
     if (noteField === note.note) {
@@ -69,20 +80,15 @@ const PatientNoteCard = ({
       return;
     }
 
-    const { res } = await request(routes.updatePatientNote, {
-      pathParams: { patientId, noteId: note.id },
-      body: payload,
-    });
-    if (res?.status === 200) {
-      Success({ msg: "Note updated successfully" });
-      setIsEditing(false);
-      setReload(true);
-    }
+    updateNote(payload);
   };
 
+  useEffect(() => {
+    setEditHistory(data?.results ?? []);
+  }, [data]);
+
   return (
     <>
-      {" "}
       <div
         className={classNames(
           "mt-4 flex w-full flex-col rounded-lg border border-secondary-300 bg-white p-3 text-secondary-800",
@@ -119,7 +125,7 @@ const PatientNoteCard = ({
                   <div
                     className="cursor-pointer text-xs text-secondary-600"
                     onClick={() => {
-                      fetchEditHistory();
+                      refetch();
                       setShowEditHistory(true);
                     }}
                   >
@@ -207,7 +213,7 @@ const PatientNoteCard = ({
                 </div>
               </div>
             ) : (
-              <div className="text-sm text-secondary-700 break-all ">
+              <div className="text-sm text-secondary-700 break-all">
                 {noteField}
               </div>
             )}

From c66672205299d7552751eeaa8acd43151799ced4 Mon Sep 17 00:00:00 2001
From: AdityaJ2305 <adityajindal2305@gmail.com>
Date: Mon, 30 Dec 2024 12:16:18 +0530
Subject: [PATCH 08/10] revert third changes

---
 src/components/Patient/PatientHome.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/Patient/PatientHome.tsx b/src/components/Patient/PatientHome.tsx
index 3abe3a50fab..d31349e10e9 100644
--- a/src/components/Patient/PatientHome.tsx
+++ b/src/components/Patient/PatientHome.tsx
@@ -7,6 +7,7 @@ import CareIcon from "@/CAREUI/icons/CareIcon";
 
 import { Button } from "@/components/ui/button";
 
+import { AuthorizedButton } from "@/components/Common/AuthorizedButton";
 import ConfirmDialog from "@/components/Common/ConfirmDialog";
 import UserAutocomplete from "@/components/Common/UserAutocompleteFormField";
 
@@ -36,7 +37,6 @@ import {
   relativeDate,
 } from "../../Utils/utils";
 import { Avatar } from "../Common/Avatar";
-import ButtonV2 from "../Common/ButtonV2";
 import Loading from "../Common/Loading";
 import Page from "../Common/Page";
 import { SkillModel, UserBareMinimum } from "../Users/models";
@@ -523,7 +523,7 @@ export const PatientHome = (props: {
 
                     {NonReadOnlyUsers(authUser.user_type) && (
                       <div>
-                        <ButtonV2
+                        <AuthorizedButton
                           id="assign-volunteer"
                           onClick={() => setOpenAssignVolunteerDialog(true)}
                           disabled={false}
@@ -536,12 +536,12 @@ export const PatientHome = (props: {
                               ? t("update_volunteer")
                               : t("assign_to_volunteer")}
                           </span>
-                        </ButtonV2>
+                        </AuthorizedButton>
                       </div>
                     )}
 
                     <div>
-                      <ButtonV2
+                      <AuthorizedButton
                         id="patient-allow-transfer"
                         className="flex w-full flex-row bg-white font-semibold text-green-800 hover:bg-secondary-200"
                         disabled={
@@ -564,7 +564,7 @@ export const PatientHome = (props: {
                             ? t("disable_transfer")
                             : t("allow_transfer")}
                         </span>
-                      </ButtonV2>
+                      </AuthorizedButton>
                     </div>
                   </div>
                 </div>
@@ -725,4 +725,4 @@ export const PatientHome = (props: {
       />
     </Page>
   );
-};
+};
\ No newline at end of file

From 60106b47002a44428a3f5c434b4c232b26a1ca3c Mon Sep 17 00:00:00 2001
From: AdityaJ2305 <adityajindal2305@gmail.com>
Date: Mon, 30 Dec 2024 12:20:53 +0530
Subject: [PATCH 09/10] fix lint issue

---
 src/components/Patient/PatientHome.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Patient/PatientHome.tsx b/src/components/Patient/PatientHome.tsx
index d31349e10e9..b50c73ece88 100644
--- a/src/components/Patient/PatientHome.tsx
+++ b/src/components/Patient/PatientHome.tsx
@@ -725,4 +725,4 @@ export const PatientHome = (props: {
       />
     </Page>
   );
-};
\ No newline at end of file
+};

From aacec80b502a0e89581e14130703fb3007e9f262 Mon Sep 17 00:00:00 2001
From: AdityaJ2305 <adityajindal2305@gmail.com>
Date: Mon, 30 Dec 2024 12:23:51 +0530
Subject: [PATCH 10/10] fix line break

---
 src/components/Facility/PatientNoteCard.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Facility/PatientNoteCard.tsx b/src/components/Facility/PatientNoteCard.tsx
index ebcdc9a1d9a..49c8cf4204b 100644
--- a/src/components/Facility/PatientNoteCard.tsx
+++ b/src/components/Facility/PatientNoteCard.tsx
@@ -213,7 +213,7 @@ const PatientNoteCard = ({
                 </div>
               </div>
             ) : (
-              <div className="text-sm text-secondary-700 break-all">
+              <div className="text-sm text-secondary-700 whitespace-pre-wrap">
                 {noteField}
               </div>
             )}