Skip to content

Commit 50794ef

Browse files
authored
Merge pull request #52150 from callstack-internal/feat/51915
Workspace Feed - remove unneeded extractDate from the startDate step
2 parents a7b1553 + b474da3 commit 50794ef

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type {StackScreenProps} from '@react-navigation/stack';
2-
import {format} from 'date-fns';
2+
import {format, parseISO} from 'date-fns';
33
import React, {useState} from 'react';
44
import {ActivityIndicator, View} from 'react-native';
55
import {useOnyx} from 'react-native-onyx';
@@ -159,7 +159,7 @@ function WorkspaceCompanyCardDetailsPage({route}: WorkspaceCompanyCardDetailsPag
159159
/>
160160
<MenuItemWithTopDescription
161161
description={translate('workspace.moreFeatures.companyCards.transactionStartDate')}
162-
title={card?.scrapeMinDate ? format(card.scrapeMinDate, CONST.DATE.FNS_FORMAT_STRING) : ''}
162+
title={card?.scrapeMinDate ? format(parseISO(card.scrapeMinDate), CONST.DATE.FNS_FORMAT_STRING) : ''}
163163
interactive={false}
164164
/>
165165
<OfflineWithFeedback

src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {subDays} from 'date-fns';
1+
import {format, subDays} from 'date-fns';
22
import React, {useMemo, useState} from 'react';
33
import {View} from 'react-native';
44
import {useOnyx} from 'react-native-onyx';
@@ -11,7 +11,6 @@ import Text from '@components/Text';
1111
import useLocalize from '@hooks/useLocalize';
1212
import useSafePaddingBottomStyle from '@hooks/useSafePaddingBottomStyle';
1313
import useThemeStyles from '@hooks/useThemeStyles';
14-
import DateUtils from '@libs/DateUtils';
1514
import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
1615
import * as CompanyCards from '@userActions/CompanyCards';
1716
import CONST from '@src/CONST';
@@ -30,7 +29,7 @@ function TransactionStartDateStep() {
3029

3130
const [dateOptionSelected, setDateOptionSelected] = useState(data?.dateOption ?? CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.FROM_BEGINNING);
3231
const [isModalOpened, setIsModalOpened] = useState(false);
33-
const [startDate, setStartDate] = useState(DateUtils.extractDate(new Date().toString()));
32+
const [startDate, setStartDate] = useState(format(new Date(), CONST.DATE.FNS_FORMAT_STRING));
3433

3534
const handleBackButtonPress = () => {
3635
if (isEditing) {
@@ -50,13 +49,12 @@ function TransactionStartDateStep() {
5049
const handleSelectDateOption = (dateOption: string) => {
5150
setDateOptionSelected(dateOption);
5251
if (dateOption === CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.FROM_BEGINNING) {
53-
const newStartDate = new Date();
54-
setStartDate(DateUtils.extractDate(newStartDate.toString()));
52+
setStartDate(format(new Date(), CONST.DATE.FNS_FORMAT_STRING));
5553
}
5654
};
5755

5856
const submit = () => {
59-
const date90DaysBack = DateUtils.extractDate(subDays(new Date(), 90).toString());
57+
const date90DaysBack = format(subDays(new Date(), 90), CONST.DATE.FNS_FORMAT_STRING);
6058

6159
CompanyCards.setAssignCardStepAndData({
6260
currentStep: CONST.COMPANY_CARD.STEP.CONFIRMATION,

0 commit comments

Comments
 (0)