Fixed-issues

ohcnetwork · Sep 4, 2024 · aae7932 · aae7932
1 parent 7ea55cc
commit aae7932
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git 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
@@ -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>