From 392fbd5b18e8c368fc995ad9906c1ad972e6a0a6 Mon Sep 17 00:00:00 2001
From: Ashesh <3626859+Ashesh3@users.noreply.github.com>
Date: Fri, 24 Nov 2023 17:03:21 +0530
Subject: [PATCH 1/4] Fix layout issue in DailyRoundsList component (#6709)

---
 src/Components/Facility/Consultations/DailyRoundsList.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Components/Facility/Consultations/DailyRoundsList.tsx b/src/Components/Facility/Consultations/DailyRoundsList.tsx
index da4b8201495..8d08cea2f95 100644
--- a/src/Components/Facility/Consultations/DailyRoundsList.tsx
+++ b/src/Components/Facility/Consultations/DailyRoundsList.tsx
@@ -28,7 +28,7 @@ export const DailyRoundsList = (props: any) => {
       }}
     >
       {(_) => (
-        <div className="flex w-full flex-col gap-4">
+        <div className="-mt-2 flex w-full flex-col gap-4">
           <div className="flex max-h-[85vh] flex-col gap-4 overflow-y-auto overflow-x-hidden px-3">
             <PaginatedList.WhenEmpty className="flex w-full justify-center border-b border-gray-200 bg-white p-5 text-center text-2xl font-bold text-gray-500">
               <span className="flex justify-center rounded-lg bg-white p-3 text-gray-700 shadow">
@@ -42,7 +42,7 @@ export const DailyRoundsList = (props: any) => {
                 ))}
               </>
             </PaginatedList.WhenLoading>
-            <PaginatedList.Items<DailyRoundsModel> className="my-8 flex grow flex-col gap-3 lg:mx-8">
+            <PaginatedList.Items<DailyRoundsModel> className="flex grow flex-col gap-3">
               {(item, items) => {
                 if (item.rounds_type === "AUTOMATED") {
                   return (

From 83b6d1f94009c524c32c397350aacbcf85aee90f Mon Sep 17 00:00:00 2001
From: Khavin Shankar <khavinshankar@gmail.com>
Date: Fri, 24 Nov 2023 17:03:49 +0530
Subject: [PATCH 2/4] sandbox iframe in fileupload (#6691)

---
 src/Components/Common/FilePreviewDialog.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Components/Common/FilePreviewDialog.tsx b/src/Components/Common/FilePreviewDialog.tsx
index b7eda93930e..90dde50a249 100644
--- a/src/Components/Common/FilePreviewDialog.tsx
+++ b/src/Components/Common/FilePreviewDialog.tsx
@@ -192,6 +192,7 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
                           />
                         ) : (
                           <iframe
+                            sandbox
                             title="Source Files"
                             src={fileUrl}
                             className="mx-auto h-5/6 w-5/6 border-2 border-black bg-white md:my-6 md:w-4/6"

From ba2c91d89e7268aed5321fe341fd9d373840675d Mon Sep 17 00:00:00 2001
From: Ashesh <3626859+Ashesh3@users.noreply.github.com>
Date: Fri, 24 Nov 2023 20:33:23 +0530
Subject: [PATCH 3/4] Filter out push notif and Fix empty daily rounds design
 (#6710)

* Filter out PUSH_MESSAGE notifications in
NotificationsList

* test

* revert test

* Fix styling issue in DailyRoundsList component

* Refactor DailyRoundsList component styles
---
 src/Components/Facility/Consultations/DailyRoundsList.tsx | 4 ++--
 src/Components/Notifications/NotificationsList.tsx        | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Components/Facility/Consultations/DailyRoundsList.tsx b/src/Components/Facility/Consultations/DailyRoundsList.tsx
index 8d08cea2f95..ffc70ddf175 100644
--- a/src/Components/Facility/Consultations/DailyRoundsList.tsx
+++ b/src/Components/Facility/Consultations/DailyRoundsList.tsx
@@ -30,8 +30,8 @@ export const DailyRoundsList = (props: any) => {
       {(_) => (
         <div className="-mt-2 flex w-full flex-col gap-4">
           <div className="flex max-h-[85vh] flex-col gap-4 overflow-y-auto overflow-x-hidden px-3">
-            <PaginatedList.WhenEmpty className="flex w-full justify-center border-b border-gray-200 bg-white p-5 text-center text-2xl font-bold text-gray-500">
-              <span className="flex justify-center rounded-lg bg-white p-3 text-gray-700 shadow">
+            <PaginatedList.WhenEmpty className="flex w-full justify-center rounded-md border-b border-gray-200 bg-white px-5 py-1 text-center text-2xl font-bold text-gray-500">
+              <span className="flex justify-center rounded-lg bg-white p-3 text-gray-700">
                 {t("no_consultation_updates")}
               </span>
             </PaginatedList.WhenEmpty>
diff --git a/src/Components/Notifications/NotificationsList.tsx b/src/Components/Notifications/NotificationsList.tsx
index ae3e3f94ac6..6066bf6c66b 100644
--- a/src/Components/Notifications/NotificationsList.tsx
+++ b/src/Components/Notifications/NotificationsList.tsx
@@ -358,6 +358,7 @@ export default function NotificationsList({
     manageResults = (
       <>
         {data
+          .filter((notification: any) => notification.event != "PUSH_MESSAGE")
           .filter((notification: any) =>
             showUnread ? notification.read_at === null : true
           )

From c37b55487c8e8ffb5202357ff46a25bb88021784 Mon Sep 17 00:00:00 2001
From: Ashesh <3626859+Ashesh3@users.noreply.github.com>
Date: Fri, 24 Nov 2023 21:15:32 +0530
Subject: [PATCH 4/4] Add icu_admission_date field to ConsultationForm (#6711)

---
 src/Components/Facility/ConsultationForm.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Components/Facility/ConsultationForm.tsx b/src/Components/Facility/ConsultationForm.tsx
index a56a0d587e9..091be6b5968 100644
--- a/src/Components/Facility/ConsultationForm.tsx
+++ b/src/Components/Facility/ConsultationForm.tsx
@@ -724,6 +724,7 @@ export const ConsultationForm = (props: any) => {
             : undefined,
         consultation_notes: state.form.consultation_notes,
         is_telemedicine: state.form.is_telemedicine,
+        icu_admission_date: state.form.icu_admission_date,
         action: state.form.action,
         review_interval: state.form.review_interval,
         assigned_to: