From c1d47bf2f7241f9a316e1f611dd007f7c9f7bde9 Mon Sep 17 00:00:00 2001 From: zikaeroh <48577114+zikaeroh@users.noreply.github.com> Date: Mon, 25 May 2020 16:52:46 -0700 Subject: [PATCH] Low hanging hook fruit --- frontend/src/hooks/useServerTime.tsx | 2 +- frontend/src/pages/gameView.tsx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/hooks/useServerTime.tsx b/frontend/src/hooks/useServerTime.tsx index 752577a..4d9e4a2 100644 --- a/frontend/src/hooks/useServerTime.tsx +++ b/frontend/src/hooks/useServerTime.tsx @@ -9,7 +9,7 @@ const Context = React.createContext(Object.seal({ setOffset: () => { export const ServerTimeProvider = (props: React.PropsWithChildren<{}>) => { const [offset, setOffset] = React.useState(0); - const value = React.useMemo(() => Object.seal({ setOffset, now: () => Date.now() + offset }), [offset, setOffset]); + const value = React.useMemo(() => Object.seal({ setOffset, now: () => Date.now() + offset }), [offset]); return {props.children}; }; diff --git a/frontend/src/pages/gameView.tsx b/frontend/src/pages/gameView.tsx index 92a0952..2b12a11 100644 --- a/frontend/src/pages/gameView.tsx +++ b/frontend/src/pages/gameView.tsx @@ -84,6 +84,7 @@ const CenterText = ({ winner, timer, turn }: State) => { const classes = useCenterStyles(); const [countdown, setCountdown] = React.useState(); const { now } = useServerTime(); + const deadline = timer?.turnEnd; React.useEffect(() => { const updateCountdown = () => { @@ -92,14 +93,13 @@ const CenterText = ({ winner, timer, turn }: State) => { return; } - if (!isDefined(timer)) { + if (deadline === undefined) { if (countdown !== undefined) { setCountdown(undefined); } return; } - const deadline = timer.turnEnd; const diff = deadline.getTime() - now(); const between = Math.floor(diff / 1000); @@ -120,7 +120,7 @@ const CenterText = ({ winner, timer, turn }: State) => { }, 200); return () => window.clearInterval(interval); - }, [countdown, setCountdown, winner, timer, now]); + }, [countdown, winner, deadline, now]); const centerText = React.useMemo(() => { const text = isDefined(winner) ? `${teamSpecs[winner].name} wins!` : `${teamSpecs[turn].name}'s turn`;