Skip to content

Commit dfa504a

Browse files
authored
Merge pull request Expensify#66622 from parasharrajat/parasharrajat/time-schedule-date
Convert date to user timezone to display on schedule call page
2 parents 3c4fcce + c13477e commit dfa504a

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/pages/ScheduleCall/ScheduleCallConfirmationPage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {useRoute} from '@react-navigation/native';
2-
import {addMinutes, format} from 'date-fns';
2+
import {addMinutes} from 'date-fns';
33
import React, {useCallback, useMemo} from 'react';
44
import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
55
import Button from '@components/Button';
@@ -71,7 +71,7 @@ function ScheduleCallConfirmationPage() {
7171
if (!scheduleCallDraft?.timeSlot || !scheduleCallDraft.date) {
7272
return '';
7373
}
74-
const dateString = format(scheduleCallDraft.date, CONST.DATE.MONTH_DAY_YEAR_FORMAT);
74+
const dateString = DateUtils.formatInTimeZoneWithFallback(scheduleCallDraft.date, userTimezone, CONST.DATE.MONTH_DAY_YEAR_FORMAT);
7575
const timeString = `${DateUtils.formatInTimeZoneWithFallback(scheduleCallDraft?.timeSlot, userTimezone, CONST.DATE.LOCAL_TIME_FORMAT)} - ${DateUtils.formatInTimeZoneWithFallback(
7676
addMinutes(scheduleCallDraft?.timeSlot, 30),
7777
userTimezone,

src/pages/ScheduleCall/ScheduleCallPage.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {useFocusEffect, useRoute} from '@react-navigation/native';
2-
import {compareAsc, format, parse} from 'date-fns';
2+
import {compareAsc, parse} from 'date-fns';
33
import React, {useCallback, useEffect, useMemo} from 'react';
44
import {View} from 'react-native';
55
import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
@@ -187,7 +187,9 @@ function ScheduleCallPage() {
187187
<View style={[styles.ph5, styles.mb5]}>
188188
<Text style={[styles.mb5, styles.colorMuted]}>
189189
{translate('scheduledCall.book.slots')}
190-
<Text style={[styles.textStrong, styles.colorMuted]}>{format(scheduleCallDraft.date, CONST.DATE.MONTH_DAY_YEAR_FORMAT)}</Text>
190+
<Text style={[styles.textStrong, styles.colorMuted]}>
191+
{DateUtils.formatInTimeZoneWithFallback(scheduleCallDraft.date, userTimezone, CONST.DATE.MONTH_DAY_YEAR_FORMAT)}
192+
</Text>
191193
</Text>
192194
<View style={[styles.flexRow, styles.flexWrap, styles.justifyContentStart, styles.gap2]}>
193195
{timeSlotsForSelectedData.map((timeSlot: TimeSlot) => (

0 commit comments

Comments
 (0)