diff --git a/pages/alarms.tsx b/pages/alarms.tsx index 1affc9f2..0ce1402d 100644 --- a/pages/alarms.tsx +++ b/pages/alarms.tsx @@ -120,7 +120,7 @@ const Alarms: NextPage = () => { const [serverTime, setServerTime] = useState( currDate.setZone(regionTZ) ) - const [selectedDate, setSelectedDate] = useState(currDate.setZone(regionTZ)) + const [selectedDate, setSelectedDate] = useState(currDate.setZone(regionTZ).set({hour: 0, minute: 0, second: 0, millisecond: 0})) const [gameEvents, setGameEvents] = useState | undefined>( undefined @@ -185,7 +185,7 @@ const Alarms: NextPage = () => { if (regionTZ !== undefined) { setMounted(true) setServerTime(currDate.setZone(regionTZ)) - setSelectedDate(currDate.setZone(regionTZ)) + setSelectedDate(currDate.setZone(regionTZ).set({hour: 0, minute: 0, second: 0, millisecond: 0})) } }, [regionTZ]) @@ -200,14 +200,14 @@ const Alarms: NextPage = () => { useEffect(() => { const timer = setInterval(() => { let now = DateTime.now() - if (currDate.endOf('day').diffNow().toMillis() < 0) setSelectedDate(now) + if (serverTime.endOf('day').diffNow().toMillis() < 0) setSelectedDate(now.setZone(regionTZ).set({hour: 0, minute: 0, second: 0, millisecond: 0})) setCurrDate(now) setServerTime(now.setZone(regionTZ)) }, 1000) return () => { clearInterval(timer) // Return a function to clear the timer so that it will stop being called on unmount } - }, [regionTZ, view24HrTime, viewLocalizedTime, selectedDate]) + }, [regionTZ, view24HrTime, viewLocalizedTime, selectedDate, serverTime.day]) // clear disabled alarm when alarm expires useEffect(() => { @@ -539,7 +539,7 @@ const Alarms: NextPage = () => {