Null check

island-is · Jan 20, 2025 · 99a20b6 · 99a20b6
1 parent 674d4d1
commit 99a20b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...mary-school/src/forms/NewPrimarySchoolForm/childrenNParentsSection/childInfoSubSection.ts b/...mary-school/src/forms/NewPrimarySchoolForm/childrenNParentsSection/childInfoSubSection.ts
@@ -96,7 +96,7 @@ export const childInfoSubSection = buildSubSection({
           condition: (answers) => {
             const { childInfo } = getApplicationAnswers(answers)
 
-            return !!childInfo.usePronounAndPreferredName?.includes(YES)
+            return !!childInfo?.usePronounAndPreferredName?.includes(YES)
           },
           defaultValue: (application: Application) =>
             getApplicationExternalData(application.externalData)
@@ -109,7 +109,7 @@ export const childInfoSubSection = buildSubSection({
             condition: (answers) => {
               const { childInfo } = getApplicationAnswers(answers)
 
-              return !!childInfo.usePronounAndPreferredName?.includes(YES)
+              return !!childInfo?.usePronounAndPreferredName?.includes(YES)
             },
             component: 'FriggOptionsAsyncSelectField',
             defaultValue: (application: Application) =>
@@ -154,7 +154,7 @@ export const childInfoSubSection = buildSubSection({
           condition: (answers) => {
             const { childInfo } = getApplicationAnswers(answers)
 
-            return childInfo.differentPlaceOfResidence === YES
+            return childInfo?.differentPlaceOfResidence === YES
           },
         }),
         buildTextField({
@@ -166,7 +166,7 @@ export const childInfoSubSection = buildSubSection({
           condition: (answers) => {
             const { childInfo } = getApplicationAnswers(answers)
 
-            return childInfo.differentPlaceOfResidence === YES
+            return childInfo?.differentPlaceOfResidence === YES
           },
         }),
       ],

diff --git a/libs/application/templates/new-primary-school/src/lib/NewPrimarySchoolTemplate.ts b/libs/application/templates/new-primary-school/src/lib/NewPrimarySchoolTemplate.ts
@@ -208,7 +208,7 @@ const NewPrimarySchoolTemplate: ApplicationTemplate<
       clearPlaceOfResidence: assign((context) => {
         const { application } = context
         const { childInfo } = getApplicationAnswers(application.answers)
-        if (childInfo.differentPlaceOfResidence === NO) {
+        if (childInfo?.differentPlaceOfResidence === NO) {
           unset(application.answers, 'childInfo.placeOfResidence')
         }
         return context