Skip to content

Commit 5d3ebb0

Browse files
committed
add to AssigneeStep
1 parent 8b20b18 commit 5d3ebb0

2 files changed

Lines changed: 4 additions & 12 deletions

File tree

src/libs/CardUtils.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -850,10 +850,7 @@ function getDefaultCardName(cardholder?: string) {
850850
* @returns Formatted start date string in yyyy-MM-dd format
851851
*/
852852
function getCardAssignmentStartDate(isEditing: boolean | undefined, existingStartDate?: string): string {
853-
if (!isEditing) {
854-
return format(new Date(), CONST.DATE.FNS_FORMAT_STRING);
855-
}
856-
return existingStartDate ?? format(new Date(), CONST.DATE.FNS_FORMAT_STRING);
853+
return isEditing ? (existingStartDate ?? format(new Date(), CONST.DATE.FNS_FORMAT_STRING)) : format(new Date(), CONST.DATE.FNS_FORMAT_STRING);
857854
}
858855

859856
function checkIfNewFeedConnected(prevFeedsData: CompanyFeeds, currentFeedsData: CompanyFeeds, plaidBank?: string) {

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import {format} from 'date-fns';
21
import {Str} from 'expensify-common';
32
import React, {useEffect, useMemo, useState} from 'react';
43
import {Keyboard} from 'react-native';
@@ -16,7 +15,7 @@ import useSearchSelector from '@hooks/useSearchSelector';
1615
import useThemeStyles from '@hooks/useThemeStyles';
1716
import {setDraftInviteAccountID} from '@libs/actions/Card';
1817
import {searchInServer} from '@libs/actions/Report';
19-
import {getDefaultCardName} from '@libs/CardUtils';
18+
import {getCardAssignmentStartDate, getDefaultCardName} from '@libs/CardUtils';
2019
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
2120
import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
2221
import {getHeaderMessage, getSearchValueForPhoneOrEmail, sortAlphabetically} from '@libs/OptionsListUtils';
@@ -92,9 +91,7 @@ function AssigneeStep({route}: AssigneeStepProps) {
9291
cardToAssign.encryptedCardNumber = assignCard.cardToAssign.encryptedCardNumber;
9392
cardToAssign.cardName = assignCard.cardToAssign.cardName;
9493
cardToAssign.customCardName = assignCard.cardToAssign.customCardName ?? defaultCardName;
95-
cardToAssign.startDate = !isEditing
96-
? format(new Date(), CONST.DATE.FNS_FORMAT_STRING)
97-
: (assignCard?.cardToAssign?.startDate ?? format(new Date(), CONST.DATE.FNS_FORMAT_STRING));
94+
cardToAssign.startDate = getCardAssignmentStartDate(isEditing, assignCard?.cardToAssign?.startDate);
9895
cardToAssign.dateOption = !isEditing
9996
? CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM
10097
: (assignCard?.cardToAssign?.dateOption ?? CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM);
@@ -129,9 +126,7 @@ function AssigneeStep({route}: AssigneeStepProps) {
129126
cardToAssign.encryptedCardNumber = assignCard.cardToAssign.encryptedCardNumber;
130127
cardToAssign.cardName = assignCard.cardToAssign.cardName;
131128
cardToAssign.customCardName = assignCard.cardToAssign.customCardName ?? defaultCardName;
132-
cardToAssign.startDate = !isEditing
133-
? format(new Date(), CONST.DATE.FNS_FORMAT_STRING)
134-
: (assignCard?.cardToAssign?.startDate ?? format(new Date(), CONST.DATE.FNS_FORMAT_STRING));
129+
cardToAssign.startDate = getCardAssignmentStartDate(isEditing, assignCard?.cardToAssign?.startDate);
135130
cardToAssign.dateOption = !isEditing
136131
? CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM
137132
: (assignCard?.cardToAssign?.dateOption ?? CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM);

0 commit comments

Comments
 (0)