From dd48c2995d300f340c155b2d92d7ed0cc7f56b61 Mon Sep 17 00:00:00 2001
From: Severin Beauvais <severin.beauvais@gov.bc.ca>
Date: Fri, 24 May 2024 09:34:32 -0700
Subject: [PATCH 1/2] - app version = 5.10.12 - added COLIN env config -
 imported some updated shared components - added COLIN vault keys - added a
 base class - misc cleanup - added error dialog to Extrapro Registration -
 re-worked Extrapro Registration components, layout, logic, etc - added rules
 + validation - added date picker - removed ULC radio group - finished
 affidavit file upload - changed historical fields to display-only - changed
 active fields to all editable - added jurisdiction conversions - fixed some
 Manual Business Info bugs + cleanup - added BN hints - re-worked Summary
 Business Home Jurisdiction fields, etc - added conditional contact info to
 Generic Error Dialog - added Colin Business interface - updated Continuation
 In Filing interface - updated Continuation Authorization interface - updated
 Existing Business Info interface - updated filing save/restore code - added
 Colin Services module - added store getters for new (continuation in) entity
 types - added COLIN keys to Fetch Config - updated unit test

---
 .env.example                                  |   2 +
 devops/vaults.env                             |   2 +
 package-lock.json                             |  65 +-
 package.json                                  |  12 +-
 src/assets/styles/base.scss                   |   4 +
 .../ContinuationAuthorization.vue             |   8 +-
 .../ContinuationIn/ExtraproRegistration.vue   | 635 +++++++++++++-----
 .../ContinuationIn/ManualBusinessInfo.vue     | 136 ++--
 .../SummaryBusinessHomeJurisdiction.vue       | 114 ++--
 .../Registration/BusinessNumber.vue           |   6 -
 src/dialogs/GenericErrorDialog.vue            |   5 +-
 .../colin-business-interface.ts               |  14 +
 .../existing-business-info-interface.ts       |  33 -
 .../filing-interfaces/filing-interfaces.ts    |  11 +-
 src/interfaces/index.ts                       |   5 +-
 .../continuation-authorization-interface.ts   |   0
 .../existing-business-info-interface.ts       |  36 +
 src/mixins/filing-template-mixin.ts           |  40 +-
 src/services/auth-services.ts                 |   4 +-
 src/services/colin-services.ts                |  23 +
 src/services/index.ts                         |   1 +
 src/store/store.ts                            |  22 +-
 src/utils/AxiosInstance.ts                    |   5 +
 src/utils/FetchConfig.ts                      |   3 +
 .../ContinuationInBusinessHome.vue            |   2 +-
 .../SummaryBusinessHomeJurisdiction.spec.ts   |  11 +-
 26 files changed, 772 insertions(+), 427 deletions(-)
 create mode 100644 src/interfaces/filing-interfaces/colin-business-interface.ts
 delete mode 100644 src/interfaces/filing-interfaces/existing-business-info-interface.ts
 rename src/interfaces/{filing-interfaces => store-interfaces/state-interfaces}/continuation-authorization-interface.ts (100%)
 create mode 100644 src/interfaces/store-interfaces/state-interfaces/existing-business-info-interface.ts
 create mode 100644 src/services/colin-services.ts

diff --git a/.env.example b/.env.example
index 088e6eead..1ec419aee 100644
--- a/.env.example
+++ b/.env.example
@@ -14,6 +14,8 @@ VUE_APP_SITEMINDER_LOGOUT_URL="https://logontest7.gov.bc.ca/clp-cgi/logoff.cgi"
 #vaults API
 VUE_APP_AUTH_API_URL="https://auth-api-dev.apps.silver.devops.gov.bc.ca"
 VUE_APP_AUTH_API_VERSION="/api/v1"
+VUE_APP_COLIN_API_URL="https://colin-api-dev.apps.silver.devops.gov.bc.ca"
+VUE_APP_COLIN_API_VERSION="/api/v1"
 VUE_APP_LEGAL_API_URL="https://legal-api-dev.apps.silver.devops.gov.bc.ca"
 VUE_APP_LEGAL_API_VERSION_2="/api/v2"
 VUE_APP_NAICS_API_URL="https://legal-api-dev.apps.silver.devops.gov.bc.ca"
diff --git a/devops/vaults.env b/devops/vaults.env
index 0d530e6ab..5fd04e581 100644
--- a/devops/vaults.env
+++ b/devops/vaults.env
@@ -14,6 +14,8 @@ VUE_APP_SITEMINDER_LOGOUT_URL="op://web-url/$APP_ENV/siteminder/SITEMINDER_LOGOU
 #vaults API
 VUE_APP_AUTH_API_URL="op://API/$APP_ENV/auth-api/AUTH_API_URL"
 VUE_APP_AUTH_API_VERSION="op://API/$APP_ENV/auth-api/AUTH_API_VERSION"
+VUE_APP_COLIN_API_URL="op://API/$APP_ENV/colin-api-entity/COLIN_API_URL"
+VUE_APP_COLIN_API_VERSION="op://API/$APP_ENV/colin-api-entity/COLIN_API_VERSION"
 VUE_APP_LEGAL_API_URL="op://API/$APP_ENV/legal-api/LEGAL_API_URL"
 VUE_APP_LEGAL_API_VERSION_2="op://API/$APP_ENV/legal-api/LEGAL_API_VERSION_2"
 VUE_APP_NAICS_API_URL="op://API/$APP_ENV/naics-api/NAICS_API_URL"
diff --git a/package-lock.json b/package-lock.json
index cc72dd534..de2547f21 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,18 +1,18 @@
 {
   "name": "business-create-ui",
-  "version": "5.10.11",
+  "version": "5.10.12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "business-create-ui",
-      "version": "5.10.11",
+      "version": "5.10.12",
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
         "@bcrs-shared-components/approval-type": "1.0.19",
         "@bcrs-shared-components/base-address": "2.0.3",
         "@bcrs-shared-components/breadcrumb": "2.1.15",
-        "@bcrs-shared-components/business-lookup": "1.3.1",
+        "@bcrs-shared-components/business-lookup": "1.3.3",
         "@bcrs-shared-components/certify": "2.1.15",
         "@bcrs-shared-components/completing-party": "2.1.30",
         "@bcrs-shared-components/confirm-dialog": "1.2.1",
@@ -20,17 +20,17 @@
         "@bcrs-shared-components/corp-type-module": "1.0.16",
         "@bcrs-shared-components/correct-name": "1.0.46",
         "@bcrs-shared-components/court-order-poa": "3.0.11",
-        "@bcrs-shared-components/date-picker": "1.2.15",
+        "@bcrs-shared-components/date-picker": "1.2.55",
         "@bcrs-shared-components/document-delivery": "1.2.0",
         "@bcrs-shared-components/effective-date-time": "1.1.15",
         "@bcrs-shared-components/enums": "1.1.10",
         "@bcrs-shared-components/expandable-help": "1.0.1",
         "@bcrs-shared-components/genesys-web-message": "1.0.0",
         "@bcrs-shared-components/help-business-number": "1.1.1",
-        "@bcrs-shared-components/interfaces": "1.1.13",
-        "@bcrs-shared-components/jurisdiction": "1.1.2",
+        "@bcrs-shared-components/interfaces": "1.1.15",
+        "@bcrs-shared-components/jurisdiction": "1.1.3",
         "@bcrs-shared-components/limited-restoration-panel": "1.0.5",
-        "@bcrs-shared-components/mixins": "1.1.44",
+        "@bcrs-shared-components/mixins": "1.1.46",
         "@bcrs-shared-components/nature-of-business": "1.2.14",
         "@bcrs-shared-components/relationships-panel": "1.0.9",
         "@bcrs-shared-components/staff-comments": "1.3.15",
@@ -242,16 +242,6 @@
         "vue-property-decorator": "^9.1.2"
       }
     },
-    "node_modules/@bcrs-shared-components/approval-type/node_modules/@bcrs-shared-components/date-picker": {
-      "version": "1.2.52",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/date-picker/-/date-picker-1.2.52.tgz",
-      "integrity": "sha512-t9jPVfUb+RbQxN5GEpRs8zXOIoUddXWNXgqn7eV+0pocxLrmrTRfAUUck6l7cp/XdKbl9dtE12gpp5k8Jl+Cug==",
-      "dependencies": {
-        "@bcrs-shared-components/interfaces": "^1.1.12",
-        "@bcrs-shared-components/mixins": "^1.1.43",
-        "vue": "^2.7.14"
-      }
-    },
     "node_modules/@bcrs-shared-components/base-address": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@bcrs-shared-components/base-address/-/base-address-2.0.3.tgz",
@@ -273,11 +263,11 @@
       }
     },
     "node_modules/@bcrs-shared-components/business-lookup": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/business-lookup/-/business-lookup-1.3.1.tgz",
-      "integrity": "sha512-fq4dcDDFlLOa8Bm2JAx+HPaUUQ49I63Ab/gak0yBuIqnV9VDepgHn3Hz3GzRIQkNjJHvZjEKd5tXmYhWOLZ0xQ==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/business-lookup/-/business-lookup-1.3.3.tgz",
+      "integrity": "sha512-6m7ILSKZc8MP2TpYnD5K1tsXF8+9o+5D58d0UlZwnThSzRaRRFYt1BvHnSkbHg7ov26PHWpRlg2uYYmYZQwyUQ==",
       "dependencies": {
-        "@bcrs-shared-components/interfaces": "^1.1.13",
+        "@bcrs-shared-components/interfaces": "^1.1.15",
         "lodash": "4.17.21",
         "vue": "^2.7.14"
       }
@@ -358,12 +348,13 @@
       }
     },
     "node_modules/@bcrs-shared-components/date-picker": {
-      "version": "1.2.15",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/date-picker/-/date-picker-1.2.15.tgz",
-      "integrity": "sha512-zG/tFZgRHDVx1xaR5cz+MdlzN0HFW9jkPIQuUjtSpD1DLYaas2NDzPmBfuPboVMMKfjh/2AvhiPPQDAQZIz89Q==",
+      "version": "1.2.55",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/date-picker/-/date-picker-1.2.55.tgz",
+      "integrity": "sha512-QjFr4iBjJFyifMOimWTOI+ayxGPPaxNJj6ofUpA71AV7+4WLgIFX+mKGaYFkqCtqSJgFR6Y/Kb1e7VP4Jk1SsA==",
       "dependencies": {
-        "@bcrs-shared-components/interfaces": "^1.0.58",
-        "vue-property-decorator": "^9.1.2"
+        "@bcrs-shared-components/interfaces": "^1.1.15",
+        "@bcrs-shared-components/mixins": "^1.1.46",
+        "vue": "^2.7.14"
       }
     },
     "node_modules/@bcrs-shared-components/document-delivery": {
@@ -427,9 +418,9 @@
       }
     },
     "node_modules/@bcrs-shared-components/interfaces": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.1.13.tgz",
-      "integrity": "sha512-+ukMaxz8mChD3gF5km8fW+afsO+7l4tZKyNsBkgWUVIC4eSqDO9XVSVOEAJS3e+R5dM4jdORbiHZzL4kkUT4ZQ==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.1.15.tgz",
+      "integrity": "sha512-wPL9eQS7ILJ3gUecakAj3WHIavkLE5mFANUfeL7c9JFFBxlk46CsSeRvOoJSTzB3Br5vjGv4Y+Tk70yqk56eYA==",
       "dependencies": {
         "@bcrs-shared-components/corp-type-module": "^1.0.16",
         "@bcrs-shared-components/enums": "^1.1.10",
@@ -437,11 +428,13 @@
       }
     },
     "node_modules/@bcrs-shared-components/jurisdiction": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/jurisdiction/-/jurisdiction-1.1.2.tgz",
-      "integrity": "sha512-WynkqBVlXjgoBRVe8W6RDh7dzODmLxVO9K0Gxe/5kX6EgbnkueK0NUsvcQl+qq/i+MSiKkZpyRMxAJY0sLTs8A==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/jurisdiction/-/jurisdiction-1.1.3.tgz",
+      "integrity": "sha512-LvHMAaMelmicH4Oiwe1jW0IFlSGnv0ReC+PsISULaQJw1CGXsMUuKZjJkc2bkEM3FKi9tKQEcNsf3298c8zCTw==",
       "dependencies": {
         "@bcrs-shared-components/enums": "^1.1.10",
+        "@bcrs-shared-components/interfaces": "^1.1.15",
+        "@bcrs-shared-components/mixins": "^1.1.46",
         "vue": "^2.7.14"
       }
     },
@@ -454,13 +447,13 @@
       }
     },
     "node_modules/@bcrs-shared-components/mixins": {
-      "version": "1.1.44",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/mixins/-/mixins-1.1.44.tgz",
-      "integrity": "sha512-alY2txATh3joXOs7DLi1XsgeIloll/9Vr7sz0mxUSUN0CXWrU0l9ROH42d5Nrr5vueWczTHZxyv/WLYSd6TPGg==",
+      "version": "1.1.46",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/mixins/-/mixins-1.1.46.tgz",
+      "integrity": "sha512-owtneegoCUw6S4L/dXk3wNczo09JtmibYg7jHgO6E1f4a2qm0yggq84cJL3c8oWU7UAJzKXjjtWT+TKFIRrWyA==",
       "dependencies": {
         "@bcrs-shared-components/corp-type-module": "^1.0.16",
         "@bcrs-shared-components/enums": "^1.1.10",
-        "@bcrs-shared-components/interfaces": "^1.1.13",
+        "@bcrs-shared-components/interfaces": "^1.1.15",
         "country-list": "^2.3.0",
         "lodash": "4.17.21",
         "provinces": "^1.11.0",
diff --git a/package.json b/package.json
index 69dd9238e..8741e9859 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-create-ui",
-  "version": "5.10.11",
+  "version": "5.10.12",
   "private": true,
   "appName": "Create UI",
   "sbcName": "SBC Common Components",
@@ -17,7 +17,7 @@
     "@bcrs-shared-components/approval-type": "1.0.19",
     "@bcrs-shared-components/base-address": "2.0.3",
     "@bcrs-shared-components/breadcrumb": "2.1.15",
-    "@bcrs-shared-components/business-lookup": "1.3.1",
+    "@bcrs-shared-components/business-lookup": "1.3.3",
     "@bcrs-shared-components/certify": "2.1.15",
     "@bcrs-shared-components/completing-party": "2.1.30",
     "@bcrs-shared-components/confirm-dialog": "1.2.1",
@@ -25,17 +25,17 @@
     "@bcrs-shared-components/corp-type-module": "1.0.16",
     "@bcrs-shared-components/correct-name": "1.0.46",
     "@bcrs-shared-components/court-order-poa": "3.0.11",
-    "@bcrs-shared-components/date-picker": "1.2.15",
+    "@bcrs-shared-components/date-picker": "1.2.55",
     "@bcrs-shared-components/document-delivery": "1.2.0",
     "@bcrs-shared-components/effective-date-time": "1.1.15",
     "@bcrs-shared-components/enums": "1.1.10",
     "@bcrs-shared-components/expandable-help": "1.0.1",
     "@bcrs-shared-components/genesys-web-message": "1.0.0",
     "@bcrs-shared-components/help-business-number": "1.1.1",
-    "@bcrs-shared-components/interfaces": "1.1.13",
-    "@bcrs-shared-components/jurisdiction": "1.1.2",
+    "@bcrs-shared-components/interfaces": "1.1.15",
+    "@bcrs-shared-components/jurisdiction": "1.1.3",
     "@bcrs-shared-components/limited-restoration-panel": "1.0.5",
-    "@bcrs-shared-components/mixins": "1.1.44",
+    "@bcrs-shared-components/mixins": "1.1.46",
     "@bcrs-shared-components/nature-of-business": "1.2.14",
     "@bcrs-shared-components/relationships-panel": "1.0.9",
     "@bcrs-shared-components/staff-comments": "1.3.15",
diff --git a/src/assets/styles/base.scss b/src/assets/styles/base.scss
index e121207c5..1d18ae8d7 100644
--- a/src/assets/styles/base.scss
+++ b/src/assets/styles/base.scss
@@ -241,6 +241,10 @@ p {
   font-size: $px-14;
 }
 
+.font-15 {
+  font-size: $px-15;
+}
+
 .error-text {
   color: $app-red !important;
 }
diff --git a/src/components/ContinuationIn/ContinuationAuthorization.vue b/src/components/ContinuationIn/ContinuationAuthorization.vue
index e3e3f0b2f..d12b94a92 100644
--- a/src/components/ContinuationIn/ContinuationAuthorization.vue
+++ b/src/components/ContinuationIn/ContinuationAuthorization.vue
@@ -12,6 +12,7 @@
       lazy-validation
       @submit.prevent
     >
+      <!-- Authorization Date -->
       <v-row no-gutters>
         <v-col
           cols="12"
@@ -40,6 +41,7 @@
         </v-col>
       </v-row>
 
+      <!-- Expiry Date -->
       <v-row
         class="mt-2"
         no-gutters
@@ -91,6 +93,7 @@
 
     <div class="pt-4" />
 
+    <!-- file upload component(s) -->
     <v-row
       v-for="(num, index) in numUploads"
       :key="authorization.files[index]?.fileKey"
@@ -128,6 +131,7 @@
 <script lang="ts">
 import { Component, Emit, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
+import { StatusCodes } from 'http-status-codes'
 import { useStore } from '@/store/store'
 import { DocumentMixin } from '@/mixins'
 import { ContinuationAuthorizationIF, FormIF, PresignedUrlIF } from '@/interfaces'
@@ -149,6 +153,7 @@ export default class ExtraproRegistration extends Mixins(DocumentMixin) {
     expiryDateRef: DatePickerShared,
     formRef: FormIF
   }
+
   readonly PdfPageSize = PdfPageSize
 
   @Getter(useStore) getContinuationAuthorization!: ContinuationAuthorizationIF
@@ -189,6 +194,7 @@ export default class ExtraproRegistration extends Mixins(DocumentMixin) {
     return Math.min((this.authorization.files.length + 1), 5)
   }
 
+  /** Called when this component is mounted. */
   mounted (): void {
     // set or initialize authorization object
     this.authorization = this.getContinuationAuthorization || { files: [] } as ContinuationAuthorizationIF
@@ -227,7 +233,7 @@ export default class ExtraproRegistration extends Mixins(DocumentMixin) {
       try {
         psu = await this.getPresignedUrl(file.name)
         const res = await this.uploadToUrl(psu.preSignedUrl, file, psu.key, this.getKeycloakGuid)
-        if (!res || res.status !== 200) throw new Error()
+        if (!res || res.status !== StatusCodes.OK) throw new Error()
       } catch {
         // put file uploader into manual error mode by setting custom error message
         this.customErrorMessage[index] = this.UPLOAD_FAILED_MESSAGE
diff --git a/src/components/ContinuationIn/ExtraproRegistration.vue b/src/components/ContinuationIn/ExtraproRegistration.vue
index dfa6effaa..0b9d03583 100644
--- a/src/components/ContinuationIn/ExtraproRegistration.vue
+++ b/src/components/ContinuationIn/ExtraproRegistration.vue
@@ -1,5 +1,14 @@
 <template>
   <div id="extrapro-registration">
+    <GenericErrorDialog
+      attach="#extrapro-registration"
+      :dialog="errorDialog"
+      :text="errorDialogText"
+      :title="errorDialogTitle"
+      :showContactInfo="false"
+      @close="errorDialog = false"
+    />
+
     <!-- inactive = ready to search to start -->
     <template v-if="!active">
       <v-row no-gutters>
@@ -24,6 +33,7 @@
 
     <!-- active = display/edit mode -->
     <template v-if="active">
+      <!-- Extraprovincial Registration in B.C. + Undo button-->
       <v-row no-gutters>
         <v-col
           cols="12"
@@ -42,7 +52,7 @@
             hide-details
             label="B.C. Extraprovincial Incorporation Number"
             readonly
-            :value="incorporationNumber"
+            :value="business.bcIdentifier"
           />
         </v-col>
 
@@ -65,123 +75,175 @@
         </v-col>
       </v-row>
 
-      <v-row
-        class="mt-6"
-        no-gutters
+      <!-- active business -->
+      <v-form
+        v-if="isBusinessActive"
+        ref="formRef"
+        lazy-validation
+        @submit.prevent
       >
-        <v-col
-          cols="12"
-          sm="3"
+        <!-- Home Jurisdiction -->
+        <v-row
+          class="mt-6"
+          no-gutters
         >
-          <label>Extraprovincial Registration Information</label>
-        </v-col>
+          <v-col
+            cols="12"
+            sm="3"
+          >
+            <label>Home Jurisdiction</label>
+          </v-col>
 
-        <v-col
-          cols="12"
-          sm="9"
+          <v-col
+            cols="12"
+            sm="9"
+          >
+            <Jurisdiction
+              class="home-jurisdiction"
+              :showUsaJurisdictions="true"
+              label="Home Jurisdiction"
+              :initialValue="business.homeJurisdiction"
+              :errorMessages="jurisdictionErrorMessage"
+              @change="onJurisdictionChange($event)"
+            />
+          </v-col>
+        </v-row>
+
+        <!-- Name in Home Jurisdiction -->
+        <v-row
+          class="mt-6"
+          no-gutters
         >
-          <p id="home-jurisdiction">
-            <label>Home Jurisdiction: </label>
-            <span>{{ homeJurisdiction || '[Unknown]' }}</span>
-          </p>
-
-          <p id="business-name">
-            <label>Business Name: </label>
-            <span>{{ businessName }}</span>
-          </p>
-
-          <p id="business-number">
-            <label>Business Number: </label>
-            <span>{{ businessNumber || '[Unknown]' }}</span>
-          </p>
-
-          <p id="incorporation-date">
-            <label>Incorporation Date: </label>
-            <span>{{ incorporationDate || '[Unknown]' }}</span>
-          </p>
-        </v-col>
-      </v-row>
+          <v-col
+            cols="12"
+            sm="3"
+          >
+            <label>Name in Home Jurisdiction</label>
+          </v-col>
+
+          <v-col
+            cols="12"
+            sm="9"
+          >
+            <!-- *** TODO: add rules -->
+            <v-text-field
+              v-model="business.homeLegalName"
+              class="name-home-jurisdiction"
+              filled
+              hide-details="auto"
+              label="Name in Home Jurisdiction"
+              :rules="getShowErrors ? businessNameRules : []"
+            />
+          </v-col>
+        </v-row>
 
-      <template v-if="isBusinessActive">
+        <!-- Date of Incorporation, Continuation or Amalgamation in Home Jurisdiction -->
         <v-row
-          class="mt-4"
+          class="mt-6"
           no-gutters
         >
           <v-col
             cols="12"
             sm="3"
           >
-            <label>Type of Business in Home Jurisdiction</label>
+            <label>Date of Incorporation, Continuation or Amalgamation in Home Jurisdiction</label>
           </v-col>
 
           <v-col
             cols="12"
             sm="9"
           >
-            <v-radio-group
-              v-model="business.isUlc"
-              class="mt-0 pt-0"
-              row
-            >
-              <v-radio
-                label="Unlimited Liability Company"
-                :value="true"
-              />
-              <v-radio
-                label="Other"
-                :value="false"
-              />
-            </v-radio-group>
+            <DatePickerShared
+              id="incorporation-date"
+              ref="incorporationDateRef"
+              title="Date of Incorporation, Continuation or Amalgamation in Home Jurisdiction"
+              :nudgeRight="40"
+              :nudgeTop="85"
+              :persistentHint="true"
+              :initialValue="business.homeIncorporationDate"
+              :inputRules="getShowErrors ? incorporationDateRules: []"
+              :maxDate="getCurrentDate"
+              :disablePicker="!isBusinessActive"
+              @emitDateSync="business.homeIncorporationDate = $event"
+            />
           </v-col>
         </v-row>
 
-        <v-expand-transition>
-          <v-row
-            v-if="business.isUlc"
-            class="mt-4"
-            no-gutters
+        <!-- Business Number -->
+        <v-row
+          class="mt-6"
+          no-gutters
+        >
+          <v-col
+            cols="12"
+            sm="3"
           >
-            <v-col
-              cols="12"
-              sm="3"
-            >
-              <label>Upload Affidavit</label>
-            </v-col>
-
-            <v-col
-              cols="12"
-              sm="9"
-            >
-              <p>
-                Upload the affidavit from the directors.
-              </p>
-
-              <ul>
-                <li>
-                  Use a white background and a legible font with contrasting font colour
-                </li>
-                <li>
-                  PDF file type (maximum 30 MB file size)
-                </li>
-              </ul>
-
-              <FileUploadPreview
-                class="mt-4"
-                inputFileLabel="Affidavit from directors"
-                :maxSize="MAX_FILE_SIZE"
-                :pdfPageSize="PdfPageSize.LETTER_SIZE"
-                :inputFile="uploadMemorandumDoc"
-                :showErrors="getShowErrors"
-                :customErrorMessage="UPLOAD_FAILED_MESSAGE"
-                @fileValidity="onFileValidity($event)"
-                @fileSelected="onFileSelected($event)"
-              />
-            </v-col>
-          </v-row>
-        </v-expand-transition>
+            <label>Business Number</label>
+          </v-col>
+
+          <v-col
+            cols="12"
+            sm="9"
+          >
+            <!-- *** TODO: add rules -->
+            <v-text-field
+              v-model="business.taxId"
+              v-mask="['#########']"
+              class="business-number"
+              filled
+              hide-details="auto"
+              label="Business Number (Optional)"
+              hint="First 9 digits of the CRA Business Number if you have one"
+              :rules="getShowErrors ? Rules.BusinessNumberRules : []"
+            />
+          </v-col>
+        </v-row>
 
+        <!-- Upload Affidavit -->
         <v-row
-          class="mt-8"
+          v-if="isAffidavitRequired"
+          class="mt-6"
+          no-gutters
+        >
+          <v-col
+            cols="12"
+            sm="3"
+          >
+            <label>Upload Affidavit</label>
+          </v-col>
+
+          <v-col
+            cols="12"
+            sm="9"
+          >
+            <p>
+              Upload the affidavit from the directors.
+            </p>
+
+            <ul>
+              <li>Use a white background and a legible font with contrasting font colour</li>
+              <li>PDF file type (maximum 30 MB file size)</li>
+            </ul>
+
+            <FileUploadPreview
+              class="mt-4"
+              inputFileLabel="Affidavit from directors"
+              :maxSize="MAX_FILE_SIZE"
+              :pdfPageSize="PdfPageSize.LETTER_SIZE"
+              :hint="business.affidavitFile ? 'File uploaded' : undefined"
+              :inputFile="business.affidavitFile"
+              :showErrors="getShowErrors"
+              :customErrorMessage.sync="customErrorMessage"
+              :isRequired="true"
+              @fileValidity="onFileValidity($event)"
+              @fileSelected="onFileSelected($event)"
+            />
+          </v-col>
+        </v-row>
+
+        <!-- message box -->
+        <v-row
+          class="mt-6"
           no-gutters
         >
           <v-col
@@ -202,8 +264,9 @@
           </v-col>
         </v-row>
 
+        <!-- Confirmation -->
         <v-row
-          class="mt-8"
+          class="mt-6"
           no-gutters
         >
           <v-col
@@ -218,20 +281,91 @@
             sm="9"
           >
             <v-checkbox
-              id="extrapro-registration-checkbox"
               v-model="business.isConfirmed"
-              class="pt-0 mt-0"
+              class="confirmation pt-0 mt-0"
               hide-details
               :label="checkboxLabel"
               :rules="getShowErrors ? [(v) => !!v] : []"
             />
           </v-col>
         </v-row>
-      </template>
+      </v-form>
 
-      <template v-else>
+      <!-- historical business -->
+      <template v-if="!isBusinessActive">
+        <!-- Home Jurisdiction, Name in B.C., Date of Registration in B.C. -->
         <v-row
-          class="mt-2"
+          class="mt-6"
+          no-gutters
+        >
+          <v-col
+            cols="12"
+            sm="3"
+          >
+            <!-- empty column -->
+          </v-col>
+
+          <v-col
+            cols="12"
+            sm="9"
+          >
+            <div class="home-jurisdiction font-15">
+              <label>Home Jurisdiction:</label>
+              {{ homeJurisdiction || '[Unknown]' }}
+            </div>
+            <div class="name-in-bc font-15 mt-2">
+              <label>Name in B.C.:</label>
+              {{ business.bcLegalName }}
+            </div>
+            <div class="date-registration-bc font-15 mt-2">
+              <label>Date of Registration in B.C.:</label>
+              {{ yyyyMmDdToPacificDate(business.bcFoundingDate, true, false) || '[Unknown]' }}
+            </div>
+          </v-col>
+        </v-row>
+
+        <v-divider class="mx-6 mt-6" />
+
+        <!-- Business Information in Home Jurisdiction -->
+        <v-row
+          class="mt-6"
+          no-gutters
+        >
+          <v-col
+            cols="12"
+            sm="3"
+          >
+            <label>Business Information in Home Jurisdiction</label>
+          </v-col>
+
+          <v-col
+            cols="12"
+            sm="9"
+          >
+            <div class="business-name font-15">
+              <label>Business Name:</label>
+              {{ business.homeLegalName || '[Unknown]' }}
+            </div>
+            <div class="registration-number font-15 mt-2">
+              <label>Registration Number:</label>
+              {{ business.homeIdentifier || '[Unknown]' }}
+            </div>
+            <div class="business-number font-15 mt-2">
+              <label>Business Number:</label>
+              {{ business.taxId || '[Unknown]' }}
+            </div>
+            <div class="incorporation-date font-15 mt-2">
+              <label>Date of Incorporation, Continuation or Amalgamation in Home Jurisdiction:</label>
+              {{ yyyyMmDdToPacificDate(business.homeIncorporationDate, true, false) || '[Unknown]' }}
+            </div>
+          </v-col>
+        </v-row>
+
+        <v-divider class="mx-6 mt-6" />
+
+        <!-- message box -->
+        <v-row
+          class="mt-6"
           no-gutters
         >
           <v-col
@@ -261,40 +395,69 @@
 <script lang="ts">
 import { Component, Emit, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
+import { StatusCodes } from 'http-status-codes'
 import { isEqual } from 'lodash'
-import { getName } from 'country-list'
+import { mask } from 'vue-the-mask'
 import { useStore } from '@/store/store'
-import { DocumentMixin } from '@/mixins'
-import { BusinessLookupResultIF, ExistingBusinessInfoIF } from '@/interfaces'
+import { DateMixin, DocumentMixin } from '@/mixins'
+import { BusinessLookupResultIF, ColinBusinessIF, ExistingBusinessInfoIF, FormIF, PresignedUrlIF } from '@/interfaces'
 import { PdfPageSize } from '@/enums'
-import { EntityStates } from '@bcrs-shared-components/enums'
+import { EntityStates, JurisdictionLocation } from '@bcrs-shared-components/enums'
+import { ColinServices } from '@/services'
+import { VuetifyRuleFunction } from '@/types'
+import { CanJurisdictions, IntlJurisdictions, UsaJurisdiction } from '@bcrs-shared-components/jurisdiction/list-data'
+import { Jurisdiction } from '@bcrs-shared-components/jurisdiction'
+import { GenericErrorDialog } from '@/dialogs/'
+import { Rules } from '@/rules'
 import ExtraproBusinessLookup from './ExtraproBusinessLookup.vue'
 import MessageBox from '@/components/common/MessageBox.vue'
 import RegistriesContactInfo from '@/components/common/RegistriesContactInfo.vue'
 import FileUploadPreview from '@/components/common/FileUploadPreview.vue'
-// import { LegalServices } from '@/services'
+import { DatePicker as DatePickerShared } from '@bcrs-shared-components/date-picker'
 
 @Component({
   components: {
+    DatePickerShared,
     ExtraproBusinessLookup,
     FileUploadPreview,
+    GenericErrorDialog,
+    Jurisdiction,
     MessageBox,
     RegistriesContactInfo
+  },
+  directives: {
+    mask
   }
 })
-export default class ExtraproRegistration extends Mixins(DocumentMixin) {
+export default class ExtraproRegistration extends Mixins(DateMixin, DocumentMixin) {
+  // Refs
+  $refs!: {
+    formRef: FormIF,
+    incorporationDateRef: DatePickerShared
+  }
+
   readonly PdfPageSize = PdfPageSize
+  readonly Rules = Rules
 
+  @Getter(useStore) getCurrentDate!: string
   @Getter(useStore) getExistingBusinessInfo!: ExistingBusinessInfoIF
+  @Getter(useStore) getKeycloakGuid!: string
   @Getter(useStore) getShowErrors!: boolean
+  @Getter(useStore) isTypeUlcContinueIn!: boolean
 
   @Action(useStore) setExistingBusinessInfo!: (x: ExistingBusinessInfoIF) => void
 
   // Local properties
   active = false
   business = {} as ExistingBusinessInfoIF
+  jurisdictionErrorMessage = ''
+  customErrorMessage = ''
   uploadMemorandumDoc = null as File
   uploadMemorandumDocKey = null as string
+  fileValidity = false
+  errorDialog = false
+  errorDialogText = ''
+  errorDialogTitle = ''
 
   readonly checkboxLabel = 'I understand and acknowledge that the extraprovincial registration of' +
     ' this business will be cancelled and made historical in the B.C. Registry once the continuation' +
@@ -305,119 +468,242 @@ export default class ExtraproRegistration extends Mixins(DocumentMixin) {
     return !isEqual(this.business, {})
   }
 
-  /** The incorporation number in BC (eg, A1234567). */
-  get incorporationNumber (): string {
-    return this.business.businessIdentifier
+  /** Whether the business is active (otherwise it's historical). */
+  get isBusinessActive (): boolean {
+    return (this.business.status === EntityStates.ACTIVE)
   }
 
-  /** The home jurisdiction. */
-  get homeJurisdiction (): string {
-    const hj = this.business.homeJurisdiction
-    if (hj?.country) {
-      const country = getName(hj.country)
-      const region = (hj.region === 'FEDERAL' ? 'Federal' : hj.region)
-      if (region) return `${region}, ${country}`
-      return country
-    }
-    return null
+  /**
+   * Whether the director's affidavit is required.
+   * Is true if the business is a Continued In ULC in Alberta or Nova Scotia.
+   */
+  get isAffidavitRequired (): boolean {
+    return (
+      this.isTypeUlcContinueIn &&
+      this.business.homeJurisdiction?.country === JurisdictionLocation.CA &&
+      (
+        this.business.homeJurisdiction?.region === 'AB' ||
+        this.business.homeJurisdiction?.region === 'NB'
+      )
+    )
   }
 
-  /** The business name in BC. */
-  get businessName (): string {
-    return this.business.businessLegalName
+  readonly businessNameRules: Array<VuetifyRuleFunction> = [
+    v => !!v || 'Name is required',
+    v => (v && v.length <= 1000) || 'Cannot exceed 1000 characters'
+  ]
+
+  get incorporationDateRules (): Array<VuetifyRuleFunction> {
+    return [
+      () => !!this.business.homeIncorporationDate || !this.isBusinessActive ||
+        'Date is required',
+      () => {
+        return (this.business.homeIncorporationDate <= this.getCurrentDate) ||
+          'Date cannot be in the future'
+      }
+    ]
   }
 
-  /** The business number (aka tax id). */
-  get businessNumber (): string {
-    return this.business.taxId
-  }
+  /** The text version of the home jurisdiction. */
+  get homeJurisdiction (): string {
+    const jurisdiction = this.business.homeJurisdiction // may be null
 
-  /** The incorporation date in the home jurisdiction. */
-  get incorporationDate (): string {
-    // FUTURE: format date as needed
-    return this.business.incorporationDate
-  }
+    if (jurisdiction?.country === JurisdictionLocation.CA) {
+      if (jurisdiction?.region === 'FEDERAL') return 'Federal'
+      return CanJurisdictions.find(can => can.value === jurisdiction?.region)?.text || 'Canada'
+    }
 
-  /** Whether the business is Active (otherwise it's Historical). */
-  get isBusinessActive (): boolean {
-    return (this.business.status === EntityStates.ACTIVE)
+    if (jurisdiction?.country === JurisdictionLocation.US) {
+      const state = UsaJurisdiction.find(usa => usa.value === jurisdiction?.region)?.text
+      return (state ? `${state}, US` : 'USA')
+    }
+
+    return IntlJurisdictions.find(intl => intl.value === jurisdiction?.country)?.text || null
   }
 
+  /** Called when this component is mounted. */
   mounted (): void {
-    // set existing business info object from the store, if it exists
+    // point business variable to Existing Business Info object from the store, if it exists
     if (this.getExistingBusinessInfo) this.business = this.getExistingBusinessInfo
 
-    // if mode is LOOKUP, set this component to active (which hides the other component)
-    if (this.business.mode === 'LOOKUP') this.active = true
+    // if mode is EXPRO, set this component to active (which hides the other component)
+    if (this.business.mode === 'EXPRO') this.active = true
   }
 
+  /** Called when user has searched for and selected a business. */
   async setBusiness (result: BusinessLookupResultIF): Promise<void> {
-    // FUTURE: fetch extra business data from COLIN and add to business object
-    // NOTE: fetch for both active and historical businesses
-    // const businessInfo = await LegalServices.fetchColinBusinessInfo(business.identifier)
-    //   .catch(() => {})
-
-    // FUTURE: convert FD to FEDERAL and add other COLIN conversions here
+    // fetch expro business data from COLIN and add to business object
+    const businessInfo = await ColinServices.fetchPublicBusiness(result.identifier)
+      .catch(() => (null as ColinBusinessIF))
+    if (!businessInfo) {
+      this.errorDialogTitle = 'Could not fetch business data'
+      this.errorDialogText = 'An error occurred. Please try searching for the business again.'
+      this.errorDialog = true
+
+      // *** TODO: test/update this
+      // toggle active flag to re-render the ExtraproBusinessLookup component (and thus reset it)
+      // this.active = true
+      // await this.$nextTick()
+      // this.active = false
+      this.$forceUpdate() // force file upload component to react // *** TEST THIS
+
+      return
+    }
 
     this.business = {
-      homeJurisdiction: null, // get from COLIN
-      businessIdentifier: result.identifier,
-      businessLegalName: result.name,
-      identifier: null, // get from COLIN
-      incorporationDate: null, // get from COLIN
-      legalName: null, // get from COLIN
-      mode: 'LOOKUP',
+      bcFoundingDate: this.dateToYyyyMmDd(this.apiToDate(businessInfo.foundingDate)),
+      bcIdentifier: businessInfo.identifier,
+      bcLegalName: businessInfo.legalName,
+      homeJurisdiction: this.getHomeJurisdiction(businessInfo.jurisdiction || ''),
+      homeIdentifier: businessInfo.homeJurisdictionNumber,
+      homeIncorporationDate: this.dateToYyyyMmDd(this.apiToDate(businessInfo.homeRecognitionDate)),
+      homeLegalName: businessInfo.homeCompanyName,
+      mode: 'EXPRO',
       status: result.status,
-      taxId: result.bn?.substring(0, 9) || null
+      taxId: businessInfo.businessNumber?.substring(0, 9) || null
     }
     this.setExistingBusinessInfo(this.business)
     this.active = true
   }
 
+  /** Returns jurisdiction object for the given COLIN jurisdiction string. */
+  private getHomeJurisdiction (jurisdiction: string): any {
+    // safety check
+    if (jurisdiction) {
+      const provinces = CanJurisdictions.map(j => j.value).filter(p => p !== JurisdictionLocation.FD)
+      const states = UsaJurisdiction.map(j => j.value)
+      const countries = IntlJurisdictions.map(j => j.value)
+        .filter(c => (c !== JurisdictionLocation.CA && c !== JurisdictionLocation.US))
+
+      // look for BC, AB, etc
+      if (provinces.includes(jurisdiction)) {
+        return { country: JurisdictionLocation.CA, region: jurisdiction }
+      }
+      // look for FD
+      if (jurisdiction === JurisdictionLocation.FD) {
+        return { country: JurisdictionLocation.CA, region: 'FEDERAL' }
+      }
+      // look for "US, <state>"
+      if (
+        jurisdiction.startsWith(JurisdictionLocation.US) &&
+        states.includes(jurisdiction.substring(3))
+      ) {
+        return { country: JurisdictionLocation.US, region: jurisdiction }
+      }
+      // look for known countries
+      if (countries.includes(jurisdiction)) {
+        return { country: jurisdiction }
+      }
+    }
+    return null
+  }
+
   /** Resets this component back to its initial state. */
   reset () {
-    this.business = {} as unknown as ExistingBusinessInfoIF
+    this.business = {} as ExistingBusinessInfoIF
     this.setExistingBusinessInfo(this.business)
     // set this component to inactive (which shows the other component)
     this.active = false
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  /** Called when user has selected a jurisdiction. */
+  onJurisdictionChange (jurisdiction: any): void {
+    this.business.homeJurisdiction = jurisdiction
+
+    if (jurisdiction?.group === 0) {
+      this.business.homeJurisdiction.country = JurisdictionLocation.CA
+      if (jurisdiction.value === JurisdictionLocation.FD) {
+        this.business.homeJurisdiction.region = 'FEDERAL'
+      } else {
+        this.business.homeJurisdiction.region = jurisdiction.value
+      }
+    }
+
+    if (jurisdiction?.group === 1) {
+      this.business.homeJurisdiction.country = JurisdictionLocation.US
+      this.business.homeJurisdiction.region = jurisdiction.value
+    }
+
+    if (jurisdiction?.group === 2) {
+      this.business.homeJurisdiction.country = jurisdiction.value
+      this.business.homeJurisdiction.region = ''
+    }
+
+    // *** TODO: need this?
+    // if (this.jurisdiction) {
+    //   this.setShowErrors(false)
+    // }
+
+    this.jurisdictionErrorMessage = this.business.homeJurisdiction ? '' : 'Home jurisdiction is required'
+  }
+
+  /**
+   * Called when FileUploadPreview tells us whether a file is valid.
+   * This is called right before the File Selected event.
+   */
   onFileValidity (valid: boolean): void {
-    // *** TODO: implement -- see UploadMemorandum.vue
+    this.fileValidity = valid
   }
 
+  /**
+   * Called when FileUploadPreview tells us about a new or cleared file.
+   * This is called right after the File Validity event.
+   */
   async onFileSelected (file: File): Promise<void> {
-    // *** TODO: finish implementing -- see UploadMemorandum.vue
     if (file) {
-      // add property reactively to business object
-      this.$set(this.business, 'affidavitFileKey', '123')
+      if (this.fileValidity) {
+        // try to upload to Minio
+        let psu: PresignedUrlIF
+        try {
+          psu = await this.getPresignedUrl(file.name)
+          const res = await this.uploadToUrl(psu.preSignedUrl, file, psu.key, this.getKeycloakGuid)
+          if (!res || res.status !== StatusCodes.OK) throw new Error()
+        } catch {
+          // put file uploader into manual error mode by setting custom error message
+          this.customErrorMessage = this.UPLOAD_FAILED_MESSAGE
+          this.$forceUpdate() // force file upload component to react
+          return // don't add to list
+        }
+
+        // add properties reactively to business object
+        this.$set(this.business, 'affidavitFile', {
+          name: file.name,
+          lastModified: file.lastModified,
+          size: file.size
+        } as File)
+        this.$set(this.business, 'affidavitFileKey', psu.key)
+        this.$set(this.business, 'affidavitFileName', file.name)
+        this.$set(this.business, 'affidavitFileUrl', psu.preSignedUrl)
+      }
     } else {
-      // delete property reactively if the file is cleared
+      // delete properties reactively when the file is cleared
+      this.$delete(this.business, 'affidavitFile')
       this.$delete(this.business, 'affidavitFileKey')
+      this.$delete(this.business, 'affidavitFileName')
+      this.$delete(this.business, 'affidavitFileUrl')
       // FUTURE: should also delete the file from Minio
     }
   }
 
-  @Watch('business.isUlc')
-  onIsUlcChanged (val: boolean): void {
-    // delete the affidavit property if the business is not a ULC
-    if (!val) {
-      delete this.business.affidavitFileKey
-    }
+  @Watch('getShowErrors')
+  private onGetShowErrors (): void {
+    this.$refs.formRef.validate()
+    this.$refs.incorporationDateRef.validateForm()
+    // this.onComponentValid()
   }
 
   @Watch('business', { deep: true })
   @Emit('valid')
   private onComponentValid (): boolean {
-    // this component is valid if we have looked up an active business
-    // and we have the affidavit if the business in the home jurisdiction is ULC
+    // this component is valid if we have looked up a business
+    // and the business is active
+    // and we have the affidavit if it's required
     // and the user has checked the confirmation
     return (
       this.haveLookupBusiness &&
       this.isBusinessActive &&
-      ((this.business.isUlc === false) || !!this.business.affidavitFileKey) &&
-      (this.business.isConfirmed === true)
+      (!this.isAffidavitRequired || !!this.business.affidavitFileKey) &&
+      this.business.isConfirmed
     )
   }
 
@@ -447,19 +733,6 @@ label {
   pointer-events: none;
 }
 
-// style the radio buttons
-:deep(.v-radio) {
-  background: rgba(0, 0, 0, 0.06); // same as Vuetify
-  height: 3.5rem;
-  padding: 1rem;
-  width: 47%;
-
-  label {
-    font-weight: normal;
-    color: $gray7;
-  }
-}
-
 // align the checkbox with its label
 :deep(.v-input--checkbox .v-input__slot) {
   align-items: flex-start;
diff --git a/src/components/ContinuationIn/ManualBusinessInfo.vue b/src/components/ContinuationIn/ManualBusinessInfo.vue
index 0e7c353e0..dfdc76536 100644
--- a/src/components/ContinuationIn/ManualBusinessInfo.vue
+++ b/src/components/ContinuationIn/ManualBusinessInfo.vue
@@ -27,7 +27,7 @@
 
     <!-- active = display/edit mode -->
     <template v-if="active">
-      <!-- Jurisdiction -->
+      <!-- Jurisdiction + Undo button -->
       <v-row no-gutters>
         <v-col
           cols="12"
@@ -41,7 +41,7 @@
           sm="7"
         >
           <Jurisdiction
-            class="mb-n3"
+            class="home-jurisdiction"
             :showUsaJurisdictions="true"
             :initialValue="jurisdictionInitialVal"
             :errorMessages="jurisdictionErrorMessage"
@@ -67,6 +67,7 @@
           </v-btn>
         </v-col>
       </v-row>
+
       <v-form
         v-if="jurisdiction && !isMrasJurisdiction"
         ref="manualFormRef"
@@ -75,21 +76,24 @@
       >
         <!-- Identifying Number -->
         <v-row
-          class="mt-2"
+          class="mt-6"
           no-gutters
         >
           <v-col
             cols="12"
             sm="3"
-          />
+          >
+            <!-- empty column -->
+          </v-col>
 
           <v-col
             cols="12"
             sm="7"
           >
+            <!-- *** TODO: add rules -->
             <v-text-field
-              id="business-name"
-              v-model="business.identifier"
+              v-model="business.homeIdentifier"
+              class="identifying-number"
               filled
               hide-details="auto"
               label="Identifying Number"
@@ -121,9 +125,10 @@
             cols="12"
             sm="7"
           >
+            <!-- *** TODO: add rules -->
             <v-text-field
-              id="business-name"
-              v-model="business.legalName"
+              v-model="business.homeLegalName"
+              class="business-name"
               filled
               hide-details="auto"
               label="Business Name in Home Jurisdiction"
@@ -147,19 +152,23 @@
           <v-col
             cols="12"
             sm="3"
-          />
+          >
+            <!-- empty column -->
+          </v-col>
 
           <v-col
             cols="12"
             sm="7"
           >
+            <!-- *** TODO: add rules -->
             <v-text-field
-              id="business-number"
               v-model="business.taxId"
+              v-mask="['#########']"
+              class="business-number"
               filled
               hide-details="auto"
               label="Business Number (Optional)"
-              :hint="'First 9 digits of the CRA Business Number if you have one'"
+              hint="First 9 digits of the CRA Business Number if you have one"
             />
           </v-col>
 
@@ -179,7 +188,9 @@
           <v-col
             cols="12"
             sm="3"
-          />
+          >
+            <!-- empty column -->
+          </v-col>
 
           <v-col
             cols="12"
@@ -191,10 +202,10 @@
               title="Incorporation Date in Home Jurisdiction"
               :nudgeRight="40"
               :nudgeTop="85"
-              :initialValue="getExistingBusinessInfo.incorporationDate"
+              :initialValue="getExistingBusinessInfo.homeIncorporationDate"
               :inputRules="getShowErrors ? incorporationDateRules : []"
               :maxDate="getCurrentDate"
-              @emitDateSync="business.incorporationDate = $event"
+              @emitDateSync="business.homeIncorporationDate = $event"
             />
           </v-col>
 
@@ -206,11 +217,14 @@
           </v-col>
         </v-row>
 
+        <!-- message box -->
         <v-row no-gutters>
           <v-col
             cols="12"
             sm="3"
-          />
+          >
+            <!-- empty column -->
+          </v-col>
 
           <v-col
             cols="12"
@@ -238,10 +252,11 @@
 <script lang="ts">
 import { Component, Emit, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
+import { cloneDeep } from 'lodash'
+import { mask } from 'vue-the-mask'
 import { useStore } from '@/store/store'
 import { DateMixin } from '@/mixins'
-import { cloneDeep, isEqual } from 'lodash'
-import { EmptyBusinessLookup, EmptyExistingBusinessInfoIF, ExistingBusinessInfoIF } from '@/interfaces'
+import { EmptyExistingBusinessInfoIF, ExistingBusinessInfoIF } from '@/interfaces'
 import MessageBox from '@/components/common/MessageBox.vue'
 import { Jurisdiction } from '@bcrs-shared-components/jurisdiction'
 import { DatePicker as DatePickerShared } from '@bcrs-shared-components/date-picker'
@@ -255,6 +270,9 @@ import { MrasJurisdictions } from '@bcrs-shared-components/jurisdiction/list-dat
     DatePickerShared,
     Jurisdiction,
     MessageBox
+  },
+  directives: {
+    mask
   }
 })
 export default class ManualBusinessInfo extends Mixins(CountriesProvincesMixin, DateMixin) {
@@ -273,44 +291,38 @@ export default class ManualBusinessInfo extends Mixins(CountriesProvincesMixin,
 
   // Local properties
   active = false
-  businessLookup = null
   business = {} as ExistingBusinessInfoIF
   jurisdiction = null
   isMrasJurisdiction = false
   jurisdictionErrorMessage = ''
 
-  /** Whether to show this component. */
-  get showComponent (): boolean {
-    return true
-  }
-
-  /** Whether we have a looked-up business. */
-  get haveLookupBusiness (): boolean {
-    return !isEqual(this.business, {})
-  }
-
+  /** Called when this component is mounted. */
   mounted (): void {
-    // get the business info object from the store or initialize it
-    if (this.getExistingBusinessInfo) this.business = this.getExistingBusinessInfo
+    // point business variable to Existing Business Info object from the store, if it exists
+    if (this.getExistingBusinessInfo) {
+      this.business = this.getExistingBusinessInfo
+    } else {
+      this.business = cloneDeep(EmptyExistingBusinessInfoIF)
+      this.setExistingBusinessInfo(this.business)
+    }
 
     // if mode is MANUAL, set this component to active (which hides the other component)
     if (this.business.mode === 'MANUAL') this.active = true
   }
 
+  /** Called when user clicks to enter business info manually. */
   onClick (): void {
+    this.business.mode = 'MANUAL'
     this.isMrasJurisdiction = false
     this.jurisdiction = null
-    this.business = cloneDeep(EmptyExistingBusinessInfoIF)
     this.active = true
   }
 
   /** Jurisdiction initial value for draft. */
   get jurisdictionInitialVal (): any {
-    let country = this.getExistingBusinessInfo ? this.getExistingBusinessInfo.homeJurisdiction?.country : ''
-    let regions
+    const country = this.getExistingBusinessInfo ? this.getExistingBusinessInfo.homeJurisdiction?.country : ''
     let region = ''
-    let jurisdictionText = ''
-    let jur
+    let jur = {}
 
     if (this.getExistingBusinessInfo.homeJurisdiction) {
       if (this.getExistingBusinessInfo.homeJurisdiction?.region === 'FEDERAL') {
@@ -321,16 +333,13 @@ export default class ManualBusinessInfo extends Mixins(CountriesProvincesMixin,
     }
 
     if (country && region) {
-      jur = {
-        country: country,
-        region: region
-      }
+      jur = { country, region }
 
       // set local jurisdiction property
-      this.jurisdiction = jur || ''
+      this.jurisdiction = jur || null
 
-      regions = this.getCountryRegions(country) as any[]
-      jurisdictionText = regions.find(p => p.short === region).name
+      const regions = this.getCountryRegions(country)
+      const jurisdictionText = regions.find(p => p.short === region).name
 
       // set local property based on jurisdiction value
       this.isMrasJurisdiction = MrasJurisdictions.includes(jurisdictionText.toLowerCase())
@@ -341,35 +350,36 @@ export default class ManualBusinessInfo extends Mixins(CountriesProvincesMixin,
 
   /** Resets this component back to its initial state. */
   reset () {
-    this.businessLookup = { ...EmptyBusinessLookup }
-    this.setExistingBusinessInfo(this.businessLookup)
+    this.business = cloneDeep(EmptyExistingBusinessInfoIF)
+    this.setExistingBusinessInfo(this.business)
     // set this component to inactive (which shows the other component)
     this.active = false
   }
 
-  /** When Jurisdiction value changes */
+  /** Called when Jurisdiction value has changed. */
   onJurisdictionChange (jurisdiction: any): void {
     this.jurisdiction = jurisdiction
-    this.isMrasJurisdiction = MrasJurisdictions.includes(
-      this.jurisdiction?.text.toLowerCase()
-    )
+    this.isMrasJurisdiction = MrasJurisdictions.includes(this.jurisdiction?.text.toLowerCase())
+
     if (jurisdiction?.group === 0) {
-      this.business.homeJurisdiction.country = JurisdictionLocation.CA
-      if (jurisdiction.value === JurisdictionLocation.FD) {
-        this.business.homeJurisdiction.region = 'FEDERAL'
-      } else {
-        this.business.homeJurisdiction.region = jurisdiction.value
+      this.business.homeJurisdiction = {
+        country: JurisdictionLocation.CA,
+        region: (jurisdiction.value === JurisdictionLocation.FD) ? 'FEDERAL' : jurisdiction.value
       }
     }
 
     if (jurisdiction?.group === 1) {
-      this.business.homeJurisdiction.country = JurisdictionLocation.US
-      this.business.homeJurisdiction.region = jurisdiction.value
+      this.business.homeJurisdiction = {
+        country: JurisdictionLocation.US,
+        region: jurisdiction.value
+      }
     }
 
     if (jurisdiction?.group === 2) {
-      this.business.homeJurisdiction.country = jurisdiction.value
-      this.business.homeJurisdiction.region = ''
+      this.business.homeJurisdiction = {
+        country: jurisdiction.value,
+        region: ''
+      }
     }
 
     if (this.jurisdiction) {
@@ -397,12 +407,6 @@ export default class ManualBusinessInfo extends Mixins(CountriesProvincesMixin,
     ]
   }
 
-  @Watch('business', { deep: true })
-  private async onBusinessChanged (): Promise<void> {
-    this.setExistingBusinessInfo(this.business)
-    this.active = true
-  }
-
   @Watch('getShowErrors')
   @Watch('business.homeJurisdiction')
   @Watch('business.incorporationDate')
@@ -422,9 +426,9 @@ export default class ManualBusinessInfo extends Mixins(CountriesProvincesMixin,
   private onComponentValid (val: boolean): boolean {
     return (
       !!this.business.homeJurisdiction &&
-      !!this.business.identifier &&
-      !!this.business.legalName &&
-      !!this.business.incorporationDate
+      !!this.business.homeIdentifier &&
+      !!this.business.homeLegalName &&
+      !!this.business.homeIncorporationDate
     )
   }
 
diff --git a/src/components/ContinuationIn/SummaryBusinessHomeJurisdiction.vue b/src/components/ContinuationIn/SummaryBusinessHomeJurisdiction.vue
index 032d76d74..d090224f6 100644
--- a/src/components/ContinuationIn/SummaryBusinessHomeJurisdiction.vue
+++ b/src/components/ContinuationIn/SummaryBusinessHomeJurisdiction.vue
@@ -42,7 +42,7 @@
 
         <!-- Registration Number in B.C. -->
         <article
-          v-if="isLookup"
+          v-if="isExpro"
           class="section-container"
         >
           <v-row no-gutters>
@@ -59,15 +59,15 @@
               class="pt-4 pt-sm-0"
             >
               <div id="registration-number-bc">
-                {{ getExistingBusinessInfo?.businessIdentifier || '[Unknown]' }}
+                {{ getExistingBusinessInfo?.bcIdentifier || '[Unknown]' }}
               </div>
             </v-col>
           </v-row>
         </article>
 
-        <!-- Registered Name in B.C. -->
+        <!-- Name in B.C. -->
         <article
-          v-if="isLookup"
+          v-if="isExpro"
           class="section-container"
         >
           <v-row no-gutters>
@@ -76,15 +76,15 @@
               sm="3"
               class="pr-4"
             >
-              <label>Registered Name in B.C.</label>
+              <label>Name in B.C.</label>
             </v-col>
             <v-col
               cols="12"
               sm="9"
               class="pt-4 pt-sm-0"
             >
-              <div id="registered-name-bc">
-                {{ getExistingBusinessInfo?.businessLegalName || '[Unknown]' }}
+              <div id="name-bc">
+                {{ getExistingBusinessInfo?.bcLegalName || '[Unknown]' }}
               </div>
             </v-col>
           </v-row>
@@ -92,7 +92,7 @@
 
         <!-- Date of Registration in B.C. -->
         <article
-          v-if="isLookup"
+          v-if="isExpro"
           class="section-container"
         >
           <v-row no-gutters>
@@ -109,14 +109,13 @@
               class="pt-4 pt-sm-0"
             >
               <div id="registration-date-bc">
-                <!-- *** TODO: verify/fix format -->
-                {{ getExistingBusinessInfo?.businessFoundingDate || '[Unknown]' }}
+                {{ registrationDateBc || '[Unknown]' }}
               </div>
             </v-col>
           </v-row>
         </article>
 
-        <!-- Registered Name in Home Jurisdiction -->
+        <!-- Registration Number in Home Jurisdiction -->
         <article class="section-container">
           <v-row no-gutters>
             <v-col
@@ -124,21 +123,21 @@
               sm="3"
               class="pr-4"
             >
-              <label>Registered Name in Home Jurisdiction</label>
+              <label>Registration Number in Home Jurisdiction</label>
             </v-col>
             <v-col
               cols="12"
               sm="9"
               class="pt-4 pt-sm-0"
             >
-              <div id="registered-name-home">
-                {{ getExistingBusinessInfo?.legalName || '[Unknown]' }}
+              <div id="registration-number-home">
+                {{ getExistingBusinessInfo?.homeIdentifier || '[Unknown]' }}
               </div>
             </v-col>
           </v-row>
         </article>
 
-        <!-- Registration Number in Home Jurisdiction -->
+        <!-- Name in Home Jurisdiction -->
         <article class="section-container">
           <v-row no-gutters>
             <v-col
@@ -146,21 +145,21 @@
               sm="3"
               class="pr-4"
             >
-              <label>Registration Number in Home Jurisdiction</label>
+              <label>Name in Home Jurisdiction</label>
             </v-col>
             <v-col
               cols="12"
               sm="9"
               class="pt-4 pt-sm-0"
             >
-              <div id="registration-number-home">
-                {{ getExistingBusinessInfo?.identifier || '[Unknown]' }}
+              <div id="name-home">
+                {{ getExistingBusinessInfo?.homeLegalName || '[Unknown]' }}
               </div>
             </v-col>
           </v-row>
         </article>
 
-        <!-- Date of Incorporation, Continuation or Amalgamation in Foreign Jurisdiction -->
+        <!-- Date of Incorporation, Continuation or Amalgamation in Home Jurisdiction -->
         <article class="section-container">
           <v-row no-gutters>
             <v-col
@@ -168,7 +167,7 @@
               sm="3"
               class="pr-4"
             >
-              <label>Date of Incorporation, Continuation or Amalgamation in Foreign Jurisdiction</label>
+              <label>Date of Incorporation, Continuation or Amalgamation in Home Jurisdiction</label>
             </v-col>
             <v-col
               cols="12"
@@ -176,7 +175,7 @@
               class="pt-4 pt-sm-0"
             >
               <div id="incorporation-date-home">
-                {{ getExistingBusinessInfo?.incorporationDate || '[Unknown]' }}
+                {{ incorporationDateHome || '[Unknown]' }}
               </div>
             </v-col>
           </v-row>
@@ -291,11 +290,12 @@
 <script lang="ts">
 import { Component, Mixins } from 'vue-property-decorator'
 import { Getter } from 'pinia-class'
-import { getName } from 'country-list'
 import { useStore } from '@/store/store'
 import { RouteNames } from '@/enums'
 import { ContinuationAuthorizationIF, ExistingBusinessInfoIF } from '@/interfaces'
 import { DateMixin } from '@/mixins'
+import { CanJurisdictions, IntlJurisdictions, UsaJurisdiction } from '@bcrs-shared-components/jurisdiction/list-data'
+import { JurisdictionLocation } from '@bcrs-shared-components/enums'
 
 @Component({})
 export default class SummaryBusinessHomeJurisdiction extends Mixins(DateMixin) {
@@ -307,62 +307,44 @@ export default class SummaryBusinessHomeJurisdiction extends Mixins(DateMixin) {
   @Getter(useStore) getExistingBusinessInfo!: ExistingBusinessInfoIF
   @Getter(useStore) isContinuationInBusinessHomeValid!: boolean
 
-  // *** data from COLIN looks like this:
-  // 'business': {
-  //     'businessNumber': self.business_number,
-  //     'corpState': self.corp_state,
-  //     'corpStateClass': self.corp_state_class,
-  //     'email': self.email,
-  //     'foundingDate': self.founding_date,
-  //     'goodStanding': self.good_standing,
-  //     'identifier': self.corp_num,
-  //     'jurisdiction': self.jurisdiction,
-  //     'homeRecognitionDate': self.home_recogn_dt,
-  //     'homeJurisdictionNumber': self.home_juris_num,
-  //     'homeCompanyName': self.home_company_nme,
-  //     'lastAgmDate': self.last_agm_date,
-  //     'lastArDate': self.last_ar_date,
-  //     'lastLedgerTimestamp': self.last_ledger_timestamp,
-  //     'legalName': self.corp_name,
-  //     'legalType': self.corp_type,
-  //     'status': self.status
-  // }
-
-  /** Whether the existing business data was looked up (ie, is an extrapro). */
-  get isLookup (): boolean {
-    return this.getExistingBusinessInfo?.mode === 'LOOKUP'
+  /** Whether the existing business is an extrapro. */
+  get isExpro (): boolean {
+    return this.getExistingBusinessInfo?.mode === 'EXPRO'
   }
 
-  // NOT NEEDED ATM
-  // /** Whether the existing business data was manually entered. */
-  // get isManual (): boolean {
-  //   return this.getExistingBusinessInfo?.mode === 'MANUAL'
-  // }
-
-  /** The home jurisdiction. */
+  /** The text version of the home jurisdiction. */
   get homeJurisdiction (): string {
-    const hj = this.getExistingBusinessInfo?.homeJurisdiction
-    if (hj?.country) {
-      const country = getName(hj.country)
-      const region = (hj.region === 'FEDERAL' ? 'Federal' : hj.region)
-      if (region) return `${region}, ${country}`
-      return country
+    const jurisdiction = this.getExistingBusinessInfo?.homeJurisdiction // may be undefined or null
+
+    if (jurisdiction?.country === JurisdictionLocation.CA) {
+      if (jurisdiction?.region === 'FEDERAL') return 'Federal'
+      return CanJurisdictions.find(can => can.value === jurisdiction?.region)?.text || 'Canada'
+    }
+
+    if (jurisdiction?.country === JurisdictionLocation.US) {
+      const state = UsaJurisdiction.find(usa => usa.value === jurisdiction?.region)?.text
+      return (state ? `${state}, US` : 'USA')
     }
-    return null
+
+    return IntlJurisdictions.find(intl => intl.value === jurisdiction?.country)?.text || null
+  }
+
+  /** The formatted date of registration in BC. */
+  get registrationDateBc (): string {
+    return this.yyyyMmDdToPacificDate(this.getExistingBusinessInfo?.bcFoundingDate, true, false)
   }
 
-  /** The expro identifier and name (in BC). */
-  get extraproRegistration (): string {
-    const identifier = this.getExistingBusinessInfo?.businessIdentifier
-    const name = this.getExistingBusinessInfo?.businessLegalName
-    if (identifier && name) return `${identifier} - ${name}`
-    return null
+  /** The formatted date of incorporation in the home jurisdiction. */
+  get incorporationDateHome (): string {
+    return this.yyyyMmDdToPacificDate(this.getExistingBusinessInfo?.homeIncorporationDate, true, false)
   }
 
+  /** The formatted authorization date. */
   get authorizationDate (): string {
     return this.yyyyMmDdToPacificDate(this.getContinuationAuthorization?.date, true, false)
   }
 
+  /** The formatted expiry date. */
   get expiryDate (): string {
     return this.yyyyMmDdToPacificDate(this.getContinuationAuthorization?.expiryDate, true, false)
   }
diff --git a/src/components/Registration/BusinessNumber.vue b/src/components/Registration/BusinessNumber.vue
index 9c9d8cfff..95535718b 100644
--- a/src/components/Registration/BusinessNumber.vue
+++ b/src/components/Registration/BusinessNumber.vue
@@ -33,7 +33,6 @@
           :isTypeSoleProp="isTypeSoleProp"
         />
         <v-text-field
-          ref="textField"
           v-model="value"
           v-mask="['#########']"
           filled
@@ -53,7 +52,6 @@
 <script lang="ts">
 import { Component, Emit, Prop, Vue, Watch } from 'vue-property-decorator'
 import { mask } from 'vue-the-mask'
-import { FormIF } from '@/interfaces'
 import { Rules } from '@/rules'
 import { HelpBusinessNumber } from '@bcrs-shared-components/help-business-number'
 
@@ -73,10 +71,6 @@ import { HelpBusinessNumber } from '@bcrs-shared-components/help-business-number
   }
 })
 export default class BusinessNumber extends Vue {
-  $refs!: {
-    textField: FormIF
-  }
-
   /** The registration business number. */
   @Prop({ required: true }) readonly businessNumber!: string
 
diff --git a/src/dialogs/GenericErrorDialog.vue b/src/dialogs/GenericErrorDialog.vue
index e1efca432..810d7ee6a 100644
--- a/src/dialogs/GenericErrorDialog.vue
+++ b/src/dialogs/GenericErrorDialog.vue
@@ -17,7 +17,9 @@
           v-html="text"
         />
 
-        <RegistriesContactInfo class="mt-6" />
+        <div class="mt-6" />
+
+        <RegistriesContactInfo v-if="showContactInfo" />
       </v-card-text>
 
       <v-card-actions class="justify-center pt-0 pb-9">
@@ -47,6 +49,7 @@ export default class GenericErrorDialog extends Vue {
   @Prop({ default: false }) readonly dialog!: boolean
   @Prop({ default: 'Please contact us:' }) readonly text!: string
   @Prop({ default: 'An error occurred' }) readonly title!: string
+  @Prop({ default: true }) readonly showContactInfo!: boolean
 
   @Emit() close (): void {}
 }
diff --git a/src/interfaces/filing-interfaces/colin-business-interface.ts b/src/interfaces/filing-interfaces/colin-business-interface.ts
new file mode 100644
index 000000000..3a790bb0b
--- /dev/null
+++ b/src/interfaces/filing-interfaces/colin-business-interface.ts
@@ -0,0 +1,14 @@
+export interface ColinBusinessIF {
+  businessNumber: string // aka tax id
+  corpState: string // not used
+  corpStateClass: string // not used
+  foundingDate: string // aka incorporation date in BC
+  homeCompanyName: string // in foreign jurisdiction
+  homeJurisdictionNumber: string // in foreign jurisdiction
+  homeRecognitionDate: string // in foreign jurisdiction
+  identifier: string // business id in BC
+  jurisdiction: string // foreign jurisdiction
+  legalName: string // legal name in BC
+  legalType: string // may be same as CorpTypeCd
+  status: string // not used
+}
diff --git a/src/interfaces/filing-interfaces/existing-business-info-interface.ts b/src/interfaces/filing-interfaces/existing-business-info-interface.ts
deleted file mode 100644
index 219f28f5e..000000000
--- a/src/interfaces/filing-interfaces/existing-business-info-interface.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { EntityStates } from '@bcrs-shared-components/enums'
-
-export interface ExistingBusinessInfoIF {
-  affidavitFileKey?: string
-  businessFoundingDate?: string // registration date in BC (expro only)
-  businessIdentifier?: string // identifier in BC (expro only)
-  businessLegalName?: string // legal name in BC (expro only)
-  homeJurisdiction: {
-    country: string
-    region?: string
-  }
-  identifier: string // identifier in home jurisdiction
-  incorporationDate: string // incorporation date in home jurisdiction // YYYY-MM-DD
-  isConfirmed?: boolean // only used by UI
-  isUlc?: boolean // only used by UI
-  legalName: string // legal name in home jurisdiction
-  mode: 'LOOKUP' | 'MANUAL' // only used by UI
-  status?: EntityStates // only used by UI
-  taxId?: string
-}
-
-export const EmptyExistingBusinessInfoIF: ExistingBusinessInfoIF = {
-  homeJurisdiction: {
-    country: '',
-    region: ''
-  },
-  identifier: '',
-  incorporationDate: '',
-  legalName: '',
-  mode: null,
-  status: null,
-  taxId: ''
-}
diff --git a/src/interfaces/filing-interfaces/filing-interfaces.ts b/src/interfaces/filing-interfaces/filing-interfaces.ts
index 710152f47..1006d36c0 100644
--- a/src/interfaces/filing-interfaces/filing-interfaces.ts
+++ b/src/interfaces/filing-interfaces/filing-interfaces.ts
@@ -92,6 +92,7 @@ export interface ContinuationInFilingIF {
   }
   continuationIn: {
     business?: { // expro data in BC
+      foundingDate: string // API format
       identifier: string
       legalName: string
     }
@@ -100,9 +101,12 @@ export interface ContinuationInFilingIF {
       region?: string
       legalName: string
       identifier: string
-      incorporationDate: string
+      incorporationDate: string // YYYY-MM-DD
       taxId?: string
-      affidavitFileKey: string
+      affidavitFile?: File
+      affidavitFileKey?: string
+      affidavitFileName?: string
+      affidavitFileUrl?: string
     }
     authorization: ContinuationAuthorizationIF
     contactPoint: ContactPointIF
@@ -113,8 +117,7 @@ export interface ContinuationInFilingIF {
     shareStructure: { shareClasses: ShareClassIF[] }
     courtOrder?: CourtOrderIF
     isConfirmed?: boolean // used only by UI
-    isUlc?: boolean // used only by UI
-    mode?: 'LOOKUP' | 'MANUAL' // used only by UI
+    mode?: 'EXPRO' | 'MANUAL' // used only by UI
     status?: EntityStates // only used by UI
   }
 }
diff --git a/src/interfaces/index.ts b/src/interfaces/index.ts
index e5f51b2f1..3429e3630 100644
--- a/src/interfaces/index.ts
+++ b/src/interfaces/index.ts
@@ -1,7 +1,6 @@
 // Filing interfaces
+export * from './filing-interfaces/colin-business-interface'
 export * from './filing-interfaces/court-order-interface'
-export * from './filing-interfaces/continuation-authorization-interface'
-export * from './filing-interfaces/existing-business-info-interface'
 export * from './filing-interfaces/filing-data-interface'
 export * from './filing-interfaces/filing-interfaces'
 export * from './filing-interfaces/party-interface'
@@ -50,9 +49,11 @@ export * from './store-interfaces/state-interfaces/account-information-interface
 export * from './store-interfaces/state-interfaces/amalgamation-state-interface'
 export * from './store-interfaces/state-interfaces/auth-information-interface'
 export * from './store-interfaces/state-interfaces/business-interface'
+export * from './store-interfaces/state-interfaces/continuation-authorization-interface'
 export * from './store-interfaces/state-interfaces/continuation-in-state-interface'
 export * from './store-interfaces/state-interfaces/dissolution-state-interface'
 export * from './store-interfaces/state-interfaces/document-delivery-interface'
+export * from './store-interfaces/state-interfaces/existing-business-info-interface'
 export * from './store-interfaces/state-interfaces/org-information-interface'
 export * from './store-interfaces/state-interfaces/registration-state-interface'
 export * from './store-interfaces/state-interfaces/restoration-state-interface'
diff --git a/src/interfaces/filing-interfaces/continuation-authorization-interface.ts b/src/interfaces/store-interfaces/state-interfaces/continuation-authorization-interface.ts
similarity index 100%
rename from src/interfaces/filing-interfaces/continuation-authorization-interface.ts
rename to src/interfaces/store-interfaces/state-interfaces/continuation-authorization-interface.ts
diff --git a/src/interfaces/store-interfaces/state-interfaces/existing-business-info-interface.ts b/src/interfaces/store-interfaces/state-interfaces/existing-business-info-interface.ts
new file mode 100644
index 000000000..565a7c007
--- /dev/null
+++ b/src/interfaces/store-interfaces/state-interfaces/existing-business-info-interface.ts
@@ -0,0 +1,36 @@
+import { EntityStates } from '@bcrs-shared-components/enums'
+
+export interface ExistingBusinessInfoIF {
+  affidavitFile?: File // only used by UI
+  affidavitFileKey?: string
+  affidavitFileName?: string
+  affidavitFileUrl?: string // presigned URL for future deletion (ticket 21110)
+  bcFoundingDate?: string // expro only (YYYY-MM-DD)
+  bcIdentifier?: string // expro only
+  bcLegalName?: string // expro only
+  homeJurisdiction: {
+    country: string
+    region?: string
+  }
+  homeIdentifier: string
+  homeIncorporationDate: string // YYYY-MM-DD
+  homeLegalName: string
+  isConfirmed?: boolean // only used by UI
+  mode: 'EXPRO' | 'MANUAL' // only used by UI
+  status?: EntityStates // only used by UI
+  taxId?: string
+}
+
+// *** TODO: delete this if not used
+export const EmptyExistingBusinessInfoIF: ExistingBusinessInfoIF = {
+  homeJurisdiction: {
+    country: '',
+    region: ''
+  },
+  homeIdentifier: '',
+  homeIncorporationDate: '',
+  homeLegalName: '',
+  mode: null,
+  status: null,
+  taxId: ''
+}
diff --git a/src/mixins/filing-template-mixin.ts b/src/mixins/filing-template-mixin.ts
index 874278592..25cd694b9 100644
--- a/src/mixins/filing-template-mixin.ts
+++ b/src/mixins/filing-template-mixin.ts
@@ -367,11 +367,14 @@ export default class FilingTemplateMixin extends Mixins(AmalgamationMixin, DateM
         foreignJurisdiction: {
           country: this.getExistingBusinessInfo?.homeJurisdiction?.country,
           region: this.getExistingBusinessInfo?.homeJurisdiction?.region || undefined,
-          legalName: this.getExistingBusinessInfo?.legalName,
-          identifier: this.getExistingBusinessInfo?.identifier,
-          incorporationDate: this.getExistingBusinessInfo?.incorporationDate,
+          legalName: this.getExistingBusinessInfo?.homeLegalName,
+          identifier: this.getExistingBusinessInfo?.homeIdentifier,
+          incorporationDate: this.getExistingBusinessInfo?.homeIncorporationDate,
           taxId: this.getExistingBusinessInfo?.taxId || undefined,
-          affidavitFileKey: this.getExistingBusinessInfo?.affidavitFileKey
+          affidavitFile: this.getExistingBusinessInfo?.affidavitFile,
+          affidavitFileKey: this.getExistingBusinessInfo?.affidavitFileKey,
+          affidavitFileName: this.getExistingBusinessInfo?.affidavitFileName,
+          affidavitFileUrl: this.getExistingBusinessInfo?.affidavitFileUrl
         },
         authorization: this.getContinuationAuthorization,
         contactPoint: {
@@ -394,18 +397,19 @@ export default class FilingTemplateMixin extends Mixins(AmalgamationMixin, DateM
           shareClasses: this.getCreateShareStructureStep.shareClasses
         },
         // save properties used only for UI:
-        isConfirmed: this.getExistingBusinessInfo?.isConfirmed,
-        isUlc: this.getExistingBusinessInfo?.isUlc,
+        isConfirmed: this.getExistingBusinessInfo?.isConfirmed || false,
         mode: this.getExistingBusinessInfo?.mode,
         status: this.getExistingBusinessInfo?.status
       }
     }
 
-    // Add expro business information (expro only).
-    if (this.getExistingBusinessInfo?.mode === 'LOOKUP') {
+    // Add expro business information.
+    if (this.getExistingBusinessInfo?.mode === 'EXPRO') {
+      const foundingDate = this.yyyyMmDdToDate(this.getExistingBusinessInfo.bcFoundingDate)
       filing.continuationIn.business = {
-        identifier: this.getExistingBusinessInfo.businessIdentifier,
-        legalName: this.getExistingBusinessInfo.businessLegalName
+        foundingDate: this.dateToApi(foundingDate),
+        identifier: this.getExistingBusinessInfo.bcIdentifier,
+        legalName: this.getExistingBusinessInfo.bcLegalName
       }
     }
 
@@ -448,19 +452,23 @@ export default class FilingTemplateMixin extends Mixins(AmalgamationMixin, DateM
 
     // restore existing business information
     if (continuationIn.foreignJurisdiction) {
+      const foundingDate = this.apiToDate(continuationIn.business?.foundingDate)
       this.setExistingBusinessInfo({
+        affidavitFile: continuationIn.foreignJurisdiction.affidavitFile,
         affidavitFileKey: continuationIn.foreignJurisdiction.affidavitFileKey,
-        businessIdentifier: continuationIn.business?.identifier, // FUTURE: need fallback to null?
-        businessLegalName: continuationIn.business?.legalName, // FUTURE: need fallback to null?
+        affidavitFileName: continuationIn.foreignJurisdiction.affidavitFileName,
+        affidavitFileUrl: continuationIn.foreignJurisdiction.affidavitFileUrl,
+        bcFoundingDate: this.dateToYyyyMmDd(foundingDate), // FUTURE: need fallback to null?
+        bcIdentifier: continuationIn.business?.identifier, // FUTURE: need fallback to null?
+        bcLegalName: continuationIn.business?.legalName, // FUTURE: need fallback to null?
         homeJurisdiction: {
           country: continuationIn.foreignJurisdiction.country,
           region: continuationIn.foreignJurisdiction.region
         },
-        identifier: continuationIn.foreignJurisdiction.identifier,
-        incorporationDate: continuationIn.foreignJurisdiction.incorporationDate,
+        homeIdentifier: continuationIn.foreignJurisdiction.identifier,
+        homeIncorporationDate: continuationIn.foreignJurisdiction.incorporationDate,
+        homeLegalName: continuationIn.foreignJurisdiction.legalName,
         isConfirmed: false, // don't restore confirmation checkbox
-        isUlc: continuationIn.isUlc,
-        legalName: continuationIn.foreignJurisdiction.legalName,
         mode: continuationIn.mode,
         status: continuationIn.status,
         taxId: continuationIn.foreignJurisdiction.taxId
diff --git a/src/services/auth-services.ts b/src/services/auth-services.ts
index 916a269e2..7518ef275 100644
--- a/src/services/auth-services.ts
+++ b/src/services/auth-services.ts
@@ -113,8 +113,8 @@ export default class AuthServices {
       phone: contactInfo.phone,
       phoneExtension: contactInfo.extension
     }
-    const authUrl = sessionStorage.getItem('AUTH_API_URL')
-    const url = `${authUrl}entities/${businessId}/contacts`
+    const authApiUrl = sessionStorage.getItem('AUTH_API_URL')
+    const url = `${authApiUrl}entities/${businessId}/contacts`
 
     return axios.put(url, data).then(response => {
       const contacts = response?.data?.contacts[0]
diff --git a/src/services/colin-services.ts b/src/services/colin-services.ts
new file mode 100644
index 000000000..41fb430f5
--- /dev/null
+++ b/src/services/colin-services.ts
@@ -0,0 +1,23 @@
+import { AxiosInstance as axios } from '@/utils'
+import { ColinBusinessIF } from '@/interfaces'
+
+/**
+ * Class that provides integration with the COLIN API.
+ */
+export default class ColinServices {
+  /**
+   * Fetches the public business data from COLIN.
+   * @param businessId the business identifier (aka entity inc no)
+   * @returns a promise to return the data
+   */
+  static async fetchPublicBusiness (businessId: string): Promise<ColinBusinessIF> {
+    const colinApiUrl = sessionStorage.getItem('COLIN_API_URL')
+    const url = `${colinApiUrl}businesses/${businessId}/public`
+
+    return axios.get(url).then(response => {
+      const data = response?.data
+      if (!data) throw new Error('Invalid API response')
+      return data.business
+    })
+  }
+}
diff --git a/src/services/index.ts b/src/services/index.ts
index 907b1a5f7..fb48dfa94 100644
--- a/src/services/index.ts
+++ b/src/services/index.ts
@@ -1,4 +1,5 @@
 export { default as AuthServices } from './auth-services'
+export { default as ColinServices } from './colin-services'
 export { default as LegalServices } from './legal-services'
 export { default as NaicsServices } from './naics-services'
 export { default as PayServices } from './pay-services'
diff --git a/src/store/store.ts b/src/store/store.ts
index 74e691bf8..7fbda3aa3 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -252,7 +252,7 @@ export const useStore = defineStore('store', {
       return (this.getEntityType === CorpTypeCd.BC_COMPANY)
     },
 
-    /** Whether the entity is a BC ULC Company. */
+    /** Whether the entity is a BC Unlimited Liability Company. */
     isTypeBcUlcCompany (): boolean {
       return (this.getEntityType === CorpTypeCd.BC_ULC_COMPANY)
     },
@@ -267,6 +267,26 @@ export const useStore = defineStore('store', {
       return (this.getEntityType === CorpTypeCd.PARTNERSHIP)
     },
 
+    /** Whether the entity is a Continued In BC Company. */
+    isTypeContinueIn (): boolean {
+      return (this.getEntityType === CorpTypeCd.CONTINUE_IN)
+    },
+
+    /** Whether the entity is a Continued In Benefit Company. */
+    isTypeBenContinueIn (): boolean {
+      return (this.getEntityType === CorpTypeCd.BEN_CONTINUE_IN)
+    },
+
+    /** Whether the entity is a Continued In Community Contribution Company. */
+    isTypeCccContinueIn (): boolean {
+      return (this.getEntityType === CorpTypeCd.CCC_CONTINUE_IN)
+    },
+
+    /** Whether the entity is a Continued In Unlimited Liability Company. */
+    isTypeUlcContinueIn (): boolean {
+      return (this.getEntityType === CorpTypeCd.ULC_CONTINUE_IN)
+    },
+
     /** Is True if entity is a Sole Proprietorship or General Partnership. */
     isTypeFirm (): boolean {
       return (this.isTypeSoleProp || this.isTypePartnership)
diff --git a/src/utils/AxiosInstance.ts b/src/utils/AxiosInstance.ts
index 0bfb546ae..bc83beece 100644
--- a/src/utils/AxiosInstance.ts
+++ b/src/utils/AxiosInstance.ts
@@ -1,6 +1,11 @@
 import axios from 'axios'
 import { SessionStorageKeys } from 'sbc-common-components/src/util/constants'
 
+/**
+ * This file exports an instance of Axios with a bearer token added to the request
+ * headers.
+ */
+
 const instance = axios.create()
 
 instance.interceptors.request.use(
diff --git a/src/utils/FetchConfig.ts b/src/utils/FetchConfig.ts
index a435d937e..fe07635f1 100644
--- a/src/utils/FetchConfig.ts
+++ b/src/utils/FetchConfig.ts
@@ -52,6 +52,9 @@ export async function FetchConfig (): Promise<any> {
   const authApiUrl: string = (import.meta.env.VUE_APP_AUTH_API_URL + import.meta.env.VUE_APP_AUTH_API_VERSION + '/')
   sessionStorage.setItem('AUTH_API_URL', authApiUrl)
 
+  const colinApiUrl: string = (import.meta.env.VUE_APP_COLIN_API_URL + import.meta.env.VUE_APP_COLIN_API_VERSION + '/')
+  sessionStorage.setItem('COLIN_API_URL', colinApiUrl)
+
   const payApiUrl: string = (import.meta.env.VUE_APP_PAY_API_URL + import.meta.env.VUE_APP_PAY_API_VERSION + '/')
   sessionStorage.setItem('PAY_API_URL', payApiUrl)
 
diff --git a/src/views/ContinuationIn/ContinuationInBusinessHome.vue b/src/views/ContinuationIn/ContinuationInBusinessHome.vue
index 97c8101b6..724bb58bd 100644
--- a/src/views/ContinuationIn/ContinuationInBusinessHome.vue
+++ b/src/views/ContinuationIn/ContinuationInBusinessHome.vue
@@ -41,7 +41,7 @@
         <h2>Continuation Authorization</h2>
         <p class="mt-4">
           You must provide proof of authorization to continue out of your home jurisdiction.
-          This may be reviewed by our staff.
+          This will be reviewed by our staff.
         </p>
       </header>
 
diff --git a/tests/unit/SummaryBusinessHomeJurisdiction.spec.ts b/tests/unit/SummaryBusinessHomeJurisdiction.spec.ts
index 5b4d0c8f3..7138aabbf 100644
--- a/tests/unit/SummaryBusinessHomeJurisdiction.spec.ts
+++ b/tests/unit/SummaryBusinessHomeJurisdiction.spec.ts
@@ -12,7 +12,8 @@ describe('Summary Business Home Jurisdiction component', () => {
       null,
       null,
       {
-        isLookup: () => true
+        isLookup: () => true,
+        isExpro: () => true
       }
     )
     await Vue.nextTick()
@@ -31,11 +32,11 @@ describe('Summary Business Home Jurisdiction component', () => {
 
     expect(articles.at(0).find('label').text()).toBe('Home Jurisdiction')
     expect(articles.at(1).find('label').text()).toBe('Registration Number in B.C.')
-    expect(articles.at(2).find('label').text()).toBe('Registered Name in B.C.')
+    expect(articles.at(2).find('label').text()).toBe('Name in B.C.')
     expect(articles.at(3).find('label').text()).toBe('Date of Registration in B.C.')
-    expect(articles.at(4).find('label').text()).toBe('Registered Name in Home Jurisdiction')
-    expect(articles.at(5).find('label').text()).toBe('Registration Number in Home Jurisdiction')
-    expect(articles.at(6).find('label').text()).toBe('Date of Incorporation, Continuation or Amalgamation in Foreign Jurisdiction')
+    expect(articles.at(4).find('label').text()).toBe('Registration Number in Home Jurisdiction')
+    expect(articles.at(5).find('label').text()).toBe('Name in Home Jurisdiction')
+    expect(articles.at(6).find('label').text()).toBe('Date of Incorporation, Continuation or Amalgamation in Home Jurisdiction')
     expect(articles.at(7).find('label').text()).toBe('Business Number')
 
     wrapper.destroy()

From 8f4a21a861e0de6e126f815b38ee76315a31539b Mon Sep 17 00:00:00 2001
From: Severin Beauvais <severin.beauvais@gov.bc.ca>
Date: Fri, 24 May 2024 10:32:41 -0700
Subject: [PATCH 2/2] - added affidavit file to summary section - updated
 isContinuationInValid getter - added Court Order/POA component to review page
 - imported fixed shared DatePicker component - updated validation triggers -
 reactively set homeJurisdiction objects - wait for form to show before
 validating it - misc logic cleanup - deleted unneeded Empty Existing Business
 Info object - updated initial value in store state

---
 package-lock.json                             |   8 +-
 package.json                                  |   2 +-
 .../ContinuationAuthorization.vue             |  12 +-
 .../ContinuationIn/ExtraproBusinessLookup.vue |  10 +-
 .../ContinuationIn/ExtraproRegistration.vue   | 216 ++++++++----------
 .../ContinuationIn/ManualBusinessInfo.vue     | 139 +++++------
 .../SummaryBusinessHomeJurisdiction.vue       |  32 ++-
 .../colin-business-interface.ts               |   3 +
 .../existing-business-info-interface.ts       |  14 --
 src/mixins/filing-template-mixin.ts           |  11 +-
 src/store/state/state-model.ts                |   3 +-
 src/store/store.ts                            |  31 ++-
 src/utils/feature-flag-utils.ts               |   3 +-
 .../ContinuationInBusinessHome.vue            |   4 +-
 .../ContinuationInReviewConfirm.vue           |  20 +-
 .../unit/ContinuationInReviewConfirm.spec.ts  |  12 +-
 16 files changed, 265 insertions(+), 255 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index de2547f21..af1231044 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
         "@bcrs-shared-components/corp-type-module": "1.0.16",
         "@bcrs-shared-components/correct-name": "1.0.46",
         "@bcrs-shared-components/court-order-poa": "3.0.11",
-        "@bcrs-shared-components/date-picker": "1.2.55",
+        "@bcrs-shared-components/date-picker": "1.3.0",
         "@bcrs-shared-components/document-delivery": "1.2.0",
         "@bcrs-shared-components/effective-date-time": "1.1.15",
         "@bcrs-shared-components/enums": "1.1.10",
@@ -348,9 +348,9 @@
       }
     },
     "node_modules/@bcrs-shared-components/date-picker": {
-      "version": "1.2.55",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/date-picker/-/date-picker-1.2.55.tgz",
-      "integrity": "sha512-QjFr4iBjJFyifMOimWTOI+ayxGPPaxNJj6ofUpA71AV7+4WLgIFX+mKGaYFkqCtqSJgFR6Y/Kb1e7VP4Jk1SsA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/date-picker/-/date-picker-1.3.0.tgz",
+      "integrity": "sha512-ZL9fEgFIHt4372Jpt2lI8EAUjQ4zi2zOUvFrrWW8kuHDcqU/odLOdLYkpqXG7+OcfCHxgIhx0SR6Z4LhASpy0w==",
       "dependencies": {
         "@bcrs-shared-components/interfaces": "^1.1.15",
         "@bcrs-shared-components/mixins": "^1.1.46",
diff --git a/package.json b/package.json
index 8741e9859..de5ec013d 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@bcrs-shared-components/corp-type-module": "1.0.16",
     "@bcrs-shared-components/correct-name": "1.0.46",
     "@bcrs-shared-components/court-order-poa": "3.0.11",
-    "@bcrs-shared-components/date-picker": "1.2.55",
+    "@bcrs-shared-components/date-picker": "1.3.0",
     "@bcrs-shared-components/document-delivery": "1.2.0",
     "@bcrs-shared-components/effective-date-time": "1.1.15",
     "@bcrs-shared-components/enums": "1.1.10",
diff --git a/src/components/ContinuationIn/ContinuationAuthorization.vue b/src/components/ContinuationIn/ContinuationAuthorization.vue
index d12b94a92..93a15b555 100644
--- a/src/components/ContinuationIn/ContinuationAuthorization.vue
+++ b/src/components/ContinuationIn/ContinuationAuthorization.vue
@@ -93,7 +93,7 @@
 
     <div class="pt-4" />
 
-    <!-- file upload component(s) -->
+    <!-- file upload components -->
     <v-row
       v-for="(num, index) in numUploads"
       :key="authorization.files[index]?.fileKey"
@@ -174,10 +174,8 @@ export default class ExtraproRegistration extends Mixins(DocumentMixin) {
     return [
       () => !!this.authorization.date ||
         'Authorization Date is required',
-      () => {
-        return (this.authorization.date <= this.getCurrentDate) ||
-          'Authorization Date cannot be in the future'
-      }
+      () => (this.authorization.date <= this.getCurrentDate) ||
+        'Authorization Date cannot be in the future'
     ]
   }
 
@@ -217,7 +215,7 @@ export default class ExtraproRegistration extends Mixins(DocumentMixin) {
       // verify that file is valid
       if (!this.fileValidity) {
         // NB: as this is validity according to the component, do not overwrite current error message
-        return // don't add to list
+        return // don't add to array
       }
 
       // verify that file doesn't already exist
@@ -238,7 +236,7 @@ export default class ExtraproRegistration extends Mixins(DocumentMixin) {
         // put file uploader into manual error mode by setting custom error message
         this.customErrorMessage[index] = this.UPLOAD_FAILED_MESSAGE
         this.$forceUpdate() // force file upload component to react
-        return // don't add to list
+        return // don't add to array
       }
 
       // add file to array
diff --git a/src/components/ContinuationIn/ExtraproBusinessLookup.vue b/src/components/ContinuationIn/ExtraproBusinessLookup.vue
index e2f74540b..7d00fe52e 100644
--- a/src/components/ContinuationIn/ExtraproBusinessLookup.vue
+++ b/src/components/ContinuationIn/ExtraproBusinessLookup.vue
@@ -34,9 +34,8 @@
             cols="3"
             class="result-identifier d-inline-flex"
           >
-            {{ item.identifier }}
-            <!-- *** TODO: remove after testing: -->
-            ({{ item.status?.charAt(0) }})
+            <span>{{ item.identifier }}</span>
+            <span v-if="showBusinessSearchStatus">&nbsp;({{ item.status?.charAt(0) }})</span>
           </v-col>
 
           <v-col
@@ -64,6 +63,7 @@ import { Component, Emit, Watch } from 'vue-property-decorator'
 import { debounce } from 'lodash'
 import { BusinessLookupResultIF } from '@/interfaces'
 import { BusinessLookupServices } from '@/services'
+import { GetFeatureFlag } from '@/utils/feature-flag-utils'
 
 /* eslint-disable no-unused-vars */
 enum States {
@@ -91,6 +91,10 @@ export default class ExtraproBusinessLookup extends Vue {
 
   readonly businessLookupLabel = 'Extraprovincial registration number or name of the business in B.C.'
 
+  get showBusinessSearchStatus (): boolean {
+    return Boolean(GetFeatureFlag('show-business-search-status'))
+  }
+
   /** Called when Search Input has been updated. */
   onSearchInput (searchInput: string) {
     this.onSearchInputDebounced(this, searchInput)
diff --git a/src/components/ContinuationIn/ExtraproRegistration.vue b/src/components/ContinuationIn/ExtraproRegistration.vue
index 0b9d03583..a28d01718 100644
--- a/src/components/ContinuationIn/ExtraproRegistration.vue
+++ b/src/components/ContinuationIn/ExtraproRegistration.vue
@@ -79,7 +79,7 @@
       <v-form
         v-if="isBusinessActive"
         ref="formRef"
-        lazy-validation
+        v-model="formValid"
         @submit.prevent
       >
         <!-- Home Jurisdiction -->
@@ -125,7 +125,6 @@
             cols="12"
             sm="9"
           >
-            <!-- *** TODO: add rules -->
             <v-text-field
               v-model="business.homeLegalName"
               class="name-home-jurisdiction"
@@ -163,8 +162,7 @@
               :initialValue="business.homeIncorporationDate"
               :inputRules="getShowErrors ? incorporationDateRules: []"
               :maxDate="getCurrentDate"
-              :disablePicker="!isBusinessActive"
-              @emitDateSync="business.homeIncorporationDate = $event"
+              @emitDateSync="$set(business, 'homeIncorporationDate', $event)"
             />
           </v-col>
         </v-row>
@@ -185,7 +183,6 @@
             cols="12"
             sm="9"
           >
-            <!-- *** TODO: add rules -->
             <v-text-field
               v-model="business.taxId"
               v-mask="['#########']"
@@ -199,47 +196,49 @@
           </v-col>
         </v-row>
 
-        <!-- Upload Affidavit -->
-        <v-row
-          v-if="isAffidavitRequired"
-          class="mt-6"
-          no-gutters
-        >
-          <v-col
-            cols="12"
-            sm="3"
-          >
-            <label>Upload Affidavit</label>
-          </v-col>
-
-          <v-col
-            cols="12"
-            sm="9"
+        <v-expand-transition>
+          <!-- Upload Affidavit -->
+          <v-row
+            v-if="isContinuationInAffidavitRequired"
+            class="mt-6"
+            no-gutters
           >
-            <p>
-              Upload the affidavit from the directors.
-            </p>
-
-            <ul>
-              <li>Use a white background and a legible font with contrasting font colour</li>
-              <li>PDF file type (maximum 30 MB file size)</li>
-            </ul>
-
-            <FileUploadPreview
-              class="mt-4"
-              inputFileLabel="Affidavit from directors"
-              :maxSize="MAX_FILE_SIZE"
-              :pdfPageSize="PdfPageSize.LETTER_SIZE"
-              :hint="business.affidavitFile ? 'File uploaded' : undefined"
-              :inputFile="business.affidavitFile"
-              :showErrors="getShowErrors"
-              :customErrorMessage.sync="customErrorMessage"
-              :isRequired="true"
-              @fileValidity="onFileValidity($event)"
-              @fileSelected="onFileSelected($event)"
-            />
-          </v-col>
-        </v-row>
+            <v-col
+              cols="12"
+              sm="3"
+            >
+              <label>Upload Affidavit</label>
+            </v-col>
+
+            <v-col
+              cols="12"
+              sm="9"
+            >
+              <p>
+                Upload the affidavit from the directors.
+              </p>
+
+              <ul>
+                <li>Use a white background and a legible font with contrasting font colour</li>
+                <li>PDF file type (maximum 30 MB file size)</li>
+              </ul>
+
+              <FileUploadPreview
+                class="mt-4"
+                inputFileLabel="Affidavit from directors"
+                :maxSize="MAX_FILE_SIZE"
+                :pdfPageSize="PdfPageSize.LETTER_SIZE"
+                :hint="business.affidavitFile ? 'File uploaded' : undefined"
+                :inputFile="business.affidavitFile"
+                :showErrors="getShowErrors"
+                :customErrorMessage.sync="customErrorMessage"
+                :isRequired="getShowErrors"
+                @fileValidity="onFileValidity($event)"
+                @fileSelected="onFileSelected($event)"
+              />
+            </v-col>
+          </v-row>
+        </v-expand-transition>
 
         <!-- message box -->
         <v-row
@@ -311,7 +310,7 @@
           >
             <div class="home-jurisdiction font-15">
               <label>Home Jurisdiction:</label>
-              {{ homeJurisdiction || '[Unknown]' }}
+              {{ homeJurisdictionText || '[Unknown]' }}
             </div>
             <div class="name-in-bc font-15 mt-2">
               <label>Name in B.C.:</label>
@@ -396,7 +395,6 @@
 import { Component, Emit, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { StatusCodes } from 'http-status-codes'
-import { isEqual } from 'lodash'
 import { mask } from 'vue-the-mask'
 import { useStore } from '@/store/store'
 import { DateMixin, DocumentMixin } from '@/mixins'
@@ -443,14 +441,14 @@ export default class ExtraproRegistration extends Mixins(DateMixin, DocumentMixi
   @Getter(useStore) getExistingBusinessInfo!: ExistingBusinessInfoIF
   @Getter(useStore) getKeycloakGuid!: string
   @Getter(useStore) getShowErrors!: boolean
-  @Getter(useStore) isTypeUlcContinueIn!: boolean
+  @Getter(useStore) isContinuationInAffidavitRequired!: boolean
 
   @Action(useStore) setExistingBusinessInfo!: (x: ExistingBusinessInfoIF) => void
 
   // Local properties
   active = false
   business = {} as ExistingBusinessInfoIF
-  jurisdictionErrorMessage = ''
+  formValid = false
   customErrorMessage = ''
   uploadMemorandumDoc = null as File
   uploadMemorandumDocKey = null as string
@@ -463,49 +461,26 @@ export default class ExtraproRegistration extends Mixins(DateMixin, DocumentMixi
     ' this business will be cancelled and made historical in the B.C. Registry once the continuation' +
     ' application application has been submitted.'
 
-  /** Whether we have a looked-up business. */
-  get haveLookupBusiness (): boolean {
-    return !isEqual(this.business, {})
-  }
-
   /** Whether the business is active (otherwise it's historical). */
   get isBusinessActive (): boolean {
     return (this.business.status === EntityStates.ACTIVE)
   }
 
-  /**
-   * Whether the director's affidavit is required.
-   * Is true if the business is a Continued In ULC in Alberta or Nova Scotia.
-   */
-  get isAffidavitRequired (): boolean {
-    return (
-      this.isTypeUlcContinueIn &&
-      this.business.homeJurisdiction?.country === JurisdictionLocation.CA &&
-      (
-        this.business.homeJurisdiction?.region === 'AB' ||
-        this.business.homeJurisdiction?.region === 'NB'
-      )
-    )
-  }
-
   readonly businessNameRules: Array<VuetifyRuleFunction> = [
-    v => !!v || 'Name is required',
-    v => (v && v.length <= 1000) || 'Cannot exceed 1000 characters'
+    (v) => !!v || 'Name is required',
+    (v) => (v && v.length <= 1000) || 'Cannot exceed 1000 characters'
   ]
 
-  get incorporationDateRules (): Array<VuetifyRuleFunction> {
-    return [
-      () => !!this.business.homeIncorporationDate || !this.isBusinessActive ||
-        'Date is required',
-      () => {
-        return (this.business.homeIncorporationDate <= this.getCurrentDate) ||
-          'Date cannot be in the future'
-      }
-    ]
+  readonly incorporationDateRules: Array<VuetifyRuleFunction> = [
+    (v) => !!v || 'Incorporation Date is required'
+  ]
+
+  get jurisdictionErrorMessage (): string {
+    return (this.getShowErrors && !this.business.homeJurisdiction) ? 'Jurisdiction is required' : ''
   }
 
   /** The text version of the home jurisdiction. */
-  get homeJurisdiction (): string {
+  get homeJurisdictionText (): string {
     const jurisdiction = this.business.homeJurisdiction // may be null
 
     if (jurisdiction?.country === JurisdictionLocation.CA) {
@@ -540,12 +515,10 @@ export default class ExtraproRegistration extends Mixins(DateMixin, DocumentMixi
       this.errorDialogText = 'An error occurred. Please try searching for the business again.'
       this.errorDialog = true
 
-      // *** TODO: test/update this
       // toggle active flag to re-render the ExtraproBusinessLookup component (and thus reset it)
-      // this.active = true
-      // await this.$nextTick()
-      // this.active = false
-      this.$forceUpdate() // force file upload component to react // *** TEST THIS
+      this.active = true
+      await this.$nextTick()
+      this.active = false
 
       return
     }
@@ -608,33 +581,31 @@ export default class ExtraproRegistration extends Mixins(DateMixin, DocumentMixi
 
   /** Called when user has selected a jurisdiction. */
   onJurisdictionChange (jurisdiction: any): void {
-    this.business.homeJurisdiction = jurisdiction
+    this.business.homeJurisdiction = null
 
     if (jurisdiction?.group === 0) {
-      this.business.homeJurisdiction.country = JurisdictionLocation.CA
-      if (jurisdiction.value === JurisdictionLocation.FD) {
-        this.business.homeJurisdiction.region = 'FEDERAL'
-      } else {
-        this.business.homeJurisdiction.region = jurisdiction.value
-      }
+      // set property reactively (in case it was null)
+      this.$set(this.business, 'homeJurisdiction', {
+        country: JurisdictionLocation.CA,
+        region: (jurisdiction.value === JurisdictionLocation.FD) ? 'FEDERAL' : jurisdiction.value
+      })
     }
 
     if (jurisdiction?.group === 1) {
-      this.business.homeJurisdiction.country = JurisdictionLocation.US
-      this.business.homeJurisdiction.region = jurisdiction.value
+      // set property reactively (in case it was null)
+      this.$set(this.business, 'homeJurisdiction', {
+        country: JurisdictionLocation.US,
+        region: jurisdiction.value
+      })
     }
 
     if (jurisdiction?.group === 2) {
-      this.business.homeJurisdiction.country = jurisdiction.value
-      this.business.homeJurisdiction.region = ''
+      // set property reactively (in case it was null)
+      this.$set(this.business, 'homeJurisdiction', {
+        country: jurisdiction.value,
+        region: ''
+      })
     }
-
-    // *** TODO: need this?
-    // if (this.jurisdiction) {
-    //   this.setShowErrors(false)
-    // }
-
-    this.jurisdictionErrorMessage = this.business.homeJurisdiction ? '' : 'Home jurisdiction is required'
   }
 
   /**
@@ -685,28 +656,41 @@ export default class ExtraproRegistration extends Mixins(DateMixin, DocumentMixi
     }
   }
 
+  /** Validates the form and other components. */
+  @Watch('active')
   @Watch('getShowErrors')
-  private onGetShowErrors (): void {
-    this.$refs.formRef.validate()
-    this.$refs.incorporationDateRef.validateForm()
-    // this.onComponentValid()
+  private async onGetShowErrors (): Promise<void> {
+    if (this.active && this.getShowErrors) {
+      await this.$nextTick() // wait for form to finish rendering
+      this.$refs.formRef?.validate()
+      this.$refs.incorporationDateRef?.validateForm()
+    }
   }
 
-  @Watch('business', { deep: true })
+  /** Emits form validity. */
+  @Watch('isBusinessActive')
+  @Watch('business.homeJurisdiction')
+  @Watch('business.homeIncorporationDate')
+  @Watch('isContinuationInAffidavitRequired')
+  @Watch('business.affidavitFileKey')
+  @Watch('formValid')
   @Emit('valid')
   private onComponentValid (): boolean {
-    // this component is valid if we have looked up a business
-    // and the business is active
-    // and we have the affidavit if it's required
-    // and the user has checked the confirmation
+    // this component is valid if we have an active business
+    // and we have the home jurisdiction (custom component)
+    // and we have the home incorporation date (custom component)
+    // and we have the affidavit file, if required (custom component)
+    // and the other form (Vuetify) components are valid
     return (
-      this.haveLookupBusiness &&
       this.isBusinessActive &&
-      (!this.isAffidavitRequired || !!this.business.affidavitFileKey) &&
-      this.business.isConfirmed
+      !!this.business.homeJurisdiction &&
+      !!this.business.homeIncorporationDate &&
+      (!this.isContinuationInAffidavitRequired || !!this.business.affidavitFileKey) &&
+      this.formValid
     )
   }
 
+  /** Informs parent component whether we have become active or inactive. */
   @Watch('active', { immediate: true })
   @Emit('active')
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
diff --git a/src/components/ContinuationIn/ManualBusinessInfo.vue b/src/components/ContinuationIn/ManualBusinessInfo.vue
index dfdc76536..e0246182e 100644
--- a/src/components/ContinuationIn/ManualBusinessInfo.vue
+++ b/src/components/ContinuationIn/ManualBusinessInfo.vue
@@ -43,6 +43,7 @@
           <Jurisdiction
             class="home-jurisdiction"
             :showUsaJurisdictions="true"
+            label="Jurisdiction"
             :initialValue="jurisdictionInitialVal"
             :errorMessages="jurisdictionErrorMessage"
             @change="onJurisdictionChange($event)"
@@ -69,9 +70,8 @@
       </v-row>
 
       <v-form
-        v-if="jurisdiction && !isMrasJurisdiction"
         ref="manualFormRef"
-        lazy-validation
+        v-model="formValid"
         @submit.prevent
       >
         <!-- Identifying Number -->
@@ -90,7 +90,6 @@
             cols="12"
             sm="7"
           >
-            <!-- *** TODO: add rules -->
             <v-text-field
               v-model="business.homeIdentifier"
               class="identifying-number"
@@ -125,7 +124,6 @@
             cols="12"
             sm="7"
           >
-            <!-- *** TODO: add rules -->
             <v-text-field
               v-model="business.homeLegalName"
               class="business-name"
@@ -160,7 +158,6 @@
             cols="12"
             sm="7"
           >
-            <!-- *** TODO: add rules -->
             <v-text-field
               v-model="business.taxId"
               v-mask="['#########']"
@@ -169,6 +166,7 @@
               hide-details="auto"
               label="Business Number (Optional)"
               hint="First 9 digits of the CRA Business Number if you have one"
+              :rules="getShowErrors ? Rules.BusinessNumberRules : []"
             />
           </v-col>
 
@@ -202,10 +200,11 @@
               title="Incorporation Date in Home Jurisdiction"
               :nudgeRight="40"
               :nudgeTop="85"
+              :persistentHint="true"
               :initialValue="getExistingBusinessInfo.homeIncorporationDate"
               :inputRules="getShowErrors ? incorporationDateRules : []"
               :maxDate="getCurrentDate"
-              @emitDateSync="business.homeIncorporationDate = $event"
+              @emitDateSync="$set(business, 'homeIncorporationDate', $event)"
             />
           </v-col>
 
@@ -252,18 +251,18 @@
 <script lang="ts">
 import { Component, Emit, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
-import { cloneDeep } from 'lodash'
 import { mask } from 'vue-the-mask'
 import { useStore } from '@/store/store'
 import { DateMixin } from '@/mixins'
-import { EmptyExistingBusinessInfoIF, ExistingBusinessInfoIF } from '@/interfaces'
+import { ExistingBusinessInfoIF } from '@/interfaces'
+import { Rules } from '@/rules'
+import { VuetifyRuleFunction } from '@/types'
 import MessageBox from '@/components/common/MessageBox.vue'
 import { Jurisdiction } from '@bcrs-shared-components/jurisdiction'
 import { DatePicker as DatePickerShared } from '@bcrs-shared-components/date-picker'
 import { JurisdictionLocation } from '@bcrs-shared-components/enums'
 import { CountriesProvincesMixin } from '@/mixins/'
 import { FormIF } from '@bcrs-shared-components/interfaces'
-import { MrasJurisdictions } from '@bcrs-shared-components/jurisdiction/list-data'
 
 @Component({
   components: {
@@ -282,28 +281,41 @@ export default class ManualBusinessInfo extends Mixins(CountriesProvincesMixin,
     incorporationDateRef: DatePickerShared
   }
 
+  readonly Rules = Rules
+
   @Getter(useStore) getCurrentDate!: string
   @Getter(useStore) getExistingBusinessInfo!: ExistingBusinessInfoIF
   @Getter(useStore) getShowErrors!: boolean
 
   @Action(useStore) setExistingBusinessInfo!: (x: ExistingBusinessInfoIF) => void
-  @Action(useStore) setShowErrors!: (x: boolean) => void
 
   // Local properties
   active = false
   business = {} as ExistingBusinessInfoIF
-  jurisdiction = null
-  isMrasJurisdiction = false
-  jurisdictionErrorMessage = ''
+  formValid = false
+
+  readonly identifyingNumberRules: Array<VuetifyRuleFunction> = [
+    (v) => !!v || 'Identifying Number is required'
+  ]
+
+  readonly businessNameRules: Array<VuetifyRuleFunction> = [
+    (v) => !!v || 'Business Name is required',
+    (v) => (v && v.length <= 1000) || 'Cannot exceed 1000 characters'
+  ]
+
+  readonly incorporationDateRules: Array<VuetifyRuleFunction> = [
+    (v) => !!v || 'Incorporation Date is required'
+  ]
+
+  get jurisdictionErrorMessage (): string {
+    return (this.getShowErrors && !this.business.homeJurisdiction) ? 'Jurisdiction is required' : ''
+  }
 
   /** Called when this component is mounted. */
   mounted (): void {
     // point business variable to Existing Business Info object from the store, if it exists
     if (this.getExistingBusinessInfo) {
       this.business = this.getExistingBusinessInfo
-    } else {
-      this.business = cloneDeep(EmptyExistingBusinessInfoIF)
-      this.setExistingBusinessInfo(this.business)
     }
 
     // if mode is MANUAL, set this component to active (which hides the other component)
@@ -313,8 +325,6 @@ export default class ManualBusinessInfo extends Mixins(CountriesProvincesMixin,
   /** Called when user clicks to enter business info manually. */
   onClick (): void {
     this.business.mode = 'MANUAL'
-    this.isMrasJurisdiction = false
-    this.jurisdiction = null
     this.active = true
   }
 
@@ -322,7 +332,6 @@ export default class ManualBusinessInfo extends Mixins(CountriesProvincesMixin,
   get jurisdictionInitialVal (): any {
     const country = this.getExistingBusinessInfo ? this.getExistingBusinessInfo.homeJurisdiction?.country : ''
     let region = ''
-    let jur = {}
 
     if (this.getExistingBusinessInfo.homeJurisdiction) {
       if (this.getExistingBusinessInfo.homeJurisdiction?.region === 'FEDERAL') {
@@ -332,25 +341,14 @@ export default class ManualBusinessInfo extends Mixins(CountriesProvincesMixin,
       }
     }
 
-    if (country && region) {
-      jur = { country, region }
-
-      // set local jurisdiction property
-      this.jurisdiction = jur || null
+    if (country && region) return { country, region }
 
-      const regions = this.getCountryRegions(country)
-      const jurisdictionText = regions.find(p => p.short === region).name
-
-      // set local property based on jurisdiction value
-      this.isMrasJurisdiction = MrasJurisdictions.includes(jurisdictionText.toLowerCase())
-    }
-
-    return jur
+    return null
   }
 
   /** Resets this component back to its initial state. */
   reset () {
-    this.business = cloneDeep(EmptyExistingBusinessInfoIF)
+    this.business = {} as ExistingBusinessInfoIF
     this.setExistingBusinessInfo(this.business)
     // set this component to inactive (which shows the other component)
     this.active = false
@@ -358,80 +356,59 @@ export default class ManualBusinessInfo extends Mixins(CountriesProvincesMixin,
 
   /** Called when Jurisdiction value has changed. */
   onJurisdictionChange (jurisdiction: any): void {
-    this.jurisdiction = jurisdiction
-    this.isMrasJurisdiction = MrasJurisdictions.includes(this.jurisdiction?.text.toLowerCase())
-
     if (jurisdiction?.group === 0) {
-      this.business.homeJurisdiction = {
+      // set property reactively (in case it was null)
+      this.$set(this.business, 'homeJurisdiction', {
         country: JurisdictionLocation.CA,
         region: (jurisdiction.value === JurisdictionLocation.FD) ? 'FEDERAL' : jurisdiction.value
-      }
+      })
     }
 
     if (jurisdiction?.group === 1) {
-      this.business.homeJurisdiction = {
+      // set property reactively (in case it was null)
+      this.$set(this.business, 'homeJurisdiction', {
         country: JurisdictionLocation.US,
         region: jurisdiction.value
-      }
+      })
     }
 
     if (jurisdiction?.group === 2) {
-      this.business.homeJurisdiction = {
+      // set property reactively (in case it was null)
+      this.$set(this.business, 'homeJurisdiction', {
         country: jurisdiction.value,
         region: ''
-      }
+      })
     }
-
-    if (this.jurisdiction) {
-      this.setShowErrors(false)
-    }
-
-    this.jurisdictionErrorMessage = this.jurisdiction ? '' : 'Home jurisdiction is required'
-  }
-
-  get identifyingNumberRules (): Array<(v: string) => boolean | string> {
-    return [
-      v => !!v || 'Identifying Number is required'
-    ]
-  }
-
-  get businessNameRules (): Array<(v: string) => boolean | string> {
-    return [
-      v => !!v || 'Business Name is required'
-    ]
-  }
-
-  get incorporationDateRules (): Array<(v: string) => boolean | string> {
-    return [
-      v => !!v || 'Incorporation Date is required'
-    ]
   }
 
+  /** Validates the form and other components. */
+  @Watch('active')
   @Watch('getShowErrors')
-  @Watch('business.homeJurisdiction')
-  @Watch('business.incorporationDate')
-  private onShowErrors (): void {
-    if (!this.jurisdiction && this.getShowErrors) {
-      this.jurisdictionErrorMessage = this.jurisdiction ? '' : 'Home jurisdiction is required'
-    }
-    if (this.jurisdiction && !this.isMrasJurisdiction && this.getShowErrors) {
-      this.$refs.manualFormRef.validate()
-      this.$refs.incorporationDateRef.validateForm()
+  private async onGetShowErrors (): Promise<void> {
+    if (this.active && this.getShowErrors) {
+      await this.$nextTick() // wait for form to finish rendering
+      this.$refs.manualFormRef?.validate()
+      this.$refs.incorporationDateRef?.validateForm()
     }
   }
 
-  @Watch('business', { deep: true })
+  /** Emits form validity. */
+  @Watch('business.homeJurisdiction')
+  @Watch('business.homeIncorporationDate')
+  @Watch('formValid')
   @Emit('valid')
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  private onComponentValid (val: boolean): boolean {
+  private onComponentValid (): boolean {
+    // this form is valid if we have the home jurisdiction (custom component)
+    // and we have the home incorporation date (custom component)
+    // and the other form (Vuetify) components are valid
     return (
       !!this.business.homeJurisdiction &&
-      !!this.business.homeIdentifier &&
-      !!this.business.homeLegalName &&
-      !!this.business.homeIncorporationDate
+      !!this.business.homeIncorporationDate &&
+      this.formValid
     )
   }
 
+  /** Emit whether we have become active or inactive. */
   @Watch('active', { immediate: true })
   @Emit('active')
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
diff --git a/src/components/ContinuationIn/SummaryBusinessHomeJurisdiction.vue b/src/components/ContinuationIn/SummaryBusinessHomeJurisdiction.vue
index d090224f6..3439827aa 100644
--- a/src/components/ContinuationIn/SummaryBusinessHomeJurisdiction.vue
+++ b/src/components/ContinuationIn/SummaryBusinessHomeJurisdiction.vue
@@ -223,15 +223,38 @@
               class="pt-4 pt-sm-0"
             >
               <ul id="continuation-authorization-file">
+                <!-- the director's affidavit file -->
+                <li v-if="isContinuationInAffidavitRequired">
+                  <template v-if="getExistingBusinessInfo.affidavitFileName">
+                    <v-icon color="primary">
+                      mdi-file-pdf-outline
+                    </v-icon>
+                    <span>{{ getExistingBusinessInfo.affidavitFileName }}</span>
+                  </template>
+                  <template v-else>
+                    <v-icon color="error">
+                      mdi-close
+                    </v-icon>
+                    <span>Missing Affidavit</span>
+                  </template>
+                </li>
+
+                <!-- the proof of authorization files -->
                 <li
                   v-for="item in getContinuationAuthorization?.files"
                   :key="item.fileKey"
                 >
-                  <v-icon color="green darken-2">
-                    mdi-check
+                  <v-icon color="primary">
+                    mdi-file-pdf-outline
                   </v-icon>
                   <span>{{ item.fileName }}</span>
                 </li>
+                <li v-if="!getContinuationAuthorization?.files?.length">
+                  <v-icon color="error">
+                    mdi-close
+                  </v-icon>
+                  <span>Missing Authorization Files</span>
+                </li>
               </ul>
             </v-col>
           </v-row>
@@ -305,6 +328,7 @@ export default class SummaryBusinessHomeJurisdiction extends Mixins(DateMixin) {
   // Getters
   @Getter(useStore) getContinuationAuthorization!: ContinuationAuthorizationIF
   @Getter(useStore) getExistingBusinessInfo!: ExistingBusinessInfoIF
+  @Getter(useStore) isContinuationInAffidavitRequired!: boolean
   @Getter(useStore) isContinuationInBusinessHomeValid!: boolean
 
   /** Whether the existing business is an extrapro. */
@@ -381,6 +405,10 @@ article:not(:last-child) {
     margin-left: 2rem;
     padding-left: 0;
 
+    li:not(:first-child) {
+      margin-top: 0.25rem;
+    }
+
     li > i {
       margin-left: -2rem;
       padding-right: 10px;
diff --git a/src/interfaces/filing-interfaces/colin-business-interface.ts b/src/interfaces/filing-interfaces/colin-business-interface.ts
index 3a790bb0b..bbfa9bb35 100644
--- a/src/interfaces/filing-interfaces/colin-business-interface.ts
+++ b/src/interfaces/filing-interfaces/colin-business-interface.ts
@@ -1,3 +1,6 @@
+/**
+ * The data object from the COLIN Fetch Public Business call.
+ */
 export interface ColinBusinessIF {
   businessNumber: string // aka tax id
   corpState: string // not used
diff --git a/src/interfaces/store-interfaces/state-interfaces/existing-business-info-interface.ts b/src/interfaces/store-interfaces/state-interfaces/existing-business-info-interface.ts
index 565a7c007..c65aa605c 100644
--- a/src/interfaces/store-interfaces/state-interfaces/existing-business-info-interface.ts
+++ b/src/interfaces/store-interfaces/state-interfaces/existing-business-info-interface.ts
@@ -20,17 +20,3 @@ export interface ExistingBusinessInfoIF {
   status?: EntityStates // only used by UI
   taxId?: string
 }
-
-// *** TODO: delete this if not used
-export const EmptyExistingBusinessInfoIF: ExistingBusinessInfoIF = {
-  homeJurisdiction: {
-    country: '',
-    region: ''
-  },
-  homeIdentifier: '',
-  homeIncorporationDate: '',
-  homeLegalName: '',
-  mode: null,
-  status: null,
-  taxId: ''
-}
diff --git a/src/mixins/filing-template-mixin.ts b/src/mixins/filing-template-mixin.ts
index 25cd694b9..6c4531f52 100644
--- a/src/mixins/filing-template-mixin.ts
+++ b/src/mixins/filing-template-mixin.ts
@@ -458,13 +458,14 @@ export default class FilingTemplateMixin extends Mixins(AmalgamationMixin, DateM
         affidavitFileKey: continuationIn.foreignJurisdiction.affidavitFileKey,
         affidavitFileName: continuationIn.foreignJurisdiction.affidavitFileName,
         affidavitFileUrl: continuationIn.foreignJurisdiction.affidavitFileUrl,
-        bcFoundingDate: this.dateToYyyyMmDd(foundingDate), // FUTURE: need fallback to null?
-        bcIdentifier: continuationIn.business?.identifier, // FUTURE: need fallback to null?
-        bcLegalName: continuationIn.business?.legalName, // FUTURE: need fallback to null?
-        homeJurisdiction: {
+        bcFoundingDate: this.dateToYyyyMmDd(foundingDate),
+        bcIdentifier: continuationIn.business?.identifier,
+        bcLegalName: continuationIn.business?.legalName,
+        // store homeJurisdiction as null if not saved
+        homeJurisdiction: continuationIn.foreignJurisdiction.country ? {
           country: continuationIn.foreignJurisdiction.country,
           region: continuationIn.foreignJurisdiction.region
-        },
+        } : null,
         homeIdentifier: continuationIn.foreignJurisdiction.identifier,
         homeIncorporationDate: continuationIn.foreignJurisdiction.incorporationDate,
         homeLegalName: continuationIn.foreignJurisdiction.legalName,
diff --git a/src/store/state/state-model.ts b/src/store/state/state-model.ts
index ac47dc41d..a89de7b1a 100644
--- a/src/store/state/state-model.ts
+++ b/src/store/state/state-model.ts
@@ -5,6 +5,7 @@ import {
   EmptyNameRequest,
   EmptyOfficer,
   EmptyNaics,
+  ExistingBusinessInfoIF,
   StateModelIF
 } from '@/interfaces'
 import { EmptyAddress } from '@bcrs-shared-components/interfaces'
@@ -217,7 +218,7 @@ export const stateModel: StateModelIF = {
   continuationIn: {
     businessHomeValid: false,
     continuationAuthorization: null,
-    existingBusinessInfo: null
+    existingBusinessInfo: {} as ExistingBusinessInfoIF
   },
   restoration: {
     applicationDate: null,
diff --git a/src/store/store.ts b/src/store/store.ts
index 7fbda3aa3..3eb0f84d5 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -15,7 +15,10 @@ import {
   RelationshipTypes,
   RestorationTypes
 } from '@/enums'
-import { CorrectNameOptions } from '@bcrs-shared-components/enums/'
+import {
+  CorrectNameOptions,
+  JurisdictionLocation
+} from '@bcrs-shared-components/enums/'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 import {
   AccountInformationIF,
@@ -199,14 +202,32 @@ export const useStore = defineStore('store', {
       return this.stateModel.entityType
     },
 
+    /** The continuation in Continuation Authorization object. */
     getContinuationAuthorization (): ContinuationAuthorizationIF {
       return this.getContinuationIn.continuationAuthorization
     },
 
+    /** The continuation in Existing Business Info object. */
     getExistingBusinessInfo (): ExistingBusinessInfoIF {
       return this.getContinuationIn.existingBusinessInfo
     },
 
+    /**
+     * Whether a continuation in Director's Affidavit is required.
+     * Is true if the business is a Continued In ULC from Alberta or Nova Scotia.
+     */
+    isContinuationInAffidavitRequired (): boolean {
+      const homeJurisdiction = this.getExistingBusinessInfo?.homeJurisdiction
+      return (
+        this.isTypeUlcContinueIn &&
+        (homeJurisdiction?.country === JurisdictionLocation.CA) &&
+        (
+          homeJurisdiction?.region === 'AB' ||
+          homeJurisdiction?.region === 'NS'
+        )
+      )
+    },
+
     /** The account folio number. */
     getFolioNumber (): string {
       return this.stateModel.tombstone.folioNumber
@@ -704,9 +725,9 @@ export const useStore = defineStore('store', {
      * TODO: Add all the remaining checks when all components are in place.
      */
     isContinuationInValid (): boolean {
-      const isCertifyValid = this.getCertifyState.valid && !!this.getCertifyState.certifiedBy
       const isEffectiveDateTimeValid = this.getEffectiveDateTime.valid
-      const isFolioNumberValid = !this.isPremiumAccount || this.getFolioNumberValid
+      const isCertifyValid = this.getCertifyState.valid && !!this.getCertifyState.certifiedBy
+      const isCourtOrderValid = this.isRoleStaff ? this.getCourtOrderStep.valid : true
       const isStaffPaymentValid = this.isRoleStaff ? this.getStaffPaymentStep.valid : true
 
       return (
@@ -714,9 +735,9 @@ export const useStore = defineStore('store', {
         this.isDefineCompanyValid &&
         this.isAddPeopleAndRolesValid &&
         this.isCreateShareStructureValid &&
-        isCertifyValid &&
         isEffectiveDateTimeValid &&
-        isFolioNumberValid &&
+        isCertifyValid &&
+        isCourtOrderValid &&
         isStaffPaymentValid
       )
     },
diff --git a/src/utils/feature-flag-utils.ts b/src/utils/feature-flag-utils.ts
index e5ccf3b2a..f90b81e6d 100644
--- a/src/utils/feature-flag-utils.ts
+++ b/src/utils/feature-flag-utils.ts
@@ -13,7 +13,8 @@ const defaultFlagSet: LDFlagSet = {
   'enable-web-chat': false, // by default, old webchat is disabled
   'enable-genesys-web-message': false, // by default, genesys web message is disabled
   'sentry-enable': false, // by default, no sentry logs
-  'banner-text': '' // by default, there is no banner text
+  'banner-text': '', // by default, there is no banner text
+  'show-business-search-status': false // by default, don't show status in results
 }
 
 /**
diff --git a/src/views/ContinuationIn/ContinuationInBusinessHome.vue b/src/views/ContinuationIn/ContinuationInBusinessHome.vue
index 724bb58bd..c7c38e836 100644
--- a/src/views/ContinuationIn/ContinuationInBusinessHome.vue
+++ b/src/views/ContinuationIn/ContinuationInBusinessHome.vue
@@ -2,7 +2,7 @@
   <div id="continuation-in-business-home">
     <!-- Existing Business Information -->
     <section class="mt-10">
-      <header id="existing-Business-information">
+      <header id="existing-business-information">
         <h2>Existing Business Information</h2>
         <p class="mt-4">
           Enter information about your existing business. If your company is extraprovincially registered
@@ -132,7 +132,7 @@ export default class ContinuationInBusinessHome extends Mixins(CommonMixin, Name
   @Watch('$route')
   private async scrollToInvalidComponent (): Promise<void> {
     if (this.getShowErrors && this.$route.name === RouteNames.CONTINUATION_IN_BUSINESS_HOME) {
-      // scroll to invalid components
+      // scroll to invalid section
       await this.$nextTick()
       await this.validateAndScroll(this.validFlags, this.validComponents)
     }
diff --git a/src/views/ContinuationIn/ContinuationInReviewConfirm.vue b/src/views/ContinuationIn/ContinuationInReviewConfirm.vue
index 8b176074f..97af7adc7 100644
--- a/src/views/ContinuationIn/ContinuationInReviewConfirm.vue
+++ b/src/views/ContinuationIn/ContinuationInReviewConfirm.vue
@@ -167,8 +167,7 @@
         flat
         class="mt-6"
       >
-        <div>** Court Order / POA component goes here **</div>
-        <!-- <CourtOrderPoa
+        <CourtOrderPoa
           class="py-8 px-6"
           :class="{ 'invalid-section': isCourtOrderInvalid }"
           :draftCourtOrderNumber="getCourtOrderStep.courtOrder.fileNumber"
@@ -178,7 +177,7 @@
           @emitCourtNumber="setCourtOrderFileNumber($event)"
           @emitPoa="setHasPlanOfArrangement($event)"
           @emitValid="setCourtOrderValidity($event)"
-        /> -->
+        />
       </v-card>
     </section>
 
@@ -207,7 +206,7 @@
 import { Component, Vue } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { useStore } from '@/store/store'
-import { ContactPointIF, CertifyIF, EffectiveDateTimeIF, ShareStructureIF } from '@/interfaces'
+import { ContactPointIF, CertifyIF, EffectiveDateTimeIF, ShareStructureIF, CourtOrderStepIF } from '@/interfaces'
 import CardHeader from '@/components/common/CardHeader.vue'
 import Certify from '@/components/common/Certify.vue'
 import { DocumentDelivery } from '@bcrs-shared-components/document-delivery'
@@ -218,13 +217,13 @@ import SummaryBusinessHomeJurisdiction from '@/components/ContinuationIn/Summary
 import SummaryDefineCompany from '@/components/common/SummaryDefineCompany.vue'
 import StaffPayment from '@/components/common/StaffPayment.vue'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
-// import { CourtOrderPoa } from '@bcrs-shared-components/court-order-poa'
+import { CourtOrderPoa } from '@bcrs-shared-components/court-order-poa'
 
 @Component({
   components: {
     CardHeader,
     Certify,
-    // CourtOrderPoa,
+    CourtOrderPoa,
     DocumentDelivery,
     EffectiveDateTime,
     ListPeopleAndRoles,
@@ -237,15 +236,17 @@ import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp
 export default class ContinuationInReviewConfirm extends Vue {
   @Getter(useStore) getBusinessContact!: ContactPointIF
   @Getter(useStore) getCertifyState!: CertifyIF
+  @Getter(useStore) getCourtOrderStep!: CourtOrderStepIF
   @Getter(useStore) getCreateShareStructureStep!: ShareStructureIF
   @Getter(useStore) getEffectiveDateTime!: EffectiveDateTimeIF
   @Getter(useStore) getEntityType!: CorpTypeCd
   @Getter(useStore) getUserEmail!: string
   @Getter(useStore) getValidateSteps!: boolean
-  @Getter(useStore) isPremiumAccount!: boolean
   @Getter(useStore) isRoleStaff!: boolean
 
   @Action(useStore) setCertifyState!: (x: CertifyIF) => void
+  @Action(useStore) setCourtOrderFileNumber!: (x: string) => void
+  @Action(useStore) setCourtOrderValidity!: (x: boolean) => void
   @Action(useStore) setEffectiveDate!: (x: Date) => void
   @Action(useStore) setEffectiveDateTimeValid!: (x: boolean) => void
   @Action(useStore) setHasPlanOfArrangement!: (x: boolean) => void
@@ -276,6 +277,11 @@ export default class ContinuationInReviewConfirm extends Vue {
   get isCertifyInvalid (): boolean {
     return this.getValidateSteps && !(this.getCertifyState.certifiedBy && this.getCertifyState.valid)
   }
+
+  /** Is true when the Court Order conditions are not met. */
+  get isCourtOrderInvalid (): boolean {
+    return (this.getValidateSteps && !this.getCourtOrderStep.valid)
+  }
 }
 </script>
 
diff --git a/tests/unit/ContinuationInReviewConfirm.spec.ts b/tests/unit/ContinuationInReviewConfirm.spec.ts
index 9e8642ef9..69086c58a 100644
--- a/tests/unit/ContinuationInReviewConfirm.spec.ts
+++ b/tests/unit/ContinuationInReviewConfirm.spec.ts
@@ -13,7 +13,7 @@ import { CourtOrderPoa } from '@bcrs-shared-components/court-order-poa'
 import StaffPayment from '@/components/common/StaffPayment.vue'
 
 describe('Continuation In Review Confirm component', () => {
-  it('renders the component correctly - first section', async () => {
+  it('renders the component correctly - Review and Confirm section', async () => {
     const wrapper = wrapperFactory(ContinuationInReviewConfirm)
     await Vue.nextTick()
 
@@ -41,7 +41,7 @@ describe('Continuation In Review Confirm component', () => {
     wrapper.destroy()
   })
 
-  it('renders the component correctly - second section', async () => {
+  it('renders the component correctly - Continuation Effective Date and Time section', async () => {
     const wrapper = wrapperFactory(ContinuationInReviewConfirm)
     await Vue.nextTick()
 
@@ -58,7 +58,7 @@ describe('Continuation In Review Confirm component', () => {
     wrapper.destroy()
   })
 
-  it('renders the component correctly - third section', async () => {
+  it('renders the component correctly - Document Delivery section', async () => {
     const wrapper = wrapperFactory(ContinuationInReviewConfirm)
     await Vue.nextTick()
 
@@ -75,7 +75,7 @@ describe('Continuation In Review Confirm component', () => {
     wrapper.destroy()
   })
 
-  it('renders the component correctly - fourth section', async () => {
+  it('renders the component correctly - Certify section', async () => {
     const wrapper = wrapperFactory(ContinuationInReviewConfirm)
     await Vue.nextTick()
 
@@ -92,7 +92,7 @@ describe('Continuation In Review Confirm component', () => {
     wrapper.destroy()
   })
 
-  it.skip('renders the component correctly - fifth section', async () => {
+  it('renders the component correctly - Court Order / POA section', async () => {
     const wrapper = wrapperFactory(
       ContinuationInReviewConfirm,
       null,
@@ -119,7 +119,7 @@ describe('Continuation In Review Confirm component', () => {
     wrapper.destroy()
   })
 
-  it('renders the component correctly - sixth section', async () => {
+  it('renders the component correctly - Staff Payment section', async () => {
     const wrapper = wrapperFactory(
       ContinuationInReviewConfirm,
       null,