diff --git a/libs/application/templates/announcement-of-death/src/lib/dataSchema.ts b/libs/application/templates/announcement-of-death/src/lib/dataSchema.ts index e1feabcf8435..14f4d0db21e7 100644 --- a/libs/application/templates/announcement-of-death/src/lib/dataSchema.ts +++ b/libs/application/templates/announcement-of-death/src/lib/dataSchema.ts @@ -118,6 +118,21 @@ export const dataSchema = z.object({ dateOfBirth: z.string().min(1).optional(), dummy: z.boolean().optional(), }) + .refine( + ({ name, relation, nationalId, foreignCitizenship, dateOfBirth }) => { + const hasNameAndRelation = name && relation + + if (foreignCitizenship && foreignCitizenship.length !== 0) { + return Boolean(dateOfBirth) && hasNameAndRelation + } else { + return Boolean(nationalId) && hasNameAndRelation + } + }, + { + message: m.errorNoDateOfBirthProvided.defaultMessage, + path: ['dateOfBirth'], + }, + ) .array() .optional(), encountered: z.boolean().optional(), diff --git a/libs/application/templates/announcement-of-death/src/lib/messages.ts b/libs/application/templates/announcement-of-death/src/lib/messages.ts index db3556c25385..ebbd3a17613f 100644 --- a/libs/application/templates/announcement-of-death/src/lib/messages.ts +++ b/libs/application/templates/announcement-of-death/src/lib/messages.ts @@ -558,6 +558,11 @@ Ef ekkert á við sem hér að ofan er talið rennur arfur í ríkissjóð. Nán defaultMessage: 'Númer má ekki vera tómt', description: 'Invalid general asset number error message', }, + errorNoDateOfBirthProvided: { + id: 'aod.application:error.errorNoDateOfBirthProvided', + defaultMessage: 'Fæðingardagur þarf að vera fylltur út', + description: 'Date of birth is required', + }, /* Announcement */ announcementTitle: {