Skip to content
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

Preserve start date when user go back to date edit from confirm page #56457

Merged
merged 4 commits into from
Feb 17, 2025
Merged

Preserve start date when user go back to date edit from confirm page #56457

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0fc2f20
Preserve start date when user go back to date edit from confirm page
parasharrajat Feb 6, 2025
39968b9
Merge branch 'main' of github.com:Expensify/App into parasharrajat/st…
parasharrajat Feb 12, 2025
042a620
use Named imports
parasharrajat Feb 12, 2025
69e162c
Merge branch 'main' of github.com:Expensify/App into parasharrajat/st…
parasharrajat Feb 13, 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
14 changes: 7 additions & 7 deletions src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import RadioListItem from '@components/SelectionList/RadioListItem';
import Text from '@components/Text';
import useLocalize from '@hooks/useLocalize';
import useThemeStyles from '@hooks/useThemeStyles';
import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
import * as CompanyCards from '@userActions/CompanyCards';
import {getPersonalDetailByEmail} from '@libs/PersonalDetailsUtils';
import {setAssignCardStepAndData} from '@userActions/CompanyCards';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import TransactionStartDateSelectorModal from './TransactionStartDateSelectorModal';
Expand All @@ -23,21 +23,21 @@ function TransactionStartDateStep() {
const [assignCard] = useOnyx(ONYXKEYS.ASSIGN_CARD);
const isEditing = assignCard?.isEditing;
const data = assignCard?.data;
const assigneeDisplayName = PersonalDetailsUtils.getPersonalDetailByEmail(data?.email ?? '')?.displayName ?? '';
const assigneeDisplayName = getPersonalDetailByEmail(data?.email ?? '')?.displayName ?? '';

const [dateOptionSelected, setDateOptionSelected] = useState(data?.dateOption ?? CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.FROM_BEGINNING);
const [isModalOpened, setIsModalOpened] = useState(false);
const [startDate, setStartDate] = useState(() => format(new Date(), CONST.DATE.FNS_FORMAT_STRING));
const [startDate, setStartDate] = useState(() => data?.startDate ?? format(new Date(), CONST.DATE.FNS_FORMAT_STRING));

const handleBackButtonPress = () => {
if (isEditing) {
CompanyCards.setAssignCardStepAndData({
setAssignCardStepAndData({
currentStep: CONST.COMPANY_CARD.STEP.CONFIRMATION,
isEditing: false,
});
return;
}
CompanyCards.setAssignCardStepAndData({currentStep: CONST.COMPANY_CARD.STEP.CARD});
setAssignCardStepAndData({currentStep: CONST.COMPANY_CARD.STEP.CARD});
};

const handleSelectDate = (date: string) => {
Expand All @@ -54,7 +54,7 @@ function TransactionStartDateStep() {
const submit = () => {
const date90DaysBack = format(subDays(new Date(), 90), CONST.DATE.FNS_FORMAT_STRING);

CompanyCards.setAssignCardStepAndData({
setAssignCardStepAndData({
currentStep: CONST.COMPANY_CARD.STEP.CONFIRMATION,
data: {
dateOption: dateOptionSelected,
Expand Down