fix: validate de minimis dates with shared function

City-of-Helsinki · Sep 20, 2023 · 155b902 · 155b902
1 parent eceb562
commit 155b902
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/.../applicant/src/components/applications/forms/application/deMinimisAid/utils/validation.ts b/.../applicant/src/components/applications/forms/application/deMinimisAid/utils/validation.ts
@@ -1,3 +1,4 @@
+import { validateIsFutureDate } from '@frontend/benefit-shared/src/utils/dates';
 import {
   DE_MINIMIS_AID_GRANTED_AT_MAX_DATE,
   DE_MINIMIS_AID_GRANTED_AT_MIN_DATE,
@@ -7,7 +8,7 @@ import {
   VALIDATION_MESSAGE_KEYS,
 } from 'benefit-shared/constants';
 import { DeMinimisAid } from 'benefit-shared/types/application';
-import { isBefore, isFuture } from 'date-fns';
+import { isBefore } from 'date-fns';
 import { TFunction } from 'next-i18next';
 import { convertToUIDateFormat, parseDate } from 'shared/utils/date.utils';
 import { getNumberValue } from 'shared/utils/string.utils';
@@ -35,16 +36,7 @@ export const getValidationSchema = (t: TFunction): Yup.SchemaOf<DeMinimisAid> =>
         message: t(VALIDATION_MESSAGE_KEYS.DATE_MAX, {
           max: convertToUIDateFormat(DE_MINIMIS_AID_GRANTED_AT_MAX_DATE),
         }),
-        test: (value) => {
-          if (!value) return false;
-
-          const date = parseDate(value);
-
-          if (date && isFuture(date)) {
-            return false;
-          }
-          return true;
-        },
+        test: (value) => validateIsFutureDate(value),
       })
       .test({
         message: t(VALIDATION_MESSAGE_KEYS.DATE_MIN, {