From 89472f09cf86cb6f5251c1631212e2154a0c3eae Mon Sep 17 00:00:00 2001
From: Aditya Jindal <adityajindal2305@gmail.com>
Date: Fri, 28 Feb 2025 12:52:45 +0530
Subject: [PATCH] Medicine Administer List Should Only Show Active Medicines
 (#10858)

Co-authored-by: Amjith Titus <amjithtitus09@gmail.com>
---
 .../Medicine/MedicationAdministration/AdministrationTab.tsx    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Medicine/MedicationAdministration/AdministrationTab.tsx b/src/components/Medicine/MedicationAdministration/AdministrationTab.tsx
index 9e9b462af8b..cb53325fd11 100644
--- a/src/components/Medicine/MedicationAdministration/AdministrationTab.tsx
+++ b/src/components/Medicine/MedicationAdministration/AdministrationTab.tsx
@@ -796,6 +796,7 @@ export const AdministrationTab: React.FC<AdministrationTabProps> = ({
           variant="outline"
           className="text-emerald-600 border-emerald-600 hover:bg-emerald-50 w-full sm:w-auto"
           onClick={() => setIsSheetOpen(true)}
+          disabled={!activeMedications?.results.length}
         >
           <CareIcon icon="l-plus" className="mr-2 h-4 w-4" />
           {t("administer_medicine")}
@@ -839,7 +840,7 @@ export const AdministrationTab: React.FC<AdministrationTabProps> = ({
             });
           }
         }}
-        medications={medications}
+        medications={activeMedications?.results || []}
         lastAdministeredDates={lastAdministeredDetails?.dates}
         patientId={patientId}
         encounterId={encounterId}