{greeting}
diff --git a/ui/desktop/src/utils/timeUtils.test.ts b/ui/desktop/src/utils/timeUtils.test.ts new file mode 100644 index 000000000..22806f85d --- /dev/null +++ b/ui/desktop/src/utils/timeUtils.test.ts @@ -0,0 +1,100 @@ +import { describe, it, expect } from 'vitest'; +import { formatClockDisplay, formatMessageTimestamp } from './timeUtils'; + +describe('timeUtils', () => { + describe('formatClockDisplay', () => { + it('formats 12-hour locale with AM/PM meridiem (en-US)', () => { + // 8:49 PM + const eveningDate = new Date(2026, 8, 1, 20, 49, 0); + const eveningResult = formatClockDisplay(eveningDate, 'en-US'); + expect(eveningResult.time).toBe('8:49'); + expect(eveningResult.meridiem).toBe('PM'); + expect(eveningResult.hour).toBe(20); + + // 8:49 AM + const morningDate = new Date(2026, 8, 1, 8, 49, 0); + const morningResult = formatClockDisplay(morningDate, 'en-US'); + expect(morningResult.time).toBe('8:49'); + expect(morningResult.meridiem).toBe('AM'); + expect(morningResult.hour).toBe(8); + + // Midnight (12:00 AM) + const midnight = new Date(2026, 8, 1, 0, 0, 0); + const midnightResult = formatClockDisplay(midnight, 'en-US'); + expect(midnightResult.time).toBe('12:00'); + expect(midnightResult.meridiem).toBe('AM'); + expect(midnightResult.hour).toBe(0); + + // Noon (12:00 PM) + const noon = new Date(2026, 8, 1, 12, 0, 0); + const noonResult = formatClockDisplay(noon, 'en-US'); + expect(noonResult.time).toBe('12:00'); + expect(noonResult.meridiem).toBe('PM'); + expect(noonResult.hour).toBe(12); + }); + + it('formats 24-hour locale without meridiem (en-GB)', () => { + const eveningDate = new Date(2026, 8, 1, 20, 49, 0); + const result = formatClockDisplay(eveningDate, 'en-GB'); + expect(result.time).toBe('20:49'); + expect(result.meridiem).toBe(''); + expect(result.hour).toBe(20); + + const midnight = new Date(2026, 8, 1, 0, 5, 0); + const midnightResult = formatClockDisplay(midnight, 'en-GB'); + expect(midnightResult.time).toBe('0:05'); + expect(midnightResult.meridiem).toBe(''); + expect(midnightResult.hour).toBe(0); + }); + + it('formats 24-hour European locales without meridiem (de-DE, sv-SE, fr-FR)', () => { + const eveningDate = new Date(2026, 8, 1, 20, 49, 0); + + const deResult = formatClockDisplay(eveningDate, 'de-DE'); + expect(deResult.time).toBe('20:49'); + expect(deResult.meridiem).toBe(''); + + const svResult = formatClockDisplay(eveningDate, 'sv-SE'); + expect(svResult.time).toBe('20:49'); + expect(svResult.meridiem).toBe(''); + + const frResult = formatClockDisplay(eveningDate, 'fr-FR'); + expect(frResult.time).toBe('20:49'); + expect(frResult.meridiem).toBe(''); + }); + + it('defaults to current date when no date is supplied', () => { + const result = formatClockDisplay(); + expect(result).toHaveProperty('time'); + expect(result).toHaveProperty('meridiem'); + expect(result).toHaveProperty('hour'); + expect(typeof result.time).toBe('string'); + expect(typeof result.hour).toBe('number'); + }); + + it('handles unexpected/invalid locale gracefully using fallback', () => { + const eveningDate = new Date(2026, 8, 1, 20, 49, 0); + const result = formatClockDisplay(eveningDate, 'invalid-locale-!!!'); + expect(result.time).toBe('8:49'); + expect(result.meridiem).toBe('PM'); + expect(result.hour).toBe(20); + }); + }); + + describe('formatMessageTimestamp', () => { + it('formats timestamp from today with time only', () => { + const now = new Date(); + const timestamp = Math.floor(now.getTime() / 1000); + const result = formatMessageTimestamp(timestamp); + expect(result).toBeTruthy(); + expect(typeof result).toBe('string'); + }); + + it('formats timestamp from previous date with date and time', () => { + const pastDate = new Date(2025, 0, 1, 12, 0, 0); + const timestamp = Math.floor(pastDate.getTime() / 1000); + const result = formatMessageTimestamp(timestamp); + expect(result).toContain('2025'); + }); + }); +}); diff --git a/ui/desktop/src/utils/timeUtils.ts b/ui/desktop/src/utils/timeUtils.ts index 6de531d05..e4fc4408b 100644 --- a/ui/desktop/src/utils/timeUtils.ts +++ b/ui/desktop/src/utils/timeUtils.ts @@ -28,3 +28,42 @@ export function formatMessageTimestamp(timestamp?: number): string { return `${dateStr} ${timeStr}`; } + +export interface ClockDisplay { + time: string; + meridiem: string; + hour: number; +} + +export function formatClockDisplay( + date: Date = new Date(), + locale: string = currentLocale +): ClockDisplay { + const hour = date.getHours(); + + try { + const formatter = new Intl.DateTimeFormat(locale, { + hour: 'numeric', + minute: '2-digit', + }); + + const parts = formatter.formatToParts(date); + const dayPeriodPart = parts.find((p) => p.type === 'dayPeriod'); + const meridiem = dayPeriodPart ? dayPeriodPart.value : ''; + + const time = parts + .filter((p) => p.type !== 'dayPeriod') + .map((p) => p.value) + .join('') + .trim(); + + return { time, meridiem, hour }; + } catch { + const minutes = date.getMinutes(); + const meridiem = hour >= 12 ? 'PM' : 'AM'; + const displayHour = ((hour + 11) % 12) + 1; + const time = `${displayHour}:${String(minutes).padStart(2, '0')}`; + return { time, meridiem, hour }; + } +} +