From 13ab84d50e7f8bfa4837ba8f7e48e97703b227dd Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Mon, 10 Nov 2025 17:26:06 -0800 Subject: [PATCH] Revert "add canonicalizeTimezone conversions" This reverts commit a1d6204373b13bb4675de3aacc49a650b24318be. --- src/components/hooks/useDateParameters.ts | 4 ++-- src/components/hooks/useTimezone.ts | 15 ++------------- src/lib/constants.ts | 21 --------------------- 3 files changed, 4 insertions(+), 36 deletions(-) diff --git a/src/components/hooks/useDateParameters.ts b/src/components/hooks/useDateParameters.ts index 16e12314..359bbc1f 100644 --- a/src/components/hooks/useDateParameters.ts +++ b/src/components/hooks/useDateParameters.ts @@ -5,7 +5,7 @@ export function useDateParameters() { const { dateRange: { startDate, endDate, unit }, } = useDateRange(); - const { timezone, toUtc, canonicalizeTimezone } = useTimezone(); + const { timezone, toUtc } = useTimezone(); return { startAt: +toUtc(startDate), @@ -13,6 +13,6 @@ export function useDateParameters() { startDate: toUtc(startDate).toISOString(), endDate: toUtc(endDate).toISOString(), unit, - timezone: canonicalizeTimezone(timezone), + timezone, }; } diff --git a/src/components/hooks/useTimezone.ts b/src/components/hooks/useTimezone.ts index 3770c26b..0e1fe6cd 100644 --- a/src/components/hooks/useTimezone.ts +++ b/src/components/hooks/useTimezone.ts @@ -1,5 +1,5 @@ import { setItem } from '@/lib/storage'; -import { TIMEZONE_CONFIG, TIMEZONE_LEGACY } from '@/lib/constants'; +import { TIMEZONE_CONFIG } from '@/lib/constants'; import { formatInTimeZone, zonedTimeToUtc, utcToZonedTime } from 'date-fns-tz'; import { useApp, setTimezone } from '@/store/app'; import { useLocale } from './useLocale'; @@ -34,16 +34,5 @@ export function useTimezone() { return utcToZonedTime(date, timezone); }; - const canonicalizeTimezone = (timezone: string): string => { - return TIMEZONE_LEGACY[timezone] ?? timezone; - }; - - return { - timezone, - saveTimezone, - formatTimezoneDate, - toUtc, - fromUtc, - canonicalizeTimezone, - }; + return { timezone, saveTimezone, formatTimezoneDate, toUtc, fromUtc }; } diff --git a/src/lib/constants.ts b/src/lib/constants.ts index 195fe1be..50a25b8d 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -658,24 +658,3 @@ export const CURRENCIES = [ { id: 'OMR', name: 'Omani Rial' }, { id: 'GHS', name: 'Ghanaian Cedi' }, ]; - -export const TIMEZONE_LEGACY: Record = { - 'Asia/Batavia': 'Asia/Jakarta', - 'Asia/Calcutta': 'Asia/Kolkata', - 'Asia/Chongqing': 'Asia/Shanghai', - 'Asia/Harbin': 'Asia/Shanghai', - 'Asia/Jayapura': 'Asia/Pontianak', - 'Asia/Katmandu': 'Asia/Kathmandu', - 'Asia/Macao': 'Asia/Macau', - 'Asia/Rangoon': 'Asia/Yangon', - 'Asia/Saigon': 'Asia/Ho_Chi_Minh', - 'Europe/Kiev': 'Europe/Kyiv', - 'Europe/Zaporozhye': 'Europe/Kyiv', - 'Etc/UTC': 'UTC', - 'US/Arizona': 'America/Phoenix', - 'US/Central': 'America/Chicago', - 'US/Eastern': 'America/New_York', - 'US/Mountain': 'America/Denver', - 'US/Pacific': 'America/Los_Angeles', - 'US/Samoa': 'Pacific/Pago_Pago', -};