From 700a8b48d3cc4570d2b060f4be0ddb6c53e273bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9verin=20Beauvais?=
 <severinbeauvais@users.noreply.github.com>
Date: Thu, 16 Nov 2023 11:32:15 -0800
Subject: [PATCH] 18536 Fixed lint warnings before further development (#581)

* - app version = 5.6.0
- fixed a whack of lint warnings

* - imported CorpTypeCd directly from module to avoid type confusion
---
 package-lock.json                             |   4 +-
 package.json                                  |   2 +-
 .../Dissolution/CompleteResolution.vue        |  18 +-
 .../Dissolution/CompleteResolutionSummary.vue |   2 +-
 .../Incorporation/IncorporationDateTime.vue   |  12 +-
 .../Incorporation/ShareStructure.vue          |   4 +
 src/components/Incorporation/UploadRules.vue  |  10 +-
 src/components/Restoration/BusinessName.vue   |   4 +-
 src/components/common/ListPeopleAndRoles.vue  |  14 +-
 src/components/common/OfficeAddresses.vue     |   2 +-
 src/components/common/RegAddEditOrgPerson.vue |   4 +-
 src/dialogs/FilingSurveyDialog.vue            |   1 +
 .../filing-data-interface.ts                  |   2 +-
 .../filing-interfaces/filing-interfaces.ts    |   9 +-
 .../resource-interfaces/resource-interface.ts |   2 +-
 .../store-interfaces/state-interface.ts       |   3 +-
 src/mixins/filing-template-mixin.ts           |   3 +-
 src/resources/BreadCrumbResource.ts           |   5 +-
 src/resources/Dissolution/BC.ts               |   3 +-
 src/resources/Dissolution/BEN.ts              |   3 +-
 src/resources/Dissolution/CC.ts               |   3 +-
 src/resources/Dissolution/CP.ts               |   3 +-
 src/resources/Dissolution/GP.ts               |   3 +-
 src/resources/Dissolution/SP.ts               |   3 +-
 src/resources/Dissolution/ULC.ts              |   3 +-
 src/resources/Incorporation/BC.ts             |   3 +-
 src/resources/Incorporation/BEN.ts            |   3 +-
 src/resources/Incorporation/CC.ts             |   3 +-
 src/resources/Incorporation/CP.ts             |   3 +-
 src/resources/Incorporation/ULC.ts            |   3 +-
 src/resources/Registration/GP.ts              |   3 +-
 src/resources/Registration/SP.ts              |   3 +-
 src/services/pay-services.ts                  |   2 +-
 src/store/store.ts                            |   3 +-
 src/utils/FetchConfig.ts                      |   3 +-
 .../Incorporation/IncorporationAgreement.vue  | 177 +++++++++---------
 .../IncorporationDefineCompany.vue            |   2 +-
 .../unit/AccountContactMissingDialog.spec.ts  |  12 +-
 tests/unit/BusinessContactInfo.spec.ts        |   3 -
 tests/unit/BusinessName.spec.ts               |   5 +-
 tests/unit/FeeAcknowledgment.spec.ts          |   2 -
 tests/unit/FilingSurveyDialog.spec.ts         |   2 -
 tests/unit/IncorporationAgreement.spec.ts     |   2 +-
 tests/unit/IncorporationDateTime.spec.ts      |   4 +-
 tests/unit/InvalidFilingDialog.spec.ts        |   2 -
 tests/unit/ListNameTranslations.spec.ts       |   2 +
 tests/unit/ListShareClass.spec.ts             |   6 +-
 tests/unit/NameRequestInfo.spec.ts            |   5 +-
 tests/unit/NameTranslations.spec.ts           |   4 +-
 tests/unit/NatureOfBusiness.spec.ts           |   2 -
 tests/unit/ShareStructure.spec.ts             |   5 +-
 51 files changed, 185 insertions(+), 201 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8454250d3..e667cf63e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "business-create-ui",
-  "version": "5.5.8",
+  "version": "5.6.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "business-create-ui",
-      "version": "5.5.8",
+      "version": "5.6.0",
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
         "@bcrs-shared-components/approval-type": "1.0.19",
diff --git a/package.json b/package.json
index fc7a99e8a..cb62c9b71 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-create-ui",
-  "version": "5.5.8",
+  "version": "5.6.0",
   "private": true,
   "appName": "Create UI",
   "sbcName": "SBC Common Components",
diff --git a/src/components/Dissolution/CompleteResolution.vue b/src/components/Dissolution/CompleteResolution.vue
index 632dc7d39..2d9af477e 100644
--- a/src/components/Dissolution/CompleteResolution.vue
+++ b/src/components/Dissolution/CompleteResolution.vue
@@ -63,8 +63,8 @@
           </header>
 
           <span
-            v-for="(item, index) in getCreateResolutionResource.helpSection.helpText.section1.items"
-            :key="index"
+            v-for="(item, index1) in getCreateResolutionResource.helpSection.helpText.section1.items"
+            :key="index1"
           >
             <p
               v-if="item.type === ItemTypes.TEXT"
@@ -74,8 +74,8 @@
             <v-row v-if="item.type === ItemTypes.PARTIAL_ITEMS">
               <v-col cols="11">
                 <span
-                  v-for="(partialItem, index) in item.value"
-                  :key="index"
+                  v-for="(partialItem, index2) in item.value"
+                  :key="index2"
                 >
                   <span
                     v-if="partialItem.type === ItemTypes.TEXT"
@@ -426,8 +426,8 @@
             </v-checkbox>
             <ul>
               <li
-                v-for="(item, index) in getCreateResolutionResource.confirmSection.items"
-                :key="index"
+                v-for="(item, index1) in getCreateResolutionResource.confirmSection.items"
+                :key="index1"
                 class="mt-4"
               >
                 <v-row
@@ -450,8 +450,8 @@
                   </v-col>
                   <v-col cols="11">
                     <span
-                      v-for="(partialItem, index) in item.value"
-                      :key="index"
+                      v-for="(partialItem, index2) in item.value"
+                      :key="index2"
                     >
                       <span
                         v-if="partialItem.type === ItemTypes.TEXT"
@@ -846,7 +846,7 @@ export default class CompleteResolution extends Mixins(CommonMixin, DateMixin) {
   // v-observe-visibility property, we are able to force a re-calculation of the text area height when a user navigates
   // to the complete resolution step from another step for the first time. This results in the text area being rendered
   // to the appropriate height.
-  onResolutionVisibilityChanged (isVisible: boolean, _entry): void {
+  onResolutionVisibilityChanged (isVisible: boolean): void {
     if (isVisible) {
       this.$refs.resolutionTextRef.calculateInputHeight()
     }
diff --git a/src/components/Dissolution/CompleteResolutionSummary.vue b/src/components/Dissolution/CompleteResolutionSummary.vue
index ec6fab068..255c844ca 100644
--- a/src/components/Dissolution/CompleteResolutionSummary.vue
+++ b/src/components/Dissolution/CompleteResolutionSummary.vue
@@ -242,7 +242,7 @@ export default class CompleteResolutionSummary extends Mixins(DateMixin) {
   // v-observe-visibility property, we are able to force a re-calculation of the text area height when a user navigates
   // to the complete resolution summary step from another step for the first time. This results in the text area being
   // rendered to the appropriate height.
-  onResolutionVisibilityChanged (isVisible: boolean, _entry): void {
+  onResolutionVisibilityChanged (isVisible: boolean): void {
     if (isVisible && this.resolutionTextHeightUpdateRequired) {
       this.resolutionTextHeightUpdateRequired = false
       this.$refs.resolutionTextRef.calculateInputHeight()
diff --git a/src/components/Incorporation/IncorporationDateTime.vue b/src/components/Incorporation/IncorporationDateTime.vue
index ce0e3a7b7..533a85e28 100644
--- a/src/components/Incorporation/IncorporationDateTime.vue
+++ b/src/components/Incorporation/IncorporationDateTime.vue
@@ -340,7 +340,7 @@ export default class IncorporationDateTime extends Mixins(DateMixin) {
    * @param val The date input
    */
   @Watch('dateText')
-  private onEffectiveDateManual (val: string): void {
+  private onEffectiveDateManual (): void {
     this.constructDate()
   }
 
@@ -349,7 +349,7 @@ export default class IncorporationDateTime extends Mixins(DateMixin) {
    * @param val The hour selected
    */
   @Watch('selectHour')
-  private onHourUpdate (val: string): void {
+  private onHourUpdate (): void {
     this.constructDate()
   }
 
@@ -358,7 +358,7 @@ export default class IncorporationDateTime extends Mixins(DateMixin) {
    * @param val The minute selected
    */
   @Watch('selectMinute')
-  private onMinuteUpdate (val: string): void {
+  private onMinuteUpdate (): void {
     this.constructDate()
   }
 
@@ -367,7 +367,7 @@ export default class IncorporationDateTime extends Mixins(DateMixin) {
    * @param val The time period selected
    */
   @Watch('selectPeriod')
-  private onPeriodUpdate (val: string): void {
+  private onPeriodUpdate (): void {
     this.constructDate()
   }
 
@@ -376,8 +376,8 @@ export default class IncorporationDateTime extends Mixins(DateMixin) {
    * @param val The value of the selected radio button
    */
   @Watch('selectDate')
-  private setDateTimeChoice (val) {
-    this.isFutureEffective = val === ISFUTUREEFFECTIVE
+  private setDateTimeChoice (val: string) {
+    this.isFutureEffective = (val === ISFUTUREEFFECTIVE)
     this.isImmediate = !this.isFutureEffective
 
     // Clear DateTimes when immediate is selected
diff --git a/src/components/Incorporation/ShareStructure.vue b/src/components/Incorporation/ShareStructure.vue
index 8b2f5b2d9..e20cdc218 100644
--- a/src/components/Incorporation/ShareStructure.vue
+++ b/src/components/Incorporation/ShareStructure.vue
@@ -387,15 +387,19 @@ export default class ShareStructure extends Mixins(CurrencyLookupMixin) {
 
   // Events
   @Emit('addEditClass')
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   private emitAddEditShareClassEvent (shareClass: ShareClassIF): void {}
 
   @Emit('addEditSeries')
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   private emitAddEditShareSeriesEvent (shareSeries: ShareClassIF): void {}
 
   @Emit('removeClass')
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   private emitRemoveShareClassEvent (shareClassIndex: number): void {}
 
   @Emit('removeSeries')
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   private emitRemoveShareSeriesEvent (parentIndex: number, shareSeriesIndex: number): void {}
 
   @Emit('resetEvent')
diff --git a/src/components/Incorporation/UploadRules.vue b/src/components/Incorporation/UploadRules.vue
index 3d7ebdf2b..9c3e2a68e 100644
--- a/src/components/Incorporation/UploadRules.vue
+++ b/src/components/Incorporation/UploadRules.vue
@@ -74,23 +74,23 @@
           </p>
           <ul class="bulleted-list mt-4">
             <li
-              v-for="(item, index) in getCreateRulesResource.helpSection.helpText.section2.items"
-              :key="index"
+              v-for="(item, index1) in getCreateRulesResource.helpSection.helpText.section2.items"
+              :key="index1"
             >
               <span
                 v-if="item.type === ItemTypes.TEXT"
                 v-html="item.value"
               />
               <template v-if="item.type === ItemTypes.PARTIAL_ITEMS">
-                <template v-for="(partialItem, index) in item.value">
+                <template v-for="(partialItem, index2) in item.value">
                   <span
                     v-if="partialItem.type === ItemTypes.TEXT"
-                    :key="index"
+                    :key="index2"
                     v-html="partialItem.value"
                   />
                   <a
                     v-if="partialItem.type === ItemTypes.LINK"
-                    :key="index"
+                    :key="index2"
                     :href="partialItem.value.href"
                     target="_blank"
                   >
diff --git a/src/components/Restoration/BusinessName.vue b/src/components/Restoration/BusinessName.vue
index 4c7fcb9ad..d25f3e7a1 100644
--- a/src/components/Restoration/BusinessName.vue
+++ b/src/components/Restoration/BusinessName.vue
@@ -91,7 +91,7 @@ export default class BusinessName extends Mixins(CommonMixin, DateMixin, NameReq
   // Global actions
   @Action(useStore) setBusinessNameValid!: (x: boolean) => void
   @Action(useStore) setCorrectNameOption!: (x: CorrectNameOptions) => void
-  @Action(useStore) setNameRequest!: (x: string) => void
+  @Action(useStore) setNameRequest!: (x: NameRequestIF) => void
   @Action(useStore) setNameRequestApprovedName!: (x: string) => void
 
   // Local variable
@@ -180,7 +180,7 @@ export default class BusinessName extends Mixins(CommonMixin, DateMixin, NameReq
 
   /** Updates component validity initially and when correct name option has changed. */
   @Watch('getCorrectNameOption', { immediate: true })
-  private updateComponentValidity (val: boolean): void {
+  private updateComponentValidity (): void {
     this.setBusinessNameValid(!!this.getCorrectNameOption)
   }
 }
diff --git a/src/components/common/ListPeopleAndRoles.vue b/src/components/common/ListPeopleAndRoles.vue
index a35771d8f..670372e2d 100644
--- a/src/components/common/ListPeopleAndRoles.vue
+++ b/src/components/common/ListPeopleAndRoles.vue
@@ -56,8 +56,8 @@
 
         <!-- List Content -->
         <v-row
-          v-for="(orgPerson, index) in personList"
-          :key="index"
+          v-for="(orgPerson, index1) in personList"
+          :key="index1"
           class="people-roles-content"
           no-gutters
         >
@@ -124,8 +124,8 @@
             class="roles-column"
           >
             <p
-              v-for="(role, index) in orgPerson.roles"
-              :key="index"
+              v-for="(role, index2) in orgPerson.roles"
+              :key="index2"
             >
               {{ role.roleType }}
             </p>
@@ -149,11 +149,11 @@
             <div class="float-right">
               <span class="edit-action">
                 <v-btn
-                  :id="`officer-${index}-change-btn`"
+                  :id="`officer-${index1}-change-btn`"
                   text
                   color="primary"
                   :tabindex="disabled ? -1 : 0"
-                  @click="disabled ? null : emitPersonInfo(index)"
+                  @click="disabled ? null : emitPersonInfo(index1)"
                 >
                   <v-icon small>mdi-pencil</v-icon>
                   <span>Edit</span>
@@ -180,7 +180,7 @@
                     </v-btn>
                   </template>
                   <v-list class="more-actions-list">
-                    <v-list-item @click="emitRemovePerson(index)">
+                    <v-list-item @click="emitRemovePerson(index1)">
                       <v-list-item-title>
                         <v-icon
                           small
diff --git a/src/components/common/OfficeAddresses.vue b/src/components/common/OfficeAddresses.vue
index 1ce0aeb12..e02bbff2e 100644
--- a/src/components/common/OfficeAddresses.vue
+++ b/src/components/common/OfficeAddresses.vue
@@ -616,7 +616,7 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
 
   // Watchers
   @Watch('formValid')
-  private onFormValidityChange (val: boolean): void {
+  private onFormValidityChange (): void {
     this.emitValid()
   }
 
diff --git a/src/components/common/RegAddEditOrgPerson.vue b/src/components/common/RegAddEditOrgPerson.vue
index 4e3c22b5f..d77abeb7b 100644
--- a/src/components/common/RegAddEditOrgPerson.vue
+++ b/src/components/common/RegAddEditOrgPerson.vue
@@ -79,8 +79,8 @@
                   class="item first-name"
                   label="First Name"
                   :rules="enableRules ?
-                   (isCompletingParty ? Rules.FirstNameRulesFirmsCP :
-                   Rules.FirstNameRulesFirms) : []"
+                    (isCompletingParty ? Rules.FirstNameRulesFirmsCP :
+                      Rules.FirstNameRulesFirms) : []"
                   :readonly="isCompletingParty && !(isRoleStaff || isSbcStaff)"
                 />
                 <v-text-field
diff --git a/src/dialogs/FilingSurveyDialog.vue b/src/dialogs/FilingSurveyDialog.vue
index ce8556322..b9a2d8f0f 100644
--- a/src/dialogs/FilingSurveyDialog.vue
+++ b/src/dialogs/FilingSurveyDialog.vue
@@ -80,6 +80,7 @@ export default class FilingSurveyDialog extends Vue {
   // Pass events to parent.
   @Emit() no (): void {}
   @Emit() yes (): void {}
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   @Emit('doNotShow') doNotShow (val: boolean): void {}
 }
 </script>
diff --git a/src/interfaces/filing-interfaces/filing-data-interface.ts b/src/interfaces/filing-interfaces/filing-data-interface.ts
index 3f2da3f8e..bceedc6e7 100644
--- a/src/interfaces/filing-interfaces/filing-data-interface.ts
+++ b/src/interfaces/filing-interfaces/filing-data-interface.ts
@@ -1,5 +1,5 @@
 import { FilingCodes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 
 /** Filing data for SBC Fee Summary component. */
 export interface FilingDataIF {
diff --git a/src/interfaces/filing-interfaces/filing-interfaces.ts b/src/interfaces/filing-interfaces/filing-interfaces.ts
index 406eae7c0..b8528661c 100644
--- a/src/interfaces/filing-interfaces/filing-interfaces.ts
+++ b/src/interfaces/filing-interfaces/filing-interfaces.ts
@@ -2,7 +2,8 @@ import { BusinessAddressIF, CourtOrderIF, RegisteredRecordsAddressesIF, NaicsIF,
   OfficeAddressIF, PartyIF, ShareClassIF, SpecialResolutionIF } from '@/interfaces'
 import { ApprovalTypes, BusinessTypes, DissolutionStatementTypes, DissolutionTypes, FilingTypes,
   RestorationTypes, RelationshipTypes } from '@/enums'
-import { CorpTypeCd, CorrectNameOptions } from '@bcrs-shared-components/enums/'
+import { CorrectNameOptions } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 import { ContactPointIF } from '@bcrs-shared-components/interfaces'
 
 /**
@@ -78,7 +79,7 @@ export interface IncorporationFilingIF {
 /** Interface for registration filing data saved to the Legal API. */
 export interface RegistrationFilingIF {
   header: {
-    name: string
+    name: FilingTypes
     certifiedBy: string
     date: string
     effectiveDate?: string // not saved by UI but may be provided by API
@@ -118,7 +119,7 @@ export interface RegistrationFilingIF {
 /** Interface for dissolution filing data saved to the Legal API. */
 export interface DissolutionFilingIF {
   header: {
-    name: string
+    name: FilingTypes
     certifiedBy: string
     date: string
     effectiveDate?: string // Optional and should be set only for future effective filings
@@ -168,7 +169,7 @@ export interface DissolutionFilingIF {
 /** Interface for restoration filing data saved to the Legal API. */
 export interface RestorationFilingIF {
   header: {
-    name: string
+    name: FilingTypes
     certifiedBy: string
     date: string
     effectiveDate?: string // not saved by UI but may be provided by API
diff --git a/src/interfaces/resource-interfaces/resource-interface.ts b/src/interfaces/resource-interfaces/resource-interface.ts
index 5b0f5b8a1..fbd6267a4 100644
--- a/src/interfaces/resource-interfaces/resource-interface.ts
+++ b/src/interfaces/resource-interfaces/resource-interface.ts
@@ -3,7 +3,7 @@ import {
   PeopleAndRolesResourceIF, StepIF, CreateRulesResourceIF, CreateMemorandumResourceIF,
   CreateResolutionResourceIF, CustodianResourceIF, CompletingPartyStatementIF
 } from '@/interfaces'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 
 /** Dissolution resource interface. */
 export interface DissolutionResourceIF {
diff --git a/src/interfaces/store-interfaces/state-interface.ts b/src/interfaces/store-interfaces/state-interface.ts
index b42d19b2a..08e1b902d 100644
--- a/src/interfaces/store-interfaces/state-interface.ts
+++ b/src/interfaces/store-interfaces/state-interface.ts
@@ -1,4 +1,5 @@
-import { CorpTypeCd, CorrectNameOptions } from '@bcrs-shared-components/enums/'
+import { CorrectNameOptions } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 import {
   AccountInformationIF,
   ContactPointIF,
diff --git a/src/mixins/filing-template-mixin.ts b/src/mixins/filing-template-mixin.ts
index 892857407..a10fd59f5 100644
--- a/src/mixins/filing-template-mixin.ts
+++ b/src/mixins/filing-template-mixin.ts
@@ -14,7 +14,8 @@ import {
 import { ApprovalTypes, BusinessTypes, CoopTypes, DissolutionTypes, EffectOfOrders, FilingTypes,
   PartyTypes, RelationshipTypes, RestorationTypes, RoleTypes, StaffPaymentOptions
 } from '@/enums'
-import { CorpTypeCd, CorrectNameOptions } from '@bcrs-shared-components/enums/'
+import { CorrectNameOptions } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 
 /**
  * Mixin that provides the integration with the Legal API.
diff --git a/src/resources/BreadCrumbResource.ts b/src/resources/BreadCrumbResource.ts
index c5aed7dc7..1a408e63f 100644
--- a/src/resources/BreadCrumbResource.ts
+++ b/src/resources/BreadCrumbResource.ts
@@ -1,9 +1,8 @@
 import { FilingTypes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
+import { GetCorpNumberedDescription } from '@bcrs-shared-components/corp-type-module'
 import { BreadcrumbIF } from '@/interfaces'
 import { createPinia, setActivePinia } from 'pinia'
 import { useStore } from '@/store/store'
-import { GetCorpNumberedDescription } from '@bcrs-shared-components/corp-type-module'
 
 setActivePinia(createPinia())
 const store = useStore()
@@ -24,7 +23,7 @@ function getLegalName (): string {
 
 /** Returns numbered entity name. */
 function getNumberedEntityName (): string {
-  const getEntityType = store.getEntityType as CorpTypeCd
+  const getEntityType = store.getEntityType
   return GetCorpNumberedDescription(getEntityType)
 }
 
diff --git a/src/resources/Dissolution/BC.ts b/src/resources/Dissolution/BC.ts
index 0450e0add..1701ed5d9 100644
--- a/src/resources/Dissolution/BC.ts
+++ b/src/resources/Dissolution/BC.ts
@@ -1,7 +1,6 @@
 import { DissolutionResourceIF } from '@/interfaces'
 import { BulletListTypes, FilingCodes, ItemTypes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { DissolutionStepsCorp } from './steps'
 
 export const DissolutionResourceBc: DissolutionResourceIF = {
diff --git a/src/resources/Dissolution/BEN.ts b/src/resources/Dissolution/BEN.ts
index 4edab786b..3eae27415 100644
--- a/src/resources/Dissolution/BEN.ts
+++ b/src/resources/Dissolution/BEN.ts
@@ -1,7 +1,6 @@
 import { DissolutionResourceIF } from '@/interfaces'
 import { BulletListTypes, FilingCodes, ItemTypes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { DissolutionStepsCorp } from './steps'
 
 export const DissolutionResourceBen: DissolutionResourceIF = {
diff --git a/src/resources/Dissolution/CC.ts b/src/resources/Dissolution/CC.ts
index 9ed1bd22c..810b7a366 100644
--- a/src/resources/Dissolution/CC.ts
+++ b/src/resources/Dissolution/CC.ts
@@ -1,7 +1,6 @@
 import { DissolutionResourceIF } from '@/interfaces'
 import { BulletListTypes, FilingCodes, ItemTypes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { DissolutionStepsCorp } from './steps'
 
 export const DissolutionResourceCc: DissolutionResourceIF = {
diff --git a/src/resources/Dissolution/CP.ts b/src/resources/Dissolution/CP.ts
index 231f03dbc..d34589ef9 100644
--- a/src/resources/Dissolution/CP.ts
+++ b/src/resources/Dissolution/CP.ts
@@ -1,7 +1,6 @@
 import { DissolutionResourceIF } from '@/interfaces'
 import { BulletListTypes, DissolutionStatementTypes, FilingCodes, ItemTypes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { DissolutionStepsCoop } from './steps'
 
 export const DissolutionResourceCp: DissolutionResourceIF = {
diff --git a/src/resources/Dissolution/GP.ts b/src/resources/Dissolution/GP.ts
index 14c23e7d8..488891c85 100644
--- a/src/resources/Dissolution/GP.ts
+++ b/src/resources/Dissolution/GP.ts
@@ -1,7 +1,6 @@
 import { DissolutionResourceIF } from '@/interfaces'
 import { FilingCodes, ItemTypes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { DissolutionStepsFirm } from './steps'
 
 export const DissolutionResourceGp: DissolutionResourceIF = {
diff --git a/src/resources/Dissolution/SP.ts b/src/resources/Dissolution/SP.ts
index c603d8901..9f9b649ae 100644
--- a/src/resources/Dissolution/SP.ts
+++ b/src/resources/Dissolution/SP.ts
@@ -1,7 +1,6 @@
 import { DissolutionResourceIF } from '@/interfaces'
 import { FilingCodes, ItemTypes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { DissolutionStepsFirm } from './steps'
 
 export const DissolutionResourceSp: DissolutionResourceIF = {
diff --git a/src/resources/Dissolution/ULC.ts b/src/resources/Dissolution/ULC.ts
index cba779a75..2976808ba 100644
--- a/src/resources/Dissolution/ULC.ts
+++ b/src/resources/Dissolution/ULC.ts
@@ -1,7 +1,6 @@
 import { DissolutionResourceIF } from '@/interfaces'
 import { BulletListTypes, FilingCodes, ItemTypes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { DissolutionStepsCorp } from './steps'
 
 export const DissolutionResourceUlc: DissolutionResourceIF = {
diff --git a/src/resources/Incorporation/BC.ts b/src/resources/Incorporation/BC.ts
index 5fb72b1e2..850d94646 100644
--- a/src/resources/Incorporation/BC.ts
+++ b/src/resources/Incorporation/BC.ts
@@ -1,8 +1,7 @@
 import { IncorporationResourceIF } from '@/interfaces'
 import { FilingCodes, RuleIds } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { IncorporationStepsCorp } from './steps'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 
 export const IncorporationResourceBc: IncorporationResourceIF = {
   entityType: CorpTypeCd.BC_COMPANY,
diff --git a/src/resources/Incorporation/BEN.ts b/src/resources/Incorporation/BEN.ts
index f20c94f61..b57a2687c 100644
--- a/src/resources/Incorporation/BEN.ts
+++ b/src/resources/Incorporation/BEN.ts
@@ -1,8 +1,7 @@
 import { IncorporationResourceIF } from '@/interfaces'
 import { FilingCodes, RuleIds } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { IncorporationStepsCorp } from './steps'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 
 export const IncorporationResourceBen: IncorporationResourceIF = {
   entityType: CorpTypeCd.BENEFIT_COMPANY,
diff --git a/src/resources/Incorporation/CC.ts b/src/resources/Incorporation/CC.ts
index dd3cae18e..2627e20a1 100644
--- a/src/resources/Incorporation/CC.ts
+++ b/src/resources/Incorporation/CC.ts
@@ -1,8 +1,7 @@
 import { IncorporationResourceIF } from '@/interfaces'
 import { FilingCodes, RuleIds } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { IncorporationStepsCorp } from './steps'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 
 export const IncorporationResourceCc: IncorporationResourceIF = {
   entityType: CorpTypeCd.BC_CCC,
diff --git a/src/resources/Incorporation/CP.ts b/src/resources/Incorporation/CP.ts
index 8f9246ff4..e12a36004 100644
--- a/src/resources/Incorporation/CP.ts
+++ b/src/resources/Incorporation/CP.ts
@@ -1,7 +1,6 @@
 import { IncorporationResourceIF } from '@/interfaces'
 import { FilingCodes, RuleIds, ItemTypes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { IncorporationStepsCoop } from '@/resources/Incorporation/steps'
 
 export const IncorporationResourceCp: IncorporationResourceIF = {
diff --git a/src/resources/Incorporation/ULC.ts b/src/resources/Incorporation/ULC.ts
index 2cf160e68..eeb5f38da 100644
--- a/src/resources/Incorporation/ULC.ts
+++ b/src/resources/Incorporation/ULC.ts
@@ -1,8 +1,7 @@
 import { IncorporationResourceIF } from '@/interfaces'
 import { FilingCodes, RuleIds } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { IncorporationStepsCorp } from './steps'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 
 export const IncorporationResourceUlc: IncorporationResourceIF = {
   entityType: CorpTypeCd.BC_ULC_COMPANY,
diff --git a/src/resources/Registration/GP.ts b/src/resources/Registration/GP.ts
index 8c032e7e7..64fd81c70 100644
--- a/src/resources/Registration/GP.ts
+++ b/src/resources/Registration/GP.ts
@@ -1,7 +1,6 @@
 import { RegistrationResourceIF } from '@/interfaces'
 import { FilingCodes, RuleIds } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { RegistrationSteps } from './steps'
 
 export const RegistrationResourceGp: RegistrationResourceIF = {
diff --git a/src/resources/Registration/SP.ts b/src/resources/Registration/SP.ts
index 3ac17f1d1..2bbba4d2b 100644
--- a/src/resources/Registration/SP.ts
+++ b/src/resources/Registration/SP.ts
@@ -1,7 +1,6 @@
 import { RegistrationResourceIF } from '@/interfaces'
 import { FilingCodes, RuleIds } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { RegistrationSteps } from './steps'
 
 export const RegistrationResourceSp: RegistrationResourceIF = {
diff --git a/src/services/pay-services.ts b/src/services/pay-services.ts
index 46073cb14..bfc8e8dce 100644
--- a/src/services/pay-services.ts
+++ b/src/services/pay-services.ts
@@ -1,6 +1,6 @@
 import { AxiosInstance as axios } from '@/utils'
 import { FilingCodes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 import { FeesIF } from '@/interfaces'
 
 /**
diff --git a/src/store/store.ts b/src/store/store.ts
index 5c6e66e4c..540acea8a 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -14,7 +14,8 @@ import {
   RelationshipTypes,
   RestorationTypes
 } from '@/enums'
-import { CorpTypeCd, CorrectNameOptions } from '@bcrs-shared-components/enums/'
+import { CorrectNameOptions } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 import {
   AccountInformationIF,
   AddressIF,
diff --git a/src/utils/FetchConfig.ts b/src/utils/FetchConfig.ts
index 29a4b737f..a435d937e 100644
--- a/src/utils/FetchConfig.ts
+++ b/src/utils/FetchConfig.ts
@@ -34,7 +34,8 @@ export async function FetchConfig (): Promise<any> {
   const dashboardUrl: string = import.meta.env.VUE_APP_DASHBOARD_URL
   sessionStorage.setItem('DASHBOARD_URL', dashboardUrl)
 
-  const legalApiUrl: string = (import.meta.env.VUE_APP_LEGAL_API_URL + import.meta.env.VUE_APP_LEGAL_API_VERSION_2 + '/')
+  const legalApiUrl: string =
+    (import.meta.env.VUE_APP_LEGAL_API_URL + import.meta.env.VUE_APP_LEGAL_API_VERSION_2 + '/')
   // set base URL for axios calls
   axios.defaults.baseURL = legalApiUrl
 
diff --git a/src/views/Incorporation/IncorporationAgreement.vue b/src/views/Incorporation/IncorporationAgreement.vue
index 507354dfd..2965b4dc4 100644
--- a/src/views/Incorporation/IncorporationAgreement.vue
+++ b/src/views/Incorporation/IncorporationAgreement.vue
@@ -82,9 +82,9 @@
           class="incorporation-agreement-help"
         >
           <div
-            v-for="(item, index) in getIncorporationAgreementResource.helpSection"
-            :id="`agreement-help-${index}`"
-            :key="index"
+            v-for="(item, index1) in getIncorporationAgreementResource.helpSection"
+            :id="`agreement-help-${index1}`"
+            :key="index1"
             class="help-div"
           >
             <h3>
@@ -98,17 +98,17 @@
               {{ item.header }}
             </h3>
             <ul
-              v-for="(text, index) in item.helpText"
-              :id="`agreement-help-text-${index}`"
-              :key="index"
+              v-for="(text, index2) in item.helpText"
+              :id="`agreement-help-text-${index2}`"
+              :key="index2"
               class="help-div"
             >
               <li>{{ text }}</li>
             </ul>
             <ul
-              v-for="(text, index) in item.statements"
-              :id="`agreement-statements-${index}`"
-              :key="index"
+              v-for="(text, index2) in item.statements"
+              :id="`agreement-statements-${index2}`"
+              :key="index2"
               class="articles-statements"
             >
               <li>{{ text }}</li>
@@ -170,93 +170,91 @@
     </section>
 
     <!-- Sample Templates -->
-    <template>
-      <section class="mt-10">
-        <header>
-          <h2>2. Sample Templates</h2>
-        </header>
-
-        <p>
-          For your convenience, we have provided a sample Incorporation Agreement and a set of sample
-          {{ entityDescription }} Articles.
-        </p>
-        <v-card
-          flat
-          class="share-structure-check-panel py-8 px-6"
-        >
-          <div class="share-structure-check-header">
-            <v-icon color="black">
-              mdi-information-outline
-            </v-icon>
-            <span> Share Structure Check:</span>
-          </div>
+    <section class="mt-10">
+      <header>
+        <h2>2. Sample Templates</h2>
+      </header>
 
-          <div class="share-structure-check-text">
-            The sample articles CAN ONLY be used if the company's share structure DOES NOT contain a class or series
-            with special rights or restrictions.
-            <span
-              class="read-more-btn"
-              @click="readMoreFlag = true"
-            >
-              <span v-if="!readMoreFlag">Read more...</span>
-            </span>
-            <div v-if="readMoreFlag">
-              <div class="read-more-line">
-                If the corporation's share structure contains a class or series with special rights or restrictions,
-                you need to create a unique set of Articles for the company and outline these special rights or
-                restrictions in the Articles.
-              </div>
-              <div class="read-more-line">
-                We recommend seeking professional assistance from a lawyer or accountant to help you prepare your
-                Incorporation Agreement and Articles.
-                <span
-                  class="read-more-btn"
-                  @click="readMoreFlag = false"
-                >
-                  <span>Read less...</span>
-                </span>
-              </div>
+      <p>
+        For your convenience, we have provided a sample Incorporation Agreement and a set of sample
+        {{ entityDescription }} Articles.
+      </p>
+      <v-card
+        flat
+        class="share-structure-check-panel py-8 px-6"
+      >
+        <div class="share-structure-check-header">
+          <v-icon color="black">
+            mdi-information-outline
+          </v-icon>
+          <span> Share Structure Check:</span>
+        </div>
+
+        <div class="share-structure-check-text">
+          The sample articles CAN ONLY be used if the company's share structure DOES NOT contain a class or series
+          with special rights or restrictions.
+          <span
+            class="read-more-btn"
+            @click="readMoreFlag = true"
+          >
+            <span v-if="!readMoreFlag">Read more...</span>
+          </span>
+          <div v-if="readMoreFlag">
+            <div class="read-more-line">
+              If the corporation's share structure contains a class or series with special rights or restrictions,
+              you need to create a unique set of Articles for the company and outline these special rights or
+              restrictions in the Articles.
+            </div>
+            <div class="read-more-line">
+              We recommend seeking professional assistance from a lawyer or accountant to help you prepare your
+              Incorporation Agreement and Articles.
+              <span
+                class="read-more-btn"
+                @click="readMoreFlag = false"
+              >
+                <span>Read less...</span>
+              </span>
             </div>
           </div>
+        </div>
 
-          <div class="d-flex flex-column flex-sm-row justify-center align-center mt-6">
-            <img
-              src="@/assets/images/BCRegistries_Sample_IncoporationAgreement_x2.png"
-              class="preview-image"
+        <div class="d-flex flex-column flex-sm-row justify-center align-center mt-6">
+          <img
+            src="@/assets/images/BCRegistries_Sample_IncoporationAgreement_x2.png"
+            class="preview-image"
+          >
+          <div class="px-8" />
+          <div class="download-link-container py-5">
+            <v-icon
+              color="primary"
+              class="mt-n1"
             >
-            <div class="px-8" />
-            <div class="download-link-container py-5">
-              <v-icon
-                color="primary"
-                class="mt-n1"
-              >
-                mdi-file-pdf-outline
-              </v-icon>
-              <a
-                :href="documentURL"
-                download
-                class="ml-1"
-              >
-                Download the sample Incorporation Agreement and Company Articles
-              </a>
-            </div>
+              mdi-file-pdf-outline
+            </v-icon>
+            <a
+              :href="documentURL"
+              download
+              class="ml-1"
+            >
+              Download the sample Incorporation Agreement and Company Articles
+            </a>
           </div>
-        </v-card>
-      </section>
+        </div>
+      </v-card>
+    </section>
 
-      <section class="mt-10">
-        <header id="confirm-agreement">
-          <h2>3. Confirm Incorporation Agreement and Article Completion</h2>
-        </header>
+    <section class="mt-10">
+      <header id="confirm-agreement">
+        <h2>3. Confirm Incorporation Agreement and Article Completion</h2>
+      </header>
 
-        <v-card
-          flat
-          class="mt-6"
-        >
-          <AgreementType :showErrorSummary="!getIncorporationAgreementStep.valid" />
-        </v-card>
-      </section>
-    </template>
+      <v-card
+        flat
+        class="mt-6"
+      >
+        <AgreementType :showErrorSummary="!getIncorporationAgreementStep.valid" />
+      </v-card>
+    </section>
   </div>
 </template>
 
@@ -266,8 +264,7 @@ import { Getter } from 'pinia-class'
 import { useStore } from '@/store/store'
 import AgreementType from '@/components/common/AgreementType.vue'
 import { IncorporationAgreementIF } from '@/interfaces'
-import { RouteNames } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd, RouteNames } from '@/enums'
 import { CommonMixin } from '@/mixins'
 import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 
diff --git a/src/views/Incorporation/IncorporationDefineCompany.vue b/src/views/Incorporation/IncorporationDefineCompany.vue
index 4847498d5..fad02aae1 100644
--- a/src/views/Incorporation/IncorporationDefineCompany.vue
+++ b/src/views/Incorporation/IncorporationDefineCompany.vue
@@ -298,7 +298,7 @@ export default class IncorporationDefineCompany extends Mixins(CommonMixin) {
   }
 
   @Watch('getNameTranslationsValid', { deep: true })
-  private onNameTranslationsValid (valid: boolean): void {
+  private onNameTranslationsValid (): void {
     this.setDefineCompanyStepValidity(
       this.businessContactFormValid &&
       this.addressFormValid &&
diff --git a/tests/unit/AccountContactMissingDialog.spec.ts b/tests/unit/AccountContactMissingDialog.spec.ts
index a7a4417d5..f1fdbd28c 100644
--- a/tests/unit/AccountContactMissingDialog.spec.ts
+++ b/tests/unit/AccountContactMissingDialog.spec.ts
@@ -1,20 +1,13 @@
 import { shallowMount } from '@vue/test-utils'
 import AccountContactMissingDialog from '@/dialogs/AccountContactMissingDialog.vue'
 import Vuetify from 'vuetify'
-import Vue from 'vue'
 
-Vue.use(Vuetify)
+const vuetify = new Vuetify({})
 
 // Prevent the warning "[Vuetify] Unable to locate target [data-app]"
 document.body.setAttribute('data-app', 'true')
 
 describe('AccountContactMissingDialog.vue', () => {
-  let vuetify: any
-
-  beforeEach(() => {
-    vuetify = new Vuetify()
-  })
-
   it('renders the dialog', () => {
     const wrapper = shallowMount(AccountContactMissingDialog, {
       vuetify,
@@ -37,6 +30,7 @@ describe('AccountContactMissingDialog.vue', () => {
       vuetify,
       propsData: { dialog: true }
     })
+    const vm = wrapper.vm as any
 
     // Override window.location
     Object.defineProperty(window, 'location', {
@@ -45,7 +39,7 @@ describe('AccountContactMissingDialog.vue', () => {
     })
 
     // Calling the method directly
-    wrapper.vm.redirectToUserProfile()
+    vm.redirectToUserProfile()
 
     // Checking the logic inside the method
     expect(window.location.href).toBe('https://dev.account.bcregistry.gov.bc.ca/userprofile')
diff --git a/tests/unit/BusinessContactInfo.spec.ts b/tests/unit/BusinessContactInfo.spec.ts
index 19f15fde6..f7aae267d 100644
--- a/tests/unit/BusinessContactInfo.spec.ts
+++ b/tests/unit/BusinessContactInfo.spec.ts
@@ -3,12 +3,9 @@ import Vuetify from 'vuetify'
 import { mount, Wrapper } from '@vue/test-utils'
 import { getLastEvent } from '../get-last-event'
 import { createPinia, setActivePinia } from 'pinia'
-import { useStore } from '@/store/store'
 import BusinessContactInfo from '@/components/common/BusinessContactInfo.vue'
 
 setActivePinia(createPinia())
-const store = useStore()
-
 const vuetify = new Vuetify({})
 
 // Events
diff --git a/tests/unit/BusinessName.spec.ts b/tests/unit/BusinessName.spec.ts
index 242c5ea7f..2716ec184 100644
--- a/tests/unit/BusinessName.spec.ts
+++ b/tests/unit/BusinessName.spec.ts
@@ -7,7 +7,8 @@ import LegalServices from '@/services/legal-services'
 import BusinessName from '@/components/Restoration/BusinessName.vue'
 import { CorrectName } from '@bcrs-shared-components/correct-name/'
 import NameRequestInfo from '@/components/common/NameRequestInfo.vue'
-import { CorpTypeCd, CorrectNameOptions, FilingTypes } from '@/enums'
+import { CorrectNameOptions, FilingTypes } from '@/enums'
+import { CorpTypeCd } from '@bcrs-shared-components/enums'
 import { vi } from 'vitest'
 
 // mock the console.warn function to hide "[Vuetify] Unable to locate target XXX"
@@ -18,7 +19,7 @@ setActivePinia(createPinia())
 const store = useStore()
 
 // mock services function
-const mockFetchValidContactNr = vi.spyOn((LegalServices as any), 'updateFiling').mockImplementation()
+vi.spyOn((LegalServices as any), 'updateFiling').mockImplementation(() => {})
 
 describe('Business Name component', () => {
   let wrapper: any
diff --git a/tests/unit/FeeAcknowledgment.spec.ts b/tests/unit/FeeAcknowledgment.spec.ts
index 8aefa37a0..ccfa77bd2 100644
--- a/tests/unit/FeeAcknowledgment.spec.ts
+++ b/tests/unit/FeeAcknowledgment.spec.ts
@@ -1,12 +1,10 @@
 import Vuetify from 'vuetify'
 import { createPinia, setActivePinia } from 'pinia'
-import { useStore } from '@/store/store'
 import { mount } from '@vue/test-utils'
 import FeeAcknowledgement from '@/components/Registration/FeeAcknowledgement.vue'
 
 const vuetify = new Vuetify({})
 setActivePinia(createPinia())
-const store = useStore()
 
 describe('Stepper component', () => {
   let wrapper: any
diff --git a/tests/unit/FilingSurveyDialog.spec.ts b/tests/unit/FilingSurveyDialog.spec.ts
index e5d7fff62..70ccbf91d 100644
--- a/tests/unit/FilingSurveyDialog.spec.ts
+++ b/tests/unit/FilingSurveyDialog.spec.ts
@@ -1,13 +1,11 @@
 import Vue from 'vue'
 import Vuetify from 'vuetify'
 import { createPinia, setActivePinia } from 'pinia'
-import { useStore } from '@/store/store'
 import { mount } from '@vue/test-utils'
 import FilingSurveyDialog from '@/dialogs/FilingSurveyDialog.vue'
 
 const vuetify = new Vuetify({})
 setActivePinia(createPinia())
-const store = useStore()
 
 describe('Filing Survey Dialog', () => {
   it('renders the component properly', () => {
diff --git a/tests/unit/IncorporationAgreement.spec.ts b/tests/unit/IncorporationAgreement.spec.ts
index e5a78653a..12811724b 100644
--- a/tests/unit/IncorporationAgreement.spec.ts
+++ b/tests/unit/IncorporationAgreement.spec.ts
@@ -1,4 +1,4 @@
-import { shallowWrapperFactory, wrapperFactory } from '../jest-wrapper-factory'
+import { wrapperFactory } from '../jest-wrapper-factory'
 import IncorporationAgreement from '@/views/Incorporation/IncorporationAgreement.vue'
 import { IncorporationResources } from '@/resources/'
 
diff --git a/tests/unit/IncorporationDateTime.spec.ts b/tests/unit/IncorporationDateTime.spec.ts
index 3e656e2ae..001ea087d 100644
--- a/tests/unit/IncorporationDateTime.spec.ts
+++ b/tests/unit/IncorporationDateTime.spec.ts
@@ -12,10 +12,10 @@ import { createLocalVue, mount } from '@vue/test-utils'
 import IncorporationDateTime from '@/components/Incorporation/IncorporationDateTime.vue'
 
 const vuetify = new Vuetify({})
-
-// Store
 setActivePinia(createPinia())
 const store = useStore()
+
+// Prevent the warning "[Vuetify] Unable to locate target [data-app]"
 document.body.setAttribute('data-app', 'true')
 
 describe('Incorporation Date Time component', () => {
diff --git a/tests/unit/InvalidFilingDialog.spec.ts b/tests/unit/InvalidFilingDialog.spec.ts
index 3647ec584..cfc5d0efb 100644
--- a/tests/unit/InvalidFilingDialog.spec.ts
+++ b/tests/unit/InvalidFilingDialog.spec.ts
@@ -1,13 +1,11 @@
 import Vue from 'vue'
 import Vuetify from 'vuetify'
 import { createPinia, setActivePinia } from 'pinia'
-import { useStore } from '@/store/store'
 import { shallowMount, mount } from '@vue/test-utils'
 import InvalidIncorporationApplicationDialog from '@/dialogs/InvalidFilingDialog.vue'
 
 const vuetify = new Vuetify({})
 setActivePinia(createPinia())
-const store = useStore()
 
 // Prevent the warning "[Vuetify] Unable to locate target [data-app]"
 document.body.setAttribute('data-app', 'true')
diff --git a/tests/unit/ListNameTranslations.spec.ts b/tests/unit/ListNameTranslations.spec.ts
index 8f53432a2..9e423b8e3 100644
--- a/tests/unit/ListNameTranslations.spec.ts
+++ b/tests/unit/ListNameTranslations.spec.ts
@@ -10,6 +10,8 @@ import ListNameTranslations from '@/components/common/ListNameTranslations.vue'
 const vuetify = new Vuetify({})
 setActivePinia(createPinia())
 const store = useStore()
+
+// Prevent the warning "[Vuetify] Unable to locate target [data-app]"
 document.body.setAttribute('data-app', 'true')
 
 // Local references
diff --git a/tests/unit/ListShareClass.spec.ts b/tests/unit/ListShareClass.spec.ts
index 5f46a2fb9..489d5c171 100644
--- a/tests/unit/ListShareClass.spec.ts
+++ b/tests/unit/ListShareClass.spec.ts
@@ -1,15 +1,13 @@
 import Vuetify from 'vuetify'
 import { createPinia, setActivePinia } from 'pinia'
-import { useStore } from '@/store/store'
 import { createLocalVue, mount } from '@vue/test-utils'
 import ListShareClass from '@/components/Incorporation/ListShareClass.vue'
 
 const vuetify = new Vuetify({})
 const localVue = createLocalVue()
-
-// Store
 setActivePinia(createPinia())
-const store = useStore()
+
+// Prevent the warning "[Vuetify] Unable to locate target [data-app]"
 document.body.setAttribute('data-app', 'true')
 
 describe('List Shares and Series component', () => {
diff --git a/tests/unit/NameRequestInfo.spec.ts b/tests/unit/NameRequestInfo.spec.ts
index 7cc549311..cdf3496fe 100644
--- a/tests/unit/NameRequestInfo.spec.ts
+++ b/tests/unit/NameRequestInfo.spec.ts
@@ -4,12 +4,15 @@ import { mount } from '@vue/test-utils'
 import { createPinia, setActivePinia } from 'pinia'
 import { useStore } from '@/store/store'
 import NameRequestInfo from '@/components/common/NameRequestInfo.vue'
-import { CorpTypeCd, NameRequestStates } from '@/enums'
+import { NameRequestStates } from '@/enums'
+import { CorpTypeCd } from '@bcrs-shared-components/enums'
 import { NameRequestIF } from '@/interfaces'
 
 const vuetify = new Vuetify({})
 setActivePinia(createPinia())
 const store = useStore()
+
+// Prevent the warning "[Vuetify] Unable to locate target [data-app]"
 document.body.setAttribute('data-app', 'true')
 
 const mockNrData = {
diff --git a/tests/unit/NameTranslations.spec.ts b/tests/unit/NameTranslations.spec.ts
index 38d862114..9d25ea7c3 100644
--- a/tests/unit/NameTranslations.spec.ts
+++ b/tests/unit/NameTranslations.spec.ts
@@ -6,11 +6,13 @@ import { useStore } from '@/store/store'
 import NameTranslations from '@/components/common/NameTranslations.vue'
 import AddNameTranslation from '@/components/common/AddNameTranslation.vue'
 import ListNameTranslations from '@/components/common/ListNameTranslations.vue'
-import { CorpTypeCd } from '@/enums'
+import { CorpTypeCd } from '@bcrs-shared-components/enums'
 
 const vuetify = new Vuetify({})
 setActivePinia(createPinia())
 const store = useStore()
+
+// Prevent the warning "[Vuetify] Unable to locate target [data-app]"
 document.body.setAttribute('data-app', 'true')
 
 describe('Name Translations component', () => {
diff --git a/tests/unit/NatureOfBusiness.spec.ts b/tests/unit/NatureOfBusiness.spec.ts
index 9e8ab428d..55b3c892d 100644
--- a/tests/unit/NatureOfBusiness.spec.ts
+++ b/tests/unit/NatureOfBusiness.spec.ts
@@ -1,12 +1,10 @@
 import Vuetify from 'vuetify'
 import { createPinia, setActivePinia } from 'pinia'
-import { useStore } from '@/store/store'
 import { shallowMount } from '@vue/test-utils'
 import NatureOfBusiness from '@/components/Registration/NatureOfBusiness.vue'
 
 const vuetify = new Vuetify({})
 setActivePinia(createPinia())
-const store = useStore()
 
 describe('Nature Of Business component', () => {
   let wrapper: any
diff --git a/tests/unit/ShareStructure.spec.ts b/tests/unit/ShareStructure.spec.ts
index 2aee9efc1..ee295199d 100644
--- a/tests/unit/ShareStructure.spec.ts
+++ b/tests/unit/ShareStructure.spec.ts
@@ -6,7 +6,7 @@ import { useStore } from '@/store/store'
 import ShareStructure from '@/components/Incorporation/ShareStructure.vue'
 import { ShareClassIF } from '@/interfaces'
 import { waitForUpdate } from '../wait-for-update'
-import { CorpTypeCd } from '@/enums'
+import { CorpTypeCd } from '@bcrs-shared-components/enums'
 
 const vuetify = new Vuetify({})
 setActivePinia(createPinia())
@@ -47,7 +47,10 @@ function createComponent (
 ): Wrapper<ShareStructure> {
   const localVue = createLocalVue()
   localVue.use(Vuetify)
+
+  // Prevent the warning "[Vuetify] Unable to locate target [data-app]"
   document.body.setAttribute('data-app', 'true')
+
   return mount(ShareStructure, {
     localVue,
     propsData: {