Medicine Administer List Should Only Show Active Medicines (#10858)

Co-authored-by: Amjith Titus <amjithtitus09@gmail.com>
ohcnetwork · Feb 28, 2025 · e502bfb · e502bfb
1 parent 75d757f
commit e502bfb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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}