fixed rebase issues

package.json

@@ -1,6 +1,6 @@
 {
   "name": "business-edit-ui",
-  "version": "4.8.0",
+  "version": "4.9.0",
   "private": true,
   "appName": "Edit UI",
   "sbcName": "SBC Common Components",

src/mixins/filing-template-mixin.ts

@@ -3,9 +3,9 @@ import { Action, Getter } from 'pinia-class'
 import { cloneDeep } from 'lodash'
 import { DateMixin } from '@/mixins/'
 import { AddressesIF, AlterationFilingIF, BusinessInformationIF, CertifyIF, CoopAlterationIF,
-  CorrectionInformationIF, CorrectionFilingIF, CourtOrderIF, EffectiveDateTimeIF, EntitySnapshotIF,
-  ChgRegistrationFilingIF, ConversionFilingIF, NameTranslationIF, OrgPersonIF, RestorationFilingIF,
-  RestorationStateIF, SpecialResolutionFilingIF, StateFilingRestorationIF, RulesMemorandumIF }
+  CorrectionInformationIF, CorrectionFilingIF, CourtOrderIF, EffectiveDateTimeIF, EmptyBusinessInfo,
+  EntitySnapshotIF, ChgRegistrationFilingIF, ConversionFilingIF, NameTranslationIF, OrgPersonIF,
+  RestorationFilingIF, RestorationStateIF, SpecialResolutionFilingIF, StateFilingRestorationIF, RulesMemorandumIF }
   from '@/interfaces/'
 import { CompletingPartyIF, ContactPointIF, NaicsIF, NameRequestIF, ShareClassIF, SpecialResolutionIF,
   StaffPaymentIF } from '@bcrs-shared-components/interfaces/'
@@ -60,6 +60,7 @@ export default class FilingTemplateMixin extends DateMixin {
   @Getter(useStore) getOriginalNrNumber!: string
   @Getter(useStore) getRestoration!: RestorationStateIF
   @Getter(useStore) getShareClasses!: ShareClassIF[]
+  @Getter(useStore) getSnapshotNaics!: NaicsIF
   @Getter(useStore) getSpecialResolution!: SpecialResolutionIF
   @Getter(useStore) getSpecialResolutionMemorandum!: RulesMemorandumIF
   @Getter(useStore) getSpecialResolutionRules!: RulesMemorandumIF

tests/unit/filing-template-mixin.spec.ts

@@ -160,7 +160,7 @@ describe('Change of Registration Filing', () => {
   })
 
   it('correctly builds a change of registration filing', () => {
-    store.stateModel.tombstone.businessId = 'BC1234567'
+    store.stateModel.tombstone.businessId = 'FM1234567'
     store.stateModel.tombstone.filingType = FilingTypes.CHANGE_OF_REGISTRATION
     store.stateModel.tombstone.entityType = CorpTypeCd.SOLE_PROP
     store.stateModel.completingParty = {
@@ -175,7 +175,7 @@ describe('Change of Registration Filing', () => {
         addressCountry: 'CA'
       }
     }
-    store.stateModel.nameRequestLegalName = 'SomeMockBusiness'
+    store.stateModel.nameRequestLegalName = 'My Alternate Name'
     store.stateModel.entitySnapshot = {
       businessInfo: {
         foundingDate: 'Jan 01, 2000',