diff --git a/packages/client/src/i18n/messages/views/duplicates.ts b/packages/client/src/i18n/messages/views/duplicates.ts index 9a13ee11f7..996187c01b 100644 --- a/packages/client/src/i18n/messages/views/duplicates.ts +++ b/packages/client/src/i18n/messages/views/duplicates.ts @@ -13,6 +13,7 @@ import { defineMessages, MessageDescriptor } from 'react-intl' interface IDuplicateDeclarationMessages extends Record { + duplicateDeclarationDetails: MessageDescriptor duplicateReviewHeader: MessageDescriptor duplicateContentTitle: MessageDescriptor duplicateContentSubtitle: MessageDescriptor @@ -23,6 +24,11 @@ interface IDuplicateDeclarationMessages } const messagesToDefine: IDuplicateDeclarationMessages = { + duplicateDeclarationDetails: { + id: 'duplicates.content.header', + defaultMessage: 'Declaration Details', + description: 'Declaration details header of two duplicate ones' + }, duplicateReviewHeader: { id: 'duplicates.review.header', defaultMessage: 'Potential {event} duplicate review', diff --git a/packages/client/src/views/RegisterForm/RegisterForm.tsx b/packages/client/src/views/RegisterForm/RegisterForm.tsx index 2b0c95a910..a0dedaec67 100644 --- a/packages/client/src/views/RegisterForm/RegisterForm.tsx +++ b/packages/client/src/views/RegisterForm/RegisterForm.tsx @@ -438,7 +438,7 @@ function FormAppBar({ } desktopRight={ <> - {!isCorrection(declaration) && ( + {!duplicate && !isCorrection(declaration) && ( + {!duplicate && !isCorrection(declaration) && ( + + )} diff --git a/packages/client/src/views/RegisterForm/duplicate/DuplicateFormTabs.tsx b/packages/client/src/views/RegisterForm/duplicate/DuplicateFormTabs.tsx index 2c05d2ff9d..0f53438058 100644 --- a/packages/client/src/views/RegisterForm/duplicate/DuplicateFormTabs.tsx +++ b/packages/client/src/views/RegisterForm/duplicate/DuplicateFormTabs.tsx @@ -917,6 +917,11 @@ export const DuplicateFormTabs = (props: IProps) => { size={ContentSize.LARGE} showTitleOnMobile > + + {intl.formatMessage( + duplicateMessages.duplicateDeclarationDetails + )} + {comparisonDelcarationData.map((sections, index) => { return ( diff --git a/packages/client/src/views/RegisterForm/review/ReviewSection.tsx b/packages/client/src/views/RegisterForm/review/ReviewSection.tsx index ea564f5bb4..697cd10a50 100644 --- a/packages/client/src/views/RegisterForm/review/ReviewSection.tsx +++ b/packages/client/src/views/RegisterForm/review/ReviewSection.tsx @@ -1891,7 +1891,7 @@ class ReviewSectionComp extends React.Component { labelForHideAction={intl.formatMessage(messages.hideLabel)} labelForShowAction={intl.formatMessage(messages.showLabel)} action={ - viewRecord ? null : ( + viewRecord || isDuplicate ? null : (