Merge pull request #641 from jamespaologarcia/19039-resulting-company…

…-name

19039-show-resulting-name-and-business-type

package.json

@@ -1,6 +1,6 @@
 {
   "name": "business-create-ui",
-  "version": "5.8.6",
+  "version": "5.8.7",
   "private": true,
   "appName": "Create UI",
   "sbcName": "SBC Common Components",

src/components/Amalgamation/ResultingBusinessName.vue

@@ -5,7 +5,7 @@
   >
     <!-- Editing Mode -->
     <div
-      v-if="!getCorrectNameOption"
+      v-if="!getCorrectNameOption && isAmalgamationFilingRegular"
       class="section-container"
       :class="{ 'invalid-section': invalidSection }"
     >
@@ -47,9 +47,12 @@
     <!-- Display Mode -->
     <template v-else>
       <NameRequestInfo />
-      <NameTranslations />
+      <NameTranslations
+        v-if="isAmalgamationFilingRegular"
+      />
 
       <v-btn
+        v-if="isAmalgamationFilingRegular"
         text
         color="primary"
         class="btn-undo"
@@ -179,14 +182,12 @@ export default class ResultingBusinessName extends Mixins(AmalgamationMixin, Nam
   top: 22px;
   right: 20px;
 }
-
 // "sm" breakpoint
 @media (min-width: 600px) {
   .btn-undo {
     top: 24px;
   }
 }
-
 // "md" breakpoint
 @media (min-width: 960px) {
   .btn-undo {

src/mixins/filing-template-mixin.ts

@@ -143,7 +143,8 @@ export default class FilingTemplateMixin extends Mixins(AmalgamationMixin, DateM
         amalgamatingBusinesses: this.getAmalgamatingBusinesses,
         type: this.getAmalgamationType,
         nameRequest: {
-          legalType: this.getEntityType
+          legalType: this.getEntityType,
+          correctNameOption: this.getCorrectNameOption
         },
         nameTranslations: this.getNameTranslations,
         offices: this.getDefineCompanyStep.officeAddresses,
@@ -254,6 +255,7 @@ export default class FilingTemplateMixin extends Mixins(AmalgamationMixin, DateM
 
     // restore business name data
     const nameRequest = draftFiling.amalgamationApplication.nameRequest as NameRequestFilingIF
+
     switch (nameRequest?.correctNameOption) {
       case CorrectNameOptions.CORRECT_AML_ADOPT:
         this.setCorrectNameOption(CorrectNameOptions.CORRECT_AML_ADOPT)

src/views/Amalgamation/Information.vue

@@ -63,6 +63,7 @@
       </header>
 
       <ExpandableHelp
+        v-if="isAmalgamationFilingRegular"
         class="mt-4"
         helpLabel="Help with Business Type"
       >
@@ -71,6 +72,16 @@
         </template>
       </ExpandableHelp>
 
+      <p
+        v-else
+        class="mt-3"
+      >
+        This is a {{ isAmalgamationFilingVertical ? 'vertical' : 'horizontal' }} short form amalgamation
+        under section 273 of Business Corporations Act.
+        The amalgamated business will adopt as its notice of articles, the notice of articles of the
+        {{ isAmalgamationFilingVertical ? 'holding' : 'primary' }} business.
+      </p>
+
       <ResultingBusinessName class="mt-5" />
     </section>
   </div>