From 8879b8896d4cbb563d0750f618c65a4e6e4666fb Mon Sep 17 00:00:00 2001
From: James <james.paolo.p.garcia@gmail.com>
Date: Wed, 6 Dec 2023 13:21:49 -0800
Subject: [PATCH 1/8] PR (TODO fix unit tests)

---
 package-lock.json                             |  4 +--
 package.json                                  |  2 +-
 src/components/common/HelpText.vue            | 26 +++++++++++++++++++
 src/components/common/NameRequestInfo.vue     | 24 ++++++++++++-----
 src/views/AmalgamationRegular/Information.vue |  4 ++-
 5 files changed, 49 insertions(+), 11 deletions(-)
 create mode 100644 src/components/common/HelpText.vue

diff --git a/package-lock.json b/package-lock.json
index 5d95d7b8d..420d9f5a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "business-create-ui",
-  "version": "5.6.7",
+  "version": "5.6.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "business-create-ui",
-      "version": "5.6.7",
+      "version": "5.6.8",
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
         "@bcrs-shared-components/approval-type": "1.0.19",
diff --git a/package.json b/package.json
index 44100f14b..69a563e3d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-create-ui",
-  "version": "5.6.7",
+  "version": "5.6.8",
   "private": true,
   "appName": "Create UI",
   "sbcName": "SBC Common Components",
diff --git a/src/components/common/HelpText.vue b/src/components/common/HelpText.vue
new file mode 100644
index 000000000..e51bab933
--- /dev/null
+++ b/src/components/common/HelpText.vue
@@ -0,0 +1,26 @@
+<template>
+  <header id="name-header">
+    <h2>Help with Resulting Business Type</h2>
+    <p class="mt-4">
+      A BC Limited Company and BC Community Contribution Company can amalgamate
+      but must form a BC Community Contribution Company. - BCA s. 51.98
+    </p>
+    <p class="mt-4">
+      A BC Unlimited Liability Company and BC Community Contribution
+      Company can amalgamate but must form a BC Community Contribution Company. - BCA s. 51.98
+    </p>
+    <p>
+      For assistance with amalgamations involving extraprovincial corporations, please contact BC Registries staff:
+    </p>
+    <RegistriesContactInfo />
+  </header>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator'
+import RegistriesContactInfo from '@/components/common/RegistriesContactInfo.vue'
+@Component({
+  components: { RegistriesContactInfo }
+})
+export default class HelpText extends Vue {}
+</script>
diff --git a/src/components/common/NameRequestInfo.vue b/src/components/common/NameRequestInfo.vue
index 0abcb0eee..4fe9b0f8b 100644
--- a/src/components/common/NameRequestInfo.vue
+++ b/src/components/common/NameRequestInfo.vue
@@ -110,7 +110,7 @@
             sm="3"
             class="pr-4"
           >
-            <label>Name</label>
+            <label>Resulting Business Name</label>
           </v-col>
 
           <v-col
@@ -121,12 +121,6 @@
               <li id="numbered-company-title">
                 <strong>[Incorporation Number]</strong> B.C. LTD.
               </li>
-              <li class="mt-4">
-                <strong>Entity Type:</strong> {{ getEntityTypeDescription }}
-              </li>
-              <li class="mt-2">
-                <strong>Request Type:</strong> {{ requestType }}
-              </li>
               <li class="bullet-point mt-4 ml-6">
                 You will be filing this Incorporation Application for a company
                 created by adding "B.C. LTD." after the Incorporation Number.
@@ -140,6 +134,22 @@
               </li>
             </ul>
           </v-col>
+          <v-col
+            cols="12"
+            sm="3"
+            class="pr-4 mt-4"
+          >
+            <label>Resulting Business Type</label>
+          </v-col>
+          <v-col
+            cols="12"
+            sm="9"
+            class="mt-4"
+          >
+            <ul>
+              {{ getEntityTypeDescription }}
+            </ul>
+          </v-col>
         </v-row>
       </div>
     </template>
diff --git a/src/views/AmalgamationRegular/Information.vue b/src/views/AmalgamationRegular/Information.vue
index d10e25208..50a6f4d12 100644
--- a/src/views/AmalgamationRegular/Information.vue
+++ b/src/views/AmalgamationRegular/Information.vue
@@ -27,7 +27,7 @@
         helpLabel="Help with Business Type"
       >
         <template #content>
-          [*** TODO: help text component ***]
+          <HelpText />
         </template>
       </ExpandableHelp>
 
@@ -50,6 +50,7 @@ import { DefineCompanyIF } from '@/interfaces'
 import { CommonMixin } from '@/mixins'
 import { RouteNames } from '@/enums'
 import { ExpandableHelp } from '@bcrs-shared-components/expandable-help'
+import HelpText from '@/components/common/HelpText.vue'
 import NameRequestInfo from '@/components/common/NameRequestInfo.vue'
 import NameTranslations from '@/components/common/NameTranslations.vue'
 import AmalgamatingBusinesses from '@/components/Amalgamation/AmalgamatingBusinesses.vue'
@@ -58,6 +59,7 @@ import AmalgamatingBusinesses from '@/components/Amalgamation/AmalgamatingBusine
   components: {
     AmalgamatingBusinesses,
     ExpandableHelp,
+    HelpText,
     NameRequestInfo,
     NameTranslations
   }

From e8936d34b77c9ec29a612b91681767e921fc3dca Mon Sep 17 00:00:00 2001
From: James <james.paolo.p.garcia@gmail.com>
Date: Wed, 6 Dec 2023 13:44:52 -0800
Subject: [PATCH 2/8] Added unit tests for numbered am

---
 src/components/common/NameRequestInfo.vue |  6 ++++--
 tests/unit/NameRequestInfo.spec.ts        | 16 ++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/components/common/NameRequestInfo.vue b/src/components/common/NameRequestInfo.vue
index 4fe9b0f8b..a5c246838 100644
--- a/src/components/common/NameRequestInfo.vue
+++ b/src/components/common/NameRequestInfo.vue
@@ -146,8 +146,10 @@
             sm="9"
             class="mt-4"
           >
-            <ul>
-              {{ getEntityTypeDescription }}
+            <ul class="entity-type-description">
+              <li>
+                {{ getEntityTypeDescription }}
+              </li>
             </ul>
           </v-col>
         </v-row>
diff --git a/tests/unit/NameRequestInfo.spec.ts b/tests/unit/NameRequestInfo.spec.ts
index 2a8eb7b8a..998a10e28 100644
--- a/tests/unit/NameRequestInfo.spec.ts
+++ b/tests/unit/NameRequestInfo.spec.ts
@@ -242,13 +242,17 @@ describe('Name Request Info component without a NR', () => {
 
   it('renders the numbered company content', () => {
     const listItems = wrapper.vm.$el.querySelectorAll('.numbered-company-list-items li')
-    expect(listItems.length).toEqual(6)
+    expect(listItems.length).toEqual(4)
 
     expect(listItems[0].textContent).toContain('[Incorporation Number] B.C. LTD.')
-    expect(listItems[1].textContent).toContain('Entity Type: BC Benefit Company')
-    expect(listItems[2].textContent).toContain('Request Type: New Business')
-    expect(listItems[3].textContent).toContain('You will be filing this Incorporation Application')
-    expect(listItems[4].textContent).toContain('Your Incorporation Number will be generated at the end')
-    expect(listItems[5].textContent).toContain('It is not possible to request a specific Incorporation Number')
+    expect(listItems[1].textContent).toContain('You will be filing this Incorporation Application')
+    expect(listItems[2].textContent).toContain('Your Incorporation Number will be generated at the end')
+    expect(listItems[3].textContent).toContain('It is not possible to request a specific Incorporation Number')
+  })
+
+  it('renders the resulting business type', () => {
+    const listItems = wrapper.vm.$el.querySelectorAll('.entity-type-description li')
+    expect(listItems.length).toEqual(1)
+    expect(listItems[0].textContent).toContain(' BC Benefit Company ')
   })
 })

From 5194b4ca1bf39f1aa648d849c1767635e1a1f64f Mon Sep 17 00:00:00 2001
From: James <james.paolo.p.garcia@gmail.com>
Date: Wed, 6 Dec 2023 16:42:41 -0800
Subject: [PATCH 3/8] Fixed test case and update from comments

---
 .../Amalgamation/BusinessTypeHelp.vue         | 35 ++++++++++++
 src/components/common/HelpText.vue            | 26 ---------
 src/components/common/NameRequestInfo.vue     | 56 +++++++++++++++++--
 src/views/AmalgamationRegular/Information.vue |  8 +--
 tests/unit/NameRequestInfo.spec.ts            | 51 +++++++++++++----
 5 files changed, 130 insertions(+), 46 deletions(-)
 create mode 100644 src/components/Amalgamation/BusinessTypeHelp.vue
 delete mode 100644 src/components/common/HelpText.vue

diff --git a/src/components/Amalgamation/BusinessTypeHelp.vue b/src/components/Amalgamation/BusinessTypeHelp.vue
new file mode 100644
index 000000000..55cadc1ec
--- /dev/null
+++ b/src/components/Amalgamation/BusinessTypeHelp.vue
@@ -0,0 +1,35 @@
+<template>
+  <section class="business-type-help mt-0">
+    <header>
+      <h3 class="text-center">
+        Help with Resulting Business Type
+      </h3>
+      <div class="mt-6">
+        <p class="ml-1">
+          A BC Limited Company and BC Community Contribution Company can amalgamate
+          but must form a BC Community Contribution Company. - BCA s. 51.98
+        </p>
+        <p class="ml-1">
+          A BC Unlimited Liability Company and BC Community Contribution
+          Company can amalgamate but must form a BC Community Contribution Company. - BCA s. 51.98
+        </p>
+        <p class="ml-1">
+          For assistance with amalgamations involving extraprovincial corporations, please contact BC Registries staff:
+        </p>
+      </div>
+      <br>
+      <RegistriesContactInfo />
+    </header>
+  </section>
+</template>
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator'
+import RegistriesContactInfo from '@/components/common/RegistriesContactInfo.vue'
+
+@Component({
+  components: {
+    RegistriesContactInfo
+  }
+})
+export default class BusinessTypeHelp extends Vue {}
+</script>
diff --git a/src/components/common/HelpText.vue b/src/components/common/HelpText.vue
deleted file mode 100644
index e51bab933..000000000
--- a/src/components/common/HelpText.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-  <header id="name-header">
-    <h2>Help with Resulting Business Type</h2>
-    <p class="mt-4">
-      A BC Limited Company and BC Community Contribution Company can amalgamate
-      but must form a BC Community Contribution Company. - BCA s. 51.98
-    </p>
-    <p class="mt-4">
-      A BC Unlimited Liability Company and BC Community Contribution
-      Company can amalgamate but must form a BC Community Contribution Company. - BCA s. 51.98
-    </p>
-    <p>
-      For assistance with amalgamations involving extraprovincial corporations, please contact BC Registries staff:
-    </p>
-    <RegistriesContactInfo />
-  </header>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from 'vue-property-decorator'
-import RegistriesContactInfo from '@/components/common/RegistriesContactInfo.vue'
-@Component({
-  components: { RegistriesContactInfo }
-})
-export default class HelpText extends Vue {}
-</script>
diff --git a/src/components/common/NameRequestInfo.vue b/src/components/common/NameRequestInfo.vue
index a5c246838..ad4ffbfc3 100644
--- a/src/components/common/NameRequestInfo.vue
+++ b/src/components/common/NameRequestInfo.vue
@@ -97,12 +97,11 @@
         </v-row>
       </div>
     </template>
-
-    <template v-else>
-      <!-- Numbered Company -->
+    <template v-else-if="isAmalgamationFiling && !getNameRequestNumber">
+      <!-- Numbered Amalgamation-->
       <div class="section-container">
         <v-row
-          id="numbered-company-info"
+          id="numbered-amalgamation-info"
           no-gutters
         >
           <v-col
@@ -117,7 +116,7 @@
             cols="12"
             sm="9"
           >
-            <ul class="numbered-company-list-items">
+            <ul class="numbered-amalgamation-list-items">
               <li id="numbered-company-title">
                 <strong>[Incorporation Number]</strong> B.C. LTD.
               </li>
@@ -155,6 +154,51 @@
         </v-row>
       </div>
     </template>
+    <template v-else>
+      <!-- Numbered Company -->
+      <div class="section-container">
+        <v-row
+          id="numbered-company-info"
+          no-gutters
+        >
+          <v-col
+            cols="12"
+            sm="3"
+            class="pr-4"
+          >
+            <label>Name</label>
+          </v-col>
+
+          <v-col
+            cols="12"
+            sm="9"
+          >
+            <ul class="numbered-company-list-items">
+              <li id="numbered-company-title">
+                <strong>[Incorporation Number]</strong> B.C. LTD.
+              </li>
+              <li class="mt-4">
+                <strong>Entity Type:</strong> {{ getEntityTypeDescription }}
+              </li>
+              <li class="mt-2">
+                <strong>Request Type:</strong> {{ requestType }}
+              </li>
+              <li class="bullet-point mt-4 ml-6">
+                You will be filing this Incorporation Application for a company
+                created by adding "B.C. LTD." after the Incorporation Number.
+              </li>
+              <li class="bullet-point ml-6">
+                Your Incorporation Number will be generated at the end of the filing
+                transaction.
+              </li>
+              <li class="bullet-point ml-6">
+                It is not possible to request a specific Incorporation Number.
+              </li>
+            </ul>
+          </v-col>
+        </v-row>
+      </div>
+    </template>
   </div>
 </template>
 
@@ -183,6 +227,7 @@ export default class NameRequestInfo extends Mixins(CommonMixin, DateMixin) {
   @Getter(useStore) getNameRequestApprovedName!: string
   @Getter(useStore) getNameRequestNumber!: string
   @Getter(useStore) isTypeSoleProp: boolean
+  @Getter(useStore) isAmalgamationFiling!: boolean
 
   /** The entity type description.  */
   get getEntityTypeDescription (): string {
@@ -198,6 +243,7 @@ export default class NameRequestInfo extends Mixins(CommonMixin, DateMixin) {
     switch (this.getNameRequest.request_action_cd) {
       case NrRequestActionCodes.NEW_BUSINESS: return 'New Business'
       case NrRequestActionCodes.RESTORE: return 'Restoration Request'
+      case NrRequestActionCodes.AMALGAMATE: return 'Amalgamation'
     }
     return '' // should never happen
   }
diff --git a/src/views/AmalgamationRegular/Information.vue b/src/views/AmalgamationRegular/Information.vue
index 50a6f4d12..e25b166a4 100644
--- a/src/views/AmalgamationRegular/Information.vue
+++ b/src/views/AmalgamationRegular/Information.vue
@@ -27,7 +27,7 @@
         helpLabel="Help with Business Type"
       >
         <template #content>
-          <HelpText />
+          <BusinessTypeHelp />
         </template>
       </ExpandableHelp>
 
@@ -50,16 +50,16 @@ import { DefineCompanyIF } from '@/interfaces'
 import { CommonMixin } from '@/mixins'
 import { RouteNames } from '@/enums'
 import { ExpandableHelp } from '@bcrs-shared-components/expandable-help'
-import HelpText from '@/components/common/HelpText.vue'
+import AmalgamatingBusinesses from '@/components/Amalgamation/AmalgamatingBusinesses.vue'
+import BusinessTypeHelp from '@/components/Amalgamation/BusinessTypeHelp.vue'
 import NameRequestInfo from '@/components/common/NameRequestInfo.vue'
 import NameTranslations from '@/components/common/NameTranslations.vue'
-import AmalgamatingBusinesses from '@/components/Amalgamation/AmalgamatingBusinesses.vue'
 
 @Component({
   components: {
     AmalgamatingBusinesses,
+    BusinessTypeHelp,
     ExpandableHelp,
-    HelpText,
     NameRequestInfo,
     NameTranslations
   }
diff --git a/tests/unit/NameRequestInfo.spec.ts b/tests/unit/NameRequestInfo.spec.ts
index 998a10e28..bf011af39 100644
--- a/tests/unit/NameRequestInfo.spec.ts
+++ b/tests/unit/NameRequestInfo.spec.ts
@@ -4,7 +4,7 @@ import { mount } from '@vue/test-utils'
 import { createPinia, setActivePinia } from 'pinia'
 import { useStore } from '@/store/store'
 import NameRequestInfo from '@/components/common/NameRequestInfo.vue'
-import { NameRequestStates } from '@/enums'
+import { NameRequestStates, FilingTypes } from '@/enums'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 import { NameRequestIF } from '@/interfaces'
 
@@ -215,7 +215,39 @@ describe('Name Request Info with a NR', () => {
     expect(listItems[5].textContent).toContain('Condition/Consent: Not Received')
   })
 })
+describe('Numbered Amalgamation Info component', () => {
+  let wrapper: any
+
+  beforeEach(() => {
+    store.stateModel.tombstone.filingType = FilingTypes.AMALGAMATION
+    store.stateModel.tempId = 'T1234567'
+    store.stateModel.entityType = CorpTypeCd.BENEFIT_COMPANY
+    store.stateModel.nameRequest.nrNum = null
+    store.stateModel.nameRequestApprovedName = null
+    wrapper = mount(NameRequestInfo, { vuetify })
+  })
 
+  afterEach(() => {
+    wrapper.destroy()
+  })
+
+  it('renders numbered company info', () => {
+    expect(wrapper.vm.$el.querySelector('#numbered-amalgamation-info').textContent)
+      .toContain('Resulting Business Name')
+
+    expect(wrapper.vm.$el.querySelector('.numbered-amalgamation-list-items')).toBeDefined()
+  })
+
+  it('renders the numbered company content', () => {
+    const listItems = wrapper.vm.$el.querySelectorAll('.numbered-amalgamation-list-items li')
+    expect(listItems.length).toEqual(4)
+
+    expect(listItems[0].textContent).toContain('[Incorporation Number] B.C. LTD.')
+    expect(listItems[1].textContent).toContain('You will be filing this Incorporation Application')
+    expect(listItems[2].textContent).toContain('Your Incorporation Number will be generated at the end')
+    expect(listItems[3].textContent).toContain('It is not possible to request a specific Incorporation Number')
+  })
+})
 describe('Name Request Info component without a NR', () => {
   let wrapper: any
 
@@ -226,6 +258,7 @@ describe('Name Request Info component without a NR', () => {
     store.stateModel.tempId = 'T1234567'
     store.stateModel.nameRequest.nrNum = null
     store.stateModel.nameRequestApprovedName = null
+    store.stateModel.tombstone.filingType = FilingTypes.REGISTRATION
     wrapper = mount(NameRequestInfo, { vuetify })
   })
 
@@ -242,17 +275,13 @@ describe('Name Request Info component without a NR', () => {
 
   it('renders the numbered company content', () => {
     const listItems = wrapper.vm.$el.querySelectorAll('.numbered-company-list-items li')
-    expect(listItems.length).toEqual(4)
+    expect(listItems.length).toEqual(6)
 
     expect(listItems[0].textContent).toContain('[Incorporation Number] B.C. LTD.')
-    expect(listItems[1].textContent).toContain('You will be filing this Incorporation Application')
-    expect(listItems[2].textContent).toContain('Your Incorporation Number will be generated at the end')
-    expect(listItems[3].textContent).toContain('It is not possible to request a specific Incorporation Number')
-  })
-
-  it('renders the resulting business type', () => {
-    const listItems = wrapper.vm.$el.querySelectorAll('.entity-type-description li')
-    expect(listItems.length).toEqual(1)
-    expect(listItems[0].textContent).toContain(' BC Benefit Company ')
+    expect(listItems[1].textContent).toContain('Entity Type: BC Benefit Company')
+    expect(listItems[2].textContent).toContain('Request Type: New Business')
+    expect(listItems[3].textContent).toContain('You will be filing this Incorporation Application')
+    expect(listItems[4].textContent).toContain('Your Incorporation Number will be generated at the end')
+    expect(listItems[5].textContent).toContain('It is not possible to request a specific Incorporation Number')
   })
 })

From e44fb0561eb17f3eda6f85252077223327ce22a3 Mon Sep 17 00:00:00 2001
From: James <james.paolo.p.garcia@gmail.com>
Date: Thu, 7 Dec 2023 09:11:11 -0800
Subject: [PATCH 4/8] Added additional test case

---
 tests/unit/NameRequestInfo.spec.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/unit/NameRequestInfo.spec.ts b/tests/unit/NameRequestInfo.spec.ts
index bf011af39..49cdd9269 100644
--- a/tests/unit/NameRequestInfo.spec.ts
+++ b/tests/unit/NameRequestInfo.spec.ts
@@ -238,7 +238,7 @@ describe('Numbered Amalgamation Info component', () => {
     expect(wrapper.vm.$el.querySelector('.numbered-amalgamation-list-items')).toBeDefined()
   })
 
-  it('renders the numbered company content', () => {
+  it('renders the numbered amalgamation content', () => {
     const listItems = wrapper.vm.$el.querySelectorAll('.numbered-amalgamation-list-items li')
     expect(listItems.length).toEqual(4)
 
@@ -247,6 +247,13 @@ describe('Numbered Amalgamation Info component', () => {
     expect(listItems[2].textContent).toContain('Your Incorporation Number will be generated at the end')
     expect(listItems[3].textContent).toContain('It is not possible to request a specific Incorporation Number')
   })
+
+  it('renders the entity type description content', () => {
+    const listItems = wrapper.vm.$el.querySelectorAll('.entity-type-description li')
+    expect(listItems.length).toEqual(1)
+
+    expect(listItems[0].textContent).toContain(' BC Benefit Company ')
+  })
 })
 describe('Name Request Info component without a NR', () => {
   let wrapper: any

From 3decbe1c4956f5abf5201e698073c305014ca435 Mon Sep 17 00:00:00 2001
From: James <james.paolo.p.garcia@gmail.com>
Date: Thu, 7 Dec 2023 12:08:11 -0800
Subject: [PATCH 5/8] Updated unit test formatting.

---
 tests/unit/NameRequestInfo.spec.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/unit/NameRequestInfo.spec.ts b/tests/unit/NameRequestInfo.spec.ts
index 49cdd9269..6e6d61790 100644
--- a/tests/unit/NameRequestInfo.spec.ts
+++ b/tests/unit/NameRequestInfo.spec.ts
@@ -215,6 +215,7 @@ describe('Name Request Info with a NR', () => {
     expect(listItems[5].textContent).toContain('Condition/Consent: Not Received')
   })
 })
+
 describe('Numbered Amalgamation Info component', () => {
   let wrapper: any
 
@@ -255,6 +256,7 @@ describe('Numbered Amalgamation Info component', () => {
     expect(listItems[0].textContent).toContain(' BC Benefit Company ')
   })
 })
+
 describe('Name Request Info component without a NR', () => {
   let wrapper: any
 

From 47d2588b5eed3520e8b32850a28bdec12032a7e4 Mon Sep 17 00:00:00 2001
From: James <james.paolo.p.garcia@gmail.com>
Date: Thu, 7 Dec 2023 12:09:32 -0800
Subject: [PATCH 6/8] Updated package.json

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 420d9f5a6..8c1b3bd2d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "business-create-ui",
-  "version": "5.6.8",
+  "version": "5.6.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "business-create-ui",
-      "version": "5.6.8",
+      "version": "5.6.10",
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
         "@bcrs-shared-components/approval-type": "1.0.19",
diff --git a/package.json b/package.json
index 69a563e3d..779051045 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-create-ui",
-  "version": "5.6.8",
+  "version": "5.6.10",
   "private": true,
   "appName": "Create UI",
   "sbcName": "SBC Common Components",

From f04c34380ba00d6a0cb033faae0ee8b4460425ac Mon Sep 17 00:00:00 2001
From: James <james.paolo.p.garcia@gmail.com>
Date: Thu, 7 Dec 2023 13:56:28 -0800
Subject: [PATCH 7/8] Added bullet points for numberd AML

---
 src/components/common/NameRequestInfo.vue | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/components/common/NameRequestInfo.vue b/src/components/common/NameRequestInfo.vue
index ad4ffbfc3..6cb13bffc 100644
--- a/src/components/common/NameRequestInfo.vue
+++ b/src/components/common/NameRequestInfo.vue
@@ -24,15 +24,16 @@
               <li id="name-request-title">
                 <strong>{{ getNameRequestNumber }}</strong> - {{ getNameRequestApprovedName }}
               </li>
-              <li class="mt-4">
+
+              <li class="bullet-point mt-4">
                 <strong>Entity Type:</strong> {{ getEntityTypeDescription }}
               </li>
-              <li><strong>Request Type:</strong> {{ requestType }}</li>
-              <li><strong>Expiry Date:</strong> {{ expirationDate }}</li>
-              <li><strong>Status:</strong> {{ state }}</li>
+              <li class="bullet-point mt-4"><strong>Request Type:</strong> {{ requestType }}</li>
+              <li class="bullet-point mt-4"><strong>Expiry Date:</strong> {{ expirationDate }}</li>
+              <li class="bullet-point mt-4"><strong>Status:</strong> {{ state }}</li>
               <li
                 v-if="isConditional"
-                id="condition-consent"
+                class="bullet-point mt-4"
               >
                 <strong>Condition/Consent:</strong> {{ conditionConsent }}
               </li>
@@ -120,7 +121,7 @@
               <li id="numbered-company-title">
                 <strong>[Incorporation Number]</strong> B.C. LTD.
               </li>
-              <li class="bullet-point mt-4 ml-6">
+              <li class="bullet-point ml-6">
                 You will be filing this Incorporation Application for a company
                 created by adding "B.C. LTD." after the Incorporation Number.
               </li>
@@ -321,4 +322,13 @@ ul {
     margin-left: -1.5em;
   }
 }
+
+.numbered-amalgamation-list-items {
+  .bullet-point::before {
+    content: "\2022";
+    display: inline-block;
+    width: 1.5em;
+    margin-left: -1.5em;
+  }
+}
 </style>

From d8fbc54935628718e99400875c972a2cc56e879f Mon Sep 17 00:00:00 2001
From: James <james.paolo.p.garcia@gmail.com>
Date: Thu, 7 Dec 2023 14:12:18 -0800
Subject: [PATCH 8/8] Fixed test cases

---
 src/components/common/NameRequestInfo.vue | 24 +++++++----------------
 tests/unit/NameRequestInfo.spec.ts        |  4 ++--
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/components/common/NameRequestInfo.vue b/src/components/common/NameRequestInfo.vue
index 6cb13bffc..4ad3a74f1 100644
--- a/src/components/common/NameRequestInfo.vue
+++ b/src/components/common/NameRequestInfo.vue
@@ -24,16 +24,15 @@
               <li id="name-request-title">
                 <strong>{{ getNameRequestNumber }}</strong> - {{ getNameRequestApprovedName }}
               </li>
-
-              <li class="bullet-point mt-4">
+              <li class="mt-4">
                 <strong>Entity Type:</strong> {{ getEntityTypeDescription }}
               </li>
-              <li class="bullet-point mt-4"><strong>Request Type:</strong> {{ requestType }}</li>
-              <li class="bullet-point mt-4"><strong>Expiry Date:</strong> {{ expirationDate }}</li>
-              <li class="bullet-point mt-4"><strong>Status:</strong> {{ state }}</li>
+              <li><strong>Request Type:</strong> {{ requestType }}</li>
+              <li><strong>Expiry Date:</strong> {{ expirationDate }}</li>
+              <li><strong>Status:</strong> {{ state }}</li>
               <li
                 v-if="isConditional"
-                class="bullet-point mt-4"
+                id="condition-consent"
               >
                 <strong>Condition/Consent:</strong> {{ conditionConsent }}
               </li>
@@ -117,11 +116,11 @@
             cols="12"
             sm="9"
           >
-            <ul class="numbered-amalgamation-list-items">
+            <ul class="numbered-company-list-items">
               <li id="numbered-company-title">
                 <strong>[Incorporation Number]</strong> B.C. LTD.
               </li>
-              <li class="bullet-point ml-6">
+              <li class="bullet-point mt-4 ml-6">
                 You will be filing this Incorporation Application for a company
                 created by adding "B.C. LTD." after the Incorporation Number.
               </li>
@@ -322,13 +321,4 @@ ul {
     margin-left: -1.5em;
   }
 }
-
-.numbered-amalgamation-list-items {
-  .bullet-point::before {
-    content: "\2022";
-    display: inline-block;
-    width: 1.5em;
-    margin-left: -1.5em;
-  }
-}
 </style>
diff --git a/tests/unit/NameRequestInfo.spec.ts b/tests/unit/NameRequestInfo.spec.ts
index 6e6d61790..6ba8eb9ad 100644
--- a/tests/unit/NameRequestInfo.spec.ts
+++ b/tests/unit/NameRequestInfo.spec.ts
@@ -236,11 +236,11 @@ describe('Numbered Amalgamation Info component', () => {
     expect(wrapper.vm.$el.querySelector('#numbered-amalgamation-info').textContent)
       .toContain('Resulting Business Name')
 
-    expect(wrapper.vm.$el.querySelector('.numbered-amalgamation-list-items')).toBeDefined()
+    expect(wrapper.vm.$el.querySelector('.numbered-company-list-items')).toBeDefined()
   })
 
   it('renders the numbered amalgamation content', () => {
-    const listItems = wrapper.vm.$el.querySelectorAll('.numbered-amalgamation-list-items li')
+    const listItems = wrapper.vm.$el.querySelectorAll('.numbered-company-list-items li')
     expect(listItems.length).toEqual(4)
 
     expect(listItems[0].textContent).toContain('[Incorporation Number] B.C. LTD.')