chore(release): publish

- @standardnotes/[email protected]
 - @standardnotes/[email protected].7
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].4

.github/workflows/desktop.release.reuse.yml

@@ -203,3 +203,11 @@ jobs:
           token: ${{ secrets.CI_PAT_TOKEN }}
           repository: ${{ secrets.RELEASES_EVENT_RECEIVING_REPO }}
           event-type: releases-updated-event
+
+      - name: Publish Snap
+        continue-on-error: true
+        run: |
+          sudo snap install snapcraft --classic
+          echo "${{ secrets.SNAPCRAFT_LOGIN_FILE }}" >> snapauth.txt
+          snapcraft login --with=snapauth.txt
+          snapcraft upload dist/standard-notes-${{ steps.package-version.outputs.current-version}}-linux-amd64.snap --release stable,candidate,beta,edge

packages/components/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.
 
+## [2.7.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+### Bug Fixes
+
+* **components:** dynamic panels theme ([d1df0d3](https://github.com/standardnotes/app/commit/d1df0d371a8afc60c17c79f35a1416804eedb9ec))
+
 ## [2.7.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
 
 **Note:** Version bump only for package @standardnotes/components-meta

packages/components/dist/assets/org.standardnotes.theme-dynamic/dist/dist.css

@@ -1,29 +1,23 @@
-#navigation.section,
-.section.tags,
-navigation {
+#navigation {
   flex: none !important;
-  width: 190px !important;
+  width: 10px !important;
   transition: width 0.25s;
 }
 
-#navigation.section:hover,
-.section.tags:hover,
-navigation:hover {
+#navigation:hover {
   flex: initial;
-  width: 250px !important;
+  width: 200px !important;
   transition: width 0.25s;
 }
 
-.section.notes,
-notes-view {
+#items-column {
   flex: none !important;
   width: 270px !important;
   transition: width 0.25s;
 }
 
-.section.notes:hover,
-notes-view:hover {
+#items-column:hover {
   flex: initial;
-  width: 420px !important;
+  width: 380px !important;
   transition: width 0.25s;
 }

packages/components/dist/zips/checksums.json

@@ -30,9 +30,9 @@
     "binary": "5a00749f8930a41541589f704fff2b6e1d84224305750c7880e941085a8fef62"
   },
   "org.standardnotes.theme-dynamic": {
-    "version": "1.0.8",
-    "base64": "0f0232ab1bd65f562619fbd68ae593522e6127f359b5843956aaf99c9436c583",
-    "binary": "6f726e05c26f0e9feee775656513a034c6a437b22510e75fba863acc6342af24"
+    "version": "1.1.0",
+    "base64": "1214db7ca8962d7f56937c16463ca3131f2073a718f993e47c1dfcf233eefab8",
+    "binary": "6da8d19f03e724b058950eb6869e4fe9c6ba5e57d995e268aecc823a235af43d"
   },
   "org.standardnotes.code-editor": {
     "version": "1.3.17",

packages/components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/components-meta",
-  "version": "2.7.1",
+  "version": "2.7.2",
   "private": true,
   "author": "Standard Notes.",
   "main": "dist",

packages/components/src/Packages/Themes/org.standardnotes.theme-dynamic/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.1.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+### Bug Fixes
+
+* **components:** dynamic panels theme ([d1df0d3](https://github.com/standardnotes/app/commit/d1df0d371a8afc60c17c79f35a1416804eedb9ec))
+
+### Features
+
+* deprecated editors ([#1166](https://github.com/standardnotes/app/issues/1166)) ([60ca415](https://github.com/standardnotes/app/commit/60ca4150446f9a14bb6a31416686c6d07a7d0cd9))
+
 ## [1.0.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-06-22)
 
 **Note:** Version bump only for package @standardnotes/dynamic-theme

packages/components/src/Packages/Themes/org.standardnotes.theme-dynamic/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/dynamic-theme",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "main": "dist/dist.css",
   "private": true,
   "sn": {

packages/components/src/Packages/Themes/org.standardnotes.theme-dynamic/src/main.scss

@@ -1,29 +1,23 @@
-#navigation.section,
-.section.tags, // legacy code pre-smart tags release
-navigation {
+#navigation {
   flex: none !important;
-  width: 190px !important;
+  width: 10px !important;
   transition: width 0.25s;
 }
 
-#navigation.section:hover,
-.section.tags:hover, // legacy code pre-smart tags release
-navigation:hover {
+#navigation:hover {
   flex: initial;
-  width: 250px !important;
+  width: 200px !important;
   transition: width 0.25s;
 }
 
-.section.notes,
-notes-view {
+#items-column {
   flex: none !important;
   width: 270px !important;
   transition: width 0.25s;
 }
 
-.section.notes:hover,
-notes-view:hover {
+#items-column:hover {
   flex: initial;
-  width: 420px !important;
+  width: 380px !important;
   transition: width 0.25s;
 }

packages/desktop/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.
 
+## [3.23.57](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.56](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.55](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.23.54](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
 ## [3.23.53](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
 
 **Note:** Version bump only for package @standardnotes/desktop

packages/desktop/package.json

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

packages/mobile/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.30.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.30.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.30.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.30.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.30.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.30.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
 ## [3.30.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
 
 **Note:** Version bump only for package @standardnotes/mobile

packages/mobile/fastlane/Fastfile

@@ -19,7 +19,7 @@ platform :ios do
       version_number: ENV['PACKAGE_VERSION'],
       xcodeproj: 'ios/StandardNotes.xcodeproj'
     )
-    increment_build_number(
+    build_number = increment_build_number(
       build_number: ENV['BUILD_NUMBER'],
       xcodeproj: 'ios/StandardNotes.xcodeproj'
     )
@@ -30,24 +30,44 @@ platform :ios do
       silent: true,
       xcargs: 'DEBUG_INFORMATION_FORMAT=dwarf-with-dsym'
     )
+
+    build_number
   end
 
   def deploy_ios(scheme)
     sign_ios
-    build_ios(scheme)
+    build_number = build_ios(scheme)
     app_store_connect_api_key(
       key_id: ENV['APPSTORE_CONNECT_KEY_ID'],
       issuer_id: ENV['APPSTORE_CONNECT_KEY_ISSUER_ID'],
       key_filepath: 'ios/Authkey.p8',
       in_house: false # optional but may be required if using match/sigh
     )
+
+    is_prod = scheme == 'StandardNotes'
+
     upload_to_testflight(
       apple_id: ENV['APPLE_APP_ID'],
-      distribute_external: true,
-      notify_external_testers: true,
-      submit_beta_review: true
+      distribute_external: is_prod,
+      groups: ['Public'],
+      notify_external_testers: is_prod,
+      submit_beta_review: is_prod,
+      changelog: 'Fixes and improvements.'
+    )
+
+    upload_to_app_store(
+      apple_id: ENV['APPLE_APP_ID'],
+      build_number: build_number,
+      submit_for_review: true,
+      automatic_release: false,
+      force: true, # Skip HTMl report verification
+      skip_metadata: true,
+      skip_screenshots: true,
+      skip_binary_upload: true,
+      release_notes: {
+        'default': "Fixes and improvements.",
+      }
     )
-    # refresh_dsyms
   end
 
   desc 'Deploy dev app'

packages/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/mobile",
-  "version": "3.30.1",
+  "version": "3.30.7",
   "author": "Standard Notes.",
   "private": true,
   "license": "AGPL-3.0-or-later",
@@ -8,21 +8,21 @@
     "android-dev": "react-native run-android --variant devDebug --appIdSuffix dev",
     "android-prod-debug": "react-native run-android --variant prodDebug",
     "android-prod-release": "yarn run android:bundle && react-native run-android --variant prodRelease",
+    "android:bundle": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/build/intermediates/res/merged/release/",
+    "build": "yarn web:bundle && yarn install:pods && yarn android:bundle",
+    "clear-cache": "watchman watch-del-all && rm -rf $TMPDIR/react-native-packager-cache-* && rm -rf $TMPDIR/metro-bundler-cache-*",
+    "format:fix": "yarn format --write",
+    "format": "prettier ./src",
+    "install:pods": "yarn pod-install ios",
     "ios-dev": "react-native run-ios --scheme StandardNotesDev",
     "ios-prod": "react-native run-ios --scheme StandardNotes",
-    "clear-cache": "watchman watch-del-all && rm -rf $TMPDIR/react-native-packager-cache-* && rm -rf $TMPDIR/metro-bundler-cache-*",
-    "lint": "yarn tsc && yarn eslint . --ext .ts,.tsx",
     "lint:fix": "yarn lint --fix",
-    "format": "prettier ./src",
-    "format:fix": "yarn format --write",
-    "build": "yarn web:bundle && yarn install:pods && yarn android:bundle",
-    "web:bundle": "mkdir -p html/Web.bundle/src/web-src/ && cp -r ../web/dist/. html/Web.bundle/src/web-src/",
+    "lint": "yarn tsc && yarn eslint . --ext .ts,.tsx",
     "pods": "yarn install:pods",
-    "tsc": "tsc --noEmit",
     "start": "react-native start",
-    "install:pods": "yarn pod-install ios",
-    "android:bundle": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/build/intermediates/res/merged/release/",
-    "upgrade:snjs": "ncu -u '@standardnotes/*'"
+    "tsc": "tsc --noEmit",
+    "upgrade:snjs": "ncu -u '@standardnotes/*'",
+    "web:bundle": "mkdir -p html/Web.bundle/src/web-src/ && cp -r ../web/dist/. html/Web.bundle/src/web-src/"
   },
   "installConfig": {
     "hoistingLimits": "workspaces"

packages/releases/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.73](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.2.72](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.2.71](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.2.70](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.2.69](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.2.68](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/releases
+
 ## [1.2.67](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
 
 **Note:** Version bump only for package @standardnotes/releases

packages/releases/package.json

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

packages/web-server/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.2.79](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/web-server
+
+## [1.2.78](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/web-server
+
+## [1.2.77](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/web-server
+
+## [1.2.76](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/web-server
+
 ## [1.2.75](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
 
 **Note:** Version bump only for package @standardnotes/web-server

packages/web-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/web-server",
-  "version": "1.2.75",
+  "version": "1.2.79",
   "license": "AGPL-3.0-or-later",
   "private": true,
   "author": "Standard Notes.",

packages/web/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.
 
+## [3.37.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+### Bug Fixes
+
+* **web:** update modal styles ([#1220](https://github.com/standardnotes/app/issues/1220)) ([6fa6374](https://github.com/standardnotes/app/commit/6fa6374cf2a283070977b43b0ac4542d054aee96))
+
+## [3.37.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+### Bug Fixes
+
+* select next item when trashing or deleting item ([#1218](https://github.com/standardnotes/app/issues/1218)) ([2ee7912](https://github.com/standardnotes/app/commit/2ee791259dca709d03db2ebded7972ce7c3b788e))
+
+## [3.37.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
+
+**Note:** Version bump only for package @standardnotes/web
+
 ## [3.37.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
 
 **Note:** Version bump only for package @standardnotes/web

packages/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/web",
-  "version": "3.37.1",
+  "version": "3.37.4",
   "license": "AGPL-3.0-or-later",
   "main": "dist/app.js",
   "author": "Standard Notes.",
@@ -9,23 +9,23 @@
     "dist"
   ],
   "scripts": {
-    "start": "webpack-dev-server --config web.webpack.dev.js",
-    "watch": "webpack -w --config web.webpack.dev.js",
-    "clean": "rm -fr dist",
-    "prebuild": "yarn clean",
     "build": "webpack --config web.webpack.prod.js && yarn tsc",
-    "lint": "eslint src/javascripts",
+    "clean": "rm -fr dist",
     "format": "prettier --write src/javascripts",
-    "tsc": "tsc --project tsconfig.json",
+    "lint": "eslint src/javascripts",
+    "prebuild": "yarn clean",
+    "start": "webpack-dev-server --config web.webpack.dev.js",
     "test": "jest --config jest.config.js --coverage",
-    "upgrade:snjs": "ncu -u '@standardnotes/*'"
+    "tsc": "tsc --project tsconfig.json",
+    "upgrade:snjs": "ncu -u '@standardnotes/*'",
+    "watch": "webpack -w --config web.webpack.dev.js"
   },
   "devDependencies": {
     "@babel/core": "*",
     "@babel/plugin-transform-react-jsx": "^7.17.3",
     "@babel/preset-env": "*",
     "@babel/preset-typescript": "^7.16.7",
-    "@types/jest": "^27.4.1",
+    "@types/jest": "^27.5.1",
     "@types/react": "^17.0.42",
     "@types/react-dom": "^18.0.5",
     "@types/wicg-file-system-access": "^2020.9.5",
@@ -41,6 +41,7 @@
     "html-webpack-plugin": "^5.5.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^27.5.1",
+    "jest-environment-jsdom": "^27.5.1",
     "lint-staged": ">=12",
     "mini-css-extract-plugin": "^2.6.0",
     "node-sass": "*",

packages/web/src/javascripts/Components/ContentListView/ContentList.tsx

@@ -37,7 +37,7 @@ const ContentList: FunctionComponent<Props> = ({
   selectedItems,
   paginate,
 }) => {
-  const { selectPreviousItem, selectNextItem } = itemListController
+  const { selectPreviousItem, selectNextItem } = selectionController
   const { hideTags, hideDate, hideNotePreview, hideEditorIcon } = itemListController.webDisplayOptions
   const { sortBy } = itemListController.displayOptions
 

packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx

@@ -57,11 +57,9 @@ const ContentListView: FunctionComponent<Props> = ({
     panelWidth,
     renderedItems,
     searchBarElement,
-    selectNextItem,
-    selectPreviousItem,
   } = itemListController
 
-  const { selectedItems } = selectionController
+  const { selectedItems, selectNextItem, selectPreviousItem } = selectionController
 
   const isFilesSmartView = useMemo(
     () => navigationController.selected?.uuid === SystemViewId.Files,

packages/web/src/javascripts/Components/NoteTags/NoteTag.tsx

@@ -80,7 +80,7 @@ const NoteTag = ({ viewControllerManager, tag }: Props) => {
     if (autocompleteInputFocused) {
       return -1
     }
-    return tags[0].uuid === tag.uuid ? 0 : -1
+    return tags[0]?.uuid === tag.uuid ? 0 : -1
   }, [autocompleteInputFocused, tags, tag, focusedTagUuid])
 
   const onKeyDown: KeyboardEventHandler = useCallback(

packages/web/src/javascripts/Components/PasswordWizard/PasswordWizard.tsx

@@ -3,6 +3,10 @@ import { createRef } from 'react'
 import { PureComponent } from '@/Components/Abstract/PureComponent'
 import Button from '@/Components/Button/Button'
 import DecoratedPasswordInput from '../Input/DecoratedPasswordInput'
+import ModalDialog from '../Shared/ModalDialog'
+import ModalDialogLabel from '../Shared/ModalDialogLabel'
+import ModalDialogDescription from '../Shared/ModalDialogDescription'
+import ModalDialogButtons from '../Shared/ModalDialogButtons'
 
 interface Props {
   application: WebApplication
@@ -224,84 +228,69 @@ class PasswordWizard extends PureComponent<Props, State> {
 
   override render() {
     return (
-      <div className="sn-component">
-        <div id="password-wizard" className="sk-modal small auto-height">
-          <div className="sk-modal-background" />
-          <div className="sk-modal-content">
-            <div className="sn-component">
-              <div className="sk-panel">
-                <div className="sk-panel-header">
-                  <div className="sk-panel-header-title">{this.state.title}</div>
-                  <a onClick={this.dismiss} className="sk-a info close-button">
-                    Close
-                  </a>
-                </div>
-                <div className="sk-panel-content">
-                  {this.state.step === Steps.PasswordStep && (
-                    <div className="sk-panel-section">
-                      <div className="sk-panel-row">
-                        <div className="sk-panel-column stretch">
-                          <form className="sk-panel-form">
-                            <label htmlFor="password-wiz-current-password" className="mb-1 block">
-                              Current Password
-                            </label>
+      <div className="sn-component" id="password-wizard">
+        <ModalDialog>
+          <ModalDialogLabel closeDialog={this.dismiss}>{this.state.title}</ModalDialogLabel>
+          <ModalDialogDescription>
+            {this.state.step === Steps.PasswordStep && (
+              <div className="flex flex-col pb-1.5">
+                <form>
+                  <label htmlFor="password-wiz-current-password" className="mb-1 block">
+                    Current Password
+                  </label>
 
-                            <DecoratedPasswordInput
-                              ref={this.currentPasswordInput}
-                              id="password-wiz-current-password"
-                              value={this.state.formData.currentPassword}
-                              onChange={this.handleCurrentPasswordInputChange}
-                              type="password"
-                            />
+                  <DecoratedPasswordInput
+                    ref={this.currentPasswordInput}
+                    id="password-wiz-current-password"
+                    value={this.state.formData.currentPassword}
+                    onChange={this.handleCurrentPasswordInputChange}
+                    type="password"
+                  />
 
-                            <div className="sk-panel-row" />
+                  <div className="min-h-2" />
 
-                            <label htmlFor="password-wiz-new-password" className="mb-1 block">
-                              New Password
-                            </label>
+                  <label htmlFor="password-wiz-new-password" className="mb-1 block">
+                    New Password
+                  </label>
 
-                            <DecoratedPasswordInput
-                              id="password-wiz-new-password"
-                              value={this.state.formData.newPassword}
-                              onChange={this.handleNewPasswordInputChange}
-                              type="password"
-                            />
-                            <div className="sk-panel-row" />
+                  <DecoratedPasswordInput
+                    id="password-wiz-new-password"
+                    value={this.state.formData.newPassword}
+                    onChange={this.handleNewPasswordInputChange}
+                    type="password"
+                  />
 
-                            <label htmlFor="password-wiz-confirm-new-password" className="mb-1 block">
-                              Confirm New Password
-                            </label>
+                  <div className="min-h-2" />
 
-                            <DecoratedPasswordInput
-                              id="password-wiz-confirm-new-password"
-                              value={this.state.formData.newPasswordConfirmation}
-                              onChange={this.handleNewPasswordConfirmationInputChange}
-                              type="password"
-                            />
-                          </form>
-                        </div>
-                      </div>
-                    </div>
-                  )}
-                  {this.state.step === Steps.FinishStep && (
-                    <div className="sk-panel-section">
-                      <div className="mb-1 font-bold text-info">Your password has been successfully changed.</div>
-                      <p className="sk-p">
-                        Please ensure you are running the latest version of Standard Notes on all platforms to ensure
-                        maximum compatibility.
-                      </p>
-                    </div>
-                  )}
-                </div>
-                <div className="sk-panel-footer">
-                  <Button primary onClick={this.nextStep} disabled={this.state.lockContinue} className="min-w-20">
-                    {this.state.continueTitle}
-                  </Button>
-                </div>
+                  <label htmlFor="password-wiz-confirm-new-password" className="mb-1 block">
+                    Confirm New Password
+                  </label>
+
+                  <DecoratedPasswordInput
+                    id="password-wiz-confirm-new-password"
+                    value={this.state.formData.newPasswordConfirmation}
+                    onChange={this.handleNewPasswordConfirmationInputChange}
+                    type="password"
+                  />
+                </form>
               </div>
-            </div>
-          </div>
-        </div>
+            )}
+            {this.state.step === Steps.FinishStep && (
+              <div className="flex flex-col">
+                <div className="mb-1 font-bold text-info">Your password has been successfully changed.</div>
+                <p className="sk-p">
+                  Please ensure you are running the latest version of Standard Notes on all platforms to ensure maximum
+                  compatibility.
+                </p>
+              </div>
+            )}
+          </ModalDialogDescription>
+          <ModalDialogButtons>
+            <Button primary onClick={this.nextStep} disabled={this.state.lockContinue} className="min-w-20">
+              {this.state.continueTitle}
+            </Button>
+          </ModalDialogButtons>
+        </ModalDialog>
       </div>
     )
   }

packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmailForm.tsx

@@ -12,7 +12,7 @@ const labelClassName = 'block mb-1'
 const ChangeEmailForm: FunctionComponent<Props> = ({ setNewEmail, setCurrentPassword }) => {
   return (
     <div className="flex w-full flex-col">
-      <div className="mt-2 mb-3">
+      <div className="mb-3">
         <label className={labelClassName} htmlFor="change-email-email-input">
           New Email:
         </label>

packages/web/src/javascripts/Components/Preferences/Panes/Security/TwoFactorAuth/Bullet.tsx

@@ -5,7 +5,7 @@ type Props = {
 }
 
 const Bullet: FunctionComponent<Props> = ({ className = '' }) => (
-  <div className={`min-h-1 bg-inverted-default min-w-1 rounded-full ${className} mr-2`} />
+  <div className={`min-h-1 min-w-1 rounded-full bg-text ${className} mr-2`} />
 )
 
 export default Bullet

packages/web/src/javascripts/Components/Preferences/Panes/Security/TwoFactorAuth/ScanQRCode.tsx

@@ -25,7 +25,7 @@ const ScanQRCode: FunctionComponent<Props> = ({ activation: act }) => {
           <QRCode className="border-neutral-contrast-bg border-2 border-solid" value={act.qrCode} size={100} />
         </div>
         <div className="min-w-5" />
-        <div className="flex flex-grow flex-col">
+        <div className="flex flex-grow flex-col gap-2">
           <div className="flex flex-row items-center">
             <Bullet />
             <div className="min-w-1" />
@@ -35,7 +35,6 @@ const ScanQRCode: FunctionComponent<Props> = ({ activation: act }) => {
             <div className="min-w-2" />
             <AuthAppInfoTooltip />
           </div>
-          <div className="min-h-2" />
           <div className="flex flex-row items-center">
             <Bullet className="mt-2 self-start" />
             <div className="min-w-1" />
@@ -43,7 +42,6 @@ const ScanQRCode: FunctionComponent<Props> = ({ activation: act }) => {
               <b>Scan this QR code</b> or <b>add this secret key</b>:
             </div>
           </div>
-          <div className="min-h-2" />
           <DecoratedInput
             className={{ container: 'w-92 ml-4' }}
             disabled={true}

packages/web/src/javascripts/Components/SessionsModal/SessionsModal.tsx

@@ -107,9 +107,9 @@ const SessionsModalContent: FunctionComponent<{
       <ModalDialog onDismiss={close} className="sessions-modal max-h-[90vh]">
         <ModalDialogLabel
           headerButtons={
-            <button className="cursor-pointer border-0 font-bold text-info" onClick={refresh}>
+            <Button small colorStyle="info" onClick={refresh}>
               Refresh
-            </button>
+            </Button>
           }
           closeDialog={close}
         >

packages/web/src/javascripts/Components/Shared/ModalDialog.tsx

@@ -1,5 +1,6 @@
 import { useRef, ReactNode } from 'react'
 import { AlertDialogContent, AlertDialogOverlay } from '@reach/alert-dialog'
+import { classNames } from '@/Utils/ConcatenateClassNames'
 
 type Props = {
   children: ReactNode
@@ -14,7 +15,10 @@ const ModalDialog = ({ children, onDismiss, className }: Props) => {
     <AlertDialogOverlay leastDestructiveRef={ldRef} onDismiss={onDismiss}>
       <AlertDialogContent
         tabIndex={0}
-        className={`flex w-160 flex-col border border-solid border-border bg-default p-0 shadow-main ${className}`}
+        className={classNames(
+          'flex w-160 flex-col rounded border border-solid border-border bg-default p-0 shadow-main',
+          className,
+        )}
       >
         {children}
       </AlertDialogContent>

packages/web/src/javascripts/Components/Shared/ModalDialogButtons.tsx

@@ -1,3 +1,4 @@
+import { classNames } from '@/Utils/ConcatenateClassNames'
 import { FunctionComponent } from 'react'
 
 type Props = {
@@ -7,7 +8,7 @@ type Props = {
 const ModalDialogButtons: FunctionComponent<Props> = ({ children, className }) => (
   <>
     <hr className="m-0 h-[1px] border-none bg-border" />
-    <div className={`flex flex-row items-center px-4 py-4 ${className}`}>
+    <div className={classNames('flex items-center justify-end px-4 py-4', className)}>
       {children != undefined && Array.isArray(children)
         ? children.map((child, idx, arr) => (
             <>

packages/web/src/javascripts/Components/Shared/ModalDialogLabel.tsx

@@ -1,5 +1,7 @@
 import { FunctionComponent, ReactNode } from 'react'
 import { AlertDialogLabel } from '@reach/alert-dialog'
+import Icon from '@/Components/Icon/Icon'
+import { classNames } from '@/Utils/ConcatenateClassNames'
 
 type Props = {
   closeDialog: () => void
@@ -9,15 +11,18 @@ type Props = {
 
 const ModalDialogLabel: FunctionComponent<Props> = ({ children, closeDialog, className, headerButtons }) => (
   <AlertDialogLabel
-    className={`flex flex-shrink-0 items-center justify-between border-b border-solid border-border bg-contrast px-4.5 py-3 text-text ${className}`}
+    className={classNames(
+      'flex flex-shrink-0 items-center justify-between rounded-t border-b border-solid border-border bg-default px-4.5 py-3 text-text',
+      className,
+    )}
   >
     <div className="flex w-full flex-row items-center justify-between">
-      <div className="flex-grow text-base font-medium text-text">{children}</div>
+      <div className="flex-grow text-lg font-semibold text-text">{children}</div>
       <div className="flex items-center gap-2">
         {headerButtons}
-        <div tabIndex={0} className="cursor-pointer font-bold text-info" onClick={closeDialog}>
-          Close
-        </div>
+        <button tabIndex={0} className="rounded p-1 font-bold hover:bg-contrast" onClick={closeDialog}>
+          <Icon type="close" />
+        </button>
       </div>
     </div>
     <hr className="h-1px no-border m-0 bg-border" />

packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts

@@ -370,7 +370,7 @@ export class ItemListController extends AbstractViewController implements Intern
       await this.selectFirstItem()
     } else if (this.shouldCloseActiveItem(activeItem) && activeController) {
       this.closeItemController(activeController)
-      this.selectNextItem()
+      this.selectionController.selectNextItem()
     } else if (this.shouldSelectNextItemOrCreateNewNote(activeItem)) {
       await this.selectNextItemOrCreateNewNote()
     } else if (this.shouldSelectActiveItem(activeItem) && activeItem) {
@@ -547,27 +547,11 @@ export class ItemListController extends AbstractViewController implements Intern
     return document.getElementById(ElementIdScrollContainer)
   }
 
-  selectItemWithScrollHandling = async (
-    item: {
-      uuid: ListableContentItem['uuid']
-    },
-    { userTriggered = false, scrollIntoView = true },
-  ): Promise<void> => {
-    await this.selectionController.selectItem(item.uuid, userTriggered)
-
-    if (scrollIntoView) {
-      const itemElement = document.getElementById(item.uuid)
-      itemElement?.scrollIntoView({
-        behavior: 'smooth',
-      })
-    }
-  }
-
   selectFirstItem = async () => {
     const item = this.getFirstNonProtectedItem()
 
     if (item) {
-      await this.selectItemWithScrollHandling(item, {
+      await this.selectionController.selectItemWithScrollHandling(item, {
         userTriggered: false,
         scrollIntoView: false,
       })
@@ -576,77 +560,21 @@ export class ItemListController extends AbstractViewController implements Intern
     }
   }
 
-  selectNextItem = () => {
-    const displayableItems = this.items
-
-    const currentIndex = displayableItems.findIndex((candidate) => {
-      return candidate.uuid === this.selectionController.lastSelectedItem?.uuid
-    })
-
-    let nextIndex = currentIndex + 1
-
-    while (nextIndex < displayableItems.length) {
-      const nextItem = displayableItems[nextIndex]
-
-      nextIndex++
-
-      if (nextItem.protected) {
-        continue
-      }
-
-      this.selectItemWithScrollHandling(nextItem, { userTriggered: true }).catch(console.error)
-
-      const nextNoteElement = document.getElementById(nextItem.uuid)
-
-      nextNoteElement?.focus()
-
-      return
-    }
-  }
-
   selectNextItemOrCreateNewNote = async () => {
     const item = this.getFirstNonProtectedItem()
 
     if (item) {
-      await this.selectItemWithScrollHandling(item, {
-        userTriggered: false,
-        scrollIntoView: false,
-      }).catch(console.error)
+      await this.selectionController
+        .selectItemWithScrollHandling(item, {
+          userTriggered: false,
+          scrollIntoView: false,
+        })
+        .catch(console.error)
     } else {
       await this.createNewNote()
     }
   }
 
-  selectPreviousItem = () => {
-    const displayableItems = this.items
-
-    if (!this.selectionController.lastSelectedItem) {
-      return
-    }
-
-    const currentIndex = displayableItems.indexOf(this.selectionController.lastSelectedItem)
-
-    let previousIndex = currentIndex - 1
-
-    while (previousIndex >= 0) {
-      const previousItem = displayableItems[previousIndex]
-
-      previousIndex--
-
-      if (previousItem.protected) {
-        continue
-      }
-
-      this.selectItemWithScrollHandling(previousItem, { userTriggered: true }).catch(console.error)
-
-      const previousNoteElement = document.getElementById(previousItem.uuid)
-
-      previousNoteElement?.focus()
-
-      return
-    }
-  }
-
   setNoteFilterText = (text: string) => {
     if (text === this.noteFilterText) {
       return

packages/web/src/javascripts/Controllers/NotesController.ts

@@ -201,7 +201,6 @@ export class NotesController extends AbstractViewController {
       const notesDeleted = await this.deleteNotes(false)
       if (notesDeleted) {
         runInAction(() => {
-          this.unselectNotes()
           this.contextMenuOpen = false
         })
       }
@@ -210,7 +209,6 @@ export class NotesController extends AbstractViewController {
         mutator.trashed = trashed
       })
       runInAction(() => {
-        this.unselectNotes()
         this.contextMenuOpen = false
       })
     }
@@ -242,10 +240,10 @@ export class NotesController extends AbstractViewController {
         confirmButtonStyle: 'danger',
       })
     ) {
+      this.selectionController.selectNextItem()
       if (permanently) {
         for (const note of this.getSelectedNotesList()) {
           await this.application.mutator.deleteItem(note)
-          this.selectionController.deselectItem(note)
         }
       } else {
         await this.changeSelectedNotes((mutator) => {

packages/web/src/javascripts/Controllers/SelectedItemsController.ts

@@ -221,4 +221,78 @@ export class SelectedItemsController extends AbstractViewController {
       didSelect: this.selectedItems[uuid] != undefined,
     }
   }
+
+  selectItemWithScrollHandling = async (
+    item: {
+      uuid: ListableContentItem['uuid']
+    },
+    { userTriggered = false, scrollIntoView = true },
+  ): Promise<void> => {
+    const { didSelect } = await this.selectItem(item.uuid, userTriggered)
+
+    if (didSelect && scrollIntoView) {
+      const itemElement = document.getElementById(item.uuid)
+      itemElement?.scrollIntoView({
+        behavior: 'smooth',
+      })
+    }
+  }
+
+  selectNextItem = () => {
+    const displayableItems = this.itemListController.items
+
+    const currentIndex = displayableItems.findIndex((candidate) => {
+      return candidate.uuid === this.lastSelectedItem?.uuid
+    })
+
+    let nextIndex = currentIndex + 1
+
+    while (nextIndex < displayableItems.length) {
+      const nextItem = displayableItems[nextIndex]
+
+      nextIndex++
+
+      if (nextItem.protected) {
+        continue
+      }
+
+      this.selectItemWithScrollHandling(nextItem, { userTriggered: true }).catch(console.error)
+
+      const nextNoteElement = document.getElementById(nextItem.uuid)
+
+      nextNoteElement?.focus()
+
+      return
+    }
+  }
+
+  selectPreviousItem = () => {
+    const displayableItems = this.itemListController.items
+
+    if (!this.lastSelectedItem) {
+      return
+    }
+
+    const currentIndex = displayableItems.indexOf(this.lastSelectedItem)
+
+    let previousIndex = currentIndex - 1
+
+    while (previousIndex >= 0) {
+      const previousItem = displayableItems[previousIndex]
+
+      previousIndex--
+
+      if (previousItem.protected) {
+        continue
+      }
+
+      this.selectItemWithScrollHandling(previousItem, { userTriggered: true }).catch(console.error)
+
+      const previousNoteElement = document.getElementById(previousItem.uuid)
+
+      previousNoteElement?.focus()
+
+      return
+    }
+  }
 }

packages/web/src/javascripts/Services/AlertService.ts

@@ -1,4 +1,5 @@
-import { AlertService, ButtonType, sanitizeHtmlString } from '@standardnotes/snjs'
+import { AlertService, ButtonType } from '@standardnotes/services'
+import { sanitizeHtmlString } from '@standardnotes/utils'
 import { SKAlert } from '@standardnotes/styles'
 
 /** @returns a promise resolving to true if the user confirmed, false if they canceled */

packages/web/tailwind.config.js

@@ -38,6 +38,10 @@ module.exports = {
         89: '22.25rem',
         125: '31.25rem',
       },
+      minHeight: {
+        1: '0.25rem',
+        2: '0.5rem',
+      },
       maxHeight: {
         110: '27.5rem',
       },

packages/web/tsconfig.json

@@ -16,7 +16,7 @@
     "declarationDir": "dist/@types",
     "baseUrl": ".",
     "jsx": "react-jsx",
-    "typeRoots": ["./src/javascripts/Types/External", "../../node_modules/@types"],
+    "typeRoots": ["./src/javascripts/Types/External", "../../node_modules/@types", "node_modules/@types"],
     "paths": {
       "@/*": ["./src/javascripts/*"],
       "@Controllers/*": ["src/javascripts/Controllers/*"],

yarn.lock

@@ -7504,7 +7504,7 @@ __metadata:
     "@standardnotes/snjs": "workspace:*"
     "@standardnotes/styles": "workspace:*"
     "@standardnotes/toast": "workspace:*"
-    "@types/jest": ^27.4.1
+    "@types/jest": ^27.5.1
     "@types/react": ^17.0.42
     "@types/react-dom": ^18.0.5
     "@types/wicg-file-system-access": ^2020.9.5
@@ -7521,6 +7521,7 @@ __metadata:
     html-webpack-plugin: ^5.5.0
     identity-obj-proxy: ^3.0.0
     jest: ^27.5.1
+    jest-environment-jsdom: ^27.5.1
     lint-staged: ">=12"
     mini-css-extract-plugin: ^2.6.0
     mobx: ^6.5.0
@@ -8386,7 +8387,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jest@npm:^27.4.1":
+"@types/jest@npm:^27.4.1, @types/jest@npm:^27.5.1":
   version: 27.5.2
   resolution: "@types/jest@npm:27.5.2"
   dependencies: