diff --git a/src/ui/SurveyUnit/Communication/CommunicationConfirmation.tsx b/src/ui/SurveyUnit/Communication/CommunicationConfirmation.tsx index adb03cd93..6db878d8e 100644 --- a/src/ui/SurveyUnit/Communication/CommunicationConfirmation.tsx +++ b/src/ui/SurveyUnit/Communication/CommunicationConfirmation.tsx @@ -29,14 +29,11 @@ const CommunicationConfirmation = ({ bypassReasonLabel, }: CommunicationConfirmationProps) => { const address = getAddressData(surveyUnit.address); - const addressLines = Object.values(address).filter(v => !!v); const recipient = getprivilegedPerson(surveyUnit); const { user } = useUser(); - const userError = userSchema.safeParse(user); const recipientError = recipientSchema.safeParse({ ...address, ...recipient }); const communicationError = communicationSchema.safeParse(communication); - const isValid = userError.success && recipientError.success && communicationError.success; return ( @@ -89,12 +86,22 @@ const CommunicationConfirmation = ({ > {getTitle(recipient.title)} {recipient.firstName} {recipient.lastName}
- {addressLines.map(line => ( - - {line} -
+ + {address.streetName}
+
+ {address.additionalAddress.length > 0 && ( + + {address.additionalAddress}
- ))} + )} + {address.locality.length > 0 && ( + + {address.locality}
+
+ )} + + {address.postCode}, {address.cityName} + {!recipientError.success && }