From b841af32308055f543da026fef038bf5cac514db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9verin=20Beauvais?=
 <severinbeauvais@users.noreply.github.com>
Date: Tue, 1 Oct 2024 15:01:32 -0700
Subject: [PATCH] 23353 POC for new continuation in design (#734)

* - app version = 5.12.0
- generalized page blurb functionality
- always show fee summary
- added special case for page header
- added special case for fee summary label
- added special route checks for continuation in authorization vs application
- added special continuation in authorization steps
- added special case for file and pay button label (submit vs resubmit)
- added special cases for validation in file and pay method
- added special case for no payment
- reverted Effective Date Time radio labels
- updated file upload error messages
- renamed ContinuationInBusinessHome -> ContinuationInAuthorizationPage
- added file name validation for ISO-8859-1 encoding
- renamed ContinuationAuthorization -> AuthorizationProof
- added filename ISO8859-1 encoding check
- updated misc existing business information layout, labels, etc
- removed confirmation checkbox
- cleaned up summary page
- fixed alignment on summary page
- renamed some getters
- added special case for dialog filing title
- renamed route + view + enums + getters + interfaces
- added special case for no fee when restoring draft
- added page blurbs to continuation in resource files
- separated auth step from the rest
- renumbered steps + hide stepper for step 0
- deleted obsolete dissolution resource objects
- added some store getters
- added Authorization Contact Information to step 0 page
- updated continuation in authorization page validation
- added special case to show pages errors and scroll properly
- removed draft-only checks on FED and staff payment components
- updated/added unit tests

* - temporary status override bypass for testing

* - improved button layout

---------

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>
---
 package-lock.json                             |  40 +++-
 package.json                                  |   4 +-
 src/App.vue                                   |  78 +++++--
 ...thorization.vue => AuthorizationProof.vue} |  29 ++-
 .../ContinuationIn/ExtraproRegistration.vue   | 153 ++------------
 .../ContinuationIn/ManualBusinessInfo.vue     | 190 +++++-------------
 .../SummaryBusinessHomeJurisdiction.vue       |  45 +----
 .../Dissolution/CustodianOfRecords.vue        |   8 +-
 src/components/common/Actions.vue             |  27 ++-
 src/components/common/EffectiveDateTime.vue   |   6 +-
 src/components/common/FileUploadPreview.vue   |   4 +-
 src/components/common/Stepper.vue             |   4 +-
 src/dialogs/SaveErrorDialog.vue               |  20 +-
 src/enums/routeNames.ts                       |   2 +-
 src/enums/views.ts                            |   2 +-
 .../filing-interfaces/filing-interfaces.ts    |   5 +-
 src/interfaces/index.ts                       |   2 +-
 .../resource-interfaces/resource-interface.ts |   2 +
 ...ce.ts => authorization-proof-interface.ts} |   2 +-
 .../continuation-in-state-interface.ts        |   7 +-
 .../existing-business-info-interface.ts       |   1 -
 src/mixins/filing-template-mixin.ts           |  27 ++-
 src/resources/ContinuationIn/C.ts             |   5 +-
 src/resources/ContinuationIn/CBEN.ts          |   2 +
 src/resources/ContinuationIn/CCC.ts           |   2 +
 src/resources/ContinuationIn/CUL.ts           |   2 +
 src/resources/ContinuationIn/steps.ts         |  35 ++--
 src/resources/Dissolution/GP.ts               |  48 +----
 src/resources/Dissolution/SP.ts               |  48 +----
 src/router/routes/continuation-in-routes.ts   |  21 +-
 src/store/state/state-model.ts                |   4 +-
 src/store/store.ts                            |  82 +++++---
 ...me.vue => ContinuationInAuthorization.vue} | 102 +++++++---
 .../ContinuationInReviewConfirm.vue           |  17 +-
 .../DissolutionDefineDissolution.vue          |  16 +-
 src/views/index.ts                            |   2 +-
 tests/unit/Actions.spec.ts                    |  35 +++-
 ...ion.spec.ts => AuthorizationProof.spec.ts} |  16 +-
 .../unit/ContinuationInAuthorization.spec.ts  |  38 ++++
 tests/unit/ContinuationInBusinessHome.spec.ts |  30 ---
 .../unit/ContinuationInReviewConfirm.spec.ts  |  33 ---
 tests/unit/FileUploadPreview.spec.ts          |   2 +-
 .../SummaryBusinessHomeJurisdiction.spec.ts   |  12 +-
 43 files changed, 537 insertions(+), 673 deletions(-)
 rename src/components/ContinuationIn/{ContinuationAuthorization.vue => AuthorizationProof.vue} (92%)
 rename src/interfaces/store-interfaces/state-interfaces/{continuation-authorization-interface.ts => authorization-proof-interface.ts} (73%)
 rename src/views/ContinuationIn/{ContinuationInBusinessHome.vue => ContinuationInAuthorization.vue} (55%)
 rename tests/unit/{ContinuationAuthorization.spec.ts => AuthorizationProof.spec.ts} (82%)
 create mode 100644 tests/unit/ContinuationInAuthorization.spec.ts
 delete mode 100644 tests/unit/ContinuationInBusinessHome.spec.ts

diff --git a/package-lock.json b/package-lock.json
index ddc13310a..ec3d6ad30 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "business-create-ui",
-  "version": "5.11.26",
+  "version": "5.12.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "business-create-ui",
-      "version": "5.11.26",
+      "version": "5.12.0",
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
         "@bcrs-shared-components/approval-type": "1.1.2",
@@ -20,7 +20,7 @@
         "@bcrs-shared-components/corp-type-module": "1.0.16",
         "@bcrs-shared-components/correct-name": "1.0.55",
         "@bcrs-shared-components/court-order-poa": "3.0.11",
-        "@bcrs-shared-components/date-picker": "1.3.1",
+        "@bcrs-shared-components/date-picker": "1.3.3",
         "@bcrs-shared-components/document-delivery": "1.2.0",
         "@bcrs-shared-components/effective-date-time": "1.1.15",
         "@bcrs-shared-components/enums": "1.1.11",
@@ -410,12 +410,36 @@
       }
     },
     "node_modules/@bcrs-shared-components/date-picker": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/date-picker/-/date-picker-1.3.1.tgz",
-      "integrity": "sha512-cwz7Mz4OAvGvWg6gmVbnIu8USi58zcQHh4tnUg+JfZf8o5VGv4sCWcTQjAVMTCtMrY6a7aQ6zrzUDY4cKahRRQ==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/date-picker/-/date-picker-1.3.3.tgz",
+      "integrity": "sha512-s69gYHbd0XdtLqw+GUfQhHCeTR5abqXUoG5bzZ0ompoZ0zMFuAYIGe+u4DrruVhh7GhyeUu0pKjv7wbHuzzs8g==",
       "dependencies": {
-        "@bcrs-shared-components/interfaces": "^1.1.15",
-        "@bcrs-shared-components/mixins": "^1.1.46",
+        "@bcrs-shared-components/interfaces": "^1.1.16",
+        "@bcrs-shared-components/mixins": "^1.1.47",
+        "vue": "^2.7.14"
+      }
+    },
+    "node_modules/@bcrs-shared-components/date-picker/node_modules/@bcrs-shared-components/interfaces": {
+      "version": "1.1.16",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.1.16.tgz",
+      "integrity": "sha512-RxmR+6W6t0lRkDGVb4VEHfEqgK76pk42LaJn36aSrd/hNIMfxgHEAqPT21zBJ5on5rvWzFMBemp3hV6DyUTw8Q==",
+      "dependencies": {
+        "@bcrs-shared-components/corp-type-module": "^1.0.16",
+        "@bcrs-shared-components/enums": "^1.1.11",
+        "vue": "^2.7.14"
+      }
+    },
+    "node_modules/@bcrs-shared-components/date-picker/node_modules/@bcrs-shared-components/mixins": {
+      "version": "1.1.47",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/mixins/-/mixins-1.1.47.tgz",
+      "integrity": "sha512-EMlf5F+//0GaEaHnISSLi+Hqbo1hpIdP02nUfP/FoiF79Me0fL4B54mkJFQMsh1kepJewkh2dA4Sm0GUzBnUsw==",
+      "dependencies": {
+        "@bcrs-shared-components/corp-type-module": "^1.0.16",
+        "@bcrs-shared-components/enums": "^1.1.11",
+        "@bcrs-shared-components/interfaces": "^1.1.16",
+        "country-list": "^2.3.0",
+        "lodash": "4.17.21",
+        "provinces": "^1.11.0",
         "vue": "^2.7.14"
       }
     },
diff --git a/package.json b/package.json
index a012dbc30..df5e43fc7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-create-ui",
-  "version": "5.11.26",
+  "version": "5.12.0",
   "private": true,
   "appName": "Create UI",
   "sbcName": "SBC Common Components",
@@ -25,7 +25,7 @@
     "@bcrs-shared-components/corp-type-module": "1.0.16",
     "@bcrs-shared-components/correct-name": "1.0.55",
     "@bcrs-shared-components/court-order-poa": "3.0.11",
-    "@bcrs-shared-components/date-picker": "1.3.1",
+    "@bcrs-shared-components/date-picker": "1.3.3",
     "@bcrs-shared-components/document-delivery": "1.2.0",
     "@bcrs-shared-components/effective-date-time": "1.1.15",
     "@bcrs-shared-components/enums": "1.1.11",
diff --git a/src/App.vue b/src/App.vue
index 0e222e4a6..91fdc94a2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -167,11 +167,10 @@
               </header>
 
               <p
-                v-if="isFirmDissolution"
+                v-if="getPageBlurb"
                 class="mt-4"
               >
-                Confirm the following information, select the dissolution date and certify
-                your dissolution before filing.
+                {{ getPageBlurb }}
               </p>
 
               <Stepper
@@ -199,9 +198,8 @@
               cols="12"
               lg="3"
             >
-              <!-- Render fee summary only after data is loaded, -->
-              <!-- and if this isn't a change-requested filing. -->
-              <aside v-if="haveData && getFilingStatus !== FilingStatus.CHANGE_REQUESTED">
+              <!-- Render fee summary only after data is loaded. -->
+              <aside v-if="haveData">
                 <affix
                   relative-element-selector=".col-lg-9"
                   :offset="{ top: 100, bottom: -100 }"
@@ -273,6 +271,7 @@ import { EntityStates, ErrorTypes, FilingCodes, FilingNames, FilingStatus, Filin
   StaffPaymentOptions } from '@/enums'
 import { SessionStorageKeys } from 'sbc-common-components/src/util/constants'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
+import { ContinuationInStepsAuthorization } from './resources/ContinuationIn/steps'
 
 @Component({
   components: {
@@ -302,6 +301,7 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
   @Getter(useStore) getFilingType!: FilingTypes
   @Getter(useStore) getHaveChanges!: boolean
   @Getter(useStore) getOrgInformation!: OrgInformationIF
+  @Getter(useStore) getPageBlurb!: string
   @Getter(useStore) getSteps!: Array<StepIF>
   @Getter(useStore) getUserFirstName!: string
   @Getter(useStore) getUserLastName!: string
@@ -310,6 +310,8 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
   // @Getter(useStore) isAmalgamationFilingHorizontal!: boolean
   // @Getter(useStore) isAmalgamationFilingRegular!: boolean
   // @Getter(useStore) isAmalgamationFilingVertical!: boolean
+  @Getter(useStore) isAuthorizationStatus!: boolean
+  // @Getter(useStore) isContinuationInAuthorization!: boolean
   @Getter(useStore) isContinuationInFiling!: boolean
   @Getter(useStore) isDissolutionFiling!: boolean
   @Getter(useStore) isIncorporationFiling!: boolean
@@ -417,9 +419,10 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
       return `${this.getFilingName} (Horizontal Short-form)`
     } else if (this.isAmalgamationFilingVertical) {
       return `${this.getFilingName} (Vertical Short-form)`
-    } else {
-      return this.getFilingName
+    } else if (this.isContinuationInAuthorization) {
+      return 'Continuation Authorization'
     }
+    return this.getFilingName
   }
 
   /** Data for fee summary component. */
@@ -475,15 +478,14 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
     )
   }
 
-  /** Whether the current filing is a firm dissolution. */
-  get isFirmDissolution (): boolean {
-    return (this.isEntityFirm && this.isDissolutionFiling)
-  }
-
-  /** The fee summary filing label. */
+  /** The (optional) fee summary filing label. */
   get filingLabel (): string {
-    // text override for firm dissolutions
-    return this.isFirmDissolution ? 'Dissolution' : null
+    // special case for firm dissolutions
+    if (this.isEntityFirm && this.isDissolutionFiling) return 'Dissolution'
+    // special case for continuation in authorizations
+    if (this.isContinuationInAuthorization) return 'Continuation Authorization'
+    // otherwise, no special label
+    return null
   }
 
   /** The About text. */
@@ -771,6 +773,24 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
         await this.loadPartiesInformation(this.getBusinessId)
       }
 
+      // special route checks for Continuation In filing
+      if (this.isContinuationInFiling) {
+        if (this.isAuthorizationStatus) {
+          // make sure user is on the Continuation In Authorization route
+          if (this.$route.name !== RouteNames.CONTINUATION_IN_AUTHORIZATION) {
+            this.$router.replace(RouteNames.CONTINUATION_IN_AUTHORIZATION).catch(() => {})
+            return
+          }
+        } else {
+          // make sure user is on Continuation In Business BC route
+          if (this.$route.name !== RouteNames.CONTINUATION_IN_BUSINESS_BC) {
+            this.$router.replace(RouteNames.CONTINUATION_IN_BUSINESS_BC).catch(() => {})
+            return
+          }
+        }
+      }
+
+      // default route check:
       // if user is on a route not valid for the current filing type
       // then try to re-route them
       if (this.$route.meta.filingType !== this.getFilingType) {
@@ -785,8 +805,8 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
             }
             return
           case FilingTypes.CONTINUATION_IN:
-            this.$router.replace(RouteNames.CONTINUATION_IN_BUSINESS_HOME).catch(() => {})
-            return
+            // should never get here -- already handled above
+            throw new Error('Invalid code path for Continuation In')
           case FilingTypes.DISSOLUTION:
             if (this.isEntityFirm) {
               this.$router.replace(RouteNames.DISSOLUTION_FIRM).catch(() => {})
@@ -867,7 +887,9 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
     // NB: will throw if API error
     let draftFiling = await LegalServices.fetchFirstTask(businessId)
 
+    // set filing type and status
     this.setFilingType(draftFiling.header.name)
+    this.setFilingStatus(draftFiling.header.status)
 
     // check if filing is in a valid state to be edited
     this.filingNotExistDialog = (draftFiling?.header?.status !== FilingStatus.DRAFT)
@@ -924,13 +946,19 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
     // NB: will throw if API error
     let draftFiling = await LegalServices.fetchFirstOrOnlyFiling(tempId)
 
+    // set filing type and status
     this.setFilingType(draftFiling.header.name)
     this.setFilingStatus(draftFiling.header.status)
+    // *** TODO: remove after testing
+    if (draftFiling.header.status === FilingStatus.CHANGE_REQUESTED) {
+      this.setFilingStatus(FilingStatus.APPROVED)
+    }
 
     // check if filing is in a valid state to be edited
     this.filingNotExistDialog = (
       draftFiling?.header?.status !== FilingStatus.DRAFT &&
-      draftFiling?.header?.status !== FilingStatus.CHANGE_REQUESTED
+      draftFiling?.header?.status !== FilingStatus.CHANGE_REQUESTED &&
+      draftFiling?.header?.status !== FilingStatus.APPROVED
     )
     if (this.filingNotExistDialog) return null // don't continue
 
@@ -958,6 +986,10 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
         }
         this.parseContinuationInDraft(draftFiling)
         resources = ContinuationInResources.find(x => x.entityType === this.getEntityType) as ResourceIF
+        // special case for Continuation In Authorizations
+        if (this.isAuthorizationStatus) {
+          resources.steps = ContinuationInStepsAuthorization
+        }
         break
       case FilingTypes.INCORPORATION_APPLICATION:
         draftFiling = {
@@ -1320,7 +1352,10 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
     }
   }
 
-  /** Called initially and when $route property changes (ie, on step changes). */
+  /**
+   * Called when $route property changes (ie, on step changes).
+   * Is also called initially without needing { immediate: true }.
+   */
   @Watch('$route', { immediate: false })
   private async onRouteChanged (): Promise<void> {
     // init only if we are not on signin or signout route
@@ -1368,7 +1403,8 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
       this.setShowErrors(true)
     }
 
-    // enable validation right away if user is changing a submitted filing
+    // enable validation right away if user is editing a submitted filing
+    // used for continuation in filings only atm
     if (this.getFilingStatus === FilingStatus.CHANGE_REQUESTED) {
       this.setShowErrors(true)
     }
diff --git a/src/components/ContinuationIn/ContinuationAuthorization.vue b/src/components/ContinuationIn/AuthorizationProof.vue
similarity index 92%
rename from src/components/ContinuationIn/ContinuationAuthorization.vue
rename to src/components/ContinuationIn/AuthorizationProof.vue
index 17cc6d078..7c91f0c23 100644
--- a/src/components/ContinuationIn/ContinuationAuthorization.vue
+++ b/src/components/ContinuationIn/AuthorizationProof.vue
@@ -5,7 +5,7 @@
   -->
   <div
     v-if="authorization"
-    id="continuation-authorization"
+    id="authorization-proof"
   >
     <!-- Authorization Date -->
     <v-card
@@ -200,7 +200,7 @@ import { Action, Getter } from 'pinia-class'
 import { StatusCodes } from 'http-status-codes'
 import { useStore } from '@/store/store'
 import { DocumentMixin } from '@/mixins'
-import { ContinuationAuthorizationIF, ExistingBusinessInfoIF, PresignedUrlIF } from '@/interfaces'
+import { AuthorizationProofIF, ExistingBusinessInfoIF, PresignedUrlIF } from '@/interfaces'
 import { FilingStatus } from '@/enums'
 import { VuetifyRuleFunction } from '@/types'
 import FileUploadPreview from '@/components/common/FileUploadPreview.vue'
@@ -218,24 +218,24 @@ import MessageBox from '@/components/common/MessageBox.vue'
     AutoResize
   }
 })
-export default class ExtraproRegistration extends Mixins(DocumentMixin) {
+export default class AuthorizationProof extends Mixins(DocumentMixin) {
   // Refs
   $refs!: {
     authorizationDateRef: DatePickerShared,
     fileUploadPreview: FileUploadPreview
   }
 
-  @Getter(useStore) getContinuationAuthorization!: ContinuationAuthorizationIF
+  @Getter(useStore) getContinuationInAuthorizationProof!: AuthorizationProofIF
   @Getter(useStore) getCurrentDate!: string
   @Getter(useStore) getExistingBusinessInfo!: ExistingBusinessInfoIF
   @Getter(useStore) getFilingStatus!: FilingStatus
   @Getter(useStore) getKeycloakGuid!: string
   @Getter(useStore) getShowErrors!: boolean
 
-  @Action(useStore) setContinuationAuthorization!: (x: ContinuationAuthorizationIF) => void
+  @Action(useStore) setContinuationAuthorization!: (x: AuthorizationProofIF) => void
 
   // Local properties
-  authorization = null as ContinuationAuthorizationIF
+  authorization = null as AuthorizationProofIF
   authorizationDateValid = false
   fileValidity = false
   customErrorMessage = ''
@@ -302,8 +302,8 @@ export default class ExtraproRegistration extends Mixins(DocumentMixin) {
 
   /** Called when this component is mounted. */
   mounted (): void {
-    this.authorization = this.getContinuationAuthorization ||
-      { files: [], date: null } as ContinuationAuthorizationIF
+    this.authorization = this.getContinuationInAuthorizationProof ||
+      { files: [], date: null } as AuthorizationProofIF
   }
 
   /** When user has clicked the Add button, opens the file selection dialog. */
@@ -334,6 +334,12 @@ export default class ExtraproRegistration extends Mixins(DocumentMixin) {
    * @param file the file to add
    */
   async onFileSelected (file: File): Promise<void> {
+    /** Returns True if given string contains only Latin 1 (ie, ISO8859-1) characters. */
+    function isValidLatin1 (str: string): boolean {
+      // eslint-disable-next-line no-control-regex
+      return !/[^\u0000-\u00ff]/g.test(str)
+    }
+
     // verify that file is specified and is valid
     if (file && this.fileValidity) {
       // verify that file doesn't already exist
@@ -343,6 +349,13 @@ export default class ExtraproRegistration extends Mixins(DocumentMixin) {
         return // don't add to array
       }
 
+      // verify file name encoding
+      if (!isValidLatin1(file.name)) {
+        // put file uploader into manual error mode by setting custom error message
+        this.customErrorMessage = 'Invalid character in file name.'
+        return // don't add to array
+      }
+
       // try to upload to Minio
       let psu: PresignedUrlIF
       try {
diff --git a/src/components/ContinuationIn/ExtraproRegistration.vue b/src/components/ContinuationIn/ExtraproRegistration.vue
index b5045e322..76ccb4225 100644
--- a/src/components/ContinuationIn/ExtraproRegistration.vue
+++ b/src/components/ContinuationIn/ExtraproRegistration.vue
@@ -88,7 +88,6 @@
         v-model="formValid"
         @submit.prevent
       >
-        <!-- Home Jurisdiction -->
         <v-row
           class="mt-8"
           no-gutters
@@ -97,97 +96,58 @@
             cols="12"
             sm="3"
           >
-            <label>Home Jurisdiction Information</label>
+            <label>Previous Jurisdiction Information</label>
+            <p class="mt-2 font-15">
+              The legal authority or region where your business was originally registered or where it
+              previously operated.
+            </p>
           </v-col>
 
           <v-col
             cols="12"
             sm="9"
           >
+            <!-- message box -->
+            <MessageBox color="gold">
+              <strong>Important:</strong> Make sure this information is identical to the current information
+              in your previous jurisdiction.
+            </MessageBox>
+
+            <!-- Home Jurisdiction -->
             <Jurisdiction
-              class="home-jurisdiction"
+              class="home-jurisdiction mt-6"
               :showUsaJurisdictions="true"
               label="Home Jurisdiction"
               :initialValue="business.homeJurisdiction"
               :errorMessages="jurisdictionErrorMessage"
               @change="onJurisdictionChange($event)"
             />
-          </v-col>
-        </v-row>
-
-        <!-- Identifying Number in Home Jurisdiction -->
-        <v-row
-          class="mt-6"
-          no-gutters
-        >
-          <v-col
-            cols="12"
-            sm="3"
-          >
-            <!-- empty column -->
-          </v-col>
 
-          <v-col
-            cols="12"
-            sm="9"
-          >
+            <!-- Identifying Number in Home Jurisdiction -->
             <v-text-field
               v-model.trim="business.homeIdentifier"
-              class="identifying-number-home"
+              class="identifying-number-home mt-6"
               filled
               hide-details="auto"
               label="Identifying Number in Home Jurisdiction"
               :rules="getShowErrors ? homeIdentifierRules : []"
             />
-          </v-col>
-        </v-row>
 
-        <!-- Name in Home Jurisdiction -->
-        <v-row
-          class="mt-6"
-          no-gutters
-        >
-          <v-col
-            cols="12"
-            sm="3"
-          >
-            <!-- empty column -->
-          </v-col>
-
-          <v-col
-            cols="12"
-            sm="9"
-          >
+            <!-- Name in Home Jurisdiction -->
             <v-text-field
               v-model.trim="business.homeLegalName"
-              class="name-home-jurisdiction"
+              class="name-home-jurisdiction mt-6"
               filled
               hide-details="auto"
               label="Name in Home Jurisdiction"
               :rules="getShowErrors ? homeLegalNameRules : []"
             />
-          </v-col>
-        </v-row>
 
-        <!-- Date of Incorporation -->
-        <v-row
-          class="mt-6"
-          no-gutters
-        >
-          <v-col
-            cols="12"
-            sm="3"
-          >
-            <!-- empty column -->
-          </v-col>
-
-          <v-col
-            cols="12"
-            sm="9"
-          >
+            <!-- Date of Incorporation -->
             <DatePickerShared
               id="incorporation-date"
               ref="incorporationDateRef"
+              class="mt-6"
               title="Date of Incorporation"
               :nudgeRight="40"
               :nudgeTop="85"
@@ -198,29 +158,12 @@
               :maxDate="business.bcFoundingDate || getCurrentDate"
               @emitDateSync="$set(business, 'homeIncorporationDate', $event)"
             />
-          </v-col>
-        </v-row>
-
-        <!-- Business Number -->
-        <v-row
-          class="mt-4"
-          no-gutters
-        >
-          <v-col
-            cols="12"
-            sm="3"
-          >
-            <!-- empty column -->
-          </v-col>
 
-          <v-col
-            cols="12"
-            sm="9"
-          >
+            <!-- Business Number -->
             <v-text-field
               v-model="business.taxId"
               v-mask="['#########']"
-              class="business-number"
+              class="business-number mnt-6"
               filled
               hide-details="auto"
               label="Business Number (Optional)"
@@ -248,59 +191,11 @@
             sm="9"
           >
             <UploadAffidavit
+              class="mb-n2"
               :business="business"
             />
           </v-col>
         </v-row>
-
-        <!-- message box -->
-        <v-row
-          class="mt-8"
-          no-gutters
-        >
-          <v-col
-            cols="12"
-            sm="3"
-          >
-            <!-- empty column -->
-          </v-col>
-
-          <v-col
-            cols="12"
-            sm="9"
-          >
-            <MessageBox color="gold">
-              <strong>Important:</strong> Verify that this information matches exactly the current information
-              in the home jurisdiction.
-            </MessageBox>
-          </v-col>
-        </v-row>
-
-        <!-- Confirmation -->
-        <v-row
-          class="mt-8"
-          no-gutters
-        >
-          <v-col
-            cols="12"
-            sm="3"
-          >
-            <label>Confirmation</label>
-          </v-col>
-
-          <v-col
-            cols="12"
-            sm="9"
-          >
-            <v-checkbox
-              v-model="business.isConfirmed"
-              class="confirmation pt-0 mt-0"
-              hide-details
-              :label="checkboxLabel"
-              :rules="getShowErrors ? [(v) => !!v] : []"
-            />
-          </v-col>
-        </v-row>
       </v-form>
 
       <!-- historical business -->
@@ -465,10 +360,6 @@ export default class ExtraproRegistration extends Mixins(DateMixin) {
   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' +
-    ' application application has been submitted.'
-
   /** Whether the business is active (otherwise it's historical). */
   get isBusinessActive (): boolean {
     return (this.business.status === EntityStates.ACTIVE)
diff --git a/src/components/ContinuationIn/ManualBusinessInfo.vue b/src/components/ContinuationIn/ManualBusinessInfo.vue
index 8da9e135b..b33e29439 100644
--- a/src/components/ContinuationIn/ManualBusinessInfo.vue
+++ b/src/components/ContinuationIn/ManualBusinessInfo.vue
@@ -30,161 +30,103 @@
 
     <!-- active = display/edit mode -->
     <template v-if="active">
-      <!-- Jurisdiction + clear button -->
-      <v-row no-gutters>
-        <v-col
-          cols="12"
-          sm="3"
-        >
-          <label>Jurisdiction</label>
-        </v-col>
-
-        <v-col
-          cols="12"
-          sm="9"
-          class="d-flex justify-space-between"
-        >
-          <Jurisdiction
-            class="home-jurisdiction"
-            :showUsaJurisdictions="true"
-            label="Jurisdiction"
-            :initialValue="business.homeJurisdiction"
-            :errorMessages="jurisdictionErrorMessage"
-            :showAppendIcon="false"
-            @change="onJurisdictionChange($event)"
-          />
-          <v-tooltip
-            top
-            content-class="top-tooltip"
-            transition="fade-transition"
-          >
-            <template #activator="{ on }">
-              <!-- align clear button on top of jurisdiction component -->
-              <v-btn
-                class="clear-info-btn float-right mt-3 ml-n10 mr-1"
-                color="primary"
-                icon
-                aria-label="Clear existing business information"
-                @click="reset()"
-                v-on="on"
-              >
-                <v-icon>mdi-close</v-icon>
-              </v-btn>
-            </template>
-            Clear existing business information.
-          </v-tooltip>
-        </v-col>
-      </v-row>
-
-      <v-divider class="mt-8" />
-
       <v-form
         ref="formRef"
         v-model="formValid"
         @submit.prevent
       >
-        <!-- Identifying Number -->
-        <v-row
-          class="mt-8"
-          no-gutters
-        >
+        <v-row no-gutters>
           <v-col
             cols="12"
             sm="3"
           >
-            <label>Business Information in Home Jurisdiction</label>
+            <label>Previous Jurisdiction Information</label>
+            <p class="mt-2 font-15">
+              The legal authority or region where your business was originally registered or where it
+              previously operated.
+            </p>
           </v-col>
 
           <v-col
             cols="12"
             sm="9"
           >
+            <!-- message box -->
+            <MessageBox color="gold">
+              <strong>Important:</strong> Make sure this information is identical to the current information
+              in your previous jurisdiction.
+            </MessageBox>
+
+            <!-- Jurisdiction + clear button -->
+            <div class="d-flex justify-space-between mt-6">
+              <Jurisdiction
+                class="home-jurisdiction"
+                :showUsaJurisdictions="true"
+                label="Jurisdiction"
+                :initialValue="business.homeJurisdiction"
+                :errorMessages="jurisdictionErrorMessage"
+                :showAppendIcon="false"
+                @change="onJurisdictionChange($event)"
+              />
+              <v-tooltip
+                top
+                content-class="top-tooltip"
+                transition="fade-transition"
+              >
+                <template #activator="{ on }">
+                  <!-- align clear button on top of jurisdiction component -->
+                  <v-btn
+                    class="clear-info-btn float-right mt-3 ml-n10 mr-1"
+                    color="primary"
+                    icon
+                    aria-label="Clear previous business information"
+                    @click="reset()"
+                    v-on="on"
+                  >
+                    <v-icon>mdi-close</v-icon>
+                  </v-btn>
+                </template>
+                Clear previous business information.
+              </v-tooltip>
+            </div>
+
+            <!-- Identifying Number -->
             <v-text-field
               v-model.trim="business.homeIdentifier"
-              class="identifying-number"
+              class="identifying-number mt-6"
               filled
               hide-details="auto"
               label="Identifying Number"
               :rules="getShowErrors ? identifyingNumberRules : []"
             />
-          </v-col>
-        </v-row>
-
-        <!-- Business Name in Home Jurisdiction -->
-        <v-row
-          class="mt-6"
-          no-gutters
-        >
-          <v-col
-            cols="12"
-            sm="3"
-          >
-            <!-- empty column -->
-          </v-col>
 
-          <v-col
-            cols="12"
-            sm="9"
-          >
+            <!-- Business Name in Home Jurisdiction -->
             <v-text-field
               v-model.trim="business.homeLegalName"
-              class="business-name"
+              class="business-name mt-6"
               filled
               hide-details="auto"
               label="Business Name in Home Jurisdiction"
               :rules="getShowErrors ? businessNameRules : []"
             />
-          </v-col>
-        </v-row>
-
-        <!-- Business Number-->
-        <v-row
-          class="mt-6"
-          no-gutters
-        >
-          <v-col
-            cols="12"
-            sm="3"
-          >
-            <!-- empty column -->
-          </v-col>
 
-          <v-col
-            cols="12"
-            sm="9"
-          >
+            <!-- Business Number-->
             <v-text-field
               v-model="business.taxId"
               v-mask="['#########']"
-              class="business-number"
+              class="business-number mt-6"
               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>
-
-        <!-- Incorporation Date -->
-        <v-row
-          class="mt-6"
-          no-gutters
-        >
-          <v-col
-            cols="12"
-            sm="3"
-          >
-            <!-- empty column -->
-          </v-col>
 
-          <v-col
-            cols="12"
-            sm="9"
-          >
+            <!-- Incorporation Date -->
             <DatePickerShared
               id="incorporation-date"
               ref="incorporationDateRef"
+              class="mt-6"
               title="Incorporation Date in Home Jurisdiction"
               :nudgeRight="40"
               :nudgeTop="85"
@@ -214,35 +156,11 @@
             sm="9"
           >
             <UploadAffidavit
+              class="mb-n2"
               :business="business"
             />
           </v-col>
         </v-row>
-
-        <!-- message box -->
-        <v-row
-          class="mt-8"
-          no-gutters
-        >
-          <v-col
-            cols="12"
-            sm="3"
-          >
-            <!-- empty column -->
-          </v-col>
-
-          <v-col
-            cols="12"
-            sm="9"
-          >
-            <MessageBox
-              color="gold"
-            >
-              <strong>Important:</strong> Verify that this information matches exactly the current information
-              in the home jurisdiction.
-            </MessageBox>
-          </v-col>
-        </v-row>
       </v-form>
     </template>
   </div>
diff --git a/src/components/ContinuationIn/SummaryBusinessHomeJurisdiction.vue b/src/components/ContinuationIn/SummaryBusinessHomeJurisdiction.vue
index c63b2fd7e..b14eb30c1 100644
--- a/src/components/ContinuationIn/SummaryBusinessHomeJurisdiction.vue
+++ b/src/components/ContinuationIn/SummaryBusinessHomeJurisdiction.vue
@@ -8,23 +8,7 @@
       @close="errorDialog = false"
     />
 
-    <section :class="{ 'invalid-section': !isContinuationInBusinessHomeValid }">
-      <div
-        v-if="!isContinuationInBusinessHomeValid"
-        class="business-home-step-error-message pt-5 pl-5"
-      >
-        <v-icon color="error">
-          mdi-information-outline
-        </v-icon>
-        <span class="error-text mx-1">This step is unfinished.</span>
-
-        <router-link
-          :to="{ path: `/${RouteNames.CONTINUATION_IN_BUSINESS_HOME}` }"
-        >
-          <span>Return to this step to finish it</span>
-        </router-link>
-      </div>
-
+    <section>
       <div id="existing-business-information-summary">
         <!-- Home Jurisdiction -->
         <article class="section-container">
@@ -228,6 +212,7 @@
             <v-col
               cols="12"
               sm="9"
+              class="file-buttons pt-2 pt-sm-0"
             >
               <!-- the director's affidavit file -->
               <template v-if="isContinuationInAffidavitRequired">
@@ -235,7 +220,7 @@
                   v-if="getExistingBusinessInfo.affidavitFileName"
                   text
                   color="primary"
-                  class="download-affidavit-btn mt-sm-n2 d-block"
+                  class="download-affidavit-btn mt-sm-n2 d-block px-2 ml-n2"
                   :disabled="isDownloading"
                   :loading="isDownloading"
                   @click="downloadAffidavitDocument()"
@@ -256,11 +241,11 @@
 
               <!-- the proof of authorization file(s) -->
               <v-btn
-                v-for="item in getContinuationAuthorization?.files"
+                v-for="item in getContinuationInAuthorizationProof?.files"
                 :key="item.fileKey"
                 text
                 color="primary"
-                class="download-authorization-btn d-block"
+                class="download-authorization-btn d-block px-2 ml-n2"
                 :disabled="isDownloading"
                 :loading="isDownloading"
                 @click="downloadAuthorizationDocument(item)"
@@ -269,7 +254,7 @@
                 <span>{{ item.fileName }}</span>
               </v-btn>
               <div
-                v-if="!getContinuationAuthorization?.files?.length"
+                v-if="!getContinuationInAuthorizationProof?.files?.length"
                 class="pl-4"
               >
                 <v-icon color="error">
@@ -296,7 +281,6 @@
             <v-col
               cols="12"
               sm="9"
-              class="pt-4 pt-sm-0"
             >
               <div id="authorization-date">
                 {{ authorizationDate || '[Unknown]' }}
@@ -314,8 +298,7 @@ import { Component, Mixins } from 'vue-property-decorator'
 import { Getter } from 'pinia-class'
 import { useStore } from '@/store/store'
 import { GenericErrorDialog } from '@/dialogs/'
-import { RouteNames } from '@/enums'
-import { ContinuationAuthorizationIF, ExistingBusinessInfoIF } from '@/interfaces'
+import { AuthorizationProofIF, ExistingBusinessInfoIF } from '@/interfaces'
 import { DateMixin, DocumentMixin } from '@/mixins'
 import { CanJurisdictions, IntlJurisdictions, UsaJurisdiction } from '@bcrs-shared-components/jurisdiction/list-data'
 import { JurisdictionLocation } from '@bcrs-shared-components/enums'
@@ -326,14 +309,10 @@ import { JurisdictionLocation } from '@bcrs-shared-components/enums'
   }
 })
 export default class SummaryBusinessHomeJurisdiction extends Mixins(DateMixin, DocumentMixin) {
-  // for template
-  readonly RouteNames = RouteNames
-
   // Getters
-  @Getter(useStore) getContinuationAuthorization!: ContinuationAuthorizationIF
+  @Getter(useStore) getContinuationInAuthorizationProof!: AuthorizationProofIF
   @Getter(useStore) getExistingBusinessInfo!: ExistingBusinessInfoIF
   @Getter(useStore) isContinuationInAffidavitRequired!: boolean
-  @Getter(useStore) isContinuationInBusinessHomeValid!: boolean
 
   // local variables
   errorDialog = false
@@ -375,7 +354,7 @@ export default class SummaryBusinessHomeJurisdiction extends Mixins(DateMixin, D
 
   /** The formatted authorization date. */
   get authorizationDate (): string {
-    return this.yyyyMmDdToPacificDate(this.getContinuationAuthorization?.date, true, false)
+    return this.yyyyMmDdToPacificDate(this.getContinuationInAuthorizationProof?.date, true, false)
   }
 
   /** Downloads the director affidavit document. */
@@ -408,10 +387,6 @@ export default class SummaryBusinessHomeJurisdiction extends Mixins(DateMixin, D
 <style lang="scss" scoped>
 @import '@/assets/styles/theme.scss';
 
-.v-icon.mdi-information-outline {
-  margin-top: -2px;
-}
-
 // reduce top whitespace for all articles except first one
 article:not(:first-child) {
   padding-top: 1.25rem;
@@ -423,7 +398,7 @@ article:not(:last-child) {
 }
 
 // vertically align file buttons with label
-#continuation-authorization-summary .col-sm-9 {
+.file-buttons {
   margin-top: -6px !important;
 }
 
diff --git a/src/components/Dissolution/CustodianOfRecords.vue b/src/components/Dissolution/CustodianOfRecords.vue
index c27f8192d..a52e55883 100644
--- a/src/components/Dissolution/CustodianOfRecords.vue
+++ b/src/components/Dissolution/CustodianOfRecords.vue
@@ -16,7 +16,7 @@
             class="pr-4"
           >
             <label class="title-label">
-              {{ getCustodialRecordsResources.custodianTitle }}
+              {{ getCustodialRecords.custodianTitle }}
             </label>
           </v-col>
 
@@ -314,7 +314,7 @@ export default class CustodianOfRecords extends Mixins(CommonMixin) {
   @Prop({ default: false }) readonly isSummary!: boolean
   @Prop({ default: false }) readonly showErrors!: boolean
 
-  @Getter(useStore) getCustodialRecordsResources!: CustodianResourceIF
+  @Getter(useStore) getCustodialRecords!: CustodianResourceIF
   @Getter(useStore) getDissolutionCustodian!: OrgPersonIF
   @Getter(useStore) getDissolutionCustodianEmail!: string
   @Getter(useStore) isEntityCoop!: boolean
@@ -347,8 +347,8 @@ export default class CustodianOfRecords extends Mixins(CommonMixin) {
     // Define default address using resource values
     this.defaultAddress = {
       addressCity: '',
-      addressCountry: this.getCustodialRecordsResources?.baseAddressValues?.country,
-      addressRegion: this.getCustodialRecordsResources?.baseAddressValues?.region,
+      addressCountry: this.getCustodialRecords?.baseAddressValues?.country,
+      addressRegion: this.getCustodialRecords?.baseAddressValues?.region,
       deliveryInstructions: '',
       postalCode: '',
       streetAddress: '',
diff --git a/src/components/common/Actions.vue b/src/components/common/Actions.vue
index 747e3f784..79d47d1b5 100644
--- a/src/components/common/Actions.vue
+++ b/src/components/common/Actions.vue
@@ -114,6 +114,7 @@ import { AmalgamationMixin, CommonMixin, DateMixin, FilingTemplateMixin, NameReq
 import { LegalServices } from '@/services/'
 import { FilingStatus, FilingTypes, RouteNames } from '@/enums'
 import { NameRequestStates } from '@bcrs-shared-components/enums'
+import flushPromises from 'flush-promises'
 
 @Component({})
 export default class Actions extends Mixins(AmalgamationMixin, CommonMixin,
@@ -127,6 +128,8 @@ export default class Actions extends Mixins(AmalgamationMixin, CommonMixin,
   // @Getter(useStore) getNameRequestNumber!: string
   @Getter(useStore) getSteps!: Array<any>
   @Getter(useStore) isBusySaving!: boolean
+  // @Getter(useStore) isContinuationInAuthorization!: boolean
+  @Getter(useStore) isContinuationInFiling!: boolean
   @Getter(useStore) isEntityType!: boolean
   @Getter(useStore) isFilingPaying!: boolean
   @Getter(useStore) isFilingValid!: boolean
@@ -198,9 +201,13 @@ export default class Actions extends Mixins(AmalgamationMixin, CommonMixin,
 
   /** Label for the File and Pay button. */
   get filePayButtonLabel (): string {
-    if (this.$route.name === RouteNames.CONTINUATION_IN_REVIEW_CONFIRM) {
-      if (this.getFilingStatus === FilingStatus.DRAFT) return 'Submit and Pay'
-      if (this.getFilingStatus === FilingStatus.CHANGE_REQUESTED) return 'Resubmit'
+    // special case for Continuation In Authorizations
+    if (this.isContinuationInFiling && (this.getFilingStatus === FilingStatus.DRAFT)) {
+      return 'Submit'
+    }
+    // special case for Continuation In Authorizations
+    if (this.isContinuationInFiling && (this.getFilingStatus === FilingStatus.CHANGE_REQUESTED)) {
+      return 'Resubmit'
     }
     return 'File and Pay'
   }
@@ -274,6 +281,10 @@ export default class Actions extends Mixins(AmalgamationMixin, CommonMixin,
     // prompt step validations
     this.setValidateSteps(true)
 
+    // wait extra long for Continuation In Authorization to validate
+    // (whereas regular filings validate when getShowErrors becomes True)
+    if (this.isContinuationInAuthorization) await flushPromises()
+
     if (this.getFilingType === FilingTypes.AMALGAMATION_APPLICATION) {
       try {
         // Re-fetch the business table data. We do this in case one of the businesses has changed (eg,
@@ -293,8 +304,8 @@ export default class Actions extends Mixins(AmalgamationMixin, CommonMixin,
     if (this.isFilingValid) {
       // prevent double saving
       if (this.isBusySaving) return
-      // If File and Pay is successful setIsFilingPaying should't be reset to false,
-      // this prevent buttons from being re-enabled if the page is slow to redirect.
+      // If File and Pay is successful, setIsFilingPaying shouldn't be reset to false.
+      // This prevent buttons from being re-enabled if the page is slow to redirect.
       this.setIsFilingPaying(true)
 
       if (
@@ -340,7 +351,8 @@ export default class Actions extends Mixins(AmalgamationMixin, CommonMixin,
       }
 
       const paymentToken = filingComplete?.header?.paymentToken
-      if (paymentToken) {
+      // special case for continuation in authorization -- no payment at this time
+      if (paymentToken || this.isContinuationInAuthorization) {
         const isPaymentActionRequired: boolean = filingComplete.header?.isPaymentActionRequired
         const returnUrl = sessionStorage.getItem('DASHBOARD_URL') + this.getEntityIdentifier +
           `?filing_id=${this.getFilingId}`
@@ -361,7 +373,8 @@ export default class Actions extends Mixins(AmalgamationMixin, CommonMixin,
         this.$root.$emit('save-error-event', error)
         this.setIsFilingPaying(false)
       }
-    } else {
+    } else if (!this.isContinuationInAuthorization) {
+      // if this is a Continuation In Authorization then let that page scroll if needed
       // otherwise, smooth-scroll to the top of the page
       window.scrollTo({ top: 0, behavior: 'smooth' })
     }
diff --git a/src/components/common/EffectiveDateTime.vue b/src/components/common/EffectiveDateTime.vue
index b6dacb2cb..fda690242 100644
--- a/src/components/common/EffectiveDateTime.vue
+++ b/src/components/common/EffectiveDateTime.vue
@@ -22,11 +22,11 @@
           class="radio-group"
         >
           <v-radio
-            :label="immediateLabel"
+            label="Immediate (Upon Filing)"
             value="isImmediate"
           />
           <v-radio
-            :label="futureEffectiveLabel"
+            label="A date / time in the future"
             value="isFutureEffective"
           />
         </v-radio-group>
@@ -165,8 +165,6 @@ export default class EffectiveDateTime extends Mixins(DateMixin) {
 
   @Prop({ required: true }) readonly effectiveDateTime!: EffectiveDateTimeIF
   @Prop({ default: 'Incorporation Date and Time' }) readonly label!: string
-  @Prop({ default: 'Immediate (Upon Filing)' }) readonly immediateLabel!: string
-  @Prop({ default: 'A date / time in the future' }) readonly futureEffectiveLabel!: string
 
   // Local properties
   isImmediate = false
diff --git a/src/components/common/FileUploadPreview.vue b/src/components/common/FileUploadPreview.vue
index 80d77096b..16e872261 100644
--- a/src/components/common/FileUploadPreview.vue
+++ b/src/components/common/FileUploadPreview.vue
@@ -94,7 +94,7 @@ export default class FileUploadPreview extends Mixins(DocumentMixin) {
     if (file) {
       const pattern = /^(.*)\.(pdf)$/i
       if (!pattern.test(file.name)) {
-        this.setCustomErrorMessage('Invalid file extension.')
+        this.setCustomErrorMessage('Invalid file extension. Must be "PDF".')
         return false
       }
     }
@@ -112,7 +112,7 @@ export default class FileUploadPreview extends Mixins(DocumentMixin) {
         return false
       }
       if (fileInfo.isContentLocked) {
-        this.setCustomErrorMessage('File content cannot be locked.')
+        this.setCustomErrorMessage('File content must not be locked.')
         return false
       }
       const isPageSizeValid = await this.validatePageSize(file)
diff --git a/src/components/common/Stepper.vue b/src/components/common/Stepper.vue
index 3131b2703..d4b6dd1f3 100644
--- a/src/components/common/Stepper.vue
+++ b/src/components/common/Stepper.vue
@@ -78,7 +78,7 @@ export default class Stepper extends Vue {
   @Getter(useStore) isAffidavitValid!: boolean
   @Getter(useStore) isAmalgamationInformationValid!: boolean
   @Getter(useStore) isBusySaving!: boolean
-  @Getter(useStore) isContinuationInBusinessHomeValid!: boolean
+  @Getter(useStore) isContinuationAuthorizationPageValid!: boolean
   @Getter(useStore) isCreateShareStructureValid!: boolean
   @Getter(useStore) isDefineCompanyValid!: boolean
   @Getter(useStore) isDissolutionDefineDissolutionValid!: boolean
@@ -103,7 +103,7 @@ export default class Stepper extends Vue {
       case RouteNames.AMALG_SHORT_PEOPLE_ROLES: return this.isAddPeopleAndRolesValid
       case RouteNames.AMALG_SHORT_REVIEW_CONFIRM: return this.isFilingValid
 
-      case RouteNames.CONTINUATION_IN_BUSINESS_HOME: return this.isContinuationInBusinessHomeValid
+      case RouteNames.CONTINUATION_IN_AUTHORIZATION: return this.isContinuationAuthorizationPageValid
       case RouteNames.CONTINUATION_IN_BUSINESS_BC: return this.isDefineCompanyValid
       case RouteNames.CONTINUATION_IN_PEOPLE_ROLES: return this.isAddPeopleAndRolesValid
       case RouteNames.CONTINUATION_IN_SHARE_STRUCTURE: return this.isCreateShareStructureValid
diff --git a/src/dialogs/SaveErrorDialog.vue b/src/dialogs/SaveErrorDialog.vue
index 85b603c25..24f411f86 100644
--- a/src/dialogs/SaveErrorDialog.vue
+++ b/src/dialogs/SaveErrorDialog.vue
@@ -12,7 +12,7 @@
         v-if="numErrors > 0 || numWarnings < 1"
         id="dialog-title"
       >
-        Unable to save {{ filingName }}
+        Unable to save {{ filingTitle }}
       </v-card-title>
 
       <!-- otherwise there are only warnings... -->
@@ -20,7 +20,7 @@
         v-else
         id="dialog-title"
       >
-        {{ filingName }} saved with warnings
+        {{ filingTitle }} saved with warnings
       </v-card-title>
 
       <v-card-text id="dialog-text">
@@ -30,8 +30,8 @@
           class="font-14"
         >
           <p>
-            We were unable to save your {{ filingName }}. You can continue to try to save this
-            {{ filingName }} or you can exit without saving and re-create this {{ filingName }} at another time.
+            We were unable to save your {{ filingTitle }}. You can continue to try to save this
+            {{ filingTitle }} or you can exit without saving and re-create this {{ filingTitle }} at another time.
           </p>
           <p>If you exit, any changes you've made will not be saved.</p>
         </div>
@@ -41,7 +41,7 @@
           v-if="numErrors > 0"
           class="font-14 mb-4"
         >
-          <p>We were unable to save your {{ filingName }} due to the following errors:</p>
+          <p>We were unable to save your {{ filingTitle }} due to the following errors:</p>
           <ul>
             <li
               v-for="(error, index) in errors"
@@ -128,6 +128,7 @@ import { FilingTypes } from '@bcrs-shared-components/enums'
   }
 })
 export default class SaveErrorDialog extends Vue {
+  @Getter(useStore) isContinuationInAuthorization!: boolean
   @Getter(useStore) isRoleStaff!: boolean
   @Getter(useStore) getFilingType!: FilingTypes
 
@@ -147,11 +148,14 @@ export default class SaveErrorDialog extends Vue {
   @Emit() exit (): void {}
   @Emit() okay (): void {}
 
-  /** The filing name. */
-  get filingName (): string {
+  /** The filing title. */
+  get filingTitle (): string {
     switch (this.getFilingType) {
       case FilingTypes.AMALGAMATION_APPLICATION: return 'Application'
-      case FilingTypes.CONTINUATION_IN: return 'Application'
+      case FilingTypes.CONTINUATION_IN: {
+        // special case for Continuation In Authorizations
+        return this.isContinuationInAuthorization ? 'Authorization' : 'Application'
+      }
       case FilingTypes.INCORPORATION_APPLICATION: return 'Application'
       case FilingTypes.REGISTRATION: return 'Registration'
       case FilingTypes.RESTORATION: return 'Restoration'
diff --git a/src/enums/routeNames.ts b/src/enums/routeNames.ts
index d7b02f9cf..deaaa0ef7 100644
--- a/src/enums/routeNames.ts
+++ b/src/enums/routeNames.ts
@@ -20,7 +20,7 @@ export enum RouteNames {
   AMALG_SHORT_REVIEW_CONFIRM = 'amalg-short-review-confirm',
 
   // Continuation In route names
-  CONTINUATION_IN_BUSINESS_HOME = 'continuation-in-business-home',
+  CONTINUATION_IN_AUTHORIZATION = 'continuation-in-authorization',
   CONTINUATION_IN_BUSINESS_BC = 'continuation-in-business-bc',
   CONTINUATION_IN_PEOPLE_ROLES = 'continuation-in-people-roles',
   CONTINUATION_IN_REVIEW_CONFIRM = 'continuation-in-review-confirm',
diff --git a/src/enums/views.ts b/src/enums/views.ts
index 13d1b0344..bf1a4fd24 100644
--- a/src/enums/views.ts
+++ b/src/enums/views.ts
@@ -14,7 +14,7 @@ export enum Views {
   AMALGAMATION_SHARE_STRUCTURE = 'amalgamation-share-structure', // regular only
 
   // Continuation In views
-  CONTINUATION_IN_BUSINESS_HOME = 'continuation-in-business-home',
+  CONTINUATION_IN_AUTHORIZATION = 'continuation-in-authorization',
   CONTINUATION_IN_BUSINESS_BC = 'continuation-in-business-bc',
   CONTINUATION_IN_PEOPLE_ROLES = 'continuation-in-people-roles',
   CONTINUATION_IN_REVIEW_CONFIRM = 'continuation-in-review-confirm',
diff --git a/src/interfaces/filing-interfaces/filing-interfaces.ts b/src/interfaces/filing-interfaces/filing-interfaces.ts
index 67a91ef69..4c10bde29 100644
--- a/src/interfaces/filing-interfaces/filing-interfaces.ts
+++ b/src/interfaces/filing-interfaces/filing-interfaces.ts
@@ -1,4 +1,4 @@
-import { AmalgamatingBusinessIF, BusinessAddressIF, ContinuationAuthorizationIF, CourtOrderIF, NaicsIF,
+import { AmalgamatingBusinessIF, BusinessAddressIF, AuthorizationProofIF, CourtOrderIF, NaicsIF,
   NameTranslationIF, OfficeAddressIF, OrgPersonIF, PartyIF, RegisteredRecordsAddressesIF, ShareClassIF,
   SpecialResolutionIF } from '@/interfaces'
 import { AmalgamationTypes, ApprovalTypes, BusinessTypes, DissolutionStatementTypes, DissolutionTypes,
@@ -109,7 +109,7 @@ export interface ContinuationInFilingIF {
       affidavitFileKey?: string
       affidavitFileName?: string
     }
-    authorization?: ContinuationAuthorizationIF
+    authorization?: AuthorizationProofIF
     contactPoint: ContactPointIF
     nameRequest: NameRequestFilingIF
     nameTranslations: NameTranslationIF[]
@@ -117,7 +117,6 @@ export interface ContinuationInFilingIF {
     parties: OrgPersonIF[]
     shareStructure: { shareClasses: ShareClassIF[] }
     courtOrder?: CourtOrderIF
-    isConfirmed?: boolean // 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 3429e3630..97c84efc0 100644
--- a/src/interfaces/index.ts
+++ b/src/interfaces/index.ts
@@ -48,8 +48,8 @@ export * from './stepper-interfaces/ReviewConfirm/certify-interface'
 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/authorization-proof-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'
diff --git a/src/interfaces/resource-interfaces/resource-interface.ts b/src/interfaces/resource-interfaces/resource-interface.ts
index 317ca3339..620f81642 100644
--- a/src/interfaces/resource-interfaces/resource-interface.ts
+++ b/src/interfaces/resource-interfaces/resource-interface.ts
@@ -23,6 +23,7 @@ export interface ContinuationInResourceIF {
   displayName: string
   steps: Array<StepIF>
   filingData: Array<FilingDataIF>
+  pageBlurbDraft: string
   peopleAndRoles: PeopleAndRolesResourceIF
   reviewAndConfirm: {
     completingPartyStatement: CompletingPartyStatementIF
@@ -35,6 +36,7 @@ export interface DissolutionResourceIF {
   displayName: string
   steps: Array<StepIF>
   filingData: Array<FilingDataIF>
+  pageBlurbDraft: string
   detailsTitle: string
   custodialRecords?: CustodianResourceIF
   dissolutionStatements?: Array<KeyValueIF>
diff --git a/src/interfaces/store-interfaces/state-interfaces/continuation-authorization-interface.ts b/src/interfaces/store-interfaces/state-interfaces/authorization-proof-interface.ts
similarity index 73%
rename from src/interfaces/store-interfaces/state-interfaces/continuation-authorization-interface.ts
rename to src/interfaces/store-interfaces/state-interfaces/authorization-proof-interface.ts
index c73fb6d81..954817beb 100644
--- a/src/interfaces/store-interfaces/state-interfaces/continuation-authorization-interface.ts
+++ b/src/interfaces/store-interfaces/state-interfaces/authorization-proof-interface.ts
@@ -1,4 +1,4 @@
-export interface ContinuationAuthorizationIF {
+export interface AuthorizationProofIF {
   files: Array<{
     file: File // only used by UI
     fileKey: string
diff --git a/src/interfaces/store-interfaces/state-interfaces/continuation-in-state-interface.ts b/src/interfaces/store-interfaces/state-interfaces/continuation-in-state-interface.ts
index 39d0a2390..015d8dd65 100644
--- a/src/interfaces/store-interfaces/state-interfaces/continuation-in-state-interface.ts
+++ b/src/interfaces/store-interfaces/state-interfaces/continuation-in-state-interface.ts
@@ -1,8 +1,7 @@
-import { ContinuationAuthorizationIF, ExistingBusinessInfoIF } from '@/interfaces'
+import { AuthorizationProofIF, ExistingBusinessInfoIF } from '@/interfaces'
 
-// TODO: Add properties as needed
 export interface ContinuationInStateIF {
-  businessHomeValid: boolean
-  continuationAuthorization: ContinuationAuthorizationIF
+  continuationAuthorizationPageValid: boolean
+  authorizationProof: AuthorizationProofIF
   existingBusinessInfo: ExistingBusinessInfoIF
 }
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 cc58ed867..522e69b04 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
@@ -14,7 +14,6 @@ export interface ExistingBusinessInfoIF {
   homeIdentifier: string
   homeIncorporationDate: string // YYYY-MM-DD
   homeLegalName: string
-  isConfirmed?: boolean // only used by UI
   latestReviewComment?: string
   mode: 'EXPRO' | 'MANUAL' // only used by UI
   status?: EntityStates // only used by UI
diff --git a/src/mixins/filing-template-mixin.ts b/src/mixins/filing-template-mixin.ts
index b6bddcca5..f9b11beb6 100644
--- a/src/mixins/filing-template-mixin.ts
+++ b/src/mixins/filing-template-mixin.ts
@@ -4,7 +4,7 @@ import { useStore } from '@/store/store'
 import { AmalgamationMixin, DateMixin } from '@/mixins'
 import {
   AmalgamationFilingIF, BusinessAddressIF, ContactPointIF, CertifyIF, CompletingPartyIF,
-  ContinuationAuthorizationIF, ContinuationInFilingIF, CourtOrderIF, CourtOrderStepIF,
+  AuthorizationProofIF, ContinuationInFilingIF, CourtOrderIF, CourtOrderStepIF,
   CreateMemorandumIF, CreateResolutionIF, CreateRulesIF, DefineCompanyIF, DissolutionFilingIF,
   DissolutionStatementIF, DocumentDeliveryIF, EffectiveDateTimeIF, EmptyNaics,
   ExistingBusinessInfoIF, IncorporationAgreementIF, IncorporationFilingIF, NaicsIF, NrApplicantIF,
@@ -14,7 +14,6 @@ import {
 } from '@/interfaces'
 import {
   AmalgamationTypes, ApprovalTypes, BusinessTypes, CoopTypes, DissolutionTypes, EffectOfOrders,
-  FilingStatus,
   FilingTypes, PartyTypes, RelationshipTypes, RestorationTypes, RoleTypes, StaffPaymentOptions
 } from '@/enums'
 import { CorrectNameOptions } from '@bcrs-shared-components/enums'
@@ -38,7 +37,7 @@ export default class FilingTemplateMixin extends Mixins(AmalgamationMixin, DateM
   @Getter(useStore) getBusinessStartDate!: string
   @Getter(useStore) getCertifyState!: CertifyIF
   @Getter(useStore) getCompletingParty!: CompletingPartyIF
-  @Getter(useStore) getContinuationAuthorization!: ContinuationAuthorizationIF
+  @Getter(useStore) getContinuationInAuthorizationProof!: AuthorizationProofIF
   @Getter(useStore) getCorrectNameOption!: CorrectNameOptions
   @Getter(useStore) getCourtOrderStep!: CourtOrderStepIF
   @Getter(useStore) getCreateMemorandumStep!: CreateMemorandumIF
@@ -69,6 +68,7 @@ export default class FilingTemplateMixin extends Mixins(AmalgamationMixin, DateM
   @Getter(useStore) getStaffPaymentStep!: StaffPaymentStepIF
   @Getter(useStore) getTempId!: string
   @Getter(useStore) getTransactionalFolioNumber!: string
+  @Getter(useStore) isContinuationInAuthorization!: boolean
   @Getter(useStore) isEntityCoop!: boolean
   @Getter(useStore) isEntityFirm!: boolean
   @Getter(useStore) isEntitySoleProp!: boolean
@@ -81,7 +81,7 @@ export default class FilingTemplateMixin extends Mixins(AmalgamationMixin, DateM
   @Action(useStore) setBusinessAddress!: (x: OfficeAddressIF) => void
   // @Action(useStore) setBusinessContact!: (x: ContactPointIF) => void
   @Action(useStore) setCertifyState!: (x: CertifyIF) => void
-  @Action(useStore) setContinuationAuthorization!: (x: ContinuationAuthorizationIF) => void
+  @Action(useStore) setContinuationAuthorization!: (x: AuthorizationProofIF) => void
   @Action(useStore) setCooperativeType!: (x: CoopTypes) => void
   // @Action(useStore) setCorrectNameOption!: (x: CorrectNameOptions) => void
   @Action(useStore) setCourtOrderFileNumber!: (x: string) => void
@@ -396,17 +396,16 @@ export default class FilingTemplateMixin extends Mixins(AmalgamationMixin, DateM
           shareClasses: this.getCreateShareStructureStep.shareClasses
         },
         // save properties used only for UI:
-        isConfirmed: this.getExistingBusinessInfo?.isConfirmed || false,
         mode: this.getExistingBusinessInfo?.mode,
         status: this.getExistingBusinessInfo?.status
       }
     }
 
-    // Add continuation authorization.
-    if (this.getContinuationAuthorization) {
+    // Add continuation in authorization proof.
+    if (this.getContinuationInAuthorizationProof) {
       filing.continuationIn.authorization = {
-        files: this.getContinuationAuthorization.files,
-        date: this.getContinuationAuthorization.date
+        files: this.getContinuationInAuthorizationProof.files,
+        date: this.getContinuationInAuthorizationProof.date
       }
     }
 
@@ -448,7 +447,6 @@ export default class FilingTemplateMixin extends Mixins(AmalgamationMixin, DateM
    */
   parseContinuationInDraft (draftFiling: ContinuationInFilingIF): void {
     const continuationIn = draftFiling.continuationIn
-    const status = draftFiling.header.status || null
 
     // save filing id
     this.setFilingId(+draftFiling.header.filingId)
@@ -474,7 +472,6 @@ export default class FilingTemplateMixin extends Mixins(AmalgamationMixin, DateM
         homeIdentifier: continuationIn.foreignJurisdiction.identifier,
         homeIncorporationDate: continuationIn.foreignJurisdiction.incorporationDate,
         homeLegalName: continuationIn.foreignJurisdiction.legalName,
-        isConfirmed: continuationIn.isConfirmed,
         mode: continuationIn.mode,
         status: continuationIn.status,
         taxId: continuationIn.foreignJurisdiction.taxId,
@@ -482,7 +479,7 @@ export default class FilingTemplateMixin extends Mixins(AmalgamationMixin, DateM
       })
     }
 
-    // restore continuation authorization
+    // restore continuation in authorization proof
     if (continuationIn.authorization) {
       this.setContinuationAuthorization(continuationIn.authorization)
     }
@@ -561,11 +558,11 @@ export default class FilingTemplateMixin extends Mixins(AmalgamationMixin, DateM
       if (effectiveDate >= this.getCurrentJsDate) this.setEffectiveDate(effectiveDate)
     }
 
-    if (status === FilingStatus.CHANGE_REQUESTED) {
-      // if user is editing a (previously filed) filing, waive fees as they don't have to pay again
+    if (this.isContinuationInAuthorization) {
+      // if this is a continuation in authorization, show zero fees
       this.parseStaffPayment({ header: { waiveFees: true } } as any)
     } else if (this.isRoleStaff) {
-      // restore Staff Payment data
+      // otherwise, restore normal Staff Payment data
       // (NB: Staff role is mutually exclusive with premium account.)
       this.parseStaffPayment(draftFiling)
     }
diff --git a/src/resources/ContinuationIn/C.ts b/src/resources/ContinuationIn/C.ts
index acb373665..371ddfbbe 100644
--- a/src/resources/ContinuationIn/C.ts
+++ b/src/resources/ContinuationIn/C.ts
@@ -12,10 +12,11 @@ export const ContinuationInResourceC: ContinuationInResourceIF = {
     entityType: CorpTypeCd.CONTINUE_IN,
     filingTypeCode: FilingCodes.CONTINUATION_IN
   }],
+  pageBlurbDraft: `To continue in to B.C., you must first submit a Continuation Authorization and
+    have it approved by BC Registries before filing a Continuation Application.`,
   peopleAndRoles: {
     header: '1. Add People to your Application',
-    blurb: `Add the people who will have a role in your company. People can
-      have multiple roles.`,
+    blurb: `Add the people who will have a role in your company. People can have multiple roles.`,
     helpSection: null,
     rules: [
       {
diff --git a/src/resources/ContinuationIn/CBEN.ts b/src/resources/ContinuationIn/CBEN.ts
index 8b7f3c174..969e166fc 100644
--- a/src/resources/ContinuationIn/CBEN.ts
+++ b/src/resources/ContinuationIn/CBEN.ts
@@ -12,6 +12,8 @@ export const ContinuationInResourceCben: ContinuationInResourceIF = {
     entityType: CorpTypeCd.BEN_CONTINUE_IN,
     filingTypeCode: FilingCodes.CONTINUATION_IN
   }],
+  pageBlurbDraft: `To continue in to B.C., you must first submit a Continuation Authorization and
+    have it approved BC Registries before filing a Continuation Application.`,
   peopleAndRoles: {
     header: '1. Add People to your Application',
     blurb: `Add the people who will have a role in your company. People can
diff --git a/src/resources/ContinuationIn/CCC.ts b/src/resources/ContinuationIn/CCC.ts
index 37f5cfedb..4ba5a2d11 100644
--- a/src/resources/ContinuationIn/CCC.ts
+++ b/src/resources/ContinuationIn/CCC.ts
@@ -12,6 +12,8 @@ export const ContinuationInResourceCcc: ContinuationInResourceIF = {
     entityType: CorpTypeCd.CCC_CONTINUE_IN,
     filingTypeCode: FilingCodes.CONTINUATION_IN
   }],
+  pageBlurbDraft: `To continue in to B.C., you must first submit a Continuation Authorization and
+    have it approved BC Registries before filing a Continuation Application.`,
   peopleAndRoles: {
     header: '1. Add People to your Application',
     blurb: `Add the people who will have a role in your company. People can
diff --git a/src/resources/ContinuationIn/CUL.ts b/src/resources/ContinuationIn/CUL.ts
index e5a27358c..e7f0b8b7c 100644
--- a/src/resources/ContinuationIn/CUL.ts
+++ b/src/resources/ContinuationIn/CUL.ts
@@ -12,6 +12,8 @@ export const ContinuationInResourceCul: ContinuationInResourceIF = {
     entityType: CorpTypeCd.ULC_CONTINUE_IN,
     filingTypeCode: FilingCodes.CONTINUATION_IN
   }],
+  pageBlurbDraft: `To continue in to B.C., you must first submit a Continuation Authorization and
+    have it approved BC Registries before filing a Continuation Application.`,
   peopleAndRoles: {
     header: '1. Add People to your Application',
     blurb: `Add the people who will have a role in your company. People can
diff --git a/src/resources/ContinuationIn/steps.ts b/src/resources/ContinuationIn/steps.ts
index 122d7c583..eb94ac4d0 100644
--- a/src/resources/ContinuationIn/steps.ts
+++ b/src/resources/ContinuationIn/steps.ts
@@ -1,29 +1,30 @@
 import { RouteNames, Views } from '@/enums'
 
-/**
- * The continuation in steps object.
- * Currently used for BC, BEN, CC and ULC.
- */
+/** The continuation in steps object when the filing is in "authorization mode". */
+export const ContinuationInStepsAuthorization = [
+  {
+    id: 'step-0-btn',
+    step: 0,
+    icon: 'mdi-file-document-multiple-outline',
+    text: 'Continuation\nAuthorization',
+    to: RouteNames.CONTINUATION_IN_AUTHORIZATION,
+    component: Views.CONTINUATION_IN_AUTHORIZATION
+  }
+]
+
+/** The regular continuation in steps object. */
 export const ContinuationInSteps = [
   {
     id: 'step-1-btn',
     step: 1,
-    icon: 'mdi-home-city-outline',
-    text: 'Your Business in\nHome Jurisdiction',
-    to: RouteNames.CONTINUATION_IN_BUSINESS_HOME,
-    component: Views.CONTINUATION_IN_BUSINESS_HOME
-  },
-  {
-    id: 'step-2-btn',
-    step: 2,
     icon: 'mdi-domain',
     text: 'Your Business\nin B.C.',
     to: RouteNames.CONTINUATION_IN_BUSINESS_BC,
     component: Views.CONTINUATION_IN_BUSINESS_BC
   },
   {
-    id: 'step-3-btn',
-    step: 3,
+    id: 'step-2-btn',
+    step: 2,
     icon: 'mdi-account-multiple-plus',
     text: 'Add People\nand Roles',
     to: RouteNames.CONTINUATION_IN_PEOPLE_ROLES,
@@ -31,8 +32,8 @@ export const ContinuationInSteps = [
 
   },
   {
-    id: 'step-4-btn',
-    step: 4,
+    id: 'step-3-btn',
+    step: 3,
     icon: 'mdi-sitemap',
     text: 'Create Share\nStructure',
     to: RouteNames.CONTINUATION_IN_SHARE_STRUCTURE,
@@ -40,7 +41,7 @@ export const ContinuationInSteps = [
   },
   {
     id: 'step-5-btn',
-    step: 5,
+    step: 4,
     icon: 'mdi-text-box-check-outline',
     text: 'Review\nand Confirm',
     to: RouteNames.CONTINUATION_IN_REVIEW_CONFIRM,
diff --git a/src/resources/Dissolution/GP.ts b/src/resources/Dissolution/GP.ts
index 488891c85..23bbd01b6 100644
--- a/src/resources/Dissolution/GP.ts
+++ b/src/resources/Dissolution/GP.ts
@@ -1,5 +1,5 @@
 import { DissolutionResourceIF } from '@/interfaces'
-import { FilingCodes, ItemTypes } from '@/enums'
+import { FilingCodes } from '@/enums'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { DissolutionStepsFirm } from './steps'
 
@@ -11,7 +11,9 @@ export const DissolutionResourceGp: DissolutionResourceIF = {
     entityType: CorpTypeCd.PARTNERSHIP,
     filingTypeCode: FilingCodes.DISSOLUTION_VOLUNTARY
   }],
-  detailsTitle: 'Company Details',
+  pageBlurbDraft: `Confirm the following information, select the dissolution date, and certify your
+    dissolution before filing.`,
+  detailsTitle: null,
   reviewAndConfirm: {
     completingPartyStatement: {
       certifyStatements: [],
@@ -20,47 +22,5 @@ export const DissolutionResourceGp: DissolutionResourceIF = {
       A person who commits this offence is subject to a maximum fine of $5,000.`,
       entityDisplay: GetCorpFullDescription(CorpTypeCd.PARTNERSHIP)
     }
-  },
-  createResolution: {
-    reviewConfirmHeader: 'Resolution',
-    introSection: {
-      header: '1. Resolution',
-      items: [
-        {
-          type: ItemTypes.TEXT,
-          value: 'Before submitting your voluntary dissolution you must <b>complete, sign, and date</b> a '
-        },
-        {
-          type: ItemTypes.TOOLTIP,
-          value: {
-            label: 'resolution',
-            text: 'Resolution - A formal statement of a decision.'
-          }
-        },
-        {
-          type: ItemTypes.TEXT,
-          value: 'and deposit the resolution in the Company\'s records book.'
-        }
-      ]
-    },
-
-    confirmSection: {
-      header: '2. Confirm Resolution Completion',
-      text: [
-        {
-          type: ItemTypes.TEXT,
-          value: 'I confirm a resolution was passed by'
-        },
-        {
-          type: ItemTypes.PLACEHOLDER,
-          value: 'legal_name'
-        },
-        {
-          type: ItemTypes.TEXT,
-          value: 'and has been deposited in the Company\'s records book.'
-        }
-      ],
-      items: []
-    }
   }
 }
diff --git a/src/resources/Dissolution/SP.ts b/src/resources/Dissolution/SP.ts
index 9f9b649ae..56d16637d 100644
--- a/src/resources/Dissolution/SP.ts
+++ b/src/resources/Dissolution/SP.ts
@@ -1,5 +1,5 @@
 import { DissolutionResourceIF } from '@/interfaces'
-import { FilingCodes, ItemTypes } from '@/enums'
+import { FilingCodes } from '@/enums'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { DissolutionStepsFirm } from './steps'
 
@@ -11,7 +11,9 @@ export const DissolutionResourceSp: DissolutionResourceIF = {
     entityType: CorpTypeCd.SOLE_PROP,
     filingTypeCode: FilingCodes.DISSOLUTION_VOLUNTARY
   }],
-  detailsTitle: 'Company Details',
+  pageBlurbDraft: `Confirm the following information, select the dissolution date, and certify your
+    dissolution before filing.`,
+  detailsTitle: null,
   reviewAndConfirm: {
     completingPartyStatement: {
       certifyStatements: [],
@@ -20,47 +22,5 @@ export const DissolutionResourceSp: DissolutionResourceIF = {
       A person who commits this offence is subject to a maximum fine of $5,000.`,
       entityDisplay: GetCorpFullDescription(CorpTypeCd.SOLE_PROP)
     }
-  },
-  createResolution: {
-    reviewConfirmHeader: 'Resolution',
-    introSection: {
-      header: '1. Resolution',
-      items: [
-        {
-          type: ItemTypes.TEXT,
-          value: 'Before submitting your voluntary dissolution you must <b>complete, sign, and date</b> a '
-        },
-        {
-          type: ItemTypes.TOOLTIP,
-          value: {
-            label: 'resolution',
-            text: 'Resolution - A formal statement of a decision.'
-          }
-        },
-        {
-          type: ItemTypes.TEXT,
-          value: 'and deposit the resolution in the Company\'s records book.'
-        }
-      ]
-    },
-
-    confirmSection: {
-      header: '2. Confirm Resolution Completion',
-      text: [
-        {
-          type: ItemTypes.TEXT,
-          value: 'I confirm a resolution was passed by'
-        },
-        {
-          type: ItemTypes.PLACEHOLDER,
-          value: 'legal_name'
-        },
-        {
-          type: ItemTypes.TEXT,
-          value: 'and has been deposited in the Company\'s records book.'
-        }
-      ],
-      items: []
-    }
   }
 }
diff --git a/src/router/routes/continuation-in-routes.ts b/src/router/routes/continuation-in-routes.ts
index 9f063e7f1..7d7157ecd 100644
--- a/src/router/routes/continuation-in-routes.ts
+++ b/src/router/routes/continuation-in-routes.ts
@@ -2,22 +2,25 @@ import { FilingTypes, RouteNames } from '@/enums'
 import * as Views from '@/views'
 
 export const ContinuationInRoutes = [
+  // this route is used for Draft and Change Requested statuses:
   {
-    path: '/continuation-in-business-home',
-    name: RouteNames.CONTINUATION_IN_BUSINESS_HOME,
-    component: Views.ContinuationInBusinessHome,
+    path: '/continuation-in-authorization',
+    name: RouteNames.CONTINUATION_IN_AUTHORIZATION,
+    component: Views.ContinuationInAuthorization,
     meta: {
-      step: 1,
+      step: 0,
       requiresAuth: true,
-      filingType: FilingTypes.CONTINUATION_IN
+      filingType: FilingTypes.CONTINUATION_IN,
+      noStepper: true // hide stepper for this route/filing type
     }
   },
+  // the following routes are used for Approved status:
   {
     path: '/continuation-in-business-bc',
     name: RouteNames.CONTINUATION_IN_BUSINESS_BC,
     component: Views.ContinuationInBusinessBc,
     meta: {
-      step: 2,
+      step: 1,
       requiresAuth: true,
       filingType: FilingTypes.CONTINUATION_IN
     }
@@ -27,7 +30,7 @@ export const ContinuationInRoutes = [
     name: RouteNames.CONTINUATION_IN_PEOPLE_ROLES,
     component: Views.ContinuationInPeopleRoles,
     meta: {
-      step: 3,
+      step: 2,
       requiresAuth: true,
       filingType: FilingTypes.CONTINUATION_IN
     }
@@ -37,7 +40,7 @@ export const ContinuationInRoutes = [
     name: RouteNames.CONTINUATION_IN_SHARE_STRUCTURE,
     component: Views.ContinuationInShareStructure,
     meta: {
-      step: 4,
+      step: 3,
       requiresAuth: true,
       filingType: FilingTypes.CONTINUATION_IN
     }
@@ -47,7 +50,7 @@ export const ContinuationInRoutes = [
     name: RouteNames.CONTINUATION_IN_REVIEW_CONFIRM,
     component: Views.ContinuationInReviewConfirm,
     meta: {
-      step: 5,
+      step: 4,
       requiresAuth: true,
       filingType: FilingTypes.CONTINUATION_IN
     }
diff --git a/src/store/state/state-model.ts b/src/store/state/state-model.ts
index 32d747aec..4051f287a 100644
--- a/src/store/state/state-model.ts
+++ b/src/store/state/state-model.ts
@@ -217,8 +217,8 @@ export const stateModel: StateModelIF = {
     type: null
   },
   continuationIn: {
-    businessHomeValid: false,
-    continuationAuthorization: null,
+    continuationAuthorizationPageValid: false,
+    authorizationProof: null,
     existingBusinessInfo: {} as ExistingBusinessInfoIF
   },
   restoration: {
diff --git a/src/store/store.ts b/src/store/store.ts
index c5a15bf92..8d93870a6 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -40,7 +40,7 @@ import {
   CreateRulesIF,
   CreateRulesResourceIF,
   CompletingPartyStatementIF,
-  ContinuationAuthorizationIF,
+  AuthorizationProofIF,
   ContinuationInStateIF,
   CustodianResourceIF,
   DefineCompanyIF,
@@ -139,6 +139,27 @@ export const useStore = defineStore('store', {
       return (this.getFilingType === FilingTypes.CONTINUATION_IN)
     },
 
+    /**
+     * Whether the current filing is in "authorization mode".
+     * Use for Continuation In filings only atm.
+     */
+    isAuthorizationStatus (): boolean {
+      // Draft: user is filling out the Continuation Authorization step only
+      // Change Requested: user is making changes to the Continuation Authorization step only
+      return [FilingStatus.DRAFT, FilingStatus.CHANGE_REQUESTED].includes(this.getFilingStatus)
+    },
+
+    /**
+     * Whether this filing is a Continuation In Authorization (step 0).
+     * Otherwise, it's a normal Continuation In filing (steps 1-4).
+     */
+    isContinuationInAuthorization (): boolean {
+      return (
+        this.isContinuationInFiling &&
+        this.isAuthorizationStatus
+      )
+    },
+
     /** Whether the current filing is an Incorporation Application. */
     isIncorporationFiling (): boolean {
       return (this.getFilingType === FilingTypes.INCORPORATION_APPLICATION)
@@ -207,9 +228,9 @@ export const useStore = defineStore('store', {
       return this.stateModel.entityType
     },
 
-    /** The continuation in Continuation Authorization object. */
-    getContinuationAuthorization (): ContinuationAuthorizationIF {
-      return this.getContinuationIn.continuationAuthorization
+    /** The continuation in Authorization Proof object. */
+    getContinuationInAuthorizationProof (): AuthorizationProofIF {
+      return this.getContinuationIn.authorizationProof
     },
 
     /** The continuation in Existing Business Info object. */
@@ -593,7 +614,7 @@ export const useStore = defineStore('store', {
       return (this.isSaving || this.isSavingResuming || this.isFilingPaying)
     },
 
-    /** Is true when the step is valid. */
+    /** Whether the Define Company step is valid. */
     isDefineCompanyValid (): boolean {
       if (this.isEntityCoop) {
         return (!!this.getCooperativeType && this.getDefineCompanyStep.valid)
@@ -601,12 +622,12 @@ export const useStore = defineStore('store', {
       return this.getDefineCompanyStep.valid
     },
 
-    /** Is true when the Continuation In Business Home step is valid. */
-    isContinuationInBusinessHomeValid (): boolean {
-      return this.getContinuationIn.businessHomeValid
+    /** Whether the Continuation Authorization page is valid. */
+    isContinuationAuthorizationPageValid (): boolean {
+      return this.getContinuationIn.continuationAuthorizationPageValid
     },
 
-    /** Is true when the step is valid. */
+    /** Whether the Restore Business Name step is valid. */
     isRestoreBusinessNameValid (): boolean {
       return (
         this.getRestorationBusinessNameValid &&
@@ -616,17 +637,17 @@ export const useStore = defineStore('store', {
       )
     },
 
-    /** Is true when the step is valid. */
+    /** Whether the Add People And Roles step is valid. */
     isAddPeopleAndRolesValid (): boolean {
       return this.getAddPeopleAndRoleStep.valid
     },
 
-    /** Is true when the step is valid. */
+    /** Whether the Create Share Structure step is valid. */
     isCreateShareStructureValid (): boolean {
       return this.getCreateShareStructureStep.valid
     },
 
-    /** Is true when the step is valid. */
+    /** Whether the Incorporation Agreement step is valid. */
     isIncorporationAgreementValid (): boolean {
       return this.getIncorporationAgreementStep.valid
     },
@@ -729,11 +750,14 @@ export const useStore = defineStore('store', {
       )
     },
 
-    /**
-     * Whether all the continuation in steps are valid.
-     * TODO: Add all the remaining checks when all components are in place.
-     */
+    /** Whether all the continuation in steps are valid. */
     isContinuationInValid (): boolean {
+      // special case for continuation in authorization
+      if (this.isContinuationInAuthorization) {
+        return this.isContinuationAuthorizationPageValid
+      }
+
+      // otherwise, it's a continuation in application
       const isEffectiveDateTimeValid =
         (this.getFilingStatus === FilingStatus.DRAFT) ? this.getEffectiveDateTime.valid : true
       const isCertifyValid = this.getCertifyState.valid && !!this.getCertifyState.certifiedBy
@@ -742,7 +766,6 @@ export const useStore = defineStore('store', {
         (this.isRoleStaff && this.getFilingStatus === FilingStatus.DRAFT) ? this.getStaffPaymentStep.valid : true
 
       return (
-        this.isContinuationInBusinessHomeValid &&
         this.isDefineCompanyValid &&
         this.isAddPeopleAndRolesValid &&
         this.isCreateShareStructureValid &&
@@ -1082,8 +1105,15 @@ export const useStore = defineStore('store', {
       return (steps ? steps.filter(step => step.step !== -1).length : -1)
     },
 
-    /** The dissolution details title. */
-    getDissolutionDetailsTitle (): string {
+    /** The page blurb. Only valid in Draft or Change Requested status. */
+    getPageBlurb (): string {
+      return [FilingStatus.DRAFT, FilingStatus.CHANGE_REQUESTED].includes(this.getFilingStatus)
+        ? this.resourceModel.pageBlurbDraft
+        : null
+    },
+
+    /** The details title. Used for dissolutions only atm. */
+    getDetailsTitle (): string {
       return this.resourceModel.detailsTitle
     },
 
@@ -1093,7 +1123,7 @@ export const useStore = defineStore('store', {
     },
 
     /** The dissolution custodial records resources. */
-    getCustodialRecordsResources (): CustodianResourceIF {
+    getCustodialRecords (): CustodianResourceIF {
       return this.resourceModel.custodialRecords
     },
 
@@ -1179,8 +1209,8 @@ export const useStore = defineStore('store', {
     setCurrentJsDate (date: Date) {
       this.stateModel.currentJsDate = date
     },
-    setContinuationAuthorization (val: ContinuationAuthorizationIF) {
-      this.stateModel.continuationIn.continuationAuthorization = val
+    setContinuationAuthorization (val: AuthorizationProofIF) {
+      this.stateModel.continuationIn.authorizationProof = val
       if (!this.stateModel.ignoreChanges) this.stateModel.haveChanges = true
     },
     setExistingBusinessInfo (val: ExistingBusinessInfoIF) {
@@ -1212,8 +1242,8 @@ export const useStore = defineStore('store', {
     setDefineCompanyStepValidity (valid: boolean) {
       this.stateModel.defineCompanyStep.valid = valid
     },
-    setContinuationInBusinessHomeValid (valid: boolean) {
-      this.getContinuationIn.businessHomeValid = valid
+    setContinuationAuthorizationPageValid (valid: boolean) {
+      this.getContinuationIn.continuationAuthorizationPageValid = valid
     },
     setOfficeAddresses (addresses: RegisteredRecordsAddressesIF) {
       this.stateModel.defineCompanyStep.officeAddresses = addresses
@@ -1310,8 +1340,8 @@ export const useStore = defineStore('store', {
     setHaveChanges (haveChanges: boolean) {
       this.stateModel.haveChanges = haveChanges
     },
-    setValidateSteps (validate: boolean) {
-      this.stateModel.validateSteps = validate
+    setValidateSteps (validateSteps: boolean) {
+      this.stateModel.validateSteps = validateSteps
     },
     setShowErrors (showErrors: boolean) {
       this.stateModel.showErrors = showErrors
diff --git a/src/views/ContinuationIn/ContinuationInBusinessHome.vue b/src/views/ContinuationIn/ContinuationInAuthorization.vue
similarity index 55%
rename from src/views/ContinuationIn/ContinuationInBusinessHome.vue
rename to src/views/ContinuationIn/ContinuationInAuthorization.vue
index 78ba847f0..e0842f94c 100644
--- a/src/views/ContinuationIn/ContinuationInBusinessHome.vue
+++ b/src/views/ContinuationIn/ContinuationInAuthorization.vue
@@ -1,10 +1,10 @@
 <template>
-  <div id="continuation-in-business-home">
+  <div id="continuation-in-authorization">
     <!-- Existing Business Information -->
     <section class="mt-10">
       <header id="existing-business-information">
         <h2>Existing Business Information</h2>
-        <p class="mt-4">
+        <p>
           Enter information about your existing business. If your company is extraprovincially registered
           in B.C., that registration will be made historical when this continuation application is processed.
         </p>
@@ -35,18 +35,44 @@
       </v-card>
     </section>
 
-    <!-- Continuation Authorization -->
+    <!-- Contact Information -->
     <section class="mt-10">
-      <header id="continuation-authorization">
-        <h2>Continuation Authorization</h2>
-        <p class="mt-4">
+      <header id="contact-information">
+        <h2>Contact Information</h2>
+        <p>
+          Enter the contact information for the continuation authorization. The BC Business Registry
+          will use this to communicate with the business about this authorization in the future,
+          including sending documents and notifications.
+        </p>
+      </header>
+
+      <v-card
+        flat
+        class="py-8 px-6"
+        :class="{ 'invalid-section': getShowErrors && !businessContactInfoValid }"
+      >
+        <BusinessContactInfo
+          :initialValue="getBusinessContact"
+          :isEditing="true"
+          :showErrors="getShowErrors"
+          @update="setBusinessContact($event)"
+          @valid="businessContactInfoValid = $event"
+        />
+      </v-card>
+    </section>
+
+    <!-- Proof of Authorization -->
+    <section class="mt-10">
+      <header id="proof-of-authorization">
+        <h2>Proof of Authorization</h2>
+        <p>
           You must provide proof of authorization to continue out of your home jurisdiction.
           This will be reviewed by our staff.
         </p>
       </header>
 
-      <ContinuationAuthorization
-        @valid="continuationAuthorizationValid = $event"
+      <AuthorizationProof
+        @valid="authorizationProofValid = $event"
       />
     </section>
   </div>
@@ -57,42 +83,53 @@ import { Component, Mixins, Watch } from 'vue-property-decorator'
 import { Getter, Action } from 'pinia-class'
 import { useStore } from '@/store/store'
 import { CommonMixin, NameRequestMixin } from '@/mixins'
-import { RouteNames } from '@/enums'
-import ContinuationAuthorization from '@/components/ContinuationIn/ContinuationAuthorization.vue'
+import { ContactPointIF } from '@bcrs-shared-components/interfaces'
+import AuthorizationProof from '@/components/ContinuationIn/AuthorizationProof.vue'
+import BusinessContactInfo from '@/components/common/BusinessContactInfo.vue'
 import ExtraproRegistration from '@/components/ContinuationIn/ExtraproRegistration.vue'
 import ManualBusinessInfo from '@/components/ContinuationIn/ManualBusinessInfo.vue'
 
 @Component({
   components: {
-    ContinuationAuthorization,
-    ManualBusinessInfo,
-    ExtraproRegistration
+    AuthorizationProof,
+    BusinessContactInfo,
+    ExtraproRegistration,
+    ManualBusinessInfo
   }
 })
-export default class ContinuationInBusinessHome extends Mixins(CommonMixin, NameRequestMixin) {
+export default class ContinuationInAuthorization extends Mixins(CommonMixin, NameRequestMixin) {
+  @Getter(useStore) getBusinessContact!: ContactPointIF
   @Getter(useStore) getShowErrors!: boolean
+  @Getter(useStore) getValidateSteps!: boolean
+  @Getter(useStore) isFilingValid!: boolean
 
-  @Action(useStore) setContinuationInBusinessHomeValid!: (x: boolean) => void
+  @Action(useStore) setBusinessContact!: (x: ContactPointIF) => void
+  @Action(useStore) setContinuationAuthorizationPageValid!: (x: boolean) => void
   @Action(useStore) setIgnoreChanges!: (x: boolean) => void
+  @Action(useStore) setShowErrors!: (x: boolean) => void
+  @Action(useStore) setValidateSteps!: (x: boolean) => void
 
   // Local properties
   manualBusinessInfoActive = false
   manualBusinessInfoValid = false
   extraproRegistrationActive = false
   extraproRegistrationValid = false
-  continuationAuthorizationValid = false
+  businessContactInfoValid = false
+  authorizationProofValid = false
 
   /** Array of valid components. Must match validFlags below. */
   readonly validComponents = [
     'existing-business-information',
-    'continuation-authorization'
+    'contact-information',
+    'proof-of-authorization'
   ]
 
   /** Object of valid flags. Must match validComponents above. */
   get validFlags (): object {
     return {
       existingBusinessInformationValid: this.existingBusinessInformationValid,
-      continuationAuthorizationValid: this.continuationAuthorizationValid
+      contactInformationValid: this.businessContactInfoValid,
+      authorizationProofValid: this.authorizationProofValid
     }
   }
 
@@ -113,22 +150,29 @@ export default class ContinuationInBusinessHome extends Mixins(CommonMixin, Name
   }
 
   /** Watch all components on this page and set validity in store accordingly. */
-  @Watch('continuationAuthorizationValid', { immediate: true })
   @Watch('existingBusinessInformationValid', { immediate: true })
-  private onContinuationInBusinessHomeValid () {
-    this.setContinuationInBusinessHomeValid(
-      this.continuationAuthorizationValid &&
-      this.existingBusinessInformationValid
+  @Watch('businessContactInfoValid', { immediate: true })
+  @Watch('authorizationProofValid', { immediate: true })
+  private onComponentValidityChanged () {
+    this.setContinuationAuthorizationPageValid(
+      this.existingBusinessInformationValid &&
+      this.businessContactInfoValid &&
+      this.authorizationProofValid
     )
   }
 
-  /** When we route to this step, validate the step and scroll to any errors. */
-  @Watch('$route')
-  private async scrollToInvalidComponent (): Promise<void> {
-    if (this.getShowErrors && this.$route.name === RouteNames.CONTINUATION_IN_BUSINESS_HOME) {
-      // scroll to invalid section
+  /** Called when user has clicked Submit (and this flag's value has changed). */
+  @Watch('getValidateSteps')
+  private async onValidateStepsChanges (val: boolean): Promise<void> {
+    if (val) {
+      // set Show Errors flag to enable and show component validation
+      this.setShowErrors(true)
+      // wait for validation to complete
       await this.$nextTick()
+      // scroll to the first error, if any
       await this.validateAndScroll(this.validFlags, this.validComponents)
+      // reset this flag so user can click Submit again and we can re-validate
+      this.setValidateSteps(false)
     }
   }
 }
@@ -144,7 +188,7 @@ export default class ContinuationInBusinessHome extends Mixins(CommonMixin, Name
   border-color: rgb(33, 33, 33); // grey darken-4
 }
 
-#continuation-in-business-home {
+#continuation-in-authorization {
   /* Set "header-counter" to 0 */
   counter-reset: header-counter;
 }
diff --git a/src/views/ContinuationIn/ContinuationInReviewConfirm.vue b/src/views/ContinuationIn/ContinuationInReviewConfirm.vue
index e5a8d2999..5e723b741 100644
--- a/src/views/ContinuationIn/ContinuationInReviewConfirm.vue
+++ b/src/views/ContinuationIn/ContinuationInReviewConfirm.vue
@@ -73,7 +73,6 @@
 
     <!-- Continuation Effective Date and Time -->
     <section
-      v-if="(getFilingStatus === FilingStatus.DRAFT) || getEffectiveDateTime.isFutureEffective"
       id="continuation-effective-date-time-section"
       class="mt-10"
     >
@@ -92,25 +91,11 @@
         :class="{ 'invalid-section': isEffectiveDateTimeInvalid }"
         :effectiveDateTime="getEffectiveDateTime"
         label="Incorporation Date and Time"
-        immediateLabel="Immediately upon approval"
-        futureEffectiveLabel="A date / time in the future (subject to approval)"
         @valid="setEffectiveDateTimeValid($event)"
         @effectiveDate="setEffectiveDate($event)"
         @isFutureEffective="setIsFutureEffective($event)"
       />
     </section>
-    <section
-      v-else
-      id="continuation-effective-date-time-section"
-      class="mt-10"
-    >
-      <header>
-        <h2>Continuation Effective Date and Time</h2>
-        <p class="mt-4">
-          The incorporation date and time will be upon approval.
-        </p>
-      </header>
-    </section>
 
     <!-- Document Delivery -->
     <section
@@ -204,7 +189,7 @@
 
     <!-- Staff Payment -->
     <section
-      v-if="isRoleStaff && getFilingStatus === FilingStatus.DRAFT"
+      v-if="isRoleStaff"
       id="staff-payment-section"
       class="mt-10"
     >
diff --git a/src/views/Dissolution/DissolutionDefineDissolution.vue b/src/views/Dissolution/DissolutionDefineDissolution.vue
index c631e8fe2..df5605f48 100644
--- a/src/views/Dissolution/DissolutionDefineDissolution.vue
+++ b/src/views/Dissolution/DissolutionDefineDissolution.vue
@@ -13,8 +13,8 @@
     </MessageBox>
 
     <section class="mt-10">
-      <header id="association-details">
-        <h2>1. {{ getDissolutionDetailsTitle }}</h2>
+      <header id="details-title">
+        <h2>1. {{ getDetailsTitle }}</h2>
       </header>
 
       <v-card
@@ -52,17 +52,17 @@
     <!-- Custodian of Records -->
     <section class="mt-10">
       <header id="custodian-header">
-        <h2>{{ isEntityCoop ? 3 : 2 }}. {{ getCustodialRecordsResources.custodianTitle }}</h2>
+        <h2>{{ isEntityCoop ? 3 : 2 }}. {{ getCustodialRecords.custodianTitle }}</h2>
         <p class="mt-4">
-          {{ getCustodialRecordsResources.sectionSubtitle }}
+          {{ getCustodialRecords.sectionSubtitle }}
         </p>
       </header>
 
       <!-- Help Section -->
       <HelpSection
-        v-if="getCustodialRecordsResources.helpSection"
+        v-if="getCustodialRecords.helpSection"
         class="mt-5"
-        :helpSection="getCustodialRecordsResources.helpSection"
+        :helpSection="getCustodialRecords.helpSection"
       />
 
       <v-card
@@ -140,8 +140,8 @@ import MessageBox from '@/components/common/MessageBox.vue'
 export default class DissolutionDefineDissolution extends Mixins(CommonMixin) {
   // Global getters
   @Getter(useStore) getBusinessLegalName!: string
-  @Getter(useStore) getCustodialRecordsResources!: CustodianResourceIF
-  @Getter(useStore) getDissolutionDetailsTitle!: string
+  @Getter(useStore) getCustodialRecords!: CustodianResourceIF
+  @Getter(useStore) getDetailsTitle!: string
   @Getter(useStore) getDissolutionStatementStep!: DissolutionStatementIF
   @Getter(useStore) getDissolutionHasCertificateDestroyed!: boolean
   @Getter(useStore) getEntityType!: CorpTypeCd
diff --git a/src/views/index.ts b/src/views/index.ts
index ef9b4db83..f4b55016b 100644
--- a/src/views/index.ts
+++ b/src/views/index.ts
@@ -12,7 +12,7 @@ export { default as AmalgamationPeopleRoles } from './Amalgamation/PeopleRoles.v
 export { default as AmalgamationReviewConfirm } from './Amalgamation/ReviewConfirm.vue'
 export { default as AmalgamationShareStructure } from './Amalgamation/ShareStructure.vue'
 
-export { default as ContinuationInBusinessHome } from './ContinuationIn/ContinuationInBusinessHome.vue'
+export { default as ContinuationInAuthorization } from './ContinuationIn/ContinuationInAuthorization.vue'
 export { default as ContinuationInBusinessBc } from './ContinuationIn/ContinuationInBusinessBc.vue'
 export { default as ContinuationInPeopleRoles } from './ContinuationIn/ContinuationInPeopleRoles.vue'
 export { default as ContinuationInReviewConfirm } from './ContinuationIn/ContinuationInReviewConfirm.vue'
diff --git a/tests/unit/Actions.spec.ts b/tests/unit/Actions.spec.ts
index e1bb26a1c..5698ad28f 100644
--- a/tests/unit/Actions.spec.ts
+++ b/tests/unit/Actions.spec.ts
@@ -111,7 +111,7 @@ describe('Actions component - Incorporation Application', () => {
 })
 
 describe('Actions component - Continuation Application', () => {
-  it('Shows "Submit and Pay" button when filing is in Draft status', async () => {
+  it('Shows "Submit" button when filing is in Draft status', async () => {
     const localVue = createLocalVue()
     localVue.use(VueRouter)
     const router = mockRouter.mock()
@@ -119,6 +119,7 @@ describe('Actions component - Continuation Application', () => {
     const wrapper = shallowMount(Actions, {
       // declare computed properties to override local and store getters:
       computed: {
+        isContinuationInFiling: () => true,
         getFilingStatus: () => FilingStatus.DRAFT,
         isShowFilePayBtn: () => true,
         isSummaryStep: () => true
@@ -134,7 +135,7 @@ describe('Actions component - Continuation Application', () => {
     expect(wrapper.find('#save-resume-btn').text()).toBe('Save and Resume Later')
     expect(wrapper.find('#back-btn > span').text()).toBe('Back')
     expect(wrapper.find('#next-btn').isVisible()).toBe(false)
-    expect(wrapper.find('#file-pay-btn').text()).toBe('Submit and Pay')
+    expect(wrapper.find('#file-pay-btn').text()).toBe('Submit')
 
     wrapper.destroy()
   })
@@ -147,6 +148,7 @@ describe('Actions component - Continuation Application', () => {
     const wrapper = shallowMount(Actions, {
       // declare computed properties to override local and store getters:
       computed: {
+        isContinuationInFiling: () => true,
         getFilingStatus: () => FilingStatus.CHANGE_REQUESTED,
         isShowFilePayBtn: () => true,
         isSummaryStep: () => true
@@ -166,6 +168,35 @@ describe('Actions component - Continuation Application', () => {
 
     wrapper.destroy()
   })
+
+  it('Shows "File and Pay" button when filing is in Approved status', async () => {
+    const localVue = createLocalVue()
+    localVue.use(VueRouter)
+    const router = mockRouter.mock()
+    router.push({ name: 'continuation-in-review-confirm', query: { id: 'T1234567' } })
+    const wrapper = shallowMount(Actions, {
+      // declare computed properties to override local and store getters:
+      computed: {
+        isContinuationInFiling: () => true,
+        getFilingStatus: () => FilingStatus.APPROVED,
+        isShowFilePayBtn: () => true,
+        isSummaryStep: () => true
+      },
+      localVue,
+      router,
+      vuetify
+    })
+
+    // verify buttons
+    expect(wrapper.find('#app-summary-cancel-btn').text()).toBe('Cancel')
+    expect(wrapper.find('#save-btn').text()).toBe('Save')
+    expect(wrapper.find('#save-resume-btn').text()).toBe('Save and Resume Later')
+    expect(wrapper.find('#back-btn > span').text()).toBe('Back')
+    expect(wrapper.find('#next-btn').isVisible()).toBe(false)
+    expect(wrapper.find('#file-pay-btn').text()).toBe('File and Pay')
+
+    wrapper.destroy()
+  })
 })
 
 describe('Emits error event if NR validation fails in file and pay', () => {
diff --git a/tests/unit/ContinuationAuthorization.spec.ts b/tests/unit/AuthorizationProof.spec.ts
similarity index 82%
rename from tests/unit/ContinuationAuthorization.spec.ts
rename to tests/unit/AuthorizationProof.spec.ts
index eb52ca5b6..1bbaba4ca 100644
--- a/tests/unit/ContinuationAuthorization.spec.ts
+++ b/tests/unit/AuthorizationProof.spec.ts
@@ -1,19 +1,19 @@
 import Vue from 'vue'
 import { wrapperFactory } from '../vitest-wrapper-factory'
-import ContinuationAuthorization from '@/components/ContinuationIn/ContinuationAuthorization.vue'
+import AuthorizationProof from '@/components/ContinuationIn/AuthorizationProof.vue'
 import FileUploadPreview from '@/components/common/FileUploadPreview.vue'
 import { DatePicker as DatePickerShared } from '@bcrs-shared-components/date-picker'
 import { FilingStatus } from '@/enums'
 import MessageBox from '@/components/common/MessageBox.vue'
 
-describe('Continuation Authorization component', () => {
+describe('Authorization Proof component', () => {
   it('renders the component correctly - draft filing', async () => {
-    const wrapper = wrapperFactory(ContinuationAuthorization)
+    const wrapper = wrapperFactory(AuthorizationProof)
     await Vue.nextTick()
 
     // verify main component exists
-    expect(wrapper.findComponent(ContinuationAuthorization).exists()).toBe(true)
-    expect(wrapper.find('#continuation-authorization').exists()).toBe(true)
+    expect(wrapper.findComponent(AuthorizationProof).exists()).toBe(true)
+    expect(wrapper.find('#authorization-proof').exists()).toBe(true)
 
     // spot check some content (structure / text)
     const firstVcard = wrapper.findAll('.v-card').at(0)
@@ -41,7 +41,7 @@ describe('Continuation Authorization component', () => {
 
   it('renders the component correctly - change-requested filing', async () => {
     const wrapper = wrapperFactory(
-      ContinuationAuthorization,
+      AuthorizationProof,
       null,
       {
         tombstone: { filingStatus: FilingStatus.CHANGE_REQUESTED },
@@ -51,8 +51,8 @@ describe('Continuation Authorization component', () => {
     await Vue.nextTick()
 
     // verify main component exists
-    expect(wrapper.findComponent(ContinuationAuthorization).exists()).toBe(true)
-    expect(wrapper.find('#continuation-authorization').exists()).toBe(true)
+    expect(wrapper.findComponent(AuthorizationProof).exists()).toBe(true)
+    expect(wrapper.find('#authorization-proof').exists()).toBe(true)
 
     // spot check some content (structure / text)
     const firstVcard = wrapper.findAll('.v-card').at(0)
diff --git a/tests/unit/ContinuationInAuthorization.spec.ts b/tests/unit/ContinuationInAuthorization.spec.ts
new file mode 100644
index 000000000..3173ec5a2
--- /dev/null
+++ b/tests/unit/ContinuationInAuthorization.spec.ts
@@ -0,0 +1,38 @@
+import Vue from 'vue'
+import { wrapperFactory } from '../vitest-wrapper-factory'
+import ContinuationInAuthorization from '@/views/ContinuationIn/ContinuationInAuthorization.vue'
+import ExtraproRegistration from '@/components/ContinuationIn/ExtraproRegistration.vue'
+import BusinessContactInfo from '@/components/common/BusinessContactInfo.vue'
+import AuthorizationProof from '@/components/ContinuationIn/AuthorizationProof.vue'
+
+describe('Continuation In Authorization component', () => {
+  it('renders the component correctly', async () => {
+    const wrapper = wrapperFactory(ContinuationInAuthorization)
+    await Vue.nextTick()
+
+    // verify main component exists
+    expect(wrapper.findComponent(ContinuationInAuthorization).exists()).toBe(true)
+    expect(wrapper.find('#continuation-in-authorization').exists()).toBe(true)
+
+    // spot check some content (structure / text)
+    const firstSection = wrapper.findAll('section').at(0)
+    expect(firstSection.find('header').exists()).toBe(true)
+    expect(firstSection.find('header h2').text()).toBe('Existing Business Information')
+    expect(firstSection.find('header p').text()).toContain('Enter information about')
+    expect(firstSection.findComponent(ExtraproRegistration).exists()).toBe(true)
+
+    const secondSection = wrapper.findAll('section').at(1)
+    expect(secondSection.find('header').exists()).toBe(true)
+    expect(secondSection.find('header h2').text()).toBe('Contact Information')
+    expect(secondSection.find('header p').text()).toContain('Enter the contact information')
+    expect(secondSection.findComponent(BusinessContactInfo).exists()).toBe(true)
+
+    const thirdSection = wrapper.findAll('section').at(2)
+    expect(thirdSection.find('header').exists()).toBe(true)
+    expect(thirdSection.find('header h2').text()).toBe('Proof of Authorization')
+    expect(thirdSection.find('header p').text()).toContain('You must provide proof')
+    expect(thirdSection.findComponent(AuthorizationProof).exists()).toBe(true)
+
+    wrapper.destroy()
+  })
+})
diff --git a/tests/unit/ContinuationInBusinessHome.spec.ts b/tests/unit/ContinuationInBusinessHome.spec.ts
deleted file mode 100644
index 5280e1d0f..000000000
--- a/tests/unit/ContinuationInBusinessHome.spec.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import Vue from 'vue'
-import { wrapperFactory } from '../vitest-wrapper-factory'
-import ContinuationInBusinessHome from '@/views/ContinuationIn/ContinuationInBusinessHome.vue'
-
-describe('Continuation In Business Home component', () => {
-  it('renders the component correctly', async () => {
-    const wrapper = wrapperFactory(ContinuationInBusinessHome)
-    await Vue.nextTick()
-
-    // verify main component exists
-    expect(wrapper.findComponent(ContinuationInBusinessHome).exists()).toBe(true)
-    expect(wrapper.find('#continuation-in-business-home').exists()).toBe(true)
-
-    // spot check some content (structure / text)
-    const firstSection = wrapper.findAll('section').at(0)
-    expect(firstSection.find('header').exists()).toBe(true)
-    expect(firstSection.find('header h2').text()).toBe('Existing Business Information')
-    expect(firstSection.find('header p').text()).toContain('Enter information about')
-    expect(firstSection.find('.v-card').exists()).toBe(true)
-    expect(firstSection.find('.v-card #extrapro-registration').exists()).toBe(true)
-
-    const secondSection = wrapper.findAll('section').at(1)
-    expect(secondSection.find('header').exists()).toBe(true)
-    expect(secondSection.find('header h2').text()).toBe('Continuation Authorization')
-    expect(secondSection.find('header p').text()).toContain('You must provide proof')
-    expect(secondSection.find('#continuation-authorization').exists()).toBe(true)
-
-    wrapper.destroy()
-  })
-})
diff --git a/tests/unit/ContinuationInReviewConfirm.spec.ts b/tests/unit/ContinuationInReviewConfirm.spec.ts
index 14f785423..f0b30d3f0 100644
--- a/tests/unit/ContinuationInReviewConfirm.spec.ts
+++ b/tests/unit/ContinuationInReviewConfirm.spec.ts
@@ -139,7 +139,6 @@ describe('Continuation In Review Confirm component', () => {
       null,
       // declare computed properties to override store getters:
       {
-        getFilingStatus: () => FilingStatus.DRAFT,
         isRoleStaff: () => true
       }
     )
@@ -157,36 +156,4 @@ describe('Continuation In Review Confirm component', () => {
 
     wrapper.destroy()
   })
-
-  it('renders the components correctly - when status = Change Requested', async () => {
-    const wrapper = wrapperFactory(
-      ContinuationInReviewConfirm,
-      null,
-      null,
-      null,
-      null,
-      // declare computed properties to override store getters:
-      {
-        getFilingStatus: () => FilingStatus.CHANGE_REQUESTED,
-        isRoleStaff: () => true
-      }
-    )
-    await Vue.nextTick()
-
-    // verify that component exists
-    expect(wrapper.findComponent(ContinuationInReviewConfirm).exists()).toBe(true)
-    expect(wrapper.find('#continuation-in-review-confirm').exists()).toBe(true)
-
-    // verify Continuation Effective Date and Time section
-    const secondSection = wrapper.find('#continuation-effective-date-time-section')
-    expect(secondSection.find('header h2').text()).toBe('Continuation Effective Date and Time')
-    expect(secondSection.find('header p').text()).toBe('The incorporation date and time will be upon approval.')
-    expect(secondSection.findComponent(EffectiveDateTime).exists()).toBe(false)
-
-    // verify Staff Payment section
-    const sixthSection = wrapper.find('#staff-payment-section')
-    expect(sixthSection.exists()).toBe(false)
-
-    wrapper.destroy()
-  })
 })
diff --git a/tests/unit/FileUploadPreview.spec.ts b/tests/unit/FileUploadPreview.spec.ts
index 17dd38b80..42100cba1 100644
--- a/tests/unit/FileUploadPreview.spec.ts
+++ b/tests/unit/FileUploadPreview.spec.ts
@@ -254,7 +254,7 @@ describe('FileUploadPreview component', () => {
     await waitForUpdate(3)
     const messages = wrapper.findAll('.error--text .v-messages__message')
     expect(messages.length).toBe(1)
-    expect(messages.at(0).text()).toBe('File content cannot be locked.')
+    expect(messages.at(0).text()).toBe('File content must not be locked.')
 
     wrapper.destroy()
   })
diff --git a/tests/unit/SummaryBusinessHomeJurisdiction.spec.ts b/tests/unit/SummaryBusinessHomeJurisdiction.spec.ts
index a08e29553..eaf9e5228 100644
--- a/tests/unit/SummaryBusinessHomeJurisdiction.spec.ts
+++ b/tests/unit/SummaryBusinessHomeJurisdiction.spec.ts
@@ -23,9 +23,9 @@ describe('Summary Business Home Jurisdiction component', () => {
     expect(wrapper.find('#summary-business-home-jurisdiction').exists()).toBe(true)
 
     // spot check some content (structure / text)
-    expect(wrapper.find('.business-home-step-error-message').exists()).toBe(true)
-    expect(wrapper.find('.business-home-step-error-message span').text()).toBe('This step is unfinished.')
-    expect(wrapper.find('.business-home-step-error-message a span').text()).toBe('Return to this step to finish it')
+    // expect(wrapper.find('.business-home-step-error-message').exists()).toBe(true)
+    // expect(wrapper.find('.business-home-step-error-message span').text()).toBe('This step is unfinished.')
+    // expect(wrapper.find('.business-home-step-error-message a span').text()).toBe('Return to this step to finish it')
 
     expect(wrapper.find('#existing-business-information-summary').exists()).toBe(true)
     const articles = wrapper.findAll('#existing-business-information-summary article')
@@ -51,9 +51,9 @@ describe('Summary Business Home Jurisdiction component', () => {
     expect(wrapper.find('#summary-business-home-jurisdiction').exists()).toBe(true)
 
     // spot check some content (structure / text)
-    expect(wrapper.find('.business-home-step-error-message').exists()).toBe(true)
-    expect(wrapper.find('.business-home-step-error-message span').text()).toBe('This step is unfinished.')
-    expect(wrapper.find('.business-home-step-error-message a span').text()).toBe('Return to this step to finish it')
+    // expect(wrapper.find('.business-home-step-error-message').exists()).toBe(true)
+    // expect(wrapper.find('.business-home-step-error-message span').text()).toBe('This step is unfinished.')
+    // expect(wrapper.find('.business-home-step-error-message a span').text()).toBe('Return to this step to finish it')
 
     expect(wrapper.find('#continuation-authorization-summary').exists()).toBe(true)