fix: #1968 Timer Button Enable condition

ever-co · Dec 7, 2023 · a2244ec · a2244ec
1 parent 6844b65
commit a2244ec
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/apps/web/app/hooks/features/useTimer.ts b/apps/web/app/hooks/features/useTimer.ts
@@ -178,9 +178,10 @@ export function useTimer() {
 	const lastActiveTeamId = useRef<string | null>(null);
 	const lastActiveTaskId = useRef<string | null>(null);
 	const canRunTimer =
-		(!!activeTeamTask && activeTeamTask.status !== 'closed') ||
-		// If timer is running at some other source and user may or may not have selected the task
-		timerStatusRef.current?.lastLog?.source !== TimerSource.TEAMS;
+		user?.isEmailVerified &&
+		((!!activeTeamTask && activeTeamTask.status !== 'closed') ||
+			// If timer is running at some other source and user may or may not have selected the task
+			timerStatusRef.current?.lastLog?.source !== TimerSource.TEAMS);
 
 	// Local time status
 	const { timeCounter, updateLocalTimerStatus, timerSeconds } = useLocalTimeCounter(

diff --git a/apps/web/lib/features/task/task-displays.tsx b/apps/web/lib/features/task/task-displays.tsx
@@ -37,7 +37,6 @@ export function TaskNameInfoDisplay({
 	const color: string = taskSizeColor[size].color;
 	// @ts-expect-error
 	const short: string = taskSizeColor[size].short;
-	console.log(task?.size);
 	return (
 		<Tooltip label={task?.title || ''} placement="top" enabled={(task?.title && task?.title.length > 60) || false}>
 			<span className="flex">

diff --git a/apps/web/lib/features/timer/timer.tsx b/apps/web/lib/features/timer/timer.tsx
@@ -108,7 +108,7 @@ export function Timer({ className }: IClassName) {
 						running={timerStatus?.running}
 						disabled={
 							// If timer is running at some other source and user may or may not have selected the task
-							disabled && timerStatus?.lastLog?.source !== TimerSource.TEAMS
+							!canRunTimer || (disabled && timerStatus?.lastLog?.source !== TimerSource.TEAMS)
 						}
 					/>
 				</Tooltip>