diff --git a/components/pages/todos/ToDosList.tsx b/components/pages/todos/ToDosList.tsx index c91e9ec..bd04273 100644 --- a/components/pages/todos/ToDosList.tsx +++ b/components/pages/todos/ToDosList.tsx @@ -139,7 +139,13 @@ const ToDosList = ({ isSettings, members }: { isSettings?: boolean, members?: Ar if (localTodos && selectedFilter) { let resolvedGroupedTodos; if (selectedFilter?.value === FILTER_OPTIONS.EVERYONE) { - resolvedGroupedTodos = groupToDosByDate(toDos ?? []); + let filtered = localTodos?.filter((todo) => + todo.assignees?.some(assigneeId => + members.some(member => member.uid === assigneeId) + ) + ); + + resolvedGroupedTodos = groupToDosByDate(filtered ?? []); } else { let filtered = localTodos?.filter((todo) => todo.assignees?.includes(selectedFilter.value)) || [];