fix(parental-leave): Amend condition for other parent approval (#16050)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Sep 18, 2024 · a97a7fe · a97a7fe
1 parent 0421bfe
commit a97a7fe
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/libs/application/templates/parental-leave/src/forms/OtherParentApproval.ts b/libs/application/templates/parental-leave/src/forms/OtherParentApproval.ts
@@ -12,8 +12,10 @@ import { Form, FormModes, Application } from '@island.is/application/types'
 import Logo from '../assets/Logo'
 import { YES } from '../constants'
 import { otherParentApprovalFormMessages } from '../lib/messages'
-import { currentDateStartTime } from '../lib/parentalLeaveTemplateUtils'
-import { getApplicationAnswers } from '../lib/parentalLeaveUtils'
+import {
+  getApplicationAnswers,
+  getLastDayOfLastMonth,
+} from '../lib/parentalLeaveUtils'
 
 export const OtherParentApproval: Form = buildForm({
   id: 'OtherParentApprovalForParentalLeave',
@@ -94,10 +96,14 @@ export const OtherParentApproval: Form = buildForm({
               title: otherParentApprovalFormMessages.warning,
               titleVariant: 'h4',
               description: otherParentApprovalFormMessages.startDateInThePast,
-              condition: (answers) =>
-                new Date(
+              condition: (answers) => {
+                const lastDateOfLastMonth = getLastDayOfLastMonth()
+                const startDateTime = new Date(
                   getApplicationAnswers(answers).periods[0].startDate,
-                ).getTime() < currentDateStartTime(),
+                ).getTime()
+
+                return startDateTime <= lastDateOfLastMonth.getTime()
+              },
             }),
             buildSubmitField({
               id: 'submit',
@@ -113,10 +119,14 @@ export const OtherParentApproval: Form = buildForm({
                   name: coreMessages.buttonApprove,
                   type: 'primary',
                   event: 'APPROVE',
-                  condition: (answers) =>
-                    new Date(
+                  condition: (answers) => {
+                    const lastDateOfLastMonth = getLastDayOfLastMonth()
+                    const startDateTime = new Date(
                       getApplicationAnswers(answers).periods[0].startDate,
-                    ).getTime() >= currentDateStartTime(),
+                    ).getTime()
+
+                    return startDateTime > lastDateOfLastMonth.getTime()
+                  },
                 },
               ],
             }),