Merge pull request #1584 from ever-co/fix/timer-suspended-status

fix: User Deactivated Case for Timer
ever-co · Oct 18, 2023 · 917eef1 · 917eef1
2 parents 3e451d9 + ea2d8ff
commit 917eef1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/apps/web/lib/features/timer/timer-status.tsx b/apps/web/lib/features/timer/timer-status.tsx
@@ -75,7 +75,9 @@ export function getTimerStatusValue(
 	member: OT_Member | undefined,
 	publicTeam?: boolean
 ): ITimerStatusEnum {
-	return member?.timerStatus === 'pause'
+	return !member?.employee?.isActive && !publicTeam
+		? 'suspended'
+		: member?.timerStatus === 'pause'
 		? 'pause'
 		: !timerStatus?.running &&
 		  timerStatus?.lastLog &&
@@ -84,8 +86,6 @@ export function getTimerStatusValue(
 		  moment().diff(moment(timerStatus?.lastLog?.startedAt), 'hours') < 24 &&
 		  timerStatus?.lastLog?.source !== 'TEAMS'
 		? 'pause'
-		: !member?.employee?.isActive && !publicTeam
-		? 'suspended'
 		: member?.employee?.isOnline
 		? //  && member?.timerStatus !== 'running'
 		  'online'