From f94abce057aac082f1c7ac008aaeabcfa96fb561 Mon Sep 17 00:00:00 2001 From: Krishna Gupta Date: Wed, 22 May 2024 11:17:12 +0530 Subject: [PATCH] fix: Tags - After deleting a Tag, the select button is not showing the correct amount. Signed-off-by: Krishna Gupta --- src/pages/workspace/tags/WorkspaceTagsPage.tsx | 5 +++-- src/pages/workspace/taxes/WorkspaceTaxesPage.tsx | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx index eca339be0fc4..8d648e4b8d2d 100644 --- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx +++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx @@ -120,8 +120,9 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { }; const toggleAllTags = () => { - const isAllSelected = tagList.every((tag) => !!selectedTags[tag.value]); - setSelectedTags(isAllSelected ? {} : Object.fromEntries(tagList.map((item) => [item.value, true]))); + const availableTags = tagList.filter((tag) => tag.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE); + const isAllSelected = availableTags.length === Object.keys(selectedTags).length; + setSelectedTags(isAllSelected ? {} : Object.fromEntries(availableTags.map((item) => [item.value, true]))); }; const getCustomListHeader = () => { diff --git a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx index 20d1b8f691d3..542ffe34ac19 100644 --- a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx +++ b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx @@ -126,12 +126,11 @@ function WorkspaceTaxesPage({ }; const toggleAllTaxes = () => { - const taxesToSelect = taxesList.filter((tax) => tax.keyForList !== defaultExternalID); + const taxesToSelect = taxesList.filter((tax) => tax.keyForList !== defaultExternalID && tax.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE); setSelectedTaxesIDs((prev) => { if (prev.length === taxesToSelect.length) { return []; } - return taxesToSelect.map((item) => (item.keyForList ? item.keyForList : '')); }); };