Skip to content

Add getCardAssignmentStartDate util #82607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlosmiceli merged 7 commits into from
Feb 23, 2026
Merged

Add getCardAssignmentStartDate util #82607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8b20b18
add card util function
carlosmiceli Feb 17, 2026
5d3ebb0
add to AssigneeStep
carlosmiceli Feb 17, 2026
e0320fa
add to invite member step
carlosmiceli Feb 17, 2026
666b668
Merge remote-tracking branch 'origin/main' into cm-stardate-card-util
carlosmiceli Feb 17, 2026
077b6eb
Merge branch 'main' into cm-stardate-card-util
MelvinBot Feb 19, 2026
df3389b
Merge branch 'main' into cm-stardate-card-util
MelvinBot Feb 23, 2026
dc1fd12
Merge remote-tracking branch 'origin/main' into cm-stardate-card-util
MelvinBot Feb 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/libs/CardUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {fromUnixTime, isBefore} from 'date-fns';
import {format, fromUnixTime, isBefore} from 'date-fns';
import groupBy from 'lodash/groupBy';
import lodashSortBy from 'lodash/sortBy';
import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
Expand Down Expand Up @@ -844,6 +844,19 @@ function getDefaultCardName(cardholder?: string) {
return `${cardholder}'s card`;
}

/**
* Gets the start date for a card assignment.
* When not editing, always returns the current date.
* When editing, returns the existing start date or current date as fallback.
*
* @param isEditing - Whether the card assignment is being edited
* @param existingStartDate - The existing start date from previous assignment
* @returns Formatted start date string in yyyy-MM-dd format
*/
function getCardAssignmentStartDate(isEditing: boolean | undefined, existingStartDate?: string): string {
return isEditing ? (existingStartDate ?? format(new Date(), CONST.DATE.FNS_FORMAT_STRING)) : format(new Date(), CONST.DATE.FNS_FORMAT_STRING);
}

function checkIfNewFeedConnected(prevFeedsData: CompanyFeeds, currentFeedsData: CompanyFeeds, plaidBank?: string) {
const prevFeeds = Object.keys(prevFeedsData);
const currentFeeds = Object.keys(currentFeedsData);
Expand Down Expand Up @@ -1272,6 +1285,7 @@ export {
hasOnlyOneCardToAssign,
checkIfNewFeedConnected,
getDefaultCardName,
getCardAssignmentStartDate,
getDomainOrWorkspaceAccountID,
mergeCardListWithWorkspaceFeeds,
isCard,
Expand Down
11 changes: 3 additions & 8 deletions src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import {format} from 'date-fns';
import {Str} from 'expensify-common';
import React, {useEffect, useMemo, useState} from 'react';
import {Keyboard} from 'react-native';
Expand All @@ -16,7 +15,7 @@ import useSearchSelector from '@hooks/useSearchSelector';
import useThemeStyles from '@hooks/useThemeStyles';
import {setDraftInviteAccountID} from '@libs/actions/Card';
import {searchInServer} from '@libs/actions/Report';
import {getDefaultCardName} from '@libs/CardUtils';
import {getCardAssignmentStartDate, getDefaultCardName} from '@libs/CardUtils';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
import {getHeaderMessage, getSearchValueForPhoneOrEmail, sortAlphabetically} from '@libs/OptionsListUtils';
Expand Down Expand Up @@ -92,9 +91,7 @@ function AssigneeStep({route}: AssigneeStepProps) {
cardToAssign.encryptedCardNumber = assignCard.cardToAssign.encryptedCardNumber;
cardToAssign.cardName = assignCard.cardToAssign.cardName;
cardToAssign.customCardName = assignCard.cardToAssign.customCardName ?? defaultCardName;
cardToAssign.startDate = !isEditing
? format(new Date(), CONST.DATE.FNS_FORMAT_STRING)
: (assignCard?.cardToAssign?.startDate ?? format(new Date(), CONST.DATE.FNS_FORMAT_STRING));
cardToAssign.startDate = getCardAssignmentStartDate(isEditing, assignCard?.cardToAssign?.startDate);
cardToAssign.dateOption = !isEditing
? CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM
: (assignCard?.cardToAssign?.dateOption ?? CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM);
Expand Down Expand Up @@ -129,9 +126,7 @@ function AssigneeStep({route}: AssigneeStepProps) {
cardToAssign.encryptedCardNumber = assignCard.cardToAssign.encryptedCardNumber;
cardToAssign.cardName = assignCard.cardToAssign.cardName;
cardToAssign.customCardName = assignCard.cardToAssign.customCardName ?? defaultCardName;
cardToAssign.startDate = !isEditing
? format(new Date(), CONST.DATE.FNS_FORMAT_STRING)
: (assignCard?.cardToAssign?.startDate ?? format(new Date(), CONST.DATE.FNS_FORMAT_STRING));
cardToAssign.startDate = getCardAssignmentStartDate(isEditing, assignCard?.cardToAssign?.startDate);
cardToAssign.dateOption = !isEditing
? CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM
: (assignCard?.cardToAssign?.dateOption ?? CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM);
Expand Down
6 changes: 3 additions & 3 deletions src/pages/workspace/companyCards/assignCard/InviteNewMemberStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import useCardsList from '@hooks/useCardsList';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import {setDraftInviteAccountID} from '@libs/actions/Card';
import {getDefaultCardName, getFilteredCardList, hasOnlyOneCardToAssign} from '@libs/CardUtils';
import {getCardAssignmentStartDate, getDefaultCardName, getFilteredCardList, hasOnlyOneCardToAssign} from '@libs/CardUtils';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
import Navigation from '@navigation/Navigation';
Expand Down Expand Up @@ -63,7 +63,7 @@ function InviteNewMemberStep({route, currentUserPersonalDetails}: InviteeNewMemb
cardToAssign.encryptedCardNumber = assignCard.cardToAssign.encryptedCardNumber;
cardToAssign.cardName = assignCard.cardToAssign.cardName;
cardToAssign.customCardName = assignCard.cardToAssign.customCardName ?? defaultCardName;
cardToAssign.startDate = assignCard?.cardToAssign?.startDate ?? new Date().toISOString().split('T').at(0);
cardToAssign.startDate = getCardAssignmentStartDate(true, assignCard?.cardToAssign?.startDate);
cardToAssign.dateOption = assignCard?.cardToAssign?.dateOption ?? CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM;
setAssignCardStepAndData({
currentStep: CONST.COMPANY_CARD.STEP.CONFIRMATION,
Expand All @@ -75,7 +75,7 @@ function InviteNewMemberStep({route, currentUserPersonalDetails}: InviteeNewMemb
const onlyCard = filteredCardList.at(0);
cardToAssign.cardName = onlyCard?.cardName;
cardToAssign.encryptedCardNumber = onlyCard?.cardID;
cardToAssign.startDate = assignCard?.cardToAssign?.startDate ?? new Date().toISOString().split('T').at(0);
cardToAssign.startDate = getCardAssignmentStartDate(true, assignCard?.cardToAssign?.startDate);
cardToAssign.dateOption = assignCard?.cardToAssign?.dateOption ?? CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM;
setAssignCardStepAndData({
currentStep: CONST.COMPANY_CARD.STEP.CONFIRMATION,
Expand Down
Loading