From debdbd1c5ad90df4e602736e17120ea8ae416cac Mon Sep 17 00:00:00 2001 From: Fabian Posenau Date: Wed, 14 Feb 2024 12:44:06 +0100 Subject: [PATCH] Fix danger time not shown (#775) * wrong order of operations * chore: version bump --- apps/client/package.json | 2 +- apps/client/src/features/viewers/minimal-timer/MinimalTimer.tsx | 2 +- apps/client/src/features/viewers/timer/Timer.tsx | 2 +- apps/electron/package.json | 2 +- apps/server/package.json | 2 +- package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/client/package.json b/apps/client/package.json index 638658813..0f8670d8a 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -1,6 +1,6 @@ { "name": "ontime-ui", - "version": "2.28.16", + "version": "2.28.17", "private": true, "dependencies": { "@chakra-ui/react": "^2.7.0", diff --git a/apps/client/src/features/viewers/minimal-timer/MinimalTimer.tsx b/apps/client/src/features/viewers/minimal-timer/MinimalTimer.tsx index eaae731d5..8ae9bed5b 100644 --- a/apps/client/src/features/viewers/minimal-timer/MinimalTimer.tsx +++ b/apps/client/src/features/viewers/minimal-timer/MinimalTimer.tsx @@ -142,8 +142,8 @@ export default function MinimalTimer(props: MinimalTimerProps) { const showBlackout = pres.timerBlackout; let timerColor = viewSettings.normalColor; - if (!timerIsTimeOfDay && showProgress && showDanger) timerColor = viewSettings.dangerColor; if (!timerIsTimeOfDay && showProgress && showWarning) timerColor = viewSettings.warningColor; + if (!timerIsTimeOfDay && showProgress && showDanger) timerColor = viewSettings.dangerColor; const stageTimer = getTimerByType(time); let display = formatTimerDisplay(stageTimer); diff --git a/apps/client/src/features/viewers/timer/Timer.tsx b/apps/client/src/features/viewers/timer/Timer.tsx index 91b9767ef..c4da22e5d 100644 --- a/apps/client/src/features/viewers/timer/Timer.tsx +++ b/apps/client/src/features/viewers/timer/Timer.tsx @@ -107,8 +107,8 @@ export default function Timer(props: TimerProps) { const showExternal = external.visible && external.text; let timerColor = viewSettings.normalColor; - if (!timerIsTimeOfDay && showProgress && showDanger) timerColor = viewSettings.dangerColor; if (!timerIsTimeOfDay && showProgress && showWarning) timerColor = viewSettings.warningColor; + if (!timerIsTimeOfDay && showProgress && showDanger) timerColor = viewSettings.dangerColor; const stageTimer = getTimerByType(time); let display = formatTimerDisplay(stageTimer); diff --git a/apps/electron/package.json b/apps/electron/package.json index b2d4e49b1..904f92131 100644 --- a/apps/electron/package.json +++ b/apps/electron/package.json @@ -1,6 +1,6 @@ { "name": "ontime", - "version": "2.28.16", + "version": "2.28.17", "author": "Carlos Valente", "description": "Time keeping for live events", "repository": "https://github.com/cpvalente/ontime", diff --git a/apps/server/package.json b/apps/server/package.json index 06a824dad..8761f133b 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -2,7 +2,7 @@ "name": "ontime-server", "type": "module", "main": "src/index.ts", - "version": "2.28.16", + "version": "2.28.17", "exports": "./src/index.js", "dependencies": { "@googleapis/sheets": "^5.0.5", diff --git a/package.json b/package.json index ce3012481..2bdfe9783 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ontime", - "version": "2.28.16", + "version": "2.28.17", "description": "Time keeping for live events", "keywords": [ "lightdev",