Merge pull request #2684 from ever-co/fix/clear-interval-task-time-tr…

…acking ClearInterval From useEffect task tracking
ever-co · Jul 4, 2024 · 1ee0d25 · 1ee0d25
2 parents 3d34eb0 + bdbfe0a
commit 1ee0d25
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/apps/web/app/hooks/features/useTimer.ts b/apps/web/app/hooks/features/useTimer.ts
@@ -364,12 +364,15 @@ export function useTimer() {
 	}, [timerStatus, setTimerStatus, stopTimerQueryCall, taskId, updateLocalTimerStatus]);
 
 	useEffect(() => {
+		let syncTimerInterval: NodeJS.Timeout;
 		if (timerStatus?.running) {
-			const syncTimerInterval = setInterval(() => {
+			syncTimerInterval = setInterval(() => {
 				syncTimer();
 			}, 60000);
-			return () => clearInterval(syncTimerInterval);
 		}
+		return () => {
+			if (syncTimerInterval) clearInterval(syncTimerInterval);
+		};
 	}, [syncTimer, timerStatus]);
 
 	// If active team changes then stop the timer