Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 136 additions & 1 deletion src/TIMEZONES.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint-disable @typescript-eslint/naming-convention */
// All timezones were taken from: https://raw.githubusercontent.com/leon-do/Timezones/main/timezone.json
export default [
const TIMEZONES = [
'Africa/Abidjan',
'Africa/Accra',
'Africa/Addis_Ababa',
Expand Down Expand Up @@ -419,3 +420,137 @@ export default [
'Pacific/Wake',
'Pacific/Wallis',
] as const;

/**
* The timezones supported in browser and on native devices differ, so we must map each timezone to its supported equivalent.
* Data sourced from https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
*/
const timezoneBackwardMap: Record<string, (typeof TIMEZONES)[number]> = {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a comment explaining briefly where these values come from (link to wikipedia page)/what the purpose of the map is? That way people curious in the future don't have to follow the GH blame trail.

'Africa/Asmera': 'Africa/Nairobi',
'Africa/Timbuktu': 'Africa/Abidjan',
'America/Argentina/ComodRivadavia': 'America/Argentina/Catamarca',
'America/Atka': 'America/Adak',
'America/Buenos_Aires': 'America/Argentina/Buenos_Aires',
'America/Catamarca': 'America/Argentina/Catamarca',
'America/Coral_Harbour': 'America/Panama',
'America/Cordoba': 'America/Argentina/Cordoba',
'America/Ensenada': 'America/Tijuana',
'America/Fort_Wayne': 'America/Indiana/Indianapolis',
'America/Godthab': 'America/Nuuk',
'America/Indianapolis': 'America/Indiana/Indianapolis',
'America/Jujuy': 'America/Argentina/Jujuy',
'America/Knox_IN': 'America/Indiana/Knox',
'America/Louisville': 'America/Kentucky/Louisville',
'America/Mendoza': 'America/Argentina/Mendoza',
'America/Montreal': 'America/Toronto',
'America/Nipigon': 'America/Toronto',
'America/Pangnirtung': 'America/Iqaluit',
'America/Porto_Acre': 'America/Rio_Branco',
'America/Rainy_River': 'America/Winnipeg',
'America/Rosario': 'America/Argentina/Cordoba',
'America/Santa_Isabel': 'America/Tijuana',
'America/Shiprock': 'America/Denver',
'America/Thunder_Bay': 'America/Toronto',
'America/Virgin': 'America/Puerto_Rico',
'America/Yellowknife': 'America/Edmonton',
'Antarctica/South_Pole': 'Pacific/Auckland',
'Asia/Ashkhabad': 'Asia/Ashgabat',
'Asia/Calcutta': 'Asia/Kolkata',
'Asia/Chongqing': 'Asia/Shanghai',
'Asia/Chungking': 'Asia/Shanghai',
'Asia/Dacca': 'Asia/Dhaka',
'Asia/Harbin': 'Asia/Shanghai',
'Asia/Istanbul': 'Europe/Istanbul',
'Asia/Kashgar': 'Asia/Urumqi',
'Asia/Katmandu': 'Asia/Kathmandu',
'Asia/Macao': 'Asia/Macau',
'Asia/Rangoon': 'Asia/Yangon',
'Asia/Saigon': 'Asia/Ho_Chi_Minh',
'Asia/Tel_Aviv': 'Asia/Jerusalem',
'Asia/Thimbu': 'Asia/Thimphu',
'Asia/Ujung_Pandang': 'Asia/Makassar',
'Asia/Ulan_Bator': 'Asia/Ulaanbaatar',
'Atlantic/Faeroe': 'Atlantic/Faroe',
'Atlantic/Jan_Mayen': 'Europe/Berlin',
'Australia/ACT': 'Australia/Sydney',
'Australia/Canberra': 'Australia/Sydney',
'Australia/Currie': 'Australia/Hobart',
'Australia/LHI': 'Australia/Lord_Howe',
'Australia/NSW': 'Australia/Sydney',
'Australia/North': 'Australia/Darwin',
'Australia/Queensland': 'Australia/Brisbane',
'Australia/South': 'Australia/Adelaide',
'Australia/Tasmania': 'Australia/Hobart',
'Australia/Victoria': 'Australia/Melbourne',
'Australia/West': 'Australia/Perth',
'Australia/Yancowinna': 'Australia/Broken_Hill',
'Brazil/Acre': 'America/Rio_Branco',
'Brazil/DeNoronha': 'America/Noronha',
'Brazil/East': 'America/Sao_Paulo',
'Brazil/West': 'America/Manaus',
'Canada/Atlantic': 'America/Halifax',
'Canada/Central': 'America/Winnipeg',
'Canada/Eastern': 'America/Toronto',
'Canada/Mountain': 'America/Edmonton',
'Canada/Newfoundland': 'America/St_Johns',
'Canada/Pacific': 'America/Vancouver',
'Canada/Saskatchewan': 'America/Regina',
'Canada/Yukon': 'America/Whitehorse',
'Chile/Continental': 'America/Santiago',
'Chile/EasterIsland': 'Pacific/Easter',
Cuba: 'America/Havana',
Egypt: 'Africa/Cairo',
Eire: 'Europe/Dublin',
'Europe/Belfast': 'Europe/London',
'Europe/Kiev': 'Europe/Kyiv',
'Europe/Nicosia': 'Asia/Nicosia',
'Europe/Tiraspol': 'Europe/Chisinau',
'Europe/Uzhgorod': 'Europe/Kyiv',
'Europe/Zaporozhye': 'Europe/Kyiv',
GB: 'Europe/London',
'GB-Eire': 'Europe/London',
Hongkong: 'Asia/Hong_Kong',
Iceland: 'Africa/Abidjan',
Iran: 'Asia/Tehran',
Israel: 'Asia/Jerusalem',
Jamaica: 'America/Jamaica',
Japan: 'Asia/Tokyo',
Kwajalein: 'Pacific/Kwajalein',
Libya: 'Africa/Tripoli',
'Mexico/BajaNorte': 'America/Tijuana',
'Mexico/BajaSur': 'America/Mazatlan',
'Mexico/General': 'America/Mexico_City',
NZ: 'Pacific/Auckland',
'NZ-CHAT': 'Pacific/Chatham',
Navajo: 'America/Denver',
PRC: 'Asia/Shanghai',
'Pacific/Enderbury': 'Pacific/Kanton',
'Pacific/Johnston': 'Pacific/Honolulu',
'Pacific/Ponape': 'Pacific/Guadalcanal',
'Pacific/Samoa': 'Pacific/Pago_Pago',
'Pacific/Truk': 'Pacific/Port_Moresby',
'Pacific/Yap': 'Pacific/Port_Moresby',
Poland: 'Europe/Warsaw',
Portugal: 'Europe/Lisbon',
ROC: 'Asia/Taipei',
ROK: 'Asia/Seoul',
Singapore: 'Asia/Singapore',
Turkey: 'Europe/Istanbul',
'US/Alaska': 'America/Anchorage',
'US/Aleutian': 'America/Adak',
'US/Arizona': 'America/Phoenix',
'US/Central': 'America/Chicago',
'US/East-Indiana': 'America/Indiana/Indianapolis',
'US/Eastern': 'America/New_York',
'US/Hawaii': 'Pacific/Honolulu',
'US/Indiana-Starke': 'America/Indiana/Knox',
'US/Michigan': 'America/Detroit',
'US/Mountain': 'America/Denver',
'US/Pacific': 'America/Los_Angeles',
'US/Samoa': 'Pacific/Pago_Pago',
'W-SU': 'Europe/Moscow',
};

export {timezoneBackwardMap};

export default TIMEZONES;
18 changes: 18 additions & 0 deletions src/libs/DateUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import Onyx from 'react-native-onyx';
import type {ValueOf} from 'type-fest';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import {timezoneBackwardMap} from '@src/TIMEZONES';
import type {SelectedTimezone, Timezone} from '@src/types/onyx/PersonalDetails';
import * as CurrentDate from './actions/CurrentDate';
import * as Localize from './Localize';
Expand Down Expand Up @@ -697,6 +698,22 @@ function formatWithUTCTimeZone(datetime: string, dateFormat: string = CONST.DATE
return '';
}

/**
*
* @param timezone
* function format unsupported timezone to supported timezone
* @returns Timezone
*/
function formatToSupportedTimezone(timezoneInput: Timezone): Timezone {
if (!timezoneInput?.selected) {
return timezoneInput;
}
return {
selected: timezoneBackwardMap[timezoneInput.selected] ?? timezoneInput.selected,
automatic: timezoneInput.automatic,
};
}

const DateUtils = {
formatToDayOfWeek,
formatToLongDateWithWeekday,
Expand Down Expand Up @@ -739,6 +756,7 @@ const DateUtils = {
getWeekStartsOn,
getWeekEndsOn,
isTimeAtLeastOneMinuteInFuture,
formatToSupportedTimezone,
};

export default DateUtils;
3 changes: 3 additions & 0 deletions src/libs/actions/App.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import Onyx from 'react-native-onyx';
import type {ValueOf} from 'type-fest';
import * as API from '@libs/API';
import * as Browser from '@libs/Browser';
import DateUtils from '@libs/DateUtils';
import Log from '@libs/Log';
import getCurrentUrl from '@libs/Navigation/currentUrl';
import Navigation from '@libs/Navigation/Navigation';
Expand Down Expand Up @@ -448,6 +449,8 @@ function openProfile(personalDetails: OnyxTypes.PersonalDetails) {
};
}

newTimezoneData = DateUtils.formatToSupportedTimezone(newTimezoneData);

type OpenProfileParams = {
timezone: string;
};
Expand Down
7 changes: 4 additions & 3 deletions src/libs/actions/PersonalDetails.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import type {OnyxEntry, OnyxUpdate} from 'react-native-onyx';
import Onyx from 'react-native-onyx';
import * as API from '@libs/API';
import type {CustomRNImageManipulatorResult} from '@libs/cropOrRotateImage/types';
import DateUtils from '@libs/DateUtils';
import * as LocalePhoneNumber from '@libs/LocalePhoneNumber';
import Navigation from '@libs/Navigation/Navigation';
import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
Expand Down Expand Up @@ -270,9 +271,9 @@ function updateAutomaticTimezone(timezone: Timezone) {
type UpdateAutomaticTimezoneParams = {
timezone: string;
};

const formatedTimezone = DateUtils.formatToSupportedTimezone(timezone);
const parameters: UpdateAutomaticTimezoneParams = {
timezone: JSON.stringify(timezone),
timezone: JSON.stringify(formatedTimezone),
};

API.write('UpdateAutomaticTimezone', parameters, {
Expand All @@ -282,7 +283,7 @@ function updateAutomaticTimezone(timezone: Timezone) {
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
value: {
[currentUserAccountID]: {
timezone,
timezone: formatedTimezone,
},
},
},
Expand Down