fix: adjust imports

src/CONST.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import dateAdd from 'date-fns/add';
-import dateSubtract from 'date-fns/sub';
+import {add as dateAdd} from 'date-fns';
+import {sub as dateSubtract} from 'date-fns/sub';
 import Config from 'react-native-config';
 import * as KeyCommand from 'react-native-key-command';
 import type {ValueOf} from 'type-fest';

src/libs/DateUtils.ts

@@ -29,9 +29,9 @@ import {
     subMilliseconds,
     subMinutes,
 } from 'date-fns';
-import {formatInTimeZone, format as tzFormat, utcToZonedTime, zonedTimeToUtc} from 'date-fns-tz';
-import enGB from 'date-fns/locale/en-GB';
-import es from 'date-fns/locale/es';
+import {formatInTimeZone, fromZonedTime, toZonedTime, format as tzFormat} from 'date-fns-tz';
+import {enGB} from 'date-fns/locale/en-GB';
+import {es} from 'date-fns/locale/es';
 import throttle from 'lodash/throttle';
 import Onyx from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
@@ -128,9 +128,9 @@ function setLocale(localeString: Locale) {
 function getLocalDateFromDatetime(locale: Locale, datetime?: string, currentSelectedTimezone: SelectedTimezone = timezone.selected): Date {
     setLocale(locale);
     if (!datetime) {
-        const res = utcToZonedTime(new Date(), currentSelectedTimezone);
+        const res = toZonedTime(new Date(), currentSelectedTimezone);
         if (Number.isNaN(res.getTime())) {
-            Log.warn('DateUtils.getLocalDateFromDatetime: utcToZonedTime returned an invalid date. Returning current date.', {
+            Log.warn('DateUtils.getLocalDateFromDatetime: toZonedTime returned an invalid date. Returning current date.', {
                 locale,
                 datetime,
                 currentSelectedTimezone,
@@ -148,7 +148,7 @@ function getLocalDateFromDatetime(locale: Locale, datetime?: string, currentSele
         parsedDatetime = new Date(datetime);
     }
 
-    return utcToZonedTime(parsedDatetime, currentSelectedTimezone);
+    return toZonedTime(parsedDatetime, currentSelectedTimezone);
 }
 
 /**
@@ -160,7 +160,7 @@ function getLocalDateFromDatetime(locale: Locale, datetime?: string, currentSele
  */
 function isToday(date: Date, timeZone: SelectedTimezone): boolean {
     const currentDate = new Date();
-    const currentDateInTimeZone = utcToZonedTime(currentDate, timeZone);
+    const currentDateInTimeZone = toZonedTime(currentDate, timeZone);
     return isSameDay(date, currentDateInTimeZone);
 }
 
@@ -174,7 +174,7 @@ function isToday(date: Date, timeZone: SelectedTimezone): boolean {
 function isTomorrow(date: Date, timeZone: SelectedTimezone): boolean {
     const currentDate = new Date();
     const tomorrow = addDays(currentDate, 1); // Get the date for tomorrow in the current time zone
-    const tomorrowInTimeZone = utcToZonedTime(tomorrow, timeZone);
+    const tomorrowInTimeZone = toZonedTime(tomorrow, timeZone);
     return isSameDay(date, tomorrowInTimeZone);
 }
 
@@ -188,7 +188,7 @@ function isTomorrow(date: Date, timeZone: SelectedTimezone): boolean {
 function isYesterday(date: Date, timeZone: SelectedTimezone): boolean {
     const currentDate = new Date();
     const yesterday = subDays(currentDate, 1); // Get the date for yesterday in the current time zone
-    const yesterdayInTimeZone = utcToZonedTime(yesterday, timeZone);
+    const yesterdayInTimeZone = toZonedTime(yesterday, timeZone);
     return isSameDay(date, yesterdayInTimeZone);
 }
 
@@ -401,14 +401,14 @@ function getDBTimeWithSkew(timestamp: string | number = ''): string {
 }
 
 function subtractMillisecondsFromDateTime(dateTime: string, milliseconds: number): string {
-    const date = zonedTimeToUtc(dateTime, 'UTC');
+    const date = fromZonedTime(dateTime, 'UTC');
     const newTimestamp = subMilliseconds(date, milliseconds).valueOf();
 
     return getDBTime(newTimestamp);
 }
 
 function addMillisecondsFromDateTime(dateTime: string, milliseconds: number): string {
-    const date = zonedTimeToUtc(dateTime, 'UTC');
+    const date = fromZonedTime(dateTime, 'UTC');
     const newTimestamp = addMilliseconds(date, milliseconds).valueOf();
 
     return getDBTime(newTimestamp);
@@ -699,7 +699,7 @@ function formatWithUTCTimeZone(datetime: string, dateFormat: string = CONST.DATE
     const date = new Date(datetime);
 
     if (isValid(date)) {
-        return tzFormat(utcToZonedTime(date, 'UTC'), dateFormat);
+        return tzFormat(toZonedTime(date, 'UTC'), dateFormat);
     }
 
     return '';

src/libs/DebugUtils.ts

@@ -1,6 +1,5 @@
 /* eslint-disable max-classes-per-file */
-import {isMatch} from 'date-fns';
-import isValid from 'date-fns/isValid';
+import {isMatch, isValid} from 'date-fns';
 import type {OnyxEntry} from 'react-native-onyx';
 import CONST from '@src/CONST';
 import type {Report, ReportAction} from '@src/types/onyx';

src/libs/actions/Report.ts

@@ -1,5 +1,5 @@
 import {findFocusedRoute} from '@react-navigation/native';
-import {format as timezoneFormat, utcToZonedTime} from 'date-fns-tz';
+import {format as timezoneFormat, toZonedTime} from 'date-fns-tz';
 import {Str} from 'expensify-common';
 import isEmpty from 'lodash/isEmpty';
 import {DeviceEventEmitter, InteractionManager, Linking} from 'react-native';
@@ -2513,7 +2513,7 @@ function clearIOUError(reportID: string) {
  * Uses the NEW FORMAT for "emojiReactions"
  */
 function addEmojiReaction(reportID: string, reportActionID: string, emoji: Emoji, skinTone: string | number = preferredSkinTone) {
-    const createdAt = timezoneFormat(utcToZonedTime(new Date(), 'UTC'), CONST.DATE.FNS_DB_FORMAT_STRING);
+    const createdAt = timezoneFormat(toZonedTime(new Date(), 'UTC'), CONST.DATE.FNS_DB_FORMAT_STRING);
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,

tests/actions/ReportTest.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import {afterEach, beforeAll, beforeEach, describe, expect, it} from '@jest/globals';
-import {utcToZonedTime} from 'date-fns-tz';
+import {toZonedTime} from 'date-fns-tz';
 import Onyx from 'react-native-onyx';
 import type {OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import CONST from '@src/CONST';
@@ -290,7 +290,7 @@ describe('actions/Report', () => {
             .then(() => {
                 // The report will be read
                 expect(ReportUtils.isUnread(report)).toBe(false);
-                expect(utcToZonedTime(report?.lastReadTime ?? '', UTC).getTime()).toBeGreaterThanOrEqual(utcToZonedTime(currentTime, UTC).getTime());
+                expect(toZonedTime(report?.lastReadTime ?? '', UTC).getTime()).toBeGreaterThanOrEqual(toZonedTime(currentTime, UTC).getTime());
 
                 // And no longer show the green dot for unread mentions in the LHN
                 expect(ReportUtils.isUnreadWithMention(report)).toBe(false);
@@ -316,7 +316,7 @@ describe('actions/Report', () => {
                 // The report will be read, the green dot for unread mentions will go away, and the lastReadTime updated
                 expect(ReportUtils.isUnread(report)).toBe(false);
                 expect(ReportUtils.isUnreadWithMention(report)).toBe(false);
-                expect(utcToZonedTime(report?.lastReadTime ?? '', UTC).getTime()).toBeGreaterThanOrEqual(utcToZonedTime(currentTime, UTC).getTime());
+                expect(toZonedTime(report?.lastReadTime ?? '', UTC).getTime()).toBeGreaterThanOrEqual(toZonedTime(currentTime, UTC).getTime());
                 expect(report?.lastMessageText).toBe('Current User Comment 1');
 
                 // When another comment is added by the current user
@@ -328,7 +328,7 @@ describe('actions/Report', () => {
             .then(() => {
                 // The report will be read and the lastReadTime updated
                 expect(ReportUtils.isUnread(report)).toBe(false);
-                expect(utcToZonedTime(report?.lastReadTime ?? '', UTC).getTime()).toBeGreaterThanOrEqual(utcToZonedTime(currentTime, UTC).getTime());
+                expect(toZonedTime(report?.lastReadTime ?? '', UTC).getTime()).toBeGreaterThanOrEqual(toZonedTime(currentTime, UTC).getTime());
                 expect(report?.lastMessageText).toBe('Current User Comment 2');
 
                 // When another comment is added by the current user
@@ -340,7 +340,7 @@ describe('actions/Report', () => {
             .then(() => {
                 // The report will be read and the lastReadTime updated
                 expect(ReportUtils.isUnread(report)).toBe(false);
-                expect(utcToZonedTime(report?.lastReadTime ?? '', UTC).getTime()).toBeGreaterThanOrEqual(utcToZonedTime(currentTime, UTC).getTime());
+                expect(toZonedTime(report?.lastReadTime ?? '', UTC).getTime()).toBeGreaterThanOrEqual(toZonedTime(currentTime, UTC).getTime());
                 expect(report?.lastMessageText).toBe('Current User Comment 3');
 
                 const USER_1_BASE_ACTION = {

tests/ui/UnreadIndicatorsTest.tsx

@@ -2,7 +2,7 @@
 import * as NativeNavigation from '@react-navigation/native';
 import {act, fireEvent, render, screen, waitFor} from '@testing-library/react-native';
 import {addSeconds, format, subMinutes, subSeconds} from 'date-fns';
-import {utcToZonedTime} from 'date-fns-tz';
+import {toZonedTime} from 'date-fns-tz';
 import React from 'react';
 import {AppState, DeviceEventEmitter} from 'react-native';
 import type {TextStyle, ViewStyle} from 'react-native';
@@ -301,7 +301,7 @@ describe('Unread Indicators', () => {
                             reportID: NEW_REPORT_ID,
                             reportName: CONST.REPORT.DEFAULT_REPORT_NAME,
                             lastReadTime: '',
-                            lastVisibleActionCreated: DateUtils.getDBTime(utcToZonedTime(NEW_REPORT_FIST_MESSAGE_CREATED_DATE, 'UTC').valueOf()),
+                            lastVisibleActionCreated: DateUtils.getDBTime(toZonedTime(NEW_REPORT_FIST_MESSAGE_CREATED_DATE, 'UTC').valueOf()),
                             lastMessageText: 'Comment 1',
                             lastActorAccountID: USER_C_ACCOUNT_ID,
                             participants: {

tests/unit/DateUtilsTest.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import {addDays, addMinutes, format, setHours, setMinutes, subDays, subHours, subMinutes, subSeconds} from 'date-fns';
-import {format as tzFormat, utcToZonedTime} from 'date-fns-tz';
+import {toZonedTime, format as tzFormat} from 'date-fns-tz';
 import Onyx from 'react-native-onyx';
 import DateUtils from '@libs/DateUtils';
 import CONST from '@src/CONST';
@@ -162,9 +162,9 @@ describe('DateUtils', () => {
         const tomorrow = addDays(today, 1);
         const yesterday = subDays(today, 1);
 
-        const todayInTimezone = utcToZonedTime(today, timezone);
-        const tomorrowInTimezone = utcToZonedTime(tomorrow, timezone);
-        const yesterdayInTimezone = utcToZonedTime(yesterday, timezone);
+        const todayInTimezone = toZonedTime(today, timezone);
+        const tomorrowInTimezone = toZonedTime(tomorrow, timezone);
+        const yesterdayInTimezone = toZonedTime(yesterday, timezone);
 
         it('isToday should correctly identify today', () => {
             expect(DateUtils.isToday(todayInTimezone, timezone)).toBe(true);