ci: skip testflight

mobile: release v3.0.12
mobile: fix backup share button not working
2026-08-29 10:09:26 +02:00 · 2024-08-08 10:19:10 +05:00 · 2024-07-29 10:06:21 +05:00 · 2024-07-29 09:53:20 +05:00 · 2024-07-29 09:43:37 +05:00 · 2024-07-29 09:38:30 +05:00
385 changed files with 13036 additions and 9407 deletions
--- a/.github/workflows/android.publish.internal.yml
+++ b/.github/workflows/android.publish.internal.yml
@@ -147,8 +147,10 @@ jobs:
            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86.apk
            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86_64.apk

-      - name: Upload signed aab to Github
-        uses: actions/upload-artifact@v2
+      - name: Upload sourcemaps
+        uses: actions/upload-artifact@v4
        with:
-          name: Notesnook.aab
-          path: ${{steps.sign_app.outputs.signedReleaseFile}}
+          name: sourcemaps
+          path: |
+            apps/mobile/native/android/app/build/**/*.map
+            packages/editor-mobile/sourcemaps/*.map
--- a/.github/workflows/android.publish.yml
+++ b/.github/workflows/android.publish.yml
@@ -133,7 +133,6 @@ jobs:
          status: completed
          whatsNewDirectory: apps/mobile/native/android/releasenotes/

-     
      - name: Create release draft on Github
        uses: softprops/action-gh-release@v1
        with:
@@ -148,8 +147,10 @@ jobs:
            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86.apk
            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86_64.apk

-      - name: Upload signed aab to Github
-        uses: actions/upload-artifact@v2
+      - name: Upload sourcemaps
+        uses: actions/upload-artifact@v4
        with:
-          name: Notesnook.aab
-          path: ${{steps.sign_app.outputs.signedReleaseFile}}
+          name: sourcemaps
+          path: |
+            apps/mobile/native/android/app/build/**/*.map
+            packages/editor-mobile/sourcemaps/*.map
--- a/.github/workflows/ios.publish.yml
+++ b/.github/workflows/ios.publish.yml
@@ -89,16 +89,19 @@ jobs:
      - name: CCache Stats After Build
        run: ccache -sv

-      - name: "Upload app to TestFlight"
-        uses: apple-actions/upload-testflight-build@v1
-        with:
-          app-path: Notesnook.ipa
-          issuer-id: ${{ secrets.API_KEY_ISSUER_ID }}
-          api-key-id: ${{ secrets.API_KEY_ID }}
-          api-private-key: ${{ secrets.API_KEY }}
+      # - name: "Upload app to TestFlight"
+      #   uses: apple-actions/upload-testflight-build@v1
+      #   with:
+      #     app-path: Notesnook.ipa
+      #     issuer-id: ${{ secrets.API_KEY_ISSUER_ID }}
+      #     api-key-id: ${{ secrets.API_KEY_ID }}
+      #     api-private-key: ${{ secrets.API_KEY }}

      - name: Upload Notesnook.ipa to Github
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
        with:
-          name: Notesnook.ipa
-          path: Notesnook.ipa
+          name: Notesnook.zip
+          path: |
+            Notesnook.ipa
+            apps/mobile/native/ios/**/*.map
+            packages/editor-mobile/sourcemaps/*.map
--- a/.github/workflows/web.tests.yml
+++ b/.github/workflows/web.tests.yml
@@ -40,7 +40,7 @@ jobs:
        run: npm run build:test:web

      - name: Archive build artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
        with:
          name: build
          path: apps/web/build/**/*
@@ -56,7 +56,7 @@ jobs:
        uses: actions/checkout@v3

      - name: Download build
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
        with:
          name: build
          path: ./apps/web/build
@@ -88,7 +88,7 @@ jobs:
        working-directory: apps/web

      - name: Upload test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        if: failure()
        with:
          name: test-results-${{ matrix.shard }}
--- a/apps/desktop/README.md
+++ b/apps/desktop/README.md
@@ -40,12 +40,35 @@ Once you are inside the `./notesnook` directory, run the preparation step:
 npm install
 ```

-Now you can finally start the desktop app:
+Now you can finally start the desktop app for development:

 ```bash
 npm run start:desktop
 ```

+To run the app in release mode:
+
+```bash
+npm run staging -- --rebuild
+```
+
+This will compile and run the app in production mode but it won't generate any packages. To create the final packages, you'll have to run the following commands:
+
+```bash
+npm run release -- --rebuild
+
+# For macOS
+npx electron-builder --mac dmg --arm64 --x64 -publish never
+
+# For Linux (AppImage)
+npx electron-builder --linux AppImage:x64 AppImage:arm64 -publish never
+
+# For Windows
+npx electron-builder --win --publish never
+```
+
+Feel free to play around with the `electron-builder` command to get the packages you need. `npx electron-builder --help` is a great resource to learn different commands & platforms supported by `electron-builder`.
+
 ## Developer guide

 ### The tech stack
--- a/apps/desktop/app-update.yml
+++ b/apps/desktop/app-update.yml
@@ -1,3 +1,4 @@
 owner: streetwriters
 repo: notesnook
 provider: github
+updaterCacheDirName: Notesnook
--- a/apps/desktop/package-lock.json
+++ b/apps/desktop/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@notesnook/desktop",
-  "version": "3.0.2",
+  "version": "3.0.13",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@notesnook/desktop",
-      "version": "3.0.2",
+      "version": "3.0.13",
      "hasInstallScript": true,
      "license": "GPL-3.0-or-later",
      "dependencies": {
@@ -15,7 +15,7 @@
        "@trpc/server": "10.38.3",
        "better-sqlite3-multiple-ciphers": "^9.5.0",
        "electron-trpc": "0.5.2",
-        "electron-updater": "6.1.4",
+        "electron-updater": "^6.2.1",
        "icojs": "^0.17.1",
        "sodium-native": "^4.1.1",
        "typed-emitter": "^2.1.0",
@@ -28,7 +28,8 @@
        "chokidar": "^3.5.3",
        "electron": "^29.3.1",
        "electron-builder": "^24.13.3",
-        "esbuild": "^0.20.0",
+        "esbuild": "^0.23.0",
+        "kysely": "^0.27.3",
        "node-gyp-build": "^4.8.0",
        "prebuildify": "^6.0.1",
        "tree-kill": "^1.2.2",
@@ -40,7 +41,7 @@
    },
    "../../packages/crypto": {
      "name": "@notesnook/crypto",
-      "version": "1.1.1",
+      "version": "2.0.7",
      "license": "GPL-3.0-or-later",
      "dependencies": {
        "@notesnook/sodium": "file:../sodium"
@@ -70,9 +71,9 @@
      }
    },
    "node_modules/@electron/asar": {
-      "version": "3.2.9",
-      "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.9.tgz",
-      "integrity": "sha512-Vu2P3X2gcZ3MY9W7yH72X9+AMXwUQZEJBrsPIbX0JsdllLtoh62/Q8Wg370/DawIEVKOyfD6KtTLo645ezqxUA==",
+      "version": "3.2.10",
+      "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.10.tgz",
+      "integrity": "sha512-mvBSwIBUeiRscrCeJE1LwctAriBj65eUDm0Pc11iE5gRwzkmsdbS7FnZ1XUWjpSeQWL1L5g12Fc/SchPM9DUOw==",
      "dev": true,
      "dependencies": {
        "commander": "^5.0.0",
@@ -288,9 +289,9 @@
      }
    },
    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.0.tgz",
-      "integrity": "sha512-fGFDEctNh0CcSwsiRPxiaqX0P5rq+AqE0SRhYGZ4PX46Lg1FNR6oCxJghf8YgY0WQEgQuh3lErUFE4KxLeRmmw==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.0.tgz",
+      "integrity": "sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==",
      "cpu": [
        "ppc64"
      ],
@@ -300,13 +301,13 @@
        "aix"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/android-arm": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.0.tgz",
-      "integrity": "sha512-3bMAfInvByLHfJwYPJRlpTeaQA75n8C/QKpEaiS4HrFWFiJlNI0vzq/zCjBrhAYcPyVPG7Eo9dMrcQXuqmNk5g==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.0.tgz",
+      "integrity": "sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==",
      "cpu": [
        "arm"
      ],
@@ -316,13 +317,13 @@
        "android"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/android-arm64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.0.tgz",
-      "integrity": "sha512-aVpnM4lURNkp0D3qPoAzSG92VXStYmoVPOgXveAUoQBWRSuQzt51yvSju29J6AHPmwY1BjH49uR29oyfH1ra8Q==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.0.tgz",
+      "integrity": "sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==",
      "cpu": [
        "arm64"
      ],
@@ -332,13 +333,13 @@
        "android"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/android-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.0.tgz",
-      "integrity": "sha512-uK7wAnlRvjkCPzh8jJ+QejFyrP8ObKuR5cBIsQZ+qbMunwR8sbd8krmMbxTLSrDhiPZaJYKQAU5Y3iMDcZPhyQ==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.0.tgz",
+      "integrity": "sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==",
      "cpu": [
        "x64"
      ],
@@ -348,13 +349,13 @@
        "android"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.0.tgz",
-      "integrity": "sha512-AjEcivGAlPs3UAcJedMa9qYg9eSfU6FnGHJjT8s346HSKkrcWlYezGE8VaO2xKfvvlZkgAhyvl06OJOxiMgOYQ==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.0.tgz",
+      "integrity": "sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==",
      "cpu": [
        "arm64"
      ],
@@ -364,13 +365,13 @@
        "darwin"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.0.tgz",
-      "integrity": "sha512-bsgTPoyYDnPv8ER0HqnJggXK6RyFy4PH4rtsId0V7Efa90u2+EifxytE9pZnsDgExgkARy24WUQGv9irVbTvIw==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.0.tgz",
+      "integrity": "sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==",
      "cpu": [
        "x64"
      ],
@@ -380,13 +381,13 @@
        "darwin"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.0.tgz",
-      "integrity": "sha512-kQ7jYdlKS335mpGbMW5tEe3IrQFIok9r84EM3PXB8qBFJPSc6dpWfrtsC/y1pyrz82xfUIn5ZrnSHQQsd6jebQ==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.0.tgz",
+      "integrity": "sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==",
      "cpu": [
        "arm64"
      ],
@@ -396,13 +397,13 @@
        "freebsd"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.0.tgz",
-      "integrity": "sha512-uG8B0WSepMRsBNVXAQcHf9+Ko/Tr+XqmK7Ptel9HVmnykupXdS4J7ovSQUIi0tQGIndhbqWLaIL/qO/cWhXKyQ==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.0.tgz",
+      "integrity": "sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==",
      "cpu": [
        "x64"
      ],
@@ -412,13 +413,13 @@
        "freebsd"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/linux-arm": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.0.tgz",
-      "integrity": "sha512-2ezuhdiZw8vuHf1HKSf4TIk80naTbP9At7sOqZmdVwvvMyuoDiZB49YZKLsLOfKIr77+I40dWpHVeY5JHpIEIg==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.0.tgz",
+      "integrity": "sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==",
      "cpu": [
        "arm"
      ],
@@ -428,13 +429,13 @@
        "linux"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.0.tgz",
-      "integrity": "sha512-uTtyYAP5veqi2z9b6Gr0NUoNv9F/rOzI8tOD5jKcCvRUn7T60Bb+42NDBCWNhMjkQzI0qqwXkQGo1SY41G52nw==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.0.tgz",
+      "integrity": "sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==",
      "cpu": [
        "arm64"
      ],
@@ -444,13 +445,13 @@
        "linux"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.0.tgz",
-      "integrity": "sha512-c88wwtfs8tTffPaoJ+SQn3y+lKtgTzyjkD8NgsyCtCmtoIC8RDL7PrJU05an/e9VuAke6eJqGkoMhJK1RY6z4w==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.0.tgz",
+      "integrity": "sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==",
      "cpu": [
        "ia32"
      ],
@@ -460,13 +461,13 @@
        "linux"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.0.tgz",
-      "integrity": "sha512-lR2rr/128/6svngnVta6JN4gxSXle/yZEZL3o4XZ6esOqhyR4wsKyfu6qXAL04S4S5CgGfG+GYZnjFd4YiG3Aw==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.0.tgz",
+      "integrity": "sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==",
      "cpu": [
        "loong64"
      ],
@@ -476,13 +477,13 @@
        "linux"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.0.tgz",
-      "integrity": "sha512-9Sycc+1uUsDnJCelDf6ZNqgZQoK1mJvFtqf2MUz4ujTxGhvCWw+4chYfDLPepMEvVL9PDwn6HrXad5yOrNzIsQ==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.0.tgz",
+      "integrity": "sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==",
      "cpu": [
        "mips64el"
      ],
@@ -492,13 +493,13 @@
        "linux"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.0.tgz",
-      "integrity": "sha512-CoWSaaAXOZd+CjbUTdXIJE/t7Oz+4g90A3VBCHLbfuc5yUQU/nFDLOzQsN0cdxgXd97lYW/psIIBdjzQIwTBGw==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.0.tgz",
+      "integrity": "sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==",
      "cpu": [
        "ppc64"
      ],
@@ -508,13 +509,13 @@
        "linux"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.0.tgz",
-      "integrity": "sha512-mlb1hg/eYRJUpv8h/x+4ShgoNLL8wgZ64SUr26KwglTYnwAWjkhR2GpoKftDbPOCnodA9t4Y/b68H4J9XmmPzA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.0.tgz",
+      "integrity": "sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==",
      "cpu": [
        "riscv64"
      ],
@@ -524,13 +525,13 @@
        "linux"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.0.tgz",
-      "integrity": "sha512-fgf9ubb53xSnOBqyvWEY6ukBNRl1mVX1srPNu06B6mNsNK20JfH6xV6jECzrQ69/VMiTLvHMicQR/PgTOgqJUQ==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.0.tgz",
+      "integrity": "sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==",
      "cpu": [
        "s390x"
      ],
@@ -540,13 +541,13 @@
        "linux"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/linux-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.0.tgz",
-      "integrity": "sha512-H9Eu6MGse++204XZcYsse1yFHmRXEWgadk2N58O/xd50P9EvFMLJTQLg+lB4E1cF2xhLZU5luSWtGTb0l9UeSg==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.0.tgz",
+      "integrity": "sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==",
      "cpu": [
        "x64"
      ],
@@ -556,13 +557,13 @@
        "linux"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.0.tgz",
-      "integrity": "sha512-lCT675rTN1v8Fo+RGrE5KjSnfY0x9Og4RN7t7lVrN3vMSjy34/+3na0q7RIfWDAj0e0rCh0OL+P88lu3Rt21MQ==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.0.tgz",
+      "integrity": "sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==",
      "cpu": [
        "x64"
      ],
@@ -572,13 +573,29 @@
        "netbsd"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.0.tgz",
+      "integrity": "sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.0.tgz",
-      "integrity": "sha512-HKoUGXz/TOVXKQ+67NhxyHv+aDSZf44QpWLa3I1lLvAwGq8x1k0T+e2HHSRvxWhfJrFxaaqre1+YyzQ99KixoA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.0.tgz",
+      "integrity": "sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==",
      "cpu": [
        "x64"
      ],
@@ -588,13 +605,13 @@
        "openbsd"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.0.tgz",
-      "integrity": "sha512-GDwAqgHQm1mVoPppGsoq4WJwT3vhnz/2N62CzhvApFD1eJyTroob30FPpOZabN+FgCjhG+AgcZyOPIkR8dfD7g==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.0.tgz",
+      "integrity": "sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==",
      "cpu": [
        "x64"
      ],
@@ -604,13 +621,13 @@
        "sunos"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.0.tgz",
-      "integrity": "sha512-0vYsP8aC4TvMlOQYozoksiaxjlvUcQrac+muDqj1Fxy6jh9l9CZJzj7zmh8JGfiV49cYLTorFLxg7593pGldwQ==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.0.tgz",
+      "integrity": "sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==",
      "cpu": [
        "arm64"
      ],
@@ -620,13 +637,13 @@
        "win32"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.0.tgz",
-      "integrity": "sha512-p98u4rIgfh4gdpV00IqknBD5pC84LCub+4a3MO+zjqvU5MVXOc3hqR2UgT2jI2nh3h8s9EQxmOsVI3tyzv1iFg==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.0.tgz",
+      "integrity": "sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==",
      "cpu": [
        "ia32"
      ],
@@ -636,13 +653,13 @@
        "win32"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@esbuild/win32-x64": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.0.tgz",
-      "integrity": "sha512-NgJnesu1RtWihtTtXGFMU5YSE6JyyHPMxCwBZK7a6/8d31GuSo9l0Ss7w1Jw5QnKUawG6UEehs883kcXf5fYwg==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.0.tgz",
+      "integrity": "sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==",
      "cpu": [
        "x64"
      ],
@@ -652,7 +669,7 @@
        "win32"
      ],
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      }
    },
    "node_modules/@isaacs/cliui": {
@@ -981,6 +998,15 @@
        "@types/node": "*"
      }
    },
+    "node_modules/@xmldom/xmldom": {
+      "version": "0.8.10",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
+      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
    "node_modules/7zip-bin": {
      "version": "5.2.0",
      "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz",
@@ -1107,19 +1133,6 @@
        "electron-builder-squirrel-windows": "24.13.3"
      }
    },
-    "node_modules/app-builder-lib/node_modules/builder-util-runtime": {
-      "version": "9.2.4",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz",
-      "integrity": "sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.3.4",
-        "sax": "^1.2.4"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
    "node_modules/argparse": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -1358,22 +1371,9 @@
      }
    },
    "node_modules/builder-util-runtime": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.1.tgz",
-      "integrity": "sha512-2rLv/uQD2x+dJ0J3xtsmI12AlRyk7p45TEbE/6o/fbb633e/S3pPgm+ct+JHsoY7r39dKHnGEFk/AASRFdnXmA==",
-      "dependencies": {
-        "debug": "^4.3.4",
-        "sax": "^1.2.4"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/builder-util/node_modules/builder-util-runtime": {
      "version": "9.2.4",
      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz",
      "integrity": "sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==",
-      "dev": true,
      "dependencies": {
        "debug": "^4.3.4",
        "sax": "^1.2.4"
@@ -1586,31 +1586,32 @@
      }
    },
    "node_modules/config-file-ts/node_modules/glob": {
-      "version": "10.3.12",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz",
-      "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==",
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz",
+      "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==",
      "dev": true,
      "dependencies": {
        "foreground-child": "^3.1.0",
-        "jackspeak": "^2.3.6",
-        "minimatch": "^9.0.1",
-        "minipass": "^7.0.4",
-        "path-scurry": "^1.10.2"
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
      },
      "bin": {
        "glob": "dist/esm/bin.mjs"
      },
      "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": ">=18"
      },
      "funding": {
        "url": "https://github.com/sponsors/isaacs"
      }
    },
    "node_modules/config-file-ts/node_modules/minimatch": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
-      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
      "dev": true,
      "dependencies": {
        "brace-expansion": "^2.0.1"
@@ -1623,9 +1624,9 @@
      }
    },
    "node_modules/config-file-ts/node_modules/minipass": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
      "dev": true,
      "engines": {
        "node": ">=16 || 14 >=14.17"
@@ -1833,19 +1834,6 @@
        "dmg-license": "^1.0.11"
      }
    },
-    "node_modules/dmg-builder/node_modules/builder-util-runtime": {
-      "version": "9.2.4",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz",
-      "integrity": "sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.3.4",
-        "sax": "^1.2.4"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
    "node_modules/dmg-license": {
      "version": "1.0.11",
      "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz",
@@ -1951,19 +1939,6 @@
        "node": ">=14.0.0"
      }
    },
-    "node_modules/electron-builder/node_modules/builder-util-runtime": {
-      "version": "9.2.4",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz",
-      "integrity": "sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.3.4",
-        "sax": "^1.2.4"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
    "node_modules/electron-publish": {
      "version": "24.13.1",
      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.13.1.tgz",
@@ -1979,19 +1954,6 @@
        "mime": "^2.5.2"
      }
    },
-    "node_modules/electron-publish/node_modules/builder-util-runtime": {
-      "version": "9.2.4",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz",
-      "integrity": "sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.3.4",
-        "sax": "^1.2.4"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
    "node_modules/electron-trpc": {
      "version": "0.5.2",
      "resolved": "https://registry.npmjs.org/electron-trpc/-/electron-trpc-0.5.2.tgz",
@@ -2006,11 +1968,11 @@
      }
    },
    "node_modules/electron-updater": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.4.tgz",
-      "integrity": "sha512-yYAJc6RQjjV4WtInZVn+ZcLyXRhbVXoomKEfUUwDqIk5s2wxzLhWaor7lrNgxODyODhipjg4SVPMhJHi5EnsCA==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.2.1.tgz",
+      "integrity": "sha512-83eKIPW14qwZqUUM6wdsIRwVKZyjmHxQ4/8G+1C6iS5PdDt7b1umYQyj1/qPpH510GmHEQe4q0kCPe3qmb3a0Q==",
      "dependencies": {
-        "builder-util-runtime": "9.2.1",
+        "builder-util-runtime": "9.2.4",
        "fs-extra": "^10.1.0",
        "js-yaml": "^4.1.0",
        "lazy-val": "^1.0.5",
@@ -2065,41 +2027,42 @@
      "optional": true
    },
    "node_modules/esbuild": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.0.tgz",
-      "integrity": "sha512-6iwE3Y2RVYCME1jLpBqq7LQWK3MW6vjV2bZy6gt/WrqkY+WE74Spyc0ThAOYpMtITvnjX09CrC6ym7A/m9mebA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.0.tgz",
+      "integrity": "sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==",
      "dev": true,
      "hasInstallScript": true,
      "bin": {
        "esbuild": "bin/esbuild"
      },
      "engines": {
-        "node": ">=12"
+        "node": ">=18"
      },
      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.20.0",
-        "@esbuild/android-arm": "0.20.0",
-        "@esbuild/android-arm64": "0.20.0",
-        "@esbuild/android-x64": "0.20.0",
-        "@esbuild/darwin-arm64": "0.20.0",
-        "@esbuild/darwin-x64": "0.20.0",
-        "@esbuild/freebsd-arm64": "0.20.0",
-        "@esbuild/freebsd-x64": "0.20.0",
-        "@esbuild/linux-arm": "0.20.0",
-        "@esbuild/linux-arm64": "0.20.0",
-        "@esbuild/linux-ia32": "0.20.0",
-        "@esbuild/linux-loong64": "0.20.0",
-        "@esbuild/linux-mips64el": "0.20.0",
-        "@esbuild/linux-ppc64": "0.20.0",
-        "@esbuild/linux-riscv64": "0.20.0",
-        "@esbuild/linux-s390x": "0.20.0",
-        "@esbuild/linux-x64": "0.20.0",
-        "@esbuild/netbsd-x64": "0.20.0",
-        "@esbuild/openbsd-x64": "0.20.0",
-        "@esbuild/sunos-x64": "0.20.0",
-        "@esbuild/win32-arm64": "0.20.0",
-        "@esbuild/win32-ia32": "0.20.0",
-        "@esbuild/win32-x64": "0.20.0"
+        "@esbuild/aix-ppc64": "0.23.0",
+        "@esbuild/android-arm": "0.23.0",
+        "@esbuild/android-arm64": "0.23.0",
+        "@esbuild/android-x64": "0.23.0",
+        "@esbuild/darwin-arm64": "0.23.0",
+        "@esbuild/darwin-x64": "0.23.0",
+        "@esbuild/freebsd-arm64": "0.23.0",
+        "@esbuild/freebsd-x64": "0.23.0",
+        "@esbuild/linux-arm": "0.23.0",
+        "@esbuild/linux-arm64": "0.23.0",
+        "@esbuild/linux-ia32": "0.23.0",
+        "@esbuild/linux-loong64": "0.23.0",
+        "@esbuild/linux-mips64el": "0.23.0",
+        "@esbuild/linux-ppc64": "0.23.0",
+        "@esbuild/linux-riscv64": "0.23.0",
+        "@esbuild/linux-s390x": "0.23.0",
+        "@esbuild/linux-x64": "0.23.0",
+        "@esbuild/netbsd-x64": "0.23.0",
+        "@esbuild/openbsd-arm64": "0.23.0",
+        "@esbuild/openbsd-x64": "0.23.0",
+        "@esbuild/sunos-x64": "0.23.0",
+        "@esbuild/win32-arm64": "0.23.0",
+        "@esbuild/win32-ia32": "0.23.0",
+        "@esbuild/win32-x64": "0.23.0"
      }
    },
    "node_modules/escalade": {
@@ -2224,9 +2187,9 @@
      }
    },
    "node_modules/foreground-child": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz",
+      "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==",
      "dev": true,
      "dependencies": {
        "cross-spawn": "^7.0.0",
@@ -2239,6 +2202,18 @@
        "url": "https://github.com/sponsors/isaacs"
      }
    },
+    "node_modules/foreground-child/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
    "node_modules/form-data": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
@@ -2370,6 +2345,7 @@
      "version": "7.2.3",
      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
      "dev": true,
      "dependencies": {
        "fs.realpath": "^1.0.0",
@@ -2670,6 +2646,7 @@
      "version": "1.0.6",
      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
      "dev": true,
      "dependencies": {
        "once": "^1.3.0",
@@ -2767,15 +2744,15 @@
      "dev": true
    },
    "node_modules/jackspeak": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
-      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.1.tgz",
+      "integrity": "sha512-U23pQPDnmYybVkYjObcuYMk43VRlMLLqLI+RdZy8s8WV8WsxO9SnqSroKaluuvcNOdCAlauKszDwd+umbot5Mg==",
      "dev": true,
      "dependencies": {
        "@isaacs/cliui": "^8.0.2"
      },
      "engines": {
-        "node": ">=14"
+        "node": ">=18"
      },
      "funding": {
        "url": "https://github.com/sponsors/isaacs"
@@ -2785,9 +2762,9 @@
      }
    },
    "node_modules/jake": {
-      "version": "10.8.7",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz",
-      "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==",
+      "version": "10.9.1",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.1.tgz",
+      "integrity": "sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==",
      "dev": true,
      "dependencies": {
        "async": "^3.2.3",
@@ -2891,6 +2868,15 @@
        "json-buffer": "3.0.1"
      }
    },
+    "node_modules/kysely": {
+      "version": "0.27.3",
+      "resolved": "https://registry.npmjs.org/kysely/-/kysely-0.27.3.tgz",
+      "integrity": "sha512-lG03Ru+XyOJFsjH3OMY6R/9U38IjDPfnOfDgO3ynhbDr+Dz8fak+X6L62vqu3iybQnj+lG84OttBuU9KY3L9kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
    "node_modules/lazy-val": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz",
@@ -3155,6 +3141,12 @@
        "node": ">=8"
      }
    },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
+      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+      "dev": true
+    },
    "node_modules/path-is-absolute": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -3174,28 +3166,37 @@
      }
    },
    "node_modules/path-scurry": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz",
-      "integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
      "dev": true,
      "dependencies": {
        "lru-cache": "^10.2.0",
        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
      },
      "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": ">=16 || 14 >=14.18"
      },
      "funding": {
        "url": "https://github.com/sponsors/isaacs"
      }
    },
    "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.1.tgz",
-      "integrity": "sha512-tS24spDe/zXhWbNPErCHs/AGOzbKGHT+ybSBqmdLm8WZ1xXLWvH8Qn71QPAlqVhd0qUTWjy+Kl9JmISgDdEjsA==",
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz",
+      "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==",
      "dev": true,
      "engines": {
-        "node": "14 || >=16.14"
+        "node": ">=18"
+      }
+    },
+    "node_modules/path-scurry/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
      }
    },
    "node_modules/peek-readable": {
@@ -3229,16 +3230,17 @@
      }
    },
    "node_modules/plist": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.6.tgz",
-      "integrity": "sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz",
+      "integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==",
      "devOptional": true,
      "dependencies": {
+        "@xmldom/xmldom": "^0.8.8",
        "base64-js": "^1.5.1",
        "xmlbuilder": "^15.1.1"
      },
      "engines": {
-        "node": ">=6"
+        "node": ">=10.4.0"
      }
    },
    "node_modules/pngjs": {
@@ -3586,18 +3588,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/simple-concat": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
@@ -3987,9 +3977,9 @@
      }
    },
    "node_modules/typescript": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
-      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz",
+      "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==",
      "dev": true,
      "bin": {
        "tsc": "bin/tsc",
@@ -4032,9 +4022,9 @@
      }
    },
    "node_modules/utf8-byte-length": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",
-      "integrity": "sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.5.tgz",
+      "integrity": "sha512-Xn0w3MtiQ6zoz2vFyUVruaCL53O/DwUvkEeOvj+uulMm0BkUGYWmBYVyElqZaSLhY6ZD0ulfU3aBra2aVT4xfA==",
      "dev": true
    },
    "node_modules/util-deprecate": {
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -2,7 +2,7 @@
  "name": "@notesnook/desktop",
  "productName": "Notesnook",
  "description": "Your private note taking space",
-  "version": "3.0.2",
+  "version": "3.0.13",
  "appAppleId": "1544027013",
  "private": true,
  "main": "./dist/index.js",
@@ -16,7 +16,7 @@
    "@trpc/server": "10.38.3",
    "better-sqlite3-multiple-ciphers": "^9.5.0",
    "electron-trpc": "0.5.2",
-    "electron-updater": "6.1.4",
+    "electron-updater": "^6.2.1",
    "icojs": "^0.17.1",
    "sodium-native": "^4.1.1",
    "typed-emitter": "^2.1.0",
@@ -29,7 +29,8 @@
    "chokidar": "^3.5.3",
    "electron": "^29.3.1",
    "electron-builder": "^24.13.3",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.23.0",
+    "kysely": "^0.27.3",
    "node-gyp-build": "^4.8.0",
    "prebuildify": "^6.0.1",
    "tree-kill": "^1.2.2",
--- a/apps/desktop/scripts/build.mjs
+++ b/apps/desktop/scripts/build.mjs
@@ -38,7 +38,7 @@ await fs.rm("./build/", { force: true, recursive: true });

 if (args.rebuild || !existsSync(path.join(webAppPath, "build"))) {
  await exec(
-    "npx nx build:desktop @notesnook/web",
+    "yarn nx build:desktop @notesnook/web",
    path.join(__dirname, "..", "..", "..")
  );
 }
@@ -46,11 +46,11 @@ if (args.rebuild || !existsSync(path.join(webAppPath, "build"))) {
 // temporary until there's support for prebuilt binaries for linux ARM
 if (os.platform() === "linux") await patchBetterSQLite3();

-if (os.platform() === "win32")
-  await exec(
-    `npx prebuildify --arch=arm64 --strip -t electron@${packageJson.devDependencies.electron}`,
-    path.join(__dirname, "..", "node_modules", "sodium-native")
-  );
+// if (os.platform() === "win32")
+//   await exec(
+//     `npx prebuildify --arch=arm64 --strip -t electron@${packageJson.devDependencies.electron}`,
+//     path.join(__dirname, "..", "node_modules", "sodium-native")
+//   );

 await fs.cp(path.join(webAppPath, "build"), "build", {
  recursive: true,
@@ -58,15 +58,15 @@ await fs.cp(path.join(webAppPath, "build"), "build", {
 });

 if (args.variant === "mas") {
-  await exec(`npm run bundle:mas`);
+  await exec(`yarn run bundle:mas`);
 } else {
-  await exec(`npm run bundle`);
+  await exec(`yarn run bundle`);
 }

-await exec(`npx tsc`);
+await exec(`yarn tsc`);

 if (args.run) {
-  await exec(`npx electron-builder --dir --x64`);
+  await exec(`yarn electron-builder --dir --x64`);
  if (process.platform === "win32") {
    await exec(`.\\output\\win-unpacked\\Notesnook.exe`);
  } else if (process.platform === "darwin") {
--- a/apps/desktop/scripts/dev.mjs
+++ b/apps/desktop/scripts/dev.mjs
@@ -53,11 +53,11 @@ async function onChange(first) {
  if (first) {
    await fs.rm("./build/", { force: true, recursive: true });

-    await exec("npx electron-builder install-app-deps");
+    await exec("yarn electron-builder install-app-deps");
  }

-  await exec(`npm run bundle`);
-  execAsync(`npx`, [`tsc`]);
+  await exec(`yarn run bundle`);
+  execAsync(`yarn`, [`tsc`]);

  if (await isBundleSame()) {
    console.log("Bundle is same. Doing nothing.");
@@ -66,7 +66,7 @@ async function onChange(first) {

  if (first) {
    await spawnAndWaitUntil(
-      ["npx", "nx", "start:desktop", "@notesnook/web"],
+      ["yarn", "nx", "start:desktop", "@notesnook/web"],
      path.join(__dirname, "..", "..", ".."),
      (data) => data.includes("Network: use --host to expose")
    );
@@ -78,7 +78,7 @@ async function onChange(first) {
  }

  execAsync(
-    "npx",
+    "yarn",
    ["electron", path.join("build", "electron.js")],
    true,
    cleanup
--- a/apps/desktop/src/api/os-integration.ts
+++ b/apps/desktop/src/api/os-integration.ts
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 import { initTRPC } from "@trpc/server";
 import { z } from "zod";
-import { dialog, nativeTheme, Notification, shell } from "electron";
+import { app, dialog, nativeTheme, Notification, shell } from "electron";
 import { AutoLaunch } from "../utils/autolaunch";
 import { config, DesktopIntegration } from "../utils/config";
 import { bringToFront } from "../utils/bring-to-front";
@@ -58,11 +58,11 @@ export const osIntegrationRouter = t.router({

  customDns: t.procedure.query(() => config.customDns),
  setCustomDns: t.procedure
-    .input(z.boolean())
+    .input(z.boolean().optional())
    .mutation(({ input: customDns }) => {
      if (customDns) enableCustomDns();
      else disableCustomDns();
-      config.customDns = customDns;
+      config.customDns = !!customDns;
    }),

  proxyRules: t.procedure.query(() => config.proxyRules),
@@ -152,6 +152,10 @@ export const osIntegrationRouter = t.router({
    await rm(input);
  }),

+  restart: t.procedure.query(() => {
+    app.relaunch();
+    app.exit();
+  }),
  showNotification: t.procedure
    .input(NotificationOptions)
    .query(({ input }) => {
@@ -191,7 +195,10 @@ export const osIntegrationRouter = t.router({
      ({ input: { theme, windowControlsIconColor, backgroundColor } }) => {
        if (windowControlsIconColor) {
          config.windowControlsIconColor = windowControlsIconColor;
-          if (process.platform === "win32")
+          if (
+            process.platform === "win32" &&
+            !config.desktopSettings.nativeTitlebar
+          )
            globalThis.window?.setTitleBarOverlay({
              symbolColor: windowControlsIconColor
            });
--- a/apps/desktop/src/api/sqlite-kysely.ts
+++ b/apps/desktop/src/api/sqlite-kysely.ts
@@ -0,0 +1,143 @@
+/*
+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 type { Database, Statement } from "better-sqlite3-multiple-ciphers";
+import type { QueryResult } from "kysely";
+
+type SQLiteCompatibleType =
+  | number
+  | string
+  | Uint8Array
+  | Array<number>
+  | bigint
+  | null;
+
+export class SQLite {
+  sqlite?: Database;
+  initialized = false;
+  preparedStatements: Map<string, Statement<unknown[]>> = new Map();
+  retryCounter: Record<string, number> = {};
+  constructor() {
+    console.log("new sqlite worker");
+  }
+
+  async open(filePath: string) {
+    if (this.sqlite) {
+      console.error("Database is already initialized");
+      return;
+    }
+
+    this.sqlite = require("better-sqlite3-multiple-ciphers")(
+      filePath
+    ).unsafeMode(true);
+  }
+
+  /**
+   * Wrapper function for preparing SQL statements with caching
+   * to avoid unnecessary computations.
+   */
+  async prepare(sql: string): Promise<Statement | undefined> {
+    if (!this.sqlite) throw new Error("Database is not initialized.");
+    try {
+      const cached = this.preparedStatements.get(sql);
+      if (cached !== undefined) return cached;
+
+      const prepared = this.sqlite.prepare(sql);
+      if (!prepared) return;
+
+      this.preparedStatements.set(sql, prepared);
+
+      // reset retry count on success
+      this.retryCounter[sql] = 0;
+      return prepared;
+    } catch (ex) {
+      console.error(ex);
+
+      // statement prepare process can be flaky so retry at least 5 times
+      // before giving up.
+      if (this.retryCounter[sql] < 5) {
+        this.retryCounter[sql] = (this.retryCounter[sql] || 0) + 1;
+        console.warn("Failed to prepare statement. Retrying:", sql);
+        return this.prepare(sql);
+      } else this.retryCounter[sql] = 0;
+
+      if (ex instanceof Error) ex.message += ` (query: ${sql})`;
+      throw ex;
+    }
+  }
+
+  async exec<R>(
+    sql: string,
+    parameters: SQLiteCompatibleType[] = []
+  ): Promise<QueryResult<R>> {
+    const prepared = await this.prepare(sql);
+    if (!prepared) return { rows: [] };
+    try {
+      if (prepared.reader) {
+        return {
+          rows: prepared.all(parameters) as R[]
+        };
+      } else {
+        const { changes, lastInsertRowid } = prepared.run(parameters);
+        const numAffectedRows =
+          changes !== undefined && changes !== null && !isNaN(changes)
+            ? BigInt(changes)
+            : undefined;
+        return {
+          numAffectedRows,
+          insertId:
+            lastInsertRowid !== undefined && lastInsertRowid !== null
+              ? typeof lastInsertRowid === "bigint"
+                ? lastInsertRowid
+                : BigInt(lastInsertRowid)
+              : undefined,
+          rows: [] as R[]
+        };
+      }
+    } catch (e) {
+      if (e instanceof Error) e.message += ` (query: ${sql})`;
+      throw e;
+    }
+  }
+
+  async run<R>(
+    sql: string,
+    parameters?: SQLiteCompatibleType[]
+  ): Promise<QueryResult<R>> {
+    if (!this.sqlite) throw new Error("No database is not opened.");
+    return await this.exec(sql, parameters);
+  }
+
+  async close() {
+    if (!this.sqlite) return;
+
+    this.preparedStatements.clear();
+    this.sqlite.close();
+    this.sqlite = undefined;
+  }
+
+  async delete(filePath: string) {
+    await this.close();
+    await require("fs/promises").rm(filePath, {
+      force: true,
+      maxRetries: 5,
+      retryDelay: 500
+    });
+  }
+}
--- a/apps/desktop/src/api/updater.ts
+++ b/apps/desktop/src/api/updater.ts
@@ -61,7 +61,18 @@ export const updaterRouter = t.router({
    "update-not-available"
  ),
  onAvailable: createSubscription<"update-available", UpdateInfo>(
-    "update-available"
+    "update-available",
+    () => {
+      if (!config.automaticUpdates) return false;
+      autoUpdater.emit("download-progress", {
+        bytesPerSecond: 0,
+        delta: 0,
+        percent: 0,
+        total: 100,
+        transferred: 0
+      });
+      return true;
+    }
  ),
  onError: createSubscription("error")
 });
@@ -69,10 +80,11 @@ export const updaterRouter = t.router({
 function createSubscription<
  TName extends keyof AppUpdaterEvents,
  TReturnType = Parameters<AppUpdaterEvents[TName]>[0]
->(eventName: TName) {
+>(eventName: TName, handler?: (args: TReturnType) => boolean) {
  return t.procedure.subscription(() => {
    return observable<TReturnType>((emit) => {
      const listener: AppUpdaterEvents[TName] = (...args: any[]) => {
+        if (handler?.(args[0])) return;
        emit.next(args[0]);
      };
      autoUpdater.removeAllListeners(eventName);
--- a/apps/desktop/src/index.ts
+++ b/apps/desktop/src/index.ts
@@ -21,3 +21,4 @@ export * from "./constants";
 export type { AppRouter } from "./api";
 export { type UpdateInfo } from "builder-util-runtime";
 export { type DesktopIntegration } from "./utils/config";
+export { SQLite } from "./api/sqlite-kysely.js";
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -84,22 +84,27 @@ async function createWindow() {
      format: process.platform === "win32" ? "ico" : "png"
    }),

-    titleBarStyle: "hidden",
-    frame: process.platform === "win32" || process.platform === "darwin",
-    titleBarOverlay: {
-      height: 37,
-      color: "#00000000",
-      symbolColor: config.windowControlsIconColor
-    },
-    trafficLightPosition: {
-      x: 16,
-      y: 12
-    },
+    ...(config.desktopSettings.nativeTitlebar
+      ? {}
+      : {
+          titleBarStyle: "hidden",
+          frame: process.platform === "win32" || process.platform === "darwin",
+          titleBarOverlay: {
+            height: 37,
+            color: "#00000000",
+            symbolColor: config.windowControlsIconColor
+          },
+          trafficLightPosition: {
+            x: 16,
+            y: 12
+          }
+        }),

    webPreferences: {
      zoomFactor: config.zoomFactor,
      nodeIntegration: true,
      contextIsolation: false,
+      nodeIntegrationInWorker: true,
      spellcheck: config.isSpellCheckerEnabled,
      preload: __dirname + "/preload.js"
    }
--- a/apps/desktop/src/preload.ts
+++ b/apps/desktop/src/preload.ts
@@ -23,13 +23,11 @@ import { type RendererGlobalElectronTRPC } from "electron-trpc/src/types";
 import type { NNCrypto } from "@notesnook/crypto";
 import { ipcRenderer } from "electron";
 import { platform } from "os";
-import sqlite3, { Database } from "better-sqlite3-multiple-ciphers";

 declare global {
  var os: () => "mas" | ReturnType<typeof platform>;
  var electronTRPC: RendererGlobalElectronTRPC;
  var NativeNNCrypto: (new () => NNCrypto) | undefined;
-  var createSQLite3Database: (filename: string) => Database;
 }

 process.once("loaded", async () => {
@@ -43,5 +41,4 @@ process.once("loaded", async () => {
 });

 globalThis.NativeNNCrypto = require("@notesnook/crypto").NNCrypto;
-globalThis.createSQLite3Database = (filename) => sqlite3(filename);
 globalThis.os = () => (MAC_APP_STORE ? "mas" : platform());
--- a/apps/desktop/src/utils/autoupdater.ts
+++ b/apps/desktop/src/utils/autoupdater.ts
@@ -35,6 +35,7 @@ async function configureAutoUpdater() {
  autoUpdater.allowDowngrade = false;
  autoUpdater.allowPrerelease = false;
  autoUpdater.autoInstallOnAppQuit = true;
+  autoUpdater.disableWebInstaller = true;
 }

 export { configureAutoUpdater };
--- a/apps/desktop/src/utils/config.ts
+++ b/apps/desktop/src/utils/config.ts
@@ -25,7 +25,8 @@ export const DesktopIntegration = z.object({
  autoStart: z.boolean().optional(),
  startMinimized: z.boolean().optional(),
  minimizeToSystemTray: z.boolean().optional(),
-  closeToSystemTray: z.boolean().optional()
+  closeToSystemTray: z.boolean().optional(),
+  nativeTitlebar: z.boolean().optional()
 });

 export type DesktopIntegration = z.infer<typeof DesktopIntegration>;
@@ -35,7 +36,8 @@ export const config = {
    autoStart: false,
    startMinimized: false,
    minimizeToSystemTray: false,
-    closeToSystemTray: false
+    closeToSystemTray: false,
+    nativeTitlebar: false
  },
  privacyMode: false,
  isSpellCheckerEnabled: true,
--- a/apps/mobile/app/app.tsx
+++ b/apps/mobile/app/app.tsx
@@ -16,13 +16,13 @@ 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-native-gesture-handler";
 import {
  THEME_COMPATIBILITY_VERSION,
  useThemeEngineStore
 } from "@notesnook/theme";
 import React, { useEffect } from "react";
 import { I18nManager, View } from "react-native";
+import "react-native-gesture-handler";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import { SafeAreaProvider } from "react-native-safe-area-context";
 import AppLockedOverlay from "./components/app-lock-overlay";
@@ -40,30 +40,25 @@ import { useUserStore } from "./stores/use-user-store";
 I18nManager.allowRTL(false);
 I18nManager.forceRTL(false);
 I18nManager.swapLeftAndRightInRTL(false);
+const { appLockEnabled, appLockMode } = SettingsService.get();
+if (appLockEnabled || appLockMode !== "none") {
+  useUserStore.getState().lockApp(true);
+}

 const App = () => {
-  const init = useAppEvents();
+  useAppEvents();
+  //@ts-ignore
+  globalThis["IS_MAIN_APP_RUNNING"] = true;
  useEffect(() => {
-    const { appLockEnabled, appLockMode } = SettingsService.get();
-    if (appLockEnabled || appLockMode !== "none") {
-      useUserStore.getState().lockApp(true);
-    }
-
-    //@ts-ignore
-    globalThis["IS_MAIN_APP_RUNNING"] = true;
-    init();
+    SettingsService.onFirstLaunch();
    setTimeout(async () => {
-      SettingsService.onFirstLaunch();
      await Notifications.get();
      if (SettingsService.get().notifNotes) {
        Notifications.pinQuickNote(true);
      }
      TipManager.init();
    }, 100);
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, []);
-
  return (
    <View
      style={{
--- a/apps/mobile/app/common/database/encryption.js
+++ b/apps/mobile/app/common/database/encryption.js
@@ -25,6 +25,7 @@ import { MMKVLoader, ProcessingModes } from "react-native-mmkv-storage";
 import { generateSecureRandom } from "react-native-securerandom";
 import { DatabaseLogger } from ".";
 import { MMKV } from "./mmkv";
+import { ToastManager } from "../../services/event-manager";

 // Database key cipher is persisted across different user sessions hence it has
 // it's independent storage which we will never clear. This is only used when application has
@@ -43,9 +44,8 @@ const IOS_KEYCHAIN_ACCESS_GROUP = "group.org.streetwriters.notesnook";
 const IOS_KEYCHAIN_SERVICE_NAME = "org.streetwriters.notesnook";
 const KEYCHAIN_SERVER_DBKEY = "notesnook:db";

-const NOTESNOOK_APPLOCK_KEY_SALT = "3dqclWbOYllfk9kk";
-const NOTESNOOK_DB_KEY_SALT = "2rcgSprDmRvZ1AAa";
-const NOTESNOOK_USER_KEY_SALT = "7qO4qeoM6PbsAJ0Q";
+const NOTESNOOK_APPLOCK_KEY_SALT = "kBwr1Kre86ebOZ8ThLu2OA";
+const NOTESNOOK_DB_KEY_SALT = "SNuzOcEK3amoqL0WvPeKqw";

 const DB_KEY_CIPHER = "databaseKeyCipher";
 const USER_KEY_CIPHER = "userKeyCipher";
@@ -117,9 +117,7 @@ export async function setAppLockVerificationCipher(appLockPassword) {
      NOTESNOOK_APPLOCK_KEY_SALT
    );
    const encrypted = await encrypt(appLockCredentials, generatePassword());
-
    CipherStorage.setMap(APPLOCK_CIPHER, encrypted);
-
    DatabaseLogger.info("setAppLockVerificationCipher");
  } catch (e) {
    DatabaseLogger.error(e);
@@ -135,10 +133,8 @@ export async function validateAppLockPassword(appLockPassword) {
  try {
    const appLockCipher = CipherStorage.getMap(APPLOCK_CIPHER);
    if (!appLockCipher) return true;
-    const decrypted = await decrypt(
-      await Sodium.deriveKey(appLockPassword, NOTESNOOK_APPLOCK_KEY_SALT),
-      appLockCipher
-    );
+    const key = await Sodium.deriveKey(appLockPassword, appLockCipher.salt);
+    const decrypted = await decrypt(key, appLockCipher);

    DatabaseLogger.info(
      `validateAppLockPassword: ${typeof decrypted === "string"}`
@@ -214,7 +210,7 @@ export async function getDatabaseKey(appLockPassword) {
        const userKeyCipher = await encrypt(
          {
            key: DB_KEY,
-            salt: NOTESNOOK_USER_KEY_SALT
+            salt: NOTESNOOK_DB_KEY_SALT
          },
          userKeyCredentials.password
        );
@@ -227,6 +223,7 @@ export async function getDatabaseKey(appLockPassword) {

    return DB_KEY;
  } catch (e) {
+    ToastManager.error(e, "Error getting database key");
    console.log(e, "error");
    DatabaseLogger.error(e);
    return null;
@@ -239,7 +236,7 @@ export async function deriveCryptoKey(data) {
    const userKeyCipher = await encrypt(
      {
        key: await getDatabaseKey(),
-        salt: NOTESNOOK_USER_KEY_SALT
+        salt: NOTESNOOK_DB_KEY_SALT
      },
      credentials.key
    );
@@ -264,13 +261,12 @@ export async function getCryptoKey(_name) {

    const key = await decrypt(
      {
-        key: await getDatabaseKey()
+        key: await getDatabaseKey(),
+        salt: keyCipher.salt
      },
      keyCipher
    );

-    DatabaseLogger.info("User key decrypted: ", !!key);
-
    return key;
  } catch (e) {
    console.log("getCryptoKey", e);
--- a/apps/mobile/app/common/database/index.js
+++ b/apps/mobile/app/common/database/index.js
@@ -85,4 +85,10 @@ export async function setupDatabase(password) {
 }

 export const db = database;
-export const DatabaseLogger = dbLogger;
+let DatabaseLogger = dbLogger.scope(Platform.OS);
+
+const setLogger = () => {
+  DatabaseLogger = dbLogger.scope(Platform.OS);
+};
+
+export { DatabaseLogger, setLogger };
--- a/apps/mobile/app/common/database/logger.js
+++ b/apps/mobile/app/common/database/logger.js
@@ -16,14 +16,30 @@ 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 { initialize } from "@notesnook/core/dist/logger";
-import { KV } from "./storage";
+import { SqliteAdapter, SqliteIntrospector, SqliteQueryCompiler } from "kysely";
+import { Platform } from "react-native";
+import { setLogger } from ".";
+import { RNSqliteDriver } from "./sqlite.kysely";

-const LoggerStorage = new MMKVLoader()
-  .withInstanceID("notesnook_logs")
-  .initialize();
+let loggerLoaded = false;
+const initializeLogger = async () => {
+  if (loggerLoaded) return;
+  await initialize({
+    dialect: (name) => ({
+      createDriver: () => {
+        return new RNSqliteDriver({ async: true, dbName: name });
+      },
+      createAdapter: () => new SqliteAdapter(),
+      createIntrospector: (db) => new SqliteIntrospector(db),
+      createQueryCompiler: () => new SqliteQueryCompiler()
+    }),
+    tempStore: "memory",
+    journalMode: Platform.OS === "ios" ? "DELETE" : "WAL"
+  });
+  setLogger();
+  loggerLoaded = true;
+};

-initialize(new KV(LoggerStorage));
-
-export { LoggerStorage };
+export { initializeLogger };
--- a/apps/mobile/app/common/filesystem/upload.js
+++ b/apps/mobile/app/common/filesystem/upload.js
@@ -26,6 +26,7 @@ import { Platform } from "react-native";
 import { IOS_APPGROUPID } from "../../utils/constants";
 import { createCacheDir } from "./io";
 import { getUploadedFileSize } from "./download";
+import { ToastManager } from "../../services/event-manager";

 export async function uploadFile(filename, data, cancelToken) {
  if (!data) return false;
@@ -50,9 +51,15 @@ export async function uploadFile(filename, data, cancelToken) {
      method: "PUT",
      headers
    });
-    if (!res.ok) throw new Error(`${res.status}: Unable to resolve upload url`);
-    const uploadUrl = await res.text();
-    if (!uploadUrl) throw new Error("Unable to resolve attachment upload url");
+
+    const uploadUrl = res.ok ? await res.text() : await res.json();
+
+    if (typeof uploadUrl !== "string") {
+      throw new Error(
+        uploadUrl.error || "Unable to resolve attachment upload url."
+      );
+    }
+
    let uploadFilePath = `${cacheDir}/${filename}`;

    const iosAppGroup =
@@ -125,8 +132,10 @@ export async function uploadFile(filename, data, cancelToken) {
    return result;
  } catch (e) {
    useAttachmentStore.getState().remove(filename);
-    DatabaseLogger.info(`File upload error: ${filename}, ${e}`);
-    DatabaseLogger.error(e);
+    ToastManager.error(e, "File upload failed");
+    DatabaseLogger.error(e, "File upload failed", {
+      filename
+    });
    return false;
  }
 }
--- a/apps/mobile/app/components/announcements/cta.js
+++ b/apps/mobile/app/components/announcements/cta.js
@@ -20,15 +20,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import React from "react";
 import { Linking, View } from "react-native";
 //import SettingsBackupAndRestore from '../../screens/settings/backup-restore';
-import { eSendEvent, presentSheet } from "../../services/event-manager";
-import Sync from "../../services/sync";
 import { useThemeColors } from "@notesnook/theme";
-import { eCloseAnnouncementDialog, eCloseSheet } from "../../utils/events";
+import { eSendEvent, presentSheet } from "../../services/event-manager";
+import { eCloseAnnouncementDialog } from "../../utils/events";
 import { SIZE } from "../../utils/size";
 import { sleep } from "../../utils/time";
 import { PricingPlans } from "../premium/pricing-plans";
 import SheetProvider from "../sheet-provider";
-import { Progress } from "../sheets/progress";
 import { Button } from "../ui/button";
 import { allowedOnPlatform, getStyle } from "./functions";

@@ -56,13 +54,6 @@ export const Cta = ({ actions, style = {}, color, inline }) => {
          />
        )
      });
-    } else if (item.type === "force-sync") {
-      eSendEvent(eCloseSheet);
-      await sleep(300);
-      Progress.present();
-      Sync.run("global", true, true, () => {
-        eSendEvent(eCloseSheet);
-      });
    }
  };
  return (
--- a/apps/mobile/app/components/app-lock-overlay/index.tsx
+++ b/apps/mobile/app/components/app-lock-overlay/index.tsx
@@ -18,10 +18,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 import React, { useCallback, useEffect, useRef } from "react";
-import { AppStateStatus, Platform, TextInput, View } from "react-native";
+import {
+  AppStateStatus,
+  Platform,
+  TextInput,
+  useWindowDimensions,
+  View
+} from "react-native";
 //@ts-ignore
 import { useThemeColors } from "@notesnook/theme";
-import { enabled } from "react-native-privacy-snapshot";
 import { DatabaseLogger } from "../../common/database";
 import {
  decrypt,
@@ -34,17 +39,20 @@ import {
 import { MMKV } from "../../common/database/mmkv";
 import { useAppState } from "../../hooks/use-app-state";
 import BiometricService from "../../services/biometrics";
+import { ToastManager } from "../../services/event-manager";
 import SettingsService from "../../services/settings";
 import { useSettingStore } from "../../stores/use-setting-store";
 import { useUserStore } from "../../stores/use-user-store";
 import { NotesnookModule } from "../../utils/notesnook-module";
 import { SIZE } from "../../utils/size";
+import { Toast } from "../toast";
 import { Button } from "../ui/button";
 import { IconButton } from "../ui/icon-button";
 import Input from "../ui/input";
 import Seperator from "../ui/seperator";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
+import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";

 const getUser = () => {
  const user = MMKV.getString("user");
@@ -85,6 +93,7 @@ const AppLockedOverlay = () => {
  const appState = useAppState();
  const lastAppState = useRef<AppStateStatus>(appState);
  const biometricUnlockAwaitingUserInput = useRef(false);
+  const { height } = useWindowDimensions();
  const keyboardType = useSettingStore(
    (state) => state.settings.applockKeyboardType
  );
@@ -119,7 +128,6 @@ const AppLockedOverlay = () => {
    );
    if (unlocked) {
      lockApp(false);
-      enabled(false);
      password.current = undefined;
    }
    biometricUnlockAwaitingUserInput.current = false;
@@ -146,8 +154,13 @@ const AppLockedOverlay = () => {
        }

        lockApp(false);
-        enabled(false);
        password.current = undefined;
+      } else {
+        ToastManager.show({
+          heading: `Invalid ${keyboardType === "numeric" ? "pin" : "password"}`,
+          type: "error",
+          context: "local"
+        });
      }
    } catch (e) {
      console.error(e);
@@ -155,10 +168,6 @@ const AppLockedOverlay = () => {
  };

  useEffect(() => {
-    if (appState === "active") {
-      enabled(false);
-    }
-
    const prevState = lastAppState.current;
    lastAppState.current = appState;

@@ -184,31 +193,28 @@ const AppLockedOverlay = () => {
        DatabaseLogger.info("Biometric unlock request");
        onUnlockAppRequested();
      }
-
-      enabled(false);
    } else {
      SettingsService.appEnteredBackground();
-
-      if (
-        SettingsService.get().privacyScreen ||
-        SettingsService.getProperty("appLockEnabled")
-      ) {
-        enabled(true);
-      }
    }
  }, [appState, onUnlockAppRequested, appLocked]);

  return appLocked ? (
-    <View
+    <KeyboardAwareScrollView
      style={{
        backgroundColor: colors.primary.background,
        width: "100%",
        height: "100%",
        position: "absolute",
-        zIndex: 999,
-        justifyContent: "center"
+        zIndex: 999
      }}
+      contentContainerStyle={{
+        justifyContent: "center",
+        minHeight: height
+      }}
+      keyboardDismissMode="interactive"
+      keyboardShouldPersistTaps="handled"
    >
+      <Toast context="local" />
      <View
        style={{
          flex: 1,
@@ -321,7 +327,7 @@ const AppLockedOverlay = () => {
          </View>
        </View>
      </View>
-    </View>
+    </KeyboardAwareScrollView>
  ) : null;
 };

--- a/apps/mobile/app/components/attachments/index.tsx
+++ b/apps/mobile/app/components/attachments/index.tsx
@@ -355,6 +355,7 @@ export const AttachmentDialog = ({ note }: { note?: Note }) => {

 AttachmentDialog.present = (note?: Note) => {
  presentSheet({
-    component: () => <AttachmentDialog note={note} />
+    component: () => <AttachmentDialog note={note} />,
+    keyboardHandlerDisabled: true
  });
 };
--- a/apps/mobile/app/components/auth/login.js
+++ b/apps/mobile/app/components/auth/login.js
@@ -17,12 +17,16 @@ 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, useState } from "react";
 import { TouchableOpacity, View, useWindowDimensions } from "react-native";
 import { SheetManager } from "react-native-actions-sheet";
 import { DDS } from "../../services/device-detection";
 import { eSendEvent } from "../../services/event-manager";
-import { useThemeColors } from "@notesnook/theme";
+import Sync from "../../services/sync";
+import { useSettingStore } from "../../stores/use-setting-store";
+import { useUserStore } from "../../stores/use-user-store";
+import { eUserLoggedIn } from "../../utils/events";
 import { SIZE } from "../../utils/size";
 import { sleep } from "../../utils/time";
 import SheetProvider from "../sheet-provider";
@@ -34,11 +38,6 @@ import Paragraph from "../ui/typography/paragraph";
 import { hideAuth } from "./common";
 import { ForgotPassword } from "./forgot-password";
 import { useLogin } from "./use-login";
-import { useSettingStore } from "../../stores/use-setting-store";
-import { eUserLoggedIn } from "../../utils/events";
-import { useUserStore } from "../../stores/use-user-store";
-import Sync from "../../services/sync";
-import { Notice } from "../ui/notice";

 const LoginSteps = {
  emailAuth: 1,
@@ -67,7 +66,7 @@ export const Login = ({ changeMode }) => {
    Progress.present();
    setTimeout(() => {
      if (!useUserStore.getState().syncing) {
-        Sync.run("global", false, true);
+        Sync.run("global", false, "full");
      }
    }, 5000);
  });
@@ -184,7 +183,11 @@ export const Login = ({ changeMode }) => {
            defaultValue={email.current}
            editable={step === LoginSteps.emailAuth && !loading}
            onSubmit={() => {
-              passwordInputRef.current?.focus();
+              if (step === LoginSteps.emailAuth) {
+                login();
+              } else {
+                passwordInputRef.current?.focus();
+              }
            }}
          />

@@ -243,6 +246,7 @@ export const Login = ({ changeMode }) => {
                width: 250,
                borderRadius: 100
              }}
+              height={50}
              fontSize={SIZE.md}
              type="accent"
              title={!loading ? "Continue" : null}
--- a/apps/mobile/app/components/auth/session-expired.js
+++ b/apps/mobile/app/components/auth/session-expired.js
@@ -112,7 +112,11 @@ export const SessionExpired = () => {
      if (!res) throw new Error("no token found");
      if (db.tokenManager._isTokenExpired(res))
        throw new Error("token expired");
-      Sync.run("global", false, true, async (complete) => {
+
+      const key = await db.user.getEncryptionKey();
+      if (!key) throw new Error("No encryption key found.");
+
+      Sync.run("global", false, "full", async (complete) => {
        if (!complete) {
          let user = await db.user.getUser();
          if (!user) return;
@@ -127,7 +131,6 @@ export const SessionExpired = () => {
        setVisible(false);
      });
    } catch (e) {
-      console.log(e);
      let user = await db.user.getUser();
      if (!user) return;
      email.current = user.email;
--- a/apps/mobile/app/components/auth/two-factor.js
+++ b/apps/mobile/app/components/auth/two-factor.js
@@ -37,6 +37,7 @@ import Seperator from "../ui/seperator";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { useCallback } from "react";
+import { ScrollView } from "react-native-actions-sheet";

 const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
  const { colors } = useThemeColors();
@@ -143,7 +144,10 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
  }, [currentMethod.method, mfaInfo.token, seconds, sending, start]);

  return (
-    <View>
+    <ScrollView
+      keyboardShouldPersistTaps="handled"
+      keyboardDismissMode="interactive"
+    >
      <View
        style={{
          alignItems: "center",
@@ -214,6 +218,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
                code.current = value;
                //onNext();
              }}
+              onSubmitEditing={onNext}
              caretHidden
              inputStyle={{
                fontSize: SIZE.lg,
@@ -225,6 +230,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
              keyboardType={
                currentMethod.method === "recoveryCode" ? "default" : "numeric"
              }
+              enablesReturnKeyAutomatically
              containerStyle={{
                height: 60,
                borderWidth: 0,
@@ -297,7 +303,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
          </>
        )}
      </View>
-    </View>
+    </ScrollView>
  );
 };

--- a/apps/mobile/app/components/dialog/functions.ts
+++ b/apps/mobile/app/components/dialog/functions.ts
@@ -44,6 +44,7 @@ type DialogInfo = {
  // eslint-disable-next-line @typescript-eslint/ban-types
  context: "global" | "local" | (string & {});
  secureTextEntry?: boolean;
+  keyboardType?: string;
 };

 export function presentDialog(data: Partial<DialogInfo>): void {
--- a/apps/mobile/app/components/dialog/index.js
+++ b/apps/mobile/app/components/dialog/index.js
@@ -174,6 +174,7 @@ export const Dialog = ({ context = "global" }) => {
              onSubmit={onPressPositive}
              returnKeyLabel="Done"
              returnKeyType="done"
+              keyboardType={dialogInfo.keyboardType || "default"}
              placeholder={dialogInfo.inputPlaceholder}
            />
          </View>
--- a/apps/mobile/app/components/dialogs/applock-password/index.tsx
+++ b/apps/mobile/app/components/dialogs/applock-password/index.tsx
@@ -19,6 +19,7 @@ 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 { TextInput, View } from "react-native";
+import { db } from "../../../common/database";
 import {
  clearAppLockVerificationCipher,
  setAppLockVerificationCipher,
@@ -44,6 +45,7 @@ import BaseDialog from "../../dialog/base-dialog";
 import DialogButtons from "../../dialog/dialog-buttons";
 import DialogHeader from "../../dialog/dialog-header";
 import { Toast } from "../../toast";
+import { Button } from "../../ui/button";
 import { IconButton } from "../../ui/icon-button";
 import Input from "../../ui/input";
 import Seperator from "../../ui/seperator";
@@ -66,6 +68,7 @@ export const AppLockPassword = () => {
    confirmPassword?: string;
  }>({});
  const [secureTextEntry, setSecureTextEntry] = useState(true);
+  const [accountPass, setAccountPass] = useState(false);

  useEffect(() => {
    const subs = [
@@ -73,6 +76,7 @@ export const AppLockPassword = () => {
        eOpenAppLockPasswordDialog,
        (mode: "create" | "change" | "remove") => {
          setMode(mode);
+          setAccountPass(false);
          setVisible(true);
        }
      ),
@@ -126,7 +130,9 @@ export const AppLockPassword = () => {
            mode === "change"
              ? `Change app lock ${keyboardType}`
              : mode === "remove"
-              ? `Remove app lock ${keyboardType}`
+              ? `Enter ${
+                  accountPass ? "account password" : `app lock ${keyboardType}`
+                } to remove ${keyboardType}`
              : `Set up a custom app lock ${keyboardType} to unlock the app`
          }
          icon="shield"
@@ -169,33 +175,39 @@ export const AppLockPassword = () => {
              confirmPasswordInputRef.current?.focus();
            }}
            defaultValue={values.current.password}
-            keyboardType={keyboardType === "pin" ? "number-pad" : "default"}
+            keyboardType={
+              keyboardType === "pin" && !accountPass ? "number-pad" : "default"
+            }
            autoComplete="password"
            returnKeyLabel={mode !== "remove" ? "Next" : "Remove"}
            returnKeyType={mode !== "remove" ? "next" : "done"}
            secureTextEntry={secureTextEntry}
            buttonLeft={
-              <IconButton
-                name={keyboardType === "password" ? "numeric" : "keyboard"}
-                onPress={() => {
-                  setKeyboardType(
-                    keyboardType === "password" ? "pin" : "password"
-                  );
-                  setSecureTextEntry(false);
-                  setImmediate(() => {
-                    setSecureTextEntry(true);
-                  });
-                }}
-                style={{
-                  width: 25,
-                  height: 25,
-                  marginRight: 5
-                }}
-                size={SIZE.lg}
-              />
+              accountPass ? null : (
+                <IconButton
+                  name={keyboardType === "password" ? "numeric" : "keyboard"}
+                  onPress={() => {
+                    setKeyboardType(
+                      keyboardType === "password" ? "pin" : "password"
+                    );
+                    setSecureTextEntry(false);
+                    setImmediate(() => {
+                      setSecureTextEntry(true);
+                    });
+                  }}
+                  style={{
+                    width: 25,
+                    height: 25,
+                    marginRight: 5
+                  }}
+                  size={SIZE.lg}
+                />
+              )
            }
            placeholder={
-              mode === "change"
+              accountPass
+                ? "Account password"
+                : mode === "change"
                ? `New ${keyboardType}`
                : `${keyboardType === "pin" ? "Pin" : "Password"}`
            }
@@ -222,6 +234,36 @@ export const AppLockPassword = () => {
              placeholder={`Confirm ${keyboardType}`}
            />
          ) : null}
+
+          {mode === "remove" ? (
+            <>
+              <Button
+                icon={
+                  accountPass ? "checkbox-marked" : "checkbox-blank-outline"
+                }
+                onPress={() => {
+                  setSecureTextEntry(false);
+                  setAccountPass(!accountPass);
+                  setTimeout(() => {
+                    setSecureTextEntry(true);
+                  });
+                }}
+                iconSize={SIZE.lg}
+                type="plain"
+                iconColor={
+                  accountPass ? colors.primary.accent : colors.primary.icon
+                }
+                title="Use account password instead"
+                style={{
+                  width: "100%",
+                  alignSelf: "flex-start",
+                  justifyContent: "flex-start",
+                  paddingHorizontal: 0,
+                  height: 30
+                }}
+              />
+            </>
+          ) : null}
        </View>

        <DialogButtons
@@ -249,7 +291,8 @@ export const AppLockPassword = () => {
                );
                return;
              }
-              await setAppLockVerificationCipher(values.current.password);
+              const password = values.current.password;
+              setAppLockVerificationCipher(password);
              SettingsService.setProperty("appLockHasPasswordSecurity", true);
            } else if (mode === "change") {
              if (
@@ -277,7 +320,6 @@ export const AppLockPassword = () => {
                );
                return;
              }
-
              const isCurrentPasswordCorrect = await validateAppLockPassword(
                values.current.currentPassword
              );
@@ -293,8 +335,10 @@ export const AppLockPassword = () => {
                return;
              }

+              const password = values.current.password;
+              await clearAppLockVerificationCipher();
              SettingsService.setProperty("appLockHasPasswordSecurity", true);
-              await setAppLockVerificationCipher(values.current.password);
+              await setAppLockVerificationCipher(password);
            } else if (mode === "remove") {
              if (!values.current.password) {
                ToastManager.error(
@@ -305,14 +349,18 @@ export const AppLockPassword = () => {
                return;
              }

-              const isCurrentPasswordCorrect = await validateAppLockPassword(
-                values.current.password
-              );
+              const isCurrentPasswordCorrect = accountPass
+                ? await db.user.verifyPassword(values.current.password)
+                : await validateAppLockPassword(values.current.password);

              if (!isCurrentPasswordCorrect) {
                ToastManager.error(
                  new Error(
-                    `${keyboardType === "pin" ? "Pin" : "Password"} incorrect`
+                    accountPass
+                      ? "Account password incorrect"
+                      : `${
+                          keyboardType === "pin" ? "Pin" : "Password"
+                        } incorrect`
                  ),
                  undefined,
                  "local"
@@ -342,7 +390,9 @@ export const AppLockPassword = () => {

            close();
          }}
-          positiveTitle="Save"
+          positiveTitle={
+            mode === "remove" ? "Remove" : mode === "change" ? "Change" : "Save"
+          }
          negativeTitle="Cancel"
          positiveType="transparent"
          loading={false}
--- a/apps/mobile/app/components/dialogs/attach-image-dialog/index.tsx
+++ b/apps/mobile/app/components/dialogs/attach-image-dialog/index.tsx
@@ -17,7 +17,13 @@ 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, { useState } from "react";
-import { Image, ScrollView, TouchableOpacity, View } from "react-native";
+import {
+  Image,
+  Platform,
+  ScrollView,
+  TouchableOpacity,
+  View
+} from "react-native";
 import { Image as ImageType } from "react-native-image-crop-picker";
 import { useThemeColors } from "../../../../../../packages/theme/dist";
 import { presentSheet } from "../../../services/event-manager";
@@ -61,11 +67,14 @@ export default function AttachImage({
          Attaching {response?.length} image(s):
        </Paragraph>
        <ScrollView horizontal>
-          {response?.map((item) => (
+          {response?.map?.((item) => (
            <TouchableOpacity key={item.filename} activeOpacity={0.9}>
              <Image
                source={{
-                  uri: item.sourceURL || item.path
+                  uri:
+                    Platform.OS === "ios"
+                      ? item.sourceURL || item.path
+                      : item.path
                }}
                style={{
                  width: 100,
--- a/apps/mobile/app/components/dialogs/vault/index.js
+++ b/apps/mobile/app/components/dialogs/vault/index.js
@@ -586,7 +586,7 @@ export class VaultDialog extends Component {
  }

  async _copyNote(note) {
-    Clipboard.setString(await convertNoteToText(note));
+    Clipboard.setString((await convertNoteToText(note, true)) || "");
    ToastManager.show({
      heading: "Note copied",
      type: "success",
@@ -602,7 +602,7 @@ export class VaultDialog extends Component {
      await Share.open({
        heading: "Share note",
        failOnCancel: false,
-        message: await convertNoteToText(note)
+        message: (await convertNoteToText(note)) || ""
      });
    } catch (e) {
      console.error(e);
--- a/apps/mobile/app/components/exception-handler/index.tsx
+++ b/apps/mobile/app/components/exception-handler/index.tsx
@@ -23,10 +23,7 @@ import { SafeAreaProvider, SafeAreaView } from "react-native-safe-area-context";
 import { Dialog } from "../dialog";
 import { Issue } from "../sheets/github/issue";

-const error = (
-  stack: string,
-  component: string
-) => `Please let us know what happened. What steps we can take to reproduce the issue here.
+const error = (stack: string, component: string) => `

 _______________________________
 Stacktrace: In ${component}::${stack}`;
@@ -39,9 +36,9 @@ class ExceptionHandler extends React.Component<{
    error: Error | null;
    hasError: boolean;
  } = {
-      hasError: false,
-      error: null
-    };
+    hasError: false,
+    error: null
+  };
  static getDerivedStateFromError(error: Error) {
    return { hasError: true, error: error };
  }
--- a/apps/mobile/app/components/list/card.tsx
+++ b/apps/mobile/app/components/list/card.tsx
@@ -49,7 +49,8 @@ export const Card = ({ color }: { color?: string }) => {
          flexDirection: "row",
          alignItems: "center",
          justifyContent: "space-between",
-          paddingHorizontal: 0
+          paddingHorizontal: 0,
+          width: "100%"
        }}
      >
        <View
@@ -91,7 +92,6 @@ export const Card = ({ color }: { color?: string }) => {
          <View
            style={{
              marginLeft: 10,
-              flexShrink: 1,
              marginRight: 10
            }}
          >
--- a/apps/mobile/app/components/list/index.tsx
+++ b/apps/mobile/app/components/list/index.tsx
@@ -80,7 +80,7 @@ export default function List(props: ListProps) {
  const groupOptions = useGroupOptions(groupType);

  const _onRefresh = async () => {
-    Sync.run("global", false, true, () => {
+    Sync.run("global", false, "full", () => {
      props.onRefresh?.();
    });
  };
--- a/apps/mobile/app/components/note-history/preview.js
+++ b/apps/mobile/app/components/note-history/preview.js
@@ -21,10 +21,10 @@ import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect, useState } from "react";
 import { View } from "react-native";
 import { db } from "../../common/database";
-import Editor from "../../screens/editor";
+import { ReadonlyEditor } from "../../screens/editor/readonly-editor";
 import { useTabStore } from "../../screens/editor/tiptap/use-tab-store";
 import { editorController } from "../../screens/editor/tiptap/utils";
-import { eSendEvent, ToastManager } from "../../services/event-manager";
+import { ToastManager, eSendEvent } from "../../services/event-manager";
 import Navigation from "../../services/navigation";
 import { useSelectionStore } from "../../stores/use-selection-store";
 import { useTrashStore } from "../../stores/use-trash-store";
@@ -34,7 +34,7 @@ import DialogHeader from "../dialog/dialog-header";
 import { presentDialog } from "../dialog/functions";
 import { Button } from "../ui/button";
 import Paragraph from "../ui/typography/paragraph";
-import { ReadonlyEditor } from "../../screens/editor/readonly-editor";
+import { diff } from "diffblazer";

 /**
 *
@@ -121,12 +121,21 @@ export default function NotePreview({ session, content, note }) {
          <ReadonlyEditor
            editorId="historyPreview"
            onLoad={async (loadContent) => {
-              if (content.data) {
-                const _note = note || (await db.notes.note(session?.noteId));
-                loadContent({
-                  data: content.data,
-                  id: _note.id
-                });
+              try {
+                if (content.data) {
+                  const _note = note || (await db.notes.note(session?.noteId));
+                  const currentContent = await db.content.get(_note.contentId);
+                  loadContent({
+                    data: diff(currentContent.data, content.data),
+                    id: _note.id
+                  });
+                }
+              } catch (e) {
+                ToastManager.error(
+                  e,
+                  "Failed to load history preview",
+                  "local"
+                );
              }
            }}
          />
--- a/apps/mobile/app/components/sheets/export-notes/index.tsx
+++ b/apps/mobile/app/components/sheets/export-notes/index.tsx
@@ -19,7 +19,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 import { useThemeColors } from "@notesnook/theme";
 import React, { Fragment, useState } from "react";
-import { ActivityIndicator, Platform, StyleSheet, View } from "react-native";
+import {
+  ActivityIndicator,
+  Linking,
+  Platform,
+  StyleSheet,
+  View
+} from "react-native";
 import FileViewer from "react-native-file-viewer";
 import Share from "react-native-share";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
@@ -29,14 +35,12 @@ import { requestInAppReview } from "../../../services/app-review";
 import {
  PresentSheetOptions,
  ToastManager,
-  eSendEvent,
  presentSheet
 } from "../../../services/event-manager";
 import Exporter from "../../../services/exporter";
 import PremiumService from "../../../services/premium";
 import { useUserStore } from "../../../stores/use-user-store";
 import { getElevationStyle } from "../../../utils/elevation";
-import { eCloseSheet } from "../../../utils/events";
 import { SIZE, ph, pv } from "../../../utils/size";
 import { sleep } from "../../../utils/time";
 import { Dialog } from "../../dialog";
@@ -65,6 +69,7 @@ const ExportNotesSheet = ({
        filePath: string;
        name: string;
        type: string;
+        fileDir: string;
      }
    | undefined
  >();
@@ -295,7 +300,9 @@ const ExportNotesSheet = ({
                  successfully as {result?.fileName}
                </Paragraph>
                <Button
-                  title="Open"
+                  title={
+                    Platform.OS === "android" ? "Open file location" : "Open"
+                  }
                  type="accent"
                  width={250}
                  fontSize={SIZE.md}
@@ -305,20 +312,23 @@ const ExportNotesSheet = ({
                  }}
                  onPress={async () => {
                    if (!result?.filePath) return;
-                    eSendEvent(eCloseSheet);
-                    await sleep(500);
-                    FileViewer.open(result?.filePath, {
-                      showOpenWithDialog: true,
-                      showAppsSuggestions: true
-                    }).catch((e) => {
-                      console.log(e);
-                      ToastManager.show({
-                        heading: "Cannot open",
-                        message: `No application found to open ${result.name} file.`,
-                        type: "success",
-                        context: "local"
+                    if (Platform.OS === "android") {
+                      Linking.openURL(result.fileDir).catch((e) => {
+                        ToastManager.error(e as Error);
                      });
-                    });
+                    } else {
+                      FileViewer.open(result?.filePath, {
+                        showOpenWithDialog: true,
+                        showAppsSuggestions: true
+                      }).catch((e) => {
+                        ToastManager.show({
+                          heading: "Cannot open",
+                          message: `No application found to open ${result.name} file.`,
+                          type: "success",
+                          context: "local"
+                        });
+                      });
+                    }
                  }}
                />
                <Button
@@ -331,10 +341,10 @@ const ExportNotesSheet = ({
                    borderRadius: 100
                  }}
                  onPress={async () => {
-                    if (!result?.filePath) return;
+                    if (!result) return;
                    if (Platform.OS === "ios") {
                      Share.open({
-                        url: result.filePath
+                        url: result?.fileDir + result.fileName
                      }).catch(console.log);
                    } else {
                      FileViewer.open(result.filePath, {
@@ -347,7 +357,7 @@ const ExportNotesSheet = ({
                />
                <Button
                  title="Export in another format"
-                  type="secondaryAccented"
+                  type="inverted"
                  width={250}
                  fontSize={SIZE.md}
                  style={{
--- a/apps/mobile/app/components/sheets/github/issue.js
+++ b/apps/mobile/app/components/sheets/github/issue.js
@@ -18,35 +18,33 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 import { Debug } from "@notesnook/core/dist/api/debug";
+import { getModel, getBrand, getSystemVersion } from "react-native-device-info";
 import { useThemeColors } from "@notesnook/theme";
-import Clipboard from "@react-native-clipboard/clipboard";
 import React, { useRef, useState } from "react";
 import { Linking, Platform, Text, TextInput, View } from "react-native";
 import { getVersion } from "react-native-device-info";
 import { useStoredRef } from "../../../hooks/use-stored-ref";
-import { ToastManager, eSendEvent } from "../../../services/event-manager";
+import { ToastManager } from "../../../services/event-manager";
 import PremiumService from "../../../services/premium";
 import { useUserStore } from "../../../stores/use-user-store";
-import { eCloseSheet } from "../../../utils/events";
 import { openLinkInBrowser } from "../../../utils/functions";
 import { SIZE } from "../../../utils/size";
-import { sleep } from "../../../utils/time";
 import DialogHeader from "../../dialog/dialog-header";
-import { presentDialog } from "../../dialog/functions";
 import { Button } from "../../ui/button";
 import Seperator from "../../ui/seperator";
+import Heading from "../../ui/typography/heading";
 import Paragraph from "../../ui/typography/paragraph";

 export const Issue = ({ defaultTitle, defaultBody, issueTitle }) => {
  const { colors } = useThemeColors();
-
-  const body = useStoredRef("issueBody", defaultBody);
+  const body = useStoredRef("issueBody");
  const title = useStoredRef("issueTitle", defaultTitle);
-
+  const [done, setDone] = useState(false);
  const user = useUserStore((state) => state.user);
  const [loading, setLoading] = useState(false);
  const bodyRef = useRef();
  const initialLayout = useRef(false);
+  const issueUrl = useRef();

  const onPress = async () => {
    if (loading) return;
@@ -56,57 +54,24 @@ export const Issue = ({ defaultTitle, defaultBody, issueTitle }) => {

    try {
      setLoading(true);
-      let issue_url = await Debug.report({
+      issueUrl.current = await Debug.report({
        title: title.current,
        body:
          body.current +
+          `\n${defaultBody || ""}` +
          `\n_______________
 **Device information:**
 App version: ${getVersion()}
 Platform: ${Platform.OS}
-Model: ${Platform.constants.Brand || ""}-${Platform.constants.Model || ""}-${
-            Platform.constants.Version || ""
-          }
+Device: ${getBrand() || ""}-${getModel() || ""}-${getSystemVersion() || ""}
 Pro: ${PremiumService.get()}
 Logged in: ${user ? "yes" : "no"}`,
        userId: user?.id
      });
      setLoading(false);
-      eSendEvent(eCloseSheet);
      body.reset();
      title.reset();
-      await sleep(300);
-      presentDialog({
-        title: "Issue reported",
-        paragraph: (
-          <Text>
-            You can track your issue at{" "}
-            <Text
-              style={{
-                textDecorationLine: "underline",
-                color: colors.primary.accent
-              }}
-              onPress={() => {
-                Linking.openURL(issue_url);
-              }}
-            >
-              {issue_url}.
-            </Text>{" "}
-            Please note that we will respond to your issue on the given link. We
-            recommend that you save it.
-          </Text>
-        ),
-        positiveText: "Copy link",
-        positivePress: () => {
-          Clipboard.setString(issue_url);
-          ToastManager.show({
-            heading: "Issue url copied!",
-            type: "success",
-            context: "global"
-          });
-        },
-        negativeText: "Close"
-      });
+      setDone(true);
    } catch (e) {
      setLoading(false);
      ToastManager.show({
@@ -124,125 +89,177 @@ Logged in: ${user ? "yes" : "no"}`,
        width: "100%"
      }}
    >
-      <DialogHeader
-        title={issueTitle || "Report issue"}
-        paragraph={
-          issueTitle
-            ? "We are sorry, it seems that the app crashed due to an error. You can submit a bug report below so we can fix this asap."
-            : "Let us know if you have faced any issue/bug while using Notesnook."
-        }
-      />
+      {done ? (
+        <>
+          <View
+            style={{
+              height: 250,
+              justifyContent: "center",
+              alignItems: "center",
+              gap: 10
+            }}
+          >
+            <Heading>Issue submitted</Heading>
+            <Paragraph
+              style={{
+                textAlign: "center"
+              }}
+              selectable={true}
+            >
+              You can track your issue at{" "}
+              <Paragraph
+                style={{
+                  textDecorationLine: "underline",
+                  color: colors.primary.accent
+                }}
+                onPress={() => {
+                  Linking.openURL(issueUrl.current);
+                }}
+              >
+                {issueUrl.current}
+              </Paragraph>
+              . Please note that we will respond to your issue on the given
+              link. We recommend that you save it.
+            </Paragraph>

-      <Seperator half />
-
-      <TextInput
-        placeholder="Title"
-        onChangeText={(v) => (title.current = v)}
-        defaultValue={title.current}
-        style={{
-          borderWidth: 1,
-          borderColor: colors.primary.border,
-          borderRadius: 5,
-          padding: 12,
-          fontFamily: "OpenSans-Regular",
-          marginBottom: 10,
-          fontSize: SIZE.md,
-          color: colors.primary.heading
-        }}
-        placeholderTextColor={colors.primary.placeholder}
-      />
-
-      <TextInput
-        ref={bodyRef}
-        placeholder={`Tell us more about the issue you are facing.
-        
-For example:
- Steps to reproduce the issue
- Things you have tried etc.`}
-        multiline
-        numberOfLines={5}
-        textAlignVertical="top"
-        onChangeText={(v) => (body.current = v)}
-        onLayout={() => {
-          if (initialLayout.current) return;
-          initialLayout.current = true;
-          if (body.current) {
-            bodyRef.current?.setNativeProps({
-              text: body.current,
-              selection: {
-                start: 0,
-                end: 0
-              }
-            });
-          }
-        }}
-        style={{
-          borderWidth: 1,
-          borderColor: colors.primary.border,
-          borderRadius: 5,
-          padding: 12,
-          fontFamily: "OpenSans-Regular",
-          maxHeight: 200,
-          fontSize: SIZE.sm,
-          marginBottom: 2.5,
-          color: colors.primary.paragraph
-        }}
-        placeholderTextColor={colors.primary.placeholder}
-      />
-      <Paragraph
-        size={SIZE.xs}
-        color={colors.secondary.paragraph}
-      >{`App version: ${getVersion()} Platform: ${Platform.OS} Model: ${
-        Platform.constants.Brand
-      }-${Platform.constants.Model}-${Platform.constants.Version}`}</Paragraph>
-
-      <Seperator />
-      <Button
-        onPress={onPress}
-        title={loading ? null : "Submit"}
-        loading={loading}
-        width="100%"
-        type="accent"
-      />
-
-      <Paragraph
-        color={colors.secondary.paragraph}
-        size={SIZE.xs}
-        style={{
-          marginTop: 10,
-          textAlign: "center"
-        }}
-      >
-        The information above will be publically available at{" "}
-        <Text
-          onPress={() => {
-            Linking.openURL("https://github.com/streetwriters/notesnook");
-          }}
-          style={{
-            textDecorationLine: "underline",
-            color: colors.primary.accent
-          }}
-        >
-          github.com/streetwriters/notesnook.
-        </Text>{" "}
-        If you want to ask something in general or need some assistance, we
-        would suggest that you{" "}
-        <Text
-          style={{
-            textDecorationLine: "underline",
-            color: colors.primary.accent
-          }}
-          onPress={async () => {
-            try {
-              await openLinkInBrowser("https://discord.gg/zQBK97EE22", colors);
-            } catch (e) {
-              console.error(e);
+            <Button
+              title="Open issue"
+              onPress={() => {
+                Linking.openURL(issueUrl.current);
+              }}
+              type="accent"
+              width="100%"
+            />
+          </View>
+        </>
+      ) : (
+        <>
+          <DialogHeader
+            title={issueTitle || "Report issue"}
+            paragraph={
+              issueTitle
+                ? "We are sorry, it seems that the app crashed due to an error. You can submit a bug report below so we can fix this asap."
+                : "Let us know if you have faced any issue/bug while using Notesnook."
            }
-          }}
-        >
-          join our community on Discord.
-        </Text>
-      </Paragraph>
+          />
+
+          <Seperator half />
+
+          <TextInput
+            placeholder="Title"
+            onChangeText={(v) => (title.current = v)}
+            defaultValue={title.current}
+            style={{
+              borderWidth: 1,
+              borderColor: colors.primary.border,
+              borderRadius: 5,
+              padding: 12,
+              fontFamily: "OpenSans-Regular",
+              marginBottom: 10,
+              fontSize: SIZE.md,
+              color: colors.primary.heading
+            }}
+            placeholderTextColor={colors.primary.placeholder}
+          />
+
+          <TextInput
+            ref={bodyRef}
+            multiline
+            placeholder={`Tell us more about the issue you are facing. 
+
+For example:
+- What were you trying to do in the app?
+- What did you expect to happen?
+- Steps to reproduce the issue 
+- Things you have tried etc.`}
+            numberOfLines={5}
+            textAlignVertical="top"
+            onChangeText={(v) => (body.current = v)}
+            onLayout={() => {
+              if (initialLayout.current) return;
+              initialLayout.current = true;
+              if (body.current) {
+                bodyRef.current?.setNativeProps({
+                  text: body.current,
+                  selection: {
+                    start: 0,
+                    end: 0
+                  }
+                });
+              }
+            }}
+            style={{
+              borderWidth: 1,
+              borderColor: colors.primary.border,
+              borderRadius: 5,
+              padding: 12,
+              fontFamily: "OpenSans-Regular",
+              maxHeight: 200,
+              fontSize: SIZE.sm,
+              marginBottom: 2.5,
+              color: colors.primary.paragraph
+            }}
+            placeholderTextColor={colors.primary.placeholder}
+          />
+          <Paragraph
+            size={SIZE.xs}
+            color={colors.secondary.paragraph}
+          >{`App version: ${getVersion()} Platform: ${
+            Platform.OS
+          } Model: ${getBrand()}-${getModel()}-${getSystemVersion()}`}</Paragraph>
+
+          <Seperator />
+          <Button
+            onPress={onPress}
+            title={loading ? null : "Submit"}
+            loading={loading}
+            width="100%"
+            type="accent"
+          />
+
+          <Paragraph
+            color={colors.secondary.paragraph}
+            size={SIZE.xs}
+            style={{
+              marginTop: 10,
+              textAlign: "center"
+            }}
+          >
+            The information above will be publically available at{" "}
+            <Text
+              onPress={() => {
+                Linking.openURL("https://github.com/streetwriters/notesnook");
+              }}
+              style={{
+                textDecorationLine: "underline",
+                color: colors.primary.accent
+              }}
+            >
+              github.com/streetwriters/notesnook.
+            </Text>{" "}
+            If you want to ask something in general or need some assistance, we
+            would suggest that you{" "}
+            <Text
+              style={{
+                textDecorationLine: "underline",
+                color: colors.primary.accent
+              }}
+              onPress={async () => {
+                try {
+                  await openLinkInBrowser(
+                    "https://discord.gg/zQBK97EE22",
+                    colors
+                  );
+                } catch (e) {
+                  console.error(e);
+                }
+              }}
+            >
+              join our community on Discord.
+            </Text>
+          </Paragraph>
+        </>
+      )}
    </View>
  );
 };
--- a/apps/mobile/app/components/sheets/link-note/index.tsx
+++ b/apps/mobile/app/components/sheets/link-note/index.tsx
@@ -35,7 +35,10 @@ import Input from "../../ui/input";
 import { Pressable } from "../../ui/pressable";
 import Paragraph from "../../ui/typography/paragraph";
 import type { LinkAttributes } from "@notesnook/editor/dist/extensions/link";
-import { editorController } from "../../../screens/editor/tiptap/utils";
+import {
+  EditorEvents,
+  editorController
+} from "../../../screens/editor/tiptap/utils";

 const ListNoteItem = ({
  id,
@@ -190,13 +193,13 @@ export default function LinkNote(props: {
          }
        : undefined
    );
-    editorController.current.commands.createInternalLink(
-      {
+    editorController.current?.postMessage(EditorEvents.resolve, {
+      data: {
        href: link,
        title: selectedNote.title
      },
-      props.resolverId
-    );
+      resolverId: props.resolverId
+    });
  };

  const onSelectNote = async (note: Note) => {
--- a/apps/mobile/app/components/sheets/migrate/index.tsx
+++ b/apps/mobile/app/components/sheets/migrate/index.tsx
@@ -42,10 +42,7 @@ import { ProgressBarComponent } from "../../ui/svg/lazy";
 import Paragraph from "../../ui/typography/paragraph";
 import { Issue } from "../github/issue";

-export const makeError = (
-  stack: string,
-  component: string
-) => `Please let us know what happened. What steps we can take to reproduce the issue here.
+export const makeError = (stack: string, component: string) => `

 _______________________________
 Stacktrace: In ${component}::${stack}`;
--- a/apps/mobile/app/components/sheets/sort/index.js
+++ b/apps/mobile/app/components/sheets/sort/index.js
@@ -86,16 +86,16 @@ const Sort = ({ type, screen }) => {
        <Button
          title={
            groupOptions?.sortDirection === "asc"
-              ? groupOptions.groupBy === "abc" ||
-                groupOptions.sortBy === "title"
+              ? groupOptions?.groupBy === "abc" ||
+                groupOptions?.sortBy === "title"
                ? "A - Z"
-                : groupOptions.sortBy === "dueDate"
+                : groupOptions?.sortBy === "dueDate"
                ? "Earliest first"
                : "Old - New"
-              : groupOptions.groupBy === "abc" ||
-                groupOptions.sortBy === "title"
+              : groupOptions?.groupBy === "abc" ||
+                groupOptions?.sortBy === "title"
              ? "Z - A"
-              : groupOptions.sortBy === "dueDate"
+              : groupOptions?.sortBy === "dueDate"
              ? "Latest first"
              : "New - Old"
          }
@@ -134,7 +134,7 @@ const Sort = ({ type, screen }) => {
          alignItems: "center"
        }}
      >
-        {groupOptions.groupBy === "abc" ? (
+        {groupOptions?.groupBy === "abc" ? (
          <Button
            type="secondary"
            title="Title"
@@ -154,18 +154,18 @@ const Sort = ({ type, screen }) => {
              item === "dateEdited") ? null : (
              <Button
                key={item}
-                type={groupOptions.sortBy === item ? "selected" : "plain"}
+                type={groupOptions?.sortBy === item ? "selected" : "plain"}
                title={SORT[item]}
                height={40}
                iconPosition="left"
-                icon={groupOptions.sortBy === item ? "check" : null}
+                icon={groupOptions?.sortBy === item ? "check" : null}
                style={{
                  marginRight: 10,
                  paddingHorizontal: 8
                }}
                buttonType={{
                  text:
-                    groupOptions.sortBy === item
+                    groupOptions?.sortBy === item
                      ? colors.primary.accent
                      : colors.secondary.paragraph
                }}
@@ -213,11 +213,11 @@ const Sort = ({ type, screen }) => {
                key={item}
                testID={"btn-" + item}
                type={
-                  groupOptions.groupBy === GROUP[item] ? "selected" : "plain"
+                  groupOptions?.groupBy === GROUP[item] ? "selected" : "plain"
                }
                buttonType={{
                  text:
-                    groupOptions.groupBy === GROUP[item]
+                    groupOptions?.groupBy === GROUP[item]
                      ? colors.primary.accent
                      : colors.secondary.paragraph
                }}
@@ -235,7 +235,7 @@ const Sort = ({ type, screen }) => {
                  updateGroupOptions(_groupOptions);
                }}
                height={40}
-                icon={groupOptions.groupBy === GROUP[item] ? "check" : null}
+                icon={groupOptions?.groupBy === GROUP[item] ? "check" : null}
                title={
                  item.slice(0, 1).toUpperCase() + item.slice(1, item.length)
                }
--- a/apps/mobile/app/components/ui/button/index.tsx
+++ b/apps/mobile/app/components/ui/button/index.tsx
@@ -25,7 +25,8 @@ import {
  DimensionValue,
  TextStyle,
  View,
-  ViewStyle
+  ViewStyle,
+  useWindowDimensions
 } from "react-native";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { useUserStore } from "../../../stores/use-user-store";
@@ -92,6 +93,9 @@ export const Button = ({
  });
  const textColor = buttonType?.text ? buttonType.text : text;

+  const { fontScale } = useWindowDimensions();
+  const growFactor = 1 + (fontScale - 1) / 10;
+
  const Component = bold ? Heading : Paragraph;

  return (
@@ -117,8 +121,11 @@ export const Button = ({
      customOpacity={buttonType?.opacity}
      customAlpha={buttonType?.alpha}
      style={{
-        height: height,
-        width: (width as DimensionValue) || undefined,
+        height: typeof height === "number" ? height * growFactor : height,
+        width:
+          typeof width === "number"
+            ? width * growFactor
+            : (width as DimensionValue) || undefined,
        paddingHorizontal: 12,
        borderRadius: 5,
        alignSelf: "center",
--- a/apps/mobile/app/components/ui/pressable/index.tsx
+++ b/apps/mobile/app/components/ui/pressable/index.tsx
@@ -21,11 +21,12 @@ import { VariantsWithStaticColors, useThemeColors } from "@notesnook/theme";
 import React, { RefObject, useCallback } from "react";
 import {
  ColorValue,
+  PressableStateCallbackType,
  Pressable as RNPressable,
  PressableProps as RNPressableProps,
-  PressableStateCallbackType,
  View,
-  ViewStyle
+  ViewStyle,
+  useWindowDimensions
 } from "react-native";
 import {
  RGB_Linear_Shade,
@@ -256,6 +257,8 @@ export const Pressable = ({
    ? 1
    : colorOpacity;
  const alpha = customAlpha ? customAlpha : isDark ? 0.03 : -0.03;
+  const { fontScale } = useWindowDimensions();
+  const growFactor = 1 + (fontScale - 1) / 8;

  const getStyle = useCallback(
    ({ pressed }: PressableStateCallbackType): ViewStyle | ViewStyle[] => [
@@ -276,7 +279,13 @@ export const Pressable = ({
          : borderColor || "transparent",
        borderWidth: borderWidth
      },
-      style
+      style,
+      {
+        height:
+          typeof style.height === "number"
+            ? style.height * growFactor
+            : style.height
+      }
    ],
    [
      alpha,
@@ -288,7 +297,8 @@ export const Pressable = ({
      borderSelectedColor,
      borderColor,
      borderWidth,
-      style
+      style,
+      growFactor
    ]
  );

--- a/apps/mobile/app/hooks/use-actions.tsx
+++ b/apps/mobile/app/hooks/use-actions.tsx
@@ -600,20 +600,11 @@ export const useActions = ({
        });
        return;
      }
-      const text = await convertNoteToText(item as Note, false);
-      if (!text) {
-        ToastManager.error(
-          new Error(Errors.export("text")),
-          undefined,
-          "local"
-        );
-        return;
-      }
-
-      const html = text.replace(/\n/g, "<br />");
+      const text = await convertNoteToText(item as Note, true);
+      const html = (text || "").replace(/\n/g, "<br />");
      await Notifications.displayNotification({
        title: item.title,
-        message: (item as Note).headline || text,
+        message: (item as Note).headline || text || "",
        subtitle: "",
        bigText: html,
        ongoing: true,
@@ -684,15 +675,11 @@ export const useActions = ({
      } else {
        processingId.current = "shareNote";
        const convertedText = await convertNoteToText(item);
-        if (!convertedText) {
-          ToastManager.error(new Error(Errors.export("text")));
-          return;
-        }
        processingId.current = undefined;
        Share.open({
          title: "Share note to",
          failOnCancel: false,
-          message: convertedText
+          message: convertedText || ""
        });
      }
    }
@@ -772,11 +759,7 @@ export const useActions = ({
        } else {
          processingId.current = "copyContent";
          const text = await convertNoteToText(item as Note, true);
-          if (!text) {
-            ToastManager.error(new Error(Errors.export("text")));
-            return;
-          }
-          Clipboard.setString(text);
+          Clipboard.setString(text || "");
          processingId.current = undefined;
          ToastManager.show({
            heading: "Note copied to clipboard",
--- a/apps/mobile/app/hooks/use-app-events.tsx
+++ b/apps/mobile/app/hooks/use-app-events.tsx
@@ -86,6 +86,7 @@ import { updateStatusBarColor } from "../utils/colors";
 import { BETA } from "../utils/constants";
 import {
  eCloseSheet,
+  eEditorReset,
  eLoginSessionExpired,
  eOnLoadNote,
  eOpenAnnouncementDialog,
@@ -96,6 +97,7 @@ import {
 import { getGithubVersion } from "../utils/github-version";
 import { tabBarRef } from "../utils/global-refs";
 import { sleep } from "../utils/time";
+import { initializeLogger } from "../common/database/logger";

 const onCheckSyncStatus = async (type: SyncStatusEvent) => {
  const { disableSync, disableAutoSync } = SettingsService.get();
@@ -200,11 +202,13 @@ const onRequestPartialSync = async (
    `onRequestPartialSync full:${full}, force:${force}, lastSyncTime:${lastSyncTime}`
  );

-  if (full || force) {
-    await Sync.run("global", force, full, undefined, lastSyncTime);
-  } else {
-    await Sync.run("global", false, false, undefined, lastSyncTime);
-  }
+  await Sync.run(
+    "global",
+    force,
+    full ? "full" : "send",
+    undefined,
+    lastSyncTime
+  );
 };

 const onLogout = async (reason: string) => {
@@ -233,7 +237,7 @@ async function checkForShareExtensionLaunchedInBackground() {
    if (notesAddedFromIntent || shareExtensionOpened) {
      const id = useTabStore.getState().getCurrentNoteId();
      const note = id && (await db.notes.note(id));
-      eSendEvent("webview_reset");
+      eSendEvent(eEditorReset);
      if (note) setTimeout(() => eSendEvent("loadingNote", note), 1);
      MMKV.removeItem("shareExtensionOpened");
    }
@@ -277,8 +281,108 @@ const onSubscriptionError = async (error: RNIap.PurchaseError) => {

 const SodiumEventEmitter = new NativeEventEmitter(NativeModules.Sodium);

+const doAppLoadActions = async () => {
+  if (SettingsService.get().sessionExpired) {
+    eSendEvent(eLoginSessionExpired);
+    return;
+  }
+  notifee.setBadgeCount(0);
+
+  if (!(await db.user.getUser())) {
+    setLoginMessage();
+    return;
+  }
+
+  await useMessageStore.getState().setAnnouncement();
+  if (NewFeature.present()) return;
+  if (await checkAppUpdateAvailable()) return;
+  if (await checkForRateAppRequest()) return;
+  if (await PremiumService.getRemainingTrialDaysStatus()) return;
+  if (SettingsService.get().introCompleted) {
+    useMessageStore.subscribe((state) => {
+      const dialogs = state.dialogs;
+      if (dialogs.length > 0) {
+        eSendEvent(eOpenAnnouncementDialog, dialogs[0]);
+      }
+    });
+  }
+};
+
+const checkAppUpdateAvailable = async () => {
+  if (__DEV__ || Config.isTesting === "true" || Config.FDROID_BUILD || BETA)
+    return;
+  try {
+    const version =
+      Config.GITHUB_RELEASE === "true"
+        ? await getGithubVersion()
+        : await checkVersion();
+    if (!version || !version?.needsUpdate) return false;
+
+    setUpdateAvailableMessage(version);
+    return true;
+  } catch (e) {
+    return false;
+  }
+};
+
+const checkForRateAppRequest = async () => {
+  const rateApp = SettingsService.get().rateApp as number;
+  if (
+    rateApp &&
+    rateApp < Date.now() &&
+    !useMessageStore.getState().message?.visible
+  ) {
+    setRateAppMessage();
+    return false;
+  }
+  return false;
+};
+
+const IsDatabaseMigrationRequired = () => {
+  if (!db.migrations.required() || useUserStore.getState().appLocked)
+    return false;
+
+  presentSheet({
+    component: <Migrate />,
+    onClose: () => {
+      if (!db.migrations.required()) {
+        initializeDatabase();
+      }
+    },
+    disableClosing: true
+  });
+  return true;
+};
+
+const initializeDatabase = async (password?: string) => {
+  if (useUserStore.getState().appLocked) return;
+  if (!db.isInitialized) {
+    RNBootSplash.hide({ fade: true });
+    DatabaseLogger.info("Initializing database");
+    try {
+      await setupDatabase(password);
+      await db.init();
+    } catch (e) {
+      DatabaseLogger.error(e as Error);
+      ToastManager.error(e as Error, "Error initializing database", "global");
+    }
+  }
+
+  if (IsDatabaseMigrationRequired()) return;
+
+  if (db.isInitialized) {
+    Notifications.setupReminders(true);
+    if (SettingsService.get().notifNotes) {
+      Notifications.pinQuickNote(false);
+    }
+    useSettingStore.getState().setAppLoading(false);
+    DatabaseLogger.info("Database initialized");
+  }
+  Walkthrough.init();
+};
+
 export const useAppEvents = () => {
-  const loading = useSettingStore((state) => state.isAppLoading);
+  const isAppLoading = useSettingStore((state) => state.isAppLoading);
  const [setLastSynced, setUser, appLocked, syncing] = useUserStore((state) => [
    state.setLastSynced,
    state.setUser,
@@ -309,7 +413,7 @@ export const useAppEvents = () => {
  }, [setLastSynced]);

  useEffect(() => {
-    if (loading) return;
+    if (isAppLoading) return;

    let subscriptions: EventManagerSubscription[] = [];
    const eventManager = db.eventManager;
@@ -324,7 +428,7 @@ export const useAppEvents = () => {
    return () => {
      subscriptions.forEach((sub) => sub?.unsubscribe?.());
    };
-  }, [loading, onSyncComplete]);
+  }, [isAppLoading, onSyncComplete]);

  const subscribeToPurchaseListeners = useCallback(async () => {
    if (Platform.OS === "android") {
@@ -530,6 +634,14 @@ export const useAppEvents = () => {
        }
        //@ts-ignore
        globalThis["IS_SHARE_EXTENSION"] = false;
+
+        if (
+          SettingsService.getBackgroundEnterTime() + 60 * 1000 * 10 <
+          Date.now()
+        ) {
+          // Reset the editor if the app has been in background for more than 10 minutes.
+          eSendEvent(eEditorReset);
+        }
      } else {
        await saveEditorState();
        if (
@@ -561,7 +673,7 @@ export const useAppEvents = () => {
      });
    }
    let sub: NativeEventSubscription;
-    if (!loading && !appLocked) {
+    if (!isAppLoading && !appLocked) {
      setTimeout(() => {
        sub = AppState.addEventListener("change", onAppStateChanged);
        if (
@@ -583,7 +695,7 @@ export const useAppEvents = () => {
      sub?.remove();
      unsubscribePurchaseListeners();
    };
-  }, [loading, appLocked, checkAutoBackup]);
+  }, [isAppLoading, appLocked, checkAutoBackup]);

  useEffect(() => {
    if (!appLocked && !syncing && refValues.current.backupDidWait) {
@@ -632,127 +744,22 @@ export const useAppEvents = () => {
  }

  useEffect(() => {
-    if (!loading) {
+    if (!isAppLoading) {
      onUserUpdated();
      doAppLoadActions();
    }
-  }, [loading, onUserUpdated]);
-
-  const initializeDatabase = useCallback(async (password?: string) => {
-    const IsDatabaseMigrationRequired = () => {
-      if (!db.migrations.required() || useUserStore.getState().appLocked)
-        return false;
-
-      presentSheet({
-        component: <Migrate />,
-        onClose: () => {
-          if (!db.migrations.required()) {
-            initializeDatabase();
-          }
-        },
-        disableClosing: true
-      });
-      return true;
-    };
-
-    if (useUserStore.getState().appLocked) return;
-    if (!db.isInitialized) {
-      RNBootSplash.hide({ fade: true });
-      DatabaseLogger.info("Initializing database");
-      try {
-        await setupDatabase(password);
-        await db.init();
-      } catch (e) {
-        DatabaseLogger.error(e as Error);
-        ToastManager.error(e as Error, "Error initializing database", "global");
-      }
-    }
-
-    if (IsDatabaseMigrationRequired()) return;
-
-    if (db.isInitialized) {
-      Notifications.setupReminders(true);
-      if (SettingsService.get().notifNotes) {
-        Notifications.pinQuickNote(false);
-      }
-      useSettingStore.getState().setAppLoading(false);
-      DatabaseLogger.info("Database initialized");
-    }
-    Walkthrough.init();
-  }, []);
+  }, [isAppLoading, onUserUpdated]);

  useEffect(() => {
-    let sub: () => void;
-    if (appLocked) {
-      const sub = useUserStore.subscribe((state) => {
-        if (!state.appLocked && useSettingStore.getState().isAppLoading) {
-          console.log("DB initialized");
+    if (!appLocked && isAppLoading) {
+      initializeLogger()
+        .catch((e) => {
+          console.log(e);
+        })
+        .finally(() => {
+          //@ts-ignore
          initializeDatabase();
-          sub();
-        }
-      });
+        });
    }
-    return () => {
-      sub?.();
-    };
-  }, [appLocked, initializeDatabase]);
-
-  return initializeDatabase;
-};
-
-const doAppLoadActions = async () => {
-  if (SettingsService.get().sessionExpired) {
-    eSendEvent(eLoginSessionExpired);
-    return;
-  }
-  notifee.setBadgeCount(0);
-
-  if (!(await db.user.getUser())) {
-    setLoginMessage();
-    return;
-  }
-
-  await useMessageStore.getState().setAnnouncement();
-  if (NewFeature.present()) return;
-  if (await checkAppUpdateAvailable()) return;
-  if (await checkForRateAppRequest()) return;
-  if (await PremiumService.getRemainingTrialDaysStatus()) return;
-  if (SettingsService.get().introCompleted) {
-    useMessageStore.subscribe((state) => {
-      const dialogs = state.dialogs;
-      if (dialogs.length > 0) {
-        eSendEvent(eOpenAnnouncementDialog, dialogs[0]);
-      }
-    });
-  }
-};
-
-const checkAppUpdateAvailable = async () => {
-  if (__DEV__ || Config.isTesting === "true" || Config.FDROID_BUILD || BETA)
-    return;
-  try {
-    const version =
-      Config.GITHUB_RELEASE === "true"
-        ? await getGithubVersion()
-        : await checkVersion();
-    if (!version || !version?.needsUpdate) return false;
-
-    setUpdateAvailableMessage(version);
-    return true;
-  } catch (e) {
-    return false;
-  }
-};
-
-const checkForRateAppRequest = async () => {
-  const rateApp = SettingsService.get().rateApp as number;
-  if (
-    rateApp &&
-    rateApp < Date.now() &&
-    !useMessageStore.getState().message?.visible
-  ) {
-    setRateAppMessage();
-    return false;
-  }
-  return false;
+  }, [appLocked, isAppLoading]);
 };
--- a/apps/mobile/app/hooks/use-pricing.ts
+++ b/apps/mobile/app/hooks/use-pricing.ts
@@ -22,20 +22,14 @@ import { Platform } from "react-native";
 import { Subscription } from "react-native-iap";
 import PremiumService from "../services/premium";
 import { db } from "../common/database";
+import { Product } from "@notesnook/core/dist/api/pricing";

-type PurchaseInfo = {
-  country: string;
-  countryCode: string;
-  sku: string;
-  discount: number;
-};
-
-const skuInfos: { [name: string]: PurchaseInfo | undefined } = {};
+const skuInfos: { [name: string]: Product | undefined } = {};

 export const usePricing = (period: "monthly" | "yearly") => {
  const [current, setCurrent] = useState<{
    period: string;
-    info?: PurchaseInfo;
+    info?: Product;
    product?: Subscription;
  }>();

@@ -54,6 +48,7 @@ export const usePricing = (period: "monthly" | "yearly") => {
          period
        ));
      skuInfos[period] = skuInfo;
+
      const products = (await PremiumService.getProducts()) as Subscription[];
      let product = products.find((p) => p.productId === skuInfo?.sku);
      if (!product)
--- a/apps/mobile/app/navigation/tabs-holder.js
+++ b/apps/mobile/app/navigation/tabs-holder.js
@@ -62,7 +62,6 @@ import {
 } from "../services/event-manager";
 import { useSettingStore } from "../stores/use-setting-store";
 import {
-  eClearEditor,
  eCloseFullscreenEditor,
  eOnEnterEditor,
  eOnExitEditor,
@@ -286,9 +285,10 @@ const _TabsHolder = () => {
          break;
        case "mobile":
          if (
-            state &&
-            !state?.movedAway &&
-            useTabStore.getState().getCurrentNoteId()
+            (state &&
+              !state?.movedAway &&
+              useTabStore.getState().getCurrentNoteId()) ||
+            editorState().movedAway === false
          ) {
            tabBarRef.current?.goToIndex(2, false);
          } else {
--- a/apps/mobile/app/package.json
+++ b/apps/mobile/app/package.json
@@ -16,7 +16,7 @@
    "html-to-text": "9.0.5",
    "phone": "^3.1.14",
    "qclone": "^1.2.0",
-    "react-native-actions-sheet": "0.9.3",
+    "react-native-actions-sheet": "0.9.6",
    "react-native-check-version": "https://github.com/flexible-agency/react-native-check-version",
    "react-native-drax": "^0.10.2",
    "react-native-image-zoom-viewer": "^3.0.1",
--- a/apps/mobile/app/screens/editor/index.tsx
+++ b/apps/mobile/app/screens/editor/index.tsx
@@ -39,6 +39,7 @@ import {
  eSubscribeEvent
 } from "../../services/event-manager";
 import {
+  eEditorReset,
  eOnLoadNote,
  eUnlockNote,
  eUnlockWithBiometrics,
@@ -54,8 +55,10 @@ import { syncTabs, useTabStore } from "./tiptap/use-tab-store";
 import {
  editorController,
  editorState,
-  openInternalLink
+  openInternalLink,
+  randId
 } from "./tiptap/utils";
+import { tabBarRef } from "../../utils/global-refs";

 const style: ViewStyle = {
  height: "100%",
@@ -102,24 +105,20 @@ const Editor = React.memo(
        noToolbar,
        noHeader
      });
-      const renderKey = useRef(`editor-0` + editorId);
+      const renderKey = useRef(randId("editor-id") + editorId);
      useImperativeHandle(ref, () => ({
        get: () => editor
      }));
      useLockedNoteHandler();

      const onError = useCallback(() => {
-        renderKey.current =
-          renderKey.current === `editor-0`
-            ? `editor-1` + editorId
-            : `editor-0` + editorId;
-
+        renderKey.current = randId("editor-id") + editorId;
        editor.state.current.ready = false;
        editor.setLoading(true);
      }, [editor, editorId]);

      useEffect(() => {
-        const sub = [eSubscribeEvent("webview_reset", onError)];
+        const sub = [eSubscribeEvent(eEditorReset, onError)];
        return () => {
          sub.forEach((s) => s?.unsubscribe());
        };
@@ -146,6 +145,7 @@ const Editor = React.memo(
            nestedScrollEnabled
            onError={onError}
            injectedJavaScriptBeforeContentLoaded={`
+          globalThis.__DEV__ = ${__DEV__}
          globalThis.readonly=${readonly};
          globalThis.noToolbar=${noToolbar};
          globalThis.noHeader=${noHeader};
@@ -339,7 +339,7 @@ const useLockedNoteHandler = () => {
      }),
      eSubscribeEvent(eUnlockWithPassword, onSubmit)
    ];
-    if (tabRef.current?.locked) {
+    if (tabRef.current?.locked && tabBarRef.current?.page() === 2) {
      unlock();
    }
    return () => {
--- a/apps/mobile/app/screens/editor/readonly-editor.tsx
+++ b/apps/mobile/app/screens/editor/readonly-editor.tsx
@@ -75,14 +75,16 @@ export function ReadonlyEditor(props: {
    if (editorMessage.type === EventTypes.readonlyEditorLoaded) {
      console.log("Readonly editor loaded.");
      props.onLoad?.((content: { data: string; id: string }) => {
-        noteId.current = content.id;
-        editorRef.current?.postMessage(
-          JSON.stringify({
-            type: "native:html",
-            value: content.data
-          })
-        );
-        setLoading(false);
+        setTimeout(() => {
+          noteId.current = content.id;
+          editorRef.current?.postMessage(
+            JSON.stringify({
+              type: "native:html",
+              value: content.data
+            })
+          );
+          setLoading(false);
+        }, 300);
      });
    } else if (editorMessage.type === EventTypes.getAttachmentData) {
      const attachment = (editorMessage.value as any).attachment as Attachment;
--- a/apps/mobile/app/screens/editor/tiptap/editor-events.ts
+++ b/apps/mobile/app/screens/editor/tiptap/editor-events.ts
@@ -48,5 +48,6 @@ export const EventTypes = {
  unlockWithBiometrics: "editor-events:unlock-biometrics",
  disableReadonlyMode: "editor-events:disable-readonly-mode",
  readonlyEditorLoaded: "readonlyEditorLoaded",
-  error: "editorError"
+  error: "editorError",
+  dbLogger: "editor-events:dbLogger"
 };
--- a/apps/mobile/app/screens/editor/tiptap/picker.ts
+++ b/apps/mobile/app/screens/editor/tiptap/picker.ts
@@ -41,6 +41,7 @@ import { FILE_SIZE_LIMIT, IMAGE_SIZE_LIMIT } from "../../../utils/constants";
 import { eCloseSheet } from "../../../utils/events";
 import { useTabStore } from "./use-tab-store";
 import { editorController, editorState } from "./utils";
+import { basename } from "pathe";

 const showEncryptionSheet = (file: DocumentPickerResponse) => {
  presentSheet({
@@ -108,7 +109,6 @@ const file = async (fileOptions: PickerOptions) => {
      return;
    }

-    console.log("file uri: ", uri);
    uri = Platform.OS === "ios" ? santizeUri(uri) : uri;
    showEncryptionSheet(file);
    const hash = await Sodium.hashFile({
@@ -164,13 +164,14 @@ const file = async (fileOptions: PickerOptions) => {
      eSendEvent(eCloseSheet);
    }, 1000);
  } catch (e) {
+    eSendEvent(eCloseSheet);
    ToastManager.show({
      heading: (e as Error).message,
      message: "You need internet access to attach a file",
      type: "error",
      context: "global"
    });
-    console.log("attachment error: ", e);
+    DatabaseLogger.error(e);
  }
 };

@@ -184,9 +185,15 @@ const camera = async (options: PickerOptions) => {
      cropping: false,
      multiple: true,
      maxFiles: 10,
-      writeTempFile: true
+      writeTempFile: true,
+      compressImageQuality: 1
    })
-      .then((response) => handleImageResponse(response, options))
+      .then((response) => {
+        handleImageResponse(
+          Array.isArray(response) ? response : [response],
+          options
+        );
+      })
      .catch((e) => {
        console.log("camera error: ", e);
      });
@@ -209,9 +216,15 @@ const gallery = async (options: PickerOptions) => {
      mediaType: "photo",
      maxFiles: 10,
      cropping: false,
-      multiple: true
+      multiple: true,
+      compressImageQuality: 1
    })
-      .then((response) => handleImageResponse(response, options))
+      .then((response) =>
+        handleImageResponse(
+          Array.isArray(response) ? response : [response],
+          options
+        )
+      )
      .catch((e) => {
        console.log("gallery error: ", e);
      });
@@ -290,7 +303,17 @@ const handleImageResponse = async (
      type: "url"
    });

-    const fileName = image.filename || "image";
+    let fileName = image.sourceURL
+      ? basename(image.sourceURL)
+      : image.filename || "image";
+
+    fileName =
+      image.mime === "image/jpeg"
+        ? fileName.replace(/HEIC|HEIF/, "jpeg")
+        : fileName;
+
+    console.log("attaching image...", fileName);
+
    console.log("attaching file...");
    if (!(await attachFile(uri, hash, image.mime, fileName, options))) return;

--- a/apps/mobile/app/screens/editor/tiptap/types.ts
+++ b/apps/mobile/app/screens/editor/tiptap/types.ts
@@ -37,6 +37,7 @@ export type EditorState = {
  isAwaitingResult: boolean;
  scrollPosition: number;
  overlay?: boolean;
+  initialLoadCalled?: boolean;
 };

 export type Settings = {
@@ -74,6 +75,8 @@ export type EditorMessage<T> = {
  type: string;
  noteId: string;
  tabId: number;
+  resolverId?: string;
+  hasTimeout?: boolean;
 };

 export type SavePayload = {
@@ -84,6 +87,7 @@ export type SavePayload = {
  sessionHistoryId?: number;
  ignoreEdit: boolean;
  tabId: number;
+  pendingChanges?: boolean;
 };

 export type AppState = {
--- a/apps/mobile/app/screens/editor/tiptap/use-editor-events.tsx
+++ b/apps/mobile/app/screens/editor/tiptap/use-editor-events.tsx
@@ -77,7 +77,6 @@ import { EditorMessage, EditorProps, useEditorType } from "./types";
 import { useTabStore } from "./use-tab-store";
 import { EditorEvents, editorState, openInternalLink } from "./utils";

-
 const publishNote = async () => {
  const user = useUserStore.getState().user;
  if (!user) {
@@ -354,8 +353,15 @@ export const useEditorEvents = (
      const data = event.nativeEvent.data;
      const editorMessage = JSON.parse(data) as EditorMessage<any>;

+      if (editorMessage.hasTimeout && editorMessage.resolverId) {
+        editor.postMessage(EditorEvents.resolve, {
+          data: true,
+          resolverId: editorMessage.resolverId
+        });
+      }
+
      if (editorMessage.type === EventTypes.load) {
-        console.log("Editor loaded");
+        DatabaseLogger.log("Editor is ready");
        editor.onLoad();
        return;
      }
@@ -383,21 +389,36 @@ export const useEditorEvents = (
            content: editorMessage.value.html as string,
            noteId: noteId,
            tabId: editorMessage.tabId,
-            ignoreEdit: (editorMessage.value as ContentMessage).ignoreEdit
+            ignoreEdit: (editorMessage.value as ContentMessage).ignoreEdit,
+            pendingChanges: editorMessage.value?.pendingChanges
          });
          break;
        case EventTypes.title:
          DatabaseLogger.log("EventTypes.title");
          editor.saveContent({
            type: editorMessage.type,
-            title: editorMessage.value as string,
+            title: editorMessage.value?.title as string,
            noteId: noteId,
            tabId: editorMessage.tabId,
-            ignoreEdit: false
+            ignoreEdit: false,
+            pendingChanges: editorMessage.value?.pendingChanges
          });
          break;
        case EventTypes.logger:
-          logger.info("[WEBVIEW LOG]", editorMessage.value);
+          logger.info("[EDITOR LOG]", editorMessage.value);
+          break;
+        case EventTypes.dbLogger:
+          if (editorMessage.value.error) {
+            DatabaseLogger.error(
+              editorMessage.value.error,
+              editorMessage.value.error,
+              {
+                message: "[EDITOR_ERROR]" + editorMessage.value.message
+              }
+            );
+          } else {
+            DatabaseLogger.info("[EDITOR_LOG]" + editorMessage.value.message);
+          }
          break;
        case EventTypes.contentchange:
          editor.onContentChanged(editorMessage.noteId);
@@ -485,17 +506,17 @@ export const useEditorEvents = (
              console.log(
                "Got attachment data:",
                !!data,
-                (editorMessage.value as any).resolverId
+                editorMessage.resolverId
              );
-              editor.postMessage(EditorEvents.attachmentData, {
-                resolverId: (editorMessage.value as any).resolverId,
+              editor.postMessage(EditorEvents.resolve, {
+                resolverId: editorMessage.resolverId,
                data
              });
            })
            .catch((e) => {
              DatabaseLogger.error(e);
-              editor.postMessage(EditorEvents.attachmentData, {
-                resolverId: (editorMessage.value as any).resolverId,
+              editor.postMessage(EditorEvents.resolve, {
+                resolverId: editorMessage.resolverId,
                data: undefined
              });
            });
@@ -622,7 +643,7 @@ export const useEditorEvents = (
        case EventTypes.createInternalLink: {
          LinkNote.present(
            editorMessage.value.attributes,
-            editorMessage.value.resolverId
+            editorMessage.resolverId as string
          );
          break;
        }
--- a/apps/mobile/app/screens/editor/tiptap/use-editor.ts
+++ b/apps/mobile/app/screens/editor/tiptap/use-editor.ts
@@ -39,6 +39,7 @@ import { DatabaseLogger, db } from "../../../common/database";
 import useGlobalSafeAreaInsets from "../../../hooks/use-global-safe-area-insets";
 import { DDS } from "../../../services/device-detection";
 import {
+  ToastManager,
  eSendEvent,
  eSubscribeEvent,
  eUnSubscribeEvent
@@ -46,16 +47,20 @@ import {
 import Navigation from "../../../services/navigation";
 import Notifications from "../../../services/notifications";
 import SettingsService from "../../../services/settings";
+import { useSettingStore } from "../../../stores/use-setting-store";
 import { useTagStore } from "../../../stores/use-tag-store";
 import {
+  eEditorReset,
  eEditorTabFocused,
  eOnLoadNote,
  eShowMergeDialog,
  eUpdateNoteInEditor
 } from "../../../utils/events";
 import { tabBarRef } from "../../../utils/global-refs";
+import { unlockVault } from "../../../utils/unlock-vault";
 import { onNoteCreated } from "../../notes/common";
 import Commands from "./commands";
+import { EventTypes } from "./editor-events";
 import { SessionHistory } from "./session-history";
 import { EditorState, SavePayload } from "./types";
 import { syncTabs, useTabStore } from "./use-tab-store";
@@ -68,6 +73,7 @@ import {
  isEditorLoaded,
  post
 } from "./utils";
+import { sleep } from "../../../utils/time";

 type NoteWithContent = Note & {
  content?: NoteContent<false>;
@@ -145,8 +151,9 @@ export const useEditor = (

  useEffect(() => {
    const event = eSubscribeEvent(eEditorTabFocused, (tabId) => {
+      console.log("Editot tab focus changed", lastTabFocused.current, tabId);
+      if (lastTabFocused.current !== tabId) lock.current = false;
      lastTabFocused.current = tabId as number;
-      console.log(tabId);
    });
    return () => {
      event?.unsubscribe();
@@ -165,10 +172,11 @@ export const useEditor = (

  useEffect(() => {
    if (loading) {
+      overlay(true);
      state.current.ready = false;
      setLoading(false);
    }
-  }, [loading]);
+  }, [loading, overlay]);

  const withTimer = useCallback(
    (id: string, fn: () => void, duration: number) => {
@@ -216,7 +224,8 @@ export const useEditor = (
      type,
      ignoreEdit,
      sessionHistoryId: currentSessionHistoryId,
-      tabId
+      tabId,
+      pendingChanges
    }: SavePayload) => {
      if (currentNotes.current[id as string]?.readonly || readonly) return;
      try {
@@ -277,12 +286,26 @@ export const useEditor = (
          );
        }, 50);

+        const saveTimer = setTimeout(() => {
+          DatabaseLogger.log(`Note save timeout: ${id}...`);
+          ToastManager.error(
+            new Error(
+              "Copy your changes and restart the app to avoid data loss. If the issue persists, please report to us at support@streetwriters.co."
+            ),
+            "Saving note is taking too long",
+            "global",
+            15000
+          );
+        }, 30 * 1000);
+
        if (!locked) {
          DatabaseLogger.log(`Saving note: ${id}...`);
          id = await db.notes?.add({ ...noteData });
          saved = true;
          DatabaseLogger.log(`Note saved: ${id}...`);

+          clearTimeout(saveTimer);
+
          if (!note && id) {
            editorSessionHistory.newSession(id);
            if (id) {
@@ -316,9 +339,31 @@ export const useEditor = (
            Notifications.pinNote(id as string);
          }
        } else {
-          noteData.contentId = note?.contentId;
+          if (!db.vault.unlocked) {
+            if (pendingChanges) await sleep(3000);
+            const unlocked = await unlockVault({
+              title: "Unlock vault to save note",
+              paragraph: `This note is locked, unlock to save ${
+                pendingChanges ? "some pending" : ""
+              } changes`,
+              context: "global"
+            });
+            if (!unlocked)
+              throw new Error("Could not save note, vault is locked");
+          }
          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          await db.vault?.save(noteData as any);
+          if (typeof noteData.title === "string") {
+            await db.notes.add({
+              title: noteData.title,
+              id: noteData.id
+            });
+          }
+
+          noteData.contentId = note?.contentId;
+          if (data) {
+            await db.vault?.save(noteData as any);
+          }
+          clearTimeout(saveTimer);
        }

        if (id && useTabStore.getState().getTabForNote(id) === tabId) {
@@ -341,6 +386,16 @@ export const useEditor = (
          }
        }

+        if (
+          id &&
+          id === useTabStore.getState().getCurrentNoteId() &&
+          pendingChanges
+        ) {
+          postMessage(EditorEvents.title, title || note?.title, tabId);
+          postMessage(EditorEvents.html, data, tabId);
+          currentNotes.current[id] = note;
+        }
+
        saveCount.current++;
        return id;
      } catch (e) {
@@ -415,7 +470,11 @@ export const useEditor = (
            commands.focus(tabId);
        });
      } else {
-        if (!event.item) return;
+        if (!event.item) {
+          overlay(false);
+          return;
+        }
+        console.log("LOADING NOTE", event.item.id);
        const item = event.item;

        const currentTab = useTabStore
@@ -443,7 +502,6 @@ export const useEditor = (
              useTabStore.getState().focusTab(tabId);
              setTimeout(() => {
                if (blockIdRef.current) {
-                  console.log("scrolling to block", blockIdRef.current);
                  commands.scrollIntoViewById(blockIdRef.current);
                  blockIdRef.current = undefined;
                }
@@ -502,6 +560,7 @@ export const useEditor = (
          loadingState.current === currentContents.current[item.id]?.data
        ) {
          // If note is already loading, return.
+          console.log("Note is already loading...");
          return;
        }

@@ -510,7 +569,7 @@ export const useEditor = (
          return;
        }

-        lastContentChangeTime.current[item.id] = item.dateEdited;
+        lastContentChangeTime.current[item.id] = 0;
        currentLoadingNoteId.current = item.id;
        currentNotes.current[item.id] = item;

@@ -535,11 +594,8 @@ export const useEditor = (
          10000
        );

-        console.log("blockId", blockIdRef.current);
-
        setTimeout(() => {
          if (blockIdRef.current) {
-            console.log("scrolling to block", blockIdRef.current);
            commands.scrollIntoViewById(blockIdRef.current);
            blockIdRef.current = undefined;
          }
@@ -573,124 +629,130 @@ export const useEditor = (
      data: Note | ContentItem | TrashItem | DeletedItem,
      isLocal?: boolean
    ) => {
-      if (SettingsService.get().disableRealtimeSync && !isLocal) return;
-      if (!data) return;
+      try {
+        await (async () => {
+          if (SettingsService.get().disableRealtimeSync && !isLocal) return;
+          if (!data) return;

-      if (isDeleted(data) || isTrashItem(data)) {
-        const tabId = useTabStore.getState().getTabForNote(data.id);
-        if (tabId !== undefined) {
-          console.log("Removing tab");
-          await commands.clearContent(tabId);
-          useTabStore.getState().removeTab(tabId);
-        }
-        return;
-      }
-
-      const noteId =
-        (data as ContentItem).type === "tiptap"
-          ? (data as ContentItem).noteId
-          : data.id;
-
-      if (!useTabStore.getState().hasTabForNote(noteId)) return;
-      const tabId = useTabStore.getState().getTabForNote(noteId) as number;
-
-      const tab = useTabStore.getState().getTab(tabId);
-
-      const note = data.type === "note" ? data : await db.notes?.note(noteId);
-
-      lock.current = true;
-
-      // Handle this case where note was locked on another device and synced.
-      const locked = await db.vaults.itemExists(
-        currentNotes.current[noteId] as ItemReference
-      );
-
-      if (note) {
-        if (!locked && tab?.noteLocked) {
-          // Note lock removed.
-          if (tab.locked) {
-            if (useTabStore.getState().currentTab === tabId) {
-              eSendEvent(eOnLoadNote, {
-                item: note,
-                forced: true
-              });
-            } else {
-              useTabStore.getState().updateTab(tabId, {
-                locked: false,
-                noteLocked: false
-              });
-              commands.setLoading(true, tabId);
+          if (isDeleted(data) || isTrashItem(data)) {
+            const tabId = useTabStore.getState().getTabForNote(data.id);
+            if (tabId !== undefined) {
+              console.log("Removing tab");
+              await commands.clearContent(tabId);
+              useTabStore.getState().removeTab(tabId);
            }
-          }
-        } else if (!tab?.noteLocked && locked) {
-          // Note lock added.
-          useTabStore.getState().updateTab(tabId, {
-            locked: true,
-            noteLocked: true
-          });
-          if (useTabStore.getState().currentTab !== tabId) {
-            commands.clearContent(tabId);
-            commands.setLoading(true, tabId);
-          }
-        }
-
-        if (currentNotes.current[noteId]?.title !== note.title) {
-          postMessage(EditorEvents.title, note.title, tabId);
-        }
-        commands.setTags(note);
-        if (currentNotes.current[noteId]?.dateEdited !== note.dateEdited) {
-          commands.setStatus(
-            getFormattedDate(note.dateEdited, "date-time"),
-            "Saved",
-            tabId as number
-          );
-        }
-
-        console.log("readonly state changed...", note.readonly);
-        useTabStore.getState().updateTab(tabId, {
-          readonly: note.readonly
-        });
-      }
-
-      if (data.type === "tiptap" && note && !isLocal) {
-        if (lastContentChangeTime.current[noteId] >= data.dateEdited) {
-          lock.current = false;
-          return;
-        }
-
-        if (locked && isEncryptedContent(data)) {
-          const decryptedContent = await db.vault?.decryptContent(data, noteId);
-          if (!decryptedContent) {
-            useTabStore.getState().updateTab(tabId, {
-              locked: true,
-              noteLocked: true
-            });
-            if (useTabStore.getState().currentTab !== tabId) {
-              commands.clearContent(tabId);
-              commands.setLoading(true, tabId);
-            }
-          } else {
-            await postMessage(
-              EditorEvents.updatehtml,
-              decryptedContent.data,
-              tabId
-            );
-            currentContents.current[note.id] = decryptedContent;
-          }
-        } else {
-          const _nextContent = data.data;
-          if (_nextContent === currentContents.current?.data) {
-            lock.current = false;
            return;
          }
-          lastContentChangeTime.current[note.id] = note.dateEdited;
-          await postMessage(EditorEvents.updatehtml, _nextContent, tabId);
-          if (!isEncryptedContent(data)) {
-            currentContents.current[note.id] = data as UnencryptedContentItem;
+
+          const noteId =
+            (data as ContentItem).type === "tiptap"
+              ? (data as ContentItem).noteId
+              : data.id;
+
+          if (!useTabStore.getState().hasTabForNote(noteId)) return;
+          const tabId = useTabStore.getState().getTabForNote(noteId) as number;
+
+          const tab = useTabStore.getState().getTab(tabId);
+
+          const note =
+            data.type === "note" ? data : await db.notes?.note(noteId);
+
+          lock.current = true;
+
+          // Handle this case where note was locked on another device and synced.
+          const locked = await db.vaults.itemExists(
+            currentNotes.current[noteId] as ItemReference
+          );
+
+          if (note) {
+            if (!locked && tab?.noteLocked) {
+              // Note lock removed.
+              if (tab.locked) {
+                if (useTabStore.getState().currentTab === tabId) {
+                  eSendEvent(eOnLoadNote, {
+                    item: note,
+                    forced: true
+                  });
+                } else {
+                  useTabStore.getState().updateTab(tabId, {
+                    locked: false,
+                    noteLocked: false
+                  });
+                  commands.setLoading(true, tabId);
+                }
+              }
+            } else if (!tab?.noteLocked && locked) {
+              // Note lock added.
+              useTabStore.getState().updateTab(tabId, {
+                locked: true,
+                noteLocked: true
+              });
+              if (useTabStore.getState().currentTab !== tabId) {
+                commands.clearContent(tabId);
+                commands.setLoading(true, tabId);
+              }
+            }
+
+            if (currentNotes.current[noteId]?.title !== note.title) {
+              postMessage(EditorEvents.title, note.title, tabId);
+            }
+            commands.setTags(note);
+            if (currentNotes.current[noteId]?.dateEdited !== note.dateEdited) {
+              commands.setStatus(
+                getFormattedDate(note.dateEdited, "date-time"),
+                "Saved",
+                tabId as number
+              );
+            }
+
+            useTabStore.getState().updateTab(tabId, {
+              readonly: note.readonly
+            });
          }
-        }
+
+          if (data.type === "tiptap" && note && !isLocal) {
+            if (lastContentChangeTime.current[noteId] >= data.dateModified) {
+              return;
+            }
+
+            if (locked && isEncryptedContent(data)) {
+              const decryptedContent = await db.vault?.decryptContent(data);
+              if (!decryptedContent) {
+                useTabStore.getState().updateTab(tabId, {
+                  locked: true,
+                  noteLocked: true
+                });
+                if (useTabStore.getState().currentTab !== tabId) {
+                  commands.clearContent(tabId);
+                  commands.setLoading(true, tabId);
+                }
+              } else {
+                await postMessage(
+                  EditorEvents.updatehtml,
+                  decryptedContent.data,
+                  tabId
+                );
+                currentContents.current[note.id] = decryptedContent;
+              }
+            } else {
+              const _nextContent = data.data;
+              if (_nextContent === currentContents.current[note.id]?.data) {
+                return;
+              }
+              lastContentChangeTime.current[note.id] = note.dateEdited;
+              await postMessage(EditorEvents.updatehtml, _nextContent, tabId);
+              if (!isEncryptedContent(data)) {
+                currentContents.current[note.id] =
+                  data as UnencryptedContentItem;
+              }
+            }
+          }
+        })();
+      } catch (e) {
+        DatabaseLogger.error(e as Error, "Error when applying sync changes");
+      } finally {
+        lock.current = false;
      }
-      lock.current = false;
    },
    [postMessage, commands]
  );
@@ -713,7 +775,8 @@ export const useEditor = (
      type,
      ignoreEdit,
      noteId,
-      tabId
+      tabId,
+      pendingChanges
    }: {
      noteId?: string;
      title?: string;
@@ -721,18 +784,29 @@ export const useEditor = (
      type: string;
      ignoreEdit: boolean;
      tabId: number;
+      pendingChanges?: boolean;
    }) => {
-      DatabaseLogger.log(`Saving content...`);
+      DatabaseLogger.log(
+        `saveContent... title: ${!!title}, content: ${!!content}, noteId: ${noteId}`
+      );
      if (
        lock.current ||
        (currentLoadingNoteId.current &&
          currentLoadingNoteId.current === noteId)
      ) {
-        DatabaseLogger.log(`Skipped saving conent:
+        DatabaseLogger.log(`Skipped saving content:

          lock.current: ${lock.current}
          currentLoadingNoteId.current: ${currentLoadingNoteId.current}
        `);
+        if (lock.current) {
+          setTimeout(() => {
+            if (lock.current) {
+              DatabaseLogger.warn("Editor force removed lock after 5 seconds");
+              lock.current = false;
+            }
+          }, 5000);
+        }
        return;
      }

@@ -740,7 +814,7 @@ export const useEditor = (
        lastContentChangeTime.current[noteId] = Date.now();
      }

-      if (type === EditorEvents.content && noteId) {
+      if (type === EventTypes.content && noteId) {
        currentContents.current[noteId as string] = {
          data: content,
          type: "tiptap",
@@ -755,7 +829,8 @@ export const useEditor = (
        id: noteId,
        ignoreEdit,
        sessionHistoryId: noteId ? editorSessionHistory.get(noteId) : undefined,
-        tabId: tabId
+        tabId: tabId,
+        pendingChanges
      };
      withTimer(
        noteId || "newnote",
@@ -767,7 +842,16 @@ export const useEditor = (
            onChange(params.data);
            return;
          }
-          saveNote(params);
+          if (useSettingStore.getState().isAppLoading) {
+            const sub = useSettingStore.subscribe((state) => {
+              if (!state.isAppLoading) {
+                saveNote(params);
+                sub();
+              }
+            });
+          } else {
+            saveNote(params);
+          }
        },
        ignoreEdit ? 0 : 150
      );
@@ -810,7 +894,7 @@ export const useEditor = (
        useTabStore.getState().currentTab
      ))
    ) {
-      eSendEvent("webview_reset", "onReady");
+      eSendEvent(eEditorReset, "onReady");
      return false;
    } else {
      syncTabs();
@@ -820,7 +904,6 @@ export const useEditor = (
  }, [isDefaultEditor, restoreEditorState]);

  const onLoad = useCallback(async () => {
-    if (currentNotes.current) overlay(true);
    setTimeout(() => {
      postMessage(EditorEvents.theme, theme);
    });
@@ -835,12 +918,22 @@ export const useEditor = (

    const noteId = useTabStore.getState().getCurrentNoteId();
    if (!noteId) {
-      overlay(false);
      loadNote({ newNote: true });
      if (tabBarRef.current?.page() === 1) {
        state.current.currentlyEditing = false;
      }
+    } else if (state.current?.initialLoadCalled) {
+      const note = currentNotes.current[noteId];
+      if (note) {
+        loadNote({
+          item: note
+        });
+      }
    }
+    if (!state.current?.initialLoadCalled) {
+      state.current.initialLoadCalled = true;
+    }
+    overlay(false);
  }, [
    postMessage,
    theme,
--- a/apps/mobile/app/screens/editor/tiptap/utils.ts
+++ b/apps/mobile/app/screens/editor/tiptap/utils.ts
@@ -46,7 +46,7 @@ export function editorState() {
  return editorController.current?.state.current || defaultState;
 }

-export const EditorEvents: { [name: string]: string } = {
+export const EditorEvents = {
  html: "native:html",
  updatehtml: "native:updatehtml",
  title: "native:title",
@@ -55,7 +55,8 @@ export const EditorEvents: { [name: string]: string } = {
  logger: "native:logger",
  status: "native:status",
  keyboardShown: "native:keyboardShown",
-  attachmentData: "native:attachment-data"
+  attachmentData: "native:attachment-data",
+  resolve: "native:resolve"
 };

 export function randId(prefix: string) {
--- a/apps/mobile/app/screens/settings/debug.tsx
+++ b/apps/mobile/app/screens/settings/debug.tsx
@@ -122,7 +122,8 @@ export default function DebugLogs() {
      colors.primary.paragraph,
      colors.error.paragraph,
      colors.static.black,
-      colors.static.orange
+      colors.static.orange,
+      colors.primary.border
    ]
  );

--- a/apps/mobile/app/screens/settings/functions.js
+++ b/apps/mobile/app/screens/settings/functions.js
@@ -90,13 +90,26 @@ export async function verifyUserWithApplock() {
        positiveText: "Verify",
        secureTextEntry: true,
        negativeText: "Cancel",
+        keyboardType: keyboardType,
        positivePress: async (value) => {
          try {
            const verified = await validateAppLockPassword(value);
+            if (!verified) {
+              ToastManager.show({
+                heading: `Invalid ${
+                  keyboardType === "numeric" ? "pin" : "password"
+                }`,
+                type: "error",
+                context: "local"
+              });
+              return false;
+            }
            resolve(verified);
          } catch (e) {
            resolve(false);
+            return false;
          }
+          return true;
        }
      });
    } else {
--- a/apps/mobile/app/screens/settings/settings-data.tsx
+++ b/apps/mobile/app/screens/settings/settings-data.tsx
@@ -70,6 +70,7 @@ import { useDragState } from "./editor/state";
 import { verifyUser, verifyUserWithApplock } from "./functions";
 import { SettingSection } from "./types";
 import { getTimeLeft } from "./user-section";
+import ScreenGuardModule from "react-native-screenguard";

 type User = any;

@@ -333,12 +334,14 @@ export const settingsGroups: SettingSection[] = [
          {
            id: "logout",
            name: "Log out",
-            description: "Clear all your data and reset the app.",
+            description:
+              "Logging out will clear all data stored on THIS DEVICE.",
            icon: "logout",
            modifer: () => {
              presentDialog({
                title: "Logout",
-                paragraph: "Clear all your data and reset the app.",
+                paragraph:
+                  "Logging out will clear all data stored on THIS DEVICE. Make sure you have synced all your changes before logging out.",
                positiveText: "Logout",
                positivePress: async () => {
                  try {
@@ -458,7 +461,7 @@ export const settingsGroups: SettingSection[] = [
            id: "background-sync",
            name: "Background sync (experimental)",
            description:
-              "Periodically wake up the app in background to sync your notes from other devices.",
+              "Periodically wake up the app in background to run sync.",
            type: "switch",
            property: "backgroundSync",
            onChange: (value) => {
@@ -470,22 +473,43 @@ export const settingsGroups: SettingSection[] = [
            }
          },
          {
-            id: "sync-issues-fix",
-            name: "Having problems with sync",
-            description: "Try force sync to resolve issues with syncing",
-            icon: "sync-alert",
-            modifer: async () => {
+            id: "pull-sync",
+            name: "Force pull changes",
+            description: `Use this if changes from other devices are not appearing on this device. This will overwrite the data on this device with the latest data from the server.\n\nThis must only be used for troubleshooting. Using it regularly for sync is not recommended and will lead to unexpected data loss and other issues. If you are having persistent issues with sync, please report them to us at support@streetwriters.co.`,
+            modifer: () => {
              presentDialog({
-                title: "Force sync",
+                title: "Force Pull changes",
                paragraph:
-                  "If your data on two devices is out of sync even after trying to sync normally. You can run force sync to solve such problems. Usually you should never need to run this otherwise. Force sync means that all your data on this device is reuploaded to the server.",
+                  "This must only be used for troubleshooting. Using this regularly for sync is not recommended and will lead to unexpected data loss and other issues. If you are having persistent issues with sync, please report them to us at support@streetwriters.co.",
                negativeText: "Cancel",
                positiveText: "Start",
                positivePress: async () => {
                  eSendEvent(eCloseSheet);
                  await sleep(300);
                  Progress.present();
-                  Sync.run("global", true, true, () => {
+                  Sync.run("global", true, "fetch", () => {
+                    eSendEvent(eCloseSheet);
+                  });
+                }
+              });
+            }
+          },
+          {
+            id: "push-sync",
+            name: "Force push changes",
+            description: `Use this if changes made on this device are not appearing on other devices. This will overwrite the data on the server with the data from this device.\n\nThis must only be used for troubleshooting. Using it regularly for sync is not recommended and will lead to unexpected data loss and other issues. If you are having persistent issues with sync, please report them to us at support@streetwriters.co.`,
+            modifer: () => {
+              presentDialog({
+                title: "Force Push changes",
+                paragraph:
+                  "This must only be used for troubleshooting. Using this regularly for sync is not recommended and will lead to unexpected data loss and other issues. If you are having persistent issues with sync, please report them to us at support@streetwriters.co.",
+                negativeText: "Cancel",
+                positiveText: "Start",
+                positivePress: async () => {
+                  eSendEvent(eCloseSheet);
+                  await sleep(300);
+                  Progress.present();
+                  Sync.run("global", true, "send", () => {
                    eSendEvent(eCloseSheet);
                  });
                }
@@ -827,9 +851,18 @@ export const settingsGroups: SettingSection[] = [
          "Hide app contents when you switch to other apps. This will also disable screenshot taking in the app.",
        modifer: () => {
          const settings = SettingsService.get();
-          Platform.OS === "android"
-            ? NotesnookModule.setSecureMode(!settings.privacyScreen)
-            : enabled(true);
+          if (Platform.OS === "ios") {
+            enabled(!settings.privacyScreen);
+            if (settings.privacyScreen) {
+              ScreenGuardModule.unregister();
+            } else {
+              ScreenGuardModule.register({
+                backgroundColor: "#000000"
+              });
+            }
+          } else {
+            NotesnookModule.setSecureMode(!settings.privacyScreen);
+          }

          SettingsService.set({ privacyScreen: !settings.privacyScreen });
        },
@@ -850,6 +883,9 @@ export const settingsGroups: SettingSection[] = [
            type: "switch",
            property: "appLockEnabled",
            onChange: () => {
+              SettingsService.set({
+                privacyScreen: true
+              });
              SettingsService.setPrivacyScreen(SettingsService.get());
            },
            onVerify: async () => {
@@ -952,7 +988,7 @@ export const settingsGroups: SettingSection[] = [
                SettingsService.getProperty("applockKeyboardType") === "numeric"
                  ? "pin"
                  : "password"
-              }, app lock will fallback to using account password to unlock the app`,
+              }, app lock will be disabled if no other security method is enabled.`,
            hidden: () => {
              return !SettingsService.getProperty("appLockHasPasswordSecurity");
            },
--- a/apps/mobile/app/services/background-sync.ts
+++ b/apps/mobile/app/services/background-sync.ts
@@ -141,7 +141,6 @@ const onBoot = async () => {
    }

    await Notifications.setupReminders();
-    SettingsService.init();
    if (SettingsService.get().notifNotes) {
      Notifications.pinQuickNote(false);
    }
--- a/apps/mobile/app/services/backup.js
+++ b/apps/mobile/app/services/backup.js
@@ -171,7 +171,6 @@ async function run(progress = false, context) {
  }

  let path;
-  let backupFilePath;
  let backupFileName = "notesnook_backup_" + Date.now();

  if (Platform.OS === "ios") {
@@ -236,7 +235,7 @@ async function run(progress = false, context) {
    await sleep(300);

    if (showBackupCompleteSheet) {
-      presentBackupCompleteSheet(backupFilePath);
+      presentBackupCompleteSheet(path);
    } else {
      progress && eSendEvent(eCloseSheet);
    }
--- a/apps/mobile/app/services/event-manager.ts
+++ b/apps/mobile/app/services/event-manager.ts
@@ -162,7 +162,7 @@ export const ToastManager = {
    });
  },
  hide: () => eSendEvent(eHideToast),
-  error: (e: Error, title?: string, context?: any) => {
+  error: (e: Error, title?: string, context?: any, duration = 5000) => {
    ToastManager.show({
      heading: title,
      message: e?.message || "",
@@ -176,7 +176,7 @@ export const ToastManager = {
          heading: "Logs copied!",
          type: "success",
          context: "global",
-          duration: 5000
+          duration: duration
        });
      }
    });
--- a/apps/mobile/app/services/exporter.ts
+++ b/apps/mobile/app/services/exporter.ts
@@ -17,40 +17,26 @@ 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 { decode, EntityLevel } from "entities";
 import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
 import RNHTMLtoPDF from "react-native-html-to-pdf-lite";
 import * as ScopedStorage from "react-native-scoped-storage";
 import { zip } from "react-native-zip-archive";
-import { DatabaseLogger, db } from "../common/database/index";
+import { DatabaseLogger } from "../common/database/index";
 import Storage from "../common/database/storage";

 import {
  exportNote as _exportNote,
  ExportableAttachment,
  ExportableNote,
-  exportNotes,
-  sanitizeFilename
+  exportNotes
 } from "@notesnook/common";
 import { Note } from "@notesnook/core";
-import { NoteContent } from "@notesnook/core/dist/collections/session-content";
 import { FilteredSelector } from "@notesnook/core/dist/database/sql-collection";
 import { basename, dirname, join } from "pathe";
 import downloadAttachment from "../common/filesystem/download-attachment";
-import { presentDialog } from "../components/dialog/functions";
-import { useSettingStore } from "../stores/use-setting-store";
-import BiometricService from "./biometrics";
-import { ToastManager } from "./event-manager";
 import { cacheDir } from "../common/filesystem/utils";
-
-const MIMETypes = {
-  txt: "text/plain",
-  pdf: "application/pdf",
-  md: "text/markdown",
-  "md-frontmatter": "text/markdown",
-  html: "text/html"
-};
+import { unlockVault } from "../utils/unlock-vault";

 const FolderNames: { [name: string]: string } = {
  txt: "Text",
@@ -59,16 +45,6 @@ const FolderNames: { [name: string]: string } = {
  html: "Html"
 };

-async function releasePermissions(path: string) {
-  if (Platform.OS === "ios") return;
-  const uris = await ScopedStorage.getPersistedUriPermissions();
-  for (const uri of uris) {
-    if (path.startsWith(uri)) {
-      await ScopedStorage.releasePersistableUriPermission(uri);
-    }
-  }
-}
-
 async function getPath(type: string) {
  let path =
    Platform.OS === "ios" &&
@@ -82,153 +58,11 @@ async function getPath(type: string) {
  return path;
 }

-async function save(
-  path: string,
-  data: string,
-  fileName: string,
-  extension: "txt" | "pdf" | "md" | "html" | "md-frontmatter"
-) {
-  let uri;
-  if (Platform.OS === "android") {
-    uri = await ScopedStorage.writeFile(
-      path,
-      data,
-      `${fileName}.${extension}`,
-      MIMETypes[extension],
-      extension === "pdf" ? "base64" : "utf8",
-      false
-    );
-    await releasePermissions(path);
-  } else {
-    path = path + fileName + `.${extension}`;
-    await RNFetchBlob.fs.writeFile(path, data, "utf8");
-  }
-  return uri || path;
-}
-
-async function makeHtml(note: Note, content?: NoteContent<false>) {
-  let html = await db.notes.export(note.id, {
-    format: "html",
-    contentItem: content
-  });
-  if (!html) return "";
-
-  html = decode(html, {
-    level: EntityLevel.HTML
-  });
-  return html;
-}
-
-async function exportAs(
-  type: string,
-  note: Note,
-  bulk?: boolean,
-  content?: NoteContent<false>
-) {
-  let data;
-  switch (type) {
-    case "html":
-      {
-        data = await makeHtml(note, content);
-      }
-      break;
-    case "md":
-      data = await db.notes.export(note.id, {
-        format: "md",
-        contentItem: content
-      });
-      break;
-    case "md-frontmatter":
-      data = await db.notes.export(note.id, {
-        format: "md-frontmatter",
-        contentItem: content
-      });
-      break;
-    case "pdf":
-      {
-        const html = await makeHtml(note, content);
-        const fileName = sanitizeFilename(note.title + Date.now(), {
-          replacement: "_"
-        });
-
-        const options = {
-          html: html,
-          fileName:
-            Platform.OS === "ios" ? "/exported/PDF/" + fileName : fileName,
-          width: 595,
-          height: 852,
-          bgColor: "#FFFFFF",
-          padding: 30,
-          base64: bulk || Platform.OS === "android"
-        } as { [name: string]: any };
-
-        if (Platform.OS === "ios") {
-          options.directory = "Documents";
-        }
-        const res = await RNHTMLtoPDF.convert(options);
-        data = !bulk && Platform.OS === "ios" ? res.filePath : res.base64;
-        if (bulk && res.filePath) {
-          RNFetchBlob.fs.unlink(res.filePath);
-        }
-      }
-      break;
-    case "txt":
-      {
-        data = await db.notes.export(note.id, {
-          format: "txt",
-          contentItem: content
-        });
-      }
-      break;
-  }
-
-  return data;
-}
-
-async function unlockVault() {
-  const biometry = await BiometricService.isBiometryAvailable();
-  const fingerprint = await BiometricService.hasInternetCredentials();
-  if (biometry && fingerprint) {
-    const credentials = await BiometricService.getCredentials(
-      "Unlock vault",
-      "Unlock vault to export locked notes"
-    );
-    if (credentials) {
-      return db.vault.unlock(credentials.password);
-    }
-  }
-  useSettingStore.getState().setSheetKeyboardHandler(false);
-  return new Promise((resolve) => {
-    setImmediate(() => {
-      presentDialog({
-        context: "export-notes",
-        input: true,
-        secureTextEntry: true,
-        positiveText: "Unlock",
-        title: "Unlock vault",
-        paragraph: "Some exported notes are locked, Unlock to export them",
-        inputPlaceholder: "Enter password",
-        positivePress: async (value) => {
-          const unlocked = await db.vault.unlock(value);
-          if (!unlocked) {
-            ToastManager.show({
-              heading: "Invalid password",
-              message: "Please enter a valid password",
-              type: "error",
-              context: "local"
-            });
-            return false;
-          }
-          resolve(unlocked);
-          useSettingStore.getState().setSheetKeyboardHandler(true);
-          return true;
-        },
-        onClose: () => {
-          resolve(false);
-          useSettingStore.getState().setSheetKeyboardHandler(true);
-        }
-      });
-    });
+async function unlockVaultForNoteExport() {
+  return await unlockVault({
+    title: "Unlock vault",
+    paragraph: "Some exported notes are locked, Unlock to export them",
+    context: "export-notes"
  });
 }

@@ -285,6 +119,7 @@ async function createZip(
  callback: (progress?: string) => void
 ) {
  const fileName = `nn-export-${totalNotes}-${type}-${Date.now()}.zip`;
+  const dir = path;
  try {
    callback("Creating zip");
    const zipOutputPath =
@@ -292,6 +127,7 @@ async function createZip(
        ? join(path, fileName)
        : join(RNFetchBlob.fs.dirs.CacheDir, fileName);
    await zip(cacheFolder, zipOutputPath);
+
    callback("Saving zip file");
    if (Platform.OS === "android") {
      const file = await ScopedStorage.createFile(
@@ -303,6 +139,8 @@ async function createZip(
      await copyFileAsync("file://" + zipOutputPath, path);
      await RNFetchBlob.fs.unlink(zipOutputPath);
      callback();
+    } else {
+      path = zipOutputPath;
    }
    RNFetchBlob.fs.unlink(cacheFolder);
  } catch (e) {
@@ -311,6 +149,7 @@ async function createZip(

  return {
    filePath: path,
+    fileDir: dir,
    type: "application/zip",
    name: "zip",
    fileName: fileName,
@@ -388,7 +227,7 @@ async function bulkExport(
  let currentAttachmentProgress = 0;
  for await (const item of exportNotes(notes, {
    format: type,
-    unlockVault: unlockVault as () => Promise<boolean>
+    unlockVault: unlockVaultForNoteExport as () => Promise<boolean>
  })) {
    if (item instanceof Error) {
      DatabaseLogger.error(item);
@@ -432,7 +271,7 @@ async function exportNote(
  let currentAttachmentProgress = 0;
  for await (const item of _exportNote(note, {
    format: type,
-    unlockVault: unlockVault as () => Promise<boolean>
+    unlockVault: unlockVaultForNoteExport as () => Promise<boolean>
  })) {
    if (item instanceof Error) {
      DatabaseLogger.error(item);
--- a/apps/mobile/app/services/message.js
+++ b/apps/mobile/app/services/message.js
@@ -59,14 +59,14 @@ const recoveryKeyMessage = {
      () => {
        eSendEvent(eOpenRecoveryKeyDialog);
      },
-      true,
+      false,
      async () => {
        SettingsService.set({
          recoveryKeySaved: true
        });
        clearMessage();
      },
-      "I have saved my key already"
+      "Cancel"
    );
  },
  data: {},
--- a/apps/mobile/app/services/notifications.ts
+++ b/apps/mobile/app/services/notifications.ts
@@ -952,13 +952,13 @@ async function pinNote(id: string) {
    const note = await db.notes.note(id as string);
    if (!note) return;

-    let text = await convertNoteToText(note, false);
+    let text = await convertNoteToText(note, true);
    if (!text) text = "";
    const html = text.replace(/\n/g, "<br />");
    Notifications.displayNotification({
      title: note.title,
      message: note.headline || text,
-      subtitle: note.headline || text,
+      subtitle: "",
      bigText: html,
      ongoing: true,
      actions: ["UNPIN"],
--- a/apps/mobile/app/services/settings.ts
+++ b/apps/mobile/app/services/settings.ts
@@ -17,7 +17,7 @@ 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 { Platform } from "react-native";
+import { NativeModules, Platform } from "react-native";
 import { enabled } from "react-native-privacy-snapshot";
 import { MMKV } from "../common/database/mmkv";
 import {
@@ -29,6 +29,7 @@ import { NotesnookModule } from "../utils/notesnook-module";
 import { scale, updateSize } from "../utils/size";
 import { DatabaseLogger } from "../common/database";
 import { useUserStore } from "../stores/use-user-store";
+import ScreenGuardModule from "react-native-screenguard";
 function reset() {
  const settings = get();
  if (settings.reminder !== "off" && settings.reminder !== "useroff") {
@@ -76,6 +77,17 @@ function migrateAppLock() {
  DatabaseLogger.debug("App lock Migrated");
 }

+function migrateSettings(settings: SettingStore["settings"]) {
+  const version = settings.settingsVersion;
+  if (!version) {
+    settings.settingsVersion = 1;
+    settings.privacyScreen = settings.appLockEnabled
+      ? true
+      : settings.privacyScreen;
+    MMKV.setString("appSettings", JSON.stringify(settings));
+  }
+}
+
 function init() {
  scale.fontScale = 1;
  const settingsJson = MMKV.getString("appSettings");
@@ -83,14 +95,17 @@ function init() {
  if (!settingsJson) {
    MMKV.setString("appSettings", JSON.stringify(settings));
  } else {
+    const settingsParsed = JSON.parse(settingsJson);
+    migrateSettings(settingsParsed);
    settings = {
      ...settings,
-      ...JSON.parse(settingsJson)
+      ...settingsParsed
    };
  }
  if (settings.fontScale) {
    scale.fontScale = settings.fontScale;
  }
+
  setTimeout(() => setPrivacyScreen(settings), 1);
  updateSize();
  useSettingStore.getState().setSettings({ ...settings });
@@ -98,17 +113,23 @@ function init() {
 }

 function setPrivacyScreen(settings: SettingStore["settings"]) {
-  if (settings.privacyScreen || settings.appLockEnabled) {
+  if (settings.privacyScreen) {
    if (Platform.OS === "android") {
      NotesnookModule.setSecureMode(true);
    } else {
      enabled(true);
+      if (NativeModules.ScreenGuard) {
+        ScreenGuardModule.register({ backgroundColor: "#000000" });
+      }
    }
  } else {
    if (Platform.OS === "android") {
      NotesnookModule.setSecureMode(false);
    } else {
      enabled(false);
+      if (NativeModules.ScreenGuard) {
+        ScreenGuardModule.unregister();
+      }
    }
  }
 }
@@ -191,11 +212,11 @@ function canLockAppInBackground() {
 }
 let backgroundEnterTime = 0;
 function appEnteredBackground() {
-  if (canLockAppInBackground()) {
-    backgroundEnterTime = Date.now();
-  }
+  backgroundEnterTime = Date.now();
 }

+const getBackgroundEnterTime = () => backgroundEnterTime;
+
 function shouldLockAppOnEnterForeground() {
  if (
    useUserStore.getState().disableAppLockRequests ||
@@ -227,7 +248,8 @@ export const SettingsService = {
  shouldLockAppOnEnterForeground,
  canLockAppInBackground,
  appEnteredBackground,
-  setPrivacyScreen
+  setPrivacyScreen,
+  getBackgroundEnterTime
 };

 init();
--- a/apps/mobile/app/services/sync.ts
+++ b/apps/mobile/app/services/sync.ts
@@ -32,19 +32,24 @@ export const ignoredMessages = [
  "WebSocket failed to connect",
  "Failed to start the HttpConnection before"
 ];
-let pendingSync = undefined;
-let syncTimer = 0;
+let pendingSync: any = undefined;
+let syncTimer: NodeJS.Timeout;
+
 const run = async (
  context = "global",
  forced = false,
-  full = true,
-  onCompleted,
-  lastSyncTime
+  type: "full" | "send" | "fetch" = "full",
+  onCompleted?: (status?: number) => void,
+  lastSyncTime?: number
 ) => {
  if (useUserStore.getState().syncing) {
    DatabaseLogger.info("Sync in progress");
    pendingSync = {
-      full: full
+      forced,
+      type: type,
+      context: context,
+      onCompleted,
+      lastSyncTime
    };
    return;
  }
@@ -70,7 +75,7 @@ const run = async (
    ) {
      initAfterSync();
      pendingSync = undefined;
-      return onCompleted?.(false);
+      return onCompleted?.(SyncStatus.Failed);
    }
    userstore.setSyncing(true);

@@ -80,9 +85,8 @@ const run = async (
      await BackgroundSync.doInBackground(async () => {
        try {
          await db.sync({
-            type: full ? "full" : "send",
-            force: forced,
-            lastSyncTime
+            type: type,
+            force: forced
          });
        } catch (e) {
          error = e;
@@ -95,14 +99,16 @@ const run = async (
    } catch (e) {
      error = e;
      if (
-        !ignoredMessages.find((message) => e.message?.includes(message)) &&
+        !ignoredMessages.find((message) =>
+          (e as Error).message?.includes(message)
+        ) &&
        userstore.user &&
        status.isConnected &&
        status.isInternetReachable
      ) {
        userstore.setSyncing(false, SyncStatus.Failed);
        if (status.isConnected && status.isInternetReachable) {
-          ToastManager.error(e, "Sync failed", context);
+          ToastManager.error(e as Error, "Sync failed", context);
        }
      }

@@ -115,7 +121,14 @@ const run = async (
      );
      onCompleted?.(error ? SyncStatus.Failed : SyncStatus.Passed);
      setImmediate(() => {
-        if (pendingSync) Sync.run("global", false, pendingSync.full);
+        if (pendingSync)
+          Sync.run(
+            pendingSync.context,
+            pendingSync.forced,
+            pendingSync.type,
+            pendingSync.onCompleted,
+            pendingSync.lastSyncTime
+          );
      });
    }
  }, 300);
--- a/apps/mobile/app/stores/use-setting-store.ts
+++ b/apps/mobile/app/stores/use-setting-store.ts
@@ -81,6 +81,7 @@ export type Settings = {
  biometricsAuthEnabled?: boolean;
  backgroundSync?: boolean;
  applockKeyboardType: "numeric" | "default";
+  settingsVersion?: number;
 };

 type DimensionsType = {
@@ -169,7 +170,8 @@ export const defaultSettings: SettingStore["settings"] = {
  markdownShortcuts: true,
  biometricsAuthEnabled: false,
  appLockHasPasswordSecurity: false,
-  backgroundSync: true
+  backgroundSync: true,
+  settingsVersion: 0
 };

 export const useSettingStore = create<SettingStore>((set, get) => ({
--- a/apps/mobile/app/stores/use-user-store.ts
+++ b/apps/mobile/app/stores/use-user-store.ts
@@ -17,8 +17,7 @@ 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 { Profile } from "@notesnook/core";
-import { User } from "@notesnook/core";
+import { Profile, User } from "@notesnook/core";
 import create, { State } from "zustand";

 export enum SyncStatus {
@@ -56,7 +55,9 @@ export const useUserStore = create<UserStore>((set) => ({
    set({ syncing: syncing, lastSyncStatus: status });
  },
  setLastSynced: (lastSynced) => set({ lastSynced: lastSynced }),
-  lockApp: (appLocked) => set({ appLocked }),
+  lockApp: (appLocked) => {
+    set({ appLocked });
+  },
  lastSyncStatus: SyncStatus.Never,
  disableAppLockRequests: false,
  setDisableAppLockRequests: (disableAppLockRequests) => {
--- a/apps/mobile/app/utils/constants.ts
+++ b/apps/mobile/app/utils/constants.ts
@@ -23,7 +23,7 @@ export const IOS_APPGROUPID = "group.org.streetwriters.notesnook";
 export const FILE_SIZE_LIMIT = 500 * 1024 * 1024;
 export const IMAGE_SIZE_LIMIT = 50 * 1024 * 1024;

-export const BETA = true;
+export const BETA = false;

 export const STORE_LINK =
  Platform.OS === "ios"
--- a/apps/mobile/app/utils/events.js
+++ b/apps/mobile/app/utils/events.js
@@ -174,3 +174,4 @@ export const eUnlockWithPassword = "619";
 export const eUpdateNoteInEditor = "620";
 export const eOnEnterEditor = "621";
 export const eOnExitEditor = "622";
+export const eEditorReset = "623";
--- a/apps/mobile/app/utils/unlock-vault.ts
+++ b/apps/mobile/app/utils/unlock-vault.ts
@@ -0,0 +1,91 @@
+/*
+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 { db } from "../common/database";
+import { presentDialog } from "../components/dialog/functions";
+import BiometricService from "../services/biometrics";
+import { ToastManager } from "../services/event-manager";
+import { useSettingStore } from "../stores/use-setting-store";
+
+let unlockPromise: Promise<any> | undefined = undefined;
+export async function unlockVault({
+  context,
+  title,
+  paragraph
+}: {
+  context?: string;
+  title: string;
+  paragraph: string;
+}) {
+  if (unlockPromise) {
+    console.log("Unlocking.... waiting for unlock promise");
+    return unlockPromise;
+  }
+  unlockPromise = new Promise(async (resolve) => {
+    const result = await (async () => {
+      if (db.vault.unlocked) return true;
+      const biometry = await BiometricService.isBiometryAvailable();
+      const fingerprint = await BiometricService.hasInternetCredentials();
+      if (biometry && fingerprint) {
+        const credentials = await BiometricService.getCredentials(
+          title,
+          paragraph
+        );
+        if (credentials) {
+          return db.vault.unlock(credentials.password);
+        }
+      }
+      useSettingStore.getState().setSheetKeyboardHandler(false);
+      return new Promise((resolve) => {
+        setImmediate(() => {
+          presentDialog({
+            context: context,
+            input: true,
+            secureTextEntry: true,
+            positiveText: "Unlock",
+            title: title,
+            paragraph: paragraph,
+            inputPlaceholder: "Enter password",
+            positivePress: async (value) => {
+              const unlocked = await db.vault.unlock(value);
+              if (!unlocked) {
+                ToastManager.show({
+                  heading: "Invalid password",
+                  message: "Please enter a valid password",
+                  type: "error",
+                  context: "local"
+                });
+                return false;
+              }
+              resolve(unlocked);
+              useSettingStore.getState().setSheetKeyboardHandler(true);
+              return true;
+            },
+            onClose: () => {
+              resolve(false);
+              useSettingStore.getState().setSheetKeyboardHandler(true);
+            }
+          });
+        });
+      });
+    })();
+    unlockPromise = undefined;
+    resolve(result);
+  });
+  return unlockPromise;
+}
--- a/apps/mobile/native/android/app/build.gradle
+++ b/apps/mobile/native/android/app/build.gradle
@@ -111,7 +111,7 @@ android {
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
        multiDexEnabled true
-        versionCode 3009
+        versionCode 3020
        versionName getNpmVersion()
        testBuildType System.getProperty('testBuildType', 'debug')
        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
--- a/apps/mobile/native/android/app/src/main/AndroidManifest.xml
+++ b/apps/mobile/native/android/app/src/main/AndroidManifest.xml
@@ -15,6 +15,8 @@
    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:node="remove"/>
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" tools:node="remove"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>

    <queries>
--- a/apps/mobile/native/android/build.gradle
+++ b/apps/mobile/native/android/build.gradle
@@ -37,4 +37,10 @@ allprojects {

        maven { url 'https://www.jitpack.io' }
    }
-}
+
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+        kotlinOptions {
+            jvmTarget = "11"
+        }
+    }
+}
--- a/apps/mobile/native/android/releasenotes/whatsnew-en-US
+++ b/apps/mobile/native/android/releasenotes/whatsnew-en-US
@@ -1,7 +1,3 @@
- Now you can set title of note when sharing to Notesnook
- Fix back navigation from editor closes the app
- Fix errors during migration
- Fix sharing to Notesnook not working for some apps
- Numerous other bug fixes and performance improvements
+- Bug fixes and performance improvements

 Thank you for using Notesnook!
--- a/apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj
+++ b/apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj
@@ -21,9 +21,9 @@
 		6517B7C32B6838EB0079FF37 /* OpenSans-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6517B7C02B6838EB0079FF37 /* OpenSans-Bold.ttf */; };
 		6529A13E279BC4C70048D4A8 /* BootSplash.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6529A13D279BC4C70048D4A8 /* BootSplash.storyboard */; };
 		656835812BB29A9800144BAB /* OpenSans-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 656835802BB29A8300144BAB /* OpenSans-Italic.ttf */; };
-		656DD2AB2B1891DF00A362EA /* BuildFile in Resources */ = {isa = PBXBuildFile; };
-		656DD2AC2B1891DF00A362EA /* BuildFile in Resources */ = {isa = PBXBuildFile; };
-		656DD2AD2B1891DF00A362EA /* BuildFile in Resources */ = {isa = PBXBuildFile; };
+		6569927F2C5754F10041CD41 /* OpenSans-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6517B7C02B6838EB0079FF37 /* OpenSans-Bold.ttf */; };
+		656992802C5754F10041CD41 /* OpenSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6517B7BE2B6838EB0079FF37 /* OpenSans-Regular.ttf */; };
+		656992812C5754F10041CD41 /* OpenSans-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6517B7BF2B6838EB0079FF37 /* OpenSans-SemiBold.ttf */; };
 		6593E4A3281C345400492C50 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6593E4A2281C345400492C50 /* AppDelegate.mm */; };
 		659BE46725E11A5100E05671 /* notesnook-text.png in Resources */ = {isa = PBXBuildFile; fileRef = 659BE46625E11A5100E05671 /* notesnook-text.png */; };
 		65AA857925E6DDEC00772A01 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65AA857825E6DDEC00772A01 /* WidgetKit.framework */; };
@@ -586,9 +586,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				656DD2AB2B1891DF00A362EA /* BuildFile in Resources */,
-				656DD2AC2B1891DF00A362EA /* BuildFile in Resources */,
-				656DD2AD2B1891DF00A362EA /* BuildFile in Resources */,
+				6569927F2C5754F10041CD41 /* OpenSans-Bold.ttf in Resources */,
+				656992802C5754F10041CD41 /* OpenSans-Regular.ttf in Resources */,
+				656992812C5754F10041CD41 /* OpenSans-SemiBold.ttf in Resources */,
 				65C400DF2A80B6B600AA3DF5 /* MaterialCommunityIcons.ttf in Resources */,
 				65C149872A61151B005C40F1 /* extension.bundle in Resources */,
 				65B5014725A672B200E2D264 /* MainInterface.storyboard in Resources */,
@@ -1015,7 +1015,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2098;
+				CURRENT_PROJECT_VERSION = 2109;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1084,12 +1084,12 @@
 					"${PODS_ROOT}/Headers/Public/#{s.name}/**",
 				);
 				INFOPLIST_FILE = Notesnook/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.1;
+				MARKETING_VERSION = 3.0.12;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1120,7 +1120,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2098;
+				CURRENT_PROJECT_VERSION = 2109;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1189,12 +1189,12 @@
 					"${PODS_ROOT}/Headers/Public/#{s.name}/**",
 				);
 				INFOPLIST_FILE = Notesnook/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.1;
+				MARKETING_VERSION = 3.0.12;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1353,7 +1353,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2098;
+				CURRENT_PROJECT_VERSION = 2109;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1365,7 +1365,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.0.1;
+				MARKETING_VERSION = 3.0.12;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
@@ -1396,7 +1396,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2098;
+				CURRENT_PROJECT_VERSION = 2109;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1409,7 +1409,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.0.1;
+				MARKETING_VERSION = 3.0.12;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1439,7 +1439,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Make Note/Make Note.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2098;
+				CURRENT_PROJECT_VERSION = 2109;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1513,7 +1513,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.0.1;
+				MARKETING_VERSION = 3.0.12;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
@@ -1544,7 +1544,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2098;
+				CURRENT_PROJECT_VERSION = 2109;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1619,7 +1619,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.0.1;
+				MARKETING_VERSION = 3.0.12;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
 				PRODUCT_NAME = "$(TARGET_NAME)";
--- a/apps/mobile/native/ios/Podfile.lock
+++ b/apps/mobile/native/ios/Podfile.lock
@@ -343,6 +343,9 @@ PODS:
    - React-Core
  - react-native-safe-area-context (4.9.0):
    - React-Core
+  - react-native-screenguard (1.0.0):
+    - React-Core
+    - SDWebImage (~> 5.11.1)
  - react-native-share-extension (3.0.0):
    - React
  - react-native-sodium (1.5.4):
@@ -350,7 +353,8 @@ PODS:
  - react-native-theme-switch-animation (0.6.0):
    - RCT-Folly (= 2021.07.22.00)
    - React-Core
-  - react-native-webview (11.26.1):
+  - react-native-webview (13.10.0):
+    - RCT-Folly (= 2021.07.22.00)
    - React-Core
  - React-NativeModulesApple (0.72.0):
    - React-callinvoker
@@ -547,6 +551,9 @@ PODS:
  - RNZipArchive/Core (6.0.9):
    - React-Core
    - SSZipArchive (~> 2.2)
+  - SDWebImage (5.11.1):
+    - SDWebImage/Core (= 5.11.1)
+  - SDWebImage/Core (5.11.1)
  - SexyTooltip (1.2.5):
    - pop (~> 1.0)
  - SocketRocket (0.6.0)
@@ -605,6 +612,7 @@ DEPENDENCIES:
  - react-native-pdf (from `../../node_modules/react-native-pdf`)
  - react-native-quick-sqlite (from `../../node_modules/react-native-quick-sqlite`)
  - react-native-safe-area-context (from `../../node_modules/react-native-safe-area-context`)
+  - react-native-screenguard (from `../../node_modules/react-native-screenguard`)
  - "react-native-share-extension (from `../../node_modules/@ammarahmed/react-native-share-extension`)"
  - "react-native-sodium (from `../../node_modules/@ammarahmed/react-native-sodium`)"
  - react-native-theme-switch-animation (from `../../node_modules/react-native-theme-switch-animation`)
@@ -663,6 +671,7 @@ SPEC REPOS:
    - MMKV
    - MMKVCore
    - pop
+    - SDWebImage
    - SocketRocket
    - SSZipArchive
    - SwiftyRSA
@@ -753,6 +762,8 @@ EXTERNAL SOURCES:
    :path: "../../node_modules/react-native-quick-sqlite"
  react-native-safe-area-context:
    :path: "../../node_modules/react-native-safe-area-context"
+  react-native-screenguard:
+    :path: "../../node_modules/react-native-screenguard"
  react-native-share-extension:
    :path: "../../node_modules/@ammarahmed/react-native-share-extension"
  react-native-sodium:
@@ -904,10 +915,11 @@ SPEC CHECKSUMS:
  react-native-pdf: 33c622cbdf776a649929e8b9d1ce2d313347c4fa
  react-native-quick-sqlite: e0e23b749382a85e4b57146f753de737a6c3a9e1
  react-native-safe-area-context: b97eb6f9e3b7f437806c2ce5983f479f8eb5de4b
+  react-native-screenguard: 8b36a3df84c76cd2b82c477f71c26fa1c8cc14a0
  react-native-share-extension: faed334b1ddf165f1e576fcabd3dc1c9e748bfa9
  react-native-sodium: 955bb0dc3ea05f8ea06d5e96cb89d1be7b5d7681
  react-native-theme-switch-animation: 220f883f7be290e79f2ab022093ed1a7a5929e6d
-  react-native-webview: 9f111dfbcfc826084d6c507f569e5e03342ee1c1
+  react-native-webview: 90153193e679163ec257011fa457d02765120210
  React-NativeModulesApple: 1d81d927ef1a67a3545a01e14c2e98500bf9b199
  React-perflogger: 684a11499a0589cc42135d6d5cc04d0e4e0e261a
  React-RCTActionSheet: 00b0a4c382a13b834124fa3f541a7d8d1d56efb9
@@ -948,6 +960,7 @@ SPEC CHECKSUMS:
  RNSVG: d7d7bc8229af3842c9cfc3a723c815a52cdd1105
  RNTooltips: 5424d4bf0b3d441104127943b1115cc7f0616b1f
  RNZipArchive: 68a0c6db4b1c103f846f1559622050df254a3ade
+  SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
  SexyTooltip: 5c9b4dec52bfb317938cb0488efd9da3717bb6fd
  SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
  SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
@@ -958,4 +971,4 @@ SPEC CHECKSUMS:

 PODFILE CHECKSUM: 2b8b28a341b202bf3ca5f231b75bb05893486ed8

-COCOAPODS: 1.14.2
+COCOAPODS: 1.15.2
--- a/apps/mobile/native/package.json
+++ b/apps/mobile/native/package.json
@@ -60,13 +60,14 @@
    "react-native-swiper-flatlist": "3.2.2",
    "react-native-tooltips": "^1.0.3",
    "react-native-vector-icons": "9.2.0",
-    "react-native-webview": "^11.14.1",
+    "react-native-webview": "^13.10.0",
    "react-native-zip-archive": "6.0.9",
    "react-native-quick-sqlite": "^8.0.6",
    "react-native-theme-switch-animation": "^0.6.0",
    "@ammarahmed/react-native-background-fetch": "^4.2.2",
    "react-native-image-crop-picker": "^0.40.2",
-    "react-native-url-polyfill": "^2.0.0"
+    "react-native-url-polyfill": "^2.0.0",
+    "react-native-screenguard": "^1.0.0"
  },
  "devDependencies": {
    "@babel/core": "^7.20.0",
--- a/apps/mobile/native/react-native.config.js
+++ b/apps/mobile/native/react-native.config.js
@@ -17,6 +17,12 @@ config.dependencies['react-native-vector-icons'] = {
  },
 }

+config.dependencies['react-native-screenguard'] = {
+  platforms: {
+    android: null,
+  },
+}
+
 if (isGithubRelease) {
  config.dependencies["react-native-iap"] = {
    platforms: {
--- a/apps/mobile/package-lock.json
+++ b/apps/mobile/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@notesnook/mobile",
-  "version": "3.0.0",
+  "version": "3.0.11",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@notesnook/mobile",
-      "version": "3.0.0",
+      "version": "3.0.11",
      "hasInstallScript": true,
      "license": "GPL-3.0-or-later",
      "workspaces": [
@@ -34,15 +34,15 @@
    },
    "../../packages/common": {
      "name": "@notesnook/common",
-      "version": "1.0.0",
+      "version": "2.0.7",
      "license": "GPL-3.0-or-later",
      "dependencies": {
-        "@notesnook/core": "file:../core",
+        "@notesnook/core": "^8.0.0",
        "pathe": "^1.1.2",
        "timeago.js": "4.0.2"
      },
      "devDependencies": {
-        "@notesnook/core": "file:../core",
+        "@notesnook/core": "^8.0.0",
        "@types/react": "^18.2.39",
        "react": "18.2.0",
        "vitest": "^1.4.0"
@@ -114,7 +114,7 @@
    },
    "../../packages/core": {
      "name": "@notesnook/core",
-      "version": "7.4.1",
+      "version": "8.0.8",
      "dev": true,
      "hasInstallScript": true,
      "license": "GPL-3.0-or-later",
@@ -3121,7 +3121,7 @@
    },
    "../../packages/crypto": {
      "name": "@notesnook/crypto",
-      "version": "1.1.1",
+      "version": "2.0.7",
      "dev": true,
      "license": "GPL-3.0-or-later",
      "dependencies": {
@@ -3135,7 +3135,7 @@
    },
    "../../packages/editor": {
      "name": "@notesnook/editor",
-      "version": "1.6.1",
+      "version": "2.0.7",
      "hasInstallScript": true,
      "license": "GPL-3.0-or-later",
      "dependencies": {
@@ -3234,6 +3234,7 @@
        "@szhsin/react-menu": "^4.1.0",
        "buffer": "^6.0.3",
        "framer-motion": "^10.16.8",
+        "localforage": "^1.10.0",
        "mdi-react": "9.1.0",
        "react": "^18.2.0",
        "react-dom": "^18.2.0",
@@ -7162,7 +7163,7 @@
    },
    "../../packages/editor-mobile/node_modules/@types/prop-types": {
      "version": "15.7.11",
-      "devOptional": true,
+      "dev": true,
      "license": "MIT"
    },
    "../../packages/editor-mobile/node_modules/@types/q": {
@@ -7182,7 +7183,7 @@
    },
    "../../packages/editor-mobile/node_modules/@types/react": {
      "version": "18.2.39",
-      "devOptional": true,
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@types/prop-types": "*",
@@ -7213,7 +7214,7 @@
    },
    "../../packages/editor-mobile/node_modules/@types/scheduler": {
      "version": "0.16.8",
-      "devOptional": true,
+      "dev": true,
      "license": "MIT"
    },
    "../../packages/editor-mobile/node_modules/@types/semver": {
@@ -12071,7 +12072,7 @@
    },
    "../../packages/editor-mobile/node_modules/immer": {
      "version": "9.0.21",
-      "devOptional": true,
+      "dev": true,
      "license": "MIT",
      "funding": {
        "type": "opencollective",
@@ -22460,6 +22461,7 @@
    },
    "../../packages/editor/node_modules/js-tokens": {
      "version": "4.0.0",
+      "dev": true,
      "license": "MIT"
    },
    "../../packages/editor/node_modules/json-parse-even-better-errors": {
@@ -22515,6 +22517,7 @@
    },
    "../../packages/editor/node_modules/loose-envify": {
      "version": "1.4.0",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "js-tokens": "^3.0.0 || ^4.0.0"
@@ -23036,6 +23039,7 @@
    },
    "../../packages/editor/node_modules/react": {
      "version": "18.2.0",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "loose-envify": "^1.1.0"
@@ -23054,6 +23058,7 @@
    },
    "../../packages/editor/node_modules/react-dom": {
      "version": "18.2.0",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "loose-envify": "^1.1.0",
@@ -23173,6 +23178,7 @@
    },
    "../../packages/editor/node_modules/scheduler": {
      "version": "0.23.0",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "loose-envify": "^1.1.0"
@@ -23794,13 +23800,13 @@
    },
    "../../packages/logger": {
      "name": "@notesnook/logger",
-      "version": "1.0.3",
+      "version": "2.0.7",
      "license": "GPL-3.0-or-later",
      "devDependencies": {}
    },
    "../../packages/sodium": {
      "name": "@notesnook/sodium",
-      "version": "1.1.0",
+      "version": "2.0.7",
      "dev": true,
      "license": "GPL-3.0-or-later",
      "devDependencies": {
@@ -25172,7 +25178,7 @@
    },
    "../../packages/theme": {
      "name": "@notesnook/theme",
-      "version": "1.2.0",
+      "version": "2.0.7",
      "license": "GPL-3.0-or-later",
      "devDependencies": {
        "@emotion/react": "11.11.1",
@@ -26239,7 +26245,7 @@
    },
    "../../packages/ui": {
      "name": "@notesnook/ui",
-      "version": "1.0.0",
+      "version": "2.0.8",
      "license": "GPL-3.0-or-later",
      "dependencies": {
        "@notesnook/theme": "file:../theme"
@@ -28411,7 +28417,7 @@
        "pathe": "1.1.2",
        "phone": "^3.1.14",
        "qclone": "^1.2.0",
-        "react-native-actions-sheet": "0.9.3",
+        "react-native-actions-sheet": "0.9.6",
        "react-native-check-version": "https://github.com/flexible-agency/react-native-check-version",
        "react-native-drax": "^0.10.2",
        "react-native-image-zoom-viewer": "^3.0.1",
@@ -28486,6 +28492,7 @@
        "react-native-reanimated": "3.3.0",
        "react-native-safe-area-context": "^4.3.1",
        "react-native-scoped-storage": "^1.9.5",
+        "react-native-screenguard": "^1.0.0",
        "react-native-screens": "^3.13.1",
        "react-native-securerandom": "^1.0.1",
        "react-native-share": "^7.2.0",
@@ -28495,7 +28502,7 @@
        "react-native-tooltips": "^1.0.3",
        "react-native-url-polyfill": "^2.0.0",
        "react-native-vector-icons": "9.2.0",
-        "react-native-webview": "^11.14.1",
+        "react-native-webview": "^13.10.0",
        "react-native-zip-archive": "6.0.9"
      },
      "devDependencies": {
@@ -30890,6 +30897,7 @@
    },
    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -30903,6 +30911,7 @@
    },
    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -31049,6 +31058,7 @@
    },
    "node_modules/@babel/plugin-proposal-private-property-in-object": {
      "version": "7.21.0-placeholder-for-preset-env.2",
+      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=6.9.0"
@@ -31059,6 +31069,7 @@
    },
    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
      "version": "7.18.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
@@ -31104,6 +31115,7 @@
    },
    "node_modules/@babel/plugin-syntax-class-static-block": {
      "version": "7.14.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.14.5"
@@ -31140,6 +31152,7 @@
    },
    "node_modules/@babel/plugin-syntax-export-namespace-from": {
      "version": "7.8.3",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.8.3"
@@ -31163,6 +31176,7 @@
    },
    "node_modules/@babel/plugin-syntax-import-assertions": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -31176,6 +31190,7 @@
    },
    "node_modules/@babel/plugin-syntax-import-attributes": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -31189,6 +31204,7 @@
    },
    "node_modules/@babel/plugin-syntax-import-meta": {
      "version": "7.10.4",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.10.4"
@@ -31199,6 +31215,7 @@
    },
    "node_modules/@babel/plugin-syntax-json-strings": {
      "version": "7.8.3",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.8.0"
@@ -31222,6 +31239,7 @@
    },
    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
      "version": "7.10.4",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.10.4"
@@ -31282,6 +31300,7 @@
    },
    "node_modules/@babel/plugin-syntax-private-property-in-object": {
      "version": "7.14.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.14.5"
@@ -31295,6 +31314,7 @@
    },
    "node_modules/@babel/plugin-syntax-top-level-await": {
      "version": "7.14.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.14.5"
@@ -31321,6 +31341,7 @@
    },
    "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
      "version": "7.18.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
@@ -31348,6 +31369,7 @@
    },
    "node_modules/@babel/plugin-transform-async-generator-functions": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-environment-visitor": "^7.22.5",
@@ -31405,6 +31427,7 @@
    },
    "node_modules/@babel/plugin-transform-class-properties": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-class-features-plugin": "^7.22.5",
@@ -31419,6 +31442,7 @@
    },
    "node_modules/@babel/plugin-transform-class-static-block": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-class-features-plugin": "^7.22.5",
@@ -31482,6 +31506,7 @@
    },
    "node_modules/@babel/plugin-transform-dotall-regex": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
@@ -31496,6 +31521,7 @@
    },
    "node_modules/@babel/plugin-transform-duplicate-keys": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -31509,6 +31535,7 @@
    },
    "node_modules/@babel/plugin-transform-dynamic-import": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -31537,6 +31564,7 @@
    },
    "node_modules/@babel/plugin-transform-export-namespace-from": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -31593,6 +31621,7 @@
    },
    "node_modules/@babel/plugin-transform-json-strings": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -31620,6 +31649,7 @@
    },
    "node_modules/@babel/plugin-transform-logical-assignment-operators": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -31647,6 +31677,7 @@
    },
    "node_modules/@babel/plugin-transform-modules-amd": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-module-transforms": "^7.22.5",
@@ -31676,6 +31707,7 @@
    },
    "node_modules/@babel/plugin-transform-modules-systemjs": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-hoist-variables": "^7.22.5",
@@ -31692,6 +31724,7 @@
    },
    "node_modules/@babel/plugin-transform-modules-umd": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-module-transforms": "^7.22.5",
@@ -31720,6 +31753,7 @@
    },
    "node_modules/@babel/plugin-transform-new-target": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -31733,6 +31767,7 @@
    },
    "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -31747,6 +31782,7 @@
    },
    "node_modules/@babel/plugin-transform-numeric-separator": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -31774,6 +31810,7 @@
    },
    "node_modules/@babel/plugin-transform-object-rest-spread": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/compat-data": "^7.22.5",
@@ -31805,6 +31842,7 @@
    },
    "node_modules/@babel/plugin-transform-optional-catch-binding": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -31819,6 +31857,7 @@
    },
    "node_modules/@babel/plugin-transform-optional-chaining": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -31847,6 +31886,7 @@
    },
    "node_modules/@babel/plugin-transform-private-methods": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-class-features-plugin": "^7.22.5",
@@ -31861,6 +31901,7 @@
    },
    "node_modules/@babel/plugin-transform-private-property-in-object": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-annotate-as-pure": "^7.22.5",
@@ -31960,6 +32001,7 @@
    },
    "node_modules/@babel/plugin-transform-reserved-words": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -32051,6 +32093,7 @@
    },
    "node_modules/@babel/plugin-transform-typeof-symbol": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -32080,6 +32123,7 @@
    },
    "node_modules/@babel/plugin-transform-unicode-escapes": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -32093,6 +32137,7 @@
    },
    "node_modules/@babel/plugin-transform-unicode-property-regex": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
@@ -32121,6 +32166,7 @@
    },
    "node_modules/@babel/plugin-transform-unicode-sets-regex": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
@@ -32135,6 +32181,7 @@
    },
    "node_modules/@babel/preset-env": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/compat-data": "^7.22.5",
@@ -32227,6 +32274,7 @@
    },
    "node_modules/@babel/preset-env/node_modules/semver": {
      "version": "6.3.0",
+      "dev": true,
      "license": "ISC",
      "bin": {
        "semver": "bin/semver.js"
@@ -32249,6 +32297,7 @@
    },
    "node_modules/@babel/preset-modules": {
      "version": "0.1.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.0.0",
@@ -34898,6 +34947,7 @@
    },
    "node_modules/@types/eslint": {
      "version": "8.40.2",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@types/estree": "*",
@@ -34906,6 +34956,7 @@
    },
    "node_modules/@types/eslint-scope": {
      "version": "3.7.4",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@types/eslint": "*",
@@ -34914,6 +34965,7 @@
    },
    "node_modules/@types/estree": {
      "version": "1.0.1",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/@types/graceful-fs": {
@@ -35362,6 +35414,7 @@
    },
    "node_modules/@webassemblyjs/ast": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/helper-numbers": "1.11.6",
@@ -35370,18 +35423,22 @@
    },
    "node_modules/@webassemblyjs/floating-point-hex-parser": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/@webassemblyjs/helper-api-error": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/@webassemblyjs/helper-buffer": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/@webassemblyjs/helper-numbers": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
@@ -35391,10 +35448,12 @@
    },
    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/@webassemblyjs/helper-wasm-section": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/ast": "1.11.6",
@@ -35405,6 +35464,7 @@
    },
    "node_modules/@webassemblyjs/ieee754": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@xtuc/ieee754": "^1.2.0"
@@ -35412,6 +35472,7 @@
    },
    "node_modules/@webassemblyjs/leb128": {
      "version": "1.11.6",
+      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
        "@xtuc/long": "4.2.2"
@@ -35419,10 +35480,12 @@
    },
    "node_modules/@webassemblyjs/utf8": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/@webassemblyjs/wasm-edit": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/ast": "1.11.6",
@@ -35437,6 +35500,7 @@
    },
    "node_modules/@webassemblyjs/wasm-gen": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/ast": "1.11.6",
@@ -35448,6 +35512,7 @@
    },
    "node_modules/@webassemblyjs/wasm-opt": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/ast": "1.11.6",
@@ -35458,6 +35523,7 @@
    },
    "node_modules/@webassemblyjs/wasm-parser": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/ast": "1.11.6",
@@ -35470,6 +35536,7 @@
    },
    "node_modules/@webassemblyjs/wast-printer": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/ast": "1.11.6",
@@ -35527,10 +35594,12 @@
    },
    "node_modules/@xtuc/ieee754": {
      "version": "1.2.0",
+      "dev": true,
      "license": "BSD-3-Clause"
    },
    "node_modules/@xtuc/long": {
      "version": "4.2.2",
+      "dev": true,
      "license": "Apache-2.0"
    },
    "node_modules/@yarnpkg/lockfile": {
@@ -35586,6 +35655,7 @@
    },
    "node_modules/acorn-import-assertions": {
      "version": "1.9.0",
+      "dev": true,
      "license": "MIT",
      "peerDependencies": {
        "acorn": "^8"
@@ -36690,6 +36760,7 @@
    },
    "node_modules/chrome-trace-event": {
      "version": "1.0.3",
+      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=6.0"
@@ -37790,6 +37861,7 @@
    },
    "node_modules/enhanced-resolve": {
      "version": "5.15.0",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "graceful-fs": "^4.2.4",
@@ -37902,6 +37974,7 @@
    },
    "node_modules/es-module-lexer": {
      "version": "1.3.0",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/es-set-tostringtag": {
@@ -38232,6 +38305,7 @@
    },
    "node_modules/eslint-scope": {
      "version": "5.1.1",
+      "dev": true,
      "license": "BSD-2-Clause",
      "dependencies": {
        "esrecurse": "^4.3.0",
@@ -38243,6 +38317,7 @@
    },
    "node_modules/eslint-scope/node_modules/estraverse": {
      "version": "4.3.0",
+      "dev": true,
      "license": "BSD-2-Clause",
      "engines": {
        "node": ">=4.0"
@@ -38428,6 +38503,7 @@
    },
    "node_modules/esrecurse": {
      "version": "4.3.0",
+      "dev": true,
      "license": "BSD-2-Clause",
      "dependencies": {
        "estraverse": "^5.2.0"
@@ -38438,6 +38514,7 @@
    },
    "node_modules/estraverse": {
      "version": "5.3.0",
+      "dev": true,
      "license": "BSD-2-Clause",
      "engines": {
        "node": ">=4.0"
@@ -38445,6 +38522,7 @@
    },
    "node_modules/esutils": {
      "version": "2.0.3",
+      "dev": true,
      "license": "BSD-2-Clause",
      "engines": {
        "node": ">=0.10.0"
@@ -39501,6 +39579,7 @@
    },
    "node_modules/glob-to-regexp": {
      "version": "0.4.1",
+      "dev": true,
      "license": "BSD-2-Clause"
    },
    "node_modules/global": {
@@ -41744,6 +41823,7 @@
    },
    "node_modules/json-parse-even-better-errors": {
      "version": "2.3.1",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/json-schema-traverse": {
@@ -42011,6 +42091,7 @@
    },
    "node_modules/loader-runner": {
      "version": "4.3.0",
+      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=6.11.5"
@@ -44662,6 +44743,7 @@
    },
    "node_modules/randombytes": {
      "version": "2.1.0",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "safe-buffer": "^5.1.0"
@@ -44777,8 +44859,9 @@
      }
    },
    "node_modules/react-native-actions-sheet": {
-      "version": "0.9.3",
-      "license": "MIT",
+      "version": "0.9.6",
+      "resolved": "https://registry.npmjs.org/react-native-actions-sheet/-/react-native-actions-sheet-0.9.6.tgz",
+      "integrity": "sha512-BMEFmJD29izbOxkH81HJWNCgrjdW5iz4gB+Eyov9xwUPz/Fbi53R6AFvF9N3ttYT8nEvzxj56nqP7uJZ6KuKuA==",
      "dependencies": {
        "react-native-safe-area-context": "^4.8.2"
      },
@@ -45252,6 +45335,18 @@
        "react-native": "*"
      }
    },
+    "node_modules/react-native-screenguard": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/react-native-screenguard/-/react-native-screenguard-1.0.0.tgz",
+      "integrity": "sha512-fqtoJI8TxszKqrntnHW48EMb4gNVA9VCAg5UG1FcIXEyv2W70kWoMxRRFoWuCRYlBWSAWqiXO+R6Xfk/0um0cw==",
+      "engines": {
+        "node": ">= 16.0.0"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
+      }
+    },
    "node_modules/react-native-screens": {
      "version": "3.21.1",
      "license": "MIT",
@@ -45372,8 +45467,9 @@
      }
    },
    "node_modules/react-native-webview": {
-      "version": "11.26.1",
-      "license": "MIT",
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-13.10.0.tgz",
+      "integrity": "sha512-bntBbc3JHBve17NL5fqBWPiOYYDz1VmYUPA0UbsUPHgZj6t7TXUQd4yn2yL//XFKXPDlvMO+MPB9E1uAYpEp/g==",
      "dependencies": {
        "escape-string-regexp": "2.0.0",
        "invariant": "2.2.4"
@@ -45432,6 +45528,7 @@
    },
    "node_modules/react-test-renderer": {
      "version": "18.2.0",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "react-is": "^18.2.0",
@@ -45444,10 +45541,12 @@
    },
    "node_modules/react-test-renderer/node_modules/react-is": {
      "version": "18.2.0",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/react-test-renderer/node_modules/scheduler": {
      "version": "0.23.0",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "loose-envify": "^1.1.0"
@@ -46283,6 +46382,7 @@
    },
    "node_modules/serialize-javascript": {
      "version": "6.0.1",
+      "dev": true,
      "license": "BSD-3-Clause",
      "dependencies": {
        "randombytes": "^2.1.0"
@@ -47338,6 +47438,7 @@
    },
    "node_modules/terser-webpack-plugin": {
      "version": "5.3.9",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@jridgewell/trace-mapping": "^0.3.17",
@@ -47370,6 +47471,7 @@
    },
    "node_modules/terser-webpack-plugin/node_modules/jest-worker": {
      "version": "27.5.1",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@types/node": "*",
@@ -47382,6 +47484,7 @@
    },
    "node_modules/terser-webpack-plugin/node_modules/supports-color": {
      "version": "8.1.1",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "has-flag": "^4.0.0"
@@ -48126,6 +48229,7 @@
    },
    "node_modules/watchpack": {
      "version": "2.4.0",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "glob-to-regexp": "^0.4.1",
@@ -48148,6 +48252,7 @@
    },
    "node_modules/webpack": {
      "version": "5.88.2",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@types/eslint-scope": "^3.7.3",
@@ -48262,6 +48367,7 @@
    },
    "node_modules/webpack-sources": {
      "version": "3.2.3",
+      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=10.13.0"
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@notesnook/mobile",
-  "version": "3.0.1",
+  "version": "3.0.12",
  "private": true,
  "license": "GPL-3.0-or-later",
  "workspaces": [
--- a/apps/mobile/patches/react-native-image-crop-picker+0.40.2.patch
+++ b/apps/mobile/patches/react-native-image-crop-picker+0.40.2.patch
@@ -0,0 +1,28 @@
+diff --git a/node_modules/react-native-image-crop-picker/android/src/main/java/com/reactnative/ivpusic/imagepicker/PickerModule.java b/node_modules/react-native-image-crop-picker/android/src/main/java/com/reactnative/ivpusic/imagepicker/PickerModule.java
+index 5de0845..1b158d8 100644
+--- a/node_modules/react-native-image-crop-picker/android/src/main/java/com/reactnative/ivpusic/imagepicker/PickerModule.java
+++ b/node_modules/react-native-image-crop-picker/android/src/main/java/com/reactnative/ivpusic/imagepicker/PickerModule.java
+@@ -692,6 +692,7 @@ class PickerModule extends ReactContextBaseJavaModule implements ActivityEventLi
+         image.putString("mime", options.outMimeType);
+         image.putInt("size", (int) new File(compressedImagePath).length());
+         image.putString("modificationDate", String.valueOf(modificationDate));
+        image.putString("sourceURL", path);
+ 
+         if (includeBase64) {
+             image.putString("data", getBase64StringFromFile(compressedImagePath));
+diff --git a/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m b/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
+index 9f20973..5e14da8 100644
+--- a/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
+++ b/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
+@@ -595,8 +595,10 @@ - (void)qb_imagePickerController:
+                                     NSString *mimeType = [self determineMimeTypeFromImageData:imageData];
+                                     Boolean isKnownMimeType = [mimeType length] > 0;
+                                     
+                                    Boolean isHeicOrHeif = [mimeType isEqualToString:@"image/heic"] || [mimeType isEqualToString:@"image/heif"];
+                                    
+                                     ImageResult *imageResult = [[ImageResult alloc] init];
+-                                    if (isLossless && useOriginalWidth && useOriginalHeight && isKnownMimeType && !forceJpg) {
+                                    if (isLossless && useOriginalWidth && useOriginalHeight && isKnownMimeType && !forceJpg && !isHeicOrHeif) {
+                                         // Use original, unmodified image
+                                         imageResult.data = imageData;
+                                         imageResult.width = @(imgT.size.width);
--- a/apps/mobile/patches/react-native-image-picker+4.1.2.patch
+++ b/apps/mobile/patches/react-native-image-picker+4.1.2.patch
@@ -1,169 +0,0 @@
-diff --git a/node_modules/react-native-image-picker/android/src/main/java/com/imagepicker/Utils.java b/node_modules/react-native-image-picker/android/src/main/java/com/imagepicker/Utils.java
-index 8e59033..c87febe 100644
--- a/node_modules/react-native-image-picker/android/src/main/java/com/imagepicker/Utils.java
-+++ b/node_modules/react-native-image-picker/android/src/main/java/com/imagepicker/Utils.java
-@@ -1,6 +1,7 @@
- package com.imagepicker;
- 
- import android.Manifest;
-+import android.annotation.SuppressLint;
- import android.app.Activity;
- import android.content.ClipData;
- import android.content.ContentResolver;
-@@ -21,6 +22,7 @@ import android.provider.OpenableColumns;
- import android.util.Base64;
- import android.webkit.MimeTypeMap;
- 
-+import androidx.annotation.NonNull;
- import androidx.core.app.ActivityCompat;
- import androidx.core.content.FileProvider;
- import androidx.exifinterface.media.ExifInterface;
-@@ -36,6 +38,7 @@ import java.io.FileNotFoundException;
- import java.io.IOException;
- import java.io.InputStream;
- import java.io.OutputStream;
-+import java.net.URI;
- import java.util.ArrayList;
- import java.util.Arrays;
- import java.util.Collections;
-@@ -266,7 +269,9 @@ public class Utils {
-         MediaMetadataRetriever m = new MediaMetadataRetriever();
-         m.setDataSource(context, uri);
-         int duration = Math.round(Float.parseFloat(m.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION))) / 1000;
-        m.release();
-+        try {
-+            m.release();
-+        } catch(Exception e) {}
-         return duration;
-     }
- 
-@@ -383,7 +388,7 @@ public class Utils {
-         return fileUris;
-     }
- 
-    static ReadableMap getImageResponseMap(Uri uri, Options options, Context context) {
-+    static WritableMap getImageResponseMap(Uri uri, Options options, Context context) {
-         String fileName = uri.getLastPathSegment();
-         int[] dimensions = getImageDimensions(uri, context);
- 
-@@ -418,13 +423,16 @@ public class Utils {
- 
-         for(int i = 0; i < fileUris.size(); ++i) {
-             Uri uri = fileUris.get(i);
-+            String fileName = getNameFromURI(context,uri);
- 
-             if (isImageType(uri, context)) {
-                 if (uri.getScheme().contains("content")) {
-                     uri = getAppSpecificStorageUri(uri, context);
-                 }
-                 uri = resizeImage(uri, context, options);
-                assets.pushMap(getImageResponseMap(uri, options, context));
-+                WritableMap resMap = getImageResponseMap(uri, options, context);
-+                resMap.putString("originalFileName",fileName);
-+                assets.pushMap(resMap);
-             } else if (isVideoType(uri, context)) {
-                 assets.pushMap(getVideoResponseMap(uri, context));
-             } else {
-@@ -438,6 +446,32 @@ public class Utils {
-         return response;
-     }
- 
-+    /**
-+     * Return file name from Uri given.
-+     * @param context the context, cannot be null.
-+     * @param uri uri request for file name, cannot be null
-+     * @return the corresponding display name for file defined in uri or null if error occurs.
-+     */
-+    @SuppressLint("Range")
-+    static String getNameFromURI(@NonNull Context context, @NonNull Uri uri) {
-+        String result = null;
-+        Cursor c = null;
-+        try {
-+            c = context.getContentResolver().query(uri, null, null, null, null);
-+            c.moveToFirst();
-+            result = c.getString(c.getColumnIndex(OpenableColumns.DISPLAY_NAME));
-+        }
-+        catch (Exception e){
-+            // error occurs
-+        }
-+        finally {
-+            if(c != null){
-+                c.close();
-+            }
-+        }
-+        return result;
-+    }
-+
-     static ReadableMap getErrorMap(String errCode, String errMsg) {
-         WritableMap map = Arguments.createMap();
-         map.putString("errorCode", errCode);
-diff --git a/node_modules/react-native-image-picker/ios/ImagePickerManager.m b/node_modules/react-native-image-picker/ios/ImagePickerManager.m
-index b634ffb..18b8950 100644
--- a/node_modules/react-native-image-picker/ios/ImagePickerManager.m
-+++ b/node_modules/react-native-image-picker/ios/ImagePickerManager.m
-@@ -96,6 +96,39 @@ - (void) showPickerViewController:(UIViewController *)picker
-     });
- }
- 
-+-(NSString *)cachesDirectoryName
-+{
-+    static NSString *cachePath = nil;
-+    if(!cachePath) {
-+        NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
-+        cachePath = [paths objectAtIndex:0];
-+    }
-+    
-+    return cachePath;
-+}
-+
-+///
-+/// Builds paths for identifiers in the cache directory
-+///
-+-(NSString *)pathForName:(NSString *)name
-+{
-+    NSString *cachePath = [self cachesDirectoryName];
-+    NSString *path = [cachePath stringByAppendingPathComponent:name];
-+    return path;
-+}
-+
-+#pragma mark - NSData Cache methods
-+
-+///
-+/// Saves the given data to the cache directory
-+///
-+-(NSString *)saveToCacheDirectory:(NSData *)data withName:(NSString *)name
-+{
-+    NSString *path = [self pathForName:name];
-+    [data writeToFile:path atomically:YES];
-+    return path;
-+}
-+
- #pragma mark - Helpers
- 
- -(NSMutableDictionary *)mapImageToAsset:(UIImage *)image data:(NSData *)data {
-@@ -121,22 +154,14 @@ -(NSMutableDictionary *)mapImageToAsset:(UIImage *)image data:(NSData *)data {
-     asset[@"type"] = [@"image/" stringByAppendingString:fileType];
- 
-     NSString *fileName = [self getImageFileName:fileType];
-    NSString *path = [[NSTemporaryDirectory() stringByStandardizingPath] stringByAppendingPathComponent:fileName];
-    [data writeToFile:path atomically:YES];
-+    NSString *path = [self saveToCacheDirectory:data withName:fileName];
- 
-     if ([self.options[@"includeBase64"] boolValue]) {
-         asset[@"base64"] = [data base64EncodedStringWithOptions:0];
-     }
- 
-    NSURL *fileURL = [NSURL fileURLWithPath:path];
-    asset[@"uri"] = [fileURL absoluteString];
-
-    NSNumber *fileSizeValue = nil;
-    NSError *fileSizeError = nil;
-    [fileURL getResourceValue:&fileSizeValue forKey:NSURLFileSizeKey error:&fileSizeError];
-    if (fileSizeValue){
-        asset[@"fileSize"] = fileSizeValue;
-    }
-+    asset[@"uri"] = path;
-+    asset[@"fileSize"] = [NSNumber numberWithInteger:[data length]];
- 
-     asset[@"fileName"] = fileName;
-     asset[@"width"] = @(image.size.width);
--- a/apps/mobile/patches/react-native-screenguard+1.0.0.patch
+++ b/apps/mobile/patches/react-native-screenguard+1.0.0.patch
@@ -0,0 +1,54 @@
+diff --git a/node_modules/react-native-screenguard/ios/ScreenGuard.mm b/node_modules/react-native-screenguard/ios/ScreenGuard.mm
+index 9fa7d33..d2e6d68 100644
+--- a/node_modules/react-native-screenguard/ios/ScreenGuard.mm
+++ b/node_modules/react-native-screenguard/ios/ScreenGuard.mm
+@@ -11,7 +11,7 @@
+ @implementation ScreenGuard
+ RCT_EXPORT_MODULE(ScreenGuard)
+ 
+-bool hasListeners;
+bool hasListeners_;
+ 
+ UITextField *textField;
+ UIImageView *imageView;
+@@ -22,11 +22,11 @@ @implementation ScreenGuard
+ }
+ 
+ - (void)startObserving {
+-  hasListeners = YES;
+  hasListeners_ = YES;
+ }
+ 
+ - (void)stopObserving {
+-  hasListeners = NO;
+  hasListeners_ = NO;
+ }
+ 
+ - (void)secureViewWithBackgroundColor: (NSString *)color {
+@@ -335,7 +335,7 @@ - (UIImage *)convertViewToImage:(UIView *)view {
+                          queue:mainQueue
+                     usingBlock:^(NSNotification *notification) {
+       
+-      if (hasListeners && getScreenShotPath) {
+      if (hasListeners_ && getScreenShotPath) {
+           UIViewController *presentedViewController = RCTPresentedViewController();
+ 
+           UIImage *image = [self convertViewToImage:presentedViewController.view.superview];
+@@ -359,7 +359,7 @@ - (UIImage *)convertViewToImage:(UIView *)view {
+                     result = @{@"path": filePath, @"name": fileName, @"type": @"PNG"};
+                   }
+           [self emit:SCREENSHOT_EVT body: result];
+-      } else if (hasListeners) {
+      } else if (hasListeners_) {
+           [self emit:SCREENSHOT_EVT body: nil];
+       }
+     }];
+@@ -376,7 +376,7 @@ - (UIImage *)convertViewToImage:(UIView *)view {
+                          queue:mainQueue
+                     usingBlock:^(NSNotification *notification) {
+       
+-      if (hasListeners) {
+      if (hasListeners_) {
+         [self emit:SCREEN_RECORDING_EVT body:nil];
+       }
+     }];
--- a/apps/mobile/share/share.js
+++ b/apps/mobile/share/share.js
@@ -311,8 +311,7 @@ const ShareView = () => {
          type: "tiptap"
        },
        id: note.id,
-        sessionId: Date.now(),
-        title: noteTitle.current
+        sessionId: Date.now()
      };
    } else {
      noteData = { ...note };
@@ -487,25 +486,42 @@ const ShareView = () => {
                    gap: 10
                  }}
                >
-                  <TextInput
-                    placeholder="Enter note title"
-                    ref={inputRef}
-                    style={{
-                      flexShrink: 1,
-                      flexGrow: 1,
-                      fontFamily: "OpenSans-SemiBold",
-                      fontSize: SIZE.lg,
-                      paddingBottom: 0,
-                      paddingTop: 0
-                    }}
-                    onChangeText={(value) => {
-                      noteTitle.current = value;
-                    }}
-                    blurOnSubmit={false}
-                    onSubmitEditing={() => {
-                      editorRef.current.focus();
-                    }}
-                  />
+                  {appendNoteId ? (
+                    <Heading
+                      style={{
+                        flexShrink: 1,
+                        flexGrow: 1,
+                        fontFamily: "OpenSans-SemiBold",
+                        fontSize: SIZE.lg,
+                        paddingBottom: 0,
+                        paddingTop: 0
+                      }}
+                    >
+                      Save note
+                    </Heading>
+                  ) : (
+                    <TextInput
+                      placeholder="Enter note title"
+                      ref={inputRef}
+                      style={{
+                        flexShrink: 1,
+                        flexGrow: 1,
+                        fontFamily: "OpenSans-SemiBold",
+                        fontSize: SIZE.lg,
+                        paddingBottom: 0,
+                        paddingTop: 0,
+                        color: colors.primary.heading
+                      }}
+                      onChangeText={(value) => {
+                        noteTitle.current = value;
+                      }}
+                      defaultValue={noteTitle.current}
+                      blurOnSubmit={false}
+                      onSubmitEditing={() => {
+                        editorRef.current.focus();
+                      }}
+                    />
+                  )}
                  <Button
                    title="Done"
                    type="accent"
--- a/apps/theme-builder/package-lock.json
+++ b/apps/theme-builder/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@notesnook/theme-builder",
-  "version": "1.1.1",
+  "version": "1.2.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@notesnook/theme-builder",
-      "version": "1.1.1",
+      "version": "1.2.0",
      "license": "GPL-3.0-or-later",
      "dependencies": {
        "@emotion/react": "11.11.1",
@@ -18,17 +18,18 @@
        "@theme-ui/components": "^0.14.7",
        "@theme-ui/core": "^0.14.7",
        "@trpc/client": "^10.38.3",
+        "@types/react-dom": "^18.3.0",
        "clipboard-polyfill": "^4.0.0",
        "file-saver": "^2.0.5",
        "katex": "^0.16.2",
        "react": "18.2.0",
-        "react-dom": "18.2.0"
+        "react-dom": "^18.2.0"
      },
      "devDependencies": {
        "@babel/core": "^7.22.5",
        "@types/babel__core": "^7.20.1",
        "@types/file-saver": "^2.0.5",
-        "@types/react": "^18.2.17",
+        "@types/react": "^18.2.39",
        "@vitejs/plugin-react-swc": "^3.3.2",
        "autoprefixer": "^10.4.14",
        "buffer": "^6.0.3",
@@ -133,15 +134,15 @@
    },
    "../../packages/common": {
      "name": "@notesnook/common",
-      "version": "1.0.0",
+      "version": "2.0.7",
      "license": "GPL-3.0-or-later",
      "dependencies": {
-        "@notesnook/core": "file:../core",
+        "@notesnook/core": "^8.0.0",
        "pathe": "^1.1.2",
        "timeago.js": "4.0.2"
      },
      "devDependencies": {
-        "@notesnook/core": "file:../core",
+        "@notesnook/core": "^8.0.0",
        "@types/react": "^18.2.39",
        "react": "18.2.0",
        "vitest": "^1.4.0"
@@ -329,7 +330,7 @@
    },
    "../../packages/theme": {
      "name": "@notesnook/theme",
-      "version": "1.2.0",
+      "version": "2.0.7",
      "license": "GPL-3.0-or-later",
      "devDependencies": {
        "@emotion/react": "11.11.1",
@@ -978,7 +979,7 @@
    },
    "../web": {
      "name": "@notesnook/web",
-      "version": "3.0.0",
+      "version": "3.0.13",
      "hasInstallScript": true,
      "license": "GPL-3.0-or-later",
      "dependencies": {
@@ -1028,12 +1029,12 @@
        "framer-motion": "^10.16.8",
        "hash-wasm": "^4.9.0",
        "hotkeys-js": "^3.8.3",
-        "immer": "^10.0.3",
        "katex": "0.16.2",
        "kysely": "^0.26.3",
        "libsodium-wrappers": "^0.7.13",
        "mac-scrollbar": "^0.13.5",
        "marked": "^4.1.0",
+        "mutative": "^1.0.6",
        "pdfjs-dist": "3.6.172",
        "phone": "^3.1.14",
        "platform": "^1.3.6",
@@ -1058,12 +1059,14 @@
        "w3c-keyname": "^2.2.6",
        "web-streams-polyfill": "^3.1.1",
        "wouter": "2.12.1",
-        "zustand": "4.4.7"
+        "zustand": "4.4.7",
+        "zustand-mutative": "^1.0.1"
      },
      "devDependencies": {
        "@babel/core": "^7.22.5",
        "@playwright/test": "^1.43.1",
-        "@swc/core": "1.3.61",
+        "@swc/core": "^1.5.24",
+        "@swc/plugin-react-remove-properties": "^2.0.4",
        "@trpc/server": "10.38.3",
        "@types/babel__core": "^7.20.1",
        "@types/event-source-polyfill": "^1.0.1",
@@ -1078,8 +1081,8 @@
        "@types/react-scroll-sync": "^0.9.0",
        "@types/tinycolor2": "^1.4.3",
        "@types/wicg-file-system-access": "^2020.9.6",
-        "@vitejs/plugin-react-swc": "3.3.2",
-        "autoprefixer": "^10.4.14",
+        "@vitejs/plugin-react-swc": "^3.7.0",
+        "autoprefixer": "^10.4.19",
        "better-sqlite3-multiple-ciphers": "^9.4.0",
        "buffer": "^6.0.3",
        "chalk": "^4.1.0",
@@ -1090,14 +1093,13 @@
        "ip": "^1.1.8",
        "lorem-ipsum": "^2.0.4",
        "otplib": "^12.0.1",
-        "rollup": "^3.29.4",
-        "rollup-plugin-visualizer": "^5.9.2",
-        "swc-plugin-react-remove-properties": "^0.1.4",
-        "vite": "^4.5.0",
-        "vite-plugin-env-compatible": "^1.1.1",
-        "vite-plugin-pwa": "^0.16.3",
-        "vite-plugin-svgr": "^3.2.0",
-        "vitest": "^0.34.6",
+        "rollup": "^4.18.0",
+        "rollup-plugin-visualizer": "^5.12.0",
+        "vite": "^5.2.12",
+        "vite-plugin-env-compatible": "^2.0.1",
+        "vite-plugin-pwa": "^0.20.0",
+        "vite-plugin-svgr": "^4.2.0",
+        "vitest": "^1.6.0",
        "workbox-core": "^7.0.0",
        "workbox-expiration": "^7.0.0",
        "workbox-precaching": "^7.0.0",
@@ -2098,25 +2100,30 @@
    },
    "node_modules/@types/prop-types": {
      "version": "15.7.5",
-      "dev": true,
      "license": "MIT"
    },
    "node_modules/@types/react": {
      "version": "18.2.39",
      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.39.tgz",
      "integrity": "sha512-Oiw+ppED6IremMInLV4HXGbfbG6GyziY3kqAwJYOR0PNbkYDmLWQA3a95EhdSmamsvbkJN96ZNN+YD+fGjzSBA==",
-      "dev": true,
      "dependencies": {
        "@types/prop-types": "*",
        "@types/scheduler": "*",
        "csstype": "^3.0.2"
      }
    },
+    "node_modules/@types/react-dom": {
+      "version": "18.3.0",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz",
+      "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==",
+      "dependencies": {
+        "@types/react": "*"
+      }
+    },
    "node_modules/@types/scheduler": {
      "version": "0.16.8",
      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz",
-      "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==",
-      "dev": true
+      "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A=="
    },
    "node_modules/@types/styled-system": {
      "version": "5.1.16",
--- a/apps/theme-builder/package.json
+++ b/apps/theme-builder/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@notesnook/theme-builder",
  "description": "Your private note taking space",
-  "version": "1.1.1",
+  "version": "1.2.0",
  "private": true,
  "main": "./src/app.js",
  "homepage": "https://notesnook.com/",
@@ -17,18 +17,18 @@
    "@theme-ui/components": "^0.14.7",
    "@theme-ui/core": "^0.14.7",
    "@trpc/client": "^10.38.3",
+    "@types/react-dom": "^18.3.0",
    "clipboard-polyfill": "^4.0.0",
    "file-saver": "^2.0.5",
    "katex": "^0.16.2",
    "react": "18.2.0",
-    "react-dom": "18.2.0"
+    "react-dom": "^18.2.0"
  },
  "devDependencies": {
    "@babel/core": "^7.22.5",
    "@types/babel__core": "^7.20.1",
    "@types/file-saver": "^2.0.5",
    "@types/react": "^18.2.39",
-    "@types/react": "^18.2.17",
    "@vitejs/plugin-react-swc": "^3.3.2",
    "autoprefixer": "^10.4.14",
    "buffer": "^6.0.3",
--- a/apps/theme-builder/src/index.html
+++ b/apps/theme-builder/src/index.html
@@ -2,19 +2,10 @@
 <html lang="en">
  <head>
    <meta charset="utf-8" />
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
-    <link
-      rel="icon"
-      type="image/png"
-      sizes="32x32"
-      href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAHUUExURUxpcf////////////////////////////////////////////////////////////////////////////////////39/f39/f////////////////////////////////z8/O3s7P7+/vTz8wAAAPz7++/v7/Py8u/u7vDv7+7t7dfX1/79/ezr66Kiovv6+vf29vX09OTj4w0NDfv7++Ti4vr6+vT09Ovq6vn5+f39/fb19dnX1/b29tvb29/f3xMTE/j4+Pn4+O7s7MnJyerq6uno6M/Pz8jIyN3d3dnZ2d7e3kZGRvj39/38/Pf39+zs7PDw8OPi4ubl5cvLy+rp6czMzPLy8vPz887Ozujo6MrKyuDf3+fn59PT0+bm5uXl5c3NzfX19evr6wsLC+/t7ePj4/Ty8u3r6/Lx8eXk5OPh4dDQ0Nza2tjX19vZ2fHw8Nva2tLR0djW1tbW1tra2tLS0uHh4evp6eLi4tXV1djY2L+/vysrK7q6utHR0aGhoa6urrm5uQICAigoKCEhIZCQkFxcXBgYGFRUVBISEm1tbQ4ODklJSbu7uyAgID09PZqamkVFRXh4eLGxsTg4OOTk5FFRUQEBAQoKCnx8fBcXF7/+rP8AAAAfdFJOUwBOqO2h6KT9Mtyr5+w3Str+6TTZOjXb31M24O8BOd0PapSsAAABxElEQVQ4y2NgYOBgYWWXxwLYBdmEGICAjx9Z1NJJVQfB42QE6hdG0RaoaaCqhKSCl4EF1VxNVAXyTAzcaArUUBXwMLBjKDBBViDAII+uwBZFgTy6AjU1awIKNKz1aa0g1VBfB58CDS08CuIb40AKzLAqsJKXN2tXacChwKS+rTtB3tJHRU9ewxmbFZ6tKiqTrSAKdIO1LDEUaPeoqMzsUwAp0NIt8Uj0ijJXQFVgnDJVZcK0XrACXcXY0sjoHM8AfyUkBbOn9KvMmgRSYFEW4hUVqJagHeaShqTAwX7ijJQusAkW5VXRHu6eruFqaigKkqarqAAVKFbYxWiYq1XGedijuMHBWz6xo7m2Rl7RwtvdJaw6NjzCFl2BVVNdshJQgbqBsqtdpIu7nasjXIFXS2cyRL2CW6i6JTCgFCLitUPs4QrM7cDmKZi7FRYVm6o5QeLbDGICLNEqJAVk59rk2djY5Me4FThawQOKFSzrrxmaZWpqBAamQUGmwRaakNTNzMAm7+ekrKmlqOjsrIgAGcAA1ci0NVPiYhAV8zVURgbp6nBg7isuwsDAKKfkp4AEVOHASklKApS9JZmY5bECaS5ZGQYA3vqpy6NoYh0AAABXelRYdFJhdyBwcm9maWxlIHR5cGUgaXB0YwAAeJzj8gwIcVYoKMpPy8xJ5VIAAyMLLmMLEyMTS5MUAxMgRIA0w2QDI7NUIMvY1MjEzMQcxAfLgEigSi4A6hcRdPJCNZUAAAAASUVORK5CYII="
-    />
-    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
-    <!-- <link rel="manifest" href="/site.webmanifest" /> -->
-    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#01c352" />
-    <meta name="msapplication-TileColor" content="#01c352" />
+    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+    <link rel="icon" type="image/png" href="/favicon.png" />
+    <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
    <meta name="theme-color" content="#01c352" />
-
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <!--
      manifest.json provides metadata used when your web app is installed on a
@@ -49,13 +40,26 @@
    />
    <meta name="twitter:card" content="summary_large_image" />
    <title>Notesnook Theme Builder</title>
+    <style id="theme-colors">
+      #splash {
+        display: none !important;
+      }
+    </style>
+    <script type="module">
+      import { themeToCSS } from "@notesnook/theme";

-    <script nonce="7WIq8hRwApoXhctoGZZthMLYQLRNiprTwcPi6Azdf">
      const colorScheme = JSON.parse(
        window.localStorage.getItem("colorScheme") || '"light"'
      );
      const root = document.querySelector("html");
      if (root) root.setAttribute("data-theme", colorScheme);
+
+      const theme = window.localStorage.getItem(`theme:${colorScheme}`);
+      if (theme) {
+        const css = themeToCSS(JSON.parse(theme));
+        const stylesheet = document.getElementById("theme-colors");
+        if (stylesheet) stylesheet.innerHTML = css;
+      }
    </script>
    <script type="module" src="/index.tsx"></script>
    <style>
@@ -63,21 +67,6 @@
        overscroll-behavior: none;
      }

-      html[data-theme="dark"] {
-        --bg: #0f0f0f;
-        --fg: #fff;
-        --three-bars-bg: #494949;
-        --gradient-stop-color: #111111;
-        --n-letter-color: #e1e1e1;
-      }
-
-      html[data-theme="light"] {
-        --bg: #fff;
-        --three-bars-bg: #bebebe;
-        --gradient-stop-color: #fff9f9;
-        --n-letter-color: #000;
-      }
-
      html[data-theme="light"] .react-loading-skeleton {
        --base-color: var(--background-secondary);
        --highlight-color: #var(--background-secondary);
@@ -88,6 +77,19 @@
        --highlight-color: var(--background-secondary);
      }

+      #splash {
+        background-color: var(--background);
+        height: 100%;
+        width: 100%;
+        position: absolute;
+        top: 0;
+        left: 0;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+      }
+
      #splash svg {
        transform: scale(1);
        animation: pulse 2s infinite;
@@ -95,7 +97,7 @@

      @keyframes pulse {
        0% {
-          transform: scale(0.95);
+          transform: scale(0.9);
        }

        70% {
@@ -103,7 +105,7 @@
        }

        100% {
-          transform: scale(0.95);
+          transform: scale(0.9);
        }
      }

@@ -128,20 +130,9 @@
        overflow: hidden;
      }

-      @keyframes fadeUp {
-        0% {
-          transform: translateY(500px);
-          opacity: 0;
-        }
-
-        80% {
-          transform: translateY(0px);
-          opacity: 0.7;
-        }
-
-        100% {
-          opacity: 1;
-        }
+      #root {
+        display: flex;
+        flex-direction: column;
      }

      /* svg {
@@ -171,85 +162,40 @@
    </style>
  </head>

-  <body>
+  <body class="theme-scope-base">
    <noscript>You need to enable JavaScript to run this app.</noscript>
    <!--     <script src="https://cdn.jsdelivr.net/npm/highlightjs@9.16.2/highlight.pack.min.js"></script>
 -->
    <div id="root"></div>
-    <div
-      id="splash"
-      style="
-        background-color: var(--bg);
-        height: 100%;
-        width: 100%;
-        position: absolute;
-        top: 0;
-        left: 0;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-      "
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      style="height: 0; width: 0; z-index: -1; position: absolute"
    >
-      <svg viewBox="0 0 339 339" style="width: 150px">
-        <defs />
-        <defs>
-          <linearGradient
-            xlink:href="#a"
-            id="b"
-            x1="188.61227"
-            x2="193.54405"
-            y1="165.2058"
-            y2="216.81519"
-            gradientTransform="rotate(5 4448 -4204) scale(2.93671)"
-            gradientUnits="userSpaceOnUse"
-          />
-
-          <linearGradient id="a">
-            <stop offset="0" />
-            <stop
-              offset="1"
-              stop-color="var(--gradient-stop-color)"
-              stop-opacity="0"
-            />
-          </linearGradient>
-          <linearGradient
-            id="c"
-            x1="167.8"
-            x2="270.6"
-            y1="76.9"
-            y2="64.2"
-            gradientTransform="rotate(5 465 -2050) scale(1.50082)"
-            gradientUnits="userSpaceOnUse"
-            xlink:href="#a"
-          />
-        </defs>
-        <g transform="translate(0 42)">
-          <path fill="url(#b)" d="M160 205l154 42-141 44-155-42z" />
-          <path fill="url(#c)" d="M160-35v240l154 42 1-253z" />
+      <symbol id="full-logo" viewBox="0 0 1000 1000">
+        <rect
+          width="1000"
+          height="1000"
+          rx="30%"
+          ry="30%"
+          style="fill: var(--paragraph)"
+        />
+        <g transform="translate(275,176.95254)">
          <path
-            fill="none"
-            stroke-width="1.2"
-            d="M160 205V-35m0 240L18 249m142-44l154 41"
-          />
-          <path
-            fill="var(--n-letter-color)"
-            d="M84 109l35 54V98l21-7v91l-27 9-35-54v65l-21 6v-91z"
-          />
-          <rect
-            width="86.1"
-            height="12.6"
-            x="185"
-            y="97"
-            fill="var(--three-bars-bg)"
-            ry="2.3"
-            transform="skewY(15) scale(.9669 1)"
-          />
-          <path
-            fill="var(--three-bars-bg)"
-            d="M181 169l99 26 2 3v8c0 1-1 2-2 1l-99-26-2-3v-7c0-2 1-2 2-2zm0-47l99 27 2 2v8l-2 2-99-27c-1 0-2-1-2-3v-7l2-2z"
+            style="fill: var(--background)"
+            d="M437.985 493.919c-17.255 50.411-51.835 93.065-97.588 120.372-45.752 27.307-99.71 37.496-152.269 28.753-52.56-8.743-100.313999-35.85-134.763-76.498C18.916 525.898.006 474.347 0 421.064v-110.25l79.121001 33.053v77.152c-.007 20.779 4.434 41.318 13.024 60.237C100.735 500.176 113.276 517.037 128.925 530.707c2.97 2.587 6.053 5.107 9.236 7.459 23.357 17.388 51.402 27.352 80.494 28.597.99 0 1.946.079 2.925.101.979.023 2.25 0 3.375 0h3.375c1.125 0 1.935 0 2.925-.101 29.081-1.248 57.116-11.203 80.471-28.575 3.173-2.351 6.255-4.86 9.237-7.447 20.556-17.98 35.656-41.366 43.582-67.5zM450 225v196.065c0 2.531 0 5.074-.158 7.605l-78.963-33.019V225c-.013-37.684-14.607-73.901-40.725-101.066-26.119-27.164003-61.735-43.168003-99.389-44.660003-37.655-1.492-74.426 11.644-102.611 36.657003-28.185999 25.013-45.599999 59.962-48.593999 97.526-.281 3.803-.439 7.662-.439 11.543v48.712L0 240.637V0h225c59.674 0 116.903 23.705 159.099 65.901C426.295 108.097 450 165.326 450 225Z"
          />
        </g>
+      </symbol>
+      <symbol id="themed-logo" viewBox="0 0 450 646.09491">
+        <path
+          style="fill: var(--paragraph)"
+          d="M437.985 493.919c-17.255 50.411-51.835 93.065-97.588 120.372-45.752 27.307-99.71 37.496-152.269 28.753-52.56-8.743-100.313999-35.85-134.763-76.498C18.916 525.898.006 474.347 0 421.064v-110.25l79.121001 33.053v77.152c-.007 20.779 4.434 41.318 13.024 60.237C100.735 500.176 113.276 517.037 128.925 530.707c2.97 2.587 6.053 5.107 9.236 7.459 23.357 17.388 51.402 27.352 80.494 28.597.99 0 1.946.079 2.925.101.979.023 2.25 0 3.375 0h3.375c1.125 0 1.935 0 2.925-.101 29.081-1.248 57.116-11.203 80.471-28.575 3.173-2.351 6.255-4.86 9.237-7.447 20.556-17.98 35.656-41.366 43.582-67.5zM450 225v196.065c0 2.531 0 5.074-.158 7.605l-78.963-33.019V225c-.013-37.684-14.607-73.901-40.725-101.066-26.119-27.164003-61.735-43.168003-99.389-44.660003-37.655-1.492-74.426 11.644-102.611 36.657003-28.185999 25.013-45.599999 59.962-48.593999 97.526-.281 3.803-.439 7.662-.439 11.543v48.712L0 240.637V0h225c59.674 0 116.903 23.705 159.099 65.901C426.295 108.097 450 165.326 450 225Z"
+        />
+      </symbol>
+    </svg>
+    <div id="splash" class="hidden">
+      <svg style="height: 120px">
+        <use href="#themed-logo" />
      </svg>
    </div>
    <div id="dialogContainer"></div>
--- a/apps/theme-builder/src/index.tsx
+++ b/apps/theme-builder/src/index.tsx
@@ -18,31 +18,59 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 import { init } from "@notesnook/web/src/bootstrap";
-import { render } from "react-dom";
+import { createRoot } from "react-dom/client";
+import {
+  ErrorBoundary,
+  ErrorComponent
+} from "@notesnook/web/src/components/error-boundary";
 import { BaseThemeProvider } from "@notesnook/web/src/components/theme-provider";
 import { App } from "./app";

 renderApp();

 async function renderApp() {
-  const { component, props } = await init();
+  const rootElement = document.getElementById("root");
+  if (!rootElement) return;
+  const root = createRoot(rootElement);
+  try {
+    const { component, props } = await init();

-  const { default: Component } = await component();
-  render(
-    <BaseThemeProvider
-      sx={{
-        display: "flex",
-        "#app": { flex: 1, height: "unset" },
-        "& > :first-child:not(#menu-wrapper)": { flex: 1 },
-        height: "100%"
-      }}
-    >
-      <Component route={props?.route || "login:email"} />
-      <App />
-    </BaseThemeProvider>,
-    document.getElementById("root"),
-    () => {
-      document.getElementById("splash")?.remove();
-    }
-  );
+    const { useKeyStore } = await import(
+      "@notesnook/web/src/interfaces/key-store"
+    );
+    await useKeyStore.getState().init();
+
+    const { default: Component } = await component();
+    const { default: AppLock } = await import(
+      "@notesnook/web/src/views/app-lock"
+    );
+
+    root.render(
+      <ErrorBoundary>
+        <BaseThemeProvider
+          onRender={() => document.getElementById("splash")?.remove()}
+          sx={{
+            display: "flex",
+            "#app": { flex: 1, height: "unset" },
+            "& > :first-child:not(#menu-wrapper)": { flex: 1 },
+            height: "100%"
+          }}
+        >
+          <AppLock>
+            <Component route={props?.route || "login:email"} />
+          </AppLock>
+          <App />
+        </BaseThemeProvider>
+      </ErrorBoundary>
+    );
+  } catch (e) {
+    root.render(
+      <>
+        <ErrorComponent
+          error={e}
+          resetErrorBoundary={() => window.location.reload()}
+        />
+      </>
+    );
+  }
 }
--- a/apps/vericrypt/package-lock.json
+++ b/apps/vericrypt/package-lock.json
@@ -33,7 +33,7 @@
    },
    "../../packages/crypto": {
      "name": "@notesnook/crypto",
-      "version": "1.1.1",
+      "version": "2.0.7",
      "license": "GPL-3.0-or-later",
      "dependencies": {
        "@notesnook/sodium": "file:../sodium"
--- a/apps/web/e2e/editor.test.ts-snapshots/fast-switch-and-edit-note-1-Chromium-linux.txt
+++ b/apps/web/e2e/editor.test.ts-snapshots/fast-switch-and-edit-note-1-Chromium-linux.txt
@@ -1 +1 @@
-Test note 1 (9) Test note 1 (8) Test note 1 (7) Test note 1 (6) Test note 1 (5) Test note 1 (4) Test note 1 (3) Test note 1 (2) Test note 1 (1) Test note 1 (0) 53ad8e4e40ebebd0f400498d
+53ad8e4e40ebebd0f400498dTest note 1 (0) Test note 1 (1) Test note 1 (2) Test note 1 (3) Test note 1 (4) Test note 1 (5) Test note 1 (6) Test note 1 (7) Test note 1 (8) Test note 1 (9)
--- a/apps/web/e2e/editor.test.ts-snapshots/fast-switch-and-edit-note-2-Chromium-linux.txt
+++ b/apps/web/e2e/editor.test.ts-snapshots/fast-switch-and-edit-note-2-Chromium-linux.txt
@@ -1 +1 @@
-Test note 2 (9)Test note 2 (8)Test note 2 (7)Test note 2 (6)Test note 2 (5)Test note 2 (4)Test note 2 (3)Test note 2 (2)Test note 2 (1)Test note 2 (0)f054d19e9a2f46eff7b9bb25
+f054d19e9a2f46eff7b9bb25Test note 2 (0)Test note 2 (1)Test note 2 (2)Test note 2 (3)Test note 2 (4)Test note 2 (5)Test note 2 (6)Test note 2 (7)Test note 2 (8)Test note 2 (9)
--- a/apps/web/e2e/editor.test.ts-snapshots/normal-mode-from-focus-mode-Chromium-linux.jpg
+++ b/apps/web/e2e/editor.test.ts-snapshots/normal-mode-from-focus-mode-Chromium-linux.jpg
--- a/apps/web/e2e/editor.test.ts-snapshots/readonly-edited-note-Chromium-linux.txt
+++ b/apps/web/e2e/editor.test.ts-snapshots/readonly-edited-note-Chromium-linux.txt
@@ -1 +1 @@
-An edit I madeThis is Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1
+This is Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1An edit I made
--- a/apps/web/e2e/keyboard-list-navigation.test.ts
+++ b/apps/web/e2e/keyboard-list-navigation.test.ts
@@ -262,7 +262,7 @@ test("using Shift+Click when no notes are selected should not crash the app", as
  info.setTimeout(60 * 1000);

  const { notes } = await populateList(page, 5);
-  await page.reload();
+  await notes.focus();

  const note = await notes.findNote({ title: "Test note 3" });

--- a/apps/web/e2e/models/app.model.ts
+++ b/apps/web/e2e/models/app.model.ts
@@ -123,7 +123,7 @@ export class AppModel {
    );
  }

-  async waitForSync(state: "completed" | "synced" = "completed") {
+  async waitForSync(state: "completed" | "synced" | "syncing" = "completed") {
    await this.page
      .locator(getTestId(`sync-status-${state}`))
      .waitFor({ state: "visible" });
--- a/apps/web/e2e/notes.test.ts
+++ b/apps/web/e2e/notes.test.ts
@@ -259,14 +259,15 @@ test("unlock a note for editing", async ({ page }) => {
  await page.waitForTimeout(150);

  await page.reload();
-  await page.waitForTimeout(500);
+  await notes.waitForList();

  const newContent = `${NOTE.content}${content}`;
  const editedNote = await notes.findNote({
    title: NOTE.title,
    content: newContent
  });
-  await editedNote?.openLockedNote(PASSWORD);
+  if (!editedNote) throw new Error("Could not find note.");
+  await editedNote.openLockedNote(PASSWORD);
  await notes.editor.waitForLoading();
  expect(await notes.editor.getContent("text")).toContain(newContent);
 });
@@ -284,11 +285,9 @@ test("change title of a locked note", async ({ page }) => {
  await page.waitForTimeout(150);

  await page.reload();
-  await page.waitForTimeout(500);
-
-  const editedNote = await notes.findNote({ title, content: NOTE.content });
+  await notes.waitForList();
+  const editedNote = await notes.findNote({ title });
  await editedNote?.openLockedNote(PASSWORD);
-  await notes.editor.waitForLoading();
  expect(await note?.getTitle()).toContain(title);
  expect(await notes.editor.getTitle()).toContain(title);
 });
--- a/Show More
+++ b/Show More