fix: ask apprentishipProgram also for GRANTED_AGED (#2306)

City-of-Helsinki · Sep 28, 2023 · 47da9f1 · 47da9f1
1 parent 8cd3355
commit 47da9f1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/frontend/benefit/handler/src/components/newApplication/formContent/FormContent.tsx b/frontend/benefit/handler/src/components/newApplication/formContent/FormContent.tsx
@@ -460,6 +460,10 @@ const FormContent: React.FC<Props> = ({
                   fields.paySubsidyGranted.name,
                   PAY_SUBSIDY_GRANTED.GRANTED_AGED
                 );
+                formik.setFieldValue(
+                  APPLICATION_FIELD_KEYS.APPRENTICESHIP_PROGRAM,
+                  null
+                );
               }}
               checked={
                 formik.values.paySubsidyGranted ===
@@ -481,7 +485,10 @@ const FormContent: React.FC<Props> = ({
             />
           </SelectionGroup>
         </$GridCell>
-        {formik.values.paySubsidyGranted === PAY_SUBSIDY_GRANTED.GRANTED && (
+        {[
+          PAY_SUBSIDY_GRANTED.GRANTED,
+          PAY_SUBSIDY_GRANTED.GRANTED_AGED,
+        ].includes(formik.values.paySubsidyGranted as PAY_SUBSIDY_GRANTED) && (
           <$GridCell
             as={$Grid}
             $colSpan={12}

diff --git a/frontend/benefit/handler/src/components/newApplication/utils/validation.ts b/frontend/benefit/handler/src/components/newApplication/utils/validation.ts
@@ -183,7 +183,11 @@ export const getValidationSchema = (
     [APPLICATION_FIELD_KEYS.APPRENTICESHIP_PROGRAM]: Yup.boolean()
       .nullable()
       .when(APPLICATION_FIELD_KEYS.PAY_SUBSIDY_GRANTED, {
-        is: PAY_SUBSIDY_GRANTED.GRANTED,
+        is: (value: PAY_SUBSIDY_GRANTED) =>
+          [
+            PAY_SUBSIDY_GRANTED.GRANTED,
+            PAY_SUBSIDY_GRANTED.GRANTED_AGED,
+          ].includes(value),
         then: Yup.boolean()
           .nullable()
           .required(t(VALIDATION_MESSAGE_KEYS.REQUIRED)),