fix: dark mode not working in editors (#1773)

packages/snjs/lib/Application/Application.ts

@@ -1497,7 +1497,10 @@ export class SNApplication
     const syncEventCallback = async (eventName: ExternalServices.SyncEvent) => {
       const appEvent = applicationEventForSyncEvent(eventName)
       if (appEvent) {
+        await this.protocolService.onSyncEvent(eventName)
+
         await this.notifyEvent(appEvent)
+
         if (appEvent === ApplicationEvent.CompletedFullSync) {
           if (!this.handledFullSyncStage) {
             this.handledFullSyncStage = true
@@ -1505,7 +1508,6 @@ export class SNApplication
           }
         }
       }
-      await this.protocolService.onSyncEvent(eventName)
     }
     const uninstall = this.syncService.addEventObserver(syncEventCallback)
     this.serviceObservers.push(uninstall)

packages/snjs/lib/Services/Features/FeaturesService.ts

@@ -44,6 +44,7 @@ import {
   SetOfflineFeaturesFunctionResponse,
   StorageKey,
 } from '@standardnotes/services'
+import { FeatureIdentifier } from '@standardnotes/features'
 
 type GetOfflineSubscriptionDetailsResponse = OfflineSubscriptionEntitlements | ClientDisplayableError
 
@@ -145,7 +146,10 @@ export class SNFeaturesService
 
   override async handleApplicationStage(stage: ApplicationStage): Promise<void> {
     await super.handleApplicationStage(stage)
+
     if (stage === ApplicationStage.FullSyncCompleted_13) {
+      void this.addDarkTheme()
+
       if (!this.hasOnlineSubscription()) {
         const offlineRepo = this.getOfflineRepo()
         if (offlineRepo) {
@@ -155,6 +159,14 @@ export class SNFeaturesService
     }
   }
 
+  private async addDarkTheme() {
+    const darkThemeFeature = FeaturesImports.FindNativeFeature(FeatureIdentifier.DarkTheme)
+
+    if (darkThemeFeature) {
+      await this.mapRemoteNativeFeaturesToItems([darkThemeFeature])
+    }
+  }
+
   public enableExperimentalFeature(identifier: FeaturesImports.FeatureIdentifier): void {
     const feature = this.getUserFeature(identifier)
     if (!feature) {
@@ -366,7 +378,7 @@ export class SNFeaturesService
     if (!arraysEqual(this.roles, roles)) {
       void this.notifyEvent(FeaturesEvent.UserRolesChanged)
     }
-    await this.storageService.setValue(StorageKey.UserRoles, this.roles)
+    this.storageService.setValue(StorageKey.UserRoles, this.roles)
   }
 
   public async didDownloadFeatures(features: FeaturesImports.FeatureDescription[]): Promise<void> {
@@ -448,7 +460,15 @@ export class SNFeaturesService
     return FeaturesImports.FindNativeFeature(featureId)?.deprecated === true
   }
 
+  public isFreeFeature(featureId: FeaturesImports.FeatureIdentifier) {
+    return [FeatureIdentifier.DarkTheme].includes(featureId)
+  }
+
   public getFeatureStatus(featureId: FeaturesImports.FeatureIdentifier): FeatureStatus {
+    if (this.isFreeFeature(featureId)) {
+      return FeatureStatus.Entitled
+    }
+
     const isDeprecated = this.isFeatureDeprecated(featureId)
     if (isDeprecated) {
       if (this.hasPaidOnlineOrOfflineSubscription()) {
@@ -548,7 +568,9 @@ export class SNFeaturesService
 
     let hasChanges = false
     const now = new Date()
-    const expired = new Date(feature.expires_at || 0).getTime() < now.getTime()
+    const expired = this.isFreeFeature(feature.identifier)
+      ? false
+      : new Date(feature.expires_at || 0).getTime() < now.getTime()
 
     const existingItem = currentItems.find((item) => {
       if (item.content.package_info) {

packages/snjs/mocha/application.test.js

@@ -1,12 +1,11 @@
 /* eslint-disable no-unused-expressions */
 /* eslint-disable no-undef */
+import { BaseItemCounts } from './lib/Applications.js'
 import * as Factory from './lib/factory.js'
 chai.use(chaiAsPromised)
 const expect = chai.expect
 
 describe('application instances', () => {
-  const BASE_ITEM_COUNT = 2 /** Default items key, user preferences */
-
   const syncOptions = {
     checkIntegrity: true,
     awaitAll: true,
@@ -27,8 +26,8 @@ describe('application instances', () => {
     expect(app1.payloadManager).to.not.equal(app2.payloadManager)
 
     await Factory.createMappedNote(app1)
-    expect(app1.itemManager.items.length).length.to.equal(BASE_ITEM_COUNT + 1)
-    expect(app2.itemManager.items.length).to.equal(BASE_ITEM_COUNT)
+    expect(app1.itemManager.items.length).length.to.equal(BaseItemCounts.DefaultItems + 1)
+    expect(app2.itemManager.items.length).to.equal(BaseItemCounts.DefaultItems)
     await Factory.safeDeinit(app1)
     await Factory.safeDeinit(app2)
   })
@@ -40,14 +39,14 @@ describe('application instances', () => {
     await Factory.createMappedNote(app1)
     await app1.syncService.sync(syncOptions)
 
-    expect((await app1.diskStorageService.getAllRawPayloads()).length).length.to.equal(BASE_ITEM_COUNT + 1)
-    expect((await app2.diskStorageService.getAllRawPayloads()).length).length.to.equal(BASE_ITEM_COUNT)
+    expect((await app1.diskStorageService.getAllRawPayloads()).length).length.to.equal(BaseItemCounts.DefaultItems + 1)
+    expect((await app2.diskStorageService.getAllRawPayloads()).length).length.to.equal(BaseItemCounts.DefaultItems)
 
     await Factory.createMappedNote(app2)
     await app2.syncService.sync(syncOptions)
 
-    expect((await app1.diskStorageService.getAllRawPayloads()).length).length.to.equal(BASE_ITEM_COUNT + 1)
-    expect((await app2.diskStorageService.getAllRawPayloads()).length).length.to.equal(BASE_ITEM_COUNT + 1)
+    expect((await app1.diskStorageService.getAllRawPayloads()).length).length.to.equal(BaseItemCounts.DefaultItems + 1)
+    expect((await app2.diskStorageService.getAllRawPayloads()).length).length.to.equal(BaseItemCounts.DefaultItems + 1)
     await Factory.safeDeinit(app1)
     await Factory.safeDeinit(app2)
   })

packages/snjs/mocha/auth-fringe-cases.test.js

@@ -1,16 +1,15 @@
 /* eslint-disable no-unused-expressions */
 /* eslint-disable no-undef */
+import { BaseItemCounts } from './lib/Applications.js'
 import * as Factory from './lib/factory.js'
 chai.use(chaiAsPromised)
 const expect = chai.expect
 
 describe('auth fringe cases', () => {
-  const BASE_ITEM_COUNT = ['default items key', 'user prefs'].length
-
   const createContext = async () => {
     const application = await Factory.createInitAppWithFakeCrypto()
     return {
-      expectedItemCount: BASE_ITEM_COUNT,
+      expectedItemCount: BaseItemCounts.DefaultItems,
       application: application,
       email: UuidGenerator.GenerateUuid(),
       password: UuidGenerator.GenerateUuid(),
@@ -100,9 +99,13 @@ describe('auth fringe cases', () => {
 
       expect(newApplication.itemManager.getDisplayableNotes().length).to.equal(2)
 
-      expect(newApplication.itemManager.getDisplayableNotes().find((n) => n.uuid === firstVersionOfNote.uuid).text).to.equal(staleText)
+      expect(
+        newApplication.itemManager.getDisplayableNotes().find((n) => n.uuid === firstVersionOfNote.uuid).text,
+      ).to.equal(staleText)
 
-      const conflictedCopy = newApplication.itemManager.getDisplayableNotes().find((n) => n.uuid !== firstVersionOfNote.uuid)
+      const conflictedCopy = newApplication.itemManager
+        .getDisplayableNotes()
+        .find((n) => n.uuid !== firstVersionOfNote.uuid)
       expect(conflictedCopy.text).to.equal(serverText)
       expect(conflictedCopy.duplicate_of).to.equal(firstVersionOfNote.uuid)
       await Factory.safeDeinit(newApplication)

packages/snjs/mocha/auth.test.js

@@ -1,5 +1,6 @@
 /* eslint-disable no-unused-expressions */
 /* eslint-disable no-undef */
+import { BaseItemCounts } from './lib/Applications.js'
 import * as Factory from './lib/factory.js'
 chai.use(chaiAsPromised)
 const expect = chai.expect
@@ -7,8 +8,6 @@ const expect = chai.expect
 describe('basic auth', function () {
   this.timeout(Factory.TenSecondTimeout)
 
-  const BASE_ITEM_COUNT = 2 /** Default items key, user preferences */
-
   const syncOptions = {
     checkIntegrity: true,
     awaitAll: true,
@@ -16,7 +15,7 @@ describe('basic auth', function () {
 
   beforeEach(async function () {
     localStorage.clear()
-    this.expectedItemCount = BASE_ITEM_COUNT
+    this.expectedItemCount = BaseItemCounts.DefaultItems
     this.application = await Factory.createInitAppWithFakeCrypto()
     this.email = UuidGenerator.GenerateUuid()
     this.password = UuidGenerator.GenerateUuid()
@@ -62,7 +61,7 @@ describe('basic auth', function () {
     expect(this.application.protocolService.rootKeyEncryption.keyMode).to.equal(KeyMode.RootKeyNone)
 
     const rawPayloads = await this.application.diskStorageService.getAllRawPayloads()
-    expect(rawPayloads.length).to.equal(BASE_ITEM_COUNT)
+    expect(rawPayloads.length).to.equal(BaseItemCounts.DefaultItems)
   })
 
   it('successfully signs in to registered account', async function () {
@@ -408,7 +407,7 @@ describe('basic auth', function () {
 
       this.application = await Factory.signOutApplicationAndReturnNew(this.application)
 
-      expect(this.application.itemManager.items.length).to.equal(BASE_ITEM_COUNT)
+      expect(this.application.itemManager.items.length).to.equal(BaseItemCounts.DefaultItems)
       expect(this.application.payloadManager.invalidPayloads.length).to.equal(0)
 
       /** Should login with new password */

packages/snjs/mocha/backups.test.js

@@ -1,5 +1,6 @@
 /* eslint-disable no-unused-expressions */
 /* eslint-disable no-undef */
+import { BaseItemCounts } from './lib/Applications.js'
 import * as Factory from './lib/factory.js'
 chai.use(chaiAsPromised)
 const expect = chai.expect
@@ -24,8 +25,8 @@ describe('backups', function () {
     this.application = null
   })
 
-  const BASE_ITEM_COUNT_ENCRYPTED = ['ItemsKey', 'UserPreferences'].length
-  const BASE_ITEM_COUNT_DECRYPTED = ['UserPreferences'].length
+  const BASE_ITEM_COUNT_ENCRYPTED = BaseItemCounts.DefaultItems
+  const BASE_ITEM_COUNT_DECRYPTED = ['UserPreferences', 'DarkTheme'].length
 
   it('backup file should have a version number', async function () {
     let data = await this.application.createDecryptedBackupFile()

packages/snjs/mocha/features.test.js

@@ -83,11 +83,11 @@ describe('features', () => {
     it('should fetch user features and create items for features with content type', async () => {
       expect(application.apiService.getUserFeatures.callCount).to.equal(1)
       expect(application.itemManager.createItem.callCount).to.equal(2)
+
       const themeItems = application.items.getItems(ContentType.Theme)
-      const editorItems = application.items.getItems(ContentType.Component)
-      expect(themeItems).to.have.lengthOf(1)
-      expect(editorItems).to.have.lengthOf(1)
-      expect(themeItems[0].content).to.containSubset(
+      const systemThemeCount = 1
+      expect(themeItems).to.have.lengthOf(1 + systemThemeCount)
+      expect(themeItems[1].content).to.containSubset(
         JSON.parse(
           JSON.stringify({
             name: midnightThemeFeature.name,
@@ -96,6 +96,9 @@ describe('features', () => {
           }),
         ),
       )
+
+      const editorItems = application.items.getItems(ContentType.Component)
+      expect(editorItems).to.have.lengthOf(1)
       expect(editorItems[0].content).to.containSubset(
         JSON.parse(
           JSON.stringify({
@@ -157,7 +160,9 @@ describe('features', () => {
         })
       })
 
-      const themeItem = application.items.getItems(ContentType.Theme)[0]
+      const themeItem = application.items
+        .getItems(ContentType.Theme)
+        .find((theme) => theme.identifier === midnightThemeFeature.identifier)
 
       // Wipe roles from initial sync
       await application.featuresService.setRoles([])
@@ -171,7 +176,9 @@ describe('features', () => {
         true,
       )
 
-      const noTheme = application.items.getItems(ContentType.Theme)[0]
+      const noTheme = application.items
+        .getItems(ContentType.Theme)
+        .find((theme) => theme.identifier === midnightThemeFeature.identifier)
       expect(noTheme).to.not.be.ok
     })
   })

packages/snjs/mocha/lib/Applications.js

@@ -2,6 +2,10 @@ import WebDeviceInterface from './web_device_interface.js'
 import FakeWebCrypto from './fake_web_crypto.js'
 import * as Defaults from './Defaults.js'
 
+export const BaseItemCounts = {
+  DefaultItems: ['ItemsKey', 'UserPreferences', 'DarkTheme'].length,
+}
+
 export function createApplicationWithOptions({ identifier, environment, platform, host, crypto, device }) {
   if (!device) {
     device = new WebDeviceInterface()

packages/snjs/mocha/migrations/migration.test.js

@@ -161,14 +161,15 @@ describe('migrations', () => {
     await application.mutator.insertItem(noDistractionItem)
     await application.sync.sync()
 
-    expect(application.items.getItems(ContentType.Theme).length).to.equal(1)
+    const systemThemeCount = 1
+    expect(application.items.getItems(ContentType.Theme).length).to.equal(1 + systemThemeCount)
 
     /** Run migration */
     const migration = new Migration2_42_0(application.migrationService.services)
     await migration.handleStage(ApplicationStage.FullSyncCompleted_13)
     await application.sync.sync()
 
-    expect(application.items.getItems(ContentType.Theme).length).to.equal(0)
+    expect(application.items.getItems(ContentType.Theme).length).to.equal(systemThemeCount)
 
     await Factory.safeDeinit(application)
   })

packages/snjs/mocha/model_tests/appmodels.test.js

@@ -1,12 +1,12 @@
 /* eslint-disable camelcase */
 /* eslint-disable no-unused-expressions */
 /* eslint-disable no-undef */
+import { BaseItemCounts } from '../lib/Applications.js'
 import * as Factory from '../lib/factory.js'
 chai.use(chaiAsPromised)
 const expect = chai.expect
 
 describe('app models', () => {
-  const BASE_ITEM_COUNT = 2 /** Default items key, user preferences */
   const sharedApplication = Factory.createApplicationWithFakeCrypto()
 
   before(async function () {
@@ -20,7 +20,7 @@ describe('app models', () => {
   })
 
   beforeEach(async function () {
-    this.expectedItemCount = BASE_ITEM_COUNT
+    this.expectedItemCount = BaseItemCounts.DefaultItems
     this.application = await Factory.createInitAppWithFakeCrypto()
   })
 

packages/snjs/mocha/model_tests/importing.test.js

@@ -1,5 +1,6 @@
 /* eslint-disable no-unused-expressions */
 /* eslint-disable no-undef */
+import { BaseItemCounts } from '../lib/Applications.js'
 import * as Factory from '../lib/factory.js'
 import { createRelatedNoteTagPairPayload } from '../lib/Items.js'
 chai.use(chaiAsPromised)
@@ -7,7 +8,6 @@ const expect = chai.expect
 
 describe('importing', function () {
   this.timeout(Factory.TenSecondTimeout)
-  const BASE_ITEM_COUNT = 2 /** Default items key, user preferences */
 
   let expectedItemCount
   let application
@@ -19,7 +19,7 @@ describe('importing', function () {
   })
 
   const setup = async ({ fakeCrypto }) => {
-    expectedItemCount = BASE_ITEM_COUNT
+    expectedItemCount = BaseItemCounts.DefaultItems
     if (fakeCrypto) {
       application = await Factory.createInitAppWithFakeCrypto()
     } else {
@@ -599,12 +599,11 @@ describe('importing', function () {
     application = await Factory.createInitAppWithFakeCrypto()
     application.setLaunchCallback({
       receiveChallenge: (challenge) => {
-        const values = challenge.prompts.map(
-          (prompt) =>
-            CreateChallengeValue(
-              prompt,
-              prompt.validation === ChallengeValidation.None ? 'incorrect password' : password,
-            ),
+        const values = challenge.prompts.map((prompt) =>
+          CreateChallengeValue(
+            prompt,
+            prompt.validation === ChallengeValidation.None ? 'incorrect password' : password,
+          ),
         )
         application.submitValuesForChallenge(challenge, values)
       },
@@ -782,14 +781,13 @@ describe('importing', function () {
         if (challenge.prompts.length === 2) {
           application.submitValuesForChallenge(
             challenge,
-            challenge.prompts.map(
-              (prompt) =>
-                CreateChallengeValue(
-                  prompt,
-                  prompt.validation !== ChallengeValidation.ProtectionSessionDuration
-                    ? password
-                    : UnprotectedAccessSecondsDuration.OneMinute,
-                ),
+            challenge.prompts.map((prompt) =>
+              CreateChallengeValue(
+                prompt,
+                prompt.validation !== ChallengeValidation.ProtectionSessionDuration
+                  ? password
+                  : UnprotectedAccessSecondsDuration.OneMinute,
+              ),
             ),
           )
         } else {

packages/snjs/mocha/model_tests/items.test.js

@@ -1,19 +1,18 @@
 /* eslint-disable no-unused-expressions */
 /* eslint-disable no-undef */
+import { BaseItemCounts } from '../lib/Applications.js'
 import * as Factory from '../lib/factory.js'
 chai.use(chaiAsPromised)
 const expect = chai.expect
 
 describe('items', () => {
-  const BASE_ITEM_COUNT = 2 /** Default items key, user preferences */
-
   const syncOptions = {
     checkIntegrity: true,
     awaitAll: true,
   }
 
   beforeEach(async function () {
-    this.expectedItemCount = BASE_ITEM_COUNT
+    this.expectedItemCount = BaseItemCounts.DefaultItems
     this.application = await Factory.createInitAppWithFakeCrypto()
   })
 

packages/snjs/mocha/model_tests/mapping.test.js

@@ -1,15 +1,14 @@
 /* eslint-disable no-unused-expressions */
 /* eslint-disable no-undef */
+import { BaseItemCounts } from '../lib/Applications.js'
 import * as Factory from '../lib/factory.js'
 import { createNoteParams } from '../lib/Items.js'
 chai.use(chaiAsPromised)
 const expect = chai.expect
 
 describe('model manager mapping', () => {
-  const BASE_ITEM_COUNT = 2 /** Default items key, user preferences */
-
   beforeEach(async function () {
-    this.expectedItemCount = BASE_ITEM_COUNT
+    this.expectedItemCount = BaseItemCounts.DefaultItems
     this.application = await Factory.createInitAppWithFakeCrypto()
   })
 

packages/snjs/mocha/model_tests/notes_tags.test.js

@@ -2,19 +2,18 @@
 import * as Factory from '../lib/factory.js'
 import * as Utils from '../lib/Utils.js'
 import { createRelatedNoteTagPairPayload } from '../lib/Items.js'
+import { BaseItemCounts } from '../lib/Applications.js'
 chai.use(chaiAsPromised)
 const expect = chai.expect
 
 describe('notes and tags', () => {
-  const BASE_ITEM_COUNT = 2 /** Default items key, user preferences */
-
   const syncOptions = {
     checkIntegrity: true,
     awaitAll: true,
   }
 
   beforeEach(async function () {
-    this.expectedItemCount = BASE_ITEM_COUNT
+    this.expectedItemCount = BaseItemCounts.DefaultItems
     this.application = await Factory.createInitAppWithFakeCrypto()
   })
 

packages/snjs/mocha/session.test.js

@@ -1,5 +1,6 @@
 /* eslint-disable no-unused-expressions */
 /* eslint-disable no-undef */
+import { BaseItemCounts } from './lib/Applications.js'
 import * as Factory from './lib/factory.js'
 import WebDeviceInterface from './lib/web_device_interface.js'
 chai.use(chaiAsPromised)
@@ -8,8 +9,6 @@ const expect = chai.expect
 describe('server session', function () {
   this.timeout(Factory.TenSecondTimeout)
 
-  const BASE_ITEM_COUNT = 2 /** Default items key, user preferences */
-
   const syncOptions = {
     checkIntegrity: true,
     awaitAll: true,
@@ -17,7 +16,7 @@ describe('server session', function () {
 
   beforeEach(async function () {
     localStorage.clear()
-    this.expectedItemCount = BASE_ITEM_COUNT
+    this.expectedItemCount = BaseItemCounts.DefaultItems
     this.application = await Factory.createInitAppWithFakeCrypto()
     this.email = UuidGenerator.GenerateUuid()
     this.password = UuidGenerator.GenerateUuid()

packages/snjs/mocha/singletons.test.js

@@ -1,5 +1,6 @@
 /* eslint-disable no-unused-expressions */
 /* eslint-disable no-undef */
+import { BaseItemCounts } from './lib/Applications.js'
 import * as Factory from './lib/factory.js'
 import WebDeviceInterface from './lib/web_device_interface.js'
 chai.use(chaiAsPromised)
@@ -11,7 +12,6 @@ describe('singletons', function () {
   const syncOptions = {
     checkIntegrity: true,
   }
-  const BASE_ITEM_COUNT = 2 /** Default items key, user preferences */
 
   function createPrefsPayload() {
     const params = {
@@ -30,7 +30,7 @@ describe('singletons', function () {
 
   beforeEach(async function () {
     localStorage.clear()
-    this.expectedItemCount = BASE_ITEM_COUNT
+    this.expectedItemCount = BaseItemCounts.DefaultItems
     this.application = await Factory.createInitAppWithFakeCrypto()
     this.email = UuidGenerator.GenerateUuid()
     this.password = UuidGenerator.GenerateUuid()
@@ -83,7 +83,7 @@ describe('singletons', function () {
     localStorage.clear()
   })
 
-  it(`only resolves to ${BASE_ITEM_COUNT} items`, async function () {
+  it(`only resolves to ${BaseItemCounts.DefaultItems} items`, async function () {
     /** Preferences are an item we know to always return true for isSingleton */
     const prefs1 = createPrefsPayload()
     const prefs2 = createPrefsPayload()

packages/snjs/mocha/storage.test.js

@@ -1,5 +1,6 @@
 /* eslint-disable no-unused-expressions */
 /* eslint-disable no-undef */
+import { BaseItemCounts } from './lib/Applications.js'
 import * as Factory from './lib/factory.js'
 chai.use(chaiAsPromised)
 const expect = chai.expect
@@ -11,7 +12,6 @@ describe('storage manager', function () {
    * Base keys are `storage`, `snjs_version`, and `keychain`
    */
   const BASE_KEY_COUNT = 3
-  const BASE_ITEM_COUNT = 2 /** Default items key, user preferences */
 
   beforeEach(async function () {
     localStorage.clear()
@@ -37,7 +37,7 @@ describe('storage manager', function () {
     const payload = Factory.createNotePayload()
     await this.application.diskStorageService.savePayload(payload)
     const payloads = await this.application.diskStorageService.getAllRawPayloads()
-    expect(payloads.length).to.equal(BASE_ITEM_COUNT + 1)
+    expect(payloads.length).to.equal(BaseItemCounts.DefaultItems + 1)
   })
 
   it('should clear values', async function () {
@@ -71,7 +71,7 @@ describe('storage manager', function () {
     const value = 'bar'
     await this.application.diskStorageService.setValue(key, value)
     /** Items are stored in local storage */
-    expect(Object.keys(localStorage).length).to.equal(this.expectedKeyCount + BASE_ITEM_COUNT)
+    expect(Object.keys(localStorage).length).to.equal(this.expectedKeyCount + BaseItemCounts.DefaultItems)
     const retrievedValue = await this.application.diskStorageService.getValue(key)
     expect(retrievedValue).to.equal(value)
   })
@@ -297,8 +297,8 @@ describe('storage manager', function () {
     })
 
     await Factory.createSyncedNote(this.application)
-    expect(await Factory.storagePayloadCount(this.application)).to.equal(BASE_ITEM_COUNT + 1)
+    expect(await Factory.storagePayloadCount(this.application)).to.equal(BaseItemCounts.DefaultItems + 1)
     this.application = await Factory.signOutApplicationAndReturnNew(this.application)
-    expect(await Factory.storagePayloadCount(this.application)).to.equal(BASE_ITEM_COUNT)
+    expect(await Factory.storagePayloadCount(this.application)).to.equal(BaseItemCounts.DefaultItems)
   })
 })

packages/snjs/mocha/sync_tests/conflicting.test.js

@@ -1,13 +1,13 @@
 /* eslint-disable no-undef */
+import { BaseItemCounts } from '../lib/Applications.js'
 import * as Factory from '../lib/factory.js'
-import { createItemParams, createSyncedNoteWithTag } from '../lib/Items.js'
+import { createSyncedNoteWithTag } from '../lib/Items.js'
 import * as Utils from '../lib/Utils.js'
 chai.use(chaiAsPromised)
 const expect = chai.expect
 
 describe('online conflict handling', function () {
   this.timeout(Factory.TenSecondTimeout)
-  const BASE_ITEM_COUNT = 2 /** Default items key, user preferences */
 
   const syncOptions = {
     checkIntegrity: true,
@@ -16,7 +16,7 @@ describe('online conflict handling', function () {
 
   beforeEach(async function () {
     localStorage.clear()
-    this.expectedItemCount = BASE_ITEM_COUNT
+    this.expectedItemCount = BaseItemCounts.DefaultItems
 
     this.context = await Factory.createAppContextWithFakeCrypto('AppA')
     await this.context.launch()

packages/snjs/mocha/sync_tests/integrity.test.js

@@ -1,12 +1,11 @@
 /* eslint-disable no-unused-expressions */
 /* eslint-disable no-undef */
+import { BaseItemCounts } from '../lib/Applications.js'
 import * as Factory from '../lib/factory.js'
 chai.use(chaiAsPromised)
 const expect = chai.expect
 
 describe('sync integrity', () => {
-  const BASE_ITEM_COUNT = 2 /** Default items key, user preferences */
-
   before(function () {
     localStorage.clear()
   })
@@ -16,7 +15,7 @@ describe('sync integrity', () => {
   })
 
   beforeEach(async function () {
-    this.expectedItemCount = BASE_ITEM_COUNT
+    this.expectedItemCount = BaseItemCounts.DefaultItems
     this.application = await Factory.createInitAppWithFakeCrypto()
     this.email = UuidGenerator.GenerateUuid()
     this.password = UuidGenerator.GenerateUuid()

packages/snjs/mocha/sync_tests/offline.test.js

@@ -1,19 +1,18 @@
 /* eslint-disable no-unused-expressions */
 /* eslint-disable no-undef */
+import { BaseItemCounts } from '../lib/Applications.js'
 import * as Factory from '../lib/factory.js'
 chai.use(chaiAsPromised)
 const expect = chai.expect
 
 describe('offline syncing', () => {
-  const BASE_ITEM_COUNT = 2 /** Default items key, user preferences */
-
   const syncOptions = {
     checkIntegrity: true,
     awaitAll: true,
   }
 
   beforeEach(async function () {
-    this.expectedItemCount = BASE_ITEM_COUNT
+    this.expectedItemCount = BaseItemCounts.DefaultItems
     this.application = await Factory.createInitAppWithFakeCrypto()
   })
 

packages/snjs/mocha/sync_tests/online.test.js

@@ -1,4 +1,5 @@
 /* eslint-disable no-undef */
+import { BaseItemCounts } from '../lib/Applications.js'
 import * as Factory from '../lib/factory.js'
 import * as Utils from '../lib/Utils.js'
 chai.use(chaiAsPromised)
@@ -6,7 +7,6 @@ const expect = chai.expect
 
 describe('online syncing', function () {
   this.timeout(Factory.TenSecondTimeout)
-  const BASE_ITEM_COUNT = 2 /** Default items key, user preferences */
 
   const syncOptions = {
     checkIntegrity: true,
@@ -15,7 +15,7 @@ describe('online syncing', function () {
 
   beforeEach(async function () {
     localStorage.clear()
-    this.expectedItemCount = BASE_ITEM_COUNT
+    this.expectedItemCount = BaseItemCounts.DefaultItems
 
     this.context = await Factory.createAppContext()
     await this.context.launch()
@@ -97,7 +97,7 @@ describe('online syncing', function () {
 
     this.application = await Factory.signOutApplicationAndReturnNew(this.application)
 
-    expect(this.application.itemManager.items.length).to.equal(BASE_ITEM_COUNT)
+    expect(this.application.itemManager.items.length).to.equal(BaseItemCounts.DefaultItems)
 
     const promise = Factory.loginToApplication({
       application: this.application,
@@ -244,7 +244,7 @@ describe('online syncing', function () {
     // set item to be merged for when sign in occurs
     await this.application.syncService.markAllItemsAsNeedingSyncAndPersist()
     expect(this.application.syncService.isOutOfSync()).to.equal(false)
-    expect(this.application.itemManager.getDirtyItems().length).to.equal(BASE_ITEM_COUNT + 1)
+    expect(this.application.itemManager.getDirtyItems().length).to.equal(BaseItemCounts.DefaultItems + 1)
 
     // Sign back in for next tests
     await Factory.loginToApplication({
@@ -686,7 +686,7 @@ describe('online syncing', function () {
 
     this.application = await Factory.signOutApplicationAndReturnNew(this.application)
     const rawPayloads = await this.application.diskStorageService.getAllRawPayloads()
-    expect(rawPayloads.length).to.equal(BASE_ITEM_COUNT)
+    expect(rawPayloads.length).to.equal(BaseItemCounts.DefaultItems)
 
     await this.application.signIn(this.email, this.password, undefined, undefined, undefined, true)