diff --git a/registrants/src/UI/embc-registrant/src/app/core/api/models/person-details.ts b/registrants/src/UI/embc-registrant/src/app/core/api/models/person-details.ts index 643b5fdf1..575843cac 100644 --- a/registrants/src/UI/embc-registrant/src/app/core/api/models/person-details.ts +++ b/registrants/src/UI/embc-registrant/src/app/core/api/models/person-details.ts @@ -11,4 +11,5 @@ export interface PersonDetails { initials?: null | string; lastName: string; preferredName?: null | string; + isPrimaryRegistrant?: boolean } diff --git a/registrants/src/UI/embc-registrant/src/app/core/model/needs.model.ts b/registrants/src/UI/embc-registrant/src/app/core/model/needs.model.ts index 1fc8c90ac..1805f2cf9 100644 --- a/registrants/src/UI/embc-registrant/src/app/core/model/needs.model.ts +++ b/registrants/src/UI/embc-registrant/src/app/core/model/needs.model.ts @@ -152,9 +152,10 @@ export class PetForm { customValidator .conditionalValidation( () => this.addPetIndicator.value, - Validators.required + Validators.required, ) - .bind(customValidator) + .bind(customValidator), + customValidator.whitespaceValidator() ] ] }); diff --git a/registrants/src/UI/embc-registrant/src/app/feature-components/needs-assessment/needs-assessment.service.ts b/registrants/src/UI/embc-registrant/src/app/feature-components/needs-assessment/needs-assessment.service.ts index 254b34246..00e16a830 100644 --- a/registrants/src/UI/embc-registrant/src/app/feature-components/needs-assessment/needs-assessment.service.ts +++ b/registrants/src/UI/embc-registrant/src/app/feature-components/needs-assessment/needs-assessment.service.ts @@ -237,7 +237,7 @@ export class NeedsAssessmentService { return [...this.householdMembers, primaryMember]; } else if ( !this.householdMembers.find( - (member) => member.isPrimaryRegistrant === true + (member) => member.details.isPrimaryRegistrant === true ) ) { return [...this.householdMembers, primaryMember];