From c7da42ef55d7ad04d41b61de871d1fcacef24299 Mon Sep 17 00:00:00 2001
From: Diana Nanyanzi <diana@dhis2.org>
Date: Tue, 25 Feb 2025 14:32:16 +0300
Subject: [PATCH] fix: improve activeItems computation

---
 .../src/command-palette/hooks/use-navigation.js    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/components/header-bar/src/command-palette/hooks/use-navigation.js b/components/header-bar/src/command-palette/hooks/use-navigation.js
index 0f7ee5b48..1b67e5fae 100644
--- a/components/header-bar/src/command-palette/hooks/use-navigation.js
+++ b/components/header-bar/src/command-palette/hooks/use-navigation.js
@@ -25,12 +25,18 @@ export const useNavigation = ({ itemsArray, actionsArray }) => {
     } = useCommandPaletteContext()
 
     const activeItems = useMemo(() => {
+        if (filter) {
+            return itemsArray
+        }
+
         if (currentView === HOME_VIEW) {
-            return filter || activeSection === GRID_SECTION
-                ? itemsArray
-                : actionsArray
+            if (activeSection === GRID_SECTION) {
+                return itemsArray
+            } else {
+                return actionsArray
+            }
         } else {
-            return filter ? itemsArray : actionsArray.concat(itemsArray)
+            return actionsArray.concat(itemsArray)
         }
     }, [filter, itemsArray, actionsArray, currentView, activeSection])