mobile: check if file exists based on file size

* mobile: fix sorting notes in topics

* mobile: fix list is not updated

.github/actions/setup-node-with-cache/action.yml

@@ -19,7 +19,6 @@ runs:
           packages/crypto/package-lock.json
           packages/sodium/package-lock.json
           packages/clipper/package-lock.json
-          packages/crypto-worker/package-lock.json
           packages/editor-mobile/package-lock.json
           packages/editor/package-lock.json
           packages/logger/package-lock.json

.github/workflows/desktop.publish.yml

@@ -97,6 +97,7 @@ jobs:
       - name: Get App Store Version
         id: appstore
         uses: streetwriters/appstore-connect-app-version@develop
+        if: inputs.publish-apple
         with:
           app-id: ${{ steps.app_metadata.outputs.apple_app_id }}
           key-id: ${{ secrets.api_key_id }}

CONTRIBUTING.md

@@ -103,7 +103,7 @@ All commits must include valid scopes in the commit message. **Valid commit scop
 
 **Packages:**
 
-1. `crypto`: changes related to the cryptographic core (including `@notesnook/crypto-worker`)
+1. `crypto`: changes related to the cryptographic core
 2. `editor`: changes related to the editor (including `@notesnook/editor-mobile`)
 3. `logger`: changes related to the logger
 4. `theme`: changes related to the theme

README.md

@@ -46,7 +46,6 @@ Notesnook is built using the following technologies:
 | `@notesnook/editor-mobile` | [/packages/editor-mobile](/packages/editor-mobile) | A very thin wrapper around `@notesnook/editor` for mobile clients    |
 | `@notesnook/logger`        | [/packages/logger](/packages/logger)               | Simple & pluggable logger                                            |
 | `@notesnook/sodium`        | [/packages/sodium](/packages/sodium)               | Wrapper around libsodium to support Node.js & Browser                |
-| `@notesnook/crypto-worker` | [/packages/crypto-worker](/packages/crypto-worker) | Helpers to use `@notesnook/crypto` from a Worker                     |
 | `@notesnook/streamable-fs` | [/packages/streamable-fs](/packages/streamable-fs) | Streaming interface around an IndexedDB based file system            |
 | `@notesnook/theme`         | [/packages/theme](/packages/theme)                 | The core theme used in web & desktop clients                         |
 

apps/desktop/app-update.yml

@@ -0,0 +1,3 @@
+owner: streetwriters
+repo: notesnook
+provider: github

apps/desktop/package-lock.json

@@ -1,20 +1,20 @@
 {
   "name": "@notesnook/desktop",
-  "version": "2.6.1",
+  "version": "2.6.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/desktop",
-      "version": "2.6.1",
+      "version": "2.6.5",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@notesnook/crypto": "file:../../packages/crypto",
-        "@trpc/client": "10.31.0",
-        "@trpc/server": "10.31.0",
+        "@trpc/client": "10.38.3",
+        "@trpc/server": "10.38.3",
         "electron-trpc": "0.5.2",
-        "electron-updater": "6.1.1",
+        "electron-updater": "6.1.4",
         "icojs": "^0.17.1",
         "typed-emitter": "^2.1.0",
         "yargs": "^17.6.2",
@@ -24,8 +24,8 @@
         "@types/node": "18.16.1",
         "@types/yargs": "^17.0.24",
         "chokidar": "^3.5.3",
-        "electron": "^26.1.0",
-        "electron-builder": "^24.6.3",
+        "electron": "25.8.1",
+        "electron-builder": "^24.6.4",
         "electron-builder-notarize": "^1.5.1",
         "esbuild": "^0.17.19",
         "tree-kill": "^1.2.2",
@@ -270,13 +270,14 @@
       }
     },
     "node_modules/@electron/notarize": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-1.2.4.tgz",
-      "integrity": "sha512-W5GQhJEosFNafewnS28d3bpQ37/s91CDWqxVchHfmv2dQSTWpOzNlUVQwYzC1ay5bChRV/A9BTL68yj0Pa+TSg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.1.0.tgz",
+      "integrity": "sha512-Q02xem1D0sg4v437xHgmBLxI2iz/fc0D4K7fiVWHa/AnW8o7D751xyKNXgziA6HrTOme9ul1JfWN5ark8WH1xA==",
       "dev": true,
       "dependencies": {
         "debug": "^4.1.1",
-        "fs-extra": "^9.0.1"
+        "fs-extra": "^9.0.1",
+        "promise-retry": "^2.0.1"
       },
       "engines": {
         "node": ">= 10.0.0"
@@ -331,9 +332,9 @@
       }
     },
     "node_modules/@electron/universal": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.3.4.tgz",
-      "integrity": "sha512-BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.4.1.tgz",
+      "integrity": "sha512-lE/U3UNw1YHuowNbTmKNs9UlS3En3cPgwM5MI+agIgr/B1hSze9NdOP0qn7boZaI9Lph8IDv3/24g9IxnJP7aQ==",
       "dev": true,
       "dependencies": {
         "@electron/asar": "^3.2.1",
@@ -830,20 +831,20 @@
       }
     },
     "node_modules/@trpc/client": {
-      "version": "10.31.0",
-      "resolved": "https://registry.npmjs.org/@trpc/client/-/client-10.31.0.tgz",
-      "integrity": "sha512-VCqbJEvFJb8C4hQFw7AD+dkQTjgEdV/QAzO4D+/cX5e93u5NpfNXI+PKS0QFXwG/zqgwQwVV6OkYc/D/MFwA6g==",
+      "version": "10.38.3",
+      "resolved": "https://registry.npmjs.org/@trpc/client/-/client-10.38.3.tgz",
+      "integrity": "sha512-hHPsElTL4sB+UGzuAZ4iwRVHjELrk/Nsl2owsYw9ITJz3EY7VWRsQ6vK48kJvlHPYPhP+efID5UOgyZMs4bFXA==",
       "funding": [
         "https://trpc.io/sponsor"
       ],
       "peerDependencies": {
-        "@trpc/server": "10.31.0"
+        "@trpc/server": "10.38.3"
       }
     },
     "node_modules/@trpc/server": {
-      "version": "10.31.0",
-      "resolved": "https://registry.npmjs.org/@trpc/server/-/server-10.31.0.tgz",
-      "integrity": "sha512-9EnRTSDE9nF11LZsvSOqNKqkRYzHqFX4ch5AJ6VIu8uta2vxVTN4FxxsNRSOluTzVYZDeaCISbwmOJ5iihCCIg==",
+      "version": "10.38.3",
+      "resolved": "https://registry.npmjs.org/@trpc/server/-/server-10.38.3.tgz",
+      "integrity": "sha512-9s8/kwo2IDB5hwB2SKZZrfevRhdb1f9fdXtIYd3lbQuf2jQaC/LyQuHaIQjDQoUx9updBfsHXcFFPiCP1DL6pg==",
       "funding": [
         "https://trpc.io/sponsor"
       ]
@@ -1040,15 +1041,15 @@
       "dev": true
     },
     "node_modules/app-builder-lib": {
-      "version": "24.6.3",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.6.3.tgz",
-      "integrity": "sha512-++0Zp7vcCHfXMBGVj7luFxpqvMPk5mcWeTuw7OK0xNAaNtYQTTN0d9YfWRsb1MvviTOOhyHeULWz1CaixrdrDg==",
+      "version": "24.6.4",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.6.4.tgz",
+      "integrity": "sha512-m9931WXb83teb32N0rKg+ulbn6+Hl8NV5SUpVDOVz9MWOXfhV6AQtTdftf51zJJvCQnQugGtSqoLvgw6mdF/Rg==",
       "dev": true,
       "dependencies": {
         "@develar/schema-utils": "~2.6.5",
-        "@electron/notarize": "^1.2.3",
-        "@electron/osx-sign": "^1.0.4",
-        "@electron/universal": "1.3.4",
+        "@electron/notarize": "2.1.0",
+        "@electron/osx-sign": "1.0.5",
+        "@electron/universal": "1.4.1",
         "@malept/flatpak-bundler": "^0.4.0",
         "@types/fs-extra": "9.0.13",
         "7zip-bin": "~5.1.1",
@@ -1678,12 +1679,12 @@
       }
     },
     "node_modules/dmg-builder": {
-      "version": "24.6.3",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.6.3.tgz",
-      "integrity": "sha512-O7KNT7OKqtV54fMYUpdlyTOCP5DoPuRMLqMTgxxV2PO8Hj/so6zOl5o8GTs8pdDkeAhJzCFOUNB3BDhgXbUbJg==",
+      "version": "24.6.4",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.6.4.tgz",
+      "integrity": "sha512-BNcHRc9CWEuI9qt0E655bUBU/j/3wUCYBVKGu1kVpbN5lcUdEJJJeiO0NHK3dgKmra6LUUZlo+mWqc+OCbi0zw==",
       "dev": true,
       "dependencies": {
-        "app-builder-lib": "24.6.3",
+        "app-builder-lib": "24.6.4",
         "builder-util": "24.5.0",
         "builder-util-runtime": "9.2.1",
         "fs-extra": "^10.1.0",
@@ -1750,9 +1751,9 @@
       }
     },
     "node_modules/electron": {
-      "version": "26.1.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-26.1.0.tgz",
-      "integrity": "sha512-qEh19H09Pysn3ibms5nZ0haIh5pFoOd7/5Ww7gzmAwDQOulRi8Sa2naeueOyIb1GKpf+6L4ix3iceYRAuA5r5Q==",
+      "version": "25.8.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-25.8.1.tgz",
+      "integrity": "sha512-GtcP1nMrROZfFg0+mhyj1hamrHvukfF6of2B/pcWxmWkd5FVY1NJib0tlhiorFZRzQN5Z+APLPr7aMolt7i2AQ==",
       "hasInstallScript": true,
       "dependencies": {
         "@electron/get": "^2.0.0",
@@ -1767,16 +1768,16 @@
       }
     },
     "node_modules/electron-builder": {
-      "version": "24.6.3",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.6.3.tgz",
-      "integrity": "sha512-O6PqhRXwfxCNTXI4BlhELSeYYO6/tqlxRuy+4+xKBokQvwDDjDgZMMoSgAmanVSCuzjE7MZldI9XYrKFk+EQDw==",
+      "version": "24.6.4",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.6.4.tgz",
+      "integrity": "sha512-uNWQoU7pE7qOaIQ6CJHpBi44RJFVG8OHRBIadUxrsDJVwLLo8Nma3K/EEtx5/UyWAQYdcK4nVPYKoRqBb20hbA==",
       "dev": true,
       "dependencies": {
-        "app-builder-lib": "24.6.3",
+        "app-builder-lib": "24.6.4",
         "builder-util": "24.5.0",
         "builder-util-runtime": "9.2.1",
         "chalk": "^4.1.2",
-        "dmg-builder": "24.6.3",
+        "dmg-builder": "24.6.4",
         "fs-extra": "^10.1.0",
         "is-ci": "^3.0.0",
         "lazy-val": "^1.0.5",
@@ -1896,9 +1897,9 @@
       }
     },
     "node_modules/electron-updater": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.1.tgz",
-      "integrity": "sha512-IBT3zJ4yO5UZMF2gOTC9HrlmG4OYSRtOiHKzNAShJvfuicdx6UaXoa6AvhcTxdx6zf/rJyFMRBISS9jhVwTfow==",
+      "version": "6.1.4",
+      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.4.tgz",
+      "integrity": "sha512-yYAJc6RQjjV4WtInZVn+ZcLyXRhbVXoomKEfUUwDqIk5s2wxzLhWaor7lrNgxODyODhipjg4SVPMhJHi5EnsCA==",
       "dependencies": {
         "builder-util-runtime": "9.2.1",
         "fs-extra": "^10.1.0",
@@ -1907,7 +1908,7 @@
         "lodash.escaperegexp": "^4.1.2",
         "lodash.isequal": "^4.5.0",
         "semver": "^7.3.8",
-        "typed-emitter": "^2.1.0"
+        "tiny-typed-emitter": "^2.1.0"
       }
     },
     "node_modules/emoji-regex": {
@@ -1931,6 +1932,12 @@
         "node": ">=6"
       }
     },
+    "node_modules/err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
+      "dev": true
+    },
     "node_modules/error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -3102,6 +3109,19 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/promise-retry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+      "dev": true,
+      "dependencies": {
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/pump": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -3331,6 +3351,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -3674,9 +3703,9 @@
       }
     },
     "node_modules/tar": {
-      "version": "6.1.15",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz",
-      "integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz",
+      "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==",
       "dev": true,
       "dependencies": {
         "chownr": "^2.0.0",
@@ -3700,6 +3729,11 @@
         "fs-extra": "^10.0.0"
       }
     },
+    "node_modules/tiny-typed-emitter": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz",
+      "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA=="
+    },
     "node_modules/tmp": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",

apps/desktop/package.json

@@ -2,7 +2,7 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "2.6.1",
+  "version": "2.6.5",
   "appAppleId": "1544027013",
   "private": true,
   "main": "./dist/index.js",
@@ -12,10 +12,10 @@
   "license": "GPL-3.0-or-later",
   "dependencies": {
     "@notesnook/crypto": "file:../../packages/crypto",
-    "@trpc/client": "10.31.0",
-    "@trpc/server": "10.31.0",
+    "@trpc/client": "10.38.3",
+    "@trpc/server": "10.38.3",
     "electron-trpc": "0.5.2",
-    "electron-updater": "6.1.1",
+    "electron-updater": "6.1.4",
     "icojs": "^0.17.1",
     "typed-emitter": "^2.1.0",
     "yargs": "^17.6.2",
@@ -25,8 +25,8 @@
     "@types/node": "18.16.1",
     "@types/yargs": "^17.0.24",
     "chokidar": "^3.5.3",
-    "electron": "^26.1.0",
-    "electron-builder": "^24.6.3",
+    "electron": "25.8.1",
+    "electron-builder": "^24.6.4",
     "electron-builder-notarize": "^1.5.1",
     "esbuild": "^0.17.19",
     "tree-kill": "^1.2.2",
@@ -191,6 +191,7 @@
       "allowNativeWayland": true
     },
     "extraResources": [
+      "app-update.yml",
       "./assets/**"
     ],
     "extraMetadata": {

apps/desktop/patches/app-builder-lib+24.6.4.patch

@@ -1,8 +1,8 @@
 diff --git a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
-index 3ba5d6a..cf8e147 100644
+index fcb7f54..cb1c7f7 100644
 --- a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
 +++ b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
-@@ -105,6 +105,7 @@ class LinuxTargetHelper {
+@@ -116,6 +116,7 @@ class LinuxTargetHelper {
              StartupWMClass: appInfo.productName,
              ...extra,
              ...targetSpecificOptions.desktop,
@@ -10,7 +10,7 @@ index 3ba5d6a..cf8e147 100644
          };
          const description = this.getDescription(targetSpecificOptions);
          if (!(0, builder_util_1.isEmptyOrSpaces)(description)) {
-@@ -148,6 +149,23 @@ class LinuxTargetHelper {
+@@ -159,6 +160,23 @@ class LinuxTargetHelper {
              data += `\n${name}=${desktopMeta[name]}`;
          }
          data += "\n";

apps/desktop/src/api/os-integration.ts

@@ -117,6 +117,14 @@ export const osIntegrationRouter = t.router({
       writeFileSync(resolvedPath, data);
     }),
 
+  resolvePath: t.procedure
+    .input(z.object({ filePath: z.string() }))
+    .query(({ input }) => {
+      const { filePath } = input;
+      if (!filePath) return;
+      return resolvePath(filePath);
+    }),
+
   showNotification: t.procedure
     .input(NotificationOptions)
     .query(({ input }) => {

apps/desktop/src/cli.ts

@@ -27,19 +27,23 @@ export type CLIOptions = {
   hidden: boolean;
 };
 
-export async function parseArguments(): Promise<CLIOptions> {
+export async function parseArguments(argv: string[]): Promise<CLIOptions> {
   const result: CLIOptions = {
     note: false,
     notebook: false,
     reminder: false,
     hidden: false
   };
-  const { hidden } = await yargs(hideBin(process.argv))
+  const { hidden } = await yargs(hideBin(argv))
     .boolean("hidden")
+    // have to account for this flag added on Windows when launching
+    // via Jumplist
+    .boolean("allow-file-access-from-files")
     .command("new", "Create a new item", (yargs) => {
       return yargs
         .command("note", "Create a new note", {}, () => {
           result.note = true;
+          console.log("HERE!");
         })
         .command("notebook", "Create a new notebook", {}, () => {
           result.notebook = true;

apps/desktop/src/main.ts

@@ -34,6 +34,7 @@ import { router, api } from "./api";
 import { config } from "./utils/config";
 import path from "path";
 import { bringToFront } from "./utils/bring-to-front";
+import { bridge } from "./api/bridge";
 
 // only run a single instance
 if (!MAC_APP_STORE && !app.requestSingleInstanceLock()) {
@@ -53,10 +54,17 @@ if (process.platform === "win32") {
   app.setAppUserModelId(app.name);
 }
 
+process.on("uncaughtException", (error) => {
+  console.error("uncaughtException:", error);
+});
+process.on("unhandledRejection", (reason) => {
+  console.error("unhandledRejection:", reason);
+});
+
 app.commandLine.appendSwitch("lang", "en-US");
 
 async function createWindow() {
-  const cliOptions = await parseArguments();
+  const cliOptions = await parseArguments(process.argv);
   setTheme(getTheme());
 
   const mainWindowState = new WindowState({});
@@ -83,6 +91,7 @@ async function createWindow() {
     }
   });
 
+  createIPCHandler({ router, windows: [mainWindow] });
   globalThis.window = mainWindow;
   mainWindowState.manage(mainWindow);
 
@@ -98,7 +107,6 @@ async function createWindow() {
 
   await AssetManager.loadIcons();
   setupDesktopIntegration();
-  createIPCHandler({ router, windows: [mainWindow] });
 
   mainWindow.webContents.session.setSpellCheckerDictionaryDownloadURL(
     "http://dictionaries.notesnook.com/"
@@ -139,8 +147,12 @@ app.once("window-all-closed", () => {
   }
 });
 
-app.on("second-instance", () => {
+app.on("second-instance", async (_ev, argv) => {
   if (!globalThis.window) return;
+  const cliOptions = await parseArguments(argv);
+  if (cliOptions.note) bridge.onCreateItem("note");
+  if (cliOptions.notebook) bridge.onCreateItem("notebook");
+  if (cliOptions.reminder) bridge.onCreateItem("reminder");
   bringToFront();
 });
 

apps/desktop/src/preload.ts

@@ -31,7 +31,6 @@ declare global {
 }
 
 process.once("loaded", async () => {
-  console.log("HELLO!");
   const electronTRPC: RendererGlobalElectronTRPC = {
     sendMessage: (operation) =>
       ipcRenderer.send(ELECTRON_TRPC_CHANNEL, operation),

apps/desktop/src/utils/protocol.ts

@@ -62,14 +62,9 @@ function registerProtocol() {
         headers: { "Content-Type": extensionToMimeType[fileExtension] }
       });
     } else {
-      try {
-        return net.fetch(request, {
-          bypassCustomProtocolHandlers: true
-        });
-      } catch (e) {
-        console.error(e);
-      }
-      return Response.error();
+      return net.fetch(request, {
+        bypassCustomProtocolHandlers: true
+      });
     }
   });
   console.info(`${SCHEME} protocol inteception "successful"`);

apps/mobile/app/app.js

@@ -46,6 +46,7 @@ const App = () => {
     if (appLockMode && appLockMode !== "none") {
       useUserStore.getState().lockApp(true);
     }
+    globalThis["IS_MAIN_APP_RUNNING"] = true;
     init();
     setTimeout(async () => {
       SettingsService.onFirstLaunch();
@@ -93,6 +94,12 @@ const App = () => {
   );
 };
 
+let currTheme =
+  useThemeStore.getState().colorScheme === "dark"
+    ? SettingsService.getProperty("darkTheme")
+    : SettingsService.getProperty("lightTheme");
+useThemeEngineStore.getState().setTheme(currTheme);
+
 export const withTheme = (Element) => {
   return function AppWithThemeProvider() {
     const [colorScheme, darkTheme, lightTheme] = useThemeStore((state) => [
@@ -124,11 +131,13 @@ export const withTheme = (Element) => {
       // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
-    useEffect(() => {
+    const nextTheme = colorScheme === "dark" ? darkTheme : lightTheme;
+    if (JSON.stringify(nextTheme) !== JSON.stringify(currTheme)) {
       useThemeEngineStore
         .getState()
         .setTheme(colorScheme === "dark" ? darkTheme : lightTheme);
-    }, [colorScheme, darkTheme, lightTheme]);
+      currTheme = nextTheme;
+    }
 
     return <Element />;
   };

apps/mobile/app/common/database/index.js

@@ -17,18 +17,14 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 import { database } from "@notesnook/common";
-import { initalize, logger as dbLogger } from "@notesnook/core/dist/logger";
+import { logger as dbLogger } from "@notesnook/core/dist/logger";
 import { Platform } from "react-native";
-import { MMKVLoader } from "react-native-mmkv-storage";
-import filesystem from "../filesystem";
+import * as Gzip from "react-native-gzip";
 import EventSource from "../../utils/sse/even-source-ios";
 import AndroidEventSource from "../../utils/sse/event-source";
-import Storage, { KV } from "./storage";
-import * as Gzip from "react-native-gzip";
-
-const LoggerStorage = new MMKVLoader()
-  .withInstanceID("notesnook_logs")
-  .initialize();
+import filesystem from "../filesystem";
+import "./logger";
+import Storage from "./storage";
 
 database.host(
   __DEV__
@@ -63,7 +59,5 @@ database.setup(
   }
 );
 
-initalize(new KV(LoggerStorage));
-
 export const db = database;
 export const DatabaseLogger = dbLogger;

apps/mobile/app/common/database/logger.js

@@ -0,0 +1,29 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import { MMKVLoader } from "react-native-mmkv-storage";
+import { initalize } from "@notesnook/core/dist/logger";
+import { KV } from "./storage";
+
+const LoggerStorage = new MMKVLoader()
+  .withInstanceID("notesnook_logs")
+  .initialize();
+
+initalize(new KV(LoggerStorage));
+
+export {};

apps/mobile/app/common/database/mmkv.js

@@ -26,4 +26,5 @@ export const MMKV = new MMKVLoader()
       ? ProcessingModes.MULTI_PROCESS
       : ProcessingModes.SINGLE_PROCESS
   )
+  .disableIndexing()
   .initialize();

apps/mobile/app/common/filesystem/download-attachment.js

@@ -62,6 +62,7 @@ export async function downloadAttachments(
   canceled,
   groupId
 ) {
+  await createCacheDir();
   if (!attachments || !attachments.length) return;
   const result = new Map();
 
@@ -182,6 +183,7 @@ export default async function downloadAttachment(
     groupId: undefined
   }
 ) {
+  await createCacheDir();
   let attachment = db.attachments.attachment(hash);
   if (!attachment) {
     console.log("attachment not found");

apps/mobile/app/common/filesystem/download.js

@@ -24,15 +24,18 @@ import { ToastEvent } from "../../services/event-manager";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
 import { db } from "../database";
 import { cacheDir, fileCheck } from "./utils";
+import { createCacheDir, exists } from "./io";
 
 export async function downloadFile(filename, data, cancelToken) {
   if (!data) return false;
-  let { url, headers } = data;
 
+  await createCacheDir();
+
+  let { url, headers } = data;
   let path = `${cacheDir}/${filename}`;
+
   try {
-    let exists = await RNFetchBlob.fs.exists(path);
-    if (exists) {
+    if (await exists(filename)) {
       return true;
     }
 
@@ -60,29 +63,34 @@ export async function downloadFile(filename, data, cancelToken) {
         console.log("downloading: ", recieved, total);
       });
 
-    cancelToken.cancel = request.cancel;
+    cancelToken.cancel = () => {
+      useAttachmentStore.getState().remove(filename);
+      request.cancel();
+    };
     let response = await request;
     await fileCheck(response, totalSize);
     let status = response.info().status;
     useAttachmentStore.getState().remove(filename);
     return status >= 200 && status < 300;
   } catch (e) {
-    ToastEvent.show({
-      heading: "Error downloading file",
-      message: e.message,
-      type: "error",
-      context: "global"
-    });
-    ToastEvent.show({
-      heading: "Error downloading file",
-      message: e.message,
-      type: "error",
-      context: "local"
-    });
+    if (e.message !== "canceled") {
+      ToastEvent.show({
+        heading: "Error downloading file",
+        message: e.message,
+        type: "error",
+        context: "global"
+      });
+      ToastEvent.show({
+        heading: "Error downloading file",
+        message: e.message,
+        type: "error",
+        context: "local"
+      });
+    }
 
     useAttachmentStore.getState().remove(filename);
     RNFetchBlob.fs.unlink(path).catch(console.log);
-    console.log("download file error: ", e, url, headers);
+    console.log("Download file error:", e, url, headers);
     return false;
   }
 }

apps/mobile/app/common/filesystem/io.js

@@ -20,32 +20,29 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { Platform } from "react-native";
 import Sodium from "@ammarahmed/react-native-sodium";
 import RNFetchBlob from "react-native-blob-util";
-import { cacheDir, getRandomId } from "./utils";
+import { cacheDir, cacheDirOld, getRandomId } from "./utils";
 import { db } from "../database";
 import { compressToBase64 } from "./compress";
 import { IOS_APPGROUPID } from "../../utils/constants";
 
 export async function readEncrypted(filename, key, cipherData) {
+  await migrateFilesFromCache();
+  console.log("read encrypted file...");
   let path = `${cacheDir}/${filename}`;
+
   try {
-    const iosAppGroup =
-      Platform.OS === "ios"
-        ? await RNFetchBlob.fs.pathForAppGroup(IOS_APPGROUPID)
-        : null;
-
-    const appGroupPath = `${iosAppGroup}/${filename}`;
-    let exists =
-      (await RNFetchBlob.fs.exists(path)) ||
-      (Platform.OS === "ios" && (await RNFetchBlob.fs.exists(appGroupPath)));
-
-    if (!exists) {
+    if (!(await exists(filename))) {
       return false;
+    } else {
+      RNFetchBlob.fs.stat(path).then((r) => {
+        console.log(r);
+      });
     }
 
     const attachment = db.attachments.attachment(filename);
     const isPng = /(png)/g.test(attachment?.metadata.type);
     const isJpeg = /(jpeg|jpg)/g.test(attachment?.metadata.type);
-
+    console.log("decrypting....");
     let output = await Sodium.decryptFile(
       key,
       {
@@ -59,6 +56,7 @@ export async function readEncrypted(filename, key, cipherData) {
           : "base64"
         : "text"
     );
+    console.log("file decrypted...");
     if (cipherData.outputType === "base64" && (isPng || isJpeg)) {
       const dCachePath = `${cacheDir}/${output}`;
       output = await compressToBase64(
@@ -70,7 +68,7 @@ export async function readEncrypted(filename, key, cipherData) {
     return output;
   } catch (e) {
     RNFetchBlob.fs.unlink(path).catch(console.log);
-    console.log(e);
+    console.log("readEncrypted", e);
     return false;
   }
 }
@@ -88,6 +86,7 @@ export async function hashBase64(data) {
 }
 
 export async function writeEncryptedBase64({ data, key }) {
+  await createCacheDir();
   let filepath = cacheDir + `/${getRandomId("imagecache_")}`;
   await RNFetchBlob.fs.writeFile(filepath, data, "base64");
   let output = await Sodium.encryptFile(key, {
@@ -103,6 +102,7 @@ export async function writeEncryptedBase64({ data, key }) {
 }
 
 export async function deleteFile(filename, data) {
+  await createCacheDir();
   let delFilePath = cacheDir + `/${filename}`;
   if (!data) {
     if (!filename) return;
@@ -128,19 +128,86 @@ export async function deleteFile(filename, data) {
 export async function clearFileStorage() {
   try {
     let files = await RNFetchBlob.fs.ls(cacheDir);
+    let oldCache = await RNFetchBlob.fs.ls(cacheDirOld);
+
     for (let file of files) {
-      try {
-        await RNFetchBlob.fs.unlink(cacheDir + `/${file}`);
-      } catch (e) {
-        console.log(e);
-      }
+      await RNFetchBlob.fs.unlink(cacheDir + `/${file}`).catch(console.log);
+    }
+    for (let file of oldCache) {
+      await RNFetchBlob.fs.unlink(cacheDirOld + `/${file}`).catch(console.log);
     }
   } catch (e) {
-    console.log(e);
+    console.log("clearFileStorage", e);
   }
 }
 
+export async function createCacheDir() {
+  if (!(await RNFetchBlob.fs.exists(cacheDir))) {
+    await RNFetchBlob.fs.mkdir(cacheDir);
+    console.log("Cache directory created");
+  }
+}
+
+export async function migrateFilesFromCache() {
+  try {
+    await createCacheDir();
+    const migratedFilesPath = cacheDir + "/.migrated_1";
+    const migrated = await RNFetchBlob.fs.exists(migratedFilesPath);
+    if (migrated) return;
+
+    let files = await RNFetchBlob.fs.ls(cacheDir);
+    console.log("Files to migrate:", files.join(","));
+
+    let oldCache = await RNFetchBlob.fs.ls(cacheDirOld);
+    for (let file of oldCache) {
+      if (file.startsWith("org.") || file.startsWith("com.")) continue;
+      RNFetchBlob.fs
+        .mv(cacheDirOld + `/${file}`, cacheDir + `/${file}`)
+        .catch(console.log);
+      console.log("Moved", file);
+    }
+    await RNFetchBlob.fs.createFile(migratedFilesPath, "1", "utf8");
+  } catch (e) {
+    console.log("migrateFilesFromCache", e);
+  }
+}
+
+const ABYTES = 17;
 export async function exists(filename) {
-  let exists = await RNFetchBlob.fs.exists(`${cacheDir}/${filename}`);
+  let path = `${cacheDir}/${filename}`;
+
+  const iosAppGroup =
+    Platform.OS === "ios"
+      ? await RNFetchBlob.fs.pathForAppGroup(IOS_APPGROUPID)
+      : null;
+  const appGroupPath = `${iosAppGroup}/${filename}`;
+
+  let exists = await RNFetchBlob.fs.exists(path);
+
+  // Check if file is present in app group path.
+  let existsInAppGroup = false;
+  if (!exists && Platform.OS === "ios") {
+    existsInAppGroup = await RNFetchBlob.fs.exists(appGroupPath);
+  }
+
+  if (exists || existsInAppGroup) {
+    const attachment = db.attachments.attachment(filename);
+    const totalChunks = Math.ceil(attachment.length / attachment.chunkSize);
+    const totalAbytes = totalChunks * ABYTES;
+    const expectedFileSize = attachment.length + totalAbytes;
+
+    const stat = await RNFetchBlob.fs.stat(
+      existsInAppGroup ? appGroupPath : path
+    );
+
+    if (stat.size !== expectedFileSize) {
+      RNFetchBlob.fs
+        .unlink(existsInAppGroup ? appGroupPath : path)
+        .catch(console.log);
+      return false;
+    }
+
+    exists = true;
+  }
   return exists;
 }

apps/mobile/app/common/filesystem/upload.js

@@ -24,11 +24,12 @@ import { cacheDir } from "./utils";
 import { isImage, isDocument } from "@notesnook/core/dist/utils/filename";
 import { Platform } from "react-native";
 import { IOS_APPGROUPID } from "../../utils/constants";
+import { createCacheDir } from "./io";
 
 export async function uploadFile(filename, data, cancelToken) {
   if (!data) return false;
   let { url, headers } = data;
-
+  await createCacheDir();
   DatabaseLogger.info(`Preparing to upload file: ${filename}`);
 
   try {
@@ -72,7 +73,10 @@ export async function uploadFile(filename, data, cancelToken) {
         );
       });
 
-    cancelToken.cancel = request.cancel;
+    cancelToken.cancel = () => {
+      useAttachmentStore.getState().remove(filename);
+      request.cancel();
+    };
     let response = await request;
 
     let status = response.info().status;

apps/mobile/app/common/filesystem/utils.js

@@ -21,7 +21,12 @@ import * as ScopedStorage from "react-native-scoped-storage";
 import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
 
-export const cacheDir = RNFetchBlob.fs.dirs.CacheDir;
+export const cacheDirOld = RNFetchBlob.fs.dirs.CacheDir;
+
+export const cacheDir =
+  Platform.OS == "ios"
+    ? RNFetchBlob.fs.dirs.LibraryDir + "/.cache"
+    : RNFetchBlob.fs.dirs.DocumentDir + "/.cache";
 
 export function getRandomId(prefix) {
   return Math.random()
@@ -66,9 +71,12 @@ export function cancelable(operation) {
 }
 
 export function copyFileAsync(source, dest) {
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
     ScopedStorage.copyFile(source, dest, (e, r) => {
-      console.log(e, r);
+      if (e) {
+        reject(e);
+        return;
+      }
       resolve();
     });
   });

apps/mobile/app/components/announcements/cta.js

@@ -128,7 +128,9 @@ export const Cta = ({ actions, style = {}, color, inline }) => {
                 fontSize={SIZE.md}
                 buttonType={{
                   color: color ? color : colors.primary.accent,
-                  text: colors.static.white,
+                  text: color
+                    ? colors.static.white
+                    : colors.primary.accentForeground,
                   selected: color ? color : colors.primary.accent,
                   opacity: 1
                 }}

apps/mobile/app/components/attachments/attachment-item.js

@@ -132,7 +132,7 @@ export const AttachmentItem = ({
           activeOpacity={0.9}
           onPress={() => {
             if (encryption || !pressable) return;
-            db.fs.cancel(attachment.metadata.hash);
+            db.fs.cancel(attachment.metadata.hash, currentProgress.type);
             setCurrentProgress(null);
           }}
           style={{

apps/mobile/app/components/auth/two-factor.js

@@ -214,6 +214,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
                 code.current = value;
                 //onNext();
               }}
+              caretHidden
               inputStyle={{
                 fontSize: SIZE.lg,
                 height: 60,

apps/mobile/app/components/container/floating-button.tsx

@@ -140,7 +140,7 @@ const FloatingButton = ({
         >
           <Icon
             name={title === "Clear all trash" ? "delete" : "plus"}
-            color="white"
+            color={colors.primary.accentForeground}
             size={SIZE.xxl}
           />
         </View>

apps/mobile/app/components/header/title.tsx

@@ -114,7 +114,15 @@ export const Title = () => {
               #
             </Heading>
           ) : null}
-          {title} <Tag visible={currentScreen.beta} text="BETA" />
+          {title}{" "}
+          <Tag
+            visible={currentScreen.beta}
+            text="BETA"
+            style={{
+              backgroundColor: "transparent"
+            }}
+            textColor={colors.primary.accent}
+          />
         </Heading>
       ) : null}
     </>

apps/mobile/app/components/list-items/headers/section-header.js

@@ -17,35 +17,25 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import React, { useEffect, useRef, useState } from "react";
-import { TouchableOpacity, useWindowDimensions, View } from "react-native";
 import { useThemeColors } from "@notesnook/theme";
-import { useSettingStore } from "../../../stores/use-setting-store";
-import {
-  eSendEvent,
-  eSubscribeEvent,
-  eUnSubscribeEvent,
-  presentSheet
-} from "../../../services/event-manager";
+import React, { useRef } from "react";
+import { TouchableOpacity, View, useWindowDimensions } from "react-native";
+import { eSendEvent, presentSheet } from "../../../services/event-manager";
 import SettingsService from "../../../services/settings";
-import { GROUP } from "../../../utils/constants";
+import { useSettingStore } from "../../../stores/use-setting-store";
 import { ColorValues } from "../../../utils/colors";
-import { db } from "../../../common/database";
+import { GROUP } from "../../../utils/constants";
 import { eOpenJumpToDialog } from "../../../utils/events";
 import { SIZE } from "../../../utils/size";
-import { IconButton } from "../../ui/icon-button";
-import { Button } from "../../ui/button";
 import Sort from "../../sheets/sort";
+import { Button } from "../../ui/button";
+import { IconButton } from "../../ui/icon-button";
 import Heading from "../../ui/typography/heading";
-import { useCallback } from "react";
 
 export const SectionHeader = React.memo(
-  function SectionHeader({ item, index, type, color, screen }) {
+  function SectionHeader({ item, index, type, color, screen, groupOptions }) {
     const { colors } = useThemeColors();
     const { fontScale } = useWindowDimensions();
-    const [groupOptions, setGroupOptions] = useState(
-      db.settings?.getGroupOptions(type)
-    );
     let groupBy = Object.keys(GROUP).find(
       (key) => GROUP[key] === groupOptions.groupBy
     );
@@ -65,17 +55,6 @@ export const SectionHeader = React.memo(
       ? "Default"
       : groupBy.slice(0, 1).toUpperCase() + groupBy.slice(1, groupBy.length);
 
-    const onUpdate = useCallback(() => {
-      setGroupOptions({ ...db.settings?.getGroupOptions(type) });
-    }, [type]);
-
-    useEffect(() => {
-      eSubscribeEvent("groupOptionsUpdate", onUpdate);
-      return () => {
-        eUnSubscribeEvent("groupOptionsUpdate", onUpdate);
-      };
-    }, [onUpdate]);
-
     return (
       <View
         style={{

apps/mobile/app/components/list-items/note/index.js

@@ -40,6 +40,7 @@ import { TimeSince } from "../../ui/time-since";
 import Heading from "../../ui/typography/heading";
 import Paragraph from "../../ui/typography/paragraph";
 import { useIsCompactModeEnabled } from "../../../hooks/use-is-compact-mode-enabled";
+import { useEditorStore } from "../../../stores/use-editor-store";
 
 function navigateToTag(item) {
   const tag = db.tags.tag(item.id);
@@ -98,6 +99,9 @@ const NoteItem = ({
   dateBy = "dateCreated",
   noOpen = false
 }) => {
+  const currentEditingNote = useEditorStore(
+    (state) => state.currentEditingNote
+  );
   const { colors } = useThemeColors();
   const compactMode = useIsCompactModeEnabled(item);
   const attachmentCount = db.attachments?.ofNote(item.id, "all")?.length || 0;
@@ -108,6 +112,9 @@ const NoteItem = ({
   const reminder = getUpcomingReminder(reminders);
   const noteColor = ColorValues[item.color?.toLowerCase()];
   const tags = getTags(item);
+  const primaryColors =
+    currentEditingNote === item.id ? colors.selected : colors.primary;
+
   return (
     <>
       <View
@@ -148,7 +155,7 @@ const NoteItem = ({
                   borderRadius: 5,
                   marginRight: 5,
                   borderWidth: 0.5,
-                  borderColor: colors.primary.border,
+                  borderColor: primaryColors.border,
                   paddingHorizontal: 6,
                   marginBottom: 5
                 }}
@@ -179,7 +186,7 @@ const NoteItem = ({
           <Paragraph
             numberOfLines={1}
             color={
-              ColorValues[item.color?.toLowerCase()] || colors.primary.heading
+              ColorValues[item.color?.toLowerCase()] || primaryColors.heading
             }
             style={{
               flexWrap: "wrap"
@@ -192,7 +199,7 @@ const NoteItem = ({
           <Heading
             numberOfLines={1}
             color={
-              ColorValues[item.color?.toLowerCase()] || colors.primary.heading
+              ColorValues[item.color?.toLowerCase()] || primaryColors.heading
             }
             style={{
               flexWrap: "wrap"
@@ -208,6 +215,7 @@ const NoteItem = ({
             style={{
               flexWrap: "wrap"
             }}
+            color={primaryColors.paragraph}
             numberOfLines={2}
           >
             {decode(item.headline, {
@@ -262,7 +270,7 @@ const NoteItem = ({
                     <Icon
                       name="attachment"
                       size={SIZE.md}
-                      color={colors.primary.icon}
+                      color={primaryColors.icon}
                     />
                     <Paragraph
                       color={colors.secondary.paragraph}
@@ -283,7 +291,7 @@ const NoteItem = ({
                     }}
                     color={
                       ColorValues[item.color?.toLowerCase()] ||
-                      colors.primary.accent
+                      primaryColors.accent
                     }
                   />
                 ) : null}
@@ -296,7 +304,7 @@ const NoteItem = ({
                     style={{
                       marginRight: 6
                     }}
-                    color={colors.primary.icon}
+                    color={primaryColors.icon}
                   />
                 ) : null}
 
@@ -354,7 +362,7 @@ const NoteItem = ({
                 </Paragraph>
 
                 <Paragraph
-                  color={colors.primary.accent}
+                  color={primaryColors.accent}
                   size={SIZE.xs}
                   style={{
                     marginRight: 6
@@ -424,7 +432,7 @@ const NoteItem = ({
 
         <IconButton
           testID={notesnook.listitem.menu}
-          color={colors.primary.paragraph}
+          color={primaryColors.paragraph}
           name="dots-horizontal"
           size={SIZE.xl}
           onPress={() => !noOpen && showActionSheet(item, isTrash)}

apps/mobile/app/components/list/card.js

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import React from "react";
-import { View } from "react-native";
+import { Dimensions, View } from "react-native";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { useMessageStore } from "../../stores/use-message-store";
 import { useThemeColors } from "@notesnook/theme";
@@ -32,6 +32,7 @@ export const Card = ({ color, warning }) => {
   color = color ? color : colors.primary.accent;
   const messageBoardState = useMessageStore((state) => state.message);
   const announcement = useMessageStore((state) => state.announcement);
+  const fontScale = Dimensions.get("window").fontScale;
 
   return !messageBoardState.visible || announcement || warning ? null : (
     <View
@@ -44,7 +45,6 @@ export const Card = ({ color, warning }) => {
         type="gray"
         customStyle={{
           paddingVertical: 12,
-          width: "95%",
           flexDirection: "row",
           alignItems: "center",
           justifyContent: "space-between",
@@ -54,17 +54,18 @@ export const Card = ({ color, warning }) => {
         <View
           style={{
             flexDirection: "row",
-            alignItems: "center"
+            alignItems: "center",
+            flexShrink: 1
           }}
         >
           <View
             style={{
-              width: 40,
+              width: 40 * fontScale,
               backgroundColor:
                 messageBoardState.type === "error"
                   ? hexToRGBA(colors.static.red, 0.15)
                   : hexToRGBA(color, 0.15),
-              height: 40,
+              height: 40 * fontScale,
               borderRadius: 100,
               alignItems: "center",
               justifyContent: "center"
@@ -75,6 +76,7 @@ export const Card = ({ color, warning }) => {
               color={
                 messageBoardState.type === "error" ? colors.error.icon : color
               }
+              allowFontScaling
               name={messageBoardState.icon}
             />
           </View>
@@ -91,7 +93,7 @@ export const Card = ({ color, warning }) => {
             </Paragraph>
             <Paragraph
               style={{
-                flexWrap: "wrap",
+                flexWrap: "no-wrap",
                 flexShrink: 1
               }}
               color={colors.primary.heading}
@@ -101,22 +103,24 @@ export const Card = ({ color, warning }) => {
           </View>
         </View>
 
-        <View
-          style={{
-            width: 40,
-            height: 40,
-            justifyContent: "center",
-            alignItems: "center"
-          }}
-        >
-          <Icon
-            name="chevron-right"
-            color={
-              messageBoardState.type === "error" ? colors.error.icon : color
-            }
-            size={SIZE.lg}
-          />
-        </View>
+        {fontScale > 1 ? null : (
+          <View
+            style={{
+              width: 40,
+              height: 40,
+              justifyContent: "center",
+              alignItems: "center"
+            }}
+          >
+            <Icon
+              name="chevron-right"
+              color={
+                messageBoardState.type === "error" ? colors.error.icon : color
+              }
+              size={SIZE.lg}
+            />
+          </View>
+        )}
       </PressableButton>
     </View>
   );

apps/mobile/app/components/list/index.js

@@ -39,6 +39,7 @@ import { Empty } from "./empty";
 import { getTotalNotes } from "@notesnook/common";
 import { useSettingStore } from "../../stores/use-setting-store";
 import ReminderItem from "../list-items/reminder";
+import { useGroupOptions } from "../../hooks/use-group-options";
 
 const renderItems = {
   note: NoteWrapper,
@@ -53,15 +54,10 @@ const renderItems = {
 const RenderItem = ({ item, index, type, ...restArgs }) => {
   if (!item) return <View />;
   const Item = renderItems[item.itemType || item.type] || View;
-  const groupOptions = db.settings?.getGroupOptions(type);
-  const dateBy =
-    groupOptions.sortBy !== "title" ? groupOptions.sortBy : "dateEdited";
   const totalNotes = getTotalNotes(item);
-
   return (
     <Item
       item={item}
-      dateBy={dateBy}
       index={index}
       type={type}
       totalNotes={totalNotes}
@@ -103,6 +99,13 @@ const List = ({
     (type === "notes" && notesListMode === "compact") ||
     type === "notebooks" ||
     notebooksListMode === "compact";
+  const groupType =
+    screen === "Home" ? "home" : screen === "Favorites" ? "favorites" : type;
+
+  const groupOptions = useGroupOptions(groupType);
+
+  const dateBy =
+    groupOptions.sortBy !== "title" ? groupOptions.sortBy : "dateEdited";
 
   const renderItem = React.useCallback(
     ({ item, index }) => (
@@ -111,18 +114,22 @@ const List = ({
         index={index}
         color={headerProps?.color}
         title={headerProps?.heading}
-        type={
-          screen === "Notes"
-            ? "home"
-            : screen === "Favorites"
-            ? "favorites"
-            : type
-        }
+        dateBy={dateBy}
+        type={groupType}
         screen={screen}
         isSheet={isSheet}
+        groupOptions={groupOptions}
       />
     ),
-    [headerProps?.color, headerProps?.heading, screen, type, isSheet]
+    [
+      headerProps?.color,
+      headerProps?.heading,
+      screen,
+      isSheet,
+      dateBy,
+      groupType,
+      groupOptions
+    ]
   );
 
   const _onRefresh = async () => {
@@ -228,7 +235,7 @@ const List = ({
         <JumpToSectionDialog
           screen={screen}
           data={listData}
-          type={screen === "Notes" ? "home" : type}
+          type={screen === "Home" ? "home" : type}
           scrollRef={scrollRef}
         />
       ) : null}

apps/mobile/app/components/properties/index.js

@@ -16,8 +16,8 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-import React from "react";
-import { Platform, View } from "react-native";
+import React, { useRef } from "react";
+import { Dimensions, Platform, View, useWindowDimensions } from "react-native";
 import { FlatList } from "react-native-actions-sheet";
 import { db } from "../../common/database";
 import { DDS } from "../../services/device-detection";
@@ -54,7 +54,6 @@ export const Properties = ({ close = () => {}, item, buttons = [] }) => {
   const { colors } = useThemeColors();
   const alias = item.alias || item.title;
   const isColor = !!ColorValues[item.title];
-
   if (!item || !item.id) {
     return (
       <Paragraph style={{ marginVertical: 10, alignSelf: "center" }}>
@@ -62,6 +61,7 @@ export const Properties = ({ close = () => {}, item, buttons = [] }) => {
       </Paragraph>
     );
   }
+
   return (
     <FlatList
       keyboardShouldPersistTaps="always"
@@ -135,6 +135,7 @@ export const Properties = ({ close = () => {}, item, buttons = [] }) => {
               }, 1000);
             }}
           />
+
           <Synced item={item} close={close} />
 
           {DDS.isTab ? (

apps/mobile/app/components/properties/items.js

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import React from "react";
-import { FlatList, ScrollView, View } from "react-native";
+import { Dimensions, FlatList, ScrollView, View } from "react-native";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { useActions } from "../../hooks/use-actions";
 import { DDS } from "../../services/device-detection";
@@ -33,9 +33,11 @@ export const Items = ({ item, buttons, close }) => {
   const dimensions = useSettingStore((state) => state.dimensions);
   const actions = useActions({ item, close });
   const data = actions.filter((i) => buttons.indexOf(i.id) > -1 && !i.hidden);
-
   let width = dimensions.width > 600 ? 600 : dimensions.width;
-  let columnItemsCount = DDS.isLargeTablet() ? 7 : 5;
+  const shouldShrink =
+    Dimensions.get("window").fontScale > 1 &&
+    Dimensions.get("window").width < 450;
+  let columnItemsCount = DDS.isLargeTablet() ? 7 : shouldShrink ? 4 : 5;
   let columnItemWidth = DDS.isTab
     ? (width - 12) / columnItemsCount
     : (width - 12) / columnItemsCount;
@@ -66,6 +68,7 @@ export const Items = ({ item, buttons, close }) => {
         }}
       >
         <Icon
+          allowFontScaling
           name={item.icon}
           size={DDS.isTab ? SIZE.xxl : SIZE.lg}
           color={
@@ -78,7 +81,11 @@ export const Items = ({ item, buttons, close }) => {
         />
       </PressableButton>
 
-      <Paragraph size={SIZE.xs} style={{ textAlign: "center" }}>
+      <Paragraph
+        size={SIZE.xs}
+        textBreakStrategy="simple"
+        style={{ textAlign: "center" }}
+      >
         {item.title}
       </Paragraph>
     </View>
@@ -139,6 +146,7 @@ export const Items = ({ item, buttons, close }) => {
         >
           <Icon
             name={item.icon}
+            allowFontScaling
             size={DDS.isTab ? SIZE.xxl : SIZE.md + 4}
             color={
               item.on
@@ -150,7 +158,11 @@ export const Items = ({ item, buttons, close }) => {
           />
         </PressableButton>
 
-        <Paragraph size={SIZE.xxs + 1} style={{ textAlign: "center" }}>
+        <Paragraph
+          textBreakStrategy="simple"
+          size={SIZE.xxs + 1}
+          style={{ textAlign: "center" }}
+        >
           {item.title}
         </Paragraph>
       </PressableButton>
@@ -163,9 +175,12 @@ export const Items = ({ item, buttons, close }) => {
     "copy",
     "share",
     "export",
-    "lock-unlock",
-    "publish"
+    "lock-unlock"
   ];
+  if (!shouldShrink) {
+    topBarItemsList.push("publish");
+  }
+
   const topBarItems = data.filter(
     (item) => topBarItemsList.indexOf(item.id) > -1
   );

apps/mobile/app/components/properties/synced.js

@@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import React from "react";
-import { View } from "react-native";
-import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { useThemeColors } from "@notesnook/theme";
+import React from "react";
+import { View, useWindowDimensions } from "react-native";
+import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { useUserStore } from "../../stores/use-user-store";
 import { openLinkInBrowser } from "../../utils/functions";
 import { SIZE } from "../../utils/size";
@@ -33,6 +33,8 @@ export const Synced = ({ item, close }) => {
   const user = useUserStore((state) => state.user);
   const lastSynced = useUserStore((state) => state.lastSynced);
 
+  const dimensions = useWindowDimensions();
+  const shouldShrink = dimensions.fontScale > 1 && dimensions.width < 450;
   return user && lastSynced >= item.dateModified ? (
     <View
       style={{
@@ -49,7 +51,11 @@ export const Synced = ({ item, close }) => {
         borderTopColor: colors.secondary.background
       }}
     >
-      <Icon name="shield-key-outline" color={colors.primary.accent} size={SIZE.xxxl} />
+      <Icon
+        name="shield-key-outline"
+        color={colors.primary.accent}
+        size={SIZE.xxxl}
+      />
 
       <View
         style={{
@@ -67,15 +73,17 @@ export const Synced = ({ item, close }) => {
         >
           Encrypted and synced
         </Heading>
-        <Paragraph
-          style={{
-            flexWrap: "wrap"
-          }}
-          size={SIZE.xs}
-          color={colors.primary.paragraph}
-        >
-          No one can view this {item.itemType || item.type} except you.
-        </Paragraph>
+        {shouldShrink ? null : (
+          <Paragraph
+            style={{
+              flexWrap: "wrap"
+            }}
+            size={SIZE.xs}
+            color={colors.primary.paragraph}
+          >
+            No one can view this {item.itemType || item.type} except you.
+          </Paragraph>
+        )}
       </View>
 
       <Button
@@ -92,7 +100,6 @@ export const Synced = ({ item, close }) => {
           }
         }}
         fontSize={SIZE.xs}
-        title="Learn more"
         height={30}
         type="grayAccent"
       />

apps/mobile/app/components/selection-header/index.js

@@ -207,7 +207,6 @@ export const SelectionHeader = React.memo(() => {
 
         {screen === "Trash" ||
         screen === "Notebooks" ||
-        screen === "Notebook" ||
         screen === "Reminders" ? null : (
           <>
             <IconButton
@@ -224,6 +223,21 @@ export const SelectionHeader = React.memo(() => {
               name="pound"
               size={SIZE.xl}
             />
+
+            <IconButton
+              onPress={async () => {
+                ExportNotesSheet.present(selectedItemsList);
+              }}
+              tooltipText="Export"
+              tooltipPosition={4}
+              customStyle={{
+                marginLeft: 10
+              }}
+              color={colors.primary.paragraph}
+              name="export"
+              size={SIZE.xl}
+            />
+
             <IconButton
               onPress={async () => {
                 //setSelectionMode(false);
@@ -239,20 +253,6 @@ export const SelectionHeader = React.memo(() => {
               name="plus"
               size={SIZE.xl}
             />
-
-            <IconButton
-              onPress={async () => {
-                ExportNotesSheet.present(selectedItemsList);
-              }}
-              tooltipText="Export"
-              tooltipPosition={4}
-              customStyle={{
-                marginLeft: 10
-              }}
-              color={colors.primary.paragraph}
-              name="export"
-              size={SIZE.xl}
-            />
           </>
         )}
 
@@ -317,23 +317,8 @@ export const SelectionHeader = React.memo(() => {
             customStyle={{
               marginLeft: 10
             }}
-            onPress={async () => {
-              presentDialog({
-                title: `Delete ${
-                  selectedItemsList.length > 1 ? "items" : "item"
-                }`,
-                paragraph: `Are you sure you want to delete ${
-                  selectedItemsList.length > 1 ? "these items?" : "this item?"
-                }`,
-                positiveText: "Delete",
-                negativeText: "Cancel",
-                positivePress: () => {
-                  deleteItems();
-                },
-                positiveType: "errorShade"
-              });
-
-              return;
+            onPress={() => {
+              deleteItems();
             }}
             tooltipText="Move to trash"
             tooltipPosition={1}

apps/mobile/app/components/sheet-provider/index.js

@@ -198,7 +198,6 @@ const SheetProvider = ({ context = "global" }) => {
             key={data.actionText}
             title={data.actionText}
             accentColor={data.iconColor}
-            accentText="light"
             type="accent"
             height={40}
             width={250}

apps/mobile/app/components/sheets/github/issue.js

@@ -35,10 +35,14 @@ import { presentDialog } from "../../dialog/functions";
 import { Button } from "../../ui/button";
 import Seperator from "../../ui/seperator";
 import Paragraph from "../../ui/typography/paragraph";
+import { useStoredRef } from "../../../hooks/use-stored-ref";
+
 export const Issue = ({ defaultTitle, defaultBody, issueTitle }) => {
   const { colors } = useThemeColors();
-  const body = useRef(defaultBody);
-  const title = useRef(defaultTitle);
+
+  const body = useStoredRef("issueBody", defaultBody);
+  const title = useStoredRef("issueTitle", defaultTitle);
+
   const user = useUserStore((state) => state.user);
   const [loading, setLoading] = useState(false);
   const bodyRef = useRef();
@@ -70,6 +74,8 @@ Logged in: ${user ? "yes" : "no"}`,
       });
       setLoading(false);
       eSendEvent(eCloseSheet);
+      body.reset();
+      title.reset();
       await sleep(300);
       presentDialog({
         title: "Issue reported",

apps/mobile/app/components/sheets/progress/index.tsx

@@ -64,7 +64,7 @@ export const Progress = () => {
           width={null}
           animated={true}
           useNativeDriver
-          progress={currentProgress || 0.1}
+          indeterminate
           unfilledColor={colors.secondary.background}
           color={colors.primary.accent}
           borderWidth={0}
@@ -74,7 +74,7 @@ export const Progress = () => {
       {progress ? (
         <Paragraph color={colors.secondary.paragraph}>
           {progress.type?.slice(0, 1).toUpperCase() + progress.type?.slice(1)}
-          ing {progress?.current}/{progress?.total}
+          ing {progress?.current}
         </Paragraph>
       ) : null}
     </View>

apps/mobile/app/components/sheets/publish-note/index.js

@@ -40,7 +40,9 @@ import { requestInAppReview } from "../../../services/app-review";
 const PublishNoteSheet = ({ note: item, update }) => {
   const { colors } = useThemeColors();
   const actionSheetRef = useRef();
-  const loading = useAttachmentStore((state) => state.loading);
+
+  const attachmentDownloads = useAttachmentStore((state) => state.downloading);
+  const downloading = attachmentDownloads[`monograph-${item.id}`];
   const [selfDestruct, setSelfDestruct] = useState(false);
   const [isLocked, setIsLocked] = useState(false);
   const [note, setNote] = useState(item);
@@ -137,9 +139,9 @@ const PublishNoteSheet = ({ note: item, update }) => {
             }}
           >
             Please wait...
-            {loading && loading.current && loading.total
+            {downloading && downloading.current && downloading.total
               ? `\nDownloading attachments (${
-                  loading?.current / loading?.total
+                  downloading?.current / downloading?.total
                 })`
               : ""}
           </Paragraph>

apps/mobile/app/components/sheets/reminder/index.tsx

@@ -253,6 +253,57 @@ export default function ReminderSheet({
           marginBottom: DDS.isTab ? 25 : undefined
         }}
       >
+        {reminderMode === ReminderModes.Permanent ? null : (
+          <ScrollView
+            style={{
+              flexDirection: "row",
+              borderWidth: 1,
+              marginTop: 12,
+              borderRadius: 5,
+              borderColor: colors.primary.border,
+              paddingLeft: 12,
+              height: 50
+            }}
+            horizontal
+          >
+            {Object.keys(ReminderNotificationModes).map((mode) => (
+              <Button
+                key={mode}
+                title={mode}
+                style={{
+                  marginRight: 12,
+                  borderRadius: 100
+                }}
+                icon={
+                  mode === "Silent"
+                    ? "minus-circle"
+                    : mode === "Vibrate"
+                    ? "vibrate"
+                    : "volume-high"
+                }
+                height={35}
+                type={
+                  reminderNotificationMode ===
+                  ReminderNotificationModes[
+                    mode as keyof typeof ReminderNotificationModes
+                  ]
+                    ? "grayAccent"
+                    : "gray"
+                }
+                onPress={() => {
+                  const _mode = ReminderNotificationModes[
+                    mode as keyof typeof ReminderNotificationModes
+                  ] as Reminder["priority"];
+                  SettingsService.set({
+                    reminderNotificationMode: _mode
+                  });
+                  setReminderNotificatioMode(_mode);
+                }}
+              />
+            ))}
+          </ScrollView>
+        )}
+
         <Input
           fwdRef={titleRef}
           defaultValue={reminder?.title || referencedItem?.title}
@@ -280,15 +331,21 @@ export default function ReminderSheet({
           }}
           height={80}
           wrapperStyle={{
-            marginBottom: 20
+            marginBottom: 12
           }}
         />
 
-        <View
+        <ScrollView
           style={{
             flexDirection: "row",
-            marginBottom: 12
+            marginBottom: 12,
+            height: 50,
+            borderWidth: 1,
+            borderRadius: 5,
+            borderColor: colors.primary.border,
+            paddingLeft: 12
           }}
+          horizontal
         >
           {Object.keys(ReminderModes).map((mode) => (
             <Button
@@ -327,7 +384,7 @@ export default function ReminderSheet({
               }}
             />
           ))}
-        </View>
+        </ScrollView>
 
         {reminderMode === ReminderModes.Repeat ? (
           <View
@@ -498,53 +555,6 @@ export default function ReminderSheet({
           </View>
         )}
 
-        {reminderMode === ReminderModes.Permanent ? null : (
-          <View
-            style={{
-              flexDirection: "row",
-              marginBottom: 12,
-              paddingTop: 12,
-              borderTopWidth: 1,
-              borderTopColor: colors.secondary.background
-            }}
-          >
-            {Object.keys(ReminderNotificationModes).map((mode) => (
-              <Button
-                key={mode}
-                title={mode}
-                style={{
-                  marginRight: 12,
-                  borderRadius: 100
-                }}
-                icon={
-                  mode === "Silent"
-                    ? "minus-circle"
-                    : mode === "Vibrate"
-                    ? "vibrate"
-                    : "volume-high"
-                }
-                height={35}
-                type={
-                  reminderNotificationMode ===
-                  ReminderNotificationModes[
-                    mode as keyof typeof ReminderNotificationModes
-                  ]
-                    ? "grayAccent"
-                    : "gray"
-                }
-                onPress={() => {
-                  const _mode = ReminderNotificationModes[
-                    mode as keyof typeof ReminderNotificationModes
-                  ] as Reminder["priority"];
-                  SettingsService.set({
-                    reminderNotificationMode: _mode
-                  });
-                  setReminderNotificatioMode(_mode);
-                }}
-              />
-            ))}
-          </View>
-        )}
         {reminderMode === ReminderModes.Once ||
         reminderMode === ReminderModes.Permanent ? null : (
           <View
@@ -595,6 +605,11 @@ export default function ReminderSheet({
           }}
         />
       </ScrollView>
+      <View
+        style={{
+          height: 10
+        }}
+      />
     </View>
   );
 }

apps/mobile/app/components/sheets/restore-data/index.js

@@ -22,7 +22,9 @@ import React, { useCallback, useEffect, useRef, useState } from "react";
 import { ActivityIndicator, Platform, View } from "react-native";
 import { FlatList } from "react-native-actions-sheet";
 import RNFetchBlob from "react-native-blob-util";
-import DocumentPicker from "react-native-document-picker";
+import DocumentPicker, {
+  DocumentPickerResponse
+} from "react-native-document-picker";
 import * as ScopedStorage from "react-native-scoped-storage";
 import { db } from "../../../common/database";
 import storage from "../../../common/database/storage";
@@ -45,6 +47,8 @@ import Seperator from "../../ui/seperator";
 import SheetWrapper from "../../ui/sheet";
 import Paragraph from "../../ui/typography/paragraph";
 import { getFormattedDate } from "@notesnook/common";
+import { unzip } from "react-native-zip-archive";
+import { cacheDir, copyFileAsync } from "../../../common/filesystem/utils";
 
 const RestoreDataSheet = () => {
   const [visible, setVisible] = useState(false);
@@ -129,75 +133,71 @@ const RestoreDataComponent = ({ close, setRestoring, restoring }) => {
   useEffect(() => {
     setTimeout(() => {
       checkBackups();
-    }, 300);
+    }, 1000);
   }, []);
 
   const restore = async (item) => {
     if (restoring) {
       return;
     }
-    try {
-      setRestoring(true);
-      let prefix = Platform.OS === "ios" ? "" : "file:/";
-      let backup;
-      if (Platform.OS === "android") {
-        backup = await ScopedStorage.readFile(item.uri, "utf8");
-      } else {
-        backup = await RNFetchBlob.fs.readFile(prefix + item.path, "utf8");
-      }
-      backup = JSON.parse(backup);
 
-      if (backup.data.iv && backup.data.salt) {
-        withPassword(
-          async (value) => {
-            try {
-              await restoreBackup(backup, value);
-              close();
-              setRestoring(false);
-              return true;
-            } catch (e) {
-              backupError(e);
-              return false;
-            }
-          },
-          () => {
-            setRestoring(false);
+    try {
+      const file = Platform.OS === "ios" ? item.path : item.uri;
+      console.log(file);
+      if (file.endsWith(".nnbackupz")) {
+        setRestoring(true);
+
+        if (Platform.OS === "android") {
+          const cacheFile = `file://${RNFetchBlob.fs.dirs.CacheDir}/backup.zip`;
+          if (await RNFetchBlob.fs.exists(cacheFile)) {
+            await RNFetchBlob.fs.unlink(cacheFile);
           }
-        );
-      } else {
-        await restoreBackup(backup);
-        close();
+          await RNFetchBlob.fs.createFile(cacheFile, "", "utf8");
+          console.log("copying");
+          await copyFileAsync(file, cacheFile);
+          console.log("copied");
+          await restoreFromZip(cacheFile);
+        } else {
+          await restoreFromZip(file, false);
+        }
+      } else if (file.endsWith(".nnbackup")) {
+        let backup;
+        if (Platform.OS === "android") {
+          backup = await ScopedStorage.readFile(file, "utf8");
+        } else {
+          backup = await RNFetchBlob.fs.readFile(file, "utf8");
+        }
+        await restoreFromNNBackup(JSON.parse(backup));
       }
     } catch (e) {
+      console.log("error", e);
       setRestoring(false);
       backupError(e);
     }
   };
 
-  const withPassword = (onsubmit, onclose = () => {}) => {
-    presentDialog({
-      context: "local",
-      title: "Encrypted backup",
-      input: true,
-      inputPlaceholder: "Password",
-      paragraph: "Please enter password of this backup file to restore it",
-      positiveText: "Restore",
-      secureTextEntry: true,
-      onClose: onclose,
-      negativeText: "Cancel",
-      positivePress: async (password) => {
-        try {
-          return await onsubmit(password);
-        } catch (e) {
-          ToastEvent.show({
-            heading: "Failed to backup data",
-            message: e.message,
-            type: "error",
-            context: "global"
-          });
-          return false;
+  const withPassword = () => {
+    return new Promise((resolve) => {
+      let resolved = false;
+      presentDialog({
+        context: "local",
+        title: "Encrypted backup",
+        input: true,
+        inputPlaceholder: "Password",
+        paragraph: "Please enter password of this backup file to restore it",
+        positiveText: "Restore",
+        secureTextEntry: true,
+        onClose: () => {
+          if (resolved) return;
+          resolve(undefined);
+        },
+        negativeText: "Cancel",
+        positivePress: async (password) => {
+          resolve(password);
+          resolved = true;
+          return true;
         }
-      }
+      });
     });
   };
 
@@ -217,21 +217,164 @@ const RestoreDataComponent = ({ close, setRestoring, restoring }) => {
         let path = await storage.checkAndCreateDir("/backups/");
         files = await RNFetchBlob.fs.lstat(path);
       }
-      files = files.sort(function (a, b) {
-        let timeA = a.lastModified;
-        let timeB = b.lastModified;
-        return timeB - timeA;
-      });
+      files = files
+        .filter((file) => {
+          const name = Platform.OS === "android" ? file.name : file.filename;
+          return name.endsWith(".nnbackup") || name.endsWith(".nnbackupz");
+        })
+        .sort(function (a, b) {
+          let timeA = a.lastModified;
+          let timeB = b.lastModified;
+          return timeB - timeA;
+        });
       setFiles(files);
-      setTimeout(() => {
-        setLoading(false);
-      }, 1000);
+      setLoading(false);
     } catch (e) {
       console.log(e);
       setLoading(false);
     }
   };
 
+  const restoreBackup = async (backup, password) => {
+    await db.backup.import(backup, password);
+    await db.initCollections();
+    initialize();
+    ToastEvent.show({
+      heading: "Backup restored successfully.",
+      type: "success",
+      context: "global"
+    });
+    return true;
+  };
+
+  const backupError = (e) => {
+    ToastEvent.show({
+      heading: "Restore failed",
+      message:
+        e.message ||
+        "The selected backup data file is invalid. You must select a *.nnbackup file to restore.",
+      type: "error",
+      context: "local"
+    });
+  };
+
+  /**
+   *
+   * @param {string} file
+   */
+  async function restoreFromZip(file, remove) {
+    try {
+      const zipOutputFolder = `${cacheDir}/backup_extracted`;
+      if (await RNFetchBlob.fs.exists(zipOutputFolder)) {
+        await RNFetchBlob.fs.unlink(zipOutputFolder);
+        await RNFetchBlob.fs.mkdir(zipOutputFolder);
+      }
+      await unzip(file, zipOutputFolder);
+      console.log("Unzipped files successfully to", zipOutputFolder);
+
+      const backupFiles = await RNFetchBlob.fs.ls(zipOutputFolder);
+
+      if (backupFiles.findIndex((file) => file === ".nnbackup") === -1) {
+        throw new Error("Backup file is invalid");
+      }
+
+      let password;
+
+      console.log(`Found ${backupFiles?.length} files to restore from backup`);
+      for (const path of backupFiles) {
+        if (path === ".nnbackup") continue;
+        const filePath = `${zipOutputFolder}/${path}`;
+        const data = await RNFetchBlob.fs.readFile(filePath, "utf8");
+        const parsed = JSON.parse(data);
+
+        if (parsed.encrypted && !password) {
+          console.log("Backup is encrypted...", "requesting password");
+          password = await withPassword();
+          if (!password) throw new Error("Failed to decrypt backup");
+        }
+        await db.backup.import(parsed, password);
+        console.log("Imported", path);
+      }
+      // Remove files from cache
+      RNFetchBlob.fs.unlink(zipOutputFolder).catch(console.log);
+      if (remove) {
+        RNFetchBlob.fs.unlink(file).catch(console.log);
+      }
+
+      await db.initCollections();
+      initialize();
+      setRestoring(false);
+      close();
+      ToastEvent.show({
+        heading: "Backup restored successfully.",
+        type: "success",
+        context: "global"
+      });
+    } catch (e) {
+      backupError(e);
+      setRestoring(false);
+    }
+  }
+
+  /**
+   *
+   * @param {string} file
+   */
+  async function restoreFromNNBackup(backup) {
+    try {
+      if (backup.data.iv && backup.data.salt) {
+        const password = await withPassword();
+        if (password) {
+          try {
+            await restoreBackup(backup, password);
+            close();
+            setRestoring(false);
+          } catch (e) {
+            setRestoring(false);
+            backupError(e);
+          }
+        } else {
+          setRestoring(false);
+        }
+      } else {
+        await restoreBackup(backup);
+        setRestoring(false);
+        close();
+      }
+    } catch (e) {
+      setRestoring(false);
+      backupError(e);
+    }
+  }
+
+  const button = {
+    title: "Restore from files",
+    onPress: async () => {
+      if (restoring) {
+        return;
+      }
+      try {
+        const file = await DocumentPicker.pickSingle({
+          copyTo: "cachesDirectory"
+        });
+
+        if (file.name.endsWith(".nnbackupz")) {
+          setRestoring(true);
+          await restoreFromZip(file.fileCopyUri, true);
+        } else if (file.name.endsWith(".nnbackup")) {
+          RNFetchBlob.fs.unlink(file.fileCopyUri).catch(console.log);
+          setRestoring(true);
+          const data = await fetch(file.uri);
+          await restoreFromNNBackup(await data.json());
+        }
+      } catch (e) {
+        console.log("error", e.stack);
+        setRestoring(false);
+        backupError(e);
+      }
+    }
+  };
+
   const renderItem = ({ item, index }) => (
     <View
       style={{
@@ -271,76 +414,6 @@ const RestoreDataComponent = ({ close, setRestoring, restoring }) => {
     </View>
   );
 
-  const restoreBackup = async (backup, password) => {
-    await db.backup.import(backup, password);
-    setRestoring(false);
-    initialize();
-    ToastEvent.show({
-      heading: "Backup restored successfully.",
-      type: "success",
-      context: "global"
-    });
-  };
-
-  const backupError = (e) => {
-    ToastEvent.show({
-      heading: "Restore failed",
-      message:
-        e.message ||
-        "The selected backup data file is invalid. You must select a *.nnbackup file to restore.",
-      type: "error",
-      context: "local"
-    });
-  };
-
-  const button = {
-    title: "Restore from files",
-    onPress: () => {
-      if (restoring) {
-        return;
-      }
-
-      DocumentPicker.pickSingle()
-        .then((r) => {
-          setRestoring(true);
-          fetch(r.uri)
-            .then(async (r) => {
-              try {
-                let backup = await r.json();
-                if (backup.data.iv && backup.data.salt) {
-                  withPassword(
-                    async (value) => {
-                      try {
-                        restoreBackup(backup, value).then(() => {
-                          close();
-                          setRestoring(false);
-                        });
-                        return true;
-                      } catch (e) {
-                        backupError(e);
-                        setRestoring(false);
-                        return false;
-                      }
-                    },
-                    () => {
-                      setRestoring(false);
-                    }
-                  );
-                } else {
-                  await restoreBackup(backup);
-                  close();
-                }
-              } catch (e) {
-                setRestoring(false);
-                backupError(e);
-              }
-            })
-            .catch(console.log);
-        })
-        .catch(console.log);
-    }
-  };
-
   return (
     <>
       <View>

apps/mobile/app/components/sheets/topic-sheet/index.tsx

@@ -336,23 +336,10 @@ export const TopicsSheet = () => {
                   useSelectionStore.setState({
                     selectedItemsList: selection
                   });
-                  presentDialog({
-                    title: `Delete ${
-                      selection.length > 1 ? "topics" : "topics"
-                    }`,
-                    paragraph: `Are you sure you want to delete ${
-                      selection.length > 1 ? "these topics?" : "this topic?"
-                    }`,
-                    positiveText: "Delete",
-                    negativeText: "Cancel",
-                    positivePress: async () => {
-                      await deleteItems();
-                      useSelectionStore.getState().clearSelection();
-                      setEnabled(false);
-                      setSelection([]);
-                    },
-                    positiveType: "errorShade"
-                  });
+                  await deleteItems();
+                  useSelectionStore.getState().clearSelection();
+                  setEnabled(false);
+                  setSelection([]);
                   return;
                 }}
                 color={colors.primary.icon}

apps/mobile/app/components/side-menu/menu-item.js

@@ -17,20 +17,18 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import React, { useEffect, useState } from "react";
-import { View } from "react-native";
+import { useThemeColors } from "@notesnook/theme";
+import React, { useCallback, useEffect, useState } from "react";
+import { Dimensions, View } from "react-native";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import ToggleSwitch from "toggle-switch-react-native";
 import Navigation from "../../services/navigation";
 import useNavigationStore from "../../stores/use-navigation-store";
-import { useThemeColors } from "@notesnook/theme";
-import { normalize, SIZE } from "../../utils/size";
+import { SIZE, normalize } from "../../utils/size";
 import { Button } from "../ui/button";
 import { PressableButton } from "../ui/pressable";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
-import { useCallback } from "react";
-import Tag from "../ui/tag";
 
 export const MenuItem = React.memo(
   function MenuItem({ item, index, testID, rightBtn }) {
@@ -40,6 +38,7 @@ export const MenuItem = React.memo(
     );
     const screenId = item.name.toLowerCase() + "_navigation";
     let isFocused = headerTextState?.id === screenId;
+    const primaryColors = isFocused ? colors.selected : colors.primary;
 
     const _onPress = () => {
       if (item.func) {
@@ -110,6 +109,7 @@ export const MenuItem = React.memo(
               textAlignVertical: "center",
               textAlign: "left"
             }}
+            allowFontScaling
             name={item.icon}
             color={
               item.icon === "crown"
@@ -128,14 +128,28 @@ export const MenuItem = React.memo(
             <Paragraph size={SIZE.md}>{item.name}</Paragraph>
           )}
 
-          <Tag visible={item.isBeta} text="BETA" />
+          {item.isBeta ? (
+            <View
+              style={{
+                borderRadius: 100,
+                backgroundColor: primaryColors.accent,
+                paddingHorizontal: 4,
+                marginLeft: 5,
+                paddingVertical: 2
+              }}
+            >
+              <Paragraph color={primaryColors.accentForeground} size={SIZE.xxs}>
+                BETA
+              </Paragraph>
+            </View>
+          ) : null}
         </View>
 
         {item.switch ? (
           <ToggleSwitch
             isOn={item.on}
-            onColor={colors.primary.accent}
-            offColor={colors.primary.icon}
+            onColor={primaryColors.accent}
+            offColor={primaryColors.icon}
             size="small"
             animationSpeed={150}
             onToggle={_onPress}

apps/mobile/app/components/side-menu/pinned-section.js

@@ -108,9 +108,12 @@ export const PinItem = React.memo(
     alias = item?.alias || item?.title;
     const [visible, setVisible] = useState(false);
     const [headerTextState, setHeaderTextState] = useState(null);
+    const primaryColors =
+      headerTextState?.id === item.id ? colors.selected : colors.primary;
+
     const color =
       headerTextState?.id === item.id
-        ? colors.primary.accent
+        ? colors.selected.accent
         : colors.primary.icon;
     const fwdRef = useRef();
 
@@ -206,13 +209,19 @@ export const PinItem = React.memo(
                 justifyContent: "center"
               }}
             >
-              <Icon color={color} size={SIZE.lg - 2} name={icons[item.type]} />
+              <Icon
+                allowFontScaling
+                color={color}
+                size={SIZE.lg - 2}
+                name={icons[item.type]}
+              />
               <Icon
                 style={{
                   position: "absolute",
                   bottom: -6,
                   left: -6
                 }}
+                allowFontScaling
                 color={color}
                 size={SIZE.xs}
                 name="arrow-top-right-thick"
@@ -230,7 +239,7 @@ export const PinItem = React.memo(
                   style={{
                     flexWrap: "wrap"
                   }}
-                  color={colors.primary.heading}
+                  color={primaryColors.heading}
                   size={SIZE.md}
                 >
                   {alias}
@@ -238,7 +247,7 @@ export const PinItem = React.memo(
               ) : (
                 <Paragraph
                   numberOfLines={1}
-                  color={colors.primary.paragraph}
+                  color={primaryColors.paragraph}
                   size={SIZE.md}
                 >
                   {alias}

apps/mobile/app/components/side-menu/user-status.js

@@ -113,6 +113,7 @@ export const UserStatus = () => {
               <Icon
                 name="checkbox-blank-circle"
                 size={11}
+                allowFontScaling
                 color={
                   !user || lastSyncStatus === SyncStatus.Failed
                     ? colors.error.icon
@@ -135,7 +136,7 @@ export const UserStatus = () => {
                 ? "Last sync failed, tap to try again"
                 : syncing
                 ? `Syncing your notes${
-                    progress ? ` (${progress.current}/${progress.total})` : ""
+                    progress ? ` (${progress.current})` : ""
                   }`
                 : "Tap here to sync your notes."}
             </Paragraph>
@@ -149,9 +150,15 @@ export const UserStatus = () => {
                 color={colors.error.icon}
                 name="sync-alert"
                 size={SIZE.lg}
+                allowFontScaling
               />
             ) : (
-              <Icon color={colors.primary.accent} name="sync" size={SIZE.lg} />
+              <Icon
+                allowFontScaling
+                color={colors.primary.accent}
+                name="sync"
+                size={SIZE.lg}
+              />
             )
           ) : null}
         </PressableButton>

apps/mobile/app/components/tip/index.tsx

@@ -77,7 +77,9 @@ export const Tip = ({
             alignSelf: "flex-start",
             borderRadius: 100,
             borderWidth: 1,
-            borderColor: colors.static[color as never] || colors.primary[color as never] as string
+            borderColor:
+              colors.static[color as never] ||
+              (colors.primary[color as never] as string)
           }}
         />
 
@@ -139,7 +141,7 @@ export const Tip = ({
           icon={tip.button.icon}
           buttonType={{
             color: colors.static[color as never],
-            text: colors.static.white
+            text: colors.primary.accentForeground
           }}
           style={{
             marginTop: 10

apps/mobile/app/components/ui/button/index.tsx

@@ -134,6 +134,7 @@ export const Button = ({
       {icon && !loading && iconPosition === "left" ? (
         <Icon
           name={icon}
+          allowFontScaling
           style={[{ marginRight: 0 }, iconStyle as any]}
           color={iconColor || buttonType?.text || textColor}
           size={iconSize}
@@ -170,6 +171,7 @@ export const Button = ({
       {icon && !loading && iconPosition === "right" ? (
         <Icon
           name={icon}
+          allowFontScaling
           style={[{ marginLeft: 0 }, iconStyle as any]}
           color={iconColor || buttonType?.text || textColor}
           size={iconSize}

apps/mobile/app/components/ui/icon-button/index.tsx

@@ -92,6 +92,7 @@ export const IconButton = ({
         layout={Layout}
         name={name}
         style={iconStyle as any}
+        allowFontScaling
         color={
           restProps.disabled
             ? RGB_Linear_Shade(-0.05, hexToRGBA(colors.secondary.background))

apps/mobile/app/components/ui/pressable/index.tsx

@@ -108,7 +108,7 @@ export const useButton = ({
     },
     accent: {
       primary: accent || colors.primary.accent,
-      text: text || colors.primary.paragraph,
+      text: text || colors.primary.accentForeground,
       selected: accent || colors.primary.accent
     },
     inverted: {

apps/mobile/app/components/ui/tag/index.tsx

@@ -16,9 +16,9 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-import React from "react";
-import { View, ViewStyle } from "react-native";
 import { useThemeColors } from "@notesnook/theme";
+import React from "react";
+import { ViewStyle } from "react-native";
 import { SIZE } from "../../../utils/size";
 import Paragraph from "../typography/paragraph";
 
@@ -50,7 +50,7 @@ export default function Tag({
         textAlign: "center",
         ...style
       }}
-      color={textColor || colors.static.white}
+      color={textColor || colors.primary.accentForeground}
       size={SIZE.xxs}
     >
       {text}

apps/mobile/app/components/ui/typography/heading.tsx

@@ -59,7 +59,6 @@ const Heading = ({
     <Component
       layout={restProps.layout || Layout}
       allowFontScaling={true}
-      maxFontSizeMultiplier={1}
       {...restProps}
       style={[
         {

apps/mobile/app/components/ui/typography/paragraph.tsx

@@ -45,8 +45,6 @@ const Paragraph = ({
   return (
     <Component
       layout={restProps.layout || Layout}
-      allowFontScaling
-      maxFontSizeMultiplier={1}
       {...restProps}
       style={[
         {

apps/mobile/app/hooks/use-actions.js

@@ -649,7 +649,7 @@ export const useActions = ({ close = () => null, item }) => {
     },
     {
       id: "favorite",
-      title: item.favorite ? "Unfavorite" : "Favorite",
+      title: item.favorite ? "Unfav" : "Fav",
       icon: item.favorite ? "star-off" : "star-outline",
       func: addToFavorites,
       close: false,

apps/mobile/app/hooks/use-app-events.js

@@ -83,7 +83,6 @@ import {
 import { getGithubVersion } from "../utils/github-version";
 import { tabBarRef } from "../utils/global-refs";
 import { sleep } from "../utils/time";
-import { useThemeColors } from "@notesnook/theme";
 
 const onCheckSyncStatus = async (type) => {
   const { disableSync, disableAutoSync } = SettingsService.get();
@@ -101,23 +100,26 @@ const onSyncAborted = () => {
   useUserStore.getState().setSyncing(false, SyncStatus.Failed);
 };
 
-const onSyncProgress = ({ type, total, current }) => {
-  if (type !== "download") return;
-  if (total < 10 || current % 10 === 0) {
-    initAfterSync();
-  }
-};
-
 const onFileEncryptionProgress = ({ total, progress }) => {
   useAttachmentStore
     .getState()
     .setEncryptionProgress((progress / total).toFixed(2));
 };
 
-const onLoadingAttachmentProgress = (data) => {
-  useAttachmentStore
-    .getState()
-    .setLoading(data.total === data.current ? null : data);
+const onDownloadingAttachmentProgress = (data) => {
+  useAttachmentStore.getState().setDownloading(data);
+};
+
+const onUploadingAttachmentProgress = (data) => {
+  useAttachmentStore.getState().setUploading(data);
+};
+
+const onDownloadedAttachmentProgress = (data) => {
+  useAttachmentStore.getState().setDownloading(data);
+};
+
+const onUploadedAttachmentProgress = (data) => {
+  useAttachmentStore.getState().setUploading(data);
 };
 
 const onUserSessionExpired = async () => {
@@ -167,13 +169,15 @@ const onUserSubscriptionStatusChanged = async (userStatus) => {
   useMessageStore.getState().setAnnouncement();
 };
 
-const onRequestPartialSync = async (full, force) => {
+const onRequestPartialSync = async (full, force, lastSyncTime) => {
   if (SettingsService.get().disableAutoSync) return;
-  DatabaseLogger.info(`onRequestPartialSync full:${full}, force:${force}`);
+  DatabaseLogger.info(
+    `onRequestPartialSync full:${full}, force:${force}, lastSyncTime:${lastSyncTime}`
+  );
   if (full || force) {
-    await Sync.run("global", force, full);
+    await Sync.run("global", force, full, undefined, lastSyncTime);
   } else {
-    await Sync.run("global", false, false);
+    await Sync.run("global", false, false, undefined, lastSyncTime);
   }
 };
 
@@ -253,7 +257,6 @@ export const useAppEvents = () => {
   ]);
 
   const syncedOnLaunch = useRef(false);
-  const { isDark } = useThemeColors();
   const refValues = useRef({
     subsriptionSuccessListener: null,
     subsriptionErrorListener: null,
@@ -278,7 +281,6 @@ export const useAppEvents = () => {
       const eventManager = db?.eventManager;
       eventSubscriptions = [
         eventManager?.subscribe(EVENTS.syncCompleted, onSyncComplete),
-        eventManager?.subscribe(EVENTS.syncProgress, onSyncProgress),
         eventManager?.subscribe(
           EVENTS.databaseSyncRequested,
           onRequestPartialSync
@@ -308,7 +310,16 @@ export const useAppEvents = () => {
         EVENTS.userSubscriptionUpdated,
         onUserSubscriptionStatusChanged
       ),
-      EV.subscribe(EVENTS.attachmentsLoading, onLoadingAttachmentProgress),
+      EV.subscribe(EVENTS.fileDownload, onDownloadingAttachmentProgress),
+      EV.subscribe(EVENTS.fileUpload, onUploadingAttachmentProgress),
+      EV.subscribe(EVENTS.fileDownloaded, onDownloadedAttachmentProgress),
+      EV.subscribe(EVENTS.fileUploaded, onUploadedAttachmentProgress),
+      EV.subscribe(EVENTS.downloadCanceled, (data) => {
+        useAttachmentStore.getState().setDownloading(data);
+      }),
+      EV.subscribe(EVENTS.uploadCanceled, (data) => {
+        useAttachmentStore.getState().setUploading(data);
+      }),
       eSubscribeEvent(eUserLoggedIn, onUserUpdated)
     ];
 
@@ -533,6 +544,12 @@ export const useAppEvents = () => {
     if (refValues.current?.isReconnecting || !refValues.current?.isUserReady)
       return;
 
+    if (useSettingStore.getState().appDidEnterBackgroundForAction) {
+      useSettingStore.getState().setAppDidEnterBackgroundForAction(false);
+      console.log("AppDidEnterForegroundAfterAction");
+      return;
+    }
+
     if (SettingsService.get().sessionExpired) {
       refValues.current.isReconnecting = false;
       return;

apps/mobile/app/hooks/use-group-options.ts

@@ -0,0 +1,49 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import { useEffect, useState } from "react";
+import { db } from "../common/database";
+import { eSubscribeEvent, eUnSubscribeEvent } from "../services/event-manager";
+import Navigation from "../services/navigation";
+
+export function useGroupOptions(type: any) {
+  const [groupOptions, setGroupOptions] = useState(
+    db.settings?.getGroupOptions(type)
+  );
+
+  useEffect(() => {
+    const onUpdate = () => {
+      const options = db.settings?.getGroupOptions(type) as any;
+      if (
+        groupOptions?.groupBy !== options.groupBy ||
+        groupOptions?.sortBy !== options.sortBy ||
+        groupOptions?.sortDirection !== groupOptions?.sortDirection
+      ) {
+        setGroupOptions({ ...options });
+        Navigation.queueRoutesForUpdate();
+      }
+    };
+
+    eSubscribeEvent("groupOptionsUpdate", onUpdate);
+    return () => {
+      eUnSubscribeEvent("groupOptionsUpdate", onUpdate);
+    };
+  }, [type, groupOptions]);
+
+  return groupOptions;
+}

apps/mobile/app/hooks/use-stored-ref.ts

@@ -0,0 +1,52 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import { useRef } from "react";
+import { MMKV } from "../common/database/mmkv";
+
+export function useStoredRef<T>(
+  key: string,
+  initialValue: T
+): {
+  current: T;
+  reset(): void;
+} {
+  const refKey = `storedRef:${key}`;
+  const value = useRef(
+    MMKV.getMap<{ current: T }>(refKey)?.current || initialValue
+  );
+  const frameRef = useRef(0);
+
+  return {
+    get current() {
+      return value.current;
+    },
+    set current(next: T) {
+      value.current = next;
+      cancelAnimationFrame(frameRef.current);
+      frameRef.current = requestAnimationFrame(() => {
+        MMKV.setMap(refKey, {
+          current: value.current
+        });
+      });
+    },
+    reset() {
+      MMKV.removeItem(refKey);
+    }
+  };
+}

apps/mobile/app/hooks/use-stored-state.ts

@@ -0,0 +1,49 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import { useRef, useState } from "react";
+import { MMKV } from "../common/database/mmkv";
+
+export function useStoredValue<T>(
+  key: string,
+  initialValue: T
+): { value: T; reset(): void } {
+  const refKey = `storedState:${key}`;
+  const [value, setValue] = useState<T>(
+    MMKV.getMap<{ value: T }>(refKey)?.value || initialValue
+  );
+  const frameRef = useRef(0);
+
+  return {
+    get value() {
+      return value;
+    },
+    set value(next: T) {
+      setValue(next);
+      cancelAnimationFrame(frameRef.current);
+      frameRef.current = requestAnimationFrame(() => {
+        MMKV.setMap(refKey, {
+          value: value
+        });
+      });
+    },
+    reset() {
+      MMKV.removeItem(refKey);
+    }
+  };
+}

apps/mobile/app/screens/editor/progress.js

@@ -1,81 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import React, { useEffect, useRef, useState } from "react";
-import { View } from "react-native";
-import { ProgressBarComponent } from "../../components/ui/svg/lazy";
-import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
-import { useAttachmentStore } from "../../stores/use-attachment-store";
-import { useThemeColors } from "@notesnook/theme";
-import { SIZE } from "../../utils/size";
-export const ProgressBar = () => {
-  const { colors } = useThemeColors();
-  const loading = useAttachmentStore((state) => state.loading);
-  const [prog, setProg] = useState(0);
-  const [visible, setVisible] = useState(false);
-  const timer = useRef();
-  const insets = useGlobalSafeAreaInsets();
-  const [width, setWidth] = useState(false);
-
-  useEffect(() => {
-    if (loading) {
-      if (loading.current !== loading.total) {
-        setVisible(true);
-        setProg(loading.current / loading.total);
-      } else {
-        clear();
-      }
-    } else {
-      clear();
-    }
-  }, [loading]);
-
-  const clear = () => {
-    clearTimeout(timer.current);
-    timer.current = null;
-    timer.current = setTimeout(() => {
-      setProg(1);
-      setTimeout(() => {
-        setVisible(false);
-      }, 1000);
-    }, 100);
-  };
-
-  return visible ? (
-    <View
-      style={{
-        justifyContent: "center",
-        position: "absolute",
-        zIndex: 1,
-        marginTop: insets.top + 45,
-        width: "100%"
-      }}
-      onLayout={(event) => setWidth(event.nativeEvent.layout.width)}
-    >
-      <ProgressBarComponent
-        size={SIZE.xxl}
-        progress={prog}
-        color={colors.primary.accent}
-        borderWidth={0}
-        height={1}
-        width={width || 400}
-      />
-    </View>
-  ) : null;
-};

apps/mobile/app/screens/editor/progress.tsx

@@ -0,0 +1,136 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import { useThemeColors } from "@notesnook/theme";
+import React, { useEffect, useRef, useState } from "react";
+import { View } from "react-native";
+import { ProgressBarComponent } from "../../components/ui/svg/lazy";
+import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
+import { useAttachmentStore } from "../../stores/use-attachment-store";
+import { useEditorStore } from "../../stores/use-editor-store";
+
+export const ProgressBar = () => {
+  const { colors } = useThemeColors();
+  const currentlyEditingNote = useEditorStore(
+    (state) => state.currentEditingNote
+  );
+  const downloading = useAttachmentStore((state) => state.downloading);
+
+  const loading = currentlyEditingNote
+    ? downloading?.[currentlyEditingNote]
+    : undefined;
+
+  const attachmentProgress = useAttachmentStore((state) => state.progress);
+  const [progress, setProgress] = useState(0);
+  const [visible, setVisible] = useState(false);
+  const timer = useRef<NodeJS.Timeout>();
+  const insets = useGlobalSafeAreaInsets();
+  const [width, setWidth] = useState(400);
+
+  const groupProgressInfo = useRef<{
+    [name: string]: {
+      total: number;
+      current: number;
+    };
+  }>({});
+
+  const currentItemProgress = loading?.filename
+    ? attachmentProgress?.[loading?.filename]
+    : undefined;
+
+  useEffect(() => {
+    if (loading) {
+      console.log(loading);
+      if (
+        loading.current === loading.total &&
+        typeof loading.success === "boolean"
+      ) {
+        clear();
+        return;
+      }
+      setVisible(true);
+      if (!loading.filename) return;
+
+      if (!groupProgressInfo.current[loading.filename]) {
+        groupProgressInfo.current[loading.filename] = {
+          total: 1,
+          current: 0
+        };
+      }
+
+      const itemProgressCurrent = groupProgressInfo.current[loading.filename];
+
+      const itemTotalSize =
+        currentItemProgress?.total || itemProgressCurrent.total;
+
+      const itemCurrentProgress =
+        currentItemProgress?.recieved ||
+        currentItemProgress?.sent ||
+        itemProgressCurrent.current;
+
+      groupProgressInfo.current[loading.filename] = {
+        current: itemCurrentProgress,
+        total: itemTotalSize
+      };
+
+      const itemProgressPercent = itemCurrentProgress / itemTotalSize;
+
+      setProgress(
+        ((loading.current || 0) + itemProgressPercent) / (loading.total || 1)
+      );
+    } else {
+      clear();
+    }
+  }, [currentItemProgress, loading]);
+
+  const clear = () => {
+    clearTimeout(timer.current);
+    timer.current = undefined;
+    timer.current = setTimeout(() => {
+      setProgress(1);
+      setTimeout(() => {
+        setVisible(false);
+        setProgress(0);
+        groupProgressInfo.current = {};
+      }, 1000);
+    }, 0);
+  };
+
+  return (
+    <View
+      style={{
+        justifyContent: "center",
+        position: "absolute",
+        zIndex: visible ? 1 : -1,
+        marginTop: insets.top + 45,
+        width: "100%"
+      }}
+      onLayout={(event) => setWidth(event.nativeEvent.layout.width)}
+    >
+      <ProgressBarComponent
+        progress={progress}
+        color={colors.primary.accent}
+        borderWidth={0}
+        borderRadius={0}
+        height={2}
+        width={width || 400}
+      />
+    </View>
+  );
+};

apps/mobile/app/screens/editor/tiptap/picker.js

@@ -34,6 +34,7 @@ import PremiumService from "../../../services/premium";
 import { FILE_SIZE_LIMIT, IMAGE_SIZE_LIMIT } from "../../../utils/constants";
 import { eCloseSheet } from "../../../utils/events";
 import { editorController, editorState } from "./utils";
+import { useSettingStore } from "../../../stores/use-setting-store";
 
 const showEncryptionSheet = (file) => {
   presentSheet({
@@ -62,6 +63,7 @@ const file = async (fileOptions) => {
 
     let file;
     try {
+      useSettingStore.getState().setAppDidEnterBackgroundForAction(true);
       file = await DocumentPicker.pick(options);
     } catch (e) {
       return;
@@ -135,6 +137,7 @@ const file = async (fileOptions) => {
 const camera = async (options) => {
   try {
     await db.attachments.generateKey();
+    useSettingStore.getState().setAppDidEnterBackgroundForAction(true);
     launchCamera(
       {
         includeBase64: true,
@@ -156,6 +159,7 @@ const camera = async (options) => {
 const gallery = async (options) => {
   try {
     await db.attachments.generateKey();
+    useSettingStore.getState().setAppDidEnterBackgroundForAction(true);
     launchImageLibrary(
       {
         includeBase64: true,

apps/mobile/app/screens/editor/tiptap/types.ts

@@ -52,6 +52,7 @@ export type Settings = {
   fontFamily: string;
   dateFormat: string;
   timeFormat: string;
+  fontScale: number;
 };
 
 export type EditorProps = {

apps/mobile/app/screens/editor/tiptap/use-editor-events.ts

@@ -28,7 +28,8 @@ import {
   InteractionManager,
   Keyboard,
   KeyboardEventListener,
-  NativeEventSubscription
+  NativeEventSubscription,
+  useWindowDimensions
 } from "react-native";
 import { WebViewMessageEvent } from "react-native-webview";
 import { db } from "../../../common/database";
@@ -142,6 +143,8 @@ export const useEditorEvents = (
   const handleBack = useRef<NativeEventSubscription>();
   const readonly = useEditorStore((state) => state.readonly);
   const isPremium = useUserStore((state) => state.premium);
+  const { fontScale } = useWindowDimensions();
+
   const doubleSpacedLines = useSettingStore(
     (state) => state.settings?.doubleSpacedLines
   );
@@ -195,7 +198,8 @@ export const useEditorEvents = (
           : defaultFontSize,
       fontFamily: SettingsService.get().defaultFontFamily,
       dateFormat: db.settings?.getDateFormat(),
-      timeFormat: db.settings?.getTimeFormat()
+      timeFormat: db.settings?.getTimeFormat(),
+      fontScale
     });
   }, [
     fullscreen,
@@ -215,7 +219,8 @@ export const useEditorEvents = (
     defaultFontFamily,
     dateFormat,
     timeFormat,
-    loading
+    loading,
+    fontScale
   ]);
 
   const onBackPress = useCallback(async () => {

apps/mobile/app/screens/editor/tiptap/use-editor.ts

@@ -22,7 +22,7 @@ import { EVENTS } from "@notesnook/core/dist/common";
 import { useThemeEngineStore } from "@notesnook/theme";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import WebView from "react-native-webview";
-import { db } from "../../../common/database";
+import { DatabaseLogger, db } from "../../../common/database";
 import useGlobalSafeAreaInsets from "../../../hooks/use-global-safe-area-insets";
 import { DDS } from "../../../services/device-detection";
 import {
@@ -134,19 +134,26 @@ export const useEditor = (
 
   const reset = useCallback(
     async (resetState = true, resetContent = true) => {
-      currentNote.current?.id && db.fs?.cancel(currentNote.current.id);
+      currentNote.current?.id &&
+        db.fs?.cancel(currentNote.current.id, "download");
       currentNote.current = null;
       loadedImages.current = {};
       currentContent.current = null;
       clearTimeout(timers.current["loading-images"]);
       sessionHistoryId.current = undefined;
       saveCount.current = 0;
+      lock.current = false;
       useEditorStore.getState().setReadonly(false);
       resetContent && postMessage(EditorEvents.title, "");
       lastContentChangeTime.current = 0;
       resetContent && (await commands.clearContent());
       resetContent && (await commands.clearTags());
+
       if (resetState) {
+        const newSessionId = makeSessionId();
+        await commands.setSessionId(newSessionId);
+        setSessionId(newSessionId);
+
         isDefaultEditor &&
           useEditorStore.getState().setCurrentlyEditingNote(null);
         placeholderTip.current = TipManager.placeholderTip();
@@ -263,7 +270,8 @@ export const useEditor = (
         saveCount.current++;
         return id;
       } catch (e) {
-        console.log("Error saving note: ", e);
+        console.error(e);
+        DatabaseLogger.error(e as Error);
       }
     },
     [commands, isDefaultEditor, postMessage, readonly, reset]
@@ -278,6 +286,7 @@ export const useEditor = (
         noteId: currentNote.current?.id as string
       };
     } else {
+      if (!note.contentId) return;
       currentContent.current = await db.content?.raw(note.contentId);
     }
   }, []);
@@ -365,12 +374,23 @@ export const useEditor = (
         if (!item.forced && currentNote.current?.id === item.id) return;
         state.current.movedAway = false;
         state.current.currentlyEditing = true;
-        isDefaultEditor && editorState.setCurrentlyEditingNote(item.id);
-        currentNote.current && (await reset(false, false));
+
+        if (currentNote.current?.id !== item.id) {
+          currentNote.current && (await reset(false, false));
+          isDefaultEditor && editorState.setCurrentlyEditingNote(item.id);
+        }
+
         await loadContent(item as NoteType);
-        if (loadingState.current === currentContent.current?.data) {
+
+        if (
+          currentNote.current?.id === item.id &&
+          loadingState.current &&
+          currentContent.current?.data &&
+          loadingState.current === currentContent.current?.data
+        ) {
           return;
         }
+
         if (
           !currentContent.current?.data ||
           currentContent.current?.data.length < 50000
@@ -388,17 +408,20 @@ export const useEditor = (
         lockedSessionId.current = nextSessionId;
         sessionHistoryId.current = Date.now();
         setSessionId(nextSessionId);
+
         commands.setSessionId(nextSessionId);
         sessionIdRef.current = nextSessionId;
         currentNote.current = item as NoteType;
         await commands.setStatus(getFormattedDate(item.dateEdited), "Saved");
         await postMessage(EditorEvents.title, item.title);
         loadingState.current = currentContent.current?.data;
-        await postMessage(
-          EditorEvents.html,
-          currentContent.current?.data,
-          10000
-        );
+        if (currentContent.current?.data) {
+          await postMessage(
+            EditorEvents.html,
+            currentContent.current?.data,
+            10000
+          );
+        }
         loadingState.current = undefined;
         useEditorStore.getState().setReadonly(item.readonly);
         await commands.setTags(currentNote.current);
@@ -524,6 +547,14 @@ export const useEditor = (
     }) => {
       if (lock.current || lockedSessionId.current === forSessionId) return;
       lastContentChangeTime.current = Date.now();
+
+      if (
+        sessionHistoryId.current &&
+        Date.now() - sessionHistoryId.current > 5 * 60 * 1000
+      ) {
+        sessionHistoryId.current = Date.now();
+      }
+
       if (type === EditorEvents.content) {
         currentContent.current = {
           data: content,

apps/mobile/app/screens/editor/wrapper.js

@@ -55,6 +55,7 @@ export const EditorWrapper = ({ width }) => {
       prevState.current = state;
       return;
     }
+    if (useSettingStore.getState().appDidEnterBackgroundForAction) return;
     if (state === "active") {
       editorController.current.onReady();
       editorController.current.overlay(false);

apps/mobile/app/screens/home/index.tsx

@@ -71,7 +71,7 @@ export const Home = ({ navigation, route }: NavigationProps<"Notes">) => {
       <List
         listData={notes}
         type="notes"
-        screen="Notes"
+        screen="Home"
         loading={loading || !isFocused}
         headerProps={{
           heading: "Notes"

apps/mobile/app/screens/settings/functions.js

@@ -42,7 +42,8 @@ export async function verifyUser(
     negativeText: closeText || "Cancel",
     positivePress: async (value) => {
       try {
-        let verified = await db.user.verifyPassword(value);
+        const user = await db.user.getUser();
+        let verified = !user ? true : await db.user.verifyPassword(value);
         if (verified) {
           sleep(300).then(async () => {
             await onsuccess();
@@ -58,7 +59,7 @@ export async function verifyUser(
         }
       } catch (e) {
         ToastEvent.show({
-          heading: "Failed to backup data",
+          heading: "Failed to verify",
           message: e.message,
           type: "error",
           context: "global"

apps/mobile/app/screens/settings/picker/index.tsx

@@ -27,6 +27,8 @@ import PremiumService from "../../../services/premium";
 import { useThemeColors } from "@notesnook/theme";
 import { SIZE } from "../../../utils/size";
 import { sleep } from "../../../utils/time";
+import { verifyUser } from "../functions";
+import { Dialog } from "../../../components/dialog";
 
 interface PickerOptions<T> {
   getValue: () => T;
@@ -37,6 +39,7 @@ interface PickerOptions<T> {
   options: T[];
   premium?: boolean;
   onCheckOptionIsPremium?: (item: T) => boolean;
+  requiresVerification?: () => boolean;
 }
 
 export function SettingsPicker<T>({
@@ -47,7 +50,8 @@ export function SettingsPicker<T>({
   options,
   getItemKey,
   premium,
-  onCheckOptionIsPremium = () => true
+  onCheckOptionIsPremium = () => true,
+  requiresVerification = () => false
 }: PickerOptions<T>) {
   const { colors } = useThemeColors("contextMenu");
   const menuRef = useRef<any>();
@@ -118,11 +122,18 @@ export function SettingsPicker<T>({
           </PressableButton>
         }
       >
+        <Dialog context="local" />
         {options.map((item) => (
           <MenuItem
             key={getItemKey(item)}
             onPress={async () => {
-              onChange(item);
+              if (requiresVerification?.()) {
+                verifyUser("local", () => {
+                  onChange(item);
+                });
+              } else {
+                onChange(item);
+              }
             }}
             style={{
               backgroundColor: compareValue(currentValue, item)

apps/mobile/app/screens/settings/picker/pickers.jsx

@@ -26,6 +26,7 @@ import { createSettingsPicker } from ".";
 import { getFontById, getFonts } from "@notesnook/editor/dist/utils/font";
 import { DATE_FORMATS, TIME_FORMATS } from "@notesnook/core/dist/common";
 import dayjs from "dayjs";
+import { useUserStore } from "../../../stores/use-user-store";
 
 export const FontPicker = createSettingsPicker({
   getValue: () => useSettingStore.getState().settings.defaultFontFamily,
@@ -127,6 +128,12 @@ export const BackupReminderPicker = createSettingsPicker({
   options: ["useroff", "daily", "weekly", "monthly"],
   compareValue: (current, item) => current === item,
   premium: true,
+  requiresVerification: () => {
+    return (
+      !useSettingStore.getState().settings.encryptedBackup &&
+      useUserStore.getState().user
+    );
+  },
   onCheckOptionIsPremium: (item) => {
     return item !== "useroff";
   }

apps/mobile/app/screens/settings/settings-data.tsx

@@ -628,7 +628,9 @@ export const settingsGroups: SettingSection[] = [
         name: "CORS bypass proxy",
         description: "You can set a custom proxy URL to increase your privacy.",
         inputProperties: {
-          defaultValue: "https://cors.notesnook.com"
+          defaultValue: "https://cors.notesnook.com",
+          autoCorrect: false,
+          keyboardType: "url"
         },
         property: "corsProxy",
         icon: "arrow-decision-outline"
@@ -782,10 +784,11 @@ export const settingsGroups: SettingSection[] = [
             description: "Create a backup of your data",
             modifer: async () => {
               const user = useUserStore.getState().user;
-              if (!user) {
+              if (!user || SettingsService.getProperty("encryptedBackup")) {
                 await BackupService.run(true);
                 return;
               }
+
               verifyUser(null, () => BackupService.run(true));
             }
           },
@@ -869,9 +872,17 @@ export const settingsGroups: SettingSection[] = [
                 });
                 return;
               }
-              SettingsService.set({
-                encryptedBackup: !settings.encryptedBackup
-              });
+              if (settings.encryptedBackup) {
+                await verifyUser(null, () => {
+                  SettingsService.set({
+                    encryptedBackup: false
+                  });
+                });
+              } else {
+                SettingsService.set({
+                  encryptedBackup: true
+                });
+              }
             }
           }
         ]
@@ -901,7 +912,9 @@ export const settingsGroups: SettingSection[] = [
         description:
           "Export all notes as pdf, markdown, html or text in a single zip file",
         modifer: () => {
-          ExportNotesSheet.present(undefined, true);
+          verifyUser(null, () => {
+            ExportNotesSheet.present(undefined, true);
+          });
         }
       }
     ]

apps/mobile/app/screens/settings/theme-selector.tsx

@@ -748,7 +748,7 @@ const ThemeSetter = ({
               paddingVertical: 12
             }}
           >
-            <Heading color={colors.accent} size={SIZE.md}>
+            <Heading color={colors.accentForeground} size={SIZE.md}>
               {darkTheme.id === theme.id
                 ? "Applied as dark theme"
                 : "Applied as light theme"}

apps/mobile/app/services/backup.js

@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { sanitizeFilename } from "@notesnook/common";
 import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
 import FileViewer from "react-native-file-viewer";
@@ -30,6 +29,8 @@ import { eCloseSheet } from "../utils/events";
 import { sleep } from "../utils/time";
 import { ToastEvent, eSendEvent, presentSheet } from "./event-manager";
 import SettingsService from "./settings";
+import { cacheDir, copyFileAsync } from "../common/filesystem/utils";
+import { zip } from "react-native-zip-archive";
 
 const MS_DAY = 86400000;
 const MS_WEEK = MS_DAY * 7;
@@ -152,8 +153,6 @@ async function run(progress, context) {
   let androidBackupDirectory = await checkBackupDirExists(false, context);
   if (!androidBackupDirectory) return;
 
-  let backup;
-
   if (progress) {
     presentSheet({
       title: "Backing up your data",
@@ -163,43 +162,67 @@ async function run(progress, context) {
     });
   }
 
-  try {
-    backup = await db.backup.export(
-      "mobile",
-      SettingsService.get().encryptedBackup
-    );
-    if (!backup) throw new Error("Backup returned empty.");
-  } catch (e) {
-    await sleep(300);
-    eSendEvent(eCloseSheet);
-    ToastEvent.error(e, "Backup failed!");
-    return null;
+  let path;
+  let backupFilePath;
+  let backupFileName = "notesnook_backup_" + Date.now();
+
+  if (Platform.OS === "ios") {
+    path = await storage.checkAndCreateDir("/backups/");
   }
 
-  try {
-    let backupName = "notesnook_backup_" + Date.now();
-    backupName =
-      sanitizeFilename(backupName, { replacement: "_" }) + ".nnbackup";
-    let path;
-    let backupFilePath;
+  const zipSourceFolder = `${cacheDir}/${backupFileName}`;
+  const zipOutputFile =
+    Platform.OS === "ios"
+      ? `${path}/${backupFileName}.nnbackupz`
+      : `${cacheDir}/${backupFileName}.nnbackupz`;
 
-    if (Platform.OS === "ios") {
-      path = await storage.checkAndCreateDir("/backups/");
-      await RNFetchBlob.fs.writeFile(path + backupName, backup, "utf8");
-      backupFilePath = path + backupName;
-    } else {
-      backupFilePath = await ScopedStorage.writeFile(
-        androidBackupDirectory.uri,
-        backup,
-        backupName,
-        "nnbackup/json",
-        "utf8",
-        false
+  if (await RNFetchBlob.fs.exists(zipSourceFolder))
+    await RNFetchBlob.fs.unlink(zipSourceFolder);
+
+  await RNFetchBlob.fs.mkdir(zipSourceFolder);
+
+  try {
+    for await (const file of db.backup.export(
+      "mobile",
+      SettingsService.get().encryptedBackup
+    )) {
+      console.log("Writing backup chunk of size...", file?.data?.length);
+      await RNFetchBlob.fs.writeFile(
+        `${zipSourceFolder}/${file.path}`,
+        file.data,
+        "utf8"
       );
     }
 
+    await zip(zipSourceFolder, zipOutputFile);
+
+    console.log("Final zip:", await RNFetchBlob.fs.stat(zipOutputFile));
+
+    if (Platform.OS === "android") {
+      // Move the zip to user selected directory.
+      const file = await ScopedStorage.createFile(
+        androidBackupDirectory.uri,
+        `${backupFileName}.nnbackupz`,
+        "application/nnbackupz"
+      );
+      await copyFileAsync(`file://${zipOutputFile}`, file.uri);
+      path = file.uri;
+    } else {
+      path = zipOutputFile;
+    }
+    RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
     updateNextBackupTime();
 
+    let showBackupCompleteSheet = SettingsService.get().showBackupCompleteSheet;
+
+    if (context) return path;
+    await sleep(300);
+    if (showBackupCompleteSheet) {
+      presentBackupCompleteSheet(backupFilePath);
+    } else {
+      progress && eSendEvent(eCloseSheet);
+    }
+
     ToastEvent.show({
       heading: "Backup successful",
       message: "Your backup is stored in Notesnook folder on your phone.",
@@ -207,18 +230,10 @@ async function run(progress, context) {
       context: "global"
     });
 
-    let showBackupCompleteSheet = SettingsService.get().showBackupCompleteSheet;
-
-    if (context) return backupFilePath;
-    await sleep(300);
-    if (showBackupCompleteSheet) {
-      presentBackupCompleteSheet(backupFilePath);
-    } else {
-      progress && eSendEvent(eCloseSheet);
-    }
-    return backupFilePath;
+    return path;
   } catch (e) {
-    progress && eSendEvent(eCloseSheet);
+    await sleep(300);
+    eSendEvent(eCloseSheet);
     ToastEvent.error(e, "Backup failed!");
     return null;
   }

apps/mobile/app/services/message.js

@@ -50,7 +50,7 @@ export function setRateAppMessage() {
 
 const recoveryKeyMessage = {
   visible: true,
-  message: "Keep your data safe if you lose password",
+  message: "Keep your data safe",
   actionText: "Save your account recovery key",
   onPress: () => {
     verifyUser(

apps/mobile/app/services/notifications.ts

@@ -46,6 +46,7 @@ import { useRelationStore } from "../stores/use-relation-store";
 import { useReminderStore } from "../stores/use-reminder-store";
 import { presentDialog } from "../components/dialog/functions";
 import NetInfo from "@react-native-community/netinfo";
+import { encodeNonAsciiHTML } from "entities";
 import { convertNoteToText } from "../utils/note-to-text";
 
 export type Reminder = {
@@ -87,6 +88,28 @@ async function getNextMonthlyReminderDate(
   return await getNextMonthlyReminderDate(reminder, dayjs().year() + 1);
 }
 
+export function textToHTML(src: string) {
+  return src
+    .split(/[\r\n]/)
+    .map((line) =>
+      line
+        ? `<p data-spacing="single">${encodeLine(line)}</p>`
+        : `<p data-spacing="single"></p>`
+    )
+    .join("");
+}
+
+function encodeLine(line: string) {
+  line = encodeNonAsciiHTML(line);
+  line = line.replace(/(^ +)|( {2,})/g, (sub, ...args) => {
+    const [starting, inline] = args;
+    if (starting) return "&nbsp;".repeat(starting.length);
+    if (inline) return "&nbsp;".repeat(inline.length);
+    return sub;
+  });
+  return line;
+}
+
 async function initDatabase(notes = true) {
   if (!db.isInitialized) {
     await db.initCollections();
@@ -118,6 +141,7 @@ const onEvent = async ({ type, detail }: Event) => {
       const ReminderNotify =
         require("../components/sheets/reminder-notify").default;
       ReminderNotify.present(reminder);
+      useRelationStore.getState().update();
       return;
     }
     editorState().movedAway = false;
@@ -207,16 +231,41 @@ const onEvent = async ({ type, detail }: Event) => {
         });
         if (!db.isInitialized) await db.init();
         await db.notes?.init();
-        await db.notes?.add({
+
+        const id = await db.notes?.add({
           content: {
             type: "tiptap",
-            data: `<p>${input} </p>`
+            data: textToHTML(input as string)
           }
         });
+
+        const defaultNotebook = db.settings?.getDefaultNotebook();
+
+        if (defaultNotebook) {
+          if (!defaultNotebook.topic) {
+            await db.relations?.add(
+              { type: "notebook", id: defaultNotebook.id },
+              { type: "note", id: id }
+            );
+          } else {
+            await db.notes?.addToNotebook(
+              {
+                topic: defaultNotebook.topic,
+                id: defaultNotebook?.id
+              },
+              id
+            );
+          }
+        }
+
         const status = await NetInfo.fetch();
         if (status.isInternetReachable) {
           try {
-            await db.sync(false, false);
+            if (!globalThis["IS_MAIN_APP_RUNNING" as never]) {
+              await db.sync(false, false);
+            } else {
+              console.log("main app running, skipping sync");
+            }
           } catch (e) {
             console.log(e, (e as Error).stack);
           }

apps/mobile/app/services/sync.js

@@ -17,15 +17,14 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { EVENTS } from "@notesnook/core/dist/common";
 import NetInfo from "@react-native-community/netinfo";
 import { db } from "../common/database";
 import { DatabaseLogger } from "../common/database/index";
 import { initAfterSync } from "../stores/index";
 import { SyncStatus, useUserStore } from "../stores/use-user-store";
+import BackgroundSync from "./background-sync";
 import { ToastEvent } from "./event-manager";
 import SettingsService from "./settings";
-import BackgroundSync from "./background-sync";
 
 export const ignoredMessages = [
   "Sync already running",
@@ -33,19 +32,28 @@ export const ignoredMessages = [
   "WebSocket failed to connect",
   "Failed to start the HttpConnection before"
 ];
-
+let pendingSync = undefined;
 let syncTimer = 0;
 const run = async (
   context = "global",
   forced = false,
   full = true,
-  onCompleted
+  onCompleted,
+  lastSyncTime
 ) => {
   if (useUserStore.getState().syncing) {
-    DatabaseLogger.log("Sync in progress");
-    console.log("Sync in progress");
+    DatabaseLogger.info("Sync in progress");
+    pendingSync = {
+      full: full
+    };
     return;
   }
+
+  if (pendingSync) {
+    pendingSync = undefined;
+    DatabaseLogger.info("Running pending sync...");
+  }
+
   clearTimeout(syncTimer);
   syncTimer = setTimeout(async () => {
     const status = await NetInfo.fetch();
@@ -54,56 +62,54 @@ const run = async (
     if (!status.isInternetReachable) {
       DatabaseLogger.warn("Internet not reachable");
     }
+
     if (
       !user ||
       !status.isInternetReachable ||
       SettingsService.get().disableSync
     ) {
       initAfterSync();
+      pendingSync = undefined;
       return onCompleted?.(false);
     }
     userstore.setSyncing(true);
+
     let error = null;
 
     try {
-      let res = await BackgroundSync.doInBackground(async () => {
+      await BackgroundSync.doInBackground(async () => {
         try {
-          await db.sync(full, forced);
-          return true;
+          await db.sync(full, forced, lastSyncTime);
         } catch (e) {
           error = e;
-          return e.message;
         }
       });
-      if (!res) {
-        initAfterSync();
-        userstore.setSyncing(false, SyncStatus.Failed);
-        return onCompleted?.(false);
+
+      if (error) {
+        throw error;
       }
-      if (typeof res === "string") throw error;
-      userstore.setSyncing(false);
-      return onCompleted?.(true);
     } catch (e) {
       error = e;
       if (
-        !ignoredMessages.find((im) => e.message?.includes(im)) &&
-        userstore.user
+        !ignoredMessages.find((message) => e.message?.includes(message)) &&
+        userstore.user &&
+        status.isConnected &&
+        status.isInternetReachable
       ) {
-        userstore.setSyncing(false, SyncStatus.Failed);
-        if (status.isConnected && status.isInternetReachable) {
-          ToastEvent.error(e, "Sync failed", context);
-        }
+        ToastEvent.error(e, "Sync failed", context);
       }
+
       DatabaseLogger.error(e, "[Client] Failed to sync");
-      onCompleted?.(false);
     } finally {
+      initAfterSync();
       userstore.setSyncing(
         false,
         error ? SyncStatus.Failed : SyncStatus.Passed
       );
-      if (full || forced) {
-        db.eventManager.publish(EVENTS.syncCompleted);
-      }
+      onCompleted?.(error ? SyncStatus.Failed : SyncStatus.Passed);
+      setImmediate(() => {
+        if (pendingSync) Sync.run("global", false, pendingSync.full);
+      });
     }
   }, 300);
 };

apps/mobile/app/stores/use-attachment-store.ts

@@ -20,6 +20,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import create from "zustand";
 import { editorController } from "../screens/editor/tiptap/utils";
 
+export type AttachmentGroupProgress = {
+  total: number;
+  current: number;
+  groupId: string;
+  filename: string;
+  canceled?: boolean;
+  success?: boolean;
+  error?: any;
+};
+
 interface AttachmentStore {
   progress?: {
     [name: string]: {
@@ -30,6 +40,7 @@ interface AttachmentStore {
       type: "upload" | "download";
     } | null;
   };
+
   encryptionProgress: number;
   setEncryptionProgress: (encryptionProgress: number) => void;
   remove: (hash: string) => void;
@@ -40,8 +51,14 @@ interface AttachmentStore {
     recieved: number,
     type: "upload" | "download"
   ) => void;
-  loading: { total: number; current: number };
-  setLoading: (data: { total: number; current: number }) => void;
+  downloading?: {
+    [groupId: string]: AttachmentGroupProgress | undefined;
+  };
+  setDownloading: (data: AttachmentGroupProgress) => void;
+  uploading?: {
+    [groupId: string]: AttachmentGroupProgress | undefined;
+  };
+  setUploading: (data: AttachmentGroupProgress) => void;
 }
 
 export const useAttachmentStore = create<AttachmentStore>((set, get) => ({
@@ -73,6 +90,21 @@ export const useAttachmentStore = create<AttachmentStore>((set, get) => ({
   encryptionProgress: 0,
   setEncryptionProgress: (encryptionProgress) =>
     set({ encryptionProgress: encryptionProgress }),
-  loading: { total: 0, current: 0 },
-  setLoading: (data) => set({ loading: data ? { ...data } : data })
+
+  downloading: {},
+  setDownloading: (data) =>
+    set({
+      downloading: {
+        ...get().downloading,
+        [data.groupId]: data?.canceled ? undefined : data
+      }
+    }),
+  uploading: {},
+  setUploading: (data) =>
+    set({
+      uploading: {
+        ...get().uploading,
+        [data.groupId]: data?.canceled ? undefined : data
+      }
+    })
 }));

apps/mobile/app/stores/use-setting-store.ts

@@ -103,6 +103,8 @@ export interface SettingStore extends State {
   sheetKeyboardHandler: boolean;
   requestBiometrics: boolean;
   setRequestBiometrics: (requestBiometrics: boolean) => void;
+  appDidEnterBackgroundForAction: boolean;
+  setAppDidEnterBackgroundForAction: (value: boolean) => void;
   insets: Insets;
   setInsets: (insets: Insets) => void;
   timeFormat: string;
@@ -155,7 +157,7 @@ export const defaultSettings: SettingStore["settings"] = {
   darkTheme: ThemeDark
 };
 
-export const useSettingStore = create<SettingStore>((set) => ({
+export const useSettingStore = create<SettingStore>((set, get) => ({
   settings: { ...defaultSettings },
   sheetKeyboardHandler: true,
   fullscreen: false,
@@ -174,6 +176,12 @@ export const useSettingStore = create<SettingStore>((set) => ({
   setInsets: (insets) => set({ insets }),
   timeFormat: "12-hour",
   dateFormat: "DD-MM-YYYY",
+  setAppDidEnterBackgroundForAction: (value: boolean) => {
+    set({
+      appDidEnterBackgroundForAction: value
+    });
+  },
+  appDidEnterBackgroundForAction: false,
   insets: initialWindowMetrics?.insets
     ? initialWindowMetrics.insets
     : { top: 0, right: 0, left: 0, bottom: 0 }

apps/mobile/app/utils/functions.js

@@ -107,46 +107,43 @@ export const deleteItems = async (item, context) => {
 
   if (topics?.length > 0) {
     const result = await confirmDeleteAllNotes(topics, "topic", context);
-    if (result.delete) {
-      for (const topic of topics) {
-        if (result.deleteNotes) {
+    if (!result.delete) return;
+    for (const topic of topics) {
+      if (result.deleteNotes) {
+        const notes = db.notebooks
+          .notebook(topic.notebookId)
+          .topics.topic(topic.id).all;
+        await db.notes.delete(...notes.map((note) => note.id));
+      }
+      await db.notebooks.notebook(topic.notebookId).topics.delete(topic.id);
+    }
+    useMenuStore.getState().setMenuPins();
+    ToastEvent.show({
+      heading: `${topics.length > 1 ? "Topics" : "Topic"} deleted`,
+      type: "success"
+    });
+  }
+
+  if (notebooks?.length > 0) {
+    const result = await confirmDeleteAllNotes(notebooks, "notebook", context);
+    if (!result.delete) return;
+    let ids = notebooks.map((i) => i.id);
+    if (result.deleteNotes) {
+      for (let id of ids) {
+        const notebook = db.notebooks.notebook(id);
+        const topics = notebook.topics.all;
+        for (let topic of topics) {
           const notes = db.notebooks
             .notebook(topic.notebookId)
             .topics.topic(topic.id).all;
           await db.notes.delete(...notes.map((note) => note.id));
         }
-        await db.notebooks.notebook(topic.notebookId).topics.delete(topic.id);
+        const notes = db.relations.from(notebook.data, "note");
+        await db.notes.delete(...notes.map((note) => note.id));
       }
-      useMenuStore.getState().setMenuPins();
-      ToastEvent.show({
-        heading: `${topics.length > 1 ? "Topics" : "Topic"} deleted`,
-        type: "success"
-      });
-    }
-  }
-
-  if (notebooks?.length > 0) {
-    const result = await confirmDeleteAllNotes(notebooks, "notebook", context);
-
-    if (result.delete) {
-      let ids = notebooks.map((i) => i.id);
-      if (result.deleteNotes) {
-        for (let id of ids) {
-          const notebook = db.notebooks.notebook(id);
-          const topics = notebook.topics.all;
-          for (let topic of topics) {
-            const notes = db.notebooks
-              .notebook(topic.notebookId)
-              .topics.topic(topic.id).all;
-            await db.notes.delete(...notes.map((note) => note.id));
-          }
-          const notes = db.relations.from(notebook.data, "note");
-          await db.notes.delete(...notes.map((note) => note.id));
-        }
-      }
-      await db.notebooks.delete(...ids);
-      useMenuStore.getState().setMenuPins();
     }
+    await db.notebooks.delete(...ids);
+    useMenuStore.getState().setMenuPins();
   }
 
   Navigation.queueRoutesForUpdate();

apps/mobile/app/utils/note-bundle.js

@@ -24,6 +24,12 @@ import RNFetchBlob from "react-native-blob-util";
 import { db } from "../common/database";
 import { IOS_APPGROUPID } from "./constants";
 
+const santizeUri = (uri) => {
+  uri = decodeURI(uri);
+  uri = Platform.OS === "ios" ? uri.replace("file:///", "/") : uri;
+  return uri;
+};
+
 export async function attachFile(uri, hash, type, filename, options) {
   try {
     let exists = db.attachments.exists(hash);
@@ -76,9 +82,7 @@ async function createNotes(bundle) {
 
   for (const file of bundle.files) {
     const uri =
-      Platform.OS === "ios"
-        ? `${file.value.replace("file://", "")}`
-        : `${file.value}`;
+      Platform.OS === "ios" ? santizeUri(file.value) : `${file.value}`;
     const hash = await Sodium.hashFile({
       uri: uri,
       type: "cache"

apps/mobile/e2e/tests/notebook.e2e.js

@@ -33,7 +33,7 @@ import {
   visibleById
 } from "./utils";
 
-async function createNotebook(
+export async function createNotebook(
   title = "Notebook 1",
   description = true,
   topic = true,

apps/mobile/e2e/tests/sort.e2e.js

@@ -18,6 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { notesnook } from "../test.ids";
+import { createNotebook } from "./notebook.e2e";
 import {
   tapById,
   visibleByText,
@@ -25,7 +26,8 @@ import {
   prepare,
   tapByText,
   notVisibleByText,
-  sleep
+  sleep,
+  navigate
 } from "./utils";
 
 async function sortBy(sorting, elementText = "Default") {
@@ -104,6 +106,23 @@ describe("Sort & filter", () => {
     await visibleByText("Month");
   });
 
+  it("Sort notes in topic", async () => {
+    await prepare();
+    await navigate("Notebooks");
+    await sleep(500);
+    await createNotebook("Notebook 1", true, true);
+    await sleep(500);
+    await device.pressBack();
+    await sleep(500);
+    await tapByText("Topic");
+    await createNote("A", "A letter");
+    await sleep(500);
+    await createNote("B", "B letter");
+    await sortBy("Abc");
+    await sleep(300);
+    await visibleByText("N");
+  });
+
   it("Compact mode", async () => {
     await prepare();
     await createNote("Note 1", "Note 1");

apps/mobile/native/android/app/build.gradle

@@ -111,7 +111,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode 2057
+        versionCode 2063
         versionName getNpmVersion()
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

apps/mobile/native/android/releasenotes/whatsnew-en-US

@@ -1,8 +1,3 @@
-- Added support for custom themes
-- Syntax highlighting and rendered Math in exports
-- Improved copy/pasting to and from Notesnook
-- Support copying link & link text in directly from the Link toolbar
-- Many other bug fixes and performance improvements
-
-Thank you for using Notesnook!
-
+- New backup format nnbackupz with upto 90% smaller backups
+- Improve UI of code blocks & language selection popup
+- Fixed some bugs in sync v2

apps/mobile/native/ios/Make Note/Info.plist

@@ -33,6 +33,8 @@
 		<dict>
 			<key>NSExtensionActivationRule</key>
 			<dict>
+				<key>NSExtensionActivationDictionaryVersion</key>
+				<integer>2</integer>
 				<key>NSExtensionActivationSupportsFileWithMaxCount</key>
 				<integer>5</integer>
 				<key>NSExtensionActivationSupportsImageWithMaxCount</key>

apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj

@@ -997,7 +997,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2050;
+				CURRENT_PROJECT_VERSION = 2056;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1071,7 +1071,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.6.1;
+				MARKETING_VERSION = 2.6.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1102,7 +1102,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2050;
+				CURRENT_PROJECT_VERSION = 2056;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1176,7 +1176,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.6.1;
+				MARKETING_VERSION = 2.6.5;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1335,7 +1335,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2050;
+				CURRENT_PROJECT_VERSION = 2056;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1347,7 +1347,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.1;
+				MARKETING_VERSION = 2.6.5;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
@@ -1378,7 +1378,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2050;
+				CURRENT_PROJECT_VERSION = 2056;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1391,7 +1391,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.1;
+				MARKETING_VERSION = 2.6.5;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1421,7 +1421,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Make Note/Make Note.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2050;
+				CURRENT_PROJECT_VERSION = 2056;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1495,7 +1495,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.1;
+				MARKETING_VERSION = 2.6.5;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
@@ -1526,7 +1526,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2050;
+				CURRENT_PROJECT_VERSION = 2056;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1601,7 +1601,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.1;
+				MARKETING_VERSION = 2.6.5;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
 				PRODUCT_NAME = "$(TARGET_NAME)";

apps/mobile/native/ios/Notesnook.xcodeproj/xcshareddata/xcschemes/Notesnook.xcscheme

@@ -63,7 +63,7 @@
       <EnvironmentVariables>
          <EnvironmentVariable
             key = "NSZombieEnabled"
-            value = "YES"
+            value = "NO"
             isEnabled = "YES">
          </EnvironmentVariable>
          <EnvironmentVariable
@@ -77,13 +77,6 @@
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
-      <AdditionalOptions>
-         <AdditionalOption
-            key = "NSZombieEnabled"
-            value = "YES"
-            isEnabled = "YES">
-         </AdditionalOption>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

apps/mobile/native/ios/Podfile.lock

@@ -327,7 +327,7 @@ PODS:
     - React-Core
   - react-native-keep-awake (1.2.0):
     - React-Core
-  - react-native-mmkv-storage (0.10.0-alpha.6):
+  - react-native-mmkv-storage (0.10.0-alpha.9):
     - MMKV (~> 1.3.1)
     - React
     - React-Core
@@ -347,7 +347,7 @@ PODS:
     - ReactCommon/turbomodule/core
   - react-native-share-extension (2.5.6):
     - React
-  - react-native-sodium (1.5.1):
+  - react-native-sodium (1.5.2):
     - React
   - react-native-webview (11.26.1):
     - React-Core
@@ -875,14 +875,14 @@ SPEC CHECKSUMS:
   react-native-image-resizer: 00ceb0e05586c7aadf061eea676957a6c2ec60fa
   react-native-in-app-review: db8bb167a5f238e7ceca5c242d6b36ce8c4404a4
   react-native-keep-awake: caee3ff89eaa21dfe29010f0d143566874a04441
-  react-native-mmkv-storage: a38beae34b1f7906a2f5e715f54216f9ddab14c0
+  react-native-mmkv-storage: d4ad55ab411b7f0d4e6269d801b31821ef48970b
   react-native-netinfo: ccbe1085dffd16592791d550189772e13bf479e2
   react-native-notification-sounds: da78c828fe1bcbb92d8b505d5261890ed315ff39
   react-native-orientation: f1caf84d65f1a4fd4511a18f2b924e634ad7a628
   react-native-pdf: 33c622cbdf776a649929e8b9d1ce2d313347c4fa
   react-native-safe-area-context: 36cc67648134e89465663b8172336a19eeda493d
   react-native-share-extension: df66a2ee48a62277d79898375e2142bde0782063
-  react-native-sodium: 08d459dfcb5d246363a30712d816acea56ab8f1c
+  react-native-sodium: 7d2bbb9ca840dc58d63f661b2ff733a38170fec5
   react-native-webview: 9f111dfbcfc826084d6c507f569e5e03342ee1c1
   React-NativeModulesApple: 1d81d927ef1a67a3545a01e14c2e98500bf9b199
   React-perflogger: 684a11499a0589cc42135d6d5cc04d0e4e0e261a

apps/mobile/native/package.json

@@ -7,7 +7,7 @@
   "dependencies": {
     "@ammarahmed/notifee-react-native": "7.4.4",
     "@ammarahmed/react-native-share-extension": "^2.5.5",
-    "@ammarahmed/react-native-sodium": "1.5.2",
+    "@ammarahmed/react-native-sodium": "1.5.4",
     "@bam.tech/react-native-image-resizer": "3.0.5",
     "@callstack/repack": "^3.2.0",
     "@react-native-clipboard/clipboard": "^1.9.0",
@@ -44,7 +44,7 @@
     "react-native-image-picker": "4.1.2",
     "react-native-in-app-review": "4.3.3",
     "react-native-keychain": "4.0.5",
-    "react-native-mmkv-storage": "^0.10.0-alpha.7",
+    "react-native-mmkv-storage": "^0.10.0-alpha.9",
     "react-native-modal-datetime-picker": "14.0.0",
     "react-native-navigation-bar-color": "2.0.2",
     "react-native-notification-sounds": "0.5.5",

apps/mobile/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/mobile",
-  "version": "2.6.1",
+  "version": "2.6.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/mobile",
-      "version": "2.6.1",
+      "version": "2.6.5",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "workspaces": [
@@ -22,9 +22,9 @@
         "@notesnook/logger": "file:../../packages/logger",
         "@notesnook/themes-server": "file:../../servers/themes",
         "@tanstack/react-query": "^4.29.19",
-        "@trpc/client": "10.31.0",
-        "@trpc/react-query": "10.31.0",
-        "@trpc/server": "^10.31.0",
+        "@trpc/client": "10.38.3",
+        "@trpc/react-query": "10.38.3",
+        "@trpc/server": "10.38.3",
         "react": "18.2.0",
         "react-native": "0.72.0"
       },
@@ -85,9 +85,11 @@
         "abortcontroller-polyfill": "^1.7.3",
         "cross-env": "^7.0.3",
         "dotenv": "^16.0.1",
+        "event-source-polyfill": "^1.0.31",
         "eventsource": "^2.0.2",
-        "happy-dom": "^10.9.0",
+        "hash-wasm": "^4.9.0",
         "isomorphic-fetch": "^3.0.0",
+        "jsdom": "^22.1.0",
         "mockdate": "^3.0.5",
         "otplib": "^12.0.1",
         "refractor": "^4.8.1",
@@ -101,40 +103,43 @@
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {
-        "@emotion/react": "^11.10.0",
+        "@emotion/react": "11.11.1",
         "@notesnook/core": "file:../core",
         "@notesnook/theme": "file:../theme",
         "@notesnook/ui": "file:../ui",
         "@social-embed/lib": "^0.0.2-next.1",
         "@theme-ui/components": ">=0.14.0",
         "@theme-ui/core": ">=0.14.0",
-        "@tiptap/core": "2.0.3",
-        "@tiptap/extension-character-count": "2.0.3",
-        "@tiptap/extension-color": "2.0.3",
-        "@tiptap/extension-font-family": "2.0.3",
-        "@tiptap/extension-history": "2.0.3",
-        "@tiptap/extension-horizontal-rule": "2.0.3",
-        "@tiptap/extension-link": "2.0.3",
-        "@tiptap/extension-placeholder": "2.0.3",
-        "@tiptap/extension-subscript": "2.0.3",
-        "@tiptap/extension-superscript": "2.0.3",
-        "@tiptap/extension-table": "2.0.3",
-        "@tiptap/extension-table-cell": "2.0.3",
-        "@tiptap/extension-table-header": "2.0.3",
-        "@tiptap/extension-table-row": "2.0.3",
-        "@tiptap/extension-task-item": "2.0.3",
-        "@tiptap/extension-task-list": "2.0.3",
-        "@tiptap/extension-text-align": "2.0.3",
-        "@tiptap/extension-text-style": "2.0.3",
-        "@tiptap/extension-underline": "2.0.3",
-        "@tiptap/pm": "2.0.3",
-        "@tiptap/starter-kit": "2.0.3",
+        "@tiptap/core": "2.1.7",
+        "@tiptap/extension-character-count": "2.1.7",
+        "@tiptap/extension-color": "2.1.7",
+        "@tiptap/extension-font-family": "2.1.7",
+        "@tiptap/extension-history": "2.1.7",
+        "@tiptap/extension-horizontal-rule": "2.1.7",
+        "@tiptap/extension-link": "2.1.7",
+        "@tiptap/extension-list-keymap": "2.1.7",
+        "@tiptap/extension-placeholder": "2.1.7",
+        "@tiptap/extension-subscript": "2.1.7",
+        "@tiptap/extension-superscript": "2.1.7",
+        "@tiptap/extension-table": "2.1.7",
+        "@tiptap/extension-table-cell": "2.1.7",
+        "@tiptap/extension-table-header": "2.1.7",
+        "@tiptap/extension-table-row": "2.1.7",
+        "@tiptap/extension-task-item": "2.1.7",
+        "@tiptap/extension-task-list": "2.1.7",
+        "@tiptap/extension-text-align": "2.1.7",
+        "@tiptap/extension-text-style": "2.1.7",
+        "@tiptap/extension-underline": "2.1.7",
+        "@tiptap/pm": "2.1.7",
+        "@tiptap/starter-kit": "2.1.7",
         "clipboard-polyfill": "4.0.0",
         "detect-indent": "^7.0.0",
+        "entities": "^4.5.0",
         "katex": "0.16.4",
         "nanoid": "^4.0.1",
         "prism-themes": "^1.9.0",
-        "prosemirror-codemark": "^0.4.1",
+        "prosemirror-codemark": "^0.4.2",
+        "prosemirror-view": "^1.31.7",
         "re-resizable": "^6.9.9",
         "react-colorful": "^5.5.1",
         "react-modal": "3.13.1",
@@ -191,14 +196,17 @@
         "zustand": "^3.6.8"
       },
       "devDependencies": {
+        "@playwright/test": "^1.37.1",
         "@testing-library/jest-dom": "^5.16.0",
         "@testing-library/react": "^11.2.7",
         "@testing-library/user-event": "^12.8.3",
+        "@types/ip": "^1.1.0",
         "@types/jest": "^27.0.3",
         "@types/node": "^16.11.11",
         "@types/react": "^17.0.2",
         "@types/react-dom": "^17.0.2",
         "env-cmd": "^10.1.0",
+        "ip": "^1.1.8",
         "react-error-overlay": "6.0.9",
         "react-scripts": "^5.0.1",
         "web-vitals": "^1.1.2"
@@ -216,7 +224,7 @@
       "license": "ISC",
       "dependencies": {
         "@orama/orama": "^1.0.8",
-        "@trpc/server": "10.31.0",
+        "@trpc/server": "10.38.3",
         "async-mutex": "^0.4.0",
         "cors": "^2.8.5",
         "util": "^0.12.5",
@@ -273,7 +281,7 @@
         "@ammarahmed/notifee-react-native": "7.4.4",
         "@ammarahmed/react-native-eventsource": "1.1.0",
         "@ammarahmed/react-native-share-extension": "^2.5.5",
-        "@ammarahmed/react-native-sodium": "1.5.2",
+        "@ammarahmed/react-native-sodium": "1.5.4",
         "@bam.tech/react-native-image-resizer": "3.0.5",
         "@callstack/repack": "^3.2.0",
         "@react-native-clipboard/clipboard": "^1.9.0",
@@ -309,7 +317,7 @@
         "react-native-image-picker": "4.1.2",
         "react-native-in-app-review": "4.3.3",
         "react-native-keychain": "4.0.5",
-        "react-native-mmkv-storage": "^0.10.0-alpha.7",
+        "react-native-mmkv-storage": "^0.10.0-alpha.9",
         "react-native-modal-datetime-picker": "14.0.0",
         "react-native-navigation-bar-color": "2.0.2",
         "react-native-notification-sounds": "0.5.5",
@@ -2411,9 +2419,9 @@
       }
     },
     "node_modules/@ammarahmed/react-native-sodium": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/@ammarahmed/react-native-sodium/-/react-native-sodium-1.5.2.tgz",
-      "integrity": "sha512-M309uV2DCK3EPNfsgWYthOApJhQgQKOOxYF19VerUeX7UYnm9VggW073oO0NNqqZqg5GS6bTlrtYMAz7MAKvUw=="
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@ammarahmed/react-native-sodium/-/react-native-sodium-1.5.4.tgz",
+      "integrity": "sha512-+JwYnaSJxnwpI1947sUacFXxRxK1f9ykuxDJaGkCUKvh5CkDYC5VyZFnq2BbcuIcx4OTMOG8a/a46hWJbFKQPQ=="
     },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.1",
@@ -7006,35 +7014,35 @@
       "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A=="
     },
     "node_modules/@trpc/client": {
-      "version": "10.31.0",
-      "resolved": "https://registry.npmjs.org/@trpc/client/-/client-10.31.0.tgz",
-      "integrity": "sha512-VCqbJEvFJb8C4hQFw7AD+dkQTjgEdV/QAzO4D+/cX5e93u5NpfNXI+PKS0QFXwG/zqgwQwVV6OkYc/D/MFwA6g==",
+      "version": "10.38.3",
+      "resolved": "https://registry.npmjs.org/@trpc/client/-/client-10.38.3.tgz",
+      "integrity": "sha512-hHPsElTL4sB+UGzuAZ4iwRVHjELrk/Nsl2owsYw9ITJz3EY7VWRsQ6vK48kJvlHPYPhP+efID5UOgyZMs4bFXA==",
       "funding": [
         "https://trpc.io/sponsor"
       ],
       "peerDependencies": {
-        "@trpc/server": "10.31.0"
+        "@trpc/server": "10.38.3"
       }
     },
     "node_modules/@trpc/react-query": {
-      "version": "10.31.0",
-      "resolved": "https://registry.npmjs.org/@trpc/react-query/-/react-query-10.31.0.tgz",
-      "integrity": "sha512-+M8sIsbf6e4H5XYvHlzDqhaf+ybfUigA/9OL3wXRp2vXhCedEiIERCnwNuHWFDRASl9vjOcM33AuJ4sbOOINEA==",
+      "version": "10.38.3",
+      "resolved": "https://registry.npmjs.org/@trpc/react-query/-/react-query-10.38.3.tgz",
+      "integrity": "sha512-j4xxg/y+vssGinZCrNQy0SMJNL2Nv8k3HcqMKa2mYt3jxOpaHuwxgarWvLWVqrUJqvp1JpGJ9sIjlOAZam5FeQ==",
       "funding": [
         "https://trpc.io/sponsor"
       ],
       "peerDependencies": {
         "@tanstack/react-query": "^4.18.0",
-        "@trpc/client": "10.31.0",
-        "@trpc/server": "10.31.0",
+        "@trpc/client": "10.38.3",
+        "@trpc/server": "10.38.3",
         "react": ">=16.8.0",
         "react-dom": ">=16.8.0"
       }
     },
     "node_modules/@trpc/server": {
-      "version": "10.31.0",
-      "resolved": "https://registry.npmjs.org/@trpc/server/-/server-10.31.0.tgz",
-      "integrity": "sha512-9EnRTSDE9nF11LZsvSOqNKqkRYzHqFX4ch5AJ6VIu8uta2vxVTN4FxxsNRSOluTzVYZDeaCISbwmOJ5iihCCIg==",
+      "version": "10.38.3",
+      "resolved": "https://registry.npmjs.org/@trpc/server/-/server-10.38.3.tgz",
+      "integrity": "sha512-9s8/kwo2IDB5hwB2SKZZrfevRhdb1f9fdXtIYd3lbQuf2jQaC/LyQuHaIQjDQoUx9updBfsHXcFFPiCP1DL6pg==",
       "funding": [
         "https://trpc.io/sponsor"
       ]
@@ -18254,9 +18262,9 @@
       "integrity": "sha512-TbiO8AO055EPjaxIuKxrCEOB4r81uQCVDFbtcs+e4pEOHxf6z3JgDC0UU0poJElKfCh37b+TFRxQhg6DbsYJBA=="
     },
     "node_modules/react-native-mmkv-storage": {
-      "version": "0.10.0-alpha.7",
-      "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.10.0-alpha.7.tgz",
-      "integrity": "sha512-MCMLMh0NYB4U9My/AZxdcfd/Skg7Pqfe+BHI5aMgV7+HUfAtEA08OX7FGPK6WCVFkNm0JSJt6VSthla/xNWZDg==",
+      "version": "0.10.0-alpha.9",
+      "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.10.0-alpha.9.tgz",
+      "integrity": "sha512-nv1A0t5dxhcAtMnhqqBodNp94U4QziW1RO352GB3BPpic03abPHj+0HjBJH72VeKKMfYIc0PR5pmo6BbsaPExw==",
       "bin": {
         "mmkv-link": "autolink/postlink/run.js"
       },
@@ -23695,9 +23703,9 @@
       }
     },
     "@ammarahmed/react-native-sodium": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/@ammarahmed/react-native-sodium/-/react-native-sodium-1.5.2.tgz",
-      "integrity": "sha512-M309uV2DCK3EPNfsgWYthOApJhQgQKOOxYF19VerUeX7UYnm9VggW073oO0NNqqZqg5GS6bTlrtYMAz7MAKvUw=="
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@ammarahmed/react-native-sodium/-/react-native-sodium-1.5.4.tgz",
+      "integrity": "sha512-+JwYnaSJxnwpI1947sUacFXxRxK1f9ykuxDJaGkCUKvh5CkDYC5VyZFnq2BbcuIcx4OTMOG8a/a46hWJbFKQPQ=="
     },
     "@ampproject/remapping": {
       "version": "2.2.1",
@@ -26432,11 +26440,13 @@
         "dayjs": "1.11.9",
         "dotenv": "^16.0.1",
         "entities": "^4.3.1",
+        "event-source-polyfill": "^1.0.31",
         "eventsource": "^2.0.2",
-        "happy-dom": "^10.9.0",
+        "hash-wasm": "^4.9.0",
         "html-to-text": "^9.0.5",
         "htmlparser2": "^8.0.1",
         "isomorphic-fetch": "^3.0.0",
+        "jsdom": "^22.1.0",
         "katex": "0.16.2",
         "linkedom": "^0.14.17",
         "liqe": "^1.13.0",
@@ -26454,7 +26464,7 @@
     "@notesnook/editor": {
       "version": "file:../../packages/editor",
       "requires": {
-        "@emotion/react": "^11.10.0",
+        "@emotion/react": "11.11.1",
         "@mdi/js": "^7.2.96",
         "@mdi/react": "^1.6.1",
         "@notesnook/core": "file:../core",
@@ -26463,27 +26473,28 @@
         "@social-embed/lib": "^0.0.2-next.1",
         "@theme-ui/components": ">=0.14.0",
         "@theme-ui/core": ">=0.14.0",
-        "@tiptap/core": "2.0.3",
-        "@tiptap/extension-character-count": "2.0.3",
-        "@tiptap/extension-color": "2.0.3",
-        "@tiptap/extension-font-family": "2.0.3",
-        "@tiptap/extension-history": "2.0.3",
-        "@tiptap/extension-horizontal-rule": "2.0.3",
-        "@tiptap/extension-link": "2.0.3",
-        "@tiptap/extension-placeholder": "2.0.3",
-        "@tiptap/extension-subscript": "2.0.3",
-        "@tiptap/extension-superscript": "2.0.3",
-        "@tiptap/extension-table": "2.0.3",
-        "@tiptap/extension-table-cell": "2.0.3",
-        "@tiptap/extension-table-header": "2.0.3",
-        "@tiptap/extension-table-row": "2.0.3",
-        "@tiptap/extension-task-item": "2.0.3",
-        "@tiptap/extension-task-list": "2.0.3",
-        "@tiptap/extension-text-align": "2.0.3",
-        "@tiptap/extension-text-style": "2.0.3",
-        "@tiptap/extension-underline": "2.0.3",
-        "@tiptap/pm": "2.0.3",
-        "@tiptap/starter-kit": "2.0.3",
+        "@tiptap/core": "2.1.7",
+        "@tiptap/extension-character-count": "2.1.7",
+        "@tiptap/extension-color": "2.1.7",
+        "@tiptap/extension-font-family": "2.1.7",
+        "@tiptap/extension-history": "2.1.7",
+        "@tiptap/extension-horizontal-rule": "2.1.7",
+        "@tiptap/extension-link": "2.1.7",
+        "@tiptap/extension-list-keymap": "2.1.7",
+        "@tiptap/extension-placeholder": "2.1.7",
+        "@tiptap/extension-subscript": "2.1.7",
+        "@tiptap/extension-superscript": "2.1.7",
+        "@tiptap/extension-table": "2.1.7",
+        "@tiptap/extension-table-cell": "2.1.7",
+        "@tiptap/extension-table-header": "2.1.7",
+        "@tiptap/extension-table-row": "2.1.7",
+        "@tiptap/extension-task-item": "2.1.7",
+        "@tiptap/extension-task-list": "2.1.7",
+        "@tiptap/extension-text-align": "2.1.7",
+        "@tiptap/extension-text-style": "2.1.7",
+        "@tiptap/extension-underline": "2.1.7",
+        "@tiptap/pm": "2.1.7",
+        "@tiptap/starter-kit": "2.1.7",
         "@types/katex": "^0.14.0",
         "@types/prismjs": "^1.26.0",
         "@types/react": "17.0.2",
@@ -26493,14 +26504,16 @@
         "@types/tinycolor2": "^1.4.3",
         "clipboard-polyfill": "4.0.0",
         "detect-indent": "^7.0.0",
+        "entities": "^4.5.0",
         "framer-motion": "^6.5.1",
         "happy-dom": "^8.9.0",
         "isomorphic-fetch": "^3.0.0",
         "katex": "0.16.4",
         "nanoid": "^4.0.1",
         "prism-themes": "^1.9.0",
-        "prosemirror-codemark": "^0.4.1",
+        "prosemirror-codemark": "^0.4.2",
         "prosemirror-test-builder": "^1.1.0",
+        "prosemirror-view": "^1.31.7",
         "re-resizable": "^6.9.9",
         "react": "17.0.2",
         "react-colorful": "^5.5.1",
@@ -26524,15 +26537,18 @@
         "@mdi/react": "^1.6.0",
         "@notesnook/editor": "file:../editor",
         "@notesnook/theme": "file:../theme",
+        "@playwright/test": "^1.37.1",
         "@testing-library/jest-dom": "^5.16.0",
         "@testing-library/react": "^11.2.7",
         "@testing-library/user-event": "^12.8.3",
+        "@types/ip": "^1.1.0",
         "@types/jest": "^27.0.3",
         "@types/node": "^16.11.11",
         "@types/react": "^17.0.2",
         "@types/react-dom": "^17.0.2",
         "env-cmd": "^10.1.0",
         "framer-motion": "^6.5.1",
+        "ip": "^1.1.8",
         "mdi-react": "9.1.0",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
@@ -26584,7 +26600,7 @@
         "@ammarahmed/notifee-react-native": "7.4.4",
         "@ammarahmed/react-native-eventsource": "1.1.0",
         "@ammarahmed/react-native-share-extension": "^2.5.5",
-        "@ammarahmed/react-native-sodium": "1.5.2",
+        "@ammarahmed/react-native-sodium": "1.5.4",
         "@babel/core": "^7.20.0",
         "@babel/eslint-parser": "^7.16.5",
         "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.5",
@@ -26657,7 +26673,7 @@
         "react-native-image-picker": "4.1.2",
         "react-native-in-app-review": "4.3.3",
         "react-native-keychain": "4.0.5",
-        "react-native-mmkv-storage": "^0.10.0-alpha.7",
+        "react-native-mmkv-storage": "^0.10.0-alpha.9",
         "react-native-modal-datetime-picker": "14.0.0",
         "react-native-navigation-bar-color": "2.0.2",
         "react-native-notification-sounds": "0.5.5",
@@ -26704,7 +26720,7 @@
       "requires": {
         "@notesnook/theme": "file:../../packages/theme",
         "@orama/orama": "^1.0.8",
-        "@trpc/server": "10.31.0",
+        "@trpc/server": "10.38.3",
         "@types/cors": "^2.8.13",
         "@vitejs/plugin-react": "^4.0.3",
         "async-mutex": "^0.4.0",
@@ -27313,21 +27329,21 @@
       "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A=="
     },
     "@trpc/client": {
-      "version": "10.31.0",
-      "resolved": "https://registry.npmjs.org/@trpc/client/-/client-10.31.0.tgz",
-      "integrity": "sha512-VCqbJEvFJb8C4hQFw7AD+dkQTjgEdV/QAzO4D+/cX5e93u5NpfNXI+PKS0QFXwG/zqgwQwVV6OkYc/D/MFwA6g==",
+      "version": "10.38.3",
+      "resolved": "https://registry.npmjs.org/@trpc/client/-/client-10.38.3.tgz",
+      "integrity": "sha512-hHPsElTL4sB+UGzuAZ4iwRVHjELrk/Nsl2owsYw9ITJz3EY7VWRsQ6vK48kJvlHPYPhP+efID5UOgyZMs4bFXA==",
       "requires": {}
     },
     "@trpc/react-query": {
-      "version": "10.31.0",
-      "resolved": "https://registry.npmjs.org/@trpc/react-query/-/react-query-10.31.0.tgz",
-      "integrity": "sha512-+M8sIsbf6e4H5XYvHlzDqhaf+ybfUigA/9OL3wXRp2vXhCedEiIERCnwNuHWFDRASl9vjOcM33AuJ4sbOOINEA==",
+      "version": "10.38.3",
+      "resolved": "https://registry.npmjs.org/@trpc/react-query/-/react-query-10.38.3.tgz",
+      "integrity": "sha512-j4xxg/y+vssGinZCrNQy0SMJNL2Nv8k3HcqMKa2mYt3jxOpaHuwxgarWvLWVqrUJqvp1JpGJ9sIjlOAZam5FeQ==",
       "requires": {}
     },
     "@trpc/server": {
-      "version": "10.31.0",
-      "resolved": "https://registry.npmjs.org/@trpc/server/-/server-10.31.0.tgz",
-      "integrity": "sha512-9EnRTSDE9nF11LZsvSOqNKqkRYzHqFX4ch5AJ6VIu8uta2vxVTN4FxxsNRSOluTzVYZDeaCISbwmOJ5iihCCIg=="
+      "version": "10.38.3",
+      "resolved": "https://registry.npmjs.org/@trpc/server/-/server-10.38.3.tgz",
+      "integrity": "sha512-9s8/kwo2IDB5hwB2SKZZrfevRhdb1f9fdXtIYd3lbQuf2jQaC/LyQuHaIQjDQoUx9updBfsHXcFFPiCP1DL6pg=="
     },
     "@tsconfig/react-native": {
       "version": "3.0.2",
@@ -35790,9 +35806,9 @@
       "integrity": "sha512-TbiO8AO055EPjaxIuKxrCEOB4r81uQCVDFbtcs+e4pEOHxf6z3JgDC0UU0poJElKfCh37b+TFRxQhg6DbsYJBA=="
     },
     "react-native-mmkv-storage": {
-      "version": "0.10.0-alpha.7",
-      "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.10.0-alpha.7.tgz",
-      "integrity": "sha512-MCMLMh0NYB4U9My/AZxdcfd/Skg7Pqfe+BHI5aMgV7+HUfAtEA08OX7FGPK6WCVFkNm0JSJt6VSthla/xNWZDg==",
+      "version": "0.10.0-alpha.9",
+      "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.10.0-alpha.9.tgz",
+      "integrity": "sha512-nv1A0t5dxhcAtMnhqqBodNp94U4QziW1RO352GB3BPpic03abPHj+0HjBJH72VeKKMfYIc0PR5pmo6BbsaPExw==",
       "requires": {}
     },
     "react-native-modal-datetime-picker": {

apps/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notesnook/mobile",
-  "version": "2.6.1",
+  "version": "2.6.5",
   "private": true,
   "license": "GPL-3.0-or-later",
   "workspaces": [
@@ -37,9 +37,9 @@
     "@notesnook/logger": "file:../../packages/logger",
     "@notesnook/themes-server": "file:../../servers/themes",
     "@tanstack/react-query": "^4.29.19",
-    "@trpc/client": "10.31.0",
-    "@trpc/react-query": "10.31.0",
-    "@trpc/server": "^10.31.0",
+    "@trpc/client": "10.38.3",
+    "@trpc/react-query": "10.38.3",
+    "@trpc/server": "10.38.3",
     "react": "18.2.0",
     "react-native": "0.72.0"
   }

apps/mobile/share/share.js

@@ -377,7 +377,11 @@ const ShareView = ({ quicknote = false }) => {
     });
 
     try {
-      await db.sync(false, false);
+      if (!globalThis["IS_MAIN_APP_RUNNING"]) {
+        await db.sync(false, false);
+      } else {
+        console.log("main app running, skipping sync");
+      }
     } catch (e) {
       console.log(e, e.stack);
     }
@@ -598,8 +602,9 @@ const ShareView = ({ quicknote = false }) => {
                     marginBottom: 0
                   }}
                   loading={loading}
-                  iconColor={colors.static.white}
+                  iconColor={colors.primary.accentForeground}
                   onPress={onPress}
+                  textColor={colors.primary.accentForeground}
                   textStyle={{
                     fontSize: 16,
                     marginLeft: 0

apps/mobile/share/store.js

@@ -42,20 +42,24 @@ let appSettings = MMKV.getString(StorageKeys.appSettings);
 if (appSettings) {
   appSettings = JSON.parse(appSettings);
 }
+
+const systemColorScheme = Appearance.getColorScheme();
+const appColorScheme = appSettings?.colorScheme;
+const useSystemTheme = appSettings?.useSystemTheme;
+const currentColorScheme = useSystemTheme ? systemColorScheme : appColorScheme;
+
 const theme =
-  Appearance.getColorScheme() !== "dark"
-    ? appSettings?.darkThem
+  currentColorScheme === "dark"
+    ? appSettings?.darkTheme
     : appSettings?.lightTheme;
 
-useThemeEngineStore
-  .getState()
-  .setTheme(
-    theme || (Appearance.getColorScheme() === "dark" ? ThemeDark : ThemeLight)
-  );
+const currentTheme =
+  theme || (currentColorScheme === "dark" ? ThemeDark : ThemeLight);
+
+useThemeEngineStore.getState().setTheme(currentTheme);
 
 export const useShareStore = create((set) => ({
-  theme:
-    theme || (Appearance.getColorScheme() === "dark" ? ThemeDark : ThemeLight),
+  theme: currentTheme,
   appendNote: null,
   setAppendNote: (note) => {
     MMKV.setItem(StorageKeys.appendNote, JSON.stringify(note));

apps/theme-builder/package-lock.json

@@ -17,6 +17,7 @@
         "@notesnook/web": "file:../web",
         "@theme-ui/components": "^0.14.7",
         "@theme-ui/core": "^0.14.7",
+        "@trpc/client": "^10.38.3",
         "clipboard-polyfill": "^4.0.0",
         "file-saver": "^2.0.5",
         "katex": "^0.16.2",
@@ -210,17 +211,6 @@
       },
       "devDependencies": {}
     },
-    "../../packages/crypto-worker": {
-      "name": "@notesnook/crypto-worker",
-      "version": "1.0.0",
-      "extraneous": true,
-      "license": "GPL-3.0-or-later",
-      "dependencies": {
-        "@notesnook/crypto": "file:../crypto",
-        "comlink": "^4.3.1"
-      },
-      "devDependencies": {}
-    },
     "../../packages/editor": {
       "name": "@notesnook/editor",
       "version": "1.6.1",
@@ -1387,7 +1377,7 @@
     },
     "../web": {
       "name": "@notesnook/web",
-      "version": "2.6.1",
+      "version": "2.6.5",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@aws-sdk/util-base64-browser": "^3.208.0",
@@ -1402,7 +1392,6 @@
         "@notesnook/common": "file:../../packages/common",
         "@notesnook/core": "file:../../packages/core",
         "@notesnook/crypto": "file:../../packages/crypto",
-        "@notesnook/crypto-worker": "file:../../packages/crypto-worker",
         "@notesnook/desktop": "file:../desktop",
         "@notesnook/editor": "file:../../packages/editor",
         "@notesnook/logger": "file:../../packages/logger",
@@ -1417,8 +1406,8 @@
         "@theme-ui/color": "^0.14.7",
         "@theme-ui/components": "^0.14.7",
         "@theme-ui/core": "^0.14.7",
-        "@trpc/client": "10.31.0",
-        "@trpc/react-query": "10.31.0",
+        "@trpc/client": "10.38.3",
+        "@trpc/react-query": "10.38.3",
         "allotment": "^1.19.0",
         "axios": "^1.3.4",
         "clipboard-polyfill": "4.0.0",
@@ -1457,7 +1446,7 @@
       "devDependencies": {
         "@babel/core": "^7.22.5",
         "@playwright/test": "^1.36.2",
-        "@trpc/server": "10.31.0",
+        "@trpc/server": "10.38.3",
         "@types/babel__core": "^7.20.1",
         "@types/file-saver": "^2.0.5",
         "@types/marked": "^4.0.7",
@@ -2406,6 +2395,26 @@
         "react": ">16"
       }
     },
+    "node_modules/@trpc/client": {
+      "version": "10.38.3",
+      "resolved": "https://registry.npmjs.org/@trpc/client/-/client-10.38.3.tgz",
+      "integrity": "sha512-hHPsElTL4sB+UGzuAZ4iwRVHjELrk/Nsl2owsYw9ITJz3EY7VWRsQ6vK48kJvlHPYPhP+efID5UOgyZMs4bFXA==",
+      "funding": [
+        "https://trpc.io/sponsor"
+      ],
+      "peerDependencies": {
+        "@trpc/server": "10.38.3"
+      }
+    },
+    "node_modules/@trpc/server": {
+      "version": "10.38.3",
+      "resolved": "https://registry.npmjs.org/@trpc/server/-/server-10.38.3.tgz",
+      "integrity": "sha512-9s8/kwo2IDB5hwB2SKZZrfevRhdb1f9fdXtIYd3lbQuf2jQaC/LyQuHaIQjDQoUx9updBfsHXcFFPiCP1DL6pg==",
+      "funding": [
+        "https://trpc.io/sponsor"
+      ],
+      "peer": true
+    },
     "node_modules/@types/babel__core": {
       "version": "7.20.1",
       "dev": true,

apps/theme-builder/package.json

@@ -16,6 +16,7 @@
     "@notesnook/web": "file:../web",
     "@theme-ui/components": "^0.14.7",
     "@theme-ui/core": "^0.14.7",
+    "@trpc/client": "^10.38.3",
     "clipboard-polyfill": "^4.0.0",
     "file-saver": "^2.0.5",
     "katex": "^0.16.2",

apps/theme-builder/src/components/theme-builder/index.tsx

@@ -23,7 +23,8 @@ import {
   ThemeDefinition,
   THEME_SCOPES,
   Variants,
-  validateTheme
+  validateTheme,
+  ALPHA_COLORS
 } from "@notesnook/theme";
 import { Button, Flex, Input, Text } from "@theme-ui/components";
 import FileSaver from "file-saver";
@@ -44,14 +45,15 @@ const JSON_SCHEMA_URL =
   "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json";
 const ThemeInfoTemplate: Omit<
   ThemeDefinition,
-  "authors" | "compatibilityVersion" | "colorScheme" | "codeBlockCSS" | "scopes"
+  "authors" | "compatibilityVersion" | "colorScheme" | "scopes"
 > = {
   name: "",
   id: "",
   version: 0,
   license: "",
   homepage: "",
-  description: ""
+  description: "",
+  codeBlockCSS: "https://github.com/PrismJS/prism-themes/tree/master/themes"
 };
 
 export default function ThemeBuilder() {
@@ -302,7 +304,7 @@ export default function ThemeBuilder() {
           paddingX: "10px"
         }}
       >
-        {Object.keys(ThemeInfoTemplate).map((key) => {
+        {Object.keys(ThemeInfoTemplate).map((key: string) => {
           return (
             <Field
               key={`${getThemeKey(currentTheme)}-${key}`}
@@ -355,7 +357,7 @@ export default function ThemeBuilder() {
           key="compatibilityVersion"
         />
 
-        {authors.map((author, index) => (
+        {authors.map((author, index: number) => (
           <Flex
             key={`${getThemeKey(currentTheme)}-${author.name}`}
             sx={{
@@ -524,9 +526,7 @@ export default function ThemeBuilder() {
                             }
                           }}
                           title={
-                            /hover|shade|backdrop|textSelection/g.test(
-                              colorName
-                            )
+                            ALPHA_COLORS.includes(colorName)
                               ? `Hex RGB & ARGB values both are supported. (e.g. #dbdbdb99)`
                               : `Only Hex RGB values are supported. No Alpha. (e.g. #f33ff3)`
                           }
@@ -555,9 +555,7 @@ export default function ThemeBuilder() {
                             );
                           }}
                           title={
-                            /hover|shade|backdrop|textSelection/g.test(
-                              colorName
-                            )
+                            ALPHA_COLORS.includes(colorName)
                               ? `Only Hex RGB values are supported. No Alpha. (e.g. #f33ff3)`
                               : `Hex RGB & ARGB values both are supported. (e.g. #dbdbdb99)`
                           }
@@ -645,13 +643,25 @@ function exportTheme(theme: ThemeDefinition) {
     }),
     `${theme.id}.json`
   );
+  const confirmed = window.confirm(
+    "Do you also want to download code-block.css for this theme?"
+  );
+  if (confirmed) {
+    FileSaver.saveAs(
+      new Blob([theme.codeBlockCSS], {
+        type: "text/plain"
+      }),
+      `code-block.css`
+    );
+  }
 }
 
 function themeToJSON(theme: ThemeDefinition) {
   return JSON.stringify(
     {
       $schema: JSON_SCHEMA_URL,
-      ...theme
+      ...theme,
+      codeBlockCSS: undefined
     },
     undefined,
     2
@@ -698,7 +708,10 @@ function getThemeFromFormData(
 function toTitleCase(value: string) {
   return (
     value.slice(0, 1).toUpperCase() +
-    value.slice(1).replace(/([A-Z]+)*([A-Z][a-z])/g, "$1 $2")
+    value
+      .slice(1)
+      .replace(/([A-Z]+)/g, " $1")
+      .replace(/([A-Z][a-z])/g, " $1")
   );
 }
 

apps/vericrypt/package-lock.json

@@ -11,7 +11,6 @@
         "@emotion/react": "^11.10.0",
         "@microsoft/signalr-protocol-msgpack": "^7.0.9",
         "@notesnook/crypto": "file:../../packages/crypto",
-        "@notesnook/crypto-worker": "file:../../packages/crypto-worker",
         "@notesnook/theme": "1.2.0",
         "@theme-ui/components": "^0.14.7",
         "@theme-ui/core": "^0.14.7",
@@ -42,16 +41,6 @@
       },
       "devDependencies": {}
     },
-    "../../packages/crypto-worker": {
-      "name": "@notesnook/crypto-worker",
-      "version": "1.0.0",
-      "license": "GPL-3.0-or-later",
-      "dependencies": {
-        "@notesnook/crypto": "file:../crypto",
-        "comlink": "^4.3.1"
-      },
-      "devDependencies": {}
-    },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
@@ -915,10 +904,6 @@
       "resolved": "../../packages/crypto",
       "link": true
     },
-    "node_modules/@notesnook/crypto-worker": {
-      "resolved": "../../packages/crypto-worker",
-      "link": true
-    },
     "node_modules/@notesnook/theme": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@notesnook/theme/-/theme-1.2.0.tgz",

apps/vericrypt/package.json

@@ -16,7 +16,6 @@
     "@emotion/react": "^11.10.0",
     "@microsoft/signalr-protocol-msgpack": "^7.0.9",
     "@notesnook/crypto": "file:../../packages/crypto",
-    "@notesnook/crypto-worker": "file:../../packages/crypto-worker",
     "@notesnook/theme": "1.2.0",
     "@theme-ui/components": "^0.14.7",
     "@theme-ui/core": "^0.14.7",

apps/web/__e2e__/backups.test.ts

@@ -74,3 +74,30 @@ test("restore an encrypted backup", async ({ page }) => {
   const notebooks = await app.goToNotebooks();
   expect(await notebooks.isEmpty()).toBeFalsy();
 });
+
+test("turning off encrypted backups should ask for password", async ({
+  page
+}) => {
+  const app = new AppModel(page);
+  await app.auth.goto();
+  await app.auth.login(USER.CURRENT);
+  const settings = await app.goToSettings();
+
+  await settings.toggleBackupEncryption(USER.CURRENT.password);
+
+  expect(await settings.isBackupEncryptionEnabled(false)).toBe(false);
+});
+
+test("turning on encrypted backups should not ask for password", async ({
+  page
+}) => {
+  const app = new AppModel(page);
+  await app.auth.goto();
+  await app.auth.login(USER.CURRENT);
+  const settings = await app.goToSettings();
+  await settings.toggleBackupEncryption(USER.CURRENT.password);
+
+  await settings.toggleBackupEncryption();
+
+  expect(await settings.isBackupEncryptionEnabled(true)).toBe(true);
+});

apps/web/__e2e__/models/settings-view.model.ts

@@ -84,16 +84,32 @@ export class SettingsViewModel {
     return !!(await item?.getTitle());
   }
 
-  async createBackup(password?: string) {
+  async isBackupEncryptionEnabled(state: boolean) {
+    const encyptBackups = this.page
+      .locator(getTestId("setting-encrypt-backups"))
+      .locator(
+        state ? `input[data-checked="true"]` : `input[data-checked="false"]`
+      );
+    await encyptBackups.waitFor({ state: "visible" });
+    return (await encyptBackups.getAttribute("data-checked")) === "true";
+  }
+
+  async toggleBackupEncryption(password?: string) {
     const item = await this.navigation.findItem("Backup & export");
     await item?.click();
 
-    if (password) {
-      const encyptBackups = this.page
-        .locator(getTestId("setting-encrypt-backups"))
-        .locator("label");
-      await encyptBackups.click();
-    }
+    const encyptBackups = this.page
+      .locator(getTestId("setting-encrypt-backups"))
+      .locator("label");
+
+    await encyptBackups.click();
+
+    if (password) await fillPasswordDialog(this.page, password);
+  }
+
+  async createBackup(password?: string) {
+    const item = await this.navigation.findItem("Backup & export");
+    await item?.click();
 
     const backupData = this.page
       .locator(getTestId("setting-create-backup"))

apps/web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/web",
-  "version": "2.6.1",
+  "version": "2.6.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/web",
-      "version": "2.6.1",
+      "version": "2.6.5",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@aws-sdk/util-base64-browser": "^3.208.0",
@@ -35,8 +35,8 @@
         "@theme-ui/color": "^0.14.7",
         "@theme-ui/components": "^0.14.7",
         "@theme-ui/core": "^0.14.7",
-        "@trpc/client": "10.31.0",
-        "@trpc/react-query": "10.31.0",
+        "@trpc/client": "10.38.3",
+        "@trpc/react-query": "10.38.3",
         "allotment": "^1.19.0",
         "axios": "^1.3.4",
         "clipboard-polyfill": "4.0.0",
@@ -75,7 +75,7 @@
       "devDependencies": {
         "@babel/core": "^7.22.5",
         "@playwright/test": "^1.36.2",
-        "@trpc/server": "10.31.0",
+        "@trpc/server": "10.38.3",
         "@types/babel__core": "^7.20.1",
         "@types/file-saver": "^2.0.5",
         "@types/marked": "^4.0.7",
@@ -19680,9 +19680,11 @@
         "abortcontroller-polyfill": "^1.7.3",
         "cross-env": "^7.0.3",
         "dotenv": "^16.0.1",
+        "event-source-polyfill": "^1.0.31",
         "eventsource": "^2.0.2",
-        "happy-dom": "^10.9.0",
+        "hash-wasm": "^4.9.0",
         "isomorphic-fetch": "^3.0.0",
+        "jsdom": "^22.1.0",
         "mockdate": "^3.0.5",
         "otplib": "^12.0.1",
         "refractor": "^4.8.1",
@@ -20312,17 +20314,6 @@
       },
       "devDependencies": {}
     },
-    "../../packages/crypto-worker": {
-      "name": "@notesnook/crypto-worker",
-      "version": "1.0.0",
-      "extraneous": true,
-      "license": "GPL-3.0-or-later",
-      "dependencies": {
-        "@notesnook/crypto": "file:../crypto",
-        "comlink": "^4.3.1"
-      },
-      "devDependencies": {}
-    },
     "../../packages/crypto/node_modules/@notesnook/sodium": {
       "resolved": "../../packages/sodium",
       "link": true
@@ -20333,40 +20324,43 @@
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {
-        "@emotion/react": "^11.10.0",
+        "@emotion/react": "11.11.1",
         "@notesnook/core": "file:../core",
         "@notesnook/theme": "file:../theme",
         "@notesnook/ui": "file:../ui",
         "@social-embed/lib": "^0.0.2-next.1",
         "@theme-ui/components": ">=0.14.0",
         "@theme-ui/core": ">=0.14.0",
-        "@tiptap/core": "2.0.3",
-        "@tiptap/extension-character-count": "2.0.3",
-        "@tiptap/extension-color": "2.0.3",
-        "@tiptap/extension-font-family": "2.0.3",
-        "@tiptap/extension-history": "2.0.3",
-        "@tiptap/extension-horizontal-rule": "2.0.3",
-        "@tiptap/extension-link": "2.0.3",
-        "@tiptap/extension-placeholder": "2.0.3",
-        "@tiptap/extension-subscript": "2.0.3",
-        "@tiptap/extension-superscript": "2.0.3",
-        "@tiptap/extension-table": "2.0.3",
-        "@tiptap/extension-table-cell": "2.0.3",
-        "@tiptap/extension-table-header": "2.0.3",
-        "@tiptap/extension-table-row": "2.0.3",
-        "@tiptap/extension-task-item": "2.0.3",
-        "@tiptap/extension-task-list": "2.0.3",
-        "@tiptap/extension-text-align": "2.0.3",
-        "@tiptap/extension-text-style": "2.0.3",
-        "@tiptap/extension-underline": "2.0.3",
-        "@tiptap/pm": "2.0.3",
-        "@tiptap/starter-kit": "2.0.3",
+        "@tiptap/core": "2.1.7",
+        "@tiptap/extension-character-count": "2.1.7",
+        "@tiptap/extension-color": "2.1.7",
+        "@tiptap/extension-font-family": "2.1.7",
+        "@tiptap/extension-history": "2.1.7",
+        "@tiptap/extension-horizontal-rule": "2.1.7",
+        "@tiptap/extension-link": "2.1.7",
+        "@tiptap/extension-list-keymap": "2.1.7",
+        "@tiptap/extension-placeholder": "2.1.7",
+        "@tiptap/extension-subscript": "2.1.7",
+        "@tiptap/extension-superscript": "2.1.7",
+        "@tiptap/extension-table": "2.1.7",
+        "@tiptap/extension-table-cell": "2.1.7",
+        "@tiptap/extension-table-header": "2.1.7",
+        "@tiptap/extension-table-row": "2.1.7",
+        "@tiptap/extension-task-item": "2.1.7",
+        "@tiptap/extension-task-list": "2.1.7",
+        "@tiptap/extension-text-align": "2.1.7",
+        "@tiptap/extension-text-style": "2.1.7",
+        "@tiptap/extension-underline": "2.1.7",
+        "@tiptap/pm": "2.1.7",
+        "@tiptap/starter-kit": "2.1.7",
         "clipboard-polyfill": "4.0.0",
         "detect-indent": "^7.0.0",
+        "entities": "^4.5.0",
         "katex": "0.16.4",
         "nanoid": "^4.0.1",
         "prism-themes": "^1.9.0",
-        "prosemirror-codemark": "^0.4.1",
+        "prosemirror-codemark": "^0.4.2",
+        "prosemirror-view": "^1.31.7",
         "re-resizable": "^6.9.9",
         "react-colorful": "^5.5.1",
         "react-modal": "3.13.1",
@@ -26818,7 +26812,7 @@
       "license": "ISC",
       "dependencies": {
         "@orama/orama": "^1.0.8",
-        "@trpc/server": "10.31.0",
+        "@trpc/server": "10.38.3",
         "async-mutex": "^0.4.0",
         "cors": "^2.8.5",
         "util": "^0.12.5",
@@ -26834,30 +26828,30 @@
     },
     "../desktop": {
       "name": "@notesnook/desktop",
-      "version": "2.6.1",
+      "version": "2.6.4",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@notesnook/crypto": "file:../../packages/crypto",
-        "@trpc/client": "10.31.0",
-        "@trpc/server": "10.31.0",
+        "@trpc/client": "10.38.3",
+        "@trpc/server": "10.38.3",
         "electron-trpc": "0.5.2",
-        "electron-updater": "6.1.1",
+        "electron-updater": "6.1.4",
         "icojs": "^0.17.1",
         "typed-emitter": "^2.1.0",
         "yargs": "^17.6.2",
         "zod": "^3.21.4"
       },
       "devDependencies": {
-        "@types/node": "^18.15.0",
+        "@types/node": "18.16.1",
         "@types/yargs": "^17.0.24",
         "chokidar": "^3.5.3",
-        "electron": "24.5.1",
-        "electron-builder": "24.4.0",
+        "electron": "25.8.1",
+        "electron-builder": "^24.6.4",
         "electron-builder-notarize": "^1.5.1",
         "esbuild": "^0.17.19",
-        "node-fetch": "^3.3.1",
-        "tree-kill": "^1.2.2"
+        "tree-kill": "^1.2.2",
+        "undici": "^5.23.0"
       },
       "optionalDependencies": {
         "dmg-license": "^1.0.11"
@@ -28168,14 +28162,6 @@
         "node": ">= 8"
       }
     },
-    "../desktop/node_modules/data-uri-to-buffer": {
-      "version": "4.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 12"
-      }
-    },
     "../desktop/node_modules/debug": {
       "version": "4.3.4",
       "license": "MIT",
@@ -28661,28 +28647,6 @@
         "pend": "~1.2.0"
       }
     },
-    "../desktop/node_modules/fetch-blob": {
-      "version": "3.2.0",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/jimmywarting"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/jimmywarting"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "node-domexception": "^1.0.0",
-        "web-streams-polyfill": "^3.0.3"
-      },
-      "engines": {
-        "node": "^12.20 || >= 14.13"
-      }
-    },
     "../desktop/node_modules/file-type": {
       "version": "16.5.4",
       "license": "MIT",
@@ -28775,17 +28739,6 @@
         "node": ">= 6"
       }
     },
-    "../desktop/node_modules/formdata-polyfill": {
-      "version": "4.0.10",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fetch-blob": "^3.1.2"
-      },
-      "engines": {
-        "node": ">=12.20.0"
-      }
-    },
     "../desktop/node_modules/fs-extra": {
       "version": "10.1.0",
       "license": "MIT",
@@ -29703,41 +29656,6 @@
         "semver": "^7.3.5"
       }
     },
-    "../desktop/node_modules/node-domexception": {
-      "version": "1.0.0",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/jimmywarting"
-        },
-        {
-          "type": "github",
-          "url": "https://paypal.me/jimmywarting"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.5.0"
-      }
-    },
-    "../desktop/node_modules/node-fetch": {
-      "version": "3.3.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "data-uri-to-buffer": "^4.0.0",
-        "fetch-blob": "^3.1.4",
-        "formdata-polyfill": "^4.0.10"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/node-fetch"
-      }
-    },
     "../desktop/node_modules/node-gyp": {
       "version": "9.4.0",
       "dev": true,
@@ -30852,14 +30770,6 @@
         "defaults": "^1.0.3"
       }
     },
-    "../desktop/node_modules/web-streams-polyfill": {
-      "version": "3.2.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "../desktop/node_modules/which": {
       "version": "2.0.2",
       "dev": true,
@@ -32745,9 +32655,9 @@
       "license": "0BSD"
     },
     "node_modules/@electron/get": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.2.tgz",
-      "integrity": "sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz",
+      "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==",
       "peer": true,
       "dependencies": {
         "debug": "^4.1.1",
@@ -34027,36 +33937,38 @@
       }
     },
     "node_modules/@trpc/client": {
-      "version": "10.31.0",
+      "version": "10.38.3",
+      "resolved": "https://registry.npmjs.org/@trpc/client/-/client-10.38.3.tgz",
+      "integrity": "sha512-hHPsElTL4sB+UGzuAZ4iwRVHjELrk/Nsl2owsYw9ITJz3EY7VWRsQ6vK48kJvlHPYPhP+efID5UOgyZMs4bFXA==",
       "funding": [
         "https://trpc.io/sponsor"
       ],
-      "license": "MIT",
       "peerDependencies": {
-        "@trpc/server": "10.31.0"
+        "@trpc/server": "10.38.3"
       }
     },
     "node_modules/@trpc/react-query": {
-      "version": "10.31.0",
-      "resolved": "https://registry.npmjs.org/@trpc/react-query/-/react-query-10.31.0.tgz",
-      "integrity": "sha512-+M8sIsbf6e4H5XYvHlzDqhaf+ybfUigA/9OL3wXRp2vXhCedEiIERCnwNuHWFDRASl9vjOcM33AuJ4sbOOINEA==",
+      "version": "10.38.3",
+      "resolved": "https://registry.npmjs.org/@trpc/react-query/-/react-query-10.38.3.tgz",
+      "integrity": "sha512-j4xxg/y+vssGinZCrNQy0SMJNL2Nv8k3HcqMKa2mYt3jxOpaHuwxgarWvLWVqrUJqvp1JpGJ9sIjlOAZam5FeQ==",
       "funding": [
         "https://trpc.io/sponsor"
       ],
       "peerDependencies": {
         "@tanstack/react-query": "^4.18.0",
-        "@trpc/client": "10.31.0",
-        "@trpc/server": "10.31.0",
+        "@trpc/client": "10.38.3",
+        "@trpc/server": "10.38.3",
         "react": ">=16.8.0",
         "react-dom": ">=16.8.0"
       }
     },
     "node_modules/@trpc/server": {
-      "version": "10.31.0",
+      "version": "10.38.3",
+      "resolved": "https://registry.npmjs.org/@trpc/server/-/server-10.38.3.tgz",
+      "integrity": "sha512-9s8/kwo2IDB5hwB2SKZZrfevRhdb1f9fdXtIYd3lbQuf2jQaC/LyQuHaIQjDQoUx9updBfsHXcFFPiCP1DL6pg==",
       "funding": [
         "https://trpc.io/sponsor"
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/@types/babel__core": {
       "version": "7.20.1",
@@ -34153,9 +34065,9 @@
       "license": "MIT"
     },
     "node_modules/@types/http-cache-semantics": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.2.tgz",
+      "integrity": "sha512-FD+nQWA2zJjh4L9+pFXqWOi0Hs1ryBCfI+985NjluQ1p8EYtoLvjLOKidXBtZ4/IcxDX4o8/E8qDS3540tNliw==",
       "peer": true
     },
     "node_modules/@types/json-schema": {
@@ -35600,9 +35512,9 @@
       }
     },
     "node_modules/electron": {
-      "version": "26.1.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-26.1.0.tgz",
-      "integrity": "sha512-qEh19H09Pysn3ibms5nZ0haIh5pFoOd7/5Ww7gzmAwDQOulRi8Sa2naeueOyIb1GKpf+6L4ix3iceYRAuA5r5Q==",
+      "version": "26.2.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-26.2.1.tgz",
+      "integrity": "sha512-SNT24Cf/wRvfcFZQoERXjzswUlg5ouqhIuA2t9x2L7VdTn+2Jbs0QXRtOfzcnOV/raVMz3e8ICyaU2GGeciKLg==",
       "hasInstallScript": true,
       "peer": true,
       "dependencies": {
@@ -35741,9 +35653,9 @@
       }
     },
     "node_modules/es-module-lexer": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
-      "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz",
+      "integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==",
       "dev": true,
       "peer": true
     },
@@ -39236,9 +39148,9 @@
       "license": "(WTFPL OR MIT)"
     },
     "node_modules/sprintf-js": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
-      "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
       "optional": true,
       "peer": true
     },

apps/web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@notesnook/web",
   "description": "Your private note taking space",
-  "version": "2.6.1",
+  "version": "2.6.5",
   "private": true,
   "main": "./src/app.js",
   "homepage": "https://notesnook.com/",
@@ -34,8 +34,8 @@
     "@theme-ui/color": "^0.14.7",
     "@theme-ui/components": "^0.14.7",
     "@theme-ui/core": "^0.14.7",
-    "@trpc/client": "10.31.0",
-    "@trpc/react-query": "10.31.0",
+    "@trpc/client": "10.38.3",
+    "@trpc/react-query": "10.38.3",
     "allotment": "^1.19.0",
     "axios": "^1.3.4",
     "clipboard-polyfill": "4.0.0",
@@ -74,7 +74,7 @@
   "devDependencies": {
     "@babel/core": "^7.22.5",
     "@playwright/test": "^1.36.2",
-    "@trpc/server": "10.31.0",
+    "@trpc/server": "10.38.3",
     "@types/babel__core": "^7.20.1",
     "@types/file-saver": "^2.0.5",
     "@types/marked": "^4.0.7",