Merge branch 'develop' into fix#7046

ohcnetwork · Feb 19, 2024 · 70f6c7b · 70f6c7b
2 parents f3baa66 + dacc7f8
commit 70f6c7b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx
@@ -747,7 +747,7 @@ export const PatientManager = () => {
               </p>
             </ButtonV2>
           </div>
-          <div className="flex w-full flex-col justify-end gap-2 lg:w-fit lg:flex-row lg:gap-3">
+          <div className="flex w-full flex-col items-center justify-end gap-2 lg:ml-3 lg:w-fit lg:flex-row lg:gap-3">
             <SwitchTabs
               tab1="Live"
               tab2="Discharged"

diff --git a/src/service-worker.ts b/src/service-worker.ts
@@ -105,7 +105,7 @@ self.addEventListener("push", async function (event) {
   if (event.data) {
     const data = JSON.parse(event.data.text());
 
-    if (["MESSAGE", "PUSH_MESSAGE"].includes(data?.type)) {
+    if (["PUSH_MESSAGE"].includes(data?.type)) {
       self.clients.matchAll().then((clients) => {
         clients[0].postMessage(data);
       });