diff --git a/apps/meteor/client/hooks/useTimezoneNameList.ts b/apps/meteor/client/hooks/useTimezoneNameList.ts index e51d8812ac2c9..3c19cba8e56e7 100644 --- a/apps/meteor/client/hooks/useTimezoneNameList.ts +++ b/apps/meteor/client/hooks/useTimezoneNameList.ts @@ -1,8 +1,8 @@ +import { getTimezoneNames } from '@rocket.chat/tools'; import { useMemo } from 'react'; -const getTimeZoneNames = (): string[] => { - const intl = Intl as typeof Intl & { supportedValuesOf?(key: 'timeZone'): string[] }; - return typeof intl.supportedValuesOf === 'function' ? intl.supportedValuesOf('timeZone') : []; -}; - -export const useTimezoneNameList = (): string[] => useMemo(() => getTimeZoneNames(), []); +export const useTimezoneNameList = (): string[] => + useMemo(() => { + const names = getTimezoneNames(); + return names.includes('UTC') ? names : ['UTC', ...names]; + }, []); diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/SelectTimezoneSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/SelectTimezoneSettingInput.tsx index 9db35413302f6..8008be82d8f06 100644 --- a/apps/meteor/client/views/admin/settings/Setting/inputs/SelectTimezoneSettingInput.tsx +++ b/apps/meteor/client/views/admin/settings/Setting/inputs/SelectTimezoneSettingInput.tsx @@ -1,4 +1,5 @@ import { Field, FieldHint, FieldLabel, FieldRow, Select } from '@rocket.chat/fuselage'; +import { canonicalizeTimezone } from '@rocket.chat/tools'; import type { ReactElement } from 'react'; import { useTimezoneNameList } from '../../../../../hooks/useTimezoneNameList'; @@ -38,7 +39,7 @@ function SelectTimezoneSettingInput({