From c4cf776226c122db7d5114a634185435dc02ce42 Mon Sep 17 00:00:00 2001
From: Marcin Tojek <marcin@coder.com>
Date: Thu, 20 Mar 2025 10:06:27 +0100
Subject: [PATCH] feat: display quiet hours using 24-hour time format

---
 site/src/utils/schedule.test.ts | 40 ++++++++++++++++++++++++++-------
 site/src/utils/schedule.tsx     |  2 +-
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/site/src/utils/schedule.test.ts b/site/src/utils/schedule.test.ts
index f6ca0651b69ad..d873ec7b5b41a 100644
--- a/site/src/utils/schedule.test.ts
+++ b/site/src/utils/schedule.test.ts
@@ -78,14 +78,38 @@ describe("util/schedule", () => {
 	});
 
 	describe("quietHoursDisplay", () => {
-		const quietHoursStart = quietHoursDisplay(
-			"00:00",
-			"Australia/Sydney",
-			new Date("2023-09-06T15:00:00.000+10:00"),
-		);
+		it("midnight", () => {
+			const quietHoursStart = quietHoursDisplay(
+				"00:00",
+				"Australia/Sydney",
+				new Date("2023-09-06T15:00:00.000+10:00"),
+			);
+
+			expect(quietHoursStart).toBe(
+				"00:00 tomorrow (in 9 hours) in Australia/Sydney",
+			);
+		});
+		it("five o'clock today", () => {
+			const quietHoursStart = quietHoursDisplay(
+				"17:00",
+				"Europe/London",
+				new Date("2023-09-06T15:00:00.000+10:00"),
+			);
 
-		expect(quietHoursStart).toBe(
-			"12:00AM tomorrow (in 9 hours) in Australia/Sydney",
-		);
+			expect(quietHoursStart).toBe(
+				"17:00 today (in 11 hours) in Europe/London",
+			);
+		});
+		it("lunch tomorrow", () => {
+			const quietHoursStart = quietHoursDisplay(
+				"13:00",
+				"US/Central",
+				new Date("2023-09-06T08:00:00.000+10:00"),
+			);
+
+			expect(quietHoursStart).toBe(
+				"13:00 tomorrow (in 20 hours) in US/Central",
+			);
+		});
 	});
 });
diff --git a/site/src/utils/schedule.tsx b/site/src/utils/schedule.tsx
index e9524d6f02df5..2e7ee543e0a69 100644
--- a/site/src/utils/schedule.tsx
+++ b/site/src/utils/schedule.tsx
@@ -276,7 +276,7 @@ export const quietHoursDisplay = (
 
 	const today = dayjs(now).tz(tz);
 	const day = dayjs(parsed.next().toDate()).tz(tz);
-	let display = day.format("h:mmA");
+	let display = day.format("HH:mm");
 
 	if (day.isSame(today, "day")) {
 		display += " today";