diff --git a/apps/client/src/features/viewers/common/viewUtils.ts b/apps/client/src/features/viewers/common/viewUtils.ts index 29a9e00f2..f99dd78c3 100644 --- a/apps/client/src/features/viewers/common/viewUtils.ts +++ b/apps/client/src/features/viewers/common/viewUtils.ts @@ -11,7 +11,6 @@ import { formatTime } from '../../../common/utils/time'; export function getTimerByType( freezeEnd: boolean, timerTypeNow: TimerType, - countToEndNow: boolean, clock: number, timerObject: Pick, timerTypeOverride?: TimerType, @@ -22,13 +21,6 @@ export function getTimerByType( const viewTimerType = timerTypeOverride ?? timerTypeNow; - if (countToEndNow) { - if (timerObject.current === null) { - return null; - } - return freezeEnd ? Math.max(timerObject.current, 0) : timerObject.current; - } - switch (viewTimerType) { case TimerType.CountDown: if (timerObject.current === null) { diff --git a/apps/client/src/views/editor/pip-timer/PipTimer.tsx b/apps/client/src/views/editor/pip-timer/PipTimer.tsx index 72857da9f..fb2d22551 100644 --- a/apps/client/src/views/editor/pip-timer/PipTimer.tsx +++ b/apps/client/src/views/editor/pip-timer/PipTimer.tsx @@ -40,7 +40,7 @@ export function PipTimer({ viewSettings }: PipTimerProps) { // gather timer data const totalTime = getTotalTime(time.duration, time.addedTime); - const stageTimer = getTimerByType(false, timerTypeNow, countToEndNow, clock, time, timerTypeNow); + const stageTimer = getTimerByType(false, timerTypeNow, clock, time, timerTypeNow); const display = getFormattedTimer(stageTimer, timerTypeNow, 'min', { removeSeconds: false, removeLeadingZero: false, diff --git a/apps/client/src/views/timer/Timer.tsx b/apps/client/src/views/timer/Timer.tsx index 75e8321b2..b06ac2318 100644 --- a/apps/client/src/views/timer/Timer.tsx +++ b/apps/client/src/views/timer/Timer.tsx @@ -102,7 +102,7 @@ function Timer({ customFields, projectData, isMirrored, settings, viewSettings } // gather timer data const totalTime = getTotalTime(time.duration, time.addedTime); const formattedClock = formatTime(clock); - const stageTimer = getTimerByType(freezeOvertime, timerTypeNow, countToEndNow, clock, time, timerType); + const stageTimer = getTimerByType(freezeOvertime, timerTypeNow, clock, time, timerType); const display = getFormattedTimer(stageTimer, viewTimerType, localisedMinutes, { removeSeconds: hideTimerSeconds, removeLeadingZero: removeLeadingZeros,