diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx index be3c3f2693c3..e209972bd45c 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 966229bdcdb2..dd84537a82bc 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 : '')); }); };