fix: don't show schedule when voting is ongoing

devoteam-se · Aug 13, 2024 · 33cff0f · 33cff0f
1 parent 3431725
commit 33cff0f
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/client/src/pages/event/index.tsx b/client/src/pages/event/index.tsx
@@ -32,22 +32,21 @@ const PageEvent = () => {
   const { schedulingStarted, isLoading: loadingSchedule } = useSchedule(eventId);
 
   const isLoading = loadingEvent || loadingSchedule;
+  const title = event ? event.name : '';
+  const subtitle = event ? dateShort(event.startDate) : '';
+  const onGoingVoting = event?.votingEndDate && dayjs().isBefore(event.votingEndDate);
+  const banner = onGoingVoting && <VotingEndsBanner date={event.votingEndDate!} />;
 
   useEffect(() => {
     if (isLoading || !path) return;
     if (!path.isSessionPage && !path.isSchedulePage) {
-      return navigate(schedulingStarted ? path.schedule : path.sessions, { replace: true });
+      return navigate(schedulingStarted && !onGoingVoting ? path.schedule : path.sessions, { replace: true });
     }
 
     if (path.isSchedulePage && !schedulingStarted) {
-      navigate(path.sessions, { replace: true });
+      return navigate(path.sessions, { replace: true });
     }
-  }, [isLoading, navigate, schedulingStarted, path]);
-
-  const title = event ? event.name : '';
-  const subtitle = event ? dateShort(event.startDate) : '';
-  const onGoingVoting = event?.votingEndDate && dayjs().isBefore(event.votingEndDate);
-  const banner = onGoingVoting && <VotingEndsBanner date={event.votingEndDate!} />;
+  }, [isLoading, navigate, schedulingStarted, onGoingVoting, path]);
 
   const actions =
     !onGoingVoting && schedulingStarted