Merge branch 'duptala/events-page/124' of https://github.com/UoaWDCC/…

…auis-portal into duptala/events-page/124
UoaWDCC · Jul 11, 2024 · ca3507b · ca3507b
2 parents 9e3dea8 + bbdadf6
commit ca3507b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/web/src/screens/EventScreen.tsx b/web/src/screens/EventScreen.tsx
@@ -41,7 +41,7 @@ export default function EventScreen() {
     (acc, event) => {
       const eventDate = new Date(event.eventDateStart);
       const isEventLive = event.isLive;
-      if ((eventDate >= currentDate) && (isEventLive)) {
+      if (eventDate >= currentDate && isEventLive) {
         acc.upcomingEvents.push(event);
       } else {
         acc.pastEvents.push(event);

diff --git a/web/src/screens/HomeScreen.tsx b/web/src/screens/HomeScreen.tsx
@@ -29,7 +29,7 @@ export default function HomeScreen() {
   const upcomingEvents = events.filter((event) => {
     const eventDate = new Date(event.eventDateStart);
     const isEventLive = event.isLive;
-    return ((eventDate >= currentDate) && (isEventLive));
+    return eventDate >= currentDate && isEventLive;
   });
 
   return (