From 40966ab93dd92cdf5b04d2975d92d1d7b7b3f866 Mon Sep 17 00:00:00 2001
From: Siyasanga <siyasanga.mtshokotsha@decodedev.co.za>
Date: Tue, 14 Jan 2025 11:28:28 +0200
Subject: [PATCH] Fix faling unit test after using humanName

The expected name should match the format for the given country.

https://github.com/opencrvs/opencrvs-core/issues/6830
---
 packages/client/src/i18n/messages/constants.ts         |  2 +-
 packages/client/src/utils/draftUtils.test.ts           | 10 +++++-----
 .../views/OfficeHome/inProgress/inProgress.test.tsx    |  2 +-
 .../client/src/views/RecordAudit/RecordAudit.test.tsx  |  2 +-
 .../views/RegisterForm/review/ReviewSection.test.tsx   |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/i18n/messages/constants.ts b/packages/client/src/i18n/messages/constants.ts
index c00e59edd15..d4856a1676a 100644
--- a/packages/client/src/i18n/messages/constants.ts
+++ b/packages/client/src/i18n/messages/constants.ts
@@ -981,7 +981,7 @@ const messagesToDefine: IConstantsMessages = {
     id: 'constants.withinTargetDaysTo1Year'
   },
   humanName: {
-    defaultMessage: `{lastName} {middleName} {firstName}`,
+    defaultMessage: `{firstName} {middleName} {lastName}`,
     description: 'A localized order of the full name',
     id: 'constants.humanName'
   }
diff --git a/packages/client/src/utils/draftUtils.test.ts b/packages/client/src/utils/draftUtils.test.ts
index 2f0839a41b2..a8ee6757b86 100644
--- a/packages/client/src/utils/draftUtils.test.ts
+++ b/packages/client/src/utils/draftUtils.test.ts
@@ -51,13 +51,13 @@ describe('draftUtils tests', () => {
                   familyNameEng: 'Hoque'
                 }
               },
-              event: Event.Birth,
+              event: EventType.Birth,
               savedOn: 1558037863335,
               modifiedOn: 1558037867987
             },
             intlEngish
           )
-        ).toBe('Hoque Mushraful')
+        ).toBe('Mushraful Hoque')
       })
       it('Returns child English name properly even though localed is Bangla', () => {
         expect(
@@ -77,7 +77,7 @@ describe('draftUtils tests', () => {
             },
             intlBangla
           )
-        ).toBe('Hoque Mushraful')
+        ).toBe('Mushraful Hoque')
       })
     })
     describe('Death event', () => {
@@ -93,7 +93,7 @@ describe('draftUtils tests', () => {
                   familyNameEng: 'Hoque'
                 }
               },
-              event: Event.Death,
+              event: EventType.Death,
               savedOn: 1558037863335,
               modifiedOn: 1558037867987
             },
@@ -120,7 +120,7 @@ describe('draftUtils tests', () => {
             },
             intlEngish
           )
-        ).toBe('Hoque Mushraful')
+        ).toBe('Mushraful Hoque')
       })
     })
   })
diff --git a/packages/client/src/views/OfficeHome/inProgress/inProgress.test.tsx b/packages/client/src/views/OfficeHome/inProgress/inProgress.test.tsx
index 9d016006ad5..2cdab6581ca 100644
--- a/packages/client/src/views/OfficeHome/inProgress/inProgress.test.tsx
+++ b/packages/client/src/views/OfficeHome/inProgress/inProgress.test.tsx
@@ -297,7 +297,7 @@ describe('In Progress tab', () => {
       const EXPECTED_DATE_OF_REJECTION = formattedDuration(TIME_STAMP)
 
       expect(data[0].id).toBe('e302f7c5-ad87-4117-91c1-35eaf2ea7be8')
-      expect(data[0].name).toBe('hoque anik')
+      expect(data[0].name).toBe('anik hoque')
       expect(data[0].lastUpdated).toBe(EXPECTED_DATE_OF_REJECTION)
       expect(data[0].event).toBe('Birth')
       expect(data[0].actions).toBeDefined()
diff --git a/packages/client/src/views/RecordAudit/RecordAudit.test.tsx b/packages/client/src/views/RecordAudit/RecordAudit.test.tsx
index c76b53f0bcb..8d902d0d8de 100644
--- a/packages/client/src/views/RecordAudit/RecordAudit.test.tsx
+++ b/packages/client/src/views/RecordAudit/RecordAudit.test.tsx
@@ -275,7 +275,7 @@ describe('Record audit summary for WorkQueue declarations', () => {
       component.find({ 'data-testid': 'type-value' }).hostNodes().text()
     ).toBe('Birth')
     expect(component.find('#content-name').hostNodes().text()).toBe(
-      'Al Hasan Shakib'
+      'Shakib Al Hasan'
     )
     expect(
       component
diff --git a/packages/client/src/views/RegisterForm/review/ReviewSection.test.tsx b/packages/client/src/views/RegisterForm/review/ReviewSection.test.tsx
index d4e033b3707..b83268ee1f5 100644
--- a/packages/client/src/views/RegisterForm/review/ReviewSection.test.tsx
+++ b/packages/client/src/views/RegisterForm/review/ReviewSection.test.tsx
@@ -189,7 +189,7 @@ describe('when in device of large viewport', () => {
       ).toBe('Government of the peoples republic of Bangladesh')
       expect(
         reviewSectionComponent.find('#review_header_subject').hostNodes().text()
-      ).toBe('Birth Declaration for Doe John')
+      ).toBe('Birth Declaration for John Doe')
     })
 
     it('typing additional comments input triggers onchange review form', async () => {