diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index 26e6118c6b3e..e6e6f3e88060 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -948,6 +948,8 @@ const ONYXKEYS = { EDIT_EXPENSIFY_CARD_NAME_DRAFT_FORM: 'editExpensifyCardNameDraft', EDIT_EXPENSIFY_CARD_LIMIT_FORM: 'editExpensifyCardLimit', EDIT_EXPENSIFY_CARD_LIMIT_DRAFT_FORM: 'editExpensifyCardLimitDraft', + EDIT_EXPENSIFY_CARD_LIMIT_TYPE_FORM: 'editExpensifyCardLimitType', + EDIT_EXPENSIFY_CARD_LIMIT_TYPE_DRAFT_FORM: 'editExpensifyCardLimitTypeDraft', SAGE_INTACCT_CREDENTIALS_FORM: 'sageIntacctCredentialsForm', SAGE_INTACCT_CREDENTIALS_FORM_DRAFT: 'sageIntacctCredentialsFormDraft', NETSUITE_CUSTOM_FIELD_FORM: 'netSuiteCustomFieldForm', @@ -1105,6 +1107,7 @@ type OnyxFormValuesMapping = { [ONYXKEYS.FORMS.ASSIGN_CARD_FORM]: FormTypes.AssignCardForm; [ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_NAME_FORM]: FormTypes.EditExpensifyCardNameForm; [ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_LIMIT_FORM]: FormTypes.EditExpensifyCardLimitForm; + [ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_LIMIT_TYPE_FORM]: FormTypes.EditExpensifyCardLimitTypeForm; [ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM]: FormTypes.SageIntactCredentialsForm; [ONYXKEYS.FORMS.NETSUITE_CUSTOM_FIELD_FORM]: FormTypes.NetSuiteCustomFieldForm; [ONYXKEYS.FORMS.NETSUITE_CUSTOM_LIST_ADD_FORM]: FormTypes.NetSuiteCustomFieldForm; diff --git a/src/libs/API/parameters/UpdateExpensifyCardLimitTypeParams.ts b/src/libs/API/parameters/UpdateExpensifyCardLimitTypeParams.ts index b37876004af9..d87529d9585a 100644 --- a/src/libs/API/parameters/UpdateExpensifyCardLimitTypeParams.ts +++ b/src/libs/API/parameters/UpdateExpensifyCardLimitTypeParams.ts @@ -1,6 +1,9 @@ type UpdateExpensifyCardLimitTypeParams = { cardID: number; limitType: string; + validFrom?: string; + validThru?: string; + clearValidityDates?: boolean; }; export default UpdateExpensifyCardLimitTypeParams; diff --git a/src/libs/CardUtils.ts b/src/libs/CardUtils.ts index 9f09c100c581..f9ad0533c912 100644 --- a/src/libs/CardUtils.ts +++ b/src/libs/CardUtils.ts @@ -291,7 +291,7 @@ function getDefaultExpensifyCardLimitType(policy?: OnyxEntry): ValueOf | undefined): TranslationPaths | '' { +function getTranslationKeyForLimitType(limitType: ValueOf | undefined): TranslationPaths { switch (limitType) { case CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART: return 'workspace.card.issueNewCard.smartLimit'; @@ -302,7 +302,7 @@ function getTranslationKeyForLimitType(limitType: ValueOf { +const normalizeDateToStartOfDay = (fromDate: string, timeZone: SelectedTimezone | undefined): string => { const localDate = parse(fromDate, CONST.DATE.FNS_FORMAT_STRING, new Date()); const midnightLocal = startOfDay(localDate); - return getDBTime(fromZonedTime(midnightLocal, timeZone).valueOf()); + return formatDBTimeWithoutMilliseconds(fromZonedTime(midnightLocal, timeZone ?? 'UTC').valueOf()); }; /** * Convert a date to UTC by taking end of day (23:59:59) in the user's local timezone and expressing it as a UTC timestamp */ -const normalizeDateToEndOfDay = (thruDate: string, timeZone: SelectedTimezone): string => { +const normalizeDateToEndOfDay = (thruDate: string, timeZone: SelectedTimezone | undefined): string => { const localDate = parse(thruDate, CONST.DATE.FNS_FORMAT_STRING, new Date()); const endOfDayLocal = endOfDay(localDate); - return getDBTime(fromZonedTime(endOfDayLocal, timeZone).valueOf()); + return formatDBTimeWithoutMilliseconds(fromZonedTime(endOfDayLocal, timeZone ?? 'UTC').valueOf()); }; /** @@ -1083,6 +1109,7 @@ const DateUtils = { getFormattedDateRangeForPerDiem, getFormattedSplitDateRange, formatInTimeZoneWithFallback, + formatUTCDateTimeToDateInTimezone, normalizeDateToStartOfDay, normalizeDateToEndOfDay, getMonthDateRange, diff --git a/src/libs/actions/Card.ts b/src/libs/actions/Card.ts index 7874bf69bcf6..30632f5e59c1 100644 --- a/src/libs/actions/Card.ts +++ b/src/libs/actions/Card.ts @@ -912,7 +912,16 @@ function updateExpensifyCardTitle(workspaceAccountID: number, cardID: number, ne API.write(WRITE_COMMANDS.UPDATE_EXPENSIFY_CARD_TITLE, parameters, {optimisticData, successData, failureData}); } -function updateExpensifyCardLimitType(workspaceAccountID: number, cardID: number, newLimitType: CardLimitType, oldLimitType?: CardLimitType) { +function updateExpensifyCardLimitType( + workspaceAccountID: number, + cardID: number, + newLimitType: CardLimitType, + timeZone: SelectedTimezone | undefined, + oldCardNameValuePairs?: Card['nameValuePairs'], + validFrom?: string, + validThru?: string, + shouldClearValidityDates?: boolean, +) { const optimisticData: Array> = [ { onyxMethod: Onyx.METHOD.MERGE, @@ -921,7 +930,13 @@ function updateExpensifyCardLimitType(workspaceAccountID: number, cardID: number [cardID]: { nameValuePairs: { limitType: newLimitType, - pendingFields: {limitType: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}, + pendingFields: { + limitType: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, + validFrom: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, + validThru: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, + }, + validFrom: shouldClearValidityDates ? null : validFrom, + validThru: shouldClearValidityDates ? null : validThru, }, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, pendingFields: {availableSpend: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}, @@ -940,7 +955,7 @@ function updateExpensifyCardLimitType(workspaceAccountID: number, cardID: number [cardID]: { isLoading: false, nameValuePairs: { - pendingFields: {limitType: null}, + pendingFields: {limitType: null, validFrom: null, validThru: null}, }, pendingAction: null, pendingFields: {availableSpend: null}, @@ -956,8 +971,10 @@ function updateExpensifyCardLimitType(workspaceAccountID: number, cardID: number value: { [cardID]: { nameValuePairs: { - limitType: oldLimitType, - pendingFields: {limitType: null}, + limitType: oldCardNameValuePairs?.limitType, + validFrom: oldCardNameValuePairs?.validFrom, + validThru: oldCardNameValuePairs?.validThru, + pendingFields: {limitType: null, validFrom: null, validThru: null}, }, pendingFields: {availableSpend: null}, pendingAction: null, @@ -971,6 +988,9 @@ function updateExpensifyCardLimitType(workspaceAccountID: number, cardID: number const parameters: UpdateExpensifyCardLimitTypeParams = { cardID, limitType: newLimitType, + validFrom: validFrom ? DateUtils.normalizeDateToStartOfDay(validFrom, timeZone) : undefined, + validThru: validThru ? DateUtils.normalizeDateToEndOfDay(validThru, timeZone) : undefined, + clearValidityDates: shouldClearValidityDates, }; API.write(WRITE_COMMANDS.UPDATE_EXPENSIFY_CARD_LIMIT_TYPE, parameters, {optimisticData, successData, failureData}); @@ -1174,7 +1194,14 @@ function configureExpensifyCardsForPolicy(policyID: string, workspaceAccountID: }); } -function issueExpensifyCard(domainAccountID: number, policyID: string | undefined, feedCountry: string, validateCode: string, timeZone: SelectedTimezone, data?: IssueNewCardData) { +function issueExpensifyCard( + domainAccountID: number, + policyID: string | undefined, + feedCountry: string, + validateCode: string, + timeZone: SelectedTimezone | undefined, + data?: IssueNewCardData, +) { if (!data) { return; } diff --git a/src/pages/workspace/expensifyCard/WorkspaceCardListHeader.tsx b/src/pages/workspace/expensifyCard/WorkspaceCardListHeader.tsx index 52f0eb0c0d13..c2cf52740fe1 100644 --- a/src/pages/workspace/expensifyCard/WorkspaceCardListHeader.tsx +++ b/src/pages/workspace/expensifyCard/WorkspaceCardListHeader.tsx @@ -43,7 +43,7 @@ function WorkspaceCardListHeader({cardSettings}: WorkspaceCardListHeaderProps) { {!shouldUseNarrowLayout && ( - + )} + {!shouldUseNarrowLayout && ( + + + {translate('workspace.card.issueNewCard.limitType')} + + + )} {!shouldUseNarrowLayout && ( - + )} + {!shouldUseNarrowLayout && ( + + + {translate(getTranslationKeyForLimitType(limitType))} + + + )} (null); + const {isBetaEnabled} = usePermissions(); const policy = usePolicy(policyID); const defaultFundID = useDefaultFundID(policyID); const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${defaultFundID}_${CONST.EXPENSIFY_CARD.BANK}`, {selector: filterInactiveCards, canBeMissing: true}); @@ -53,10 +66,39 @@ function WorkspaceEditCardLimitTypePage({route}: WorkspaceEditCardLimitTypePageP const [typeSelected, setTypeSelected] = useState(initialLimitType); const [isConfirmModalVisible, setIsConfirmModalVisible] = useState(false); + const [expirationToggle, setExpirationToggle] = useState(!!card?.nameValuePairs?.validFrom); const currency = useCurrencyForExpensifyCard({policyID}); const isWorkspaceRhp = route.name === SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT_TYPE; + const personalDetails = usePersonalDetails(); + + const assigneePersonalDetails = personalDetails?.[card?.accountID ?? CONST.DEFAULT_NUMBER_ID]; + const assigneeTimeZone = assigneePersonalDetails?.timezone?.selected; + + const minDate = useMemo(() => { + if (!assigneeTimeZone) { + return new Date(); + } + return toZonedTime(new Date(), assigneeTimeZone); + }, [assigneeTimeZone]); + + const validFromDefaultValue = useMemo(() => { + const validFrom = card?.nameValuePairs?.validFrom; + if (!validFrom) { + return undefined; + } + return DateUtils.formatUTCDateTimeToDateInTimezone(validFrom, assigneeTimeZone); + }, [card?.nameValuePairs?.validFrom, assigneeTimeZone]); + + const validThruDefaultValue = useMemo(() => { + const validThru = card?.nameValuePairs?.validThru; + if (!validThru) { + return undefined; + } + return DateUtils.formatUTCDateTimeToDateInTimezone(validThru, assigneeTimeZone); + }, [card?.nameValuePairs?.validThru, assigneeTimeZone]); + const goBack = () => { if (backTo) { Navigation.goBack(backTo); @@ -71,15 +113,22 @@ function WorkspaceEditCardLimitTypePage({route}: WorkspaceEditCardLimitTypePageP useFocusEffect(fetchCardLimitTypeData); - const updateCardLimitType = () => { + const updateCardLimitType = (values: FormOnyxValues) => { setIsConfirmModalVisible(false); - - updateExpensifyCardLimitType(defaultFundID, Number(cardID), typeSelected, card?.nameValuePairs?.limitType); - + updateExpensifyCardLimitType( + defaultFundID, + Number(cardID), + typeSelected, + assigneeTimeZone, + card?.nameValuePairs, + values[INPUT_IDS.VALID_FROM], + values[INPUT_IDS.VALID_THRU], + !expirationToggle, + ); goBack(); }; - const submit = () => { + const submit = (values: FormOnyxValues) => { let shouldShowConfirmModal = false; if (!!card?.unapprovedSpend && card?.nameValuePairs?.unapprovedExpenseLimit) { // Spends are coming as negative numbers from the backend and we need to make it positive for the correct expression. @@ -103,11 +152,10 @@ function WorkspaceEditCardLimitTypePage({route}: WorkspaceEditCardLimitTypePageP if (shouldShowConfirmModal) { setIsConfirmModalVisible(true); } else { - updateCardLimitType(); + updateCardLimitType(values); } }; - const options = []; let shouldShowFixedOption = true; if (card?.totalSpend && card?.nameValuePairs?.unapprovedExpenseLimit) { @@ -120,35 +168,71 @@ function WorkspaceEditCardLimitTypePage({route}: WorkspaceEditCardLimitTypePageP } } - if (areApprovalsConfigured) { - options.push({ - value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART, - text: translate('workspace.card.issueNewCard.smartLimit'), - alternateText: translate('workspace.card.issueNewCard.smartLimitDescription'), - keyForList: CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART, - isSelected: typeSelected === CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART, - }); - } + const data = useMemo(() => { + const options = []; - options.push({ - value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY, - text: translate('workspace.card.issueNewCard.monthly'), - alternateText: translate('workspace.card.issueNewCard.monthlyDescription'), - keyForList: CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY, - isMultilineSupported: true, - isSelected: typeSelected === CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY, - }); + if (areApprovalsConfigured) { + options.push({ + value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART, + label: translate('workspace.card.issueNewCard.smartLimit'), + description: translate('workspace.card.issueNewCard.smartLimitDescription'), + keyForList: CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART, + isSelected: typeSelected === CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART, + }); + } - if (shouldShowFixedOption) { options.push({ - value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED, - text: translate('workspace.card.issueNewCard.fixedAmount'), - alternateText: translate('workspace.card.issueNewCard.fixedAmountDescription'), - keyForList: CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED, - isMultilineSupported: true, - isSelected: typeSelected === CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED, + value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY, + label: translate('workspace.card.issueNewCard.monthly'), + description: translate('workspace.card.issueNewCard.monthlyDescription'), + keyForList: CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY, + isSelected: typeSelected === CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY, }); - } + + if (shouldShowFixedOption) { + options.push({ + value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED, + label: translate('workspace.card.issueNewCard.fixedAmount'), + description: translate('workspace.card.issueNewCard.fixedAmountDescription'), + keyForList: CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED, + isSelected: typeSelected === CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED, + }); + } + + if (card?.nameValuePairs?.isVirtual && isBetaEnabled(CONST.BETAS.SINGLE_USE_AND_EXPIRE_BY_CARDS)) { + options.push({ + value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.SINGLE_USE, + label: translate('workspace.card.issueNewCard.singleUse'), + description: translate('workspace.card.issueNewCard.singleUseDescription'), + keyForList: CONST.EXPENSIFY_CARD.LIMIT_TYPES.SINGLE_USE, + isSelected: typeSelected === CONST.EXPENSIFY_CARD.LIMIT_TYPES.SINGLE_USE, + }); + } + return options; + }, [areApprovalsConfigured, translate, typeSelected, shouldShowFixedOption, card?.nameValuePairs?.isVirtual, isBetaEnabled]); + + const validate = (values: FormOnyxValues) => { + if (!expirationToggle) { + return {}; + } + const errors: FormInputErrors = {}; + if (!values[INPUT_IDS.VALID_FROM]) { + errors[INPUT_IDS.VALID_FROM] = translate('workspace.card.issueNewCard.enterValidDate'); + } + if (!values[INPUT_IDS.VALID_THRU]) { + errors[INPUT_IDS.VALID_THRU] = translate('workspace.card.issueNewCard.enterValidDate'); + } + + if (values[INPUT_IDS.VALID_FROM] && values[INPUT_IDS.VALID_THRU]) { + const startDate = new Date(values[INPUT_IDS.VALID_FROM]); + const endDate = new Date(values[INPUT_IDS.VALID_THRU]); + + if (endDate < startDate) { + errors[INPUT_IDS.VALID_THRU] = translate('iou.error.endDateBeforeStartDate'); + } + } + return errors; + }; return ( - setTypeSelected(value)} - data={options} - shouldUpdateFocusedIndex - alternateNumberOfSupportedLines={2} - initiallyFocusedItemKey={typeSelected} - /> + + { + setTypeSelected(value as CardLimitType); + }} + shouldShowModal={false} + addBottomSafeAreaPadding={false} + /> + + + + {!!card?.nameValuePairs?.isVirtual && ( + + + {expirationToggle && ( + <> + {translate('workspace.card.issueNewCard.validFrom')} + + + + )} + + )} + formRef.current?.submit()} onCancel={() => setIsConfirmModalVisible(false)} prompt={translate(promptTranslationKey, convertToDisplayString(card?.nameValuePairs?.unapprovedExpenseLimit, currency))} confirmText={translate('workspace.expensifyCard.changeLimitType')} @@ -185,14 +325,6 @@ function WorkspaceEditCardLimitTypePage({route}: WorkspaceEditCardLimitTypePageP danger shouldEnableNewFocusManagement /> -