Merge pull request #56600 from software-mansion-labs/kicu/56519-fix-f…

…ilter-cards Do not return empty card Objects for AdvancedFilters (cherry picked from commit f7ce0aa) (CP triggered by Julesssss)
Expensify · Feb 11, 2025 · f3d8969 · f3d8969
1 parent 93e8e34
commit f3d8969
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/libs/CardUtils.ts b/src/libs/CardUtils.ts
@@ -100,13 +100,12 @@ function isCardHiddenFromSearch(card: Card) {
 
 function mergeCardListWithWorkspaceFeeds(workspaceFeeds: Record<string, WorkspaceCardsList | undefined>, cardList = allCards, shouldExcludeCardHiddenFromSearch = false) {
     const feedCards: CardList = {};
-    Object.keys(cardList).forEach((cardKey) => {
-        const card = cardList[cardKey];
-        if (shouldExcludeCardHiddenFromSearch && isCardHiddenFromSearch(card)) {
+    Object.values(cardList).forEach((card) => {
+        if (!isCard(card) || (shouldExcludeCardHiddenFromSearch && isCardHiddenFromSearch(card))) {
             return;
         }
 
-        feedCards[cardKey] = card;
+        feedCards[card.cardID] = card;
     });
 
     Object.values(workspaceFeeds ?? {}).forEach((currentCardFeed) => {