From 14925ec206528cfc74e47ad9d745a77357686f90 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 17 Jan 2024 16:57:54 -0800
Subject: [PATCH 1/2] FSADT1-1139

---
 frontend/src/pages/SubmissionReviewPage.vue | 24 +++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/frontend/src/pages/SubmissionReviewPage.vue b/frontend/src/pages/SubmissionReviewPage.vue
index 0982e7bb23..943341ccab 100644
--- a/frontend/src/pages/SubmissionReviewPage.vue
+++ b/frontend/src/pages/SubmissionReviewPage.vue
@@ -303,7 +303,7 @@ const matchingData = computed(() => {
             <a href="https://www.bcregistry.gov.bc.ca/"
               target="_blank"
               rel="noopener noreferrer">BC Registries</a>
-            and update it below
+            to determine if this submission should be approved or rejected.
           </p>
         </div>
       </cds-actionable-notification>
@@ -315,32 +315,34 @@ const matchingData = computed(() => {
           hide-close-button="true"
           open="true"
           kind="warning"
-          title="Possible matching record found"      
+          title="Possible matching records found"      
         >    
         <div>
-          <p v-if="matchingData.length === 1" class="body-compact-01">
-            {{ matchingData.length }} similar client record was found. 
-            Review their information in the Client Management System to determine if this submission should be approved or rejected:
-          </p>
-          <p v-else class="body-compact-01">
-            {{ matchingData.length }} similar client records were found. 
+          <p class="body-compact-01">
+            {{ matchingData.length }} similar client record 
+            <span v-if="matchingData.length === 1">was</span> 
+            <span v-else>were</span> 
+            found. 
             Review their information in the Client Management System to determine if this submission should be approved or rejected:
           </p>
           <ul class="bulleted-list-disc body-compact-01">
             <li 
               v-for="duplicatedClient in data.matchers.corporationName?.split(',')" 
               :key="duplicatedClient">
-                Legal name: <a target="_blank" :href="`https://${greenDomain}/int/client/client02MaintenanceAction.do?bean.clientNumber=${duplicatedClient.trim()}`">{{duplicatedClient.trim()}}</a>
+                Partial match on business name: 
+                <a target="_blank" :href="`https://${greenDomain}/int/client/client02MaintenanceAction.do?bean.clientNumber=${duplicatedClient.trim()}`">{{duplicatedClient.trim()}}</a>
             </li>
             <li 
               v-for="duplicatedClient in data.matchers.incorporationNumber?.split(',')" 
               :key="duplicatedClient">
-                Incorporation number: <a target="_blank" :href="`https://${greenDomain}/int/client/client02MaintenanceAction.do?bean.clientNumber=${duplicatedClient.trim()}`">{{duplicatedClient.trim()}}</a>
+                Partial match on incorporation number - Client number: 
+                <a target="_blank" :href="`https://${greenDomain}/int/client/client02MaintenanceAction.do?bean.clientNumber=${duplicatedClient.trim()}`">{{duplicatedClient.trim()}}</a>
             </li>
             <li 
               v-for="duplicatedClient in data.matchers.contact?.split(',')" 
               :key="duplicatedClient">
-                Contact: <a target="_blank" :href="`https://${greenDomain}/int/client/client02MaintenanceAction.do?bean.clientNumber=${duplicatedClient.trim()}`">{{duplicatedClient.trim()}}</a>
+                Matching one or more contacts - Client number: 
+                <a target="_blank" :href="`https://${greenDomain}/int/client/client02MaintenanceAction.do?bean.clientNumber=${duplicatedClient.trim()}`">{{duplicatedClient.trim()}}</a>
             </li>
           </ul>
         </div>    

From 101d056bed6552f0380d42e6467ad3d050b104eb Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 17 Jan 2024 18:24:25 -0800
Subject: [PATCH 2/2] Adjusted Cypress test to the new changes

---
 frontend/cypress/e2e/SubmissionReviewPage.cy.ts | 6 +++---
 frontend/src/pages/SubmissionReviewPage.vue     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/cypress/e2e/SubmissionReviewPage.cy.ts b/frontend/cypress/e2e/SubmissionReviewPage.cy.ts
index 0e447103de..d6a2e6c11a 100644
--- a/frontend/cypress/e2e/SubmissionReviewPage.cy.ts
+++ b/frontend/cypress/e2e/SubmissionReviewPage.cy.ts
@@ -136,21 +136,21 @@ describe('Submission Review Page', () => {
           cy.get('cds-actionable-notification')
           .should('exist')
           .should('contain', "Review their information in the Client Management System to determine if this submission should be approved or rejected:")
-          .should('contain', `Legal name: ${testCase.incorporationName}`);
+          .should('contain', `Partial match on business name - Client number: ${testCase.incorporationName}`);
         }
 
         if(testCase.incorporationNumber){
           cy.get('cds-actionable-notification')
           .should('exist')
           .should('contain', "Review their information in the Client Management System to determine if this submission should be approved or rejected:")
-          .should('contain', `Incorporation number: ${testCase.incorporationNumber}`);
+          .should('contain', `Partial match on incorporation number - Client number: ${testCase.incorporationNumber}`);
         }
 
         if(testCase.contact){
           cy.get('cds-actionable-notification')
           .should('exist')
           .should('contain', "Review their information in the Client Management System to determine if this submission should be approved or rejected:")
-          .should('contain', `Contact: ${testCase.contact}`);
+          .should('contain', `Matching one or more contacts - Client number: ${testCase.contact}`);
         }
 
         cy.get('.grouping-15 > [kind="primary"]')
diff --git a/frontend/src/pages/SubmissionReviewPage.vue b/frontend/src/pages/SubmissionReviewPage.vue
index 8be3557eac..21d76100d2 100644
--- a/frontend/src/pages/SubmissionReviewPage.vue
+++ b/frontend/src/pages/SubmissionReviewPage.vue
@@ -355,7 +355,7 @@ const matchingData = computed(() => {
             <li 
               v-for="duplicatedClient in data.matchers.corporationName?.split(',')" 
               :key="duplicatedClient">
-                Partial match on business name: 
+                Partial match on business name - Client number: 
                 <a target="_blank" :href="`https://${greenDomain}/int/client/client02MaintenanceAction.do?bean.clientNumber=${duplicatedClient.trim()}`">{{duplicatedClient.trim()}}</a>
             </li>
             <li