Skip to content

Commit f0db6a9

Browse files
committed
fix(gui): guard quota reset date formatting
1 parent 46d4150 commit f0db6a9

2 files changed

Lines changed: 15 additions & 5 deletions

File tree

‎gui/src/components/QuotaBars.tsx‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -349,10 +349,19 @@ function StackedQuotaRow({ row, threshold, t, locale, incomplete }: {
349349
);
350350
}
351351

352-
function formatResetAt(resetAt: number | undefined, t: TFn, locale: Locale): { day: string; time: string } {
353-
if (typeof resetAt !== "number" || !Number.isFinite(resetAt)) return { day: "", time: "" };
352+
/** Normalize seconds-or-milliseconds epochs and reject values outside JavaScript Date's range. */
353+
function resetDate(resetAt: number | undefined): { date: Date; ms: number } | null {
354+
if (typeof resetAt !== "number" || !Number.isFinite(resetAt)) return null;
354355
const ms = resetAt < 10_000_000_000 ? resetAt * 1000 : resetAt;
355356
const date = new Date(ms);
357+
if (!Number.isFinite(date.getTime())) return null;
358+
return { date, ms };
359+
}
360+
361+
function formatResetAt(resetAt: number | undefined, t: TFn, locale: Locale): { day: string; time: string } {
362+
const normalized = resetDate(resetAt);
363+
if (!normalized) return { day: "", time: "" };
364+
const { date } = normalized;
356365
const now = new Date();
357366
const tag = bcp47(locale);
358367
const time = new Intl.DateTimeFormat(tag, { hour: "2-digit", minute: "2-digit", hour12: false }).format(date);
@@ -371,9 +380,9 @@ export function formatResetFuture(
371380
locale: Locale = "en",
372381
now = Date.now(),
373382
): string {
374-
if (typeof resetAt !== "number" || !Number.isFinite(resetAt)) return "";
375-
const ms = resetAt < 10_000_000_000 ? resetAt * 1000 : resetAt;
376-
const date = new Date(ms);
383+
const normalized = resetDate(resetAt);
384+
if (!normalized) return "";
385+
const { date, ms } = normalized;
377386
const tag = bcp47(locale);
378387
const time = new Intl.DateTimeFormat(tag, { hour: "2-digit", minute: "2-digit", hour12: false }).format(date);
379388
const nowDate = new Date(now);

‎tests/quota-bars-rows.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ describe("formatResetFuture", () => {
143143
expect(formatResetFuture(NOW - 86_400_000, t, "en", NOW)).toContain("quota.resetsAt");
144144
expect(formatResetFuture(undefined, t, "en", NOW)).toBe("");
145145
expect(formatResetFuture(Number.NaN, t, "en", NOW)).toBe("");
146+
expect(formatResetFuture(Number.MAX_VALUE, t, "en", NOW)).toBe("");
146147
});
147148

148149
test("seconds-epoch inputs are normalized to milliseconds", () => {

0 commit comments

Comments
 (0)