From 68c02c4eb5f91b12347495d4f34b6dc57ddea61c Mon Sep 17 00:00:00 2001
From: Tameem Bin Haider <tameem.haider@dsinnovators.com>
Date: Tue, 20 Feb 2024 14:08:15 +0600
Subject: [PATCH] ocrvs-6204 fix date of birth unknown checkbox conditional &
 update CHANGELOG (#898)

* Consider detailsExist conditional when age unknown

* Update CHANGELOG
---
 CHANGELOG.md            | 10 ++++++++++
 src/form/death/index.ts |  8 ++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d246f0b4c..3eb8da281 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,16 @@
 
     ##### We will be deprecating the counterpart of the above mentioned handlebars that contains only the label of the specified location in a future version so we highly recommend that implementers update their certificates to use these new ones.
 
+- #### "Spouse" section in Farajaland death form
+  Spouse section is an optional section in death form. Going forward it will be included in Farajaland example configuration.
+
+- #### Type of ID dropdown
+  Farajaland forms will now include a dropdown to select the type of ID an individual is providing e.g. National ID, Driving License etc. instead of being restricted to only national ID number.
+- #### Number of dependents of deceased field
+  As an example of custom field, the deceased section in death form will now include the __numberOfDependants__ field.
+- #### Reason for late registration field
+  The birth & death forms will include another custom field, __reasonForLateRegistration__, which makes use of "LATE_REGISTRATION_TARGET" configuration option in it's visibility conditional.
+
 ## Bug fixes
 
 - Updated translations for form introduction page and sending for approval to reflect the default notification method being email.
diff --git a/src/form/death/index.ts b/src/form/death/index.ts
index 33c262829..48bec5381 100644
--- a/src/form/death/index.ts
+++ b/src/form/death/index.ts
@@ -46,16 +46,12 @@ import {
   informantFirstNameConditionals,
   exactDateOfBirthUnknownConditional,
   isValidBirthDate /*,
-  spouseFirstNameConditionals,
-  spouseFamilyNameConditionals,
-  spouseBirthDateConditionals,
   fathersDetailsExistConditionals,
   fatherFirstNameConditionals,
   fatherFamilyNameConditionals,
   fathersBirthDateConditionals,
   parentsBirthDateValidators,
   detailsExistConditional,
-  detailsExist,
   motherFirstNameConditionals,
   motherFamilyNameConditionals,
   mothersBirthDateConditionals,
@@ -351,10 +347,10 @@ export const deathForm = {
               ],
               certificateHandlebars.spouseBirthDate
             ), // Required field.
-            exactDateOfBirthUnknown([]),
+            exactDateOfBirthUnknown(detailsExist),
             getAgeOfIndividualInYears(
               formMessageDescriptors.ageOfSpouse,
-              exactDateOfBirthUnknownConditional,
+              exactDateOfBirthUnknownConditional.concat(detailsExist),
               ageOfIndividualValidators
             ),
             getNationality(