diff --git a/frontend/benefit/handler/src/components/applicationForm/useApplicationForm.ts b/frontend/benefit/handler/src/components/applicationForm/useApplicationForm.ts index 26bb1f39e2..a62df73ceb 100644 --- a/frontend/benefit/handler/src/components/applicationForm/useApplicationForm.ts +++ b/frontend/benefit/handler/src/components/applicationForm/useApplicationForm.ts @@ -17,6 +17,7 @@ import { ApplicationFields, } from 'benefit/handler/types/application'; import { + APPLICATION_ORIGINS, ORGANIZATION_TYPES, VALIDATION_MESSAGE_KEYS, } from 'benefit-shared/constants'; @@ -124,6 +125,14 @@ export const useApplicationForm = (): ExtendedComponentProps => { error: applicationDataError, } = useApplicationQueryWithState(id, setApplication); + const getPaperApplicationDate = (): string | null => { + if (application?.applicationOrigin === APPLICATION_ORIGINS.APPLICANT) + return null; + return application?.paperApplicationDate + ? formatDate(parseDate(application.paperApplicationDate)) + : formatDate(new Date()); + }; + const formik = useFormik({ initialValues: { ...application, @@ -133,10 +142,7 @@ export const useApplicationForm = (): ExtendedComponentProps => { [APPLICATION_FIELDS.END_DATE]: application.endDate ? formatDate(parseDate(application.endDate)) : undefined, - [APPLICATION_FIELDS.PAPER_APPLICATION_DATE]: - application.paperApplicationDate - ? formatDate(parseDate(application.paperApplicationDate)) - : formatDate(new Date()), + [APPLICATION_FIELDS.PAPER_APPLICATION_DATE]: getPaperApplicationDate(), }, validationSchema: getValidationSchema(organizationType, t), validateOnChange: true, diff --git a/frontend/benefit/handler/src/components/applicationForm/utils/applicationForm.ts b/frontend/benefit/handler/src/components/applicationForm/utils/applicationForm.ts index 453eb9fb0a..9715a6be7e 100644 --- a/frontend/benefit/handler/src/components/applicationForm/utils/applicationForm.ts +++ b/frontend/benefit/handler/src/components/applicationForm/utils/applicationForm.ts @@ -54,9 +54,10 @@ const getApplication = ( ...applicationData, start_date: convertToUIDateFormat(applicationData.start_date), end_date: convertToUIDateFormat(applicationData.end_date), - paper_application_date: convertToUIDateFormat( - applicationData.paper_application_date - ), + paper_application_date: + applicationData.application_origin === APPLICATION_ORIGINS.HANDLER + ? convertToUIDateFormat(applicationData.paper_application_date) + : null, calculation: applicationData.calculation ? { ...applicationData.calculation,