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].1 - @standardnotes/[email protected].1 - @standardnotes/[email protected] - @standardnotes/[email protected].1 - @standardnotes/[email protected].1
chore: fix test
2026-09-16 00:46:00 -04:00 · 2023-06-25 12:46:27 +00:00 · 2023-06-25 17:47:35 +05:30 · 2023-06-25 16:37:05 +05:30 · 2023-06-25 16:14:52 +05:30 · 2023-06-25 16:05:50 +05:30
227 changed files with 3717 additions and 847 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.12](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.26.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/api
+
 ## [1.26.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-12)

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

+## [1.1.49](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.48](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.47](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-23)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.46](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-16)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.45](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-06)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.44](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-02)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.43](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-31)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.42](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-30)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.41](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-29)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.40](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-26)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.39](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-25)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.38](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-25)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.37](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-24)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.36](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-24)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.35](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-24)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.34](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-23)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.33](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-23)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.32](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.31](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.30](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.29](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-19)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.28](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.27](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.26](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.25](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.24](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-17)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.23](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.22](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.21](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.20](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.19](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.18](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-15)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.17](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-15)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.16](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-15)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
 ## [1.1.15](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-12)

 **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.15",
+  "version": "1.1.49",
  "private": true,
  "scripts": {
    "build-mv2": "yarn clean && webpack --config ./webpack.config.prod.js",
@@ -3,6 +3,142 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [3.106.58](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.57](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.56](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-23)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.55](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-16)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.54](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.53](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-02)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.52](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-31)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.51](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-30)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.50](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-29)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.49](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-26)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.48](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-25)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.47](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-25)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.46](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.45](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.44](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.43](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-23)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.42](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-23)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.41](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.40](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.39](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.38](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-19)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.37](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.36](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.35](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.34](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.33](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-17)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.32](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.31](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.30](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.29](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.28](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.27](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-15)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.26](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-15)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.106.25](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-15)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
 ## [3.106.24](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-12)

 **Note:** Version bump only for package @standardnotes/desktop
@@ -8,7 +8,7 @@ import {
  DesktopWatchedDirectoriesChange,
 } from '@web/Application/Device/DesktopSnjsExports'
 import { AppState } from 'app/AppState'
-import { promises as fs } from 'fs'
+import { promises as fs, existsSync } from 'fs'
 import { WebContents, shell } from 'electron'
 import { StoreKeys } from '../Store/StoreKeys'
 import path from 'path'
@@ -74,10 +74,12 @@ export class FilesBackupManager implements FileBackupsDevice {

    await ensureDirectoryExists(newLocation)

-    const legacyMappingLocation = `${legacyLocation}/info.json`
+    const legacyMappingLocation = path.join(legacyLocation, 'info.json')
    const newMappingLocation = this.getFileBackupsMappingFilePath(newLocation)
    await ensureDirectoryExists(path.dirname(newMappingLocation))
-    await moveFile(legacyMappingLocation, newMappingLocation)
+    if (existsSync(legacyMappingLocation)) {
+      await moveFile(legacyMappingLocation, newMappingLocation)
+    }

    await moveDirContents(legacyLocation, newLocation)
  }
@@ -106,7 +108,7 @@ export class FilesBackupManager implements FileBackupsDevice {
    }

    const LegacyTextBackupsDirectory = 'Standard Notes Backups'
-    return `${Paths.homeDir}/${LegacyTextBackupsDirectory}`
+    return path.join(Paths.homeDir, LegacyTextBackupsDirectory)
  }

  public async presentDirectoryPickerForLocationChangeAndTransferOld(
@@ -131,7 +133,7 @@ export class FilesBackupManager implements FileBackupsDevice {
  }

  private getFileBackupsMappingFilePath(backupsLocation: string): string {
-    return `${backupsLocation}/.settings/info.json`
+    return path.join(backupsLocation, '.settings', 'info.json')
  }

  private async getFileBackupsMappingFileFromDisk(backupsLocation: string): Promise<FileBackupsMapping | undefined> {
@@ -176,9 +178,9 @@ export class FilesBackupManager implements FileBackupsDevice {
      url: string
    },
  ): Promise<'success' | 'failed'> {
-    const fileDir = `${location}/${uuid}`
-    const metaFilePath = `${fileDir}/${FileBackupsConstantsV1.MetadataFileName}`
-    const binaryPath = `${fileDir}/${FileBackupsConstantsV1.BinaryFileName}`
+    const fileDir = path.join(location, uuid)
+    const metaFilePath = path.join(fileDir, FileBackupsConstantsV1.MetadataFileName)
+    const binaryPath = path.join(fileDir, FileBackupsConstantsV1.BinaryFileName)

    await ensureDirectoryExists(fileDir)

@@ -268,7 +270,7 @@ export class FilesBackupManager implements FileBackupsDevice {
  }

  private getPlaintextMappingFilePath(location: string): string {
-    return `${location}/.settings/info.json`
+    return path.join(location, '.settings', 'info.json')
  }

  private async getPlaintextMappingFileFromDisk(location: string): Promise<PlaintextBackupsMapping | undefined> {
@@ -1,7 +1,7 @@
 {
  "name": "@standardnotes/desktop",
  "main": "./app/dist/index.js",
-  "version": "3.106.24",
+  "version": "3.106.58",
  "license": "AGPL-3.0-or-later",
  "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.40](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.21.39](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.21.38](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.21.37](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
 ## [1.21.36](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-12)

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

+## [1.59.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/features
+
+## [1.59.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/features
+
 ## [1.59.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-04-26)

 **Note:** Version bump only for package @standardnotes/features
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/features",
-  "version": "1.59.3",
+  "version": "1.59.5",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
@@ -1,5 +1,5 @@
 import { ComponentPermission } from '../Component/ComponentPermission'
-import { ContentType, SubscriptionName } from '@standardnotes/common'
+import { ContentType } from '@standardnotes/common'
 import { ComponentArea } from '../Component/ComponentArea'
 import { PermissionName } from '../Permission/PermissionName'
 import { FeatureIdentifier } from './FeatureIdentifier'
@@ -12,8 +12,7 @@ type RoleFields = {
  role_name?: string

  /** Statically populated. Non-influencing; used as a reference by other static consumers (such as email service) */
-  availableInSubscriptions: SubscriptionName[]
-  availableInRoles?: string[]
+  availableInRoles: string[]
 }

 export type BaseFeatureDescription = RoleFields & {
@@ -1,19 +1,11 @@
-import { SubscriptionName } from '@standardnotes/common'
-import { GetFeatures, GetFeaturesForSubscription } from './Features'
+import { GetFeatures } from './Features'

 describe('features', () => {
-  it('all features should have either availableInSubscriptions or availableInRoles populated', () => {
+  it('all features should have availableInRoles populated', () => {
    const features = GetFeatures()

    for (const feature of features) {
-      expect(feature.availableInSubscriptions.length > 0 || feature.availableInRoles !== undefined && feature.availableInRoles.length > 0).toBeTruthy()
-    }
-  })
-  it('gets features for plus plan', () => {
-    const features = GetFeaturesForSubscription(SubscriptionName.PlusPlan)
-
-    for (const feature of features) {
-      expect(feature.availableInSubscriptions.includes(SubscriptionName.PlusPlan))
+      expect(feature.availableInRoles !== undefined && feature.availableInRoles.length > 0).toBeTruthy()
    }
  })
 })
@@ -4,16 +4,11 @@ import { serverFeatures } from '../Lists/ServerFeatures'
 import { clientFeatures } from '../Lists/ClientFeatures'
 import { GetDeprecatedFeatures } from '../Lists/DeprecatedFeatures'
 import { experimentalFeatures } from '../Lists/ExperimentalFeatures'
-import { SubscriptionName } from '@standardnotes/common'

 export function GetFeatures(): FeatureDescription[] {
  return [...serverFeatures(), ...clientFeatures(), ...experimentalFeatures(), ...GetDeprecatedFeatures()]
 }

-export function GetFeaturesForSubscription(subscription: SubscriptionName): FeatureDescription[] {
-  return GetFeatures().filter((feature) => feature.availableInSubscriptions.includes(subscription))
-}
-
 export function FindNativeFeature(identifier: FeatureIdentifier): FeatureDescription | undefined {
  return GetFeatures().find((f) => f.identifier === identifier)
 }
@@ -1,7 +1,6 @@
 import { FeatureDescription } from '../Feature/FeatureDescription'
 import { PermissionName } from '../Permission/PermissionName'
 import { FeatureIdentifier } from '../Feature/FeatureIdentifier'
-import { SubscriptionName } from '@standardnotes/common'
 import { RoleName } from '@standardnotes/domain-core'
 import { themes } from './Themes'
 import { editors } from './Editors'
@@ -12,7 +11,6 @@ export function clientFeatures(): FeatureDescription[] {
    ...editors(),
    {
      name: 'Tag Nesting',
-      availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
      availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
      identifier: FeatureIdentifier.TagNesting,
      permission_name: PermissionName.TagNesting,
@@ -21,7 +19,6 @@ export function clientFeatures(): FeatureDescription[] {
    {
      name: 'Super Notes',
      identifier: FeatureIdentifier.SuperEditor,
-      availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
      availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
      permission_name: PermissionName.SuperEditor,
      description:
@@ -29,7 +26,6 @@ export function clientFeatures(): FeatureDescription[] {
    },
    {
      name: 'Smart Filters',
-      availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
      availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
      identifier: FeatureIdentifier.SmartFilters,
      permission_name: PermissionName.SmartFilters,
@@ -37,7 +33,6 @@ export function clientFeatures(): FeatureDescription[] {
    },
    {
      name: 'Encrypted files',
-      availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
      availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
      identifier: FeatureIdentifier.Files,
      permission_name: PermissionName.Files,
@@ -45,7 +40,6 @@ export function clientFeatures(): FeatureDescription[] {
    },
    {
      name: 'Extension',
-      availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
      availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
      identifier: FeatureIdentifier.Extension,
      permission_name: PermissionName.Extension,
@@ -1,4 +1,4 @@
-import { ContentType, SubscriptionName } from '@standardnotes/common'
+import { ContentType } from '@standardnotes/common'
 import {
  EditorFeatureDescription,
  IframeComponentFeatureDescription,
@@ -14,7 +14,6 @@ import { RoleName } from '@standardnotes/domain-core'

 export function GetDeprecatedFeatures(): FeatureDescription[] {
  const bold: EditorFeatureDescription = FillEditorComponentDefaults({
-    availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
    name: 'Alternative Rich Text',
    identifier: FeatureIdentifier.DeprecatedBoldEditor,
    note_type: NoteType.RichText,
@@ -42,7 +41,6 @@ export function GetDeprecatedFeatures(): FeatureDescription[] {
  })

  const markdownBasic: EditorFeatureDescription = FillEditorComponentDefaults({
-    availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
    name: 'Basic Markdown',
    identifier: FeatureIdentifier.DeprecatedMarkdownBasicEditor,
    note_type: NoteType.Markdown,
@@ -56,7 +54,6 @@ export function GetDeprecatedFeatures(): FeatureDescription[] {
  })

  const markdownAlt: EditorFeatureDescription = FillEditorComponentDefaults({
-    availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
    name: 'Markdown Alternative',
    identifier: FeatureIdentifier.DeprecatedMarkdownVisualEditor,
    note_type: NoteType.Markdown,
@@ -71,7 +68,6 @@ export function GetDeprecatedFeatures(): FeatureDescription[] {
  })

  const markdownMinimist: EditorFeatureDescription = FillEditorComponentDefaults({
-    availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
    name: 'Minimal Markdown',
    identifier: FeatureIdentifier.DeprecatedMarkdownMinimistEditor,
    note_type: NoteType.Markdown,
@@ -86,7 +82,6 @@ export function GetDeprecatedFeatures(): FeatureDescription[] {
  })

  const markdownMath: EditorFeatureDescription = FillEditorComponentDefaults({
-    availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
    name: 'Markdown with Math',
    identifier: FeatureIdentifier.DeprecatedMarkdownMathEditor,
    spellcheckControl: true,
@@ -101,7 +96,6 @@ export function GetDeprecatedFeatures(): FeatureDescription[] {
  })

  const filesafe: IframeComponentFeatureDescription = FillEditorComponentDefaults({
-    availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
    name: 'FileSafe',
    identifier: FeatureIdentifier.DeprecatedFileSafe,
    component_permissions: [
@@ -1,4 +1,3 @@
-import { SubscriptionName } from '@standardnotes/common'
 import { EditorFeatureDescription } from '../Feature/FeatureDescription'
 import { PermissionName } from '../Permission/PermissionName'
 import { FeatureIdentifier } from '../Feature/FeatureIdentifier'
@@ -8,7 +7,6 @@ import { RoleName } from '@standardnotes/domain-core'

 export function editors(): EditorFeatureDescription[] {
  const code: EditorFeatureDescription = FillEditorComponentDefaults({
-    availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
    name: 'Code',
    spellcheckControl: true,
    identifier: FeatureIdentifier.CodeEditor,
@@ -25,7 +23,6 @@ export function editors(): EditorFeatureDescription[] {
  })

  const plus: EditorFeatureDescription = FillEditorComponentDefaults({
-    availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
    name: 'Rich Text',
    note_type: NoteType.RichText,
    file_type: 'html',
@@ -39,7 +36,6 @@ export function editors(): EditorFeatureDescription[] {
  })

  const markdown: EditorFeatureDescription = FillEditorComponentDefaults({
-    availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
    name: 'Markdown',
    identifier: FeatureIdentifier.MarkdownProEditor,
    note_type: NoteType.Markdown,
@@ -53,7 +49,6 @@ export function editors(): EditorFeatureDescription[] {
  })

  const task: EditorFeatureDescription = FillEditorComponentDefaults({
-    availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
    name: 'Checklist',
    identifier: FeatureIdentifier.TaskEditor,
    note_type: NoteType.Task,
@@ -68,7 +63,6 @@ export function editors(): EditorFeatureDescription[] {
  })

  const tokenvault: EditorFeatureDescription = FillEditorComponentDefaults({
-    availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
    name: 'Authenticator',
    note_type: NoteType.Authentication,
    file_type: 'json',
@@ -82,7 +76,6 @@ export function editors(): EditorFeatureDescription[] {
  })

  const spreadsheets: EditorFeatureDescription = FillEditorComponentDefaults({
-    availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
    name: 'Spreadsheet',
    identifier: FeatureIdentifier.SheetsEditor,
    note_type: NoteType.Spreadsheet,
@@ -1,66 +1,66 @@
 import { ServerFeatureDescription } from '../Feature/FeatureDescription'
 import { PermissionName } from '../Permission/PermissionName'
 import { FeatureIdentifier } from '../Feature/FeatureIdentifier'
-import { SubscriptionName } from '@standardnotes/common'
+import { RoleName } from '@standardnotes/domain-core'

 export function serverFeatures(): ServerFeatureDescription[] {
  return [
    {
-      availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
      name: 'Two factor authentication',
      identifier: FeatureIdentifier.TwoFactorAuth,
      permission_name: PermissionName.TwoFactorAuth,
+      availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
    },
    {
-      availableInSubscriptions: [SubscriptionName.ProPlan],
      name: 'U2F authentication',
      identifier: FeatureIdentifier.UniversalSecondFactor,
      permission_name: PermissionName.UniversalSecondFactor,
+      availableInRoles: [RoleName.NAMES.ProUser],
    },
    {
-      availableInSubscriptions: [SubscriptionName.ProPlan],
      name: 'Unlimited note history',
      identifier: FeatureIdentifier.NoteHistoryUnlimited,
      permission_name: PermissionName.NoteHistoryUnlimited,
+      availableInRoles: [RoleName.NAMES.ProUser],
    },
    {
-      availableInSubscriptions: [SubscriptionName.PlusPlan],
      name: '365 days note history',
      identifier: FeatureIdentifier.NoteHistory365Days,
      permission_name: PermissionName.NoteHistory365Days,
+      availableInRoles: [RoleName.NAMES.PlusUser],
    },
    {
-      availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
      name: 'Email backups',
      identifier: FeatureIdentifier.DailyEmailBackup,
      permission_name: PermissionName.DailyEmailBackup,
+      availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
    },
    {
-      availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
      name: 'Sign-in email alerts',
      identifier: FeatureIdentifier.SignInAlerts,
      permission_name: PermissionName.SignInAlerts,
+      availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
    },
    {
-      availableInSubscriptions: [SubscriptionName.ProPlan],
      identifier: FeatureIdentifier.FilesMaximumStorageTier,
      permission_name: PermissionName.FilesMaximumStorageTier,
+      availableInRoles: [RoleName.NAMES.ProUser],
    },
    {
-      availableInSubscriptions: [SubscriptionName.PlusPlan],
      identifier: FeatureIdentifier.FilesLowStorageTier,
      permission_name: PermissionName.FilesLowStorageTier,
+      availableInRoles: [RoleName.NAMES.PlusUser],
    },
    {
-      availableInSubscriptions: [SubscriptionName.ProPlan],
      identifier: FeatureIdentifier.SubscriptionSharing,
      permission_name: PermissionName.SubscriptionSharing,
+      availableInRoles: [RoleName.NAMES.ProUser],
    },
    {
-      availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
      name: 'Listed Custom Domain',
      identifier: FeatureIdentifier.ListedCustomDomain,
      permission_name: PermissionName.ListedCustomDomain,
+      availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
    },
  ]
 }
@@ -2,12 +2,10 @@ import { ThemeFeatureDescription } from '../Feature/FeatureDescription'
 import { PermissionName } from '../Permission/PermissionName'
 import { FeatureIdentifier } from '../Feature/FeatureIdentifier'
 import { FillThemeComponentDefaults } from './Utilities/FillThemeComponentDefaults'
-import { SubscriptionName } from '@standardnotes/common'
 import { RoleName } from '@standardnotes/domain-core'

 export function themes(): ThemeFeatureDescription[] {
  const midnight: ThemeFeatureDescription = FillThemeComponentDefaults({
-    availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
    name: 'Midnight',
    identifier: FeatureIdentifier.MidnightTheme,
    permission_name: PermissionName.MidnightTheme,
@@ -22,7 +20,6 @@ export function themes(): ThemeFeatureDescription[] {
  })

  const futura: ThemeFeatureDescription = FillThemeComponentDefaults({
-    availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
    name: 'Futura',
    identifier: FeatureIdentifier.FuturaTheme,
@@ -37,7 +34,6 @@ export function themes(): ThemeFeatureDescription[] {
  })

  const solarizedDark: ThemeFeatureDescription = FillThemeComponentDefaults({
-    availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
    name: 'Solarized Dark',
    identifier: FeatureIdentifier.SolarizedDarkTheme,
@@ -52,7 +48,6 @@ export function themes(): ThemeFeatureDescription[] {
  })

  const autobiography: ThemeFeatureDescription = FillThemeComponentDefaults({
-    availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
    name: 'Autobiography',
    identifier: FeatureIdentifier.AutobiographyTheme,
@@ -66,7 +61,7 @@ export function themes(): ThemeFeatureDescription[] {
  })

  const dark: ThemeFeatureDescription = FillThemeComponentDefaults({
-    availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
+    availableInRoles: [RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
    name: 'Dark',
    identifier: FeatureIdentifier.DarkTheme,
    permission_name: PermissionName.FocusedTheme,
@@ -81,7 +76,6 @@ export function themes(): ThemeFeatureDescription[] {
  })

  const titanium: ThemeFeatureDescription = FillThemeComponentDefaults({
-    availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
    name: 'Titanium',
    identifier: FeatureIdentifier.TitaniumTheme,
@@ -95,7 +89,6 @@ export function themes(): ThemeFeatureDescription[] {
  })

  const dynamic: ThemeFeatureDescription = FillThemeComponentDefaults({
-    availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
    name: 'Dynamic Panels',
    identifier: FeatureIdentifier.DynamicTheme,
@@ -3,7 +3,7 @@ import { ContentType } from '@standardnotes/common'
 import { EditorFeatureDescription } from '../../Feature/FeatureDescription'
 import { ComponentArea } from '../../Component/ComponentArea'

-export type RequiredEditorFields = Pick<EditorFeatureDescription, 'availableInSubscriptions'>
+export type RequiredEditorFields = Pick<EditorFeatureDescription, 'availableInRoles'>

 export function FillEditorComponentDefaults(
  component: Partial<EditorFeatureDescription> & RequiredEditorFields,
@@ -2,7 +2,7 @@ import { ContentType } from '@standardnotes/common'
 import { ThemeFeatureDescription } from '../../Feature/FeatureDescription'
 import { ComponentArea } from '../../Component/ComponentArea'

-type RequiredThemeFields = Pick<ThemeFeatureDescription, 'availableInSubscriptions'>
+type RequiredThemeFields = Pick<ThemeFeatureDescription, 'availableInRoles'>

 export function FillThemeComponentDefaults(
  theme: Partial<ThemeFeatureDescription> & RequiredThemeFields,
@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.28.49](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.28.48](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.28.47](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-06)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.28.46](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.28.45](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
 ## [1.28.44](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-12)

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

+## [1.15.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.15.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.15.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-06)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.15.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.15.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/files
+
 ## [1.15.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-12)

 **Note:** Version bump only for package @standardnotes/files
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/files",
-  "version": "1.15.6",
+  "version": "1.15.11",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
@@ -18,7 +18,7 @@ export interface BackupServiceInterface {
  getFilesBackupsLocation(): string | undefined
  openFilesBackupsLocation(): Promise<void>
  openFileBackup(record: FileBackupRecord): Promise<void>
-  getFileBackupAbsolutePath(record: FileBackupRecord): string
+  getFileBackupAbsolutePath(record: FileBackupRecord): Promise<string>

  isTextBackupsEnabled(): boolean
  enableTextBackups(): Promise<void>
@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [1.12.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+### Features
+
+* Added a conflict resolution dialog and a Conflicts view for easier management of conflicts ([#2337](https://github.com/standardnotes/app/issues/2337)) ([e0e9249](https://github.com/standardnotes/app/commit/e0e92493342b18560e7e55ece22518e738824df0))
+
+# [1.11.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-17)
+
+### Features
+
+* Preferences view layout on mobile has been updated, and can be dismissed by swiping from the right ([e5c580d](https://github.com/standardnotes/app/commit/e5c580deab14a5fb8bea59560d230c22ccc307d4))
+
+## [1.10.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/icons
+
+## [1.10.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/icons
+
 ## [1.10.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-04-11)

 **Note:** Version bump only for package @standardnotes/icons
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/icons",
-  "version": "1.10.9",
+  "version": "1.12.0",
  "private": true,
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
@@ -1,3 +1,5 @@
 <svg viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M6.4167 6.90759L10.2417 10.7326L14.0667 6.90759L15.2417 8.09093L10.2417 13.0909L5.2417 8.09093L6.4167 6.90759Z" fill="#181818"/>
-</svg>
+    <path
+        d="M6.4167 6.90759L10.2417 10.7326L14.0667 6.90759L15.2417 8.09093L10.2417 13.0909L5.2417 8.09093L6.4167 6.90759Z"
+        fill="currentColor" />
+</svg>
@@ -1,4 +1,4 @@
 <svg viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1 5C1 2.79086 2.79086 1 5 1H27C29.2091 1 31 2.79086 31 5V27C31 29.2091 29.2091 31 27 31H5C2.79086 31 1 29.2091 1 27V5Z" fill="#2B6FCF"/>
+<path d="M1 5C1 2.79086 2.79086 1 5 1H27C29.2091 1 31 2.79086 31 5V27C31 29.2091 29.2091 31 27 31H5C2.79086 31 1 29.2091 1 27V5Z" fill="currentColor"/>
 <path d="M8.5 8.5H23.5V10.1667H8.5V8.5ZM8.5 11.8333H18.5V13.5H8.5V11.8333ZM8.5 15.1667H23.5V16.8333H8.5V15.1667ZM8.5 18.5H18.5V20.1667H8.5V18.5ZM8.5 21.8333H23.5V23.5H8.5V21.8333Z" fill="white"/>
 </svg>
@@ -186,6 +186,7 @@ import SubtractIcon from './ic-subtract.svg'
 import SuperscriptIcon from './ic-superscript.svg'
 import SyncIcon from './ic-sync.svg'
 import TasksIcon from './ic-tasks.svg'
+import TextIcon from './ic-text.svg'
 import TextCircleIcon from './ic-text-circle.svg'
 import TextParagraphLongIcon from './ic-text-paragraph-long.svg'
 import ThemesFilledIcon from './ic-themes-filled.svg'
@@ -392,6 +393,7 @@ export {
  SuperscriptIcon,
  SyncIcon,
  TasksIcon,
+  TextIcon,
  TextCircleIcon,
  TextParagraphLongIcon,
  ThemesFilledIcon,
@@ -3,6 +3,144 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [3.53.58](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.57](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.56](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-23)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.55](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-16)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.54](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-06)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.53](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-02)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.52](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-31)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.51](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-30)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.50](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-29)
+
+### Bug Fixes
+
+* Fixed issue on Android where pressing backspace in Super notes would delete characters on both side of the cursor ([#2336](https://github.com/standardnotes/app/issues/2336)) ([0cb73b5](https://github.com/standardnotes/app/commit/0cb73b5d18ece035e2fce904c859d548b8657053))
+
+## [3.53.49](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-26)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.48](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-25)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.47](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-25)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.46](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-24)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.45](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-24)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.44](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-24)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.43](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-23)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.42](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-23)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.41](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.40](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.39](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.38](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-19)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.37](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.36](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.35](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.34](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.33](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-17)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.32](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.31](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.30](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.29](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.28](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.27](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-15)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.26](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-15)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.53.25](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-15)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
 ## [3.53.24](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-12)

 **Note:** Version bump only for package @standardnotes/mobile
@@ -0,0 +1,74 @@
+package com.standardnotes;
+
+import com.reactnativecommunity.webview.RNCWebViewManager;
+import com.facebook.react.uimanager.ThemedReactContext;
+import android.view.inputmethod.InputConnectionWrapper;
+import com.facebook.react.module.annotations.ReactModule;
+import android.view.KeyEvent;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+import android.webkit.WebView;
+
+@ReactModule(name = CustomWebViewManager.REACT_CLASS)
+public class CustomWebViewManager extends RNCWebViewManager {
+	/* This name must match what we’re referring to in JS */
+	protected static final String REACT_CLASS = "CustomWebView";
+
+	protected static class CustomWebViewClient extends RNCWebViewClient {}
+
+	protected static class CustomWebView extends RNCWebView {
+		public CustomWebView(ThemedReactContext reactContext) {
+			super(reactContext);
+		}
+
+		@Override
+		public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+			InputConnection con = super.onCreateInputConnection(outAttrs);
+			if (con == null) {
+				return null;
+			}
+			return new CustomInputConnection(con, true);
+		}
+
+		private class CustomInputConnection extends InputConnectionWrapper {
+			public CustomInputConnection(InputConnection target, boolean mutable) {
+				super(target, mutable);
+			}
+
+			@Override
+			public boolean sendKeyEvent(KeyEvent event) {
+				if (event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_DEL) {
+					// Un-comment if you wish to cancel the backspace:
+					// return false;
+				}
+				return super.sendKeyEvent(event);
+			}
+
+			@Override
+			public boolean deleteSurroundingText(int beforeLength, int afterLength) {       
+				// magic: in latest Android, deleteSurroundingText(1, 0) will be called for backspace
+				if (beforeLength == 1 && afterLength == 0) {
+					// backspace
+					return sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL)) 
+						&& sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
+				}
+				return super.deleteSurroundingText(beforeLength, afterLength);
+			}
+		}
+	}
+
+	@Override
+	protected RNCWebView createRNCWebViewInstance(ThemedReactContext reactContext) {
+		return new CustomWebView(reactContext);
+	}
+
+	@Override
+	public String getName() {
+		return REACT_CLASS;
+	}
+
+	@Override
+	protected void addEventEmitters(ThemedReactContext reactContext, WebView view) {
+		view.setWebViewClient(new CustomWebViewClient());
+	}
+}
@@ -0,0 +1,22 @@
+package com.standardnotes;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.ArrayList;
+import java.util.List;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+
+public class CustomWebViewPackage implements ReactPackage {
+  @Override
+  public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+    return Collections.emptyList();
+  }
+
+  @Override
+  public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+    return Arrays.<ViewManager>asList(new CustomWebViewManager());
+  }
+}
@@ -38,6 +38,7 @@ public class MainApplication extends Application implements ReactApplication {
      List<ReactPackage> packages = new PackageList(this).getPackages();

      packages.add(new Fido2ApiPackage());
+      packages.add(new CustomWebViewPackage());

      return packages;
    }
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/mobile",
-  "version": "3.53.24",
+  "version": "3.53.58",
  "author": "Standard Notes.",
  "private": true,
  "license": "AGPL-3.0-or-later",
@@ -1,15 +1,17 @@
 import { ReactNativeToWebEvent } from '@standardnotes/snjs'
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { Button, Keyboard, Platform, Text, View } from 'react-native'
+import { Button, Keyboard, Platform, requireNativeComponent, Text, View } from 'react-native'
 import VersionInfo from 'react-native-version-info'
 import { WebView, WebViewMessageEvent } from 'react-native-webview'
-import { OnShouldStartLoadWithRequest } from 'react-native-webview/lib/WebViewTypes'
+import { NativeWebViewAndroid, OnShouldStartLoadWithRequest } from 'react-native-webview/lib/WebViewTypes'
 import { AndroidBackHandlerService } from './AndroidBackHandlerService'
 import { AppStateObserverService } from './AppStateObserverService'
 import { ColorSchemeObserverService } from './ColorSchemeObserverService'
 import { MobileDevice, MobileDeviceEvent } from './Lib/MobileDevice'
 import { IsDev } from './Lib/Utils'

+const CustomWebView: NativeWebViewAndroid = requireNativeComponent('CustomWebView')
+
 const LoggingEnabled = IsDev

 export const MobileWebAppContainer = () => {
@@ -354,6 +356,12 @@ const MobileWebAppContents = ({ destroyAndReload }: { destroyAndReload: () => vo
       * This is needed to prevent the keyboard from pushing the webview up and down when it appears and disappears.
       */
      scrollEnabled={false}
+      overScrollMode="never"
+      nativeConfig={Platform.select({
+        android: {
+          component: CustomWebView,
+        },
+      })}
    />
  )
 }
@@ -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.46.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/models
+
+# [1.46.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+### Features
+
+* Added a conflict resolution dialog and a Conflicts view for easier management of conflicts ([#2337](https://github.com/standardnotes/app/issues/2337)) ([e0e9249](https://github.com/standardnotes/app/commit/e0e92493342b18560e7e55ece22518e738824df0))
+
+## [1.45.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/models
+
+## [1.45.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/models
+
 ## [1.45.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-12)

 **Note:** Version bump only for package @standardnotes/models
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/models",
-  "version": "1.45.3",
+  "version": "1.46.1",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
@@ -189,6 +189,17 @@ export abstract class Collection<
          this.conflictMap.establishRelationship(conflictOf, element.uuid)
        }

+        const isInConflictMapButIsNotConflictOf =
+          !conflictOf && this.conflictMap.getInverseRelationships(element.uuid).length > 0
+
+        const isInConflictMapButDoesNotHaveConflicts =
+          this.conflictMap.existsInDirectMap(element.uuid) &&
+          this.conflictMap.getDirectRelationships(element.uuid).length === 0
+
+        if (isInConflictMapButIsNotConflictOf || isInConflictMapButDoesNotHaveConflicts) {
+          this.conflictMap.removeFromMap(element.uuid)
+        }
+
        this.referenceMap.setAllRelationships(
          element.uuid,
          element.references.map((r) => r.uuid),
@@ -203,6 +214,9 @@ export abstract class Collection<

      if (element.deleted) {
        this.nondeletedIndex.delete(element.uuid)
+        if (this.conflictMap.existsInDirectMap(element.uuid) || this.conflictMap.existsInInverseMap(element.uuid)) {
+          this.conflictMap.removeFromMap(element.uuid)
+        }
      } else {
        this.nondeletedIndex.add(element.uuid)
      }
@@ -260,4 +274,8 @@ export abstract class Collection<
    remove(array, { uuid: element.uuid as never })
    this.typedMap[element.content_type] = array
  }
+
+  public numberOfItemsWithConflicts(): number {
+    return this.conflictMap.directMapSize
+  }
 }
@@ -18,7 +18,7 @@ export class TagItemsIndex implements SNIndex {

  private isItemCountable = (item: ItemInterface) => {
    if (isDecryptedItem(item)) {
-      return !item.archived && !item.trashed
+      return !item.archived && !item.trashed && !item.conflictOf
    }
    return false
  }
@@ -10,8 +10,9 @@ import { FilterDisplayOptions } from './DisplayOptions'
 export function computeUnifiedFilterForDisplayOptions(
  options: FilterDisplayOptions,
  collection: ReferenceLookupCollection,
+  additionalFilters: ItemFilter[] = [],
 ): ItemFilter {
-  const filters = computeFiltersForDisplayOptions(options, collection)
+  const filters = computeFiltersForDisplayOptions(options, collection).concat(additionalFilters)

  return (item: SearchableDecryptedItem) => {
    return itemPassesFilters(item, filters)
@@ -74,5 +75,9 @@ export function computeFiltersForDisplayOptions(
    filters.push((item) => itemMatchesQuery(item, query, collection))
  }

+  if (!viewsPredicate?.keypathIncludesString('conflict_of')) {
+    filters.push((item) => !item.conflictOf)
+  }
+
  return filters
 }
@@ -85,7 +85,19 @@ export function BuildSmartViews(options: FilterDisplayOptions): SmartView[] {
    }),
  )

-  return [notes, files, starred, archived, trash, untagged]
+  const conflicts = new SmartView(
+    new DecryptedPayload({
+      uuid: SystemViewId.Conflicts,
+      content_type: ContentType.SmartView,
+      ...PayloadTimestampDefaults(),
+      content: FillItemContent<SmartViewContent>({
+        title: 'Conflicts',
+        predicate: conflictsPredicate(options).toJson(),
+      }),
+    }),
+  )
+
+  return [notes, files, starred, archived, trash, untagged, conflicts]
 }

 function allNotesPredicate(options: FilterDisplayOptions) {
@@ -203,3 +215,26 @@ function starredNotesPredicate(options: FilterDisplayOptions) {

  return predicate
 }
+
+function conflictsPredicate(options: FilterDisplayOptions) {
+  const subPredicates: Predicate<SNNote>[] = [new Predicate('content_type', '=', ContentType.Note)]
+
+  if (options.includeTrashed === false) {
+    subPredicates.push(new Predicate('trashed', '=', false))
+  }
+
+  if (options.includeArchived === false) {
+    subPredicates.push(new Predicate('archived', '=', false))
+  }
+
+  if (options.includeProtected === false) {
+    subPredicates.push(new Predicate('protected', '=', false))
+  }
+
+  if (options.includePinned === false) {
+    subPredicates.push(new Predicate('pinned', '=', false))
+  }
+
+  const predicate = new CompoundPredicate('and', subPredicates)
+  return predicate
+}
@@ -8,6 +8,7 @@ export const SmartViewIcons: Record<SystemViewId, IconType> = {
  [SystemViewId.TrashedNotes]: 'trash',
  [SystemViewId.UntaggedNotes]: 'hashtag-off',
  [SystemViewId.StarredNotes]: 'star-filled',
+  [SystemViewId.Conflicts]: 'merge',
 }

 export function systemViewIcon(id: SystemViewId): IconType {
@@ -5,4 +5,5 @@ export enum SystemViewId {
  TrashedNotes = 'trashed-notes',
  UntaggedNotes = 'untagged-notes',
  StarredNotes = 'starred-notes',
+  Conflicts = 'conflicts',
 }
@@ -3,6 +3,142 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.4.326](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.325](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.324](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-23)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.323](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-16)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.322](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-06)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.321](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-02)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.320](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-31)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.319](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-30)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.318](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-29)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.317](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-26)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.316](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-25)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.315](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-25)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.314](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-24)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.313](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-24)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.312](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-24)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.311](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-23)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.310](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-23)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.309](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.308](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.307](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.306](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-19)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.305](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.304](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.303](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.302](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.301](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-17)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.300](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.299](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.298](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.297](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.296](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.295](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-15)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.294](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-15)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.293](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-15)
+
+**Note:** Version bump only for package @standardnotes/releases
+
 ## [1.4.292](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-12)

 **Note:** Version bump only for package @standardnotes/releases
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/releases",
-  "version": "1.4.292",
+  "version": "1.4.326",
  "license": "AGPL-3.0-or-later",
  "main": "dist/releases.json",
  "types": "dist/index.d.ts",
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.13.24](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/responses
+
+## [1.13.23](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/responses
+
 ## [1.13.22](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-12)

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

+## [1.60.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/services
+
+# [1.60.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+### Features
+
+* Added a conflict resolution dialog and a Conflicts view for easier management of conflicts ([#2337](https://github.com/standardnotes/app/issues/2337)) ([e0e9249](https://github.com/standardnotes/app/commit/e0e92493342b18560e7e55ece22518e738824df0))
+
+## [1.59.12](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-06)
+
+**Note:** Version bump only for package @standardnotes/services
+
+## [1.59.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-31)
+
+### Bug Fixes
+
+* **desktop:** Fixed issue where local backup location would default to "[object Promise]" ([7d691aa](https://github.com/standardnotes/app/commit/7d691aa409af3636ad795491b8b817d9eb7a980d))
+
+## [1.59.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/services
+
+## [1.59.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/services
+
 ## [1.59.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-12)

 **Note:** Version bump only for package @standardnotes/services
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/services",
-  "version": "1.59.8",
+  "version": "1.60.1",
  "engines": {
    "node": ">=16.0.0 <17.0.0"
  },
@@ -48,6 +48,7 @@ describe('backup service', () => {
    device = {} as jest.Mocked<FileBackupsDevice>
    device.getFileBackupReadToken = jest.fn()
    device.readNextChunk = jest.fn()
+    device.joinPaths = jest.fn()

    session = {} as jest.Mocked<SessionsClientInterface>

@@ -84,6 +85,7 @@ describe('backup service', () => {
      history,
      internalEventBus,
    )
+    backupService.getFilesBackupsLocation = jest.fn().mockReturnValue('/')

    crypto.xchacha20StreamInitDecryptor = jest.fn().mockReturnValue({
      state: {},
@@ -147,9 +147,10 @@ export class FilesBackupService extends AbstractService implements BackupService
  private async automaticallyEnableTextBackupsIfPreferenceNotSet(): Promise<void> {
    if (this.storage.getValue(StorageKey.TextBackupsEnabled) == undefined) {
      this.storage.setValue(StorageKey.TextBackupsEnabled, true)
-      const location = `${await this.device.getUserDocumentsDirectory()}/${this.prependWorkspacePathForPath(
-        TextBackupsDirectoryName,
-      )}`
+      const location = await this.device.joinPaths(
+        await this.device.getUserDocumentsDirectory(),
+        await this.prependWorkspacePathForPath(TextBackupsDirectoryName),
+      )
      this.storage.setValue(StorageKey.TextBackupsLocation, location)
    }
  }
@@ -378,13 +379,16 @@ export class FilesBackupService extends AbstractService implements BackupService
    return record
  }

-  public getFileBackupAbsolutePath(record: FileBackupRecord): string {
+  public getFileBackupAbsolutePath(record: FileBackupRecord): Promise<string> {
    const location = this.getFilesBackupsLocation()
-    return `${location}/${record.relativePath}`
+    if (!location) {
+      throw new ClientDisplayableError('No files backups location set')
+    }
+    return this.device.joinPaths(location, record.relativePath)
  }

  public async openFileBackup(record: FileBackupRecord): Promise<void> {
-    const location = this.getFileBackupAbsolutePath(record)
+    const location = await this.getFileBackupAbsolutePath(record)
    await this.device.openLocation(location)
  }

@@ -459,7 +463,13 @@ export class FilesBackupService extends AbstractService implements BackupService
      return 'failed'
    }

-    const path = `${this.getFilesBackupsLocation()}/${fileBackup.relativePath}/${fileBackup.binaryFileName}`
+    const fileBackupsLocation = this.getFilesBackupsLocation()
+
+    if (!fileBackupsLocation) {
+      return 'failed'
+    }
+
+    const path = await this.device.joinPaths(fileBackupsLocation, fileBackup.relativePath, fileBackup.binaryFileName)
    const token = await this.device.getFileBackupReadToken(path)

    let readMore = true
@@ -23,7 +23,7 @@ export class ItemCounter implements ItemCounterInterface {

        continue
      }
-      if (item.content_type === ContentType.Note) {
+      if (item.content_type === ContentType.Note && !item.conflictOf) {
        counts.notes++

        continue
@@ -167,4 +167,6 @@ export interface ItemsClientInterface {
    predicate: PredicateInterface<T>,
    iconString?: string,
  ): Promise<SmartView>
+
+  numberOfNotesWithConflicts(): number
 }
@@ -3,6 +3,60 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [2.169.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+# [2.169.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+### Features
+
+* Added a conflict resolution dialog and a Conflicts view for easier management of conflicts ([#2337](https://github.com/standardnotes/app/issues/2337)) ([e0e9249](https://github.com/standardnotes/app/commit/e0e92493342b18560e7e55ece22518e738824df0))
+
+## [2.168.20](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-06)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.168.19](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-31)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.168.18](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-26)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.168.17](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-25)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.168.16](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.168.15](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.168.14](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-19)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.168.13](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.168.12](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-18)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.168.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.168.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
 ## [2.168.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-12)

 **Note:** Version bump only for package @standardnotes/snjs
@@ -123,6 +123,7 @@ export class ItemManager

  public setPrimaryItemDisplayOptions(options: Models.DisplayOptions): void {
    const override: Models.FilterDisplayOptions = {}
+    const additionalFilters: Models.ItemFilter[] = []

    if (options.views && options.views.find((view) => view.uuid === Models.SystemViewId.AllNotes)) {
      if (options.includeArchived === undefined) {
@@ -142,6 +143,9 @@ export class ItemManager
        override.includeArchived = true
      }
    }
+    if (options.views && options.views.find((view) => view.uuid === Models.SystemViewId.Conflicts)) {
+      additionalFilters.push((item) => this.collection.conflictsOf(item.uuid).length > 0)
+    }

    this.rebuildSystemSmartViews({ ...options, ...override })

@@ -174,7 +178,7 @@ export class ItemManager
    }

    this.navigationDisplayController.setDisplayOptions({
-      customFilter: Models.computeUnifiedFilterForDisplayOptions(updatedOptions, this.collection),
+      customFilter: Models.computeUnifiedFilterForDisplayOptions(updatedOptions, this.collection, additionalFilters),
      ...updatedOptions,
    })
  }
@@ -1410,4 +1414,8 @@ export class ItemManager
      },
    })
  }
+
+  numberOfNotesWithConflicts(): number {
+    return this.collection.numberOfItemsWithConflicts()
+  }
 }
@@ -11,4 +11,6 @@ export interface SyncClientInterface {
  getLastSyncDate(): Date | undefined

  getSyncStatus(): SyncOpStatus
+
+  completedOnlineDownloadFirstSync: boolean
 }
@@ -62,7 +62,7 @@ describe('files', function () {
    localStorage.clear()
  })

-  it('should create valet token from server', async function () {
+  it('should create valet token from server - @paidfeature', async function () {
    await setup({ fakeCrypto: true, subscription: true })

    const remoteIdentifier = Utils.generateUuid()
@@ -80,7 +80,7 @@ describe('files', function () {
    expect(tokenOrError.tag).to.equal('no-subscription')
  })

-  it('should not create valet token from server when user has an expired subscription', async function () {
+  it('should not create valet token from server when user has an expired subscription - @paidfeature', async function () {
    await setup({ fakeCrypto: true, subscription: false })

    await Factory.publishMockedEvent('SUBSCRIPTION_PURCHASED', {
@@ -107,7 +107,7 @@ describe('files', function () {
    expect(tokenOrError.tag).to.equal('expired-subscription')
  })

-  it('creating two upload sessions successively should succeed', async function () {
+  it('creating two upload sessions successively should succeed - @paidfeature', async function () {
    await setup({ fakeCrypto: true, subscription: true })

    const firstToken = await application.apiService.createFileValetToken(Utils.generateUuid(), 'write')
@@ -121,7 +121,7 @@ describe('files', function () {
    expect(secondSession.uploadId).to.be.ok
  })

-  it('should encrypt and upload small file', async function () {
+  it('should encrypt and upload small file - @paidfeature', async function () {
    await setup({ fakeCrypto: false, subscription: true })

    const response = await fetch('/packages/snjs/mocha/assets/small_file.md')
@@ -134,7 +134,7 @@ describe('files', function () {
    expect(downloadedBytes).to.eql(buffer)
  })

-  it('should encrypt and upload big file', async function () {
+  it('should encrypt and upload big file - @paidfeature', async function () {
    await setup({ fakeCrypto: false, subscription: true })

    const response = await fetch('/packages/snjs/mocha/assets/two_mb_file.md')
@@ -147,7 +147,7 @@ describe('files', function () {
    expect(downloadedBytes).to.eql(buffer)
  })

-  it('should delete file', async function () {
+  it('should delete file - @paidfeature', async function () {
    await setup({ fakeCrypto: false, subscription: true })

    const response = await fetch('/packages/snjs/mocha/assets/small_file.md')
@@ -5,7 +5,7 @@ import { createNoteParams } from './lib/Items.js'
 chai.use(chaiAsPromised)
 const expect = chai.expect

-describe.skip('history manager', () => {
+describe('history manager', () => {
  const largeCharacterChange = 25

  const syncOptions = {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
StandardNotes CI	747ba1b342	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].1 - @standardnotes/[email protected].1 - @standardnotes/[email protected] - @standardnotes/[email protected].1 - @standardnotes/[email protected].1	2023-06-25 12:46:27 +00:00
Aman Harwara	7c3b8d4534	chore: fix test	2023-06-25 17:47:35 +05:30
Aman Harwara	0613436198	chore: select current result when closing super search dialog	2023-06-25 16:37:05 +05:30
Aman Harwara	63b95391a6	refactor: use actual maps for uuidmap	2023-06-25 16:14:52 +05:30
Aman Harwara	195420101a	chore: fix conflict map addition/removal	2023-06-25 16:05:50 +05:30
StandardNotes CI	74ba220982	chore(release): publish - @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].0 - @standardnotes/[email protected] - @standardnotes/[email protected].0 - @standardnotes/[email protected].0 - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].0 - @standardnotes/[email protected].0	2023-06-25 09:26:54 +00:00
Aman Harwara	e0e9249334	feat: Added a conflict resolution dialog and a Conflicts view for easier management of conflicts (#2337 )	2023-06-25 14:27:51 +05:30
StandardNotes CI	49d43fd14b	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].3	2023-06-23 20:59:33 +00:00
Shane Duffy	1ff34cf1a2	refactor: fix accessibility issue with note list items (#2338 )	2023-06-24 02:01:05 +05:30
StandardNotes CI	c6d30976e0	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].2	2023-06-16 19:05:16 +00:00
Aman Harwara	26a9f8c497	chore: dayjs fix	2023-06-17 00:07:20 +05:30
StandardNotes CI	d129d51bfe	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].9 - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].1	2023-06-06 17:18:30 +00:00
Aman Harwara	6e6402da81	chore: backup service test	2023-06-06 22:15:06 +05:30
Aman Harwara	0e938c5596	chore: context menu path	2023-06-06 21:51:12 +05:30
Aman Harwara	db997955af	refactor(desktop): backup paths	2023-06-06 20:58:08 +05:30
StandardNotes CI	9cae641693	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].0	2023-06-02 20:48:54 +00:00
Aman Harwara	08c38fc7cf	feat: You can now drag-n-drop notes onto tags to move them from one tag to another (#2334 )	2023-06-03 01:46:29 +05:30
StandardNotes CI	153ec272d2	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-05-31 16:13:07 +00:00
Aman Harwara	7d691aa409	fix(desktop): Fixed issue where local backup location would default to "[object Promise]"	2023-05-31 21:16:14 +05:30
StandardNotes CI	9141da0832	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected]	2023-05-30 14:50:20 +00:00
Aman Harwara	39414e6cab	fix: Fixed issue where pane gestures on Android would break scroll in a daily journal tag	2023-05-30 19:52:41 +05:30
StandardNotes CI	1738485777	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected]	2023-05-29 11:58:09 +00:00
Aman Harwara	0cb73b5d18	fix: Fixed issue on Android where pressing backspace in Super notes would delete characters on both side of the cursor (#2336 )	2023-05-29 17:00:01 +05:30
StandardNotes CI	5d98c86592	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected]	2023-05-26 08:31:36 +00:00
Aman Harwara	ba828f31ad	Merge branch 'main' of github.com:standardnotes/app	2023-05-26 13:28:38 +05:30
Aman Harwara	c29832ab77	chore: buttons in dark themes	2023-05-26 13:28:28 +05:30
StandardNotes CI	6f10d88dee	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected]	2023-05-25 11:08:56 +00:00
Karol Sójko	7b66ee1d40	chore: enable e2e for history tests (#2335 )	2023-05-25 12:41:49 +02:00
StandardNotes CI	6c785e8565	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected]	2023-05-25 08:29:21 +00:00
Aman Harwara	c21ed0a8b6	chore: normal button color	2023-05-25 13:28:48 +05:30
Aman Harwara	a89d182612	chore: non-primary button colors	2023-05-25 13:03:18 +05:30
StandardNotes CI	4403fc3515	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected]	2023-05-24 19:04:32 +00:00
Aman Harwara	47b0ff42a0	Merge branch 'main' of github.com:standardnotes/app	2023-05-25 00:08:11 +05:30
Aman Harwara	d9e0261c80	chore: adjust notes list swipe gesture on android	2023-05-25 00:08:03 +05:30
StandardNotes CI	8c3868a9d4	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected]	2023-05-24 17:12:29 +00:00
Aman Harwara	77b60d920d	chore: comments	2023-05-24 22:15:50 +05:30
Aman Harwara	22cedc1321	chore: upgrade lexical	2023-05-24 21:43:17 +05:30
Aman Harwara	502289aa50	chore: let system figure slashes for paths	2023-05-24 21:32:07 +05:30
StandardNotes CI	4ef8992d43	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected]	2023-05-24 07:30:04 +00:00
Aman Harwara	228889c75c	Merge branch 'main' of github.com:standardnotes/app	2023-05-24 12:24:09 +05:30
Aman Harwara	210d747a05	chore: fix backup copy error	2023-05-24 12:24:01 +05:30
StandardNotes CI	0d5833af3c	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected]	2023-05-23 16:35:24 +00:00
Aman Harwara	87410f7e34	Merge branch 'main' of github.com:standardnotes/app	2023-05-23 21:29:30 +05:30
Aman Harwara	aaa8016792	chore: fix pane gestures breaking items list on android	2023-05-23 21:29:21 +05:30
StandardNotes CI	356a3751de	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].9	2023-05-23 14:14:40 +00:00
Aman Harwara	1d7079e90c	fix: Fixed issue where some dialogs would become unresponsive	2023-05-23 19:15:30 +05:30
StandardNotes CI	390ea45865	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].5 - @standardnotes/[email protected] - @standardnotes/[email protected].8 - @standardnotes/[email protected] - @standardnotes/[email protected].5 - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].8	2023-05-22 18:28:30 +00:00
Aman Harwara	68214b14b6	Merge branch 'main' of github.com:standardnotes/app	2023-05-22 23:24:47 +05:30
Aman Harwara	22297ff514	chore: pinned note ui change	2023-05-22 23:24:16 +05:30
StandardNotes CI	bec026ad6a	chore(release): publish - @standardnotes/[email protected].9 - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].4 - @standardnotes/[email protected] - @standardnotes/[email protected].7 - @standardnotes/[email protected] - @standardnotes/[email protected].4 - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].9 - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].7	2023-05-22 16:34:05 +00:00
Aman Harwara	db77e2f53b	chore: remove unused field & make role field required	2023-05-22 21:37:10 +05:30
Aman Harwara	11b4377b76	chore: fix feature roles	2023-05-22 21:09:44 +05:30
Aman Harwara	56b4c1aa80	chore: fix workspace menu item escape	2023-05-22 20:48:47 +05:30
Aman Harwara	d6843c207f	chore: workspace menu item focus after renaming	2023-05-22 20:42:05 +05:30
Aman Harwara	7f05b2a748	chore: fix workspace menu item overflow	2023-05-22 20:03:27 +05:30
StandardNotes CI	767d856293	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].6	2023-05-22 14:24:06 +00:00
Aman Harwara	799945b167	fix: Fixed issue where empty new line in Super would create extra new lines when converting to Markdown	2023-05-22 19:28:19 +05:30
StandardNotes CI	7a24b205a7	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].5	2023-05-19 15:12:36 +00:00
Aman Harwara	7e65c9c46b	chore: fix some dialogs becoming unclickable	2023-05-19 20:16:40 +05:30
Aman Harwara	d83e371022	chore: fix modal close on escape	2023-05-19 19:11:13 +05:30
Aman Harwara	8f2cdc5839	Merge branch 'main' of github.com:standardnotes/app	2023-05-19 19:02:48 +05:30
Aman Harwara	a2a6b5295c	chore: minor ui changes	2023-05-19 19:02:32 +05:30
StandardNotes CI	1482d4244d	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].4	2023-05-18 17:16:41 +00:00
Aman Harwara	c893f3a067	Merge branch 'main' of github.com:standardnotes/app	2023-05-18 22:15:13 +05:30
Aman Harwara	a1225829ca	chore: minor ui changes	2023-05-18 22:15:02 +05:30
StandardNotes CI	4094a35731	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].3	2023-05-18 11:00:31 +00:00
Karol Sójko	f14b047d7e	chore: add possibility to skip paid features in the e2e test suite	2023-05-18 12:28:11 +02:00
StandardNotes CI	a33365a4d9	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].2	2023-05-18 10:24:19 +00:00
Aman Harwara	dac719dc5a	chore: make note pinned status more prominent	2023-05-18 15:20:32 +05:30
StandardNotes CI	9d22b8bfa1	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].1	2023-05-18 08:00:20 +00:00
Aman Harwara	2294467059	chore: fix dialogs	2023-05-18 13:02:58 +05:30
StandardNotes CI	240bf669a1	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].0 - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected].0	2023-05-17 14:44:08 +00:00
Aman Harwara	e5c580deab	feat: Preferences view layout on mobile has been updated, and can be dismissed by swiping from the right	2023-05-17 19:42:08 +05:30
Aman Harwara	7b44224314	chore: fix dropdown z-index	2023-05-17 13:41:36 +05:30
StandardNotes CI	32bdb02b59	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] - @standardnotes/[email protected].9 - @standardnotes/[email protected]	2023-05-16 17:20:26 +00:00
Aman Harwara	687c7ab7cb	Merge branch 'main' of github.com:standardnotes/app	2023-05-16 22:20:40 +05:30
Aman Harwara	8ba290dbac	chore(clipper): convert relative links to absolute links so they don't become relative to SN's url	2023-05-16 22:20:31 +05:30
Aman Harwara	fc06d0001a	chore: fix app reloading when invalid url is clicked in super note	2023-05-16 21:35:55 +05:30
StandardNotes CI	d5ec7d41b9	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] - @standardnotes/[email protected].8 - @standardnotes/[email protected]	2023-05-16 15:30:01 +00:00
Aman Harwara	8d154b48b8	chore: fix alert max-width	2023-05-16 20:32:57 +05:30
Aman Harwara	91e2d66e58	chore: fix super icon tint	2023-05-16 20:22:12 +05:30
Aman Harwara	2a7567e7b8	chore: fix template super note editor icon	2023-05-16 20:16:55 +05:30
Aman Harwara	fb843ea0b1	chore: adjust switch size	2023-05-16 19:57:36 +05:30
Aman Harwara	f6afaae342	chore: fix whitespace	2023-05-16 19:33:20 +05:30
Aman Harwara	5112b97c05	Merge branch 'main' of github.com:standardnotes/app	2023-05-16 19:09:26 +05:30
Aman Harwara	f27a38ca9b	chore: fix initial loading indicator mobile	2023-05-16 19:09:21 +05:30
StandardNotes CI	4fe391cd29	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected]	2023-05-16 13:28:33 +00:00
Aman Harwara	058a2c69a3	chore: fix switch on clipper	2023-05-16 18:29:56 +05:30
StandardNotes CI	aceeeb7e7d	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected]	2023-05-16 11:28:44 +00:00
Aman Harwara	38e8a81f0b	chore: fix eslint error	2023-05-16 16:33:11 +05:30
Aman Harwara	3b23312b62	chore: upgrade ariakit	2023-05-16 16:19:22 +05:30
StandardNotes CI	0c4d44fb00	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected]	2023-05-16 10:10:38 +00:00
Aman Harwara	a137ca6d70	chore: fix radio button on big screen	2023-05-16 15:14:51 +05:30
Aman Harwara	0f641e05ad	chore: preferences view swipe gesture	2023-05-16 15:07:20 +05:30
StandardNotes CI	46e87085d7	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected]	2023-05-15 15:48:51 +00:00
Aman Harwara	6868e512f2	chore: better initial sync indicator on mobile	2023-05-15 20:48:18 +05:30
Aman Harwara	19ee9ecb41	chore: increase switch/radio sizing on mobile	2023-05-15 19:57:05 +05:30
StandardNotes CI	1ad7aa27f8	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected]	2023-05-15 11:00:04 +00:00
Aman Harwara	2ee7fef80b	refactor: allow note list swipe gesture on android to start from anywhere, and close keyboard on any swipe gesture	2023-05-15 16:01:18 +05:30
StandardNotes CI	f94921336b	chore(release): publish - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected] - @standardnotes/[email protected]	2023-05-15 10:03:44 +00:00
Aman Harwara	8bc8ef780d	chore: show initial sync message on mobile	2023-05-15 15:05:53 +05:30
Aman Harwara	1214edc80d	chore: fix alert dialog width on mobile	2023-05-15 15:00:07 +05:30