From 37577056d71b8eca699fdef884afa3795b5a923e Mon Sep 17 00:00:00 2001
From: Sulochan Khadka <122200551+Sulochan-khadka@users.noreply.github.com>
Date: Sat, 2 Nov 2024 13:15:17 +0530
Subject: [PATCH 1/2] fixes "Created-at" section peeping out of "Doctor's
 discussion" (#8796)

---
 src/components/Facility/ConsultationDoctorNotes/index.tsx | 2 +-
 src/components/Patient/PatientNotes.tsx                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Facility/ConsultationDoctorNotes/index.tsx b/src/components/Facility/ConsultationDoctorNotes/index.tsx
index f422eca2763..517c3eca619 100644
--- a/src/components/Facility/ConsultationDoctorNotes/index.tsx
+++ b/src/components/Facility/ConsultationDoctorNotes/index.tsx
@@ -128,7 +128,7 @@ const ConsultationDoctorNotes = (props: ConsultationDoctorNotesProps) => {
       backUrl={`/facility/${facilityId}/patient/${patientId}`}
     >
       <div className="relative mx-3 my-2 flex grow flex-col overflow-hidden rounded-lg border border-secondary-300 bg-white p-2 sm:mx-10 sm:my-5 sm:p-5">
-        <div className="absolute inset-x-0 top-0 flex bg-secondary-200 text-sm shadow-md">
+        <div className="absolute inset-x-0 top-0 z-10 flex bg-secondary-200 text-sm shadow-md">
           {keysOf(PATIENT_NOTES_THREADS).map((current) => (
             <button
               id={`patient-note-tab-${current}`}
diff --git a/src/components/Patient/PatientNotes.tsx b/src/components/Patient/PatientNotes.tsx
index 9edbbd2b5d8..9aaa4e79d42 100644
--- a/src/components/Patient/PatientNotes.tsx
+++ b/src/components/Patient/PatientNotes.tsx
@@ -111,7 +111,7 @@ const PatientNotes = (props: PatientNotesProps) => {
       backUrl={`/facility/${facilityId}/patient/${patientId}`}
     >
       <div className="relative mx-3 my-2 flex grow flex-col rounded-lg border border-secondary-300 bg-white p-2 sm:mx-10 sm:my-5 sm:p-5">
-        <div className="absolute inset-x-0 top-0 flex bg-secondary-200 text-sm shadow-md">
+        <div className="absolute inset-x-0 top-0 z-10 flex bg-secondary-200 text-sm shadow-md">
           {keysOf(PATIENT_NOTES_THREADS).map((current) => (
             <button
               id={`patient-note-tab-${current}`}

From 764cfe3d93dae3fb7186d815fa6cfabfb1b3145b Mon Sep 17 00:00:00 2001
From: Aman Sharma <88098873+mnshrm@users.noreply.github.com>
Date: Sat, 2 Nov 2024 16:32:02 +0530
Subject: [PATCH 2/2] resolves age field NaN issue for shifting patient copy to
 clipboard (#8984)

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

diff --git a/src/components/Shifting/ShiftDetails.tsx b/src/components/Shifting/ShiftDetails.tsx
index 666bd1bcb38..77250f71e17 100644
--- a/src/components/Shifting/ShiftDetails.tsx
+++ b/src/components/Shifting/ShiftDetails.tsx
@@ -90,7 +90,7 @@ export default function ShiftDetails(props: { id: string }) {
       "\n" +
       t("age") +
       ":" +
-      +(data?.patient_object
+      (data?.patient_object
         ? formatPatientAge(data.patient_object, true)
         : "") +
       "\n" +