diff --git a/ppr-ui/src/composables/mhrRegistration/useHomeOwners.ts b/ppr-ui/src/composables/mhrRegistration/useHomeOwners.ts index 759f17e13..282175fb2 100644 --- a/ppr-ui/src/composables/mhrRegistration/useHomeOwners.ts +++ b/ppr-ui/src/composables/mhrRegistration/useHomeOwners.ts @@ -200,10 +200,17 @@ export function useHomeOwners (isMhrTransfer: boolean = false, isMhrCorrection: const hasMixedOwnersInGroup = (groupId: number): boolean => { if (isMhrCorrection) return false + const owners = getGroupById(groupId)?.owners if (owners?.length < 2) return false + + // Verify there is at least one unique owner type in the group, as business and individuals can be mixed + const hasAdminExecOrTrustee = owners?.some(owner => + [HomeOwnerPartyTypes.TRUSTEE, HomeOwnerPartyTypes.EXECUTOR, HomeOwnerPartyTypes.ADMINISTRATOR] + .includes(owner.partyType)) + const partyType = owners?.[0].partyType - return owners?.some(owner => owner.partyType !== partyType) + return hasAdminExecOrTrustee && owners?.some(owner => owner.partyType !== partyType) } // WORKING WITH GROUPS