Skip to content

Add getCardAssignmentDateOption util method #82707

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
nkuoch merged 7 commits into from
Feb 24, 2026
Merged

Add getCardAssignmentDateOption util method #82707

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
bacc214
add util method
carlosmiceli Feb 17, 2026
8227415
use util method in asignee step
carlosmiceli Feb 17, 2026
19ec54a
use util method in new member step
carlosmiceli Feb 17, 2026
9ccfe4c
Merge remote-tracking branch 'origin/main' into cm-add-dateoption-car…
carlosmiceli Feb 17, 2026
f404124
Fix: accept string type for existingDateOption parameter in getCardAs…
MelvinBot Feb 17, 2026
7cb081e
Extract getCardAssignmentStartDate util and trim JSDoc
MelvinBot Feb 17, 2026
0b9f888
Merge remote-tracking branch 'origin/main' into cm-add-dateoption-car…
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
12 changes: 12 additions & 0 deletions src/libs/CardUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,17 @@ function getDefaultCardName(cardholder?: string) {
return `${cardholder}'s card`;
}

/** Returns the date option for a card assignment — CUSTOM when not editing, or the existing option when editing. */
function getCardAssignmentDateOption(isEditing: boolean | undefined, existingDateOption?: string): ValueOf<typeof CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS> {
if (!isEditing) {
return CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM;
}
if (existingDateOption === CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.FROM_BEGINNING) {
return CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.FROM_BEGINNING;
}
return CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM;
}

/**
* Gets the start date for a card assignment.
* When not editing, always returns the current date.
Expand Down Expand Up @@ -1285,6 +1296,7 @@ export {
hasOnlyOneCardToAssign,
checkIfNewFeedConnected,
getDefaultCardName,
getCardAssignmentDateOption,
getCardAssignmentStartDate,
getDomainOrWorkspaceAccountID,
mergeCardListWithWorkspaceFeeds,
Expand Down
10 changes: 3 additions & 7 deletions src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,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 {getCardAssignmentStartDate, getDefaultCardName} from '@libs/CardUtils';
import {getCardAssignmentDateOption, 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 +92,7 @@ function AssigneeStep({route}: AssigneeStepProps) {
cardToAssign.cardName = assignCard.cardToAssign.cardName;
cardToAssign.customCardName = assignCard.cardToAssign.customCardName ?? defaultCardName;
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);
cardToAssign.dateOption = getCardAssignmentDateOption(isEditing, assignCard?.cardToAssign?.dateOption);
setAssignCardStepAndData({
cardToAssign,
isEditing: false,
Expand Down Expand Up @@ -127,9 +125,7 @@ function AssigneeStep({route}: AssigneeStepProps) {
cardToAssign.cardName = assignCard.cardToAssign.cardName;
cardToAssign.customCardName = assignCard.cardToAssign.customCardName ?? defaultCardName;
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);
cardToAssign.dateOption = getCardAssignmentDateOption(isEditing, assignCard?.cardToAssign?.dateOption);
setAssignCardStepAndData({
cardToAssign,
isEditing: false,
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 {getCardAssignmentStartDate, getDefaultCardName, getFilteredCardList, hasOnlyOneCardToAssign} from '@libs/CardUtils';
import {getCardAssignmentDateOption, 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 @@ -64,7 +64,7 @@ function InviteNewMemberStep({route, currentUserPersonalDetails}: InviteeNewMemb
cardToAssign.cardName = assignCard.cardToAssign.cardName;
cardToAssign.customCardName = assignCard.cardToAssign.customCardName ?? defaultCardName;
cardToAssign.startDate = getCardAssignmentStartDate(true, assignCard?.cardToAssign?.startDate);
cardToAssign.dateOption = assignCard?.cardToAssign?.dateOption ?? CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM;
cardToAssign.dateOption = getCardAssignmentDateOption(true, assignCard?.cardToAssign?.dateOption);
setAssignCardStepAndData({
currentStep: CONST.COMPANY_CARD.STEP.CONFIRMATION,
cardToAssign,
Expand All @@ -76,7 +76,7 @@ function InviteNewMemberStep({route, currentUserPersonalDetails}: InviteeNewMemb
cardToAssign.cardName = onlyCard?.cardName;
cardToAssign.encryptedCardNumber = onlyCard?.cardID;
cardToAssign.startDate = getCardAssignmentStartDate(true, assignCard?.cardToAssign?.startDate);
cardToAssign.dateOption = assignCard?.cardToAssign?.dateOption ?? CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM;
cardToAssign.dateOption = getCardAssignmentDateOption(true, assignCard?.cardToAssign?.dateOption);
setAssignCardStepAndData({
currentStep: CONST.COMPANY_CARD.STEP.CONFIRMATION,
cardToAssign,
Expand Down
Loading