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

packages/api/CHANGELOG.md

@@ -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.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

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api",
-  "version": "1.26.10",
+  "version": "1.26.12",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/clipper/CHANGELOG.md

@@ -3,6 +3,74 @@
 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

packages/clipper/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardnotes/clipper",
   "description": "Web clipper browser extension for Standard Notes",
-  "version": "1.1.32",
+  "version": "1.1.49",
   "private": true,
   "scripts": {
     "build-mv2": "yarn clean && webpack --config ./webpack.config.prod.js",

packages/desktop/CHANGELOG.md

@@ -3,6 +3,74 @@
 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

packages/desktop/app/javascripts/Main/FileBackups/FileBackupsManager.ts

@@ -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> {

packages/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardnotes/desktop",
   "main": "./app/dist/index.js",
-  "version": "3.106.41",
+  "version": "3.106.58",
   "license": "AGPL-3.0-or-later",
   "author": "Standard Notes.",
   "private": true,

packages/encryption/CHANGELOG.md

@@ -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.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

packages/encryption/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/encryption",
-  "version": "1.21.38",
+  "version": "1.21.40",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/filepicker/CHANGELOG.md

@@ -3,6 +3,18 @@
 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

packages/filepicker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/filepicker",
-  "version": "1.28.46",
+  "version": "1.28.49",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/files/CHANGELOG.md

@@ -3,6 +3,18 @@
 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

packages/files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/files",
-  "version": "1.15.8",
+  "version": "1.15.11",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/files/src/Domain/Service/BackupServiceInterface.ts

@@ -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>

packages/icons/CHANGELOG.md

@@ -3,6 +3,12 @@
 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

packages/icons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/icons",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "private": true,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/icons/src/Icons/index.ts

@@ -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,

packages/mobile/CHANGELOG.md

@@ -3,6 +3,76 @@
 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

packages/mobile/android/app/src/main/java/com/standardnotes/CustomWebViewManager.java

@@ -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());
+	}
+}

packages/mobile/android/app/src/main/java/com/standardnotes/CustomWebViewPackage.java

@@ -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());
+  }
+}

packages/mobile/android/app/src/main/java/com/standardnotes/MainApplication.java

@@ -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;
     }

packages/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/mobile",
-  "version": "3.53.41",
+  "version": "3.53.58",
   "author": "Standard Notes.",
   "private": true,
   "license": "AGPL-3.0-or-later",

packages/mobile/src/MobileWebAppContainer.tsx

@@ -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,
+        },
+      })}
     />
   )
 }

packages/models/CHANGELOG.md

@@ -3,6 +3,16 @@
 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

packages/models/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/models",
-  "version": "1.45.5",
+  "version": "1.46.1",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/models/src/Domain/Runtime/Collection/Collection.ts

@@ -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
+  }
 }

packages/models/src/Domain/Runtime/Collection/Item/TagItemsIndex.ts

@@ -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
   }

packages/models/src/Domain/Runtime/Display/DisplayOptionsToFilters.ts

@@ -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
 }

packages/models/src/Domain/Syncable/SmartView/SmartViewBuilder.ts

@@ -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
+}

packages/models/src/Domain/Syncable/SmartView/SmartViewIcons.ts

@@ -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 {

packages/models/src/Domain/Syncable/SmartView/SystemViewId.ts

@@ -5,4 +5,5 @@ export enum SystemViewId {
   TrashedNotes = 'trashed-notes',
   UntaggedNotes = 'untagged-notes',
   StarredNotes = 'starred-notes',
+  Conflicts = 'conflicts',
 }

packages/releases/CHANGELOG.md

@@ -3,6 +3,74 @@
 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

packages/releases/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/releases",
-  "version": "1.4.309",
+  "version": "1.4.326",
   "license": "AGPL-3.0-or-later",
   "main": "dist/releases.json",
   "types": "dist/index.d.ts",

packages/services/CHANGELOG.md

@@ -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.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

packages/services/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/services",
-  "version": "1.59.10",
+  "version": "1.60.1",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/services/src/Domain/Backups/BackupService.spec.ts

@@ -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: {},

packages/services/src/Domain/Backups/BackupService.ts

@@ -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

packages/services/src/Domain/Item/ItemCounter.ts

@@ -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

packages/services/src/Domain/Item/ItemsClientInterface.ts

@@ -167,4 +167,6 @@ export interface ItemsClientInterface {
     predicate: PredicateInterface<T>,
     iconString?: string,
   ): Promise<SmartView>
+
+  numberOfNotesWithConflicts(): number
 }

packages/snjs/CHANGELOG.md

@@ -3,6 +3,32 @@
 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

packages/snjs/lib/Services/Items/ItemManager.ts

@@ -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()
+  }
 }

packages/snjs/mocha/history.test.js

@@ -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 = {

packages/snjs/mocha/item_manager.test.js

@@ -82,14 +82,14 @@ describe('item manager', function () {
     const note = await this.createNote()
     const tag = await this.createTag([note])
 
-    expect(this.itemManager.collection.referenceMap.directMap[tag.uuid]).to.eql([note.uuid])
+    expect(this.itemManager.collection.referenceMap.directMap.get(tag.uuid)).to.eql([note.uuid])
   })
 
   it('inverse reference map', async function () {
     const note = await this.createNote()
     const tag = await this.createTag([note])
 
-    expect(this.itemManager.collection.referenceMap.inverseMap[note.uuid]).to.eql([tag.uuid])
+    expect(this.itemManager.collection.referenceMap.inverseMap.get(note.uuid)).to.eql([tag.uuid])
   })
 
   it('inverse reference map should not have duplicates', async function () {
@@ -97,7 +97,7 @@ describe('item manager', function () {
     const tag = await this.createTag([note])
     await this.itemManager.changeItem(tag)
 
-    expect(this.itemManager.collection.referenceMap.inverseMap[note.uuid]).to.eql([tag.uuid])
+    expect(this.itemManager.collection.referenceMap.inverseMap.get(note.uuid)).to.eql([tag.uuid])
   })
 
   it('deleting from reference map', async function () {
@@ -105,8 +105,8 @@ describe('item manager', function () {
     const tag = await this.createTag([note])
     await this.itemManager.setItemToBeDeleted(note)
 
-    expect(this.itemManager.collection.referenceMap.directMap[tag.uuid]).to.eql([])
-    expect(this.itemManager.collection.referenceMap.inverseMap[note.uuid].length).to.equal(0)
+    expect(this.itemManager.collection.referenceMap.directMap.get(tag.uuid)).to.eql([])
+    expect(this.itemManager.collection.referenceMap.inverseMap.get(note.uuid).length).to.equal(0)
   })
 
   it('deleting referenced item should update referencing item references', async function () {
@@ -125,8 +125,8 @@ describe('item manager', function () {
       mutator.removeItemAsRelationship(note)
     })
 
-    expect(this.itemManager.collection.referenceMap.directMap[tag.uuid]).to.eql([])
-    expect(this.itemManager.collection.referenceMap.inverseMap[note.uuid]).to.eql([])
+    expect(this.itemManager.collection.referenceMap.directMap.get(tag.uuid)).to.eql([])
+    expect(this.itemManager.collection.referenceMap.inverseMap.get(note.uuid)).to.eql([])
   })
 
   it('emitting discardable payload should remove it from our collection', async function () {

packages/snjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/snjs",
-  "version": "2.168.16",
+  "version": "2.169.1",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/styles/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.8.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.7.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-16)
 
 **Note:** Version bump only for package @standardnotes/styles

packages/styles/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/styles",
-  "version": "1.7.8",
+  "version": "1.8.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "publishConfig": {

packages/styles/src/Styles/_scrollbar.scss

@@ -1,7 +1,8 @@
 .windows-web,
 .windows-desktop,
 .linux-web,
-.linux-desktop {
+.linux-desktop,
+.force-custom-scrollbar {
   $thumb-width: 4px;
 
   ::-webkit-scrollbar {

packages/toast/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.3.32](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/toast
+
 ## [1.3.31](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-17)
 
 **Note:** Version bump only for package @standardnotes/toast

packages/toast/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/toast",
-  "version": "1.3.31",
+  "version": "1.3.32",
   "private": true,
   "main": "./src/index.ts",
   "scripts": {

packages/ui-services/CHANGELOG.md

@@ -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.16](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
+## [1.26.15](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
+## [1.26.14](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-06)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
+## [1.26.13](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-31)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
 ## [1.26.12](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
 
 **Note:** Version bump only for package @standardnotes/ui-services

packages/ui-services/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/ui-services",
-  "version": "1.26.12",
+  "version": "1.26.16",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/utils/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.17.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/utils
+
+# [1.17.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.16.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-03-01)
 
 **Note:** Version bump only for package @standardnotes/utils

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/utils",
-  "version": "1.16.5",
+  "version": "1.17.1",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/utils/src/Domain/Uuid/UuidMap.ts

@@ -6,23 +6,39 @@ import { addIfUnique, removeFromArray } from '../Utils/Utils'
  */
 export class UuidMap {
   /** uuid to uuids that we have a relationship with */
-  private directMap: Partial<Record<string, string[]>> = {}
+  private directMap: Map<string, string[]> = new Map()
   /** uuid to uuids that have a relationship with us */
-  private inverseMap: Partial<Record<string, string[]>> = {}
+  private inverseMap: Map<string, string[]> = new Map()
+
+  public get directMapSize(): number {
+    return this.directMap.size
+  }
+
+  public get inverseMapSize(): number {
+    return this.inverseMap.size
+  }
 
   public makeCopy(): UuidMap {
     const copy = new UuidMap()
-    copy.directMap = Object.assign({}, this.directMap)
-    copy.inverseMap = Object.assign({}, this.inverseMap)
+    copy.directMap = new Map(this.directMap)
+    copy.inverseMap = new Map(this.inverseMap)
     return copy
   }
 
+  public existsInDirectMap(uuid: string): boolean {
+    return this.directMap.has(uuid)
+  }
+
+  public existsInInverseMap(uuid: string): boolean {
+    return this.inverseMap.has(uuid)
+  }
+
   public getDirectRelationships(uuid: string): string[] {
-    return this.directMap[uuid] || []
+    return this.directMap.get(uuid) || []
   }
 
   public getInverseRelationships(uuid: string): string[] {
-    return this.inverseMap[uuid] || []
+    return this.inverseMap.get(uuid) || []
   }
 
   public establishRelationship(uuidA: string, uuidB: string): void {
@@ -36,8 +52,8 @@ export class UuidMap {
   }
 
   public setAllRelationships(uuid: string, relationships: string[]): void {
-    const previousDirect = this.directMap[uuid] || []
-    this.directMap[uuid] = relationships
+    const previousDirect = this.directMap.get(uuid) || []
+    this.directMap.set(uuid, relationships)
 
     /** Remove all previous values in case relationships have changed
      * The updated references will be added afterwards.
@@ -54,41 +70,41 @@ export class UuidMap {
 
   public removeFromMap(uuid: string): void {
     /** Items that we reference */
-    const directReferences = this.directMap[uuid] || []
+    const directReferences = this.directMap.get(uuid) || []
     for (const directReference of directReferences) {
-      removeFromArray(this.inverseMap[directReference] || [], uuid)
+      removeFromArray(this.inverseMap.get(directReference) || [], uuid)
     }
-    delete this.directMap[uuid]
+    this.directMap.delete(uuid)
 
     /** Items that are referencing us */
-    const inverseReferences = this.inverseMap[uuid] || []
+    const inverseReferences = this.inverseMap.get(uuid) || []
     for (const inverseReference of inverseReferences) {
-      removeFromArray(this.directMap[inverseReference] || [], uuid)
+      removeFromArray(this.directMap.get(inverseReference) || [], uuid)
     }
-    delete this.inverseMap[uuid]
+    this.inverseMap.delete(uuid)
   }
 
   private establishDirectRelationship(uuidA: string, uuidB: string): void {
-    const index = this.directMap[uuidA] || []
+    const index = this.directMap.get(uuidA) || []
     addIfUnique(index, uuidB)
-    this.directMap[uuidA] = index
+    this.directMap.set(uuidA, index)
   }
 
   private establishInverseRelationship(uuidA: string, uuidB: string): void {
-    const inverseIndex = this.inverseMap[uuidB] || []
+    const inverseIndex = this.inverseMap.get(uuidB) || []
     addIfUnique(inverseIndex, uuidA)
-    this.inverseMap[uuidB] = inverseIndex
+    this.inverseMap.set(uuidB, inverseIndex)
   }
 
   private deestablishDirectRelationship(uuidA: string, uuidB: string): void {
-    const index = this.directMap[uuidA] || []
+    const index = this.directMap.get(uuidA) || []
     removeFromArray(index, uuidB)
-    this.directMap[uuidA] = index
+    this.directMap.set(uuidA, index)
   }
 
   private deestablishInverseRelationship(uuidA: string, uuidB: string): void {
-    const inverseIndex = this.inverseMap[uuidB] || []
+    const inverseIndex = this.inverseMap.get(uuidB) || []
     removeFromArray(inverseIndex, uuidA)
-    this.inverseMap[uuidB] = inverseIndex
+    this.inverseMap.set(uuidB, inverseIndex)
   }
 }

packages/web/CHANGELOG.md

@@ -3,6 +3,86 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.162.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)
+
+**Note:** Version bump only for package @standardnotes/web
+
+# [3.162.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))
+
+## [3.161.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-23)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.161.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-16)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.161.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-06)
+
+**Note:** Version bump only for package @standardnotes/web
+
+# [3.161.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-02)
+
+### Features
+
+* You can now drag-n-drop notes onto tags to move them from one tag to another ([#2334](https://github.com/standardnotes/app/issues/2334)) ([08c38fc](https://github.com/standardnotes/app/commit/08c38fc7cfbce96c5de269073f5f0117000066a8))
+
+## [3.160.19](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))
+
+## [3.160.18](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-30)
+
+### Bug Fixes
+
+* Fixed issue where pane gestures on Android would break scroll in a daily journal tag ([39414e6](https://github.com/standardnotes/app/commit/39414e6caba4830192a54ea9553bcda36959c9bf))
+
+## [3.160.17](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.160.16](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-26)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.160.15](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-25)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.160.14](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-25)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.160.13](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-24)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.160.12](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-24)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.160.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-24)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.160.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-23)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.160.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-23)
+
+### Bug Fixes
+
+* Fixed issue where some dialogs would become unresponsive ([1d7079e](https://github.com/standardnotes/app/commit/1d7079e90cf5c4de57a77b408a7b2d399a4a6a38))
+
 ## [3.160.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)
 
 **Note:** Version bump only for package @standardnotes/web

packages/web/CHANGELOG.md.json

@@ -1,5 +1,210 @@
 {
   "versions": [
+    {
+      "version": "3.162.1",
+      "title": "[3.162.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.162.0",
+      "title": "[3.162.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-25)",
+      "date": null,
+      "body": "### Features\n\n* 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))",
+      "parsed": {
+        "_": [
+          "Added a conflict resolution dialog and a Conflicts view for easier management of conflicts (#2337) (e0e9249)"
+        ],
+        "Features": [
+          "Added a conflict resolution dialog and a Conflicts view for easier management of conflicts (#2337) (e0e9249)"
+        ]
+      }
+    },
+    {
+      "version": "3.161.3",
+      "title": "[3.161.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-23)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.161.2",
+      "title": "[3.161.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-16)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.161.1",
+      "title": "[3.161.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-06)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.161.0",
+      "title": "[3.161.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-06-02)",
+      "date": null,
+      "body": "### Features\n\n* You can now drag-n-drop notes onto tags to move them from one tag to another ([#2334](https://github.com/standardnotes/app/issues/2334)) ([08c38fc](https://github.com/standardnotes/app/commit/08c38fc7cfbce96c5de269073f5f0117000066a8))",
+      "parsed": {
+        "_": [
+          "You can now drag-n-drop notes onto tags to move them from one tag to another (#2334) (08c38fc)"
+        ],
+        "Features": [
+          "You can now drag-n-drop notes onto tags to move them from one tag to another (#2334) (08c38fc)"
+        ]
+      }
+    },
+    {
+      "version": "3.160.19",
+      "title": "[3.160.19](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-31)",
+      "date": null,
+      "body": "### Bug Fixes\n\n* **desktop:** Fixed issue where local backup location would default to \"[object Promise]\" ([7d691aa](https://github.com/standardnotes/app/commit/7d691aa409af3636ad795491b8b817d9eb7a980d))",
+      "parsed": {
+        "_": [
+          "desktop: Fixed issue where local backup location would default to \"object Promise]\" ([7d691aa)"
+        ],
+        "Bug Fixes": [
+          "desktop: Fixed issue where local backup location would default to \"object Promise]\" ([7d691aa)"
+        ]
+      }
+    },
+    {
+      "version": "3.160.18",
+      "title": "[3.160.18](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-30)",
+      "date": null,
+      "body": "### Bug Fixes\n\n* Fixed issue where pane gestures on Android would break scroll in a daily journal tag ([39414e6](https://github.com/standardnotes/app/commit/39414e6caba4830192a54ea9553bcda36959c9bf))",
+      "parsed": {
+        "_": [
+          "Fixed issue where pane gestures on Android would break scroll in a daily journal tag (39414e6)"
+        ],
+        "Bug Fixes": [
+          "Fixed issue where pane gestures on Android would break scroll in a daily journal tag (39414e6)"
+        ]
+      }
+    },
+    {
+      "version": "3.160.17",
+      "title": "[3.160.17](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-29)",
+      "date": null,
+      "body": "### Bug Fixes\n\n* 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))",
+      "parsed": {
+        "_": [
+          "Fixed issue on Android where pressing backspace in Super notes would delete characters on both side of the cursor (#2336) (0cb73b5)"
+        ],
+        "Bug Fixes": [
+          "Fixed issue on Android where pressing backspace in Super notes would delete characters on both side of the cursor (#2336) (0cb73b5)"
+        ]
+      }
+    },
+    {
+      "version": "3.160.16",
+      "title": "[3.160.16](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-26)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.160.15",
+      "title": "[3.160.15](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-25)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.160.14",
+      "title": "[3.160.14](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-25)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.160.13",
+      "title": "[3.160.13](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-24)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.160.12",
+      "title": "[3.160.12](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-24)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.160.11",
+      "title": "[3.160.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-24)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.160.10",
+      "title": "[3.160.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-23)",
+      "date": null,
+      "body": "**Note:** Version bump only for package @standardnotes/web",
+      "parsed": {
+        "_": [
+          "Note: Version bump only for package @standardnotes/web"
+        ]
+      }
+    },
+    {
+      "version": "3.160.9",
+      "title": "[3.160.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-23)",
+      "date": null,
+      "body": "### Bug Fixes\n\n* Fixed issue where some dialogs would become unresponsive ([1d7079e](https://github.com/standardnotes/app/commit/1d7079e90cf5c4de57a77b408a7b2d399a4a6a38))",
+      "parsed": {
+        "_": [
+          "Fixed issue where some dialogs would become unresponsive (1d7079e)"
+        ],
+        "Bug Fixes": [
+          "Fixed issue where some dialogs would become unresponsive (1d7079e)"
+        ]
+      }
+    },
     {
       "version": "3.160.8",
       "title": "[3.160.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-05-22)",

packages/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/web",
-  "version": "3.160.8",
+  "version": "3.162.1",
   "license": "AGPL-3.0-or-later",
   "main": "dist/app.js",
   "author": "Standard Notes",
@@ -28,7 +28,7 @@
     "@babel/plugin-transform-react-jsx": "^7.19.0",
     "@babel/preset-env": "*",
     "@babel/preset-typescript": "^7.21.5",
-    "@lexical/react": "0.10.0",
+    "@lexical/react": "0.11.0",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
     "@simplewebauthn/browser": "^7.1.0",
     "@standardnotes/authenticator": "^2.4.0",
@@ -75,7 +75,7 @@
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.3.1",
     "jest-environment-jsdom": "^29.3.1",
-    "lexical": "0.10.0",
+    "lexical": "0.11.0",
     "lint-staged": ">=13",
     "mini-css-extract-plugin": "^2.7.2",
     "minimatch": "^5.1.1",
@@ -107,8 +107,9 @@
     "app/**/*.{js,ts,jsx,tsx,css,md}": "prettier --write"
   },
   "dependencies": {
-    "@ariakit/react": "^0.2.1",
-    "@lexical/headless": "0.10.0",
-    "@radix-ui/react-slot": "^1.0.1"
+    "@ariakit/react": "^0.2.8",
+    "@lexical/headless": "0.11.0",
+    "@radix-ui/react-slot": "^1.0.1",
+    "fast-diff": "^1.3.0"
   }
 }

packages/web/src/components/assets/org.standardnotes.theme-focus/index.css

@@ -19,7 +19,7 @@
   --sn-stylekit-neutral-contrast-color: #ffffff;
   --sn-stylekit-success-color: #2b9612;
   --sn-stylekit-success-contrast-color: #ffffff;
-  --sn-stylekit-warning-color: #f6a200;
+  --sn-stylekit-warning-color: #cc8800;
   --sn-stylekit-warning-contrast-color: #ffffff;
   --sn-stylekit-danger-color: #f80324;
   --sn-stylekit-danger-contrast-color: #ffffff;
@@ -27,7 +27,7 @@
   --sn-stylekit-editor-foreground-color: var(--sn-stylekit-foreground-color);
   --sn-stylekit-background-color: var(--background-color);
   --sn-stylekit-foreground-color: var(--foreground-color);
-  --sn-stylekit-border-color: #000000;
+  --sn-stylekit-border-color: #181a1b;
   --sn-stylekit-contrast-background-color: #000000;
   --sn-stylekit-contrast-foreground-color: #ffffff;
   --sn-stylekit-contrast-border-color: #000000;
@@ -46,4 +46,5 @@
   --sn-stylekit-scrollbar-thumb-color: var(--sn-stylekit-info-color);
   --sn-stylekit-menu-border: 1px solid #424242;
   --navigation-item-selected-background-color: var(--background-color);
+  --normal-button-background-color: var(--sn-stylekit-passive-color-5);
 }

packages/web/src/components/assets/org.standardnotes.theme-futura/index.css

@@ -42,4 +42,5 @@
   --sn-desktop-titlebar-ui-hover-color: var(--highlight-color);
   --sn-stylekit-menu-border: 1px solid #434b60;
   --navigation-item-selected-background-color: var(--sn-stylekit-background-color);
+  --normal-button-background-color: var(--sn-stylekit-passive-color-5);
 }

packages/web/src/components/assets/org.standardnotes.theme-midnight/index.css

@@ -43,4 +43,5 @@
   --sn-stylekit-scrollbar-thumb-color: var(--sn-stylekit-info-color);
   --sn-stylekit-menu-border: 1px solid #494965;
   --navigation-item-selected-background-color: var(--sn-stylekit-background-color);
+  --normal-button-background-color: var(--sn-stylekit-passive-color-5);
 }