chore(release): publish

- @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].4 - @standardnotes/[email protected].5
chore: minor vaults ui improvements
2026-09-13 00:45:26 -04:00 · 2023-08-07 10:52:11 +00:00 · 2023-08-07 15:36:34 +05:30 · 2023-08-07 05:06:11 -05:00 · 2023-08-07 05:01:04 -05:00 · 2023-08-07 11:44:53 +02:00
478 changed files with 10916 additions and 9480 deletions
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.26.44](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.43](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.42](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.41](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-05)
+
+**Note:** Version bump only for package @standardnotes/api
+
 ## [1.26.40](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)

 **Note:** Version bump only for package @standardnotes/api
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/api",
-  "version": "1.26.40",
+  "version": "1.26.44",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.1.147](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.146](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.145](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.144](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.143](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.142](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.141](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-05)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.140](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.139](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.138](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
 ## [1.1.137](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)

 **Note:** Version bump only for package @standardnotes/clipper
@@ -1,7 +1,7 @@
 {
  "name": "@standardnotes/clipper",
  "description": "Web clipper browser extension for Standard Notes",
-  "version": "1.1.137",
+  "version": "1.1.147",
  "private": true,
  "scripts": {
    "build-mv2": "yarn clean && webpack --config ./webpack.config.prod.js",
@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [3.108.78](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.77](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.76](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.75](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.74](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.73](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.72](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-05)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.71](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.70](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.108.69](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
 ## [3.108.68](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)

 **Note:** Version bump only for package @standardnotes/desktop
@@ -1,7 +1,7 @@
 {
  "name": "@standardnotes/desktop",
  "main": "./app/dist/index.js",
-  "version": "3.108.68",
+  "version": "3.108.78",
  "license": "CC BY-NC-SA 4.0",
  "author": "Standard Notes.",
  "private": true,
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.21.66](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.21.65](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.21.64](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.21.63](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-05)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
 ## [1.21.62](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)

 **Note:** Version bump only for package @standardnotes/encryption
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/encryption",
-  "version": "1.21.62",
+  "version": "1.21.66",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.28.76](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.28.75](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.28.74](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.28.73](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-05)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
 ## [1.28.72](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)

 **Note:** Version bump only for package @standardnotes/filepicker
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/filepicker",
-  "version": "1.28.72",
+  "version": "1.28.76",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.16.22](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.16.21](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.16.20](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.16.19](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-05)
+
+**Note:** Version bump only for package @standardnotes/files
+
 ## [1.16.18](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)

 **Note:** Version bump only for package @standardnotes/files
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/files",
-  "version": "1.16.18",
+  "version": "1.16.22",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [3.56.58](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.57](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.56](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.55](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.54](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.53](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.52](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-05)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.51](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.50](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.56.49](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
 ## [3.56.48](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)

 **Note:** Version bump only for package @standardnotes/mobile
@@ -723,7 +723,7 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native/ReactCommon/yoga"

 SPEC CHECKSUMS:
-  boost: 57d2868c099736d80fcd648bf211b4431e51a558
+  boost: a7c83b31436843459a1961bfd74b96033dc77234
  CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
  FBLazyVector: 4cce221dd782d3ff7c4172167bba09d58af67ccb
@@ -743,7 +743,7 @@ SPEC CHECKSUMS:
  MMKV: 9c4663aa7ca255d478ff10f2f5cb7d17c1651ccd
  MMKVCore: 89f5c8a66bba2dcd551779dea4d412eeec8ff5bb
  OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
-  RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
+  RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda
  RCTRequired: a2faf4bad4e438ca37b2040cb8f7799baa065c18
  RCTTypeSafety: cb09f3e4747b6d18331a15eb05271de7441ca0b3
  React: 13109005b5353095c052f26af37413340ccf7a5d
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/mobile",
-  "version": "3.56.48",
+  "version": "3.56.58",
  "author": "Standard Notes.",
  "private": true,
  "license": "CC BY-NC-SA 4.0",
@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.47.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/models
+
+## [1.47.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/models
+
+## [1.47.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/models
+
+# [1.47.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-05)
+
+### Features
+
+* Added translucency effect to menus, dialogs and alerts. Can be turned off from Preferences > Appeareance ([#2387](https://github.com/standardnotes/app/issues/2387)) [skip e2e] ([ec309d6](https://github.com/standardnotes/app/commit/ec309d6fb54c6cbb28414d1fe9d6119db5943d9c))
+
 ## [1.46.21](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)

 **Note:** Version bump only for package @standardnotes/models
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/models",
-  "version": "1.46.21",
+  "version": "1.47.3",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
@@ -28,6 +28,7 @@ export enum PayloadEmitSource {

  RemoteRetrieved,
  RemoteSaved,
+  DesktopComponentSync,
 }

 /**
@@ -12,10 +12,10 @@ import {
  isThemeFeatureDescription,
 } from '@standardnotes/features'
 import { ComponentInterface } from '../../Syncable/Component/ComponentInterface'
-import { isTheme } from '../../Syncable/Theme'
 import { isItemBasedFeature, isNativeFeature } from './TypeGuards'
 import { UIFeatureInterface } from './UIFeatureInterface'
 import { Uuid } from '@standardnotes/domain-core'
+import { ThemePackageInfo, isTheme } from '../../Syncable/Component'

 export class UIFeature<F extends UIFeatureDescriptionTypes> implements UIFeatureInterface<F> {
  constructor(public readonly item: ComponentInterface | F) {}
@@ -40,6 +40,14 @@ export class UIFeature<F extends UIFeatureDescriptionTypes> implements UIFeature
    throw new Error('Cannot cast item to component')
  }

+  get asTheme(): ComponentInterface<ThemePackageInfo> {
+    if (isItemBasedFeature(this.item)) {
+      return this.item
+    }
+
+    throw new Error('Cannot cast item to component')
+  }
+
  get asFeatureDescription(): F {
    if (isNativeFeature(this.item)) {
      return this.item
@@ -145,7 +153,7 @@ export class UIFeature<F extends UIFeatureDescriptionTypes> implements UIFeature

  get layerable(): boolean {
    if (isItemBasedFeature(this.item) && isTheme(this.item)) {
-      return this.item.layerable
+      return this.item.layerableTheme
    } else if (isThemeFeatureDescription(this.asFeatureDescription)) {
      return this.asFeatureDescription.layerable ?? false
    }
@@ -155,7 +163,7 @@ export class UIFeature<F extends UIFeatureDescriptionTypes> implements UIFeature

  get dockIcon(): ThemeDockIcon | undefined {
    if (isItemBasedFeature(this.item) && isTheme(this.item)) {
-      return this.item.package_info.dock_icon
+      return this.asTheme.package_info.dock_icon
    } else if (isThemeFeatureDescription(this.asFeatureDescription)) {
      return this.asFeatureDescription.dock_icon
    }
@@ -2,14 +2,14 @@ import { PayloadSource } from './../../Abstract/Payload/Types/PayloadSource'
 import { DecryptedPayload } from './../../Abstract/Payload/Implementations/DecryptedPayload'
 import { ContentType } from '@standardnotes/domain-core'
 import { FillItemContent } from '../../Abstract/Content/ItemContent'
-import { SNComponent } from './Component'
+import { ComponentItem } from './Component'
 import { ComponentContent } from './ComponentContent'
 import { PayloadTimestampDefaults } from '../../Abstract/Payload'
 import { NoteType } from '@standardnotes/features'

 describe('component model', () => {
  it('valid hosted url should ignore url', () => {
-    const component = new SNComponent(
+    const component = new ComponentItem(
      new DecryptedPayload(
        {
          uuid: String(Math.random()),
@@ -29,7 +29,7 @@ describe('component model', () => {
  })

  it('invalid hosted url should fallback to url', () => {
-    const component = new SNComponent(
+    const component = new ComponentItem(
      new DecryptedPayload(
        {
          uuid: String(Math.random()),
@@ -49,7 +49,7 @@ describe('component model', () => {
  })

  it('should return noteType as specified in package_info', () => {
-    const component = new SNComponent(
+    const component = new ComponentItem(
      new DecryptedPayload(
        {
          uuid: String(Math.random()),
@@ -69,7 +69,7 @@ describe('component model', () => {
  })

  it('should return unknown as noteType if no note type defined in package_info', () => {
-    const component = new SNComponent(
+    const component = new ComponentItem(
      new DecryptedPayload(
        {
          uuid: String(Math.random()),
@@ -17,34 +17,16 @@ import { DecryptedPayloadInterface } from '../../Abstract/Payload/Interfaces/Dec
 import { HistoryEntryInterface } from '../../Runtime/History'
 import { ItemContent } from '../../Abstract/Content/ItemContent'
 import { Predicate } from '../../Runtime/Predicate/Predicate'
-import { ItemInterface } from '../../Abstract/Item/Interfaces/ItemInterface'
 import { DecryptedItemInterface } from './../../Abstract/Item/Interfaces/DecryptedItem'
-import { ComponentPackageInfo } from './PackageInfo'
-import { isDecryptedItem } from '../../Abstract/Item'
+import { ComponentPackageInfo, ThemePackageInfo } from './PackageInfo'
 import { ContentType } from '@standardnotes/domain-core'

-export function isComponent(x: ItemInterface): x is ComponentInterface {
-  if (!isDecryptedItem(x as DecryptedItemInterface)) {
-    return false
-  }
-
-  return x.content_type === ContentType.TYPES.Component
-}
-
-export function isComponentOrTheme(x: ItemInterface): x is ComponentInterface {
-  if (!isDecryptedItem(x as DecryptedItemInterface)) {
-    return false
-  }
-
-  return x.content_type === ContentType.TYPES.Component || x.content_type === ContentType.TYPES.Theme
-}
-
 /**
 * Components are mostly iframe based extensions that communicate with the SN parent
 * via the postMessage API. However, a theme can also be a component, which is activated
 * only by its url.
 */
-export class SNComponent extends DecryptedItem<ComponentContent> implements ComponentInterface {
+export class ComponentItem extends DecryptedItem<ComponentContent> implements ComponentInterface {
  public readonly legacyComponentData: Record<string, unknown>
  /** Items that have requested a component to be disabled in its context */
  public readonly disassociatedItemIds: string[]
@@ -61,7 +43,6 @@ export class SNComponent extends DecryptedItem<ComponentContent> implements Comp
  public readonly valid_until: Date
  public readonly legacyActive: boolean
  public readonly legacy_url?: string
-  public readonly isMobileDefault: boolean

  constructor(payload: DecryptedPayloadInterface<ComponentContent>) {
    super(payload)
@@ -78,13 +59,18 @@ export class SNComponent extends DecryptedItem<ComponentContent> implements Comp
    this.valid_until = new Date(payload.content.valid_until || 0)
    this.offlineOnly = payload.content.offlineOnly ?? false
    this.name = payload.content.name
-    this.area = payload.content.area
+
+    if (this.content_type === ContentType.TYPES.Theme) {
+      this.area = ComponentArea.Themes
+    } else {
+      this.area = payload.content.area
+    }
+
    this.package_info = payload.content.package_info || {}
    this.permissions = payload.content.permissions || []
    this.autoupdateDisabled = payload.content.autoupdateDisabled ?? false
    this.disassociatedItemIds = payload.content.disassociatedItemIds || []
    this.associatedItemIds = payload.content.associatedItemIds || []
-    this.isMobileDefault = payload.content.isMobileDefault ?? false

    /**
     * @legacy
@@ -116,15 +102,11 @@ export class SNComponent extends DecryptedItem<ComponentContent> implements Comp
    return FindNativeFeature(this.identifier)?.name || this.name
  }

-  public override singletonPredicate(): Predicate<SNComponent> {
-    const uniqueIdentifierPredicate = new Predicate<SNComponent>('identifier', '=', this.identifier)
+  public override singletonPredicate(): Predicate<ComponentItem> {
+    const uniqueIdentifierPredicate = new Predicate<ComponentItem>('identifier', '=', this.identifier)
    return uniqueIdentifierPredicate
  }

-  public isEditor(): boolean {
-    return this.area === ComponentArea.Editor
-  }
-
  public isTheme(): boolean {
    return this.content_type === ContentType.TYPES.Theme || this.area === ComponentArea.Themes
  }
@@ -134,10 +116,6 @@ export class SNComponent extends DecryptedItem<ComponentContent> implements Comp
    return this.getAppDomainValue(AppDataField.DefaultEditor) === true
  }

-  public getLastSize(): unknown {
-    return this.getAppDomainValue(AppDataField.LastSize)
-  }
-
  public hasValidHostedUrl(): boolean {
    return (this.hosted_url || this.legacy_url) != undefined
  }
@@ -149,19 +127,6 @@ export class SNComponent extends DecryptedItem<ComponentContent> implements Comp
    return [...componentKeys, ...superKeys] as (keyof ItemContent)[]
  }

-  /**
-   * An associative component depends on being explicitly activated for a
-   * given item, compared to a dissaciative component, which is enabled by
-   * default in areas unrelated to a certain item.
-   */
-  public static associativeAreas(): ComponentArea[] {
-    return [ComponentArea.Editor]
-  }
-
-  public isAssociative(): boolean {
-    return SNComponent.associativeAreas().includes(this.area)
-  }
-
  public isExplicitlyEnabledForItem(uuid: string): boolean {
    return this.associatedItemIds.indexOf(uuid) !== -1
  }
@@ -199,4 +164,13 @@ export class SNComponent extends DecryptedItem<ComponentContent> implements Comp
  public get deprecationMessage(): string | undefined {
    return this.package_info.deprecation_message
  }
+
+  get layerableTheme(): boolean {
+    if (!this.isTheme()) {
+      return false
+    }
+
+    const themePackageInfo = this.package_info as ThemePackageInfo
+    return themePackageInfo?.layerable ?? false
+  }
 }
@@ -21,7 +21,6 @@ export type ComponentContentSpecialized = {
  valid_until: Date | number

  legacy_url?: string
-  isMobileDefault?: boolean
  isDeprecated?: boolean

  /** @deprecated */
@@ -1,9 +1,10 @@
 import { ComponentArea, ComponentPermission, NoteType, ThirdPartyFeatureDescription } from '@standardnotes/features'
-import { ComponentPackageInfo } from './PackageInfo'
+import { ComponentPackageInfo, ThemePackageInfo } from './PackageInfo'
 import { DecryptedItemInterface } from '../../Abstract/Item'
 import { ComponentContent } from './ComponentContent'

-export interface ComponentInterface extends DecryptedItemInterface<ComponentContent> {
+export interface ComponentInterface<P extends ComponentPackageInfo | ThemePackageInfo = ComponentPackageInfo>
+  extends DecryptedItemInterface<ComponentContent> {
  /** Items that have requested a component to be disabled in its context */
  disassociatedItemIds: string[]

@@ -16,16 +17,18 @@ export interface ComponentInterface extends DecryptedItemInterface<ComponentCont
  offlineOnly: boolean
  name: string
  autoupdateDisabled: boolean
-  package_info: ComponentPackageInfo
+  package_info: P
  area: ComponentArea
  permissions: ComponentPermission[]
  valid_until: Date
-  isMobileDefault: boolean
  isDeprecated: boolean

  isExplicitlyEnabledForItem(uuid: string): boolean
  hasValidHostedUrl(): boolean
+
  isTheme(): boolean
+  get layerableTheme(): boolean
+
  isExplicitlyDisabledForItem(uuid: string): boolean
  legacyIsDefaultEditor(): boolean

@@ -1,14 +1,9 @@
 import { addIfUnique, removeFromArray } from '@standardnotes/utils'
 import { ComponentFeatureDescription, ComponentPermission } from '@standardnotes/features'
-import { AppDataField } from '../../Abstract/Item/Types/AppDataField'
 import { ComponentContent } from './ComponentContent'
 import { DecryptedItemMutator } from '../../Abstract/Item/Mutator/DecryptedItemMutator'

 export class ComponentMutator extends DecryptedItemMutator<ComponentContent> {
-  set isMobileDefault(isMobileDefault: boolean) {
-    this.mutableContent.isMobileDefault = isMobileDefault
-  }
-
  set package_info(package_info: ComponentFeatureDescription) {
    this.mutableContent.package_info = package_info
  }
@@ -56,8 +51,4 @@ export class ComponentMutator extends DecryptedItemMutator<ComponentContent> {
  public removeDisassociatedItemId(uuid: string): void {
    removeFromArray(this.mutableContent.disassociatedItemIds || [], uuid)
  }
-
-  public setLastSize(size: string): void {
-    this.setAppDataItem(AppDataField.LastSize, size)
-  }
 }
@@ -0,0 +1,29 @@
+import { ComponentInterface } from './ComponentInterface'
+import { ItemInterface } from '../../Abstract/Item/Interfaces/ItemInterface'
+import { DecryptedItemInterface } from '../../Abstract/Item/Interfaces/DecryptedItem'
+import { isDecryptedItem } from '../../Abstract/Item'
+import { ContentType } from '@standardnotes/domain-core'
+
+export function isComponent(x: ItemInterface): x is ComponentInterface {
+  if (!isDecryptedItem(x as DecryptedItemInterface)) {
+    return false
+  }
+
+  return x.content_type === ContentType.TYPES.Component
+}
+
+export function isTheme(x: ItemInterface): x is ComponentInterface {
+  if (!isDecryptedItem(x as DecryptedItemInterface)) {
+    return false
+  }
+
+  return x.content_type === ContentType.TYPES.Theme
+}
+
+export function isComponentOrTheme(x: ItemInterface): x is ComponentInterface {
+  if (!isDecryptedItem(x as DecryptedItemInterface)) {
+    return false
+  }
+
+  return x.content_type === ContentType.TYPES.Component || x.content_type === ContentType.TYPES.Theme
+}
@@ -2,5 +2,5 @@ export * from './Component'
 export * from './ComponentMutator'
 export * from './ComponentContent'
 export * from './ComponentInterface'
-export * from '../../Runtime/Feature/UIFeature'
 export * from './PackageInfo'
+export * from './TypeGuards'
@@ -14,7 +14,7 @@ interface EditorContent extends ItemContent {

 /**
 * @deprecated
- * Editor objects are depracated in favor of SNComponent objects
+ * Editor objects are depracated in favor of ComponentItem objects
 */
 export class SNEditor extends DecryptedItem<EditorContent> {
  public readonly notes: SNNote[] = []
@@ -1,18 +0,0 @@
-import { ComponentArea } from '@standardnotes/features'
-import { SNComponent } from '../Component/Component'
-import { ItemInterface } from '../../Abstract/Item'
-import { ContentType } from '@standardnotes/domain-core'
-import { useBoolean } from '@standardnotes/utils'
-import { ThemePackageInfo } from '../Component/PackageInfo'
-import { ThemeInterface } from './ThemeInterface'
-
-export const isTheme = (x: ItemInterface): x is ThemeInterface => x.content_type === ContentType.TYPES.Theme
-
-export class SNTheme extends SNComponent implements ThemeInterface {
-  public override area: ComponentArea = ComponentArea.Themes
-  public declare readonly package_info: ThemePackageInfo
-
-  get layerable(): boolean {
-    return useBoolean(this.package_info && this.package_info.layerable, false)
-  }
-}
@@ -1,7 +0,0 @@
-import { ComponentInterface } from '../Component'
-import { ThemePackageInfo } from '../Component/PackageInfo'
-
-export interface ThemeInterface extends ComponentInterface {
-  get layerable(): boolean
-  readonly package_info: ThemePackageInfo
-}
@@ -1,4 +0,0 @@
-import { ComponentContent } from '../Component/ComponentContent'
-import { DecryptedItemMutator } from '../../Abstract/Item/Mutator/DecryptedItemMutator'
-
-export class ThemeMutator extends DecryptedItemMutator<ComponentContent> {}
@@ -1,3 +0,0 @@
-export * from './Theme'
-export * from './ThemeMutator'
-export * from './ThemeInterface'
@@ -28,6 +28,7 @@ export const PrefDefaults = {
  [PrefKey.NotesHideTags]: false,
  [PrefKey.NotesHideEditorIcon]: false,
  [PrefKey.UseSystemColorScheme]: false,
+  [PrefKey.UseTranslucentUI]: true,
  [PrefKey.AutoLightThemeIdentifier]: 'Default',
  [PrefKey.AutoDarkThemeIdentifier]: NativeFeatureIdentifier.TYPES.DarkTheme,
  [PrefKey.NoteAddToParentFolders]: true,
@@ -29,6 +29,7 @@ export enum PrefKey {
  NotesHideTags = 'hideTags',
  NotesHideEditorIcon = 'hideEditorIcon',
  UseSystemColorScheme = 'useSystemColorScheme',
+  UseTranslucentUI = 'useTranslucentUI',
  AutoLightThemeIdentifier = 'autoLightThemeIdentifier',
  AutoDarkThemeIdentifier = 'autoDarkThemeIdentifier',
  NoteAddToParentFolders = 'noteAddToParentFolders',
@@ -66,6 +67,7 @@ export type PrefValue = {
  [PrefKey.NotesHideTags]: boolean
  [PrefKey.NotesHideEditorIcon]: boolean
  [PrefKey.UseSystemColorScheme]: boolean
+  [PrefKey.UseTranslucentUI]: boolean
  [PrefKey.AutoLightThemeIdentifier]: string
  [PrefKey.AutoDarkThemeIdentifier]: string
  [PrefKey.NoteAddToParentFolders]: boolean
@@ -3,17 +3,15 @@ import { DecryptedPayloadInterface } from '../../Abstract/Payload/Interfaces/Dec
 import { FileItem } from '../../Syncable/File/File'
 import { SNFeatureRepo } from '../../Syncable/FeatureRepo/FeatureRepo'
 import { SNActionsExtension } from '../../Syncable/ActionsExtension/ActionsExtension'
-import { SNComponent } from '../../Syncable/Component/Component'
+import { ComponentItem } from '../../Syncable/Component/Component'
 import { SNEditor } from '../../Syncable/Editor/Editor'
 import { DecryptedItem } from '../../Abstract/Item/Implementations/DecryptedItem'
 import { SNNote } from '../../Syncable/Note/Note'
 import { SmartView } from '../../Syncable/SmartView/SmartView'
 import { SNTag } from '../../Syncable/Tag/Tag'
-import { SNTheme } from '../../Syncable/Theme/Theme'
 import { SNUserPrefs } from '../../Syncable/UserPrefs/UserPrefs'
 import { FileMutator } from '../../Syncable/File/FileMutator'
 import { MutationType } from '../../Abstract/Item/Types/MutationType'
-import { ThemeMutator } from '../../Syncable/Theme/ThemeMutator'
 import { UserPrefsMutator } from '../../Syncable/UserPrefs/UserPrefsMutator'
 import { ActionsExtensionMutator } from '../../Syncable/ActionsExtension/ActionsExtensionMutator'
 import { ComponentMutator } from '../../Syncable/Component/ComponentMutator'
@@ -58,7 +56,7 @@ const ContentTypeClassMapping: Partial<Record<string, MappingEntry>> = {
    itemClass: SNActionsExtension,
    mutatorClass: ActionsExtensionMutator,
  },
-  [ContentType.TYPES.Component]: { itemClass: SNComponent, mutatorClass: ComponentMutator },
+  [ContentType.TYPES.Component]: { itemClass: ComponentItem, mutatorClass: ComponentMutator },
  [ContentType.TYPES.KeySystemRootKey]: { itemClass: KeySystemRootKey, mutatorClass: KeySystemRootKeyMutator },
  [ContentType.TYPES.TrustedContact]: { itemClass: TrustedContact, mutatorClass: TrustedContactMutator },
  [ContentType.TYPES.VaultListing]: { itemClass: VaultListing, mutatorClass: VaultListingMutator },
@@ -68,7 +66,7 @@ const ContentTypeClassMapping: Partial<Record<string, MappingEntry>> = {
  [ContentType.TYPES.Note]: { itemClass: SNNote, mutatorClass: NoteMutator },
  [ContentType.TYPES.SmartView]: { itemClass: SmartView, mutatorClass: SmartViewMutator },
  [ContentType.TYPES.Tag]: { itemClass: SNTag, mutatorClass: TagMutator },
-  [ContentType.TYPES.Theme]: { itemClass: SNTheme, mutatorClass: ThemeMutator },
+  [ContentType.TYPES.Theme]: { itemClass: ComponentItem, mutatorClass: ComponentMutator },
  [ContentType.TYPES.UserPrefs]: { itemClass: SNUserPrefs, mutatorClass: UserPrefsMutator },
 } as unknown as Partial<Record<string, MappingEntry>>

@@ -93,7 +93,6 @@ export * from './Syncable/ItemsKey/ItemsKeyMutatorInterface'
 export * from './Syncable/Note'
 export * from './Syncable/SmartView'
 export * from './Syncable/Tag'
-export * from './Syncable/Theme'
 export * from './Syncable/UserPrefs'

 export * from './Syncable/TrustedContact/TrustedContact'
@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.4.430](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.429](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.428](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.427](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.426](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.425](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.424](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-05)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.423](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.422](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.421](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/releases
+
 ## [1.4.420](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)

 **Note:** Version bump only for package @standardnotes/releases
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/releases",
-  "version": "1.4.420",
+  "version": "1.4.430",
  "license": "CC BY-NC-SA 4.0",
  "main": "dist/releases.json",
  "types": "dist/index.d.ts",
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.63.28](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-07)
+
+**Note:** Version bump only for package @standardnotes/services
+
+## [1.63.27](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/services
+
+## [1.63.26](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/services
+
+## [1.63.25](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/services
+
+## [1.63.24](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-05)
+
+**Note:** Version bump only for package @standardnotes/services
+
+## [1.63.23](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-04)
+
+**Note:** Version bump only for package @standardnotes/services
+
 ## [1.63.22](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-03)

 **Note:** Version bump only for package @standardnotes/services
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/services",
-  "version": "1.63.22",
+  "version": "1.63.28",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
@@ -10,6 +10,8 @@ export interface LegacyApiServiceInterface
  extends AbstractService<ApiServiceEvent, ApiServiceEventData>,
    FilesApiInterface {
  isThirdPartyHostUsed(): boolean
+  setHost(host: string): Promise<void>
+  getHost(): string

  downloadOfflineFeaturesFromRepo(
    repo: SNFeatureRepo,
@@ -24,4 +26,6 @@ export interface LegacyApiServiceInterface
    limit: number,
    sharedVaultUuids?: string[],
  ): HttpRequest
+
+  getNewSubscriptionToken(): Promise<string | undefined>
 }
@@ -1,24 +1,28 @@
-import { VaultUserServiceInterface, VaultInviteServiceInterface } from '@standardnotes/services'
+import {
+  VaultUserServiceInterface,
+  VaultInviteServiceInterface,
+  StorageServiceInterface,
+  SyncServiceInterface,
+  FullyResolvedApplicationOptions,
+  ProtectionsClientInterface,
+  ChangeAndSaveItem,
+  GetHost,
+  SetHost,
+  LegacyApiServiceInterface,
+  StatusServiceInterface,
+  MfaServiceInterface,
+  GenerateUuid,
+} from '@standardnotes/services'
 import { VaultLockServiceInterface } from './../VaultLock/VaultLockServiceInterface'
 import { HistoryServiceInterface } from './../History/HistoryServiceInterface'
 import { InternalEventBusInterface } from './../Internal/InternalEventBusInterface'
 import { PreferenceServiceInterface } from './../Preferences/PreferenceServiceInterface'
 import { AsymmetricMessageServiceInterface } from './../AsymmetricMessage/AsymmetricMessageServiceInterface'
-import { SyncOptions } from './../Sync/SyncOptions'
 import { ImportDataReturnType } from './../Mutator/ImportDataUseCase'
 import { ChallengeServiceInterface } from './../Challenge/ChallengeServiceInterface'
 import { VaultServiceInterface } from '../Vault/VaultServiceInterface'
 import { ApplicationIdentifier } from '@standardnotes/common'
-import {
-  BackupFile,
-  DecryptedItemInterface,
-  DecryptedItemMutator,
-  ItemStream,
-  PayloadEmitSource,
-  Platform,
-  PrefKey,
-  PrefValue,
-} from '@standardnotes/models'
+import { BackupFile, Environment, Platform, PrefKey, PrefValue } from '@standardnotes/models'
 import { BackupServiceInterface, FilesClientInterface } from '@standardnotes/files'

 import { AlertService } from '../Alert/AlertService'
@@ -34,10 +38,9 @@ import { StorageValueModes } from '../Storage/StorageTypes'

 import { DeinitMode } from './DeinitMode'
 import { DeinitSource } from './DeinitSource'
-import { UserClientInterface } from '../User/UserClientInterface'
+import { UserServiceInterface } from '../User/UserServiceInterface'
 import { SessionsClientInterface } from '../Session/SessionsClientInterface'
 import { HomeServerServiceInterface } from '../HomeServer/HomeServerServiceInterface'
-import { User } from '@standardnotes/responses'
 import { EncryptionProviderInterface } from '../Encryption/EncryptionProviderInterface'

 export interface ApplicationInterface {
@@ -53,49 +56,24 @@ export interface ApplicationInterface {
  createDecryptedBackupFile(): Promise<BackupFile | undefined>
  hasPasscode(): boolean
  lock(): Promise<void>
-  softLockBiometrics(): void
  setValue(key: string, value: unknown, mode?: StorageValueModes): void
  getValue<T>(key: string, mode?: StorageValueModes): T
  removeValue(key: string, mode?: StorageValueModes): Promise<void>
-  isLocked(): Promise<boolean>
  getPreference<K extends PrefKey>(key: K): PrefValue[K] | undefined
  getPreference<K extends PrefKey>(key: K, defaultValue: PrefValue[K]): PrefValue[K]
  getPreference<K extends PrefKey>(key: K, defaultValue?: PrefValue[K]): PrefValue[K] | undefined
  setPreference<K extends PrefKey>(key: K, value: PrefValue[K]): Promise<void>
-  streamItems<I extends DecryptedItemInterface = DecryptedItemInterface>(
-    contentType: string | string[],
-    stream: ItemStream<I>,
-  ): () => void

-  getUser(): User | undefined
  hasAccount(): boolean
  setCustomHost(host: string): Promise<void>
  isThirdPartyHostUsed(): boolean
  isUsingHomeServer(): Promise<boolean>
-  getNewSubscriptionToken(): Promise<string | undefined>

  importData(data: BackupFile, awaitSync?: boolean): Promise<ImportDataReturnType>
-  /**
-   * Mutates a pre-existing item, marks it as dirty, and syncs it
-   */
-  changeAndSaveItem<M extends DecryptedItemMutator = DecryptedItemMutator>(
-    itemToLookupUuidFor: DecryptedItemInterface,
-    mutate: (mutator: M) => void,
-    updateTimestamps?: boolean,
-    emitSource?: PayloadEmitSource,
-    syncOptions?: SyncOptions,
-  ): Promise<DecryptedItemInterface | undefined>

-  /**
-   * Mutates pre-existing items, marks them as dirty, and syncs
-   */
-  changeAndSaveItems<M extends DecryptedItemMutator = DecryptedItemMutator>(
-    itemsToLookupUuidsFor: DecryptedItemInterface[],
-    mutate: (mutator: M) => void,
-    updateTimestamps?: boolean,
-    emitSource?: PayloadEmitSource,
-    syncOptions?: SyncOptions,
-  ): Promise<void>
+  get changeAndSaveItem(): ChangeAndSaveItem
+  get getHost(): GetHost
+  get setHost(): SetHost

  get alerts(): AlertService
  get asymmetric(): AsymmetricMessageServiceInterface
@@ -108,17 +86,26 @@ export interface ApplicationInterface {
  get files(): FilesClientInterface
  get history(): HistoryServiceInterface
  get homeServer(): HomeServerServiceInterface | undefined
+  get generateUuid(): GenerateUuid
  get items(): ItemManagerInterface
+  get legacyApi(): LegacyApiServiceInterface
+  get mfa(): MfaServiceInterface
  get mutator(): MutatorClientInterface
  get preferences(): PreferenceServiceInterface
+  get protections(): ProtectionsClientInterface
  get sessions(): SessionsClientInterface
+  get status(): StatusServiceInterface
+  get storage(): StorageServiceInterface
  get subscriptions(): SubscriptionManagerInterface
-  get user(): UserClientInterface
-  get vaults(): VaultServiceInterface
-  get vaultLocks(): VaultLockServiceInterface
-  get vaultUsers(): VaultUserServiceInterface
+  get sync(): SyncServiceInterface
+  get user(): UserServiceInterface
  get vaultInvites(): VaultInviteServiceInterface
+  get vaultLocks(): VaultLockServiceInterface
+  get vaults(): VaultServiceInterface
+  get vaultUsers(): VaultUserServiceInterface

+  readonly options: FullyResolvedApplicationOptions
+  readonly environment: Environment
  readonly identifier: ApplicationIdentifier
  readonly platform: Platform
  device: DeviceInterface
@@ -1,3 +1,4 @@
+import { GetKeyPairs } from './../Encryption/UseCase/GetKeyPairs'
 import { GetVault } from './../Vault/UseCase/GetVault'
 import { SessionsClientInterface } from './../Session/SessionsClientInterface'
 import { EncryptionProviderInterface } from './../Encryption/EncryptionProviderInterface'
@@ -48,6 +49,7 @@ describe('AsymmetricMessageService', () => {
    const getOutboundMessagesUseCase = {} as jest.Mocked<GetOutboundMessages>
    const getInboundMessagesUseCase = {} as jest.Mocked<GetInboundMessages>
    const getUntrustedPayload = {} as jest.Mocked<GetUntrustedPayload>
+    const getKeyPairs = {} as jest.Mocked<GetKeyPairs>

    sync = {} as jest.Mocked<SyncServiceInterface>
    sync.sync = jest.fn()
@@ -73,6 +75,7 @@ describe('AsymmetricMessageService', () => {
      getOutboundMessagesUseCase,
      getInboundMessagesUseCase,
      getUntrustedPayload,
+      getKeyPairs,
      eventBus,
    )
  })
@@ -1,3 +1,4 @@
+import { GetKeyPairs } from './../Encryption/UseCase/GetKeyPairs'
 import { SyncServiceInterface } from './../Sync/SyncServiceInterface'
 import { SessionsClientInterface } from './../Session/SessionsClientInterface'
 import { MutatorClientInterface } from './../Mutator/MutatorClientInterface'
@@ -54,6 +55,7 @@ export class AsymmetricMessageService
    private _getOutboundMessagesUseCase: GetOutboundMessages,
    private _getInboundMessagesUseCase: GetInboundMessages,
    private _getUntrustedPayload: GetUntrustedPayload,
+    private _getKeyPairs: GetKeyPairs,
    eventBus: InternalEventBusInterface,
  ) {
    super(eventBus)
@@ -196,8 +198,13 @@ export class AsymmetricMessageService
  }

  getUntrustedMessagePayload(message: AsymmetricMessageServerHash): Result<AsymmetricMessagePayload> {
+    const keys = this._getKeyPairs.execute()
+    if (keys.isFailed()) {
+      return Result.fail(keys.getError())
+    }
+
    const result = this._getUntrustedPayload.execute({
-      privateKey: this.encryption.getKeyPair().privateKey,
+      privateKey: keys.getValue().encryption.privateKey,
      message,
    })

@@ -214,8 +221,13 @@ export class AsymmetricMessageService
      return Result.fail(contact.getError())
    }

+    const keys = this._getKeyPairs.execute()
+    if (keys.isFailed()) {
+      return Result.fail(keys.getError())
+    }
+
    const result = this._getTrustedPayload.execute({
-      privateKey: this.encryption.getKeyPair().privateKey,
+      privateKey: keys.getValue().encryption.privateKey,
      sender: contact.getValue(),
      ownUserUuid: this.sessions.userUuid,
      message,
@@ -11,14 +11,14 @@ import {

 import { ContentType } from '@standardnotes/domain-core'
 import { GetVault } from '../../Vault/UseCase/GetVault'
-import { EncryptionProviderInterface } from '../../Encryption/EncryptionProviderInterface'
+import { DecryptErroredPayloads } from '../../Encryption/UseCase/DecryptErroredPayloads'

 export class HandleRootKeyChangedMessage {
  constructor(
    private mutator: MutatorClientInterface,
    private sync: SyncServiceInterface,
-    private encryption: EncryptionProviderInterface,
-    private getVault: GetVault,
+    private _getVault: GetVault,
+    private _decryptErroredPayloads: DecryptErroredPayloads,
  ) {}

  async execute(message: AsymmetricMessageSharedVaultRootKeyChanged): Promise<void> {
@@ -30,14 +30,16 @@ export class HandleRootKeyChangedMessage {
      true,
    )

-    const vault = this.getVault.execute<VaultListingInterface>({ keySystemIdentifier: rootKeyContent.systemIdentifier })
+    const vault = this._getVault.execute<VaultListingInterface>({
+      keySystemIdentifier: rootKeyContent.systemIdentifier,
+    })
    if (!vault.isFailed()) {
      await this.mutator.changeItem<VaultListingMutator>(vault.getValue(), (mutator) => {
        mutator.rootKeyParams = rootKeyContent.keyParams
      })
    }

-    await this.encryption.decryptErroredPayloads()
+    await this._decryptErroredPayloads.execute()

    void this.sync.sync({ sourceDescription: 'Not awaiting due to this event handler running from sync response' })
  }
@@ -16,13 +16,13 @@ export class ProcessAcceptedVaultInvite {
  constructor(
    private mutator: MutatorClientInterface,
    private sync: SyncServiceInterface,
-    private createOrEditContact: CreateOrEditContact,
+    private _createOrEditContact: CreateOrEditContact,
  ) {}

  async execute(
    message: AsymmetricMessageSharedVaultInvite,
    sharedVaultUuid: string,
-    senderUuid: string,
+    ownerUuid: string,
  ): Promise<void> {
    const { rootKey: rootKeyContent, trustedContacts, metadata } = message.data

@@ -34,7 +34,7 @@ export class ProcessAcceptedVaultInvite {
      description: metadata.description,
      sharing: {
        sharedVaultUuid: sharedVaultUuid,
-        ownerUserUuid: senderUuid,
+        ownerUserUuid: ownerUuid,
      },
    }

@@ -47,7 +47,7 @@ export class ProcessAcceptedVaultInvite {
    await this.mutator.createItem(ContentType.TYPES.VaultListing, FillItemContentSpecialized(content), true)

    for (const contact of trustedContacts) {
-      await this.createOrEditContact.execute({
+      await this._createOrEditContact.execute({
        name: contact.name,
        contactUuid: contact.contactUuid,
        publicKey: contact.publicKeySet.encryption,
@@ -14,8 +14,6 @@ export interface ChallengeServiceInterface extends AbstractService {
  submitValuesForChallenge(challenge: ChallengeInterface, values: ChallengeValue[]): Promise<void>
  cancelChallenge(challenge: ChallengeInterface): void

-  isPasscodeLocked(): Promise<boolean>
-
  /**
   * Resolves when the challenge has been completed.
   * For non-validated challenges, will resolve when the first value is submitted.
@@ -8,7 +8,7 @@ import { SyncServiceInterface } from '../Sync/SyncServiceInterface'
 import { SessionsClientInterface } from '../Session/SessionsClientInterface'
 import { ContactServiceEvent, ContactServiceInterface } from '../Contacts/ContactServiceInterface'
 import { InternalEventBusInterface } from '../Internal/InternalEventBusInterface'
-import { UserClientInterface } from '../User/UserClientInterface'
+import { UserServiceInterface } from '../User/UserServiceInterface'
 import { CollaborationIDData, Version1CollaborationId } from './CollaborationID'
 import { ValidateItemSigner } from './UseCase/ValidateItemSigner'
 import { ItemSignatureValidationResult } from './UseCase/Types/ItemSignatureValidationResult'
@@ -26,7 +26,7 @@ export class ContactService extends AbstractService<ContactServiceEvent> impleme
    private mutator: MutatorClientInterface,
    private session: SessionsClientInterface,
    private crypto: PureCryptoInterface,
-    private user: UserClientInterface,
+    private user: UserServiceInterface,
    private selfContactManager: SelfContactManager,
    private encryption: EncryptionProviderInterface,
    private _deleteContact: DeleteContact,
@@ -18,7 +18,7 @@ export class DeleteContact implements UseCaseInterface<void> {
      throw new Error('Cannot delete self')
    }

-    const vaults = this.getOwnedVaults.execute({ userUuid: dto.ownUserUuid })
+    const vaults = this.getOwnedVaults.execute()
    if (vaults.isFailed()) {
      return Result.fail('Failed to get owned vaults')
    }
@@ -4,4 +4,7 @@ export interface DesktopManagerInterface {
  syncComponentsInstallation(components: ComponentInterface[]): void
  registerUpdateObserver(callback: (component: ComponentInterface) => void): () => void
  getExtServerHost(): string
+  saveDesktopBackup(): Promise<void>
+  searchText(text?: string): void
+  redoSearch(): void
 }
@@ -20,11 +20,12 @@ import {
  KeySystemRootKeyParamsInterface,
  PortablePublicKeySet,
 } from '@standardnotes/models'
-import { PkcKeyPair } from '@standardnotes/sncrypto-common'

 export interface EncryptionProviderInterface {
  initialize(): Promise<void>

+  isPasscodeLocked(): Promise<boolean>
+
  encryptSplitSingle(split: KeyedEncryptionSplit): Promise<EncryptedPayloadInterface>
  encryptSplit(split: KeyedEncryptionSplit): Promise<EncryptedPayloadInterface[]>
  decryptSplitSingle<
@@ -72,7 +73,6 @@ export interface EncryptionProviderInterface {
      }
  >

-  decryptErroredPayloads(): Promise<void>
  deleteWorkspaceSpecificKeyStateFromDevice(): Promise<void>

  unwrapRootKey(wrappingKey: RootKeyInterface): Promise<void>
@@ -110,9 +110,6 @@ export interface EncryptionProviderInterface {
    rootKeyToken: string,
  ): KeySystemItemsKeyInterface

-  getKeyPair(): PkcKeyPair
-  getSigningKeyPair(): PkcKeyPair
-
  asymmetricSignatureVerifyDetached(
    encryptedString: AsymmetricallyEncryptedString,
  ): AsymmetricSignatureVerificationDetachedResult
@@ -1,3 +1,4 @@
+import { GetKeyPairs } from './UseCase/GetKeyPairs'
 import { FindDefaultItemsKey } from './UseCase/ItemsKey/FindDefaultItemsKey'
 import { InternalEventInterface } from './../Internal/InternalEventInterface'
 import { InternalEventHandlerInterface } from './../Internal/InternalEventHandlerInterface'
@@ -43,7 +44,7 @@ import {
  PortablePublicKeySet,
  RootKeyParamsInterface,
 } from '@standardnotes/models'
-import { PkcKeyPair, PureCryptoInterface } from '@standardnotes/sncrypto-common'
+import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
 import {
  extendArray,
  isNotUndefined,
@@ -73,7 +74,6 @@ import { DecryptedParameters } from '@standardnotes/encryption/src/Domain/Types/
 import { RootKeyManager } from '../RootKeyManager/RootKeyManager'
 import { RootKeyManagerEvent } from '../RootKeyManager/RootKeyManagerEvent'
 import { CreateNewItemsKeyWithRollback } from './UseCase/ItemsKey/CreateNewItemsKeyWithRollback'
-import { DecryptErroredTypeAPayloads } from './UseCase/TypeA/DecryptErroredPayloads'
 import { CreateNewDefaultItemsKey } from './UseCase/ItemsKey/CreateNewDefaultItemsKey'
 import { DecryptTypeAPayload } from './UseCase/TypeA/DecryptPayload'
 import { DecryptTypeAPayloadWithKeyLookup } from './UseCase/TypeA/DecryptPayloadWithKeyLookup'
@@ -126,12 +126,12 @@ export class EncryptionService
    private crypto: PureCryptoInterface,
    private _createNewItemsKeyWithRollback: CreateNewItemsKeyWithRollback,
    private _findDefaultItemsKey: FindDefaultItemsKey,
-    private _decryptErroredRootPayloads: DecryptErroredTypeAPayloads,
    private _rootKeyEncryptPayloadWithKeyLookup: EncryptTypeAPayloadWithKeyLookup,
    private _rootKeyEncryptPayload: EncryptTypeAPayload,
    private _rootKeyDecryptPayload: DecryptTypeAPayload,
    private _rootKeyDecryptPayloadWithKeyLookup: DecryptTypeAPayloadWithKeyLookup,
    private _createDefaultItemsKey: CreateNewDefaultItemsKey,
+    private _getKeyPairs: GetKeyPairs,
    protected override internalEventBus: InternalEventBusInterface,
  ) {
    super(internalEventBus)
@@ -157,7 +157,6 @@ export class EncryptionService
    ;(this.crypto as unknown) = undefined
    ;(this._createNewItemsKeyWithRollback as unknown) = undefined
    ;(this._findDefaultItemsKey as unknown) = undefined
-    ;(this._decryptErroredRootPayloads as unknown) = undefined
    ;(this._rootKeyEncryptPayloadWithKeyLookup as unknown) = undefined
    ;(this._rootKeyEncryptPayload as unknown) = undefined
    ;(this._rootKeyDecryptPayload as unknown) = undefined
@@ -167,28 +166,6 @@ export class EncryptionService
    super.deinit()
  }

-  /** @throws */
-  getKeyPair(): PkcKeyPair {
-    const rootKey = this.getRootKey()
-
-    if (!rootKey?.encryptionKeyPair) {
-      throw new Error('Account keypair not found')
-    }
-
-    return rootKey.encryptionKeyPair
-  }
-
-  /** @throws */
-  getSigningKeyPair(): PkcKeyPair {
-    const rootKey = this.getRootKey()
-
-    if (!rootKey?.signingKeyPair) {
-      throw new Error('Account keypair not found')
-    }
-
-    return rootKey.signingKeyPair
-  }
-
  hasSigningKeyPair(): boolean {
    return !!this.getRootKey()?.signingKeyPair
  }
@@ -214,6 +191,7 @@ export class EncryptionService
    return ProtocolVersionLatest
  }

+  /** Unlike SessionManager.isSignedIn, hasAccount can be read before the application is unlocked and is based on the key state */
  public hasAccount() {
    return this.rootKeyManager.hasAccount()
  }
@@ -244,12 +222,6 @@ export class EncryptionService
    return this._createNewItemsKeyWithRollback.execute()
  }

-  public async decryptErroredPayloads(): Promise<void> {
-    await this._decryptErroredRootPayloads.execute()
-
-    await this.itemsEncryption.decryptErroredItemPayloads()
-  }
-
  public itemsKeyForEncryptedPayload(
    payload: EncryptedPayloadInterface,
  ): ItemsKeyInterface | KeySystemItemsKeyInterface | undefined {
@@ -279,7 +251,9 @@ export class EncryptionService
      usesKeySystemRootKeyWithKeyLookup,
    } = split

-    const signingKeyPair = this.hasSigningKeyPair() ? this.getSigningKeyPair() : undefined
+    const keys = this._getKeyPairs.execute()
+
+    const signingKeyPair = keys.isFailed() ? undefined : keys.getValue().signing

    if (usesRootKey) {
      const rootKeyEncrypted = await this._rootKeyEncryptPayload.executeMany(
@@ -652,7 +626,7 @@ export class EncryptionService
  /**
   * @returns True if the root key has not yet been unwrapped (passcode locked).
   */
-  public async isPasscodeLocked() {
+  public async isPasscodeLocked(): Promise<boolean> {
    return (await this.rootKeyManager.hasRootKeyWrapper()) && this.rootKeyManager.getRootKey() == undefined
  }

@@ -0,0 +1,18 @@
+import { DecryptErroredTypeAPayloads } from './TypeA/DecryptErroredPayloads'
+import { ItemsEncryptionService } from './../../ItemsEncryption/ItemsEncryption'
+import { Result, UseCaseInterface } from '@standardnotes/domain-core'
+
+export class DecryptErroredPayloads implements UseCaseInterface<void> {
+  constructor(
+    private itemsEncryption: ItemsEncryptionService,
+    private _decryptErroredRootPayloads: DecryptErroredTypeAPayloads,
+  ) {}
+
+  async execute(): Promise<Result<void>> {
+    await this._decryptErroredRootPayloads.execute()
+
+    await this.itemsEncryption.decryptErroredItemPayloads()
+
+    return Result.ok()
+  }
+}
@@ -0,0 +1,25 @@
+import { Result, SyncUseCaseInterface } from '@standardnotes/domain-core'
+import { PkcKeyPair } from '@standardnotes/sncrypto-common'
+import { RootKeyManager } from '../../RootKeyManager/RootKeyManager'
+
+type UsecaseResult = {
+  encryption: PkcKeyPair
+  signing: PkcKeyPair
+}
+
+export class GetKeyPairs implements SyncUseCaseInterface<UsecaseResult> {
+  constructor(private rootKeyManager: RootKeyManager) {}
+
+  execute(): Result<UsecaseResult> {
+    const rootKey = this.rootKeyManager.getRootKey()
+
+    if (!rootKey?.encryptionKeyPair || !rootKey?.signingKeyPair) {
+      return Result.fail('Account keypair not found')
+    }
+
+    return Result.ok({
+      encryption: rootKey.encryptionKeyPair,
+      signing: rootKey.signingKeyPair,
+    })
+  }
+}
@@ -55,7 +55,5 @@ export enum ApplicationEvent {
  UnprotectedSessionExpired = 'Application:UnprotectedSessionExpired',
  /** Called when the app first launches and after first sync request made after sign in */
  CompletedInitialSync = 'Application:CompletedInitialSync',
-  BiometricsSoftLockEngaged = 'Application:BiometricsSoftLockEngaged',
-  BiometricsSoftLockDisengaged = 'Application:BiometricsSoftLockDisengaged',
  DidPurchaseSubscription = 'Application:DidPurchaseSubscription',
 }
@@ -20,8 +20,8 @@ import {
  FileItem,
  VaultDisplayOptions,
  NotesAndFilesDisplayControllerOptions,
-  ThemeInterface,
  ComponentInterface,
+  ItemStream,
 } from '@standardnotes/models'
 import { AbstractService } from '../Service/AbstractService'

@@ -57,6 +57,11 @@ export interface ItemManagerInterface extends AbstractService {
    callback: ItemManagerChangeObserverCallback<I>,
  ): () => void

+  streamItems<I extends DecryptedItemInterface = DecryptedItemInterface>(
+    contentType: string | string[],
+    stream: ItemStream<I>,
+  ): () => void
+
  get items(): DecryptedItemInterface[]

  getItems<T extends DecryptedItemInterface>(contentType: string | string[]): T[]
@@ -117,7 +122,7 @@ export interface ItemManagerInterface extends AbstractService {
  getTagParent(itemToLookupUuidFor: SNTag): SNTag | undefined
  isValidTagParent(parentTagToLookUpUuidFor: SNTag, childToLookUpUuidFor: SNTag): boolean
  isSmartViewTitle(title: string): boolean
-  getDisplayableComponents(): (ComponentInterface | ThemeInterface)[]
+  getDisplayableComponents(): ComponentInterface[]
  createItemFromPayload<T extends DecryptedItemInterface>(payload: DecryptedPayloadInterface): T
  createPayloadFromObject(object: DecryptedTransferPayload): DecryptedPayloadInterface
  getDisplayableFiles(): FileItem[]
@@ -0,0 +1,222 @@
+import { ItemsEncryptionService } from './ItemsEncryption'
+import { ItemManagerInterface } from '../Item/ItemManagerInterface'
+import { PayloadManagerInterface } from '../Payloads/PayloadManagerInterface'
+import { StorageServiceInterface } from '../Storage/StorageServiceInterface'
+import {
+  DecryptedParameters,
+  EncryptionOperatorsInterface,
+  KeySystemItemsKey,
+  StandardException,
+} from '@standardnotes/encryption'
+import { KeySystemKeyManagerInterface } from '../KeySystem/KeySystemKeyManagerInterface'
+import { FindDefaultItemsKey } from './../Encryption/UseCase/ItemsKey/FindDefaultItemsKey'
+import { InternalEventBusInterface } from '../Internal/InternalEventBusInterface'
+import { EncryptedOutputParameters } from '@standardnotes/encryption'
+import { PkcKeyPair } from '@standardnotes/sncrypto-common'
+import {
+  DecryptedPayloadInterface,
+  EncryptedPayloadInterface,
+  ItemsKeyInterface,
+  KeySystemItemsKeyInterface,
+} from '@standardnotes/models'
+
+describe('ItemsEncryptionService', () => {
+  let itemsEncryptionService: ItemsEncryptionService
+  let mockItems: jest.Mocked<ItemManagerInterface>
+  let mockPayloads: jest.Mocked<PayloadManagerInterface>
+  let mockStorage: jest.Mocked<StorageServiceInterface>
+  let mockOperators: jest.Mocked<EncryptionOperatorsInterface>
+  let mockKeys: jest.Mocked<KeySystemKeyManagerInterface>
+  let mockFindDefaultItemsKey: jest.Mocked<FindDefaultItemsKey>
+  let mockInternalEventBus: jest.Mocked<InternalEventBusInterface>
+
+  beforeEach(() => {
+    mockItems = {
+      addObserver: jest.fn(),
+    } as unknown as jest.Mocked<ItemManagerInterface>
+    mockPayloads = {} as jest.Mocked<PayloadManagerInterface>
+    mockStorage = {} as jest.Mocked<StorageServiceInterface>
+    mockOperators = {} as jest.Mocked<EncryptionOperatorsInterface>
+    mockKeys = {} as jest.Mocked<KeySystemKeyManagerInterface>
+    mockFindDefaultItemsKey = {} as jest.Mocked<FindDefaultItemsKey>
+    mockInternalEventBus = {} as jest.Mocked<InternalEventBusInterface>
+
+    itemsEncryptionService = new ItemsEncryptionService(
+      mockItems,
+      mockPayloads,
+      mockStorage,
+      mockOperators,
+      mockKeys,
+      mockFindDefaultItemsKey,
+      mockInternalEventBus,
+    )
+  })
+
+  describe('decryptPayloadWithKeyLookup', () => {
+    it('returns decrypted parameters when a key is found', async () => {
+      const mockPayload = {
+        uuid: 'payload-uuid',
+      } as EncryptedPayloadInterface
+
+      const mockKey = {
+        uuid: 'key-uuid',
+      } as KeySystemItemsKey
+
+      const mockDecryptedParameters = {
+        uuid: 'decrypted-uuid',
+        content: {},
+      } as DecryptedParameters
+
+      itemsEncryptionService.keyToUseForDecryptionOfPayload = jest.fn().mockReturnValue(mockKey)
+
+      itemsEncryptionService.decryptPayload = jest.fn().mockResolvedValue(mockDecryptedParameters)
+
+      const result = await itemsEncryptionService.decryptPayloadWithKeyLookup(mockPayload)
+
+      expect(itemsEncryptionService.keyToUseForDecryptionOfPayload).toHaveBeenCalledWith(mockPayload)
+      expect(itemsEncryptionService.decryptPayload).toHaveBeenCalledWith(mockPayload, mockKey)
+      expect(result).toEqual(mockDecryptedParameters)
+    })
+
+    it('returns error parameters when no key is found', async () => {
+      const mockPayload = {
+        uuid: 'payload-uuid',
+      } as EncryptedPayloadInterface
+
+      itemsEncryptionService.keyToUseForDecryptionOfPayload = jest.fn().mockReturnValue(undefined)
+
+      const result = await itemsEncryptionService.decryptPayloadWithKeyLookup(mockPayload)
+
+      expect(itemsEncryptionService.keyToUseForDecryptionOfPayload).toHaveBeenCalledWith(mockPayload)
+      expect(result).toEqual({
+        uuid: mockPayload.uuid,
+        errorDecrypting: true,
+        waitingForKey: true,
+      })
+    })
+  })
+
+  describe('keyToUseForDecryptionOfPayload', () => {
+    it('returns itemsKey when payload has items_key_id', () => {
+      const mockPayload: EncryptedPayloadInterface = {
+        items_key_id: 'test-key-id',
+      } as EncryptedPayloadInterface
+
+      const mockItemsKey: ItemsKeyInterface = {} as ItemsKeyInterface
+      itemsEncryptionService.itemsKeyForEncryptedPayload = jest.fn().mockReturnValue(mockItemsKey)
+
+      const result = itemsEncryptionService.keyToUseForDecryptionOfPayload(mockPayload)
+
+      expect(itemsEncryptionService.itemsKeyForEncryptedPayload).toHaveBeenCalledWith(mockPayload)
+      expect(result).toBe(mockItemsKey)
+    })
+
+    it('returns defaultKey when payload does not have items_key_id', () => {
+      const mockPayload: EncryptedPayloadInterface = {} as EncryptedPayloadInterface
+      const mockDefaultKey: KeySystemItemsKeyInterface = {} as KeySystemItemsKeyInterface
+
+      itemsEncryptionService.defaultItemsKeyForItemVersion = jest.fn().mockReturnValue(mockDefaultKey)
+
+      const result = itemsEncryptionService.keyToUseForDecryptionOfPayload(mockPayload)
+
+      expect(itemsEncryptionService.defaultItemsKeyForItemVersion).toHaveBeenCalledWith(mockPayload.version)
+      expect(result).toBe(mockDefaultKey)
+    })
+  })
+
+  describe('encryptPayloadWithKeyLookup', () => {
+    it('throws an error when keyToUseForItemEncryption returns an instance of StandardException', async () => {
+      const mockPayload: DecryptedPayloadInterface = {} as DecryptedPayloadInterface
+      const mockError: StandardException = new StandardException('test-error')
+
+      itemsEncryptionService.keyToUseForItemEncryption = jest.fn().mockReturnValue(mockError)
+
+      await expect(() => itemsEncryptionService.encryptPayloadWithKeyLookup(mockPayload)).rejects.toThrow('test-error')
+    })
+
+    it('encrypts the payload using the provided key', async () => {
+      const mockPayload: DecryptedPayloadInterface = {} as DecryptedPayloadInterface
+      const mockKey: ItemsKeyInterface = {} as ItemsKeyInterface
+      const encryptedOutputParameters: EncryptedOutputParameters = {
+        content: 'encrypted-content',
+      } as EncryptedOutputParameters
+
+      itemsEncryptionService.keyToUseForItemEncryption = jest.fn().mockReturnValue(mockKey)
+      itemsEncryptionService.encryptPayload = jest.fn().mockResolvedValue(encryptedOutputParameters)
+
+      const result = await itemsEncryptionService.encryptPayloadWithKeyLookup(mockPayload)
+
+      expect(itemsEncryptionService.encryptPayload).toHaveBeenCalledWith(mockPayload, mockKey, undefined)
+      expect(result).toBe(encryptedOutputParameters)
+    })
+  })
+
+  describe('encryptPayload', () => {
+    it('throws an error when the payload has no content', async () => {
+      const mockPayload: DecryptedPayloadInterface = { content: null } as unknown as DecryptedPayloadInterface
+      const mockKey: ItemsKeyInterface = {} as ItemsKeyInterface
+
+      await expect(() => itemsEncryptionService.encryptPayload(mockPayload, mockKey)).rejects.toThrow(
+        'Attempting to encrypt payload with no content.',
+      )
+    })
+
+    it('throws an error when the payload has no UUID', async () => {
+      const mockPayload: DecryptedPayloadInterface = { uuid: null, content: {} } as unknown as DecryptedPayloadInterface
+      const mockKey: ItemsKeyInterface = {} as ItemsKeyInterface
+
+      await expect(() => itemsEncryptionService.encryptPayload(mockPayload, mockKey)).rejects.toThrow(
+        'Attempting to encrypt payload with no UuidGenerator.',
+      )
+    })
+
+    it('returns encrypted output parameters', async () => {
+      const mockPayload: DecryptedPayloadInterface = {
+        uuid: 'test-uuid',
+        content: 'test-content',
+      } as unknown as DecryptedPayloadInterface
+      const mockKey: ItemsKeyInterface = {} as ItemsKeyInterface
+      const encryptedOutputParameters: EncryptedOutputParameters = {
+        content: 'encrypted-content',
+      } as EncryptedOutputParameters
+
+      jest.spyOn(itemsEncryptionService, 'encryptPayload').mockResolvedValue(encryptedOutputParameters)
+
+      const result = await itemsEncryptionService.encryptPayload(mockPayload, mockKey)
+
+      expect(result).toBe(encryptedOutputParameters)
+    })
+  })
+
+  it('repersistAllItems', async () => {
+    Object.defineProperty(mockItems, 'items', {
+      get: jest.fn().mockReturnValue([{ payload: { uuid: '123' } }]),
+    })
+
+    mockStorage.savePayloads = jest.fn().mockResolvedValue(undefined)
+
+    await itemsEncryptionService.repersistAllItems()
+
+    expect(mockStorage.savePayloads).toHaveBeenCalledWith([{ uuid: '123' }])
+  })
+
+  it('encryptPayloadWithKeyLookup', async () => {
+    const mockPayload: DecryptedPayloadInterface = {
+      key_system_identifier: 'test-identifier',
+    } as DecryptedPayloadInterface
+
+    const mockKeyPair: PkcKeyPair = { publicKey: 'publicKey', privateKey: 'privateKey' }
+    const mockKey = { uuid: 'key-id', keyVersion: '004' } as KeySystemItemsKey
+
+    mockKeys.getPrimaryKeySystemItemsKey = jest.fn().mockReturnValue(mockKey)
+    itemsEncryptionService.encryptPayload = jest
+      .fn()
+      .mockResolvedValue({ content: '004:...' } as EncryptedOutputParameters)
+
+    const result = await itemsEncryptionService.encryptPayloadWithKeyLookup(mockPayload, mockKeyPair)
+
+    expect(mockKeys.getPrimaryKeySystemItemsKey).toHaveBeenCalledWith(mockPayload.key_system_identifier)
+    expect(itemsEncryptionService.encryptPayload).toHaveBeenCalledWith(mockPayload, mockKey, mockKeyPair)
+    expect(result).toEqual({ content: '004:...' })
+  })
+})
@@ -97,7 +97,7 @@ export class ItemsEncryptionService extends AbstractService {
    return this._findDefaultItemsKey.execute(this.getItemsKeys()).getValue()
  }

-  private keyToUseForItemEncryption(
+  keyToUseForItemEncryption(
    payload: DecryptedPayloadInterface,
  ): ItemsKeyInterface | KeySystemItemsKeyInterface | KeySystemRootKeyInterface | StandardException {
    if (payload.key_system_identifier) {
@@ -132,7 +132,7 @@ export class ItemsEncryptionService extends AbstractService {
    return result
  }

-  private keyToUseForDecryptionOfPayload(
+  keyToUseForDecryptionOfPayload(
    payload: EncryptedPayloadInterface,
  ): ItemsKeyInterface | KeySystemItemsKeyInterface | undefined {
    if (payload.items_key_id) {
@@ -1,11 +1,7 @@
-export interface MfaProvider {
+export interface MfaServiceInterface {
  isMfaActivated(): Promise<boolean>
-
  generateMfaSecret(): Promise<string>
-
  getOtpToken(secret: string): Promise<string>
-
  enableMfa(secret: string, otpToken: string): Promise<void>
-
  disableMfa(): Promise<void>
 }
@@ -6,9 +6,9 @@ export enum PreferencesServiceEvent {
 }

 export interface PreferenceServiceInterface extends AbstractService<PreferencesServiceEvent> {
-  getValue<K extends PrefKey>(key: K, defaultValue: PrefValue[K] | undefined): PrefValue[K] | undefined
  getValue<K extends PrefKey>(key: K, defaultValue: PrefValue[K]): PrefValue[K]
  getValue<K extends PrefKey>(key: K, defaultValue?: PrefValue[K]): PrefValue[K] | undefined
+  getValue<K extends PrefKey>(key: K, defaultValue: PrefValue[K] | undefined): PrefValue[K] | undefined

  setValue<K extends PrefKey>(key: K, value: PrefValue[K]): Promise<void>
  /** Set value without triggering sync or event notifications */
@@ -1,9 +1,14 @@
+import { ApplicationServiceInterface } from './../Service/ApplicationServiceInterface'
 import { DecryptedItem, DecryptedItemInterface, FileItem, SNNote } from '@standardnotes/models'
 import { ChallengeInterface, ChallengeReason } from '../Challenge'
 import { MobileUnlockTiming } from './MobileUnlockTiming'
 import { TimingDisplayOption } from './TimingDisplayOption'
+import { ProtectionEvent } from './ProtectionEvent'
+
+export interface ProtectionsClientInterface extends ApplicationServiceInterface<ProtectionEvent, unknown> {
+  isLocked(): Promise<boolean>
+  softLockBiometrics(): void

-export interface ProtectionsClientInterface {
  createLaunchChallenge(): ChallengeInterface | undefined
  authorizeProtectedActionForItems<T extends DecryptedItem>(files: T[], challengeReason: ChallengeReason): Promise<T[]>
  authorizeItemAccess(item: DecryptedItem): Promise<boolean>
@@ -0,0 +1,6 @@
+export enum ProtectionEvent {
+  UnprotectedSessionBegan = 'Protection:UnprotectedSessionBegan',
+  UnprotectedSessionExpired = 'Protection:UnprotectedSessionExpired',
+  BiometricsSoftLockEngaged = 'Protection:BiometricsSoftLockEngaged',
+  BiometricsSoftLockDisengaged = 'Protection:BiometricsSoftLockDisengaged',
+}
@@ -20,6 +20,7 @@ export interface SessionsClientInterface {

  getUser(): User | undefined
  isSignedIn(): boolean
+  isSignedOut(): boolean
  get userUuid(): string
  getSureUser(): User
  isSignedIntoFirstPartyServer(): boolean
@@ -1,15 +1,11 @@
 import { DiscardItemsLocally } from './../UseCase/DiscardItemsLocally'
 import { InternalEventBusInterface } from './../Internal/InternalEventBusInterface'
 import { GetOwnedSharedVaults } from './UseCase/GetOwnedSharedVaults'
-import { IsVaultOwner } from './../VaultUser/UseCase/IsVaultOwner'
-import { EncryptionProviderInterface } from './../Encryption/EncryptionProviderInterface'
 import { DeleteSharedVault } from './UseCase/DeleteSharedVault'
 import { ConvertToSharedVault } from './UseCase/ConvertToSharedVault'
 import { ShareContactWithVault } from './UseCase/ShareContactWithVault'
 import { DeleteThirdPartyVault } from './UseCase/DeleteExternalSharedVault'
 import { FindContact } from './../Contacts/UseCase/FindContact'
-import { SendVaultDataChangedMessage } from './UseCase/SendVaultDataChangedMessage'
-import { NotifyVaultUsersOfKeyRotation } from './UseCase/NotifyVaultUsersOfKeyRotation'
 import { HandleKeyPairChange } from './../Contacts/UseCase/HandleKeyPairChange'
 import { CreateSharedVault } from './UseCase/CreateSharedVault'
 import { GetVault } from './../Vault/UseCase/GetVault'
@@ -29,20 +25,16 @@ describe('SharedVaultService', () => {
    const items = {} as jest.Mocked<ItemManagerInterface>
    items.addObserver = jest.fn()

-    const encryption = {} as jest.Mocked<EncryptionProviderInterface>
    const session = {} as jest.Mocked<SessionsClientInterface>
    const getVault = {} as jest.Mocked<GetVault>
    const getOwnedVaults = {} as jest.Mocked<GetOwnedSharedVaults>
    const createSharedVaultUseCase = {} as jest.Mocked<CreateSharedVault>
    const handleKeyPairChange = {} as jest.Mocked<HandleKeyPairChange>
-    const notifyVaultUsersOfKeyRotation = {} as jest.Mocked<NotifyVaultUsersOfKeyRotation>
-    const sendVaultDataChangeMessage = {} as jest.Mocked<SendVaultDataChangedMessage>
    const findContact = {} as jest.Mocked<FindContact>
    const deleteThirdPartyVault = {} as jest.Mocked<DeleteThirdPartyVault>
    const shareContactWithVault = {} as jest.Mocked<ShareContactWithVault>
    const convertToSharedVault = {} as jest.Mocked<ConvertToSharedVault>
    const deleteSharedVaultUseCase = {} as jest.Mocked<DeleteSharedVault>
-    const isVaultAdmin = {} as jest.Mocked<IsVaultOwner>
    const discardItemsLocally = {} as jest.Mocked<DiscardItemsLocally>

    const eventBus = {} as jest.Mocked<InternalEventBusInterface>
@@ -50,20 +42,16 @@ describe('SharedVaultService', () => {

    service = new SharedVaultService(
      items,
-      encryption,
      session,
      getVault,
      getOwnedVaults,
      createSharedVaultUseCase,
      handleKeyPairChange,
-      notifyVaultUsersOfKeyRotation,
-      sendVaultDataChangeMessage,
      findContact,
      deleteThirdPartyVault,
      shareContactWithVault,
      convertToSharedVault,
      deleteSharedVaultUseCase,
-      isVaultAdmin,
      discardItemsLocally,
      eventBus,
    )
@@ -22,18 +22,13 @@ import { InternalEventInterface } from '../Internal/InternalEventInterface'
 import { NotificationServiceEvent, NotificationServiceEventPayload } from '../UserEvent/NotificationServiceEvent'
 import { DeleteThirdPartyVault } from './UseCase/DeleteExternalSharedVault'
 import { DeleteSharedVault } from './UseCase/DeleteSharedVault'
-import { VaultServiceEvent, VaultServiceEventPayload } from '../Vault/VaultServiceEvent'
 import { ShareContactWithVault } from './UseCase/ShareContactWithVault'
-import { NotifyVaultUsersOfKeyRotation } from './UseCase/NotifyVaultUsersOfKeyRotation'
 import { CreateSharedVault } from './UseCase/CreateSharedVault'
-import { SendVaultDataChangedMessage } from './UseCase/SendVaultDataChangedMessage'
 import { ConvertToSharedVault } from './UseCase/ConvertToSharedVault'
 import { GetVault } from '../Vault/UseCase/GetVault'
 import { ContentType, NotificationType, Uuid } from '@standardnotes/domain-core'
 import { HandleKeyPairChange } from '../Contacts/UseCase/HandleKeyPairChange'
 import { FindContact } from '../Contacts/UseCase/FindContact'
-import { EncryptionProviderInterface } from '../Encryption/EncryptionProviderInterface'
-import { IsVaultOwner } from '../VaultUser/UseCase/IsVaultOwner'
 import { GetOwnedSharedVaults } from './UseCase/GetOwnedSharedVaults'

 export class SharedVaultService
@@ -42,20 +37,16 @@ export class SharedVaultService
 {
  constructor(
    private items: ItemManagerInterface,
-    private encryption: EncryptionProviderInterface,
    private session: SessionsClientInterface,
    private _getVault: GetVault,
    private _getOwnedSharedVaults: GetOwnedSharedVaults,
    private _createSharedVault: CreateSharedVault,
    private _handleKeyPairChange: HandleKeyPairChange,
-    private _notifyVaultUsersOfKeyRotation: NotifyVaultUsersOfKeyRotation,
-    private _sendVaultDataChangeMessage: SendVaultDataChangedMessage,
    private _findContact: FindContact,
    private _deleteThirdPartyVault: DeleteThirdPartyVault,
    private _shareContactWithVault: ShareContactWithVault,
    private _convertToSharedVault: ConvertToSharedVault,
    private _deleteSharedVault: DeleteSharedVault,
-    private _isVaultAdmin: IsVaultOwner,
    private _discardItemsLocally: DiscardItemsLocally,
    eventBus: InternalEventBusInterface,
  ) {
@@ -68,32 +59,20 @@ export class SharedVaultService
        }
      }),
    )
-
-    this.eventDisposers.push(
-      items.addObserver<VaultListingInterface>(ContentType.TYPES.VaultListing, ({ changed, source }) => {
-        if (source === PayloadEmitSource.LocalChanged && changed.length > 0) {
-          void this.handleVaultListingsChange(changed)
-        }
-      }),
-    )
  }

  override deinit(): void {
    super.deinit()
    ;(this.items as unknown) = undefined
-    ;(this.encryption as unknown) = undefined
    ;(this.session as unknown) = undefined
    ;(this._getVault as unknown) = undefined
    ;(this._createSharedVault as unknown) = undefined
    ;(this._handleKeyPairChange as unknown) = undefined
-    ;(this._notifyVaultUsersOfKeyRotation as unknown) = undefined
-    ;(this._sendVaultDataChangeMessage as unknown) = undefined
    ;(this._findContact as unknown) = undefined
    ;(this._deleteThirdPartyVault as unknown) = undefined
    ;(this._shareContactWithVault as unknown) = undefined
    ;(this._convertToSharedVault as unknown) = undefined
    ;(this._deleteSharedVault as unknown) = undefined
-    ;(this._isVaultAdmin as unknown) = undefined
  }

  async handleEvent(event: InternalEventInterface): Promise<void> {
@@ -109,11 +88,6 @@ export class SharedVaultService
      case NotificationServiceEvent.NotificationReceived:
        await this.handleUserEvent(event.payload as NotificationServiceEventPayload)
        break
-      case VaultServiceEvent.VaultRootKeyRotated: {
-        const payload = event.payload as VaultServiceEventPayload[VaultServiceEvent.VaultRootKeyRotated]
-        await this.handleVaultRootKeyRotatedEvent(payload.vault)
-        break
-      }
      case SyncEvent.ReceivedRemoteSharedVaults:
        void this.notifyEventSync(SharedVaultServiceEvent.SharedVaultStatusChanged)
        break
@@ -141,33 +115,6 @@ export class SharedVaultService
    }
  }

-  private isCurrentUserVaultOwner(sharedVault: SharedVaultListingInterface): boolean {
-    if (!sharedVault.sharing.ownerUserUuid) {
-      throw new Error(`Shared vault ${sharedVault.sharing.sharedVaultUuid} does not have an owner user uuid`)
-    }
-
-    return sharedVault.sharing.ownerUserUuid === this.session.userUuid
-  }
-
-  private async handleVaultRootKeyRotatedEvent(vault: VaultListingInterface): Promise<void> {
-    if (!vault.isSharedVaultListing()) {
-      return
-    }
-
-    if (!this.isCurrentUserVaultOwner(vault)) {
-      return
-    }
-
-    await this._notifyVaultUsersOfKeyRotation.execute({
-      sharedVault: vault,
-      senderUuid: this.session.getSureUser().uuid,
-      keys: {
-        encryption: this.encryption.getKeyPair(),
-        signing: this.encryption.getSigningKeyPair(),
-      },
-    })
-  }
-
  async createSharedVault(dto: {
    name: string
    description?: string
@@ -198,23 +145,6 @@ export class SharedVaultService
    }
  }

-  private async handleVaultListingsChange(vaults: VaultListingInterface[]): Promise<void> {
-    for (const vault of vaults) {
-      if (!vault.isSharedVaultListing()) {
-        continue
-      }
-
-      await this._sendVaultDataChangeMessage.execute({
-        vault,
-        senderUuid: this.session.getSureUser().uuid,
-        keys: {
-          encryption: this.encryption.getKeyPair(),
-          signing: this.encryption.getSigningKeyPair(),
-        },
-      })
-    }
-  }
-
  public async deleteSharedVault(sharedVault: SharedVaultListingInterface): Promise<ClientDisplayableError | void> {
    return this._deleteSharedVault.execute({ sharedVault })
  }
@@ -224,17 +154,12 @@ export class SharedVaultService
      throw new Error('Cannot share self contact')
    }

-    const ownedVaults = this._getOwnedSharedVaults.execute({ userUuid: this.session.userUuid }).getValue()
+    const ownedVaults = this._getOwnedSharedVaults.execute().getValue()

    for (const vault of ownedVaults) {
      await this._shareContactWithVault.execute({
-        keys: {
-          encryption: this.encryption.getKeyPair(),
-          signing: this.encryption.getSigningKeyPair(),
-        },
        sharedVault: vault,
        contactToShare: contact,
-        senderUserUuid: this.session.getSureUser().uuid,
      })
    }
  }
@@ -5,18 +5,17 @@ import { GetSharedVaults } from './GetSharedVaults'

 export class GetOwnedSharedVaults implements SyncUseCaseInterface<SharedVaultListingInterface[]> {
  constructor(
-    private getSharedVaults: GetSharedVaults,
-    private isVaultOwnwer: IsVaultOwner,
+    private _getSharedVaults: GetSharedVaults,
+    private _isVaultOwnwer: IsVaultOwner,
  ) {}

-  execute(dto: { userUuid: string }): Result<SharedVaultListingInterface[]> {
-    const sharedVaults = this.getSharedVaults.execute().getValue()
+  execute(): Result<SharedVaultListingInterface[]> {
+    const sharedVaults = this._getSharedVaults.execute().getValue()

    const ownedVaults = sharedVaults.filter((vault) => {
-      return this.isVaultOwnwer
+      return this._isVaultOwnwer
        .execute({
          sharedVault: vault,
-          userUuid: dto.userUuid,
        })
        .getValue()
    })
@@ -2,30 +2,26 @@ import { SharedVaultInvitesServerInterface } from '@standardnotes/api'
 import { AsymmetricMessageSharedVaultInvite, SharedVaultListingInterface } from '@standardnotes/models'
 import { SharedVaultInviteServerHash, isErrorResponse } from '@standardnotes/responses'
 import { SendVaultKeyChangedMessage } from './SendVaultKeyChangedMessage'
-import { PkcKeyPair } from '@standardnotes/sncrypto-common'
 import { Result, UseCaseInterface } from '@standardnotes/domain-core'
 import { InviteToVault } from '../../VaultInvite/UseCase/InviteToVault'
 import { GetVaultContacts } from '../../VaultUser/UseCase/GetVaultContacts'
 import { DecryptOwnMessage } from '../../Encryption/UseCase/Asymmetric/DecryptOwnMessage'
 import { FindContact } from '../../Contacts/UseCase/FindContact'
+import { GetKeyPairs } from '../../Encryption/UseCase/GetKeyPairs'

 type Params = {
-  keys: {
-    encryption: PkcKeyPair
-    signing: PkcKeyPair
-  }
  sharedVault: SharedVaultListingInterface
-  senderUuid: string
 }

 export class NotifyVaultUsersOfKeyRotation implements UseCaseInterface<void> {
  constructor(
-    private findContact: FindContact,
-    private sendKeyChangedMessage: SendVaultKeyChangedMessage,
-    private inviteToVault: InviteToVault,
-    private inviteServer: SharedVaultInvitesServerInterface,
-    private getVaultContacts: GetVaultContacts,
-    private decryptOwnMessage: DecryptOwnMessage<AsymmetricMessageSharedVaultInvite>,
+    private _findContact: FindContact,
+    private _sendKeyChangedMessage: SendVaultKeyChangedMessage,
+    private _inviteToVault: InviteToVault,
+    private _inviteServer: SharedVaultInvitesServerInterface,
+    private _getVaultContacts: GetVaultContacts,
+    private _decryptOwnMessage: DecryptOwnMessage<AsymmetricMessageSharedVaultInvite>,
+    private _getKeyPairs: GetKeyPairs,
  ) {}

  async execute(params: Params): Promise<Result<void>> {
@@ -44,20 +40,25 @@ export class NotifyVaultUsersOfKeyRotation implements UseCaseInterface<void> {

    await this.deleteAllInvites(params.sharedVault.sharing.sharedVaultUuid)

-    const contacts = await this.getVaultContacts.execute({
+    const contacts = await this._getVaultContacts.execute({
      sharedVaultUuid: params.sharedVault.sharing.sharedVaultUuid,
      readFromCache: false,
    })

+    const keys = this._getKeyPairs.execute()
+    if (keys.isFailed()) {
+      return Result.fail('Cannot send metadata changed message; keys not found')
+    }
+
    for (const invite of existingInvites.getValue()) {
-      const recipient = this.findContact.execute({ userUuid: invite.user_uuid })
+      const recipient = this._findContact.execute({ userUuid: invite.user_uuid })
      if (recipient.isFailed()) {
        continue
      }

-      const decryptedPreviousInvite = this.decryptOwnMessage.execute({
+      const decryptedPreviousInvite = this._decryptOwnMessage.execute({
        message: invite.encrypted_message,
-        privateKey: params.keys.encryption.privateKey,
+        privateKey: keys.getValue().encryption.privateKey,
        recipientPublicKey: recipient.getValue().publicKeySet.encryption,
      })

@@ -65,13 +66,11 @@ export class NotifyVaultUsersOfKeyRotation implements UseCaseInterface<void> {
        return Result.fail(decryptedPreviousInvite.getError())
      }

-      await this.inviteToVault.execute({
-        keys: params.keys,
+      await this._inviteToVault.execute({
        sharedVault: params.sharedVault,
        sharedVaultContacts: !contacts.isFailed() ? contacts.getValue() : [],
        recipient: recipient.getValue(),
        permission: invite.permission,
-        senderUuid: params.senderUuid,
      })
    }

@@ -79,11 +78,9 @@ export class NotifyVaultUsersOfKeyRotation implements UseCaseInterface<void> {
  }

  private async performSendKeyChangeMessage(params: Params): Promise<Result<void>> {
-    const result = await this.sendKeyChangedMessage.execute({
+    const result = await this._sendKeyChangedMessage.execute({
      keySystemIdentifier: params.sharedVault.systemIdentifier,
      sharedVaultUuid: params.sharedVault.sharing.sharedVaultUuid,
-      senderUuid: params.senderUuid,
-      keys: params.keys,
    })

    if (result.isFailed()) {
@@ -94,7 +91,7 @@ export class NotifyVaultUsersOfKeyRotation implements UseCaseInterface<void> {
  }

  private async deleteAllInvites(sharedVaultUuid: string): Promise<Result<void>> {
-    const response = await this.inviteServer.deleteAllSharedVaultInvites({
+    const response = await this._inviteServer.deleteAllSharedVaultInvites({
      sharedVaultUuid: sharedVaultUuid,
    })

@@ -106,7 +103,7 @@ export class NotifyVaultUsersOfKeyRotation implements UseCaseInterface<void> {
  }

  private async getExistingInvites(sharedVaultUuid: string): Promise<Result<SharedVaultInviteServerHash[]>> {
-    const response = await this.inviteServer.getOutboundUserInvites()
+    const response = await this._inviteServer.getOutboundUserInvites()

    if (isErrorResponse(response)) {
      return Result.fail(`Failed to get outbound user invites ${JSON.stringify(response)}`)
@@ -1,3 +1,5 @@
+import { UserServiceInterface } from './../../User/UserServiceInterface'
+import { IsVaultOwner } from './../../VaultUser/UseCase/IsVaultOwner'
 import {
  AsymmetricMessagePayloadType,
  AsymmetricMessageSharedVaultMetadataChanged,
@@ -12,24 +14,26 @@ import { EncryptMessage } from '../../Encryption/UseCase/Asymmetric/EncryptMessa
 import { Result, UseCaseInterface } from '@standardnotes/domain-core'
 import { GetReplaceabilityIdentifier } from '../../AsymmetricMessage/UseCase/GetReplaceabilityIdentifier'
 import { FindContact } from '../../Contacts/UseCase/FindContact'
+import { GetKeyPairs } from '../../Encryption/UseCase/GetKeyPairs'

 export class SendVaultDataChangedMessage implements UseCaseInterface<void> {
  constructor(
-    private encryptMessage: EncryptMessage,
-    private findContact: FindContact,
-    private getVaultUsers: GetVaultUsers,
-    private sendMessage: SendMessage,
+    private users: UserServiceInterface,
+    private _encryptMessage: EncryptMessage,
+    private _findContact: FindContact,
+    private _getVaultUsers: GetVaultUsers,
+    private _sendMessage: SendMessage,
+    private _isVaultOwner: IsVaultOwner,
+    private _getKeyPairs: GetKeyPairs,
  ) {}

-  async execute(params: {
-    vault: SharedVaultListingInterface
-    senderUuid: string
-    keys: {
-      encryption: PkcKeyPair
-      signing: PkcKeyPair
+  async execute(params: { vault: SharedVaultListingInterface }): Promise<Result<void>> {
+    const isOwner = this._isVaultOwner.execute({ sharedVault: params.vault }).getValue()
+    if (!isOwner) {
+      return Result.ok()
    }
-  }): Promise<Result<void>> {
-    const users = await this.getVaultUsers.execute({
+
+    const users = await this._getVaultUsers.execute({
      sharedVaultUuid: params.vault.sharing.sharedVaultUuid,
      readFromCache: false,
    })
@@ -37,20 +41,25 @@ export class SendVaultDataChangedMessage implements UseCaseInterface<void> {
      return Result.fail('Cannot send metadata changed message; users not found')
    }

+    const keys = this._getKeyPairs.execute()
+    if (keys.isFailed()) {
+      return Result.fail('Cannot send metadata changed message; keys not found')
+    }
+
    const errors: string[] = []
    for (const user of users.getValue()) {
-      if (user.user_uuid === params.senderUuid) {
+      if (user.user_uuid === this.users.sureUser.uuid) {
        continue
      }

-      const trustedContact = this.findContact.execute({ userUuid: user.user_uuid })
+      const trustedContact = this._findContact.execute({ userUuid: user.user_uuid })
      if (trustedContact.isFailed()) {
        continue
      }

      const sendMessageResult = await this.sendToContact({
        vault: params.vault,
-        keys: params.keys,
+        keys: keys.getValue(),
        contact: trustedContact.getValue(),
      })

@@ -84,7 +93,7 @@ export class SendVaultDataChangedMessage implements UseCaseInterface<void> {
      },
    }

-    const encryptedMessage = this.encryptMessage.execute({
+    const encryptedMessage = this._encryptMessage.execute({
      message: message,
      keys: params.keys,
      recipientPublicKey: params.contact.publicKeySet.encryption,
@@ -100,7 +109,7 @@ export class SendVaultDataChangedMessage implements UseCaseInterface<void> {
      params.vault.systemIdentifier,
    )

-    const sendMessageResult = await this.sendMessage.execute({
+    const sendMessageResult = await this._sendMessage.execute({
      recipientUuid: params.contact.contactUuid,
      encryptedMessage: encryptedMessage.getValue(),
      replaceabilityIdentifier,
@@ -1,3 +1,4 @@
+import { UserServiceInterface } from './../../User/UserServiceInterface'
 import {
  AsymmetricMessagePayloadType,
  AsymmetricMessageSharedVaultRootKeyChanged,
@@ -13,38 +14,38 @@ import { Result, UseCaseInterface } from '@standardnotes/domain-core'
 import { GetReplaceabilityIdentifier } from '../../AsymmetricMessage/UseCase/GetReplaceabilityIdentifier'
 import { FindContact } from '../../Contacts/UseCase/FindContact'
 import { KeySystemKeyManagerInterface } from '../../KeySystem/KeySystemKeyManagerInterface'
+import { GetKeyPairs } from '../../Encryption/UseCase/GetKeyPairs'

 export class SendVaultKeyChangedMessage implements UseCaseInterface<void> {
  constructor(
-    private encryptMessage: EncryptMessage,
+    private users: UserServiceInterface,
    private keyManager: KeySystemKeyManagerInterface,
-    private findContact: FindContact,
-    private sendMessage: SendMessage,
-    private getVaultUsers: GetVaultUsers,
+    private _encryptMessage: EncryptMessage,
+    private _findContact: FindContact,
+    private _sendMessage: SendMessage,
+    private _getVaultUsers: GetVaultUsers,
+    private _getKeyPairs: GetKeyPairs,
  ) {}

-  async execute(params: {
-    keySystemIdentifier: KeySystemIdentifier
-    sharedVaultUuid: string
-    senderUuid: string
-    keys: {
-      encryption: PkcKeyPair
-      signing: PkcKeyPair
-    }
-  }): Promise<Result<void>> {
-    const users = await this.getVaultUsers.execute({ sharedVaultUuid: params.sharedVaultUuid, readFromCache: false })
+  async execute(params: { keySystemIdentifier: KeySystemIdentifier; sharedVaultUuid: string }): Promise<Result<void>> {
+    const users = await this._getVaultUsers.execute({ sharedVaultUuid: params.sharedVaultUuid, readFromCache: false })
    if (users.isFailed()) {
      return Result.fail('Cannot send root key changed message; users not found')
    }

+    const keys = this._getKeyPairs.execute()
+    if (keys.isFailed()) {
+      return Result.fail('Cannot send root key changed message; keys not found')
+    }
+
    const errors: string[] = []

    for (const user of users.getValue()) {
-      if (user.user_uuid === params.senderUuid) {
+      if (user.user_uuid === this.users.sureUser.uuid) {
        continue
      }

-      const trustedContact = this.findContact.execute({ userUuid: user.user_uuid })
+      const trustedContact = this._findContact.execute({ userUuid: user.user_uuid })
      if (trustedContact.isFailed()) {
        continue
      }
@@ -52,7 +53,7 @@ export class SendVaultKeyChangedMessage implements UseCaseInterface<void> {
      const result = await this.sendToContact({
        keySystemIdentifier: params.keySystemIdentifier,
        sharedVaultUuid: params.sharedVaultUuid,
-        keys: params.keys,
+        keys: keys.getValue(),
        contact: trustedContact.getValue(),
      })

@@ -87,7 +88,7 @@ export class SendVaultKeyChangedMessage implements UseCaseInterface<void> {
      data: { recipientUuid: params.contact.contactUuid, rootKey: keySystemRootKey.content },
    }

-    const encryptedMessage = this.encryptMessage.execute({
+    const encryptedMessage = this._encryptMessage.execute({
      message: message,
      keys: params.keys,
      recipientPublicKey: params.contact.publicKeySet.encryption,
@@ -103,7 +104,7 @@ export class SendVaultKeyChangedMessage implements UseCaseInterface<void> {
      params.keySystemIdentifier,
    )

-    const sendMessageResult = await this.sendMessage.execute({
+    const sendMessageResult = await this._sendMessage.execute({
      recipientUuid: params.contact.contactUuid,
      encryptedMessage: encryptedMessage.getValue(),
      replaceabilityIdentifier,
@@ -1,37 +1,35 @@
+import { UserServiceInterface } from './../../User/UserServiceInterface'
 import {
  TrustedContactInterface,
  SharedVaultListingInterface,
  AsymmetricMessagePayloadType,
 } from '@standardnotes/models'
-import { PkcKeyPair } from '@standardnotes/sncrypto-common'
 import { SendMessage } from '../../AsymmetricMessage/UseCase/SendMessage'
 import { EncryptMessage } from '../../Encryption/UseCase/Asymmetric/EncryptMessage'
 import { Result, UseCaseInterface } from '@standardnotes/domain-core'
 import { FindContact } from '../../Contacts/UseCase/FindContact'
 import { GetVaultUsers } from '../../VaultUser/UseCase/GetVaultUsers'
+import { GetKeyPairs } from '../../Encryption/UseCase/GetKeyPairs'

 export class ShareContactWithVault implements UseCaseInterface<void> {
  constructor(
-    private findContact: FindContact,
-    private encryptMessage: EncryptMessage,
-    private sendMessage: SendMessage,
-    private getVaultUsers: GetVaultUsers,
+    private users: UserServiceInterface,
+    private _findContact: FindContact,
+    private _encryptMessage: EncryptMessage,
+    private _sendMessage: SendMessage,
+    private _getVaultUsers: GetVaultUsers,
+    private _getKeyPairs: GetKeyPairs,
  ) {}

  async execute(params: {
-    keys: {
-      encryption: PkcKeyPair
-      signing: PkcKeyPair
-    }
-    senderUserUuid: string
    sharedVault: SharedVaultListingInterface
    contactToShare: TrustedContactInterface
  }): Promise<Result<void>> {
-    if (params.sharedVault.sharing.ownerUserUuid !== params.senderUserUuid) {
+    if (params.sharedVault.sharing.ownerUserUuid !== this.users.sureUser.uuid) {
      return Result.fail('Cannot share contact; user is not the owner of the shared vault')
    }

-    const users = await this.getVaultUsers.execute({
+    const users = await this._getVaultUsers.execute({
      sharedVaultUuid: params.sharedVault.sharing.sharedVaultUuid,
      readFromCache: false,
    })
@@ -44,8 +42,13 @@ export class ShareContactWithVault implements UseCaseInterface<void> {
      return Result.ok()
    }

+    const keys = this._getKeyPairs.execute()
+    if (keys.isFailed()) {
+      return Result.fail('Cannot share contact; keys not found')
+    }
+
    for (const vaultUser of users.getValue()) {
-      if (vaultUser.user_uuid === params.senderUserUuid) {
+      if (vaultUser.user_uuid === this.users.sureUser.uuid) {
        continue
      }

@@ -53,12 +56,12 @@ export class ShareContactWithVault implements UseCaseInterface<void> {
        continue
      }

-      const vaultUserAsContact = this.findContact.execute({ userUuid: vaultUser.user_uuid })
+      const vaultUserAsContact = this._findContact.execute({ userUuid: vaultUser.user_uuid })
      if (vaultUserAsContact.isFailed()) {
        continue
      }

-      const encryptedMessage = this.encryptMessage.execute({
+      const encryptedMessage = this._encryptMessage.execute({
        message: {
          type: AsymmetricMessagePayloadType.ContactShare,
          data: {
@@ -66,7 +69,7 @@ export class ShareContactWithVault implements UseCaseInterface<void> {
            trustedContact: params.contactToShare.content,
          },
        },
-        keys: params.keys,
+        keys: keys.getValue(),
        recipientPublicKey: vaultUserAsContact.getValue().publicKeySet.encryption,
      })

@@ -74,7 +77,7 @@ export class ShareContactWithVault implements UseCaseInterface<void> {
        continue
      }

-      await this.sendMessage.execute({
+      await this._sendMessage.execute({
        recipientUuid: vaultUserAsContact.getValue().contactUuid,
        encryptedMessage: encryptedMessage.getValue(),
        replaceabilityIdentifier: undefined,
@@ -0,0 +1,33 @@
+import { SyncOptions } from './../Sync/SyncOptions'
+import { MutatorClientInterface } from './../Mutator/MutatorClientInterface'
+import { SyncServiceInterface } from './../Sync/SyncServiceInterface'
+import { ItemManagerInterface } from '../Item/ItemManagerInterface'
+import { DecryptedItemInterface, DecryptedItemMutator, MutationType, PayloadEmitSource } from '@standardnotes/models'
+import { Result, UseCaseInterface } from '@standardnotes/domain-core'
+
+export class ChangeAndSaveItem implements UseCaseInterface<DecryptedItemInterface | undefined> {
+  constructor(
+    private readonly items: ItemManagerInterface,
+    private mutator: MutatorClientInterface,
+    private sync: SyncServiceInterface,
+  ) {}
+
+  async execute<M extends DecryptedItemMutator = DecryptedItemMutator>(
+    itemToLookupUuidFor: DecryptedItemInterface,
+    mutate: (mutator: M) => void,
+    updateTimestamps = true,
+    emitSource?: PayloadEmitSource,
+    syncOptions?: SyncOptions,
+  ): Promise<Result<DecryptedItemInterface | undefined>> {
+    await this.mutator.changeItems(
+      [itemToLookupUuidFor],
+      mutate,
+      updateTimestamps ? MutationType.UpdateUserTimestamps : MutationType.NoUpdateUserTimestamps,
+      emitSource,
+    )
+
+    await this.sync.sync(syncOptions)
+
+    return Result.ok(this.items.findItem(itemToLookupUuidFor.uuid))
+  }
+}
@@ -0,0 +1,12 @@
+import { Result, SyncUseCaseInterface } from '@standardnotes/domain-core'
+import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
+
+export class GenerateUuid implements SyncUseCaseInterface<string> {
+  constructor(private crypto: PureCryptoInterface) {}
+
+  execute(): Result<string> {
+    const uuid = this.crypto.generateUUID()
+
+    return Result.ok(uuid)
+  }
+}
@@ -0,0 +1,10 @@
+import { LegacyApiServiceInterface } from './../Api/LegacyApiServiceInterface'
+import { Result, SyncUseCaseInterface } from '@standardnotes/domain-core'
+
+export class GetHost implements SyncUseCaseInterface<string> {
+  constructor(private legacyApi: LegacyApiServiceInterface) {}
+
+  execute(): Result<string> {
+    return Result.ok(this.legacyApi.getHost())
+  }
+}
@@ -0,0 +1,18 @@
+import { HttpServiceInterface } from '@standardnotes/api'
+import { LegacyApiServiceInterface } from '../Api/LegacyApiServiceInterface'
+import { Result, UseCaseInterface } from '@standardnotes/domain-core'
+
+export class SetHost implements UseCaseInterface<void> {
+  constructor(
+    private http: HttpServiceInterface,
+    private legacyApi: LegacyApiServiceInterface,
+  ) {}
+
+  async execute(host: string): Promise<Result<string>> {
+    this.http.setHost(host)
+
+    await this.legacyApi.setHost(host)
+
+    return Result.ok()
+  }
+}
@@ -1,3 +1,4 @@
+import { DecryptErroredPayloads } from './../Encryption/UseCase/DecryptErroredPayloads'
 import { ReencryptTypeAItems } from './../Encryption/UseCase/TypeA/ReencryptTypeAItems'
 import { EncryptionProviderInterface } from './../Encryption/EncryptionProviderInterface'
 import { UserApiServiceInterface } from '@standardnotes/api'
@@ -27,6 +28,7 @@ describe('UserService', () => {
  let protectionService: ProtectionsClientInterface
  let userApiService: UserApiServiceInterface
  let reencryptTypeAItems: ReencryptTypeAItems
+  let decryptErroredPayloads: DecryptErroredPayloads
  let internalEventBus: InternalEventBusInterface

  const createService = () =>
@@ -41,6 +43,7 @@ describe('UserService', () => {
      protectionService,
      userApiService,
      reencryptTypeAItems,
+      decryptErroredPayloads,
      internalEventBus,
    )

@@ -25,7 +25,7 @@ import {
 } from '../Challenge'
 import { InternalEventBusInterface } from '../Internal/InternalEventBusInterface'
 import { AbstractService } from '../Service/AbstractService'
-import { UserClientInterface } from './UserClientInterface'
+import { UserServiceInterface } from './UserServiceInterface'
 import { DeinitSource } from '../Application/DeinitSource'
 import { StoragePersistencePolicies } from '../Storage/StorageTypes'
 import { SessionsClientInterface } from '../Session/SessionsClientInterface'
@@ -38,10 +38,11 @@ import { SignedInOrRegisteredEventPayload } from './SignedInOrRegisteredEventPay
 import { CredentialsChangeFunctionResponse } from './CredentialsChangeFunctionResponse'
 import { EncryptionProviderInterface } from '../Encryption/EncryptionProviderInterface'
 import { ReencryptTypeAItems } from '../Encryption/UseCase/TypeA/ReencryptTypeAItems'
+import { DecryptErroredPayloads } from '../Encryption/UseCase/DecryptErroredPayloads'

 export class UserService
  extends AbstractService<AccountEvent, AccountEventData>
-  implements UserClientInterface, InternalEventHandlerInterface
+  implements UserServiceInterface, InternalEventHandlerInterface
 {
  private signingIn = false
  private registering = false
@@ -60,6 +61,7 @@ export class UserService
    private protections: ProtectionsClientInterface,
    private userApi: UserApiServiceInterface,
    private _reencryptTypeAItems: ReencryptTypeAItems,
+    private _decryptErroredPayloads: DecryptErroredPayloads,
    protected override internalEventBus: InternalEventBusInterface,
  ) {
    super(internalEventBus)
@@ -77,6 +79,7 @@ export class UserService
    ;(this.protections as unknown) = undefined
    ;(this.userApi as unknown) = undefined
    ;(this._reencryptTypeAItems as unknown) = undefined
+    ;(this._decryptErroredPayloads as unknown) = undefined
  }

  async handleEvent(event: InternalEventInterface): Promise<void> {
@@ -104,18 +107,26 @@ export class UserService
        })
        .then(() => {
          if (!payload.awaitSync) {
-            void this.encryption.decryptErroredPayloads()
+            void this._decryptErroredPayloads.execute()
          }
        })

      if (payload.awaitSync) {
        await syncPromise

-        await this.encryption.decryptErroredPayloads()
+        await this._decryptErroredPayloads.execute()
      }
    }
  }

+  get user(): User | undefined {
+    return this.sessions.getUser()
+  }
+
+  get sureUser(): User {
+    return this.sessions.getSureUser()
+  }
+
  getUserUuid(): string {
    return this.sessions.userUuid
  }
@@ -2,13 +2,15 @@ import { Base64String } from '@standardnotes/sncrypto-common'
 import { KeyParamsOrigination, UserRequestType } from '@standardnotes/common'
 import { DeinitSource } from '../Application/DeinitSource'
 import { UserRegistrationResponseBody } from '@standardnotes/api'
-import { HttpResponse, SignInResponse } from '@standardnotes/responses'
+import { HttpResponse, SignInResponse, User } from '@standardnotes/responses'
 import { AbstractService } from '../Service/AbstractService'
 import { AccountEventData } from './AccountEventData'
 import { AccountEvent } from './AccountEvent'
 import { CredentialsChangeFunctionResponse } from './CredentialsChangeFunctionResponse'

-export interface UserClientInterface extends AbstractService<AccountEvent, AccountEventData> {
+export interface UserServiceInterface extends AbstractService<AccountEvent, AccountEventData> {
+  get user(): User | undefined
+  get sureUser(): User
  getUserUuid(): string
  isSignedIn(): boolean

@@ -1,207 +1,66 @@
-import { MutatorClientInterface, SyncServiceInterface } from '@standardnotes/services'
-import {
-  KeySystemPasswordType,
-  KeySystemRootKeyStorageMode,
-  VaultListingInterface,
-  VaultListingMutator,
-} from '@standardnotes/models'
+import { RotateVaultKey } from './RotateVaultKey'
+import { SyncServiceInterface } from '@standardnotes/services'
+import { KeySystemPasswordType, KeySystemRootKeyStorageMode } from '@standardnotes/models'
 import { ChangeVaultKeyOptionsDTO } from './ChangeVaultKeyOptionsDTO'
-import { GetVault } from './GetVault'
-import { EncryptionProviderInterface } from '../../Encryption/EncryptionProviderInterface'
-import { KeySystemKeyManagerInterface } from '../../KeySystem/KeySystemKeyManagerInterface'
 import { Result, UseCaseInterface } from '@standardnotes/domain-core'
+import { ChangeVaultStorageMode } from './ChangeVaultStorageMode'

 export class ChangeVaultKeyOptions implements UseCaseInterface<void> {
  constructor(
-    private mutator: MutatorClientInterface,
    private sync: SyncServiceInterface,
-    private encryption: EncryptionProviderInterface,
-    private keys: KeySystemKeyManagerInterface,
-    private getVault: GetVault,
+    private _rotateVaultKey: RotateVaultKey,
+    private _changeVaultStorageMode: ChangeVaultStorageMode,
  ) {}

  async execute(dto: ChangeVaultKeyOptionsDTO): Promise<Result<void>> {
-    if (dto.newPasswordType) {
-      const result = await this.handleNewPasswordType(dto)
-      if (result.isFailed()) {
-        return result
+    let newStorageMode = dto.newStorageMode
+    let vault = dto.vault
+
+    if (dto.newPasswordOptions) {
+      if (
+        dto.newPasswordOptions.passwordType === KeySystemPasswordType.Randomized &&
+        dto.newStorageMode &&
+        dto.newStorageMode !== KeySystemRootKeyStorageMode.Synced
+      ) {
+        return Result.fail('Cannot change storage mode to non-synced for randomized vault')
      }
-    }

-    if (dto.newStorageMode) {
-      const result = await this.handleNewStorageMode(dto)
-      if (result.isFailed()) {
-        return result
+      if (
+        dto.newPasswordOptions.passwordType === KeySystemPasswordType.UserInputted &&
+        !dto.newPasswordOptions.userInputtedPassword
+      ) {
+        return Result.fail('User inputted password required')
      }
-    }

-    await this.sync.sync()
-
-    return Result.ok()
-  }
-
-  private async handleNewPasswordType(dto: ChangeVaultKeyOptionsDTO): Promise<Result<void>> {
-    if (!dto.newPasswordType) {
-      return Result.ok()
-    }
-
-    if (dto.vault.keyPasswordType === dto.newPasswordType.passwordType) {
-      return Result.fail('Vault password type is already set to this type')
-    }
-
-    if (dto.newPasswordType.passwordType === KeySystemPasswordType.UserInputted) {
-      if (!dto.newPasswordType.userInputtedPassword) {
-        return Result.fail('User inputted password is required')
-      }
-      const useStorageMode = dto.newStorageMode ?? dto.vault.keyStorageMode
-      const result = await this.changePasswordTypeToUserInputted(
-        dto.vault,
-        dto.newPasswordType.userInputtedPassword,
-        useStorageMode,
-      )
-      if (result.isFailed()) {
-        return result
-      }
-    } else if (dto.newPasswordType.passwordType === KeySystemPasswordType.Randomized) {
-      const result = await this.changePasswordTypeToRandomized(dto.vault)
-      if (result.isFailed()) {
-        return result
-      }
-    }
-
-    return Result.ok()
-  }
-
-  private async handleNewStorageMode(dto: ChangeVaultKeyOptionsDTO): Promise<Result<void>> {
-    if (!dto.newStorageMode) {
-      return Result.ok()
-    }
-
-    const result = this.getVault.execute({ keySystemIdentifier: dto.vault.systemIdentifier })
-    if (result.isFailed()) {
-      return Result.fail('Vault not found')
-    }
-
-    const latestVault = result.getValue()
-
-    if (latestVault.rootKeyParams.passwordType !== KeySystemPasswordType.UserInputted) {
-      return Result.fail('Vault uses randomized password and cannot change its storage preference')
-    }
-
-    if (dto.newStorageMode === latestVault.keyStorageMode) {
-      return Result.fail('Vault already uses this storage preference')
-    }
-
-    if (
-      dto.newStorageMode === KeySystemRootKeyStorageMode.Local ||
-      dto.newStorageMode === KeySystemRootKeyStorageMode.Ephemeral
-    ) {
-      const result = await this.changeStorageModeToLocalOrEphemeral(latestVault, dto.newStorageMode)
-      if (result.isFailed()) {
-        return result
-      }
-    } else if (dto.newStorageMode === KeySystemRootKeyStorageMode.Synced) {
-      const result = await this.changeStorageModeToSynced(latestVault)
-      if (result.isFailed()) {
-        return result
-      }
-    }
-
-    return Result.ok()
-  }
-
-  private async changePasswordTypeToUserInputted(
-    vault: VaultListingInterface,
-    userInputtedPassword: string,
-    storageMode: KeySystemRootKeyStorageMode,
-  ): Promise<Result<void>> {
-    const newRootKey = this.encryption.createUserInputtedKeySystemRootKey({
-      systemIdentifier: vault.systemIdentifier,
-      userInputtedPassword: userInputtedPassword,
-    })
-
-    if (storageMode === KeySystemRootKeyStorageMode.Synced) {
-      await this.mutator.insertItem(newRootKey, true)
-    } else {
-      this.keys.cacheKey(newRootKey, storageMode)
-    }
-
-    await this.mutator.changeItem<VaultListingMutator>(vault, (mutator) => {
-      mutator.rootKeyParams = newRootKey.keyParams
-    })
-
-    await this.keys.queueVaultItemsKeysForReencryption(vault.systemIdentifier)
-
-    return Result.ok()
-  }
-
-  private async changePasswordTypeToRandomized(vault: VaultListingInterface): Promise<Result<void>> {
-    if (vault.keyStorageMode !== KeySystemRootKeyStorageMode.Synced) {
-      this.keys.removeKeyFromCache(vault.systemIdentifier)
-
-      await this.mutator.changeItem<VaultListingMutator>(vault, (mutator) => {
-        mutator.keyStorageMode = KeySystemRootKeyStorageMode.Synced
+      const result = await this._rotateVaultKey.execute({
+        vault: dto.vault,
+        userInputtedPassword:
+          dto.newPasswordOptions.passwordType === KeySystemPasswordType.UserInputted
+            ? dto.newPasswordOptions.userInputtedPassword
+            : undefined,
      })
-    }
-
-    const newRootKey = this.encryption.createRandomizedKeySystemRootKey({
-      systemIdentifier: vault.systemIdentifier,
-    })
-
-    await this.mutator.changeItem<VaultListingMutator>(vault, (mutator) => {
-      mutator.rootKeyParams = newRootKey.keyParams
-    })
-
-    await this.mutator.insertItem(newRootKey, true)
-
-    await this.keys.queueVaultItemsKeysForReencryption(vault.systemIdentifier)
-
-    return Result.ok()
-  }
-
-  private async changeStorageModeToLocalOrEphemeral(
-    vault: VaultListingInterface,
-    newStorageMode: KeySystemRootKeyStorageMode,
-  ): Promise<Result<void>> {
-    const primaryKey = this.keys.getPrimaryKeySystemRootKey(vault.systemIdentifier)
-    if (!primaryKey) {
-      return Result.fail('No primary key found')
-    }
-
-    if (newStorageMode === KeySystemRootKeyStorageMode.Ephemeral) {
-      this.keys.removeKeyFromCache(vault.systemIdentifier)
-    }
-
-    this.keys.cacheKey(primaryKey, newStorageMode)
-    await this.keys.deleteAllSyncedKeySystemRootKeys(vault.systemIdentifier)
-
-    await this.mutator.changeItem<VaultListingMutator>(vault, (mutator) => {
-      mutator.keyStorageMode = newStorageMode
-    })
-
-    await this.sync.sync()
-
-    return Result.ok()
-  }
-
-  private async changeStorageModeToSynced(vault: VaultListingInterface): Promise<Result<void>> {
-    const allRootKeys = this.keys.getAllKeySystemRootKeysForVault(vault.systemIdentifier)
-    const syncedRootKeys = this.keys.getSyncedKeySystemRootKeysForVault(vault.systemIdentifier)
-
-    this.keys.removeKeyFromCache(vault.systemIdentifier)
-
-    for (const key of allRootKeys) {
-      const existingSyncedKey = syncedRootKeys.find((syncedKey) => syncedKey.token === key.token)
-      if (existingSyncedKey) {
-        continue
+      if (result.isFailed()) {
+        return result
      }

-      await this.mutator.insertItem(key)
+      vault = result.getValue()
+
+      if (dto.newPasswordOptions.passwordType === KeySystemPasswordType.Randomized) {
+        newStorageMode = KeySystemRootKeyStorageMode.Synced
+      }
    }

-    await this.mutator.changeItem<VaultListingMutator>(vault, (mutator) => {
-      mutator.keyStorageMode = KeySystemRootKeyStorageMode.Synced
-    })
+    if (newStorageMode && newStorageMode !== vault.keyStorageMode) {
+      const result = await this._changeVaultStorageMode.execute({
+        vault: vault,
+        newStorageMode: newStorageMode,
+      })
+      if (result.isFailed()) {
+        return result
+      }
+    }
+
+    await this.sync.sync()

    return Result.ok()
  }
@@ -2,7 +2,7 @@ import { KeySystemPasswordType, KeySystemRootKeyStorageMode, VaultListingInterfa

 export type ChangeVaultKeyOptionsDTO = {
  vault: VaultListingInterface
-  newPasswordType:
+  newPasswordOptions:
    | { passwordType: KeySystemPasswordType.Randomized }
    | { passwordType: KeySystemPasswordType.UserInputted; userInputtedPassword: string }
    | undefined
@@ -0,0 +1,107 @@
+import { MutatorClientInterface, SyncServiceInterface } from '@standardnotes/services'
+import {
+  KeySystemPasswordType,
+  KeySystemRootKeyStorageMode,
+  VaultListingInterface,
+  VaultListingMutator,
+} from '@standardnotes/models'
+import { GetVault } from './GetVault'
+import { KeySystemKeyManagerInterface } from '../../KeySystem/KeySystemKeyManagerInterface'
+import { Result, UseCaseInterface } from '@standardnotes/domain-core'
+
+export class ChangeVaultStorageMode implements UseCaseInterface<VaultListingInterface> {
+  constructor(
+    private mutator: MutatorClientInterface,
+    private sync: SyncServiceInterface,
+    private keys: KeySystemKeyManagerInterface,
+    private _getVault: GetVault,
+  ) {}
+
+  async execute(dto: {
+    vault: VaultListingInterface
+    newStorageMode: KeySystemRootKeyStorageMode
+  }): Promise<Result<VaultListingInterface>> {
+    const result = this._getVault.execute({ keySystemIdentifier: dto.vault.systemIdentifier })
+    if (result.isFailed()) {
+      return Result.fail('Vault not found')
+    }
+
+    const vault = result.getValue()
+    if (
+      vault.keyPasswordType === KeySystemPasswordType.Randomized &&
+      dto.newStorageMode !== KeySystemRootKeyStorageMode.Synced
+    ) {
+      return Result.fail('Cannot change storage mode to non-synced for randomized vault')
+    }
+
+    const latestVault = result.getValue()
+
+    if (dto.newStorageMode === latestVault.keyStorageMode) {
+      return Result.fail('Vault already uses this storage preference')
+    }
+
+    if (
+      dto.newStorageMode === KeySystemRootKeyStorageMode.Local ||
+      dto.newStorageMode === KeySystemRootKeyStorageMode.Ephemeral
+    ) {
+      const result = await this.changeStorageModeToLocalOrEphemeral(latestVault, dto.newStorageMode)
+      if (result.isFailed()) {
+        return result
+      }
+    } else if (dto.newStorageMode === KeySystemRootKeyStorageMode.Synced) {
+      const result = await this.changeStorageModeToSynced(latestVault)
+      if (result.isFailed()) {
+        return result
+      }
+    }
+
+    return Result.ok()
+  }
+
+  private async changeStorageModeToLocalOrEphemeral(
+    vault: VaultListingInterface,
+    newStorageMode: KeySystemRootKeyStorageMode,
+  ): Promise<Result<VaultListingInterface>> {
+    const primaryKey = this.keys.getPrimaryKeySystemRootKey(vault.systemIdentifier)
+    if (!primaryKey) {
+      return Result.fail('No primary key found')
+    }
+
+    if (newStorageMode === KeySystemRootKeyStorageMode.Ephemeral) {
+      this.keys.removeKeyFromCache(vault.systemIdentifier)
+    }
+
+    this.keys.cacheKey(primaryKey, newStorageMode)
+    await this.keys.deleteAllSyncedKeySystemRootKeys(vault.systemIdentifier)
+
+    const updatedVault = await this.mutator.changeItem<VaultListingMutator, VaultListingInterface>(vault, (mutator) => {
+      mutator.keyStorageMode = newStorageMode
+    })
+
+    await this.sync.sync()
+
+    return Result.ok(updatedVault)
+  }
+
+  private async changeStorageModeToSynced(vault: VaultListingInterface): Promise<Result<VaultListingInterface>> {
+    const allRootKeys = this.keys.getAllKeySystemRootKeysForVault(vault.systemIdentifier)
+    const syncedRootKeys = this.keys.getSyncedKeySystemRootKeysForVault(vault.systemIdentifier)
+
+    this.keys.removeKeyFromCache(vault.systemIdentifier)
+
+    for (const key of allRootKeys) {
+      const existingSyncedKey = syncedRootKeys.find((syncedKey) => syncedKey.token === key.token)
+      if (existingSyncedKey) {
+        continue
+      }
+
+      await this.mutator.insertItem(key)
+    }
+
+    const updatedVault = await this.mutator.changeItem<VaultListingMutator, VaultListingInterface>(vault, (mutator) => {
+      mutator.keyStorageMode = KeySystemRootKeyStorageMode.Synced
+    })
+
+    return Result.ok(updatedVault)
+  }
+}
@@ -1,9 +1,9 @@
+import { IsVaultOwner } from './../../VaultUser/UseCase/IsVaultOwner'
+import { NotifyVaultUsersOfKeyRotation } from './../../SharedVaults/UseCase/NotifyVaultUsersOfKeyRotation'
 import { UuidGenerator, assert } from '@standardnotes/utils'
-import { ClientDisplayableError, isClientDisplayableError } from '@standardnotes/responses'
 import {
  KeySystemIdentifier,
  KeySystemRootKeyInterface,
-  KeySystemPasswordType,
  KeySystemRootKeyStorageMode,
  VaultListingInterface,
  VaultListingMutator,
@@ -11,19 +11,47 @@ import {
 import { MutatorClientInterface } from '../../Mutator/MutatorClientInterface'
 import { EncryptionProviderInterface } from '../../Encryption/EncryptionProviderInterface'
 import { KeySystemKeyManagerInterface } from '../../KeySystem/KeySystemKeyManagerInterface'
+import { Result, UseCaseInterface } from '@standardnotes/domain-core'

-export class RotateVaultKey {
+export class RotateVaultKey implements UseCaseInterface<VaultListingInterface> {
  constructor(
    private mutator: MutatorClientInterface,
    private encryption: EncryptionProviderInterface,
    private keys: KeySystemKeyManagerInterface,
+    private _notifyVaultUsersOfKeyRotation: NotifyVaultUsersOfKeyRotation,
+    private _isVaultOwner: IsVaultOwner,
  ) {}

  async execute(params: {
    vault: VaultListingInterface
-    sharedVaultUuid: string | undefined
    userInputtedPassword: string | undefined
-  }): Promise<undefined | ClientDisplayableError[]> {
+  }): Promise<Result<VaultListingInterface>> {
+    const { newRootKey, updatedVault } = await this.updateRootKeyparams(params)
+
+    await this.createNewKeySystemItemsKey({
+      keySystemIdentifier: updatedVault.systemIdentifier,
+      sharedVaultUuid: updatedVault.isSharedVaultListing() ? updatedVault.sharing.sharedVaultUuid : undefined,
+      rootKeyToken: newRootKey.token,
+    })
+
+    await this.keys.queueVaultItemsKeysForReencryption(updatedVault.systemIdentifier)
+
+    const shareResult = await this.shareNewKeyWithMembers({
+      vault: updatedVault,
+      newRootKey,
+    })
+
+    if (shareResult.isFailed()) {
+      return Result.fail(shareResult.getError())
+    }
+
+    return Result.ok(updatedVault)
+  }
+
+  private async updateRootKeyparams(params: {
+    vault: VaultListingInterface
+    userInputtedPassword: string | undefined
+  }): Promise<{ newRootKey: KeySystemRootKeyInterface; updatedVault: VaultListingInterface }> {
    const currentRootKey = this.keys.getPrimaryKeySystemRootKey(params.vault.systemIdentifier)
    if (!currentRootKey) {
      throw new Error('Cannot rotate key system root key; key system root key not found')
@@ -31,16 +59,12 @@ export class RotateVaultKey {

    let newRootKey: KeySystemRootKeyInterface | undefined

-    if (currentRootKey.keyParams.passwordType === KeySystemPasswordType.UserInputted) {
-      if (!params.userInputtedPassword) {
-        throw new Error('Cannot rotate key system root key; user inputted password required')
-      }
-
+    if (params.userInputtedPassword) {
      newRootKey = this.encryption.createUserInputtedKeySystemRootKey({
        systemIdentifier: params.vault.systemIdentifier,
        userInputtedPassword: params.userInputtedPassword,
      })
-    } else if (currentRootKey.keyParams.passwordType === KeySystemPasswordType.Randomized) {
+    } else {
      newRootKey = this.encryption.createRandomizedKeySystemRootKey({
        systemIdentifier: params.vault.systemIdentifier,
      })
@@ -50,39 +74,28 @@ export class RotateVaultKey {
      throw new Error('Cannot rotate key system root key; new root key not created')
    }

-    if (params.vault.keyStorageMode === KeySystemRootKeyStorageMode.Synced) {
+    if (!params.userInputtedPassword || params.vault.keyStorageMode === KeySystemRootKeyStorageMode.Synced) {
      await this.mutator.insertItem(newRootKey, true)
    } else {
      this.keys.cacheKey(newRootKey, params.vault.keyStorageMode)
    }

-    await this.mutator.changeItem<VaultListingMutator>(params.vault, (mutator) => {
-      assert(newRootKey)
-      mutator.rootKeyParams = newRootKey.keyParams
-    })
+    const updatedVault = await this.mutator.changeItem<VaultListingMutator, VaultListingInterface>(
+      params.vault,
+      (mutator) => {
+        assert(newRootKey)
+        mutator.rootKeyParams = newRootKey.keyParams
+      },
+    )

-    const errors: ClientDisplayableError[] = []
-
-    const updateKeySystemItemsKeyResult = await this.createNewKeySystemItemsKey({
-      keySystemIdentifier: params.vault.systemIdentifier,
-      sharedVaultUuid: params.sharedVaultUuid,
-      rootKeyToken: newRootKey.token,
-    })
-
-    if (isClientDisplayableError(updateKeySystemItemsKeyResult)) {
-      errors.push(updateKeySystemItemsKeyResult)
-    }
-
-    await this.keys.queueVaultItemsKeysForReencryption(params.vault.systemIdentifier)
-
-    return errors
+    return { newRootKey, updatedVault }
  }

  private async createNewKeySystemItemsKey(params: {
    keySystemIdentifier: KeySystemIdentifier
    sharedVaultUuid: string | undefined
    rootKeyToken: string
-  }): Promise<ClientDisplayableError | void> {
+  }): Promise<void> {
    const newItemsKeyUuid = UuidGenerator.GenerateUuid()
    const newItemsKey = this.encryption.createKeySystemItemsKey(
      newItemsKeyUuid,
@@ -92,4 +105,25 @@ export class RotateVaultKey {
    )
    await this.mutator.insertItem(newItemsKey)
  }
+
+  private async shareNewKeyWithMembers(params: {
+    vault: VaultListingInterface
+    newRootKey: KeySystemRootKeyInterface
+  }): Promise<Result<void>> {
+    if (!params.vault.isSharedVaultListing()) {
+      return Result.ok()
+    }
+
+    const isOwner = this._isVaultOwner.execute({ sharedVault: params.vault }).getValue()
+
+    if (!isOwner) {
+      return Result.ok()
+    }
+
+    const result = await this._notifyVaultUsersOfKeyRotation.execute({
+      sharedVault: params.vault,
+    })
+
+    return result
+  }
 }
@@ -1,3 +1,4 @@
+import { SendVaultDataChangedMessage } from './../SharedVaults/UseCase/SendVaultDataChangedMessage'
 import { isClientDisplayableError } from '@standardnotes/responses'
 import {
  DecryptedItemInterface,
@@ -46,6 +47,7 @@ export class VaultService
    private _removeItemFromVault: RemoveItemFromVault,
    private _deleteVault: DeleteVault,
    private _rotateVaultKey: RotateVaultKey,
+    private _sendVaultDataChangeMessage: SendVaultDataChangedMessage,
    eventBus: InternalEventBusInterface,
  ) {
    super(eventBus)
@@ -192,6 +194,12 @@ export class VaultService

    await this.sync.sync()

+    if (updatedVault.isSharedVaultListing()) {
+      await this._sendVaultDataChangeMessage.execute({
+        vault: updatedVault,
+      })
+    }
+
    return updatedVault
  }

@@ -202,12 +210,9 @@ export class VaultService

    await this._rotateVaultKey.execute({
      vault,
-      sharedVaultUuid: vault.isSharedVaultListing() ? vault.sharing.sharedVaultUuid : undefined,
      userInputtedPassword: vaultPassword,
    })

-    await this.notifyEventSync(VaultServiceEvent.VaultRootKeyRotated, { vault })
-
    await this.sync.sync()
  }

@@ -228,17 +233,13 @@ export class VaultService
    return this.getVault({ keySystemIdentifier: latestItem.key_system_identifier })
  }

-  async changeVaultOptions(dto: ChangeVaultKeyOptionsDTO): Promise<Result<void>> {
+  async changeVaultKeyOptions(dto: ChangeVaultKeyOptionsDTO): Promise<Result<void>> {
    if (this.vaultLocks.isVaultLocked(dto.vault)) {
      throw new Error('Attempting to change vault options on a locked vault')
    }

    const result = await this._changeVaultKeyOptions.execute(dto)

-    if (dto.newPasswordType) {
-      await this.notifyEventSync(VaultServiceEvent.VaultRootKeyRotated, { vault: dto.vault })
-    }
-
    return result
  }
 }
@@ -1,11 +1,3 @@
-import { VaultListingInterface } from '@standardnotes/models'
+export enum VaultServiceEvent {}

-export enum VaultServiceEvent {
-  VaultRootKeyRotated = 'VaultRootKeyRotated',
-}
-
-export type VaultServiceEventPayload = {
-  [VaultServiceEvent.VaultRootKeyRotated]: {
-    vault: VaultListingInterface
-  }
-}
+export type VaultServiceEventPayload = Record<string, unknown>
@@ -36,5 +36,5 @@ export interface VaultServiceInterface
    params: { name: string; description: string },
  ): Promise<VaultListingInterface>
  rotateVaultRootKey(vault: VaultListingInterface, vaultPassword?: string): Promise<void>
-  changeVaultOptions(dto: ChangeVaultKeyOptionsDTO): Promise<Result<void>>
+  changeVaultKeyOptions(dto: ChangeVaultKeyOptionsDTO): Promise<Result<void>>
 }
@@ -11,27 +11,35 @@ import { EncryptMessage } from '../../Encryption/UseCase/Asymmetric/EncryptMessa
 import { Result, SharedVaultUserPermission, UseCaseInterface } from '@standardnotes/domain-core'
 import { ShareContactWithVault } from '../../SharedVaults/UseCase/ShareContactWithVault'
 import { KeySystemKeyManagerInterface } from '../../KeySystem/KeySystemKeyManagerInterface'
+import { GetKeyPairs } from '../../Encryption/UseCase/GetKeyPairs'

 export class InviteToVault implements UseCaseInterface<SharedVaultInviteServerHash> {
  constructor(
    private keyManager: KeySystemKeyManagerInterface,
-    private encryptMessage: EncryptMessage,
-    private sendInvite: SendVaultInvite,
-    private shareContact: ShareContactWithVault,
+    private _encryptMessage: EncryptMessage,
+    private _sendInvite: SendVaultInvite,
+    private _shareContact: ShareContactWithVault,
+    private _getKeyPairs: GetKeyPairs,
  ) {}

  async execute(params: {
-    keys: {
-      encryption: PkcKeyPair
-      signing: PkcKeyPair
-    }
-    senderUuid: string
    sharedVault: SharedVaultListingInterface
    sharedVaultContacts: TrustedContactInterface[]
    recipient: TrustedContactInterface
    permission: string
  }): Promise<Result<SharedVaultInviteServerHash>> {
-    const createInviteResult = await this.inviteContact(params)
+    const keys = this._getKeyPairs.execute()
+    if (keys.isFailed()) {
+      return Result.fail('Cannot invite contact; keys not found')
+    }
+
+    const createInviteResult = await this.inviteContact({
+      keys: keys.getValue(),
+      sharedVault: params.sharedVault,
+      sharedVaultContacts: params.sharedVaultContacts,
+      recipient: params.recipient,
+      permission: params.permission,
+    })

    if (createInviteResult.isFailed()) {
      return createInviteResult
@@ -39,8 +47,7 @@ export class InviteToVault implements UseCaseInterface<SharedVaultInviteServerHa

    await this.shareContactWithOtherVaultMembers({
      contact: params.recipient,
-      senderUuid: params.senderUuid,
-      keys: params.keys,
+      keys: keys.getValue(),
      sharedVault: params.sharedVault,
    })

@@ -49,16 +56,13 @@ export class InviteToVault implements UseCaseInterface<SharedVaultInviteServerHa

  private async shareContactWithOtherVaultMembers(params: {
    contact: TrustedContactInterface
-    senderUuid: string
    keys: {
      encryption: PkcKeyPair
      signing: PkcKeyPair
    }
    sharedVault: SharedVaultListingInterface
  }): Promise<Result<void>> {
-    const result = await this.shareContact.execute({
-      keys: params.keys,
-      senderUserUuid: params.senderUuid,
+    const result = await this._shareContact.execute({
      sharedVault: params.sharedVault,
      contactToShare: params.contact,
    })
@@ -108,7 +112,7 @@ export class InviteToVault implements UseCaseInterface<SharedVaultInviteServerHa
        }
      })

-    const encryptedMessage = this.encryptMessage.execute({
+    const encryptedMessage = this._encryptMessage.execute({
      message: {
        type: AsymmetricMessagePayloadType.SharedVaultInvite,
        data: {
@@ -129,7 +133,7 @@ export class InviteToVault implements UseCaseInterface<SharedVaultInviteServerHa
      return Result.fail(encryptedMessage.getError())
    }

-    const createInviteResult = await this.sendInvite.execute({
+    const createInviteResult = await this._sendInvite.execute({
      sharedVaultUuid: params.sharedVault.sharing.sharedVaultUuid,
      recipientUuid: params.recipient.contactUuid,
      encryptedMessage: encryptedMessage.getValue(),
@@ -12,7 +12,6 @@ import { GetVault } from '../Vault/UseCase/GetVault'
 import { InviteToVault } from './UseCase/InviteToVault'
 import { GetVaultContacts } from '../VaultUser/UseCase/GetVaultContacts'
 import { SyncServiceInterface } from './../Sync/SyncServiceInterface'
-import { EncryptionProviderInterface } from './../Encryption/EncryptionProviderInterface'
 import { InternalEventBusInterface } from './../Internal/InternalEventBusInterface'
 import { SessionsClientInterface } from './../Session/SessionsClientInterface'
 import { GetAllContacts } from './../Contacts/UseCase/GetAllContacts'
@@ -33,6 +32,8 @@ import { AbstractService } from './../Service/AbstractService'
 import { VaultInviteServiceEvent } from './VaultInviteServiceEvent'
 import { ContentType, Result } from '@standardnotes/domain-core'
 import { SharedVaultInvitesServer } from '@standardnotes/api'
+import { GetKeyPairs } from '../Encryption/UseCase/GetKeyPairs'
+import { DecryptErroredPayloads } from '../Encryption/UseCase/DecryptErroredPayloads'

 export class VaultInviteService
  extends AbstractService<VaultInviteServiceEvent>
@@ -45,7 +46,6 @@ export class VaultInviteService
    private session: SessionsClientInterface,
    private vaultUsers: VaultUserServiceInterface,
    private sync: SyncServiceInterface,
-    private encryption: EncryptionProviderInterface,
    private invitesServer: SharedVaultInvitesServer,
    private _getAllContacts: GetAllContacts,
    private _getVault: GetVault,
@@ -55,6 +55,8 @@ export class VaultInviteService
    private _getUntrustedPayload: GetUntrustedPayload,
    private _findContact: FindContact,
    private _acceptVaultInvite: AcceptVaultInvite,
+    private _getKeyPairs: GetKeyPairs,
+    private _decryptErroredPayloads: DecryptErroredPayloads,
    eventBus: InternalEventBusInterface,
  ) {
    super(eventBus)
@@ -75,7 +77,6 @@ export class VaultInviteService
    ;(this.session as unknown) = undefined
    ;(this.vaultUsers as unknown) = undefined
    ;(this.sync as unknown) = undefined
-    ;(this.encryption as unknown) = undefined
    ;(this.invitesServer as unknown) = undefined
    ;(this._getAllContacts as unknown) = undefined
    ;(this._getVault as unknown) = undefined
@@ -85,6 +86,8 @@ export class VaultInviteService
    ;(this._getUntrustedPayload as unknown) = undefined
    ;(this._findContact as unknown) = undefined
    ;(this._acceptVaultInvite as unknown) = undefined
+    ;(this._getKeyPairs as unknown) = undefined
+    ;(this._decryptErroredPayloads as unknown) = undefined

    this.pendingInvites = {}
  }
@@ -142,7 +145,7 @@ export class VaultInviteService

    void this.sync.sync()

-    await this.encryption.decryptErroredPayloads()
+    await this._decryptErroredPayloads.execute()

    await this.sync.syncSharedVaultsFromScratch([pendingInvite.invite.shared_vault_uuid])
  }
@@ -181,11 +184,6 @@ export class VaultInviteService
    const contacts = contactsResult.getValue()

    const result = await this._inviteToVault.execute({
-      keys: {
-        encryption: this.encryption.getKeyPair(),
-        signing: this.encryption.getSigningKeyPair(),
-      },
-      senderUuid: this.session.getSureUser().uuid,
      sharedVault,
      recipient: contact,
      sharedVaultContacts: contacts,
@@ -233,6 +231,11 @@ export class VaultInviteService
      return
    }

+    const keys = this._getKeyPairs.execute()
+    if (keys.isFailed()) {
+      return
+    }
+
    for (const invite of invites) {
      delete this.pendingInvites[invite.uuid]

@@ -240,7 +243,7 @@ export class VaultInviteService
      if (!sender.isFailed()) {
        const trustedMessage = this._getTrustedPayload.execute<AsymmetricMessageSharedVaultInvite>({
          message: invite,
-          privateKey: this.encryption.getKeyPair().privateKey,
+          privateKey: keys.getValue().encryption.privateKey,
          ownUserUuid: this.session.userUuid,
          sender: sender.getValue(),
        })
@@ -258,7 +261,7 @@ export class VaultInviteService

      const untrustedMessage = this._getUntrustedPayload.execute<AsymmetricMessageSharedVaultInvite>({
        message: invite,
-        privateKey: this.encryption.getKeyPair().privateKey,
+        privateKey: keys.getValue().encryption.privateKey,
      })

      if (!untrustedMessage.isFailed()) {
@@ -8,6 +8,7 @@ import { InternalEventBusInterface } from '../Internal/InternalEventBusInterface
 import { ContentType } from '@standardnotes/domain-core'
 import { EncryptionProviderInterface } from '../Encryption/EncryptionProviderInterface'
 import { KeySystemKeyManagerInterface } from '../KeySystem/KeySystemKeyManagerInterface'
+import { DecryptErroredPayloads } from '../Encryption/UseCase/DecryptErroredPayloads'

 export class VaultLockService
  extends AbstractService<VaultLockServiceEvent, VaultLockServiceEventPayload[VaultLockServiceEvent]>
@@ -20,6 +21,7 @@ export class VaultLockService
    private encryption: EncryptionProviderInterface,
    private keys: KeySystemKeyManagerInterface,
    private _getVaults: GetVaults,
+    private _decryptErroredPayloads: DecryptErroredPayloads,
    eventBus: InternalEventBusInterface,
  ) {
    super(eventBus)
@@ -37,6 +39,7 @@ export class VaultLockService
    ;(this.encryption as unknown) = undefined
    ;(this.keys as unknown) = undefined
    ;(this._getVaults as unknown) = undefined
+    ;(this._decryptErroredPayloads as unknown) = undefined

    this.lockMap.clear()
  }
@@ -86,7 +89,7 @@ export class VaultLockService

    this.keys.cacheKey(derivedRootKey, vault.keyStorageMode)

-    await this.encryption.decryptErroredPayloads()
+    await this._decryptErroredPayloads.execute()

    if (this.computeVaultLockState(vault) === 'locked') {
      this.keys.removeKeyFromCache(vault.systemIdentifier)
@@ -6,12 +6,12 @@ import { Result, UseCaseInterface } from '@standardnotes/domain-core'

 export class GetVaultContacts implements UseCaseInterface<TrustedContactInterface[]> {
  constructor(
-    private findContact: FindContact,
-    private getVaultUsers: GetVaultUsers,
+    private _findContact: FindContact,
+    private _getVaultUsers: GetVaultUsers,
  ) {}

  async execute(dto: { sharedVaultUuid: string; readFromCache: boolean }): Promise<Result<TrustedContactInterface[]>> {
-    const users = await this.getVaultUsers.execute({
+    const users = await this._getVaultUsers.execute({
      sharedVaultUuid: dto.sharedVaultUuid,
      readFromCache: dto.readFromCache,
    })
@@ -21,7 +21,7 @@ export class GetVaultContacts implements UseCaseInterface<TrustedContactInterfac

    const contacts = users
      .getValue()
-      .map((user) => this.findContact.execute({ userUuid: user.user_uuid }))
+      .map((user) => this._findContact.execute({ userUuid: user.user_uuid }))
      .map((result) => (result.isFailed() ? undefined : result.getValue()))
      .filter(isNotUndefined)

@@ -1,12 +1,17 @@
+import { UserServiceInterface } from './../../User/UserServiceInterface'
 import { Result, SyncUseCaseInterface } from '@standardnotes/domain-core'
 import { SharedVaultListingInterface } from '@standardnotes/models'

 export class IsVaultOwner implements SyncUseCaseInterface<boolean> {
-  execute(dto: { sharedVault: SharedVaultListingInterface; userUuid: string }): Result<boolean> {
+  constructor(private users: UserServiceInterface) {}
+
+  execute(dto: { sharedVault: SharedVaultListingInterface }): Result<boolean> {
    if (!dto.sharedVault.sharing.ownerUserUuid) {
      throw new Error(`Shared vault ${dto.sharedVault.sharing.sharedVaultUuid} does not have an owner user uuid`)
    }

-    return Result.ok(dto.sharedVault.sharing.ownerUserUuid === dto.userUuid)
+    const user = this.users.sureUser
+
+    return Result.ok(dto.sharedVault.sharing.ownerUserUuid === user.uuid)
  }
 }
@@ -1,3 +1,4 @@
+import { UserServiceInterface } from './../../User/UserServiceInterface'
 import { ClientDisplayableError, isErrorResponse } from '@standardnotes/responses'
 import { SharedVaultUsersServerInterface } from '@standardnotes/api'
 import { DeleteThirdPartyVault } from '../../SharedVaults/UseCase/DeleteExternalSharedVault'
@@ -6,15 +7,13 @@ import { SharedVaultListingInterface } from '@standardnotes/models'

 export class LeaveVault {
  constructor(
+    private users: UserServiceInterface,
    private vaultUserServer: SharedVaultUsersServerInterface,
    private items: ItemManagerInterface,
-    private deleteThirdPartyVault: DeleteThirdPartyVault,
+    private _deleteThirdPartyVault: DeleteThirdPartyVault,
  ) {}

-  async execute(params: {
-    sharedVault: SharedVaultListingInterface
-    userUuid: string
-  }): Promise<ClientDisplayableError | void> {
+  async execute(params: { sharedVault: SharedVaultListingInterface }): Promise<ClientDisplayableError | void> {
    const latestVaultListing = this.items.findItem<SharedVaultListingInterface>(params.sharedVault.uuid)
    if (!latestVaultListing) {
      throw new Error(`LeaveVaultUseCase: Could not find vault ${params.sharedVault.uuid}`)
@@ -22,13 +21,13 @@ export class LeaveVault {

    const response = await this.vaultUserServer.deleteSharedVaultUser({
      sharedVaultUuid: latestVaultListing.sharing.sharedVaultUuid,
-      userUuid: params.userUuid,
+      userUuid: this.users.sureUser.uuid,
    })

    if (isErrorResponse(response)) {
      return ClientDisplayableError.FromString(`Failed to leave vault ${JSON.stringify(response)}`)
    }

-    await this.deleteThirdPartyVault.execute(latestVaultListing)
+    await this._deleteThirdPartyVault.execute(latestVaultListing)
  }
 }
@@ -4,7 +4,6 @@ import { GetVault } from '../Vault/UseCase/GetVault'
 import { InternalEventBusInterface } from './../Internal/InternalEventBusInterface'
 import { RemoveVaultMember } from './UseCase/RemoveSharedVaultMember'
 import { VaultServiceInterface } from '../Vault/VaultServiceInterface'
-import { SessionsClientInterface } from './../Session/SessionsClientInterface'
 import { GetVaultUsers } from './UseCase/GetVaultUsers'
 import { SharedVaultListingInterface } from '@standardnotes/models'
 import { VaultUserServiceInterface } from './VaultUserServiceInterface'
@@ -16,7 +15,6 @@ import { IsVaultOwner } from './UseCase/IsVaultOwner'

 export class VaultUserService extends AbstractService<VaultUserServiceEvent> implements VaultUserServiceInterface {
  constructor(
-    private session: SessionsClientInterface,
    private vaults: VaultServiceInterface,
    private vaultLocks: VaultLockServiceInterface,
    private _getVaultUsers: GetVaultUsers,
@@ -31,7 +29,6 @@ export class VaultUserService extends AbstractService<VaultUserServiceEvent> imp

  override deinit(): void {
    super.deinit()
-    ;(this.session as unknown) = undefined
    ;(this.vaults as unknown) = undefined
    ;(this._getVaultUsers as unknown) = undefined
    ;(this._removeVaultMember as unknown) = undefined
@@ -58,7 +55,6 @@ export class VaultUserService extends AbstractService<VaultUserServiceEvent> imp
    return this._isVaultOwner
      .execute({
        sharedVault,
-        userUuid: this.session.userUuid,
      })
      .getValue()
  }
@@ -101,7 +97,6 @@ export class VaultUserService extends AbstractService<VaultUserServiceEvent> imp
  async leaveSharedVault(sharedVault: SharedVaultListingInterface): Promise<ClientDisplayableError | void> {
    const result = await this._leaveVault.execute({
      sharedVault: sharedVault,
-      userUuid: this.session.getSureUser().uuid,
    })

    if (isClientDisplayableError(result)) {
@@ -10,6 +10,10 @@ export * from './Application/ApplicationStage'
 export * from './Application/DeinitCallback'
 export * from './Application/DeinitMode'
 export * from './Application/DeinitSource'
+export * from './Application/Options/ApplicationOptions'
+export * from './Application/Options/Defaults'
+export * from './Application/Options/OptionalOptions'
+export * from './Application/Options/RequiredOptions'
 export * from './AsymmetricMessage/AsymmetricMessageService'
 export * from './AsymmetricMessage/AsymmetricMessageServiceInterface'
 export * from './AsymmetricMessage/UseCase/GetInboundMessages'
@@ -21,7 +25,6 @@ export * from './AsymmetricMessage/UseCase/ProcessAcceptedVaultInvite'
 export * from './AsymmetricMessage/UseCase/ResendAllMessages'
 export * from './AsymmetricMessage/UseCase/ResendMessage'
 export * from './AsymmetricMessage/UseCase/SendMessage'
-export * from './Contacts/UseCase/SendOwnContactChangeMessage'
 export * from './Auth/AuthClientInterface'
 export * from './Auth/AuthManager'
 export * from './Authenticator/AuthenticatorClientInterface'
@@ -42,6 +45,7 @@ export * from './Contacts/UseCase/FindContact'
 export * from './Contacts/UseCase/GetAllContacts'
 export * from './Contacts/UseCase/HandleKeyPairChange'
 export * from './Contacts/UseCase/ReplaceContactData'
+export * from './Contacts/UseCase/SendOwnContactChangeMessage'
 export * from './Contacts/UseCase/Types/ItemSignatureValidationResult'
 export * from './Contacts/UseCase/ValidateItemSigner'
 export * from './Device/DatabaseItemMetadata'
@@ -67,6 +71,8 @@ export * from './Encryption/UseCase/Asymmetric/DecryptOwnMessage'
 export * from './Encryption/UseCase/Asymmetric/EncryptMessage'
 export * from './Encryption/UseCase/Asymmetric/GetMessageAdditionalData'
 export * from './Encryption/UseCase/DecryptBackupFile'
+export * from './Encryption/UseCase/DecryptErroredPayloads'
+export * from './Encryption/UseCase/GetKeyPairs'
 export * from './Encryption/UseCase/ItemsKey/CreateNewDefaultItemsKey'
 export * from './Encryption/UseCase/ItemsKey/CreateNewItemsKeyWithRollback'
 export * from './Encryption/UseCase/ItemsKey/FindDefaultItemsKey'
@@ -115,12 +121,14 @@ export * from './Item/StaticItemCounter'
 export * from './ItemsEncryption/ItemsEncryption'
 export * from './ItemsEncryption/ItemsEncryption'
 export * from './KeySystem/KeySystemKeyManager'
+export * from './Mfa/MfaServiceInterface'
 export * from './Mutator/ImportDataUseCase'
 export * from './Mutator/MutatorClientInterface'
 export * from './Payloads/PayloadManagerInterface'
 export * from './Preferences/PreferenceServiceInterface'
 export * from './Protection/MobileUnlockTiming'
 export * from './Protection/ProtectionClientInterface'
+export * from './Protection/ProtectionEvent'
 export * from './Protection/TimingDisplayOption'
 export * from './Revision/RevisionClientInterface'
 export * from './Revision/RevisionManager'
@@ -168,29 +176,24 @@ export * from './Sync/SyncOptions'
 export * from './Sync/SyncQueueStrategy'
 export * from './Sync/SyncServiceInterface'
 export * from './Sync/SyncSource'
+export * from './UseCase/ChangeAndSaveItem'
 export * from './UseCase/DiscardItemsLocally'
+export * from './UseCase/GenerateUuid'
+export * from './UseCase/GetHost'
+export * from './UseCase/SetHost'
 export * from './User/AccountEvent'
 export * from './User/AccountEventData'
 export * from './User/CredentialsChangeFunctionResponse'
 export * from './User/SignedInOrRegisteredEventPayload'
 export * from './User/SignedOutEventPayload'
-export * from './User/UserClientInterface'
-export * from './User/UserClientInterface'
 export * from './User/UserService'
+export * from './User/UserServiceInterface'
+export * from './User/UserServiceInterface'
 export * from './UserEvent/NotificationService'
 export * from './UserEvent/NotificationServiceEvent'
-export * from './VaultInvite/InviteRecord'
-export * from './VaultInvite/UseCase/AcceptVaultInvite'
-export * from './VaultInvite/UseCase/InviteToVault'
-export * from './VaultInvite/UseCase/ReuploadAllInvites'
-export * from './VaultInvite/UseCase/ReuploadInvite'
-export * from './VaultInvite/UseCase/ReuploadVaultInvites'
-export * from './VaultInvite/UseCase/SendVaultInvite'
-export * from './VaultInvite/VaultInviteService'
-export * from './VaultInvite/VaultInviteServiceEvent'
-export * from './VaultInvite/VaultInviteServiceInterface'
-export * from './Vault/UseCase/ChangeVaultKeyOptionsDTO'
 export * from './Vault/UseCase/ChangeVaultKeyOptions'
+export * from './Vault/UseCase/ChangeVaultKeyOptionsDTO'
+export * from './Vault/UseCase/ChangeVaultStorageMode'
 export * from './Vault/UseCase/CreateVault'
 export * from './Vault/UseCase/DeleteVault'
 export * from './Vault/UseCase/GetVault'
@@ -201,6 +204,16 @@ export * from './Vault/UseCase/RotateVaultKey'
 export * from './Vault/VaultService'
 export * from './Vault/VaultServiceEvent'
 export * from './Vault/VaultServiceInterface'
+export * from './VaultInvite/InviteRecord'
+export * from './VaultInvite/UseCase/AcceptVaultInvite'
+export * from './VaultInvite/UseCase/InviteToVault'
+export * from './VaultInvite/UseCase/ReuploadAllInvites'
+export * from './VaultInvite/UseCase/ReuploadInvite'
+export * from './VaultInvite/UseCase/ReuploadVaultInvites'
+export * from './VaultInvite/UseCase/SendVaultInvite'
+export * from './VaultInvite/VaultInviteService'
+export * from './VaultInvite/VaultInviteServiceEvent'
+export * from './VaultInvite/VaultInviteServiceInterface'
 export * from './VaultLock/VaultLockService'
 export * from './VaultLock/VaultLockServiceEvent'
 export * from './VaultLock/VaultLockServiceInterface'
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.14.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-06)
+
+**Note:** Version bump only for package @standardnotes/sncrypto-web
+
 ## [1.14.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-08-01)

 **Note:** Version bump only for package @standardnotes/sncrypto-web
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/sncrypto-web",
-  "version": "1.14.7",
+  "version": "1.14.8",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
@@ -1,5 +1,4 @@
-/* eslint-disable no-unused-expressions */
-/* eslint-disable no-undef */
+
 import './vendor/chai-as-promised-built.js'
 import './vendor/[email protected]'

@@ -1,5 +1,4 @@
-/* eslint-disable no-unused-expressions */
-/* eslint-disable no-undef */
+
 import './vendor/chai-as-promised-built.js'

 chai.use(chaiAsPromised)
@@ -1,5 +1,4 @@
-/* eslint-disable no-unused-expressions */
-/* eslint-disable no-undef */
+
 import './vendor/chai-as-promised-built.js'

 chai.use(chaiAsPromised)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
StandardNotes CI	e4258a3e12	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].4 - @standardnotes/[email protected].5	2023-08-07 10:52:11 +00:00
Aman Harwara	e2215f9a1f	chore: minor vaults ui improvements	2023-08-07 15:36:34 +05:30
Mo	ee473fe34d	chore: fix uuid generation for importers	2023-08-07 05:06:11 -05:00
Karol Sójko	cedd8e1006	chore: add e2e tests covering invalidation of other sessions (#2385 )	2023-08-07 05:01:04 -05:00
Karol Sójko	4b278c4193	chore: fix session modal to show session creation date instead of update date (#2390 )	2023-08-07 11:44:53 +02:00
StandardNotes CI	52ef2a8a70	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].8 - @standardnotes/[email protected] - @standardnotes/[email protected].4	2023-08-06 21:04:39 +00:00
Mo	8655bdb5dd	tests: fix memory leaks (#2389 )	2023-08-06 15:23:31 -05:00
StandardNotes CI	d59e1befff	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].3	2023-08-06 19:40:57 +00:00
Aman Harwara	a295b4f2f7	chore: fix style issues [skip e2e]	2023-08-07 00:54:00 +05:30
StandardNotes CI	e61e1ff86d	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].3 - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].3 - @standardnotes/[email protected].2	2023-08-06 18:40:42 +00:00
Aman Harwara	5473829c7e	chore: fix Safari translucency issues [skip e2e]	2023-08-06 23:52:38 +05:30
Mo	d2f8a36f19	refactor: merge themes into components (#2388 )	2023-08-06 08:52:19 -05:00
StandardNotes CI	1d60af0243	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].2 - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].2 - @standardnotes/[email protected].1	2023-08-06 13:02:10 +00:00
Mo	8f3ed30c44	chore: fix infinite loop when installing desktop component	2023-08-06 07:20:24 -05:00
StandardNotes CI	3ae2b78116	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].1 - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].1 - @standardnotes/[email protected] - @standardnotes/[email protected].0	2023-08-06 12:17:43 +00:00
Aman Harwara	4b24b58f21	feat: Improved link editing and creation in Super notes (#2382 ) [skip e2e]	2023-08-06 02:43:35 +05:30
Mo	07c23d24f0	chore: fix test (skip e2e)	2023-08-05 15:58:52 -05:00
Mo	eb4a446274	chore: fix test	2023-08-05 14:24:57 -05:00
Mo	d8d4052a52	refactor(web): dependency management (#2386 )	2023-08-05 12:48:39 -05:00
StandardNotes CI	b07da5b663	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].0 - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].0 - @standardnotes/[email protected].0	2023-08-05 15:25:25 +00:00
Aman Harwara	ec309d6fb5	feat: Added translucency effect to menus, dialogs and alerts. Can be turned off from Preferences > Appeareance (#2387 ) [skip e2e]	2023-08-05 20:40:37 +05:30
Aman Harwara	83b83cd96d	chore: don't show convert as-is button when changing to super if text is not json	2023-08-05 01:43:55 +05:30
StandardNotes CI	3a0f929261	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected]	2023-08-04 19:34:34 +00:00
Aman Harwara	cf73edc524	chore: release [skip e2e]	2023-08-05 00:49:05 +05:30
Aman Harwara	de778de951	chore: fix error when trying to change invalid super note to another note type	2023-08-05 00:48:29 +05:30
StandardNotes CI	89f91178f8	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected]	2023-08-04 18:51:42 +00:00
Aman Harwara	7c959e7305	chore: fix alert dialogs [skip e2e]	2023-08-05 00:07:47 +05:30
StandardNotes CI	7205cf9bd6	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected]	2023-08-04 15:11:54 +00:00
Mo	494436bdb6	refactor: key rotation (#2383 )	2023-08-04 09:25:28 -05:00