From 7ea55cc99163210974b18b28dedc2b5fad5b3096 Mon Sep 17 00:00:00 2001
From: Sulochan Khadka <122200551+Sulochan-khadka@users.noreply.github.com>
Date: Tue, 3 Sep 2024 12:40:25 +0530
Subject: [PATCH 1/2] Do not show clear all filters button if there is no
 filter applied in Discharge patients page #8449

---
 src/Common/hooks/useFilters.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Common/hooks/useFilters.tsx b/src/Common/hooks/useFilters.tsx
index c0919be9acc..a4d6cfe06f9 100644
--- a/src/Common/hooks/useFilters.tsx
+++ b/src/Common/hooks/useFilters.tsx
@@ -194,7 +194,7 @@ export default function useFilters({
           <FilterBadge {...props} name={t(props.name)} key={props.name} />
         ))}
         {children}
-        {show && (
+        {activeFilters.length > 0 && (
           <button
             id="clear-all-filters"
             className="rounded-full border border-secondary-300 bg-white px-2 py-1 text-xs text-secondary-600 hover:text-secondary-800"

From aae79329135d1f5ca7fe8857dc8489fba3aa6c19 Mon Sep 17 00:00:00 2001
From: Sulochan Khadka <122200551+Sulochan-khadka@users.noreply.github.com>
Date: Wed, 4 Sep 2024 15:36:46 +0530
Subject: [PATCH 2/2] Fixed-issues

---
 src/Common/hooks/useFilters.tsx                   |  2 +-
 .../Facility/DischargedPatientsList.tsx           | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Common/hooks/useFilters.tsx b/src/Common/hooks/useFilters.tsx
index a4d6cfe06f9..c0919be9acc 100644
--- a/src/Common/hooks/useFilters.tsx
+++ b/src/Common/hooks/useFilters.tsx
@@ -194,7 +194,7 @@ export default function useFilters({
           <FilterBadge {...props} name={t(props.name)} key={props.name} />
         ))}
         {children}
-        {activeFilters.length > 0 && (
+        {show && (
           <button
             id="clear-all-filters"
             className="rounded-full border border-secondary-300 bg-white px-2 py-1 text-xs text-secondary-600 hover:text-secondary-800"
diff --git a/src/Components/Facility/DischargedPatientsList.tsx b/src/Components/Facility/DischargedPatientsList.tsx
index ca375fa505b..4b102bf0504 100644
--- a/src/Components/Facility/DischargedPatientsList.tsx
+++ b/src/Components/Facility/DischargedPatientsList.tsx
@@ -421,12 +421,15 @@ const DischargedPatientsList = ({
             ),
           ]}
           children={
-            <>
-              {qParams.last_consultation_admitted_bed_type_list &&
-                LastAdmittedToTypeBadges()}
-              {qParams.last_consultation__consent_types &&
-                HasConsentTypesBadges()}
-            </>
+            (qParams.last_consultation_admitted_bed_type_list ||
+              qParams.last_consultation__consent_types) && (
+              <>
+                {qParams.last_consultation_admitted_bed_type_list &&
+                  LastAdmittedToTypeBadges()}
+                {qParams.last_consultation__consent_types &&
+                  HasConsentTypesBadges()}
+              </>
+            )
           }
         />
       </div>