From 36a00947c4f8c1dc852499beee62d31260f92c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lovre=20Tomi=C4=87?= Date: Fri, 7 Feb 2025 18:51:05 +0100 Subject: [PATCH] fixed date filtering --- .../app/src/pages/SchedulePage/SchedulePage.tsx | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/apps/app/src/pages/SchedulePage/SchedulePage.tsx b/apps/app/src/pages/SchedulePage/SchedulePage.tsx index e110cb27..3e585fe3 100644 --- a/apps/app/src/pages/SchedulePage/SchedulePage.tsx +++ b/apps/app/src/pages/SchedulePage/SchedulePage.tsx @@ -33,14 +33,17 @@ export const SchedulePage = () => { useEffect(() => { const dateFilter = new Date( activeTab === TabId.FIRST_DAY ? '2025-05-23' : '2025-05-24', - ); + ).toDateString(); + setFilteredEvents( - events.filter( - (event) => - (new Date(event.startsAt).getDate() === dateFilter.getDate() && - event.theme === activeTag.toUpperCase()) || - activeTag === TagId.ALL, - ), + events.filter((event) => { + const eventDate = new Date(event.startsAt).toDateString(); + return ( + eventDate === dateFilter && + (activeTag === TagId.ALL || + event.theme.toUpperCase() === activeTag.toUpperCase()) + ); + }), ); }, [activeTab, activeTag]);