Skip to content

Fix: Company card - Start date page always shows Custom start date with today's date #78492

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 2 commits into from
Dec 28, 2025
Merged

Fix: Company card - Start date page always shows Custom start date with today's date #78492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0d50bc
fix:78335: added sync with Onyx for TransactionStartDateStep
Eskalifer1 Dec 27, 2025
99b0275
fix eslint
Eskalifer1 Dec 27, 2025
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
4 changes: 3 additions & 1 deletion src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,9 @@ function ConfirmationStep({route}: ConfirmationStepProps) {
Navigation.goBack(ROUTES.WORKSPACE_COMPANY_CARDS_ASSIGN_CARD_ASSIGNEE.getRoute(routeParams), {compareParams: false});
break;
case CONST.COMPANY_CARD.STEP.TRANSACTION_START_DATE:
Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_ASSIGN_CARD_TRANSACTION_START_DATE.getRoute(routeParams));
Navigation.setNavigationActionToMicrotaskQueue(() => {
Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_ASSIGN_CARD_TRANSACTION_START_DATE.getRoute(routeParams));
});
break;
case CONST.COMPANY_CARD.STEP.CARD_NAME:
Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_ASSIGN_CARD_CARD_NAME.getRoute(routeParams));
Expand Down
113 changes: 68 additions & 45 deletions src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {format, subDays} from 'date-fns';
import React, {useState} from 'react';
import React, {useEffect, useState} from 'react';
import {View} from 'react-native';
import ActivityIndicator from '@components/ActivityIndicator';
import Button from '@components/Button';
import DatePicker from '@components/DatePicker';
import InteractiveStepWrapper from '@components/InteractiveStepWrapper';
Expand All @@ -15,19 +16,30 @@ import Navigation from '@navigation/Navigation';
import {setAssignCardStepAndData} from '@userActions/CompanyCards';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';

function TransactionStartDateStep() {
const {translate} = useLocalize();
const styles = useThemeStyles();

const [assignCard] = useOnyx(ONYXKEYS.ASSIGN_CARD, {canBeMissing: true});
const [assignCard, assignCardMeta] = useOnyx(ONYXKEYS.ASSIGN_CARD, {canBeMissing: true});
const isEditing = assignCard?.isEditing;
const cardToAssign = assignCard?.cardToAssign;

const [dateOptionSelected, setDateOptionSelected] = useState(cardToAssign?.dateOption ?? CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM);
const [errorText, setErrorText] = useState('');
const [startDate, setStartDate] = useState(() => assignCard?.startDate ?? cardToAssign?.startDate ?? format(new Date(), CONST.DATE.FNS_FORMAT_STRING));

useEffect(() => {
if (cardToAssign?.dateOption) {
setDateOptionSelected(cardToAssign.dateOption);
}

if (cardToAssign?.startDate) {
setStartDate(cardToAssign.startDate);
}
}, [cardToAssign?.dateOption, cardToAssign?.startDate]);

const handleBackButtonPress = () => {
if (isEditing) {
setAssignCardStepAndData({
Expand Down Expand Up @@ -80,57 +92,68 @@ function TransactionStartDateStep() {
},
];

const isLoading = isLoadingOnyxValue(assignCardMeta);

return (
<InteractiveStepWrapper
wrapperID="TransactionStartDateStep"
handleBackButtonPress={handleBackButtonPress}
headerTitle={translate('workspace.companyCards.assignCard')}
enableEdgeToEdgeBottomSafeAreaPadding
>
<Text style={[styles.textSupporting, styles.ph5, styles.mv3]}>{translate('workspace.companyCards.startDateDescription')}</Text>
<View style={styles.flex1}>
<SelectionList
ListItem={SingleSelectListItem}
onSelectRow={({value}) => handleSelectDateOption(value)}
data={dateOptions}
shouldSingleExecuteRowSelect
initiallyFocusedItemKey={dateOptionSelected}
shouldUpdateFocusedIndex
addBottomSafeAreaPadding
shouldHighlightSelectedItem={false}
footerContent={
<Button
success
large
pressOnEnter
text={translate(isEditing ? 'common.save' : 'common.next')}
onPress={submit}
/>
}
listFooterContent={
dateOptionSelected === CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM ? (
<View style={[styles.ph5]}>
<DatePicker
inputID=""
value={startDate}
label={translate('iou.startDate')}
onInputChange={(value) => {
if (!isRequiredFulfilled(value)) {
setErrorText(translate('common.error.fieldRequired'));
} else {
setErrorText('');
}
setStartDate(value);
}}
minDate={CONST.CALENDAR_PICKER.MIN_DATE}
maxDate={new Date()}
errorText={errorText}
/>
</View>
) : null
}
{isLoading ? (
<ActivityIndicator
size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
style={styles.h100}
/>
</View>
) : (
<>
<Text style={[styles.textSupporting, styles.ph5, styles.mv3]}>{translate('workspace.companyCards.startDateDescription')}</Text>
<View style={styles.flex1}>
<SelectionList
ListItem={SingleSelectListItem}
onSelectRow={({value}) => handleSelectDateOption(value)}
data={dateOptions}
shouldSingleExecuteRowSelect
initiallyFocusedItemKey={dateOptionSelected}
shouldUpdateFocusedIndex
addBottomSafeAreaPadding
shouldHighlightSelectedItem={false}
footerContent={
<Button
success
large
pressOnEnter
text={translate(isEditing ? 'common.save' : 'common.next')}
onPress={submit}
/>
}
listFooterContent={
dateOptionSelected === CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM ? (
<View style={[styles.ph5]}>
<DatePicker
inputID=""
value={startDate}
label={translate('iou.startDate')}
onInputChange={(value) => {
if (!isRequiredFulfilled(value)) {
setErrorText(translate('common.error.fieldRequired'));
} else {
setErrorText('');
}
setStartDate(value);
}}
minDate={CONST.CALENDAR_PICKER.MIN_DATE}
maxDate={new Date()}
errorText={errorText}
/>
</View>
) : null
}
/>
</View>
</>
)}
</InteractiveStepWrapper>
);
}
Expand Down
Loading