Merge pull request #25772 from waterim/fix-25737-unread-messages

[CP Staging] Unread messages fix: change from Etc/UTC to UTC
Expensify · Aug 23, 2023 · 4b345be · 4b345be
2 parents 867d61e + 9dbff2d
commit 4b345be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/libs/DateUtils.js b/src/libs/DateUtils.js
@@ -273,7 +273,7 @@ function getDBTime(timestamp = '') {
  * @returns {String}
  */
 function subtractMillisecondsFromDateTime(dateTime, milliseconds) {
-    const date = zonedTimeToUtc(dateTime, 'Etc/UTC');
+    const date = zonedTimeToUtc(dateTime, 'UTC');
     const newTimestamp = subMilliseconds(date, milliseconds).valueOf();
     return getDBTime(newTimestamp);
 }

diff --git a/tests/unit/DateUtilsTest.js b/tests/unit/DateUtilsTest.js
@@ -14,7 +14,7 @@ describe('DateUtils', () => {
             keys: ONYXKEYS,
             initialKeyStates: {
                 [ONYXKEYS.SESSION]: {accountID: 999},
-                [ONYXKEYS.PERSONAL_DETAILS_LIST]: {999: {timezone: {selected: 'Etc/UTC'}}},
+                [ONYXKEYS.PERSONAL_DETAILS_LIST]: {999: {timezone: {selected: 'UTC'}}},
             },
         });
         return waitForPromisesToResolve();
@@ -73,7 +73,7 @@ describe('DateUtils', () => {
         Intl.DateTimeFormat = jest.fn(() => ({
             resolvedOptions: () => ({timeZone: 'America/Chicago'}),
         }));
-        Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, {999: {timezone: {selected: 'Etc/UTC', automatic: true}}}).then(() => {
+        Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, {999: {timezone: {selected: 'UTC', automatic: true}}}).then(() => {
             const result = DateUtils.getCurrentTimezone();
             expect(result).toEqual({
                 selected: 'America/Chicago',
@@ -84,12 +84,12 @@ describe('DateUtils', () => {
 
     it('should not update timezone if automatic and selected timezone match', () => {
         Intl.DateTimeFormat = jest.fn(() => ({
-            resolvedOptions: () => ({timeZone: 'Etc/UTC'}),
+            resolvedOptions: () => ({timeZone: 'UTC'}),
         }));
-        Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, {999: {timezone: {selected: 'Etc/UTC', automatic: true}}}).then(() => {
+        Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, {999: {timezone: {selected: 'UTC', automatic: true}}}).then(() => {
             const result = DateUtils.getCurrentTimezone();
             expect(result).toEqual({
-                selected: 'Etc/UTC',
+                selected: 'UTC',
                 automatic: true,
             });
         });