diff --git a/app/lib/helpers/ccbcSummaryGenerateFormData.ts b/app/lib/helpers/ccbcSummaryGenerateFormData.ts index 1dacb5cf5b..5e13625f1c 100644 --- a/app/lib/helpers/ccbcSummaryGenerateFormData.ts +++ b/app/lib/helpers/ccbcSummaryGenerateFormData.ts @@ -413,7 +413,7 @@ const getApplicationErrors = ( const template9Data = applicationData?.applicationFormTemplate9DataByApplicationId?.nodes[0]; const formErrors = validate( - { template9Data, allApplicationErs, allApplicationRds }, + { template9Data, applicationData, allApplicationErs, allApplicationRds }, review ); return formErrors; diff --git a/app/utils/ccbcCustomValidator.ts b/app/utils/ccbcCustomValidator.ts index 3d6208379a..ef0d6c87d6 100644 --- a/app/utils/ccbcCustomValidator.ts +++ b/app/utils/ccbcCustomValidator.ts @@ -17,10 +17,26 @@ const CCBC_VALIDATIONS = { rules: [template9Validation], }, totalHouseholdsImpacted: { - rules: [template9Validation], + rules: [ + { + condition: (data) => + !Number.isNaN(data?.applicationData?.benefits?.numberOfHouseholds), + error: + 'This value is informed from Template 1 which has not been received from the applicant.', + }, + ], }, numberOfIndigenousHouseholds: { - rules: [template9Validation], + rules: [ + { + condition: (data) => + !Number.isNaN( + data?.applicationData?.benefits?.householdsImpactedIndigenous + ), + error: + 'This value is informed from Template 1 which has not been received from the applicant.', + }, + ], }, }, locations: {