diff --git a/frontend/benefit/handler/src/components/newApplication/ApplicationForm.tsx b/frontend/benefit/handler/src/components/newApplication/ApplicationForm.tsx index 8f9e677600..4c2d242940 100644 --- a/frontend/benefit/handler/src/components/newApplication/ApplicationForm.tsx +++ b/frontend/benefit/handler/src/components/newApplication/ApplicationForm.tsx @@ -40,7 +40,7 @@ const ApplicationForm: React.FC = () => { maxEndDate, setEndDate, getSelectValue, - paySubsidyOptions, + subsidyOptions, deMinimisAidSet, attachments, dispatchStep, @@ -119,7 +119,7 @@ const ApplicationForm: React.FC = () => { maxEndDate={maxEndDate} setEndDate={setEndDate} getSelectValue={getSelectValue} - paySubsidyOptions={paySubsidyOptions} + paySubsidyOptions={subsidyOptions} deMinimisAidSet={deMinimisAidSet} attachments={attachments} checkedConsentArray={checkedConsentArray} diff --git a/frontend/benefit/handler/src/components/newApplication/formContent/FormContent.tsx b/frontend/benefit/handler/src/components/newApplication/formContent/FormContent.tsx index 780628feae..251ef980f0 100644 --- a/frontend/benefit/handler/src/components/newApplication/formContent/FormContent.tsx +++ b/frontend/benefit/handler/src/components/newApplication/formContent/FormContent.tsx @@ -33,7 +33,6 @@ import { $GridCell, } from 'shared/components/forms/section/FormSection.sc'; import { BenefitAttachment } from 'shared/types/attachment'; -import { OptionType } from 'shared/types/common'; import { formatStringFloatValue, stringFloatToFixed, @@ -55,8 +54,6 @@ type Props = { minEndDate: Date; maxEndDate: Date | undefined; setEndDate: () => void; - getSelectValue: (fieldName: keyof Application) => OptionType | null; - paySubsidyOptions: OptionType[]; deMinimisAidSet: DeMinimisAid[]; attachments: BenefitAttachment[]; checkedConsentArray: boolean[]; @@ -92,7 +89,6 @@ const FormContent: React.FC = ({ clearDatesValues, clearCommissionValues, clearContractValues, - clearPaySubsidyValues, clearAlternativeAddressValues, getErrorMessage, } = useFormContent(formik, fields); @@ -106,7 +102,6 @@ const FormContent: React.FC = ({ formik.values.associationHasBusinessActivities, apprenticeshipProgram: formik.values.apprenticeshipProgram, benefitType: formik.values.benefitType, - paySubsidyGranted: formik.values.paySubsidyGranted, startDate: formik.values.startDate, useAlternativeAddress: formik.values.useAlternativeAddress, }, @@ -117,19 +112,11 @@ const FormContent: React.FC = ({ clearDatesValues, clearCommissionValues, clearContractValues, - clearPaySubsidyValues, clearAlternativeAddressValues, setEndDate, } ); - const isAbleToSelectEmploymentBenefit = - application?.company?.organizationType !== ORGANIZATION_TYPES.ASSOCIATION || - (application?.company?.organizationType === - ORGANIZATION_TYPES.ASSOCIATION && - application?.associationHasBusinessActivities); - const isAbleToSelectSalaryBenefit = formik.values.paySubsidyGranted === true; - return (