mobile: fix dialog show above app lock

2026-09-01 11:39:21 +02:00 · 2023-10-02 11:51:44 +05:00
244 changed files with 37072 additions and 8790 deletions
--- a/apps/desktop/package-lock.json
+++ b/apps/desktop/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@notesnook/desktop",
-  "version": "2.6.13",
+  "version": "2.6.6",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@notesnook/desktop",
-      "version": "2.6.13",
+      "version": "2.6.6",
      "hasInstallScript": true,
      "license": "GPL-3.0-or-later",
      "dependencies": {
@@ -24,8 +24,8 @@
        "@types/node": "18.16.1",
        "@types/yargs": "^17.0.24",
        "chokidar": "^3.5.3",
-        "electron": "25.9.8",
-        "electron-builder": "^24.9.1",
+        "electron": "25.8.1",
+        "electron-builder": "^24.6.4",
        "electron-builder-notarize": "^1.5.1",
        "esbuild": "^0.17.19",
        "tree-kill": "^1.2.2",
@@ -173,11 +173,12 @@
      }
    },
    "node_modules/@electron/asar": {
-      "version": "3.2.8",
-      "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.8.tgz",
-      "integrity": "sha512-cmskk5M06ewHMZAplSiF4AlME3IrnnZhKnWbtwKVLRkdJkKyUVjMLhDIiPIx/+6zQWVlKX/LtmK9xDme7540Sg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.4.tgz",
+      "integrity": "sha512-lykfY3TJRRWFeTxccEKdf1I6BLl2Plw81H0bbp4Fc5iEc67foDCa5pjJQULVgo0wF+Dli75f3xVcdb/67FFZ/g==",
      "dev": true,
      "dependencies": {
+        "chromium-pickle-js": "^0.2.0",
        "commander": "^5.0.0",
        "glob": "^7.1.6",
        "minimatch": "^3.0.4"
@@ -215,7 +216,6 @@
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.2.tgz",
      "integrity": "sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==",
-      "dev": true,
      "dependencies": {
        "debug": "^4.1.1",
        "env-paths": "^2.2.0",
@@ -236,7 +236,6 @@
      "version": "8.1.0",
      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-      "dev": true,
      "dependencies": {
        "graceful-fs": "^4.2.0",
        "jsonfile": "^4.0.0",
@@ -250,7 +249,6 @@
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
-      "dev": true,
      "optionalDependencies": {
        "graceful-fs": "^4.1.6"
      }
@@ -259,7 +257,6 @@
      "version": "6.3.0",
      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
      "bin": {
        "semver": "bin/semver.js"
      }
@@ -268,7 +265,6 @@
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true,
      "engines": {
        "node": ">= 4.0.0"
      }
@@ -802,7 +798,6 @@
      "version": "4.6.0",
      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
-      "dev": true,
      "engines": {
        "node": ">=10"
      },
@@ -814,7 +809,6 @@
      "version": "4.0.6",
      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
-      "dev": true,
      "dependencies": {
        "defer-to-connect": "^2.0.0"
      },
@@ -859,7 +853,6 @@
      "version": "6.0.3",
      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
      "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
-      "dev": true,
      "dependencies": {
        "@types/http-cache-semantics": "*",
        "@types/keyv": "^3.1.4",
@@ -868,9 +861,9 @@
      }
    },
    "node_modules/@types/debug": {
-      "version": "4.1.12",
-      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
-      "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==",
+      "version": "4.1.8",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.8.tgz",
+      "integrity": "sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ==",
      "dev": true,
      "dependencies": {
        "@types/ms": "*"
@@ -888,29 +881,26 @@
    "node_modules/@types/http-cache-semantics": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
-      "dev": true
+      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="
    },
    "node_modules/@types/keyv": {
      "version": "3.1.4",
      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
      "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
-      "dev": true,
      "dependencies": {
        "@types/node": "*"
      }
    },
    "node_modules/@types/ms": {
-      "version": "0.7.34",
-      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz",
-      "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==",
+      "version": "0.7.31",
+      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz",
+      "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==",
      "dev": true
    },
    "node_modules/@types/node": {
      "version": "18.16.1",
      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.1.tgz",
-      "integrity": "sha512-DZxSZWXxFfOlx7k7Rv4LAyiMroaxa3Ly/7OOzZO8cBNho0YzAi4qlbrx8W27JGqG57IgR/6J7r+nOJWw6kcvZA==",
-      "devOptional": true
+      "integrity": "sha512-DZxSZWXxFfOlx7k7Rv4LAyiMroaxa3Ly/7OOzZO8cBNho0YzAi4qlbrx8W27JGqG57IgR/6J7r+nOJWw6kcvZA=="
    },
    "node_modules/@types/normalize-package-data": {
      "version": "2.4.1",
@@ -932,7 +922,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
-      "dev": true,
      "dependencies": {
        "@types/node": "*"
      }
@@ -962,16 +951,15 @@
      "version": "2.10.0",
      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "@types/node": "*"
      }
    },
    "node_modules/7zip-bin": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz",
-      "integrity": "sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.1.1.tgz",
+      "integrity": "sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ==",
      "dev": true
    },
    "node_modules/agent-base": {
@@ -1053,9 +1041,9 @@
      "dev": true
    },
    "node_modules/app-builder-lib": {
-      "version": "24.9.1",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.9.1.tgz",
-      "integrity": "sha512-Q1nYxZcio4r+W72cnIRVYofEAyjBd3mG47o+zms8HlD51zWtA/YxJb01Jei5F+jkWhge/PTQK+uldsPh6d0/4g==",
+      "version": "24.6.4",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.6.4.tgz",
+      "integrity": "sha512-m9931WXb83teb32N0rKg+ulbn6+Hl8NV5SUpVDOVz9MWOXfhV6AQtTdftf51zJJvCQnQugGtSqoLvgw6mdF/Rg==",
      "dev": true,
      "dependencies": {
        "@develar/schema-utils": "~2.6.5",
@@ -1064,15 +1052,15 @@
        "@electron/universal": "1.4.1",
        "@malept/flatpak-bundler": "^0.4.0",
        "@types/fs-extra": "9.0.13",
-        "7zip-bin": "~5.2.0",
+        "7zip-bin": "~5.1.1",
        "async-exit-hook": "^2.0.1",
        "bluebird-lst": "^1.0.9",
-        "builder-util": "24.8.1",
-        "builder-util-runtime": "9.2.3",
+        "builder-util": "24.5.0",
+        "builder-util-runtime": "9.2.1",
        "chromium-pickle-js": "^0.2.0",
        "debug": "^4.3.4",
        "ejs": "^3.1.8",
-        "electron-publish": "24.8.1",
+        "electron-publish": "24.5.0",
        "form-data": "^4.0.0",
        "fs-extra": "^10.1.0",
        "hosted-git-info": "^4.1.0",
@@ -1091,19 +1079,6 @@
        "node": ">=14.0.0"
      }
    },
-    "node_modules/app-builder-lib/node_modules/builder-util-runtime": {
-      "version": "9.2.3",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
-      "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
-      "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",
@@ -1128,9 +1103,9 @@
      }
    },
    "node_modules/async": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
-      "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
      "dev": true
    },
    "node_modules/async-exit-hook": {
@@ -1216,7 +1191,6 @@
      "version": "3.2.0",
      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",
      "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",
-      "dev": true,
      "optional": true
    },
    "node_modules/brace-expansion": {
@@ -1268,7 +1242,6 @@
      "version": "0.2.13",
      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-      "dev": true,
      "engines": {
        "node": "*"
      }
@@ -1292,16 +1265,16 @@
      "dev": true
    },
    "node_modules/builder-util": {
-      "version": "24.8.1",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-24.8.1.tgz",
-      "integrity": "sha512-ibmQ4BnnqCnJTNrdmdNlnhF48kfqhNzSeqFMXHLIl+o9/yhn6QfOaVrloZ9YUu3m0k3rexvlT5wcki6LWpjTZw==",
+      "version": "24.5.0",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-24.5.0.tgz",
+      "integrity": "sha512-STnBmZN/M5vGcv01u/K8l+H+kplTaq4PAIn3yeuufUKSpcdro0DhJWxPI81k5XcNfC//bjM3+n9nr8F9uV4uAQ==",
      "dev": true,
      "dependencies": {
        "@types/debug": "^4.1.6",
-        "7zip-bin": "~5.2.0",
+        "7zip-bin": "~5.1.1",
        "app-builder-bin": "4.0.0",
        "bluebird-lst": "^1.0.9",
-        "builder-util-runtime": "9.2.3",
+        "builder-util-runtime": "9.2.1",
        "chalk": "^4.1.2",
        "cross-spawn": "^7.0.3",
        "debug": "^4.3.4",
@@ -1327,19 +1300,6 @@
        "node": ">=12.0.0"
      }
    },
-    "node_modules/builder-util/node_modules/builder-util-runtime": {
-      "version": "9.2.3",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
-      "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.3.4",
-        "sax": "^1.2.4"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
    "node_modules/busboy": {
      "version": "1.6.0",
      "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz",
@@ -1356,7 +1316,6 @@
      "version": "5.0.4",
      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
-      "dev": true,
      "engines": {
        "node": ">=10.6.0"
      }
@@ -1365,7 +1324,6 @@
      "version": "7.0.4",
      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz",
      "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==",
-      "dev": true,
      "dependencies": {
        "clone-response": "^1.0.2",
        "get-stream": "^5.1.0",
@@ -1438,9 +1396,9 @@
      "dev": true
    },
    "node_modules/ci-info": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
-      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
+      "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
      "dev": true,
      "funding": [
        {
@@ -1485,7 +1443,6 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
-      "dev": true,
      "dependencies": {
        "mimic-response": "^1.0.0"
      },
@@ -1629,7 +1586,6 @@
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-      "dev": true,
      "dependencies": {
        "mimic-response": "^3.1.0"
      },
@@ -1644,7 +1600,6 @@
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-      "dev": true,
      "engines": {
        "node": ">=10"
      },
@@ -1656,7 +1611,6 @@
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-      "dev": true,
      "engines": {
        "node": ">=10"
      }
@@ -1665,7 +1619,6 @@
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "has-property-descriptors": "^1.0.0",
@@ -1691,7 +1644,6 @@
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-      "dev": true,
      "optional": true
    },
    "node_modules/dir-compare": {
@@ -1727,14 +1679,14 @@
      }
    },
    "node_modules/dmg-builder": {
-      "version": "24.9.1",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.9.1.tgz",
-      "integrity": "sha512-huC+O6hvHd24Ubj3cy2GMiGLe2xGFKN3klqVMLAdcbB6SWMd1yPSdZvV8W1O01ICzCCRlZDHiv4VrNUgnPUfbQ==",
+      "version": "24.6.4",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.6.4.tgz",
+      "integrity": "sha512-BNcHRc9CWEuI9qt0E655bUBU/j/3wUCYBVKGu1kVpbN5lcUdEJJJeiO0NHK3dgKmra6LUUZlo+mWqc+OCbi0zw==",
      "dev": true,
      "dependencies": {
-        "app-builder-lib": "24.9.1",
-        "builder-util": "24.8.1",
-        "builder-util-runtime": "9.2.3",
+        "app-builder-lib": "24.6.4",
+        "builder-util": "24.5.0",
+        "builder-util-runtime": "9.2.1",
        "fs-extra": "^10.1.0",
        "iconv-lite": "^0.6.2",
        "js-yaml": "^4.1.0"
@@ -1743,19 +1695,6 @@
        "dmg-license": "^1.0.11"
      }
    },
-    "node_modules/dmg-builder/node_modules/builder-util-runtime": {
-      "version": "9.2.3",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
-      "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
-      "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",
@@ -1812,10 +1751,9 @@
      }
    },
    "node_modules/electron": {
-      "version": "25.9.8",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.8.tgz",
-      "integrity": "sha512-PGgp6PH46QVENHuAHc2NT1Su8Q1qov7qIl2jI5tsDpTibwV2zD8539AeWBQySeBU4dhbj9onIl7+1bXQ0wefBg==",
-      "dev": true,
+      "version": "25.8.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-25.8.1.tgz",
+      "integrity": "sha512-GtcP1nMrROZfFg0+mhyj1hamrHvukfF6of2B/pcWxmWkd5FVY1NJib0tlhiorFZRzQN5Z+APLPr7aMolt7i2AQ==",
      "hasInstallScript": true,
      "dependencies": {
        "@electron/get": "^2.0.0",
@@ -1830,16 +1768,16 @@
      }
    },
    "node_modules/electron-builder": {
-      "version": "24.9.1",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.9.1.tgz",
-      "integrity": "sha512-v7BuakDuY6sKMUYM8mfQGrwyjBpZ/ObaqnenU0H+igEL10nc6ht049rsCw2HghRBdEwJxGIBuzs3jbEhNaMDmg==",
+      "version": "24.6.4",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.6.4.tgz",
+      "integrity": "sha512-uNWQoU7pE7qOaIQ6CJHpBi44RJFVG8OHRBIadUxrsDJVwLLo8Nma3K/EEtx5/UyWAQYdcK4nVPYKoRqBb20hbA==",
      "dev": true,
      "dependencies": {
-        "app-builder-lib": "24.9.1",
-        "builder-util": "24.8.1",
-        "builder-util-runtime": "9.2.3",
+        "app-builder-lib": "24.6.4",
+        "builder-util": "24.5.0",
+        "builder-util-runtime": "9.2.1",
        "chalk": "^4.1.2",
-        "dmg-builder": "24.9.1",
+        "dmg-builder": "24.6.4",
        "fs-extra": "^10.1.0",
        "is-ci": "^3.0.0",
        "lazy-val": "^1.0.5",
@@ -1901,19 +1839,6 @@
      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
      "dev": true
    },
-    "node_modules/electron-builder/node_modules/builder-util-runtime": {
-      "version": "9.2.3",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
-      "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.3.4",
-        "sax": "^1.2.4"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
    "node_modules/electron-notarize": {
      "version": "1.2.2",
      "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.2.2.tgz",
@@ -1944,33 +1869,20 @@
      }
    },
    "node_modules/electron-publish": {
-      "version": "24.8.1",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.8.1.tgz",
-      "integrity": "sha512-IFNXkdxMVzUdweoLJNXSupXkqnvgbrn3J4vognuOY06LaS/m0xvfFYIf+o1CM8if6DuWYWoQFKPcWZt/FUjZPw==",
+      "version": "24.5.0",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.5.0.tgz",
+      "integrity": "sha512-zwo70suH15L15B4ZWNDoEg27HIYoPsGJUF7xevLJLSI7JUPC8l2yLBdLGwqueJ5XkDL7ucYyRZzxJVR8ElV9BA==",
      "dev": true,
      "dependencies": {
        "@types/fs-extra": "^9.0.11",
-        "builder-util": "24.8.1",
-        "builder-util-runtime": "9.2.3",
+        "builder-util": "24.5.0",
+        "builder-util-runtime": "9.2.1",
        "chalk": "^4.1.2",
        "fs-extra": "^10.1.0",
        "lazy-val": "^1.0.5",
        "mime": "^2.5.2"
      }
    },
-    "node_modules/electron-publish/node_modules/builder-util-runtime": {
-      "version": "9.2.3",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
-      "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
-      "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",
@@ -2008,7 +1920,6 @@
      "version": "1.4.4",
      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
      "dependencies": {
        "once": "^1.4.0"
      }
@@ -2017,7 +1928,6 @@
      "version": "2.2.1",
      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-      "dev": true,
      "engines": {
        "node": ">=6"
      }
@@ -2041,7 +1951,6 @@
      "version": "4.1.1",
      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-      "dev": true,
      "optional": true
    },
    "node_modules/esbuild": {
@@ -2093,7 +2002,6 @@
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
      "optional": true,
      "engines": {
        "node": ">=10"
@@ -2119,7 +2027,6 @@
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-      "dev": true,
      "dependencies": {
        "debug": "^4.1.1",
        "get-stream": "^5.1.0",
@@ -2160,7 +2067,6 @@
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-      "dev": true,
      "dependencies": {
        "pend": "~1.2.0"
      }
@@ -2277,7 +2183,7 @@
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "devOptional": true
    },
    "node_modules/get-caller-file": {
      "version": "2.0.5",
@@ -2291,7 +2197,6 @@
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "function-bind": "^1.1.1",
@@ -2307,7 +2212,6 @@
      "version": "5.2.0",
      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
      "dependencies": {
        "pump": "^3.0.0"
      },
@@ -2376,7 +2280,6 @@
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
      "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "boolean": "^3.0.1",
@@ -2394,7 +2297,6 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "define-properties": "^1.1.3"
@@ -2410,7 +2312,6 @@
      "version": "11.8.6",
      "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
      "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
-      "dev": true,
      "dependencies": {
        "@sindresorhus/is": "^4.0.0",
        "@szmarczak/http-timer": "^4.0.5",
@@ -2440,7 +2341,7 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
+      "devOptional": true,
      "dependencies": {
        "function-bind": "^1.1.1"
      },
@@ -2461,7 +2362,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "get-intrinsic": "^1.1.1"
@@ -2474,7 +2374,6 @@
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-      "dev": true,
      "optional": true,
      "engines": {
        "node": ">= 0.4"
@@ -2487,7 +2386,6 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
      "optional": true,
      "engines": {
        "node": ">= 0.4"
@@ -2511,8 +2409,7 @@
    "node_modules/http-cache-semantics": {
      "version": "4.1.1",
      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
-      "dev": true
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="
    },
    "node_modules/http-proxy-agent": {
      "version": "5.0.0",
@@ -2532,7 +2429,6 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
-      "dev": true,
      "dependencies": {
        "quick-lru": "^5.1.1",
        "resolve-alpn": "^1.0.0"
@@ -2795,8 +2691,7 @@
    "node_modules/json-buffer": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
    },
    "node_modules/json-parse-even-better-errors": {
      "version": "2.3.1",
@@ -2814,7 +2709,6 @@
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
-      "dev": true,
      "optional": true
    },
    "node_modules/json5": {
@@ -2844,7 +2738,6 @@
      "version": "4.5.2",
      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz",
      "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==",
-      "dev": true,
      "dependencies": {
        "json-buffer": "3.0.1"
      }
@@ -2880,7 +2773,6 @@
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-      "dev": true,
      "engines": {
        "node": ">=8"
      }
@@ -2900,7 +2792,6 @@
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
      "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "escape-string-regexp": "^4.0.0"
@@ -2946,7 +2837,6 @@
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "dev": true,
      "engines": {
        "node": ">=4"
      }
@@ -3069,7 +2959,6 @@
      "version": "6.1.0",
      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-      "dev": true,
      "engines": {
        "node": ">=10"
      },
@@ -3081,7 +2970,6 @@
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
      "optional": true,
      "engines": {
        "node": ">= 0.4"
@@ -3091,7 +2979,6 @@
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
      "dependencies": {
        "wrappy": "1"
      }
@@ -3100,7 +2987,6 @@
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
-      "dev": true,
      "engines": {
        "node": ">=8"
      }
@@ -3180,8 +3066,7 @@
    "node_modules/pend": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-      "dev": true
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
    },
    "node_modules/picomatch": {
      "version": "2.3.1",
@@ -3220,7 +3105,6 @@
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true,
      "engines": {
        "node": ">=0.4.0"
      }
@@ -3242,7 +3126,6 @@
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
      "dependencies": {
        "end-of-stream": "^1.1.0",
        "once": "^1.3.1"
@@ -3261,7 +3144,6 @@
      "version": "5.1.1",
      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-      "dev": true,
      "engines": {
        "node": ">=10"
      },
@@ -3456,14 +3338,12 @@
    "node_modules/resolve-alpn": {
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
-      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
-      "dev": true
+      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="
    },
    "node_modules/responselike": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
-      "dev": true,
      "dependencies": {
        "lowercase-keys": "^2.0.0"
      },
@@ -3499,7 +3379,6 @@
      "version": "2.15.4",
      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
      "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "boolean": "^3.0.1",
@@ -3579,14 +3458,12 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
      "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
-      "dev": true,
      "optional": true
    },
    "node_modules/serialize-error": {
      "version": "7.0.1",
      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
      "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "type-fest": "^0.13.1"
@@ -3602,7 +3479,6 @@
      "version": "0.13.1",
      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
-      "dev": true,
      "optional": true,
      "engines": {
        "node": ">=10"
@@ -3723,7 +3599,6 @@
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
      "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
-      "dev": true,
      "optional": true
    },
    "node_modules/stat-mode": {
@@ -3796,7 +3671,6 @@
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
      "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==",
-      "dev": true,
      "dependencies": {
        "debug": "^4.1.0"
      },
@@ -4066,8 +3940,7 @@
    "node_modules/wrappy": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
    },
    "node_modules/xmlbuilder": {
      "version": "15.1.1",
@@ -4120,7 +3993,6 @@
      "version": "2.10.0",
      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-      "dev": true,
      "dependencies": {
        "buffer-crc32": "~0.2.3",
        "fd-slicer": "~1.1.0"
--- 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": "2.6.13",
+  "version": "2.6.6",
  "appAppleId": "1544027013",
  "private": true,
  "main": "./dist/index.js",
@@ -25,8 +25,8 @@
    "@types/node": "18.16.1",
    "@types/yargs": "^17.0.24",
    "chokidar": "^3.5.3",
-    "electron": "25.9.8",
-    "electron-builder": "^24.9.1",
+    "electron": "25.8.1",
+    "electron-builder": "^24.6.4",
    "electron-builder-notarize": "^1.5.1",
    "esbuild": "^0.17.19",
    "tree-kill": "^1.2.2",
--- a/apps/desktop/src/api/os-integration.ts
+++ b/apps/desktop/src/api/os-integration.ts
@@ -29,8 +29,6 @@ import { dirname } from "path";
 import { resolvePath } from "../utils/resolve-path";
 import { observable } from "@trpc/server/observable";
 import { AssetManager } from "../utils/asset-manager";
-import { isFlatpak } from "../utils";
-import { setupDesktopIntegration } from "../utils/desktop-integration";

 const t = initTRPC.create();

@@ -46,8 +44,6 @@ const NotificationOptions = z.object({
 });

 export const osIntegrationRouter = t.router({
-  isFlatpak: t.procedure.query(() => isFlatpak()),
-
  zoomFactor: t.procedure.query(() => config.zoomFactor),
  setZoomFactor: t.procedure.input(z.number()).mutation(({ input: factor }) => {
    globalThis.window?.webContents.setZoomFactor(factor);
@@ -83,7 +79,6 @@ export const osIntegrationRouter = t.router({
        AutoLaunch.disable();
      }
      config.desktopSettings = settings;
-      setupDesktopIntegration(settings);
    }),

  selectDirectory: t.procedure
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -24,6 +24,7 @@ import { configureAutoUpdater } from "./utils/autoupdater";
 import { getBackgroundColor, getTheme, setTheme } from "./utils/theme";
 import { setupMenu } from "./utils/menu";
 import { WindowState } from "./utils/window-state";
+import { AutoLaunch } from "./utils/autolaunch";
 import { setupJumplist } from "./utils/jumplist";
 import { setupTray } from "./utils/tray";
 import { CLIOptions, parseArguments } from "./cli";
@@ -34,7 +35,6 @@ import { config } from "./utils/config";
 import path from "path";
 import { bringToFront } from "./utils/bring-to-front";
 import { bridge } from "./api/bridge";
-import { setupDesktopIntegration } from "./utils/desktop-integration";

 // only run a single instance
 if (!MAC_APP_STORE && !app.requestSingleInstanceLock()) {
@@ -77,7 +77,7 @@ async function createWindow() {
    darkTheme: getTheme() === "dark",
    backgroundColor: getBackgroundColor(),
    opacity: 0,
-    autoHideMenuBar: false,
+    autoHideMenuBar: true,
    icon: AssetManager.appIcon({
      size: 512,
      format: process.platform === "win32" ? "ico" : "png"
@@ -93,7 +93,6 @@ async function createWindow() {

  createIPCHandler({ router, windows: [mainWindow] });
  globalThis.window = mainWindow;
-  mainWindow.setMenuBarVisibility(false);
  mainWindowState.manage(mainWindow);

  if (cliOptions.hidden && !config.desktopSettings.minimizeToSystemTray)
@@ -107,7 +106,7 @@ async function createWindow() {
  }

  await AssetManager.loadIcons();
-  setupDesktopIntegration(config.desktopSettings);
+  setupDesktopIntegration();

  mainWindow.webContents.session.setSpellCheckerDictionaryDownloadURL(
    "http://dictionaries.notesnook.com/"
@@ -177,3 +176,49 @@ function createURL(options: CLIOptions, path = "/") {

  return url;
 }
+
+function setupDesktopIntegration() {
+  const desktopIntegration = config.desktopSettings;
+
+  if (
+    desktopIntegration.closeToSystemTray ||
+    desktopIntegration.minimizeToSystemTray
+  ) {
+    setupTray();
+  }
+
+  // when close to system tray is enabled, it becomes nigh impossible
+  // to "quit" the app. This is necessary in order to fix that.
+  if (desktopIntegration.closeToSystemTray) {
+    app.on("before-quit", () => app.exit(0));
+  }
+
+  globalThis.window?.once("close", (e) => {
+    if (config.desktopSettings.closeToSystemTray) {
+      e.preventDefault();
+      if (process.platform == "darwin") {
+        // on macOS window cannot be minimized/hidden if it is already fullscreen
+        // so we just close it.
+        if (globalThis.window?.isFullScreen()) app.exit(0);
+        else app.hide();
+      } else {
+        globalThis.window?.minimize();
+        globalThis.window?.hide();
+      }
+    }
+  });
+
+  globalThis.window?.on("minimize", () => {
+    if (config.desktopSettings.minimizeToSystemTray) {
+      if (process.platform == "darwin") {
+        app.hide();
+      } else {
+        globalThis.window?.hide();
+      }
+    }
+  });
+
+  if (desktopIntegration.autoStart) {
+    AutoLaunch.enable(!!desktopIntegration.startMinimized);
+  }
+}
--- a/apps/desktop/src/utils/autolaunch.ts
+++ b/apps/desktop/src/utils/autolaunch.ts
@@ -35,8 +35,6 @@ const LINUX_AUTOSTART_DIRECTORY_PATH = path.join(
  "autostart"
 );

-const STARTUP_ARGS = ["--hidden"];
-
 export class AutoLaunch {
  static enable(hidden: boolean) {
    if (process.platform === "linux") {
@@ -49,14 +47,10 @@ export class AutoLaunch {
        LINUX_DESKTOP_ENTRY(hidden)
      );
    } else {
-      const loginItemSettings = app.getLoginItemSettings({
-        args: STARTUP_ARGS
-      });
-      if (loginItemSettings.openAtLogin) return;
      app.setLoginItemSettings({
        openAtLogin: true,
        openAsHidden: hidden,
-        args: STARTUP_ARGS
+        args: ["--hidden"]
      });
    }
  }
--- a/apps/desktop/src/utils/desktop-integration.ts
+++ b/apps/desktop/src/utils/desktop-integration.ts
@@ -1,74 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-import { app } from "electron";
-import { DesktopIntegration, config } from "./config";
-import { setupTray, destroyTray } from "./tray";
-import { AutoLaunch } from "./autolaunch";
-
-export function setupDesktopIntegration(
-  desktopIntegration: DesktopIntegration
-) {
-  if (
-    desktopIntegration.closeToSystemTray ||
-    desktopIntegration.minimizeToSystemTray
-  ) {
-    setupTray();
-  } else {
-    destroyTray();
-  }
-
-  // when close to system tray is enabled, it becomes nigh impossible
-  // to "quit" the app. This is necessary in order to fix that.
-  app.on("before-quit", () =>
-    desktopIntegration.closeToSystemTray ? app.exit(0) : null
-  );
-
-  globalThis.window?.on("close", (e) => {
-    if (config.desktopSettings.closeToSystemTray) {
-      e.preventDefault();
-      if (process.platform == "darwin") {
-        // on macOS window cannot be minimized/hidden if it is already fullscreen
-        // so we just close it.
-        if (globalThis.window?.isFullScreen()) app.exit(0);
-        else app.hide();
-      } else {
-        try {
-          globalThis.window?.minimize();
-          globalThis.window?.hide();
-        } catch (error) {
-          console.error(error);
-        }
-      }
-    }
-  });
-
-  globalThis.window?.on("minimize", () => {
-    if (config.desktopSettings.minimizeToSystemTray) {
-      if (process.platform == "darwin") {
-        app.hide();
-      } else {
-        globalThis.window?.hide();
-      }
-    }
-  });
-
-  if (desktopIntegration.autoStart) {
-    AutoLaunch.enable(!!desktopIntegration.startMinimized);
-  }
-}
--- a/apps/desktop/src/utils/protocol.ts
+++ b/apps/desktop/src/utils/protocol.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 { protocol } from "electron";
+import { protocol, net } from "electron";
 import { isDevelopment } from "./index";
 import { createReadStream } from "fs";
 import { extname, normalize } from "path";
@@ -62,25 +62,8 @@ function registerProtocol() {
        headers: { "Content-Type": extensionToMimeType[fileExtension] }
      });
    } else {
-      if (request.headers.has("X-Content-Length")) {
-        request.headers.set(
-          "Content-Length",
-          request.headers.get("X-Content-Length") || "0"
-        );
-        request.headers.delete("X-Content-Length");
-      }
-      const headers = Object.fromEntries(request.headers.entries());
-
-      return await fetch(request.url, {
-        signal: request.signal,
-        mode: request.mode,
-        headers,
-        method: request.method,
-        body: request.body,
-        credentials: request.credentials,
-        referrer: (request as any).referrer,
-        duplex: "half",
-        redirect: "manual"
+      return net.fetch(request, {
+        bypassCustomProtocolHandlers: true
      });
    }
  });
--- a/apps/mobile/app/common/database/logger.js
+++ b/apps/mobile/app/common/database/logger.js
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { initalize } from "@notesnook/core/dist/logger";
 import { MMKVLoader } from "react-native-mmkv-storage";
+import { initalize } from "@notesnook/core/dist/logger";
 import { KV } from "./storage";

 const LoggerStorage = new MMKVLoader()
@@ -26,4 +26,4 @@ const LoggerStorage = new MMKVLoader()

 initalize(new KV(LoggerStorage));

-export { LoggerStorage };
+export {};
--- a/apps/mobile/app/common/database/storage.js
+++ b/apps/mobile/app/common/database/storage.js
@@ -90,10 +90,6 @@ export class KV {
    return this.storage.removeItem(key);
  }

-  async removeMulti(keys) {
-    return this.storage.removeItems(...keys);
-  }
-
  async clear() {
    return this.storage.clearStore();
  }
@@ -149,7 +145,6 @@ export default {
  clear: () => DefaultStorage.clear(),
  getAllKeys: () => DefaultStorage.getAllKeys(),
  writeMulti: (items) => DefaultStorage.writeMulti(items),
-  removeMulti: (keys) => DefaultStorage.removeMulti(keys),
  encrypt,
  decrypt,
  decryptMulti,
--- a/apps/mobile/app/common/filesystem/download.js
+++ b/apps/mobile/app/common/filesystem/download.js
@@ -96,22 +96,16 @@ export async function downloadFile(filename, data, cancelToken) {
 }

 export async function getUploadedFileSize(hash) {
-  try {
-    const url = `${hosts.API_HOST}/s3?name=${hash}`;
-    const token = await db.user.tokenManager.getAccessToken();
+  const url = `${hosts.API_HOST}/s3?name=${hash}`;
+  const token = await db.user.tokenManager.getAccessToken();

-    const attachmentInfo = await fetch(url, {
-      method: "HEAD",
-      headers: { Authorization: `Bearer ${token}` }
-    });
+  const attachmentInfo = await fetch(url, {
+    method: "HEAD",
+    headers: { Authorization: `Bearer ${token}` }
+  });

-    const contentLength = parseInt(
-      attachmentInfo.headers?.get("content-length")
-    );
-    return isNaN(contentLength) ? 0 : contentLength;
-  } catch (e) {
-    return 0;
-  }
+  const contentLength = parseInt(attachmentInfo.headers?.get("content-length"));
+  return isNaN(contentLength) ? 0 : contentLength;
 }

 export async function checkAttachment(hash) {
--- a/apps/mobile/app/components/announcements/index.js
+++ b/apps/mobile/app/components/announcements/index.js
@@ -34,69 +34,10 @@ import BaseDialog from "../dialog/base-dialog";
 import { allowedOnPlatform, renderItem } from "./functions";
 import { useCallback } from "react";

-/**
- * Test announcement
- * {
-    id: "some-announcement",
-    type: "dialog",
-    body: [
-      {
-        type: "title",
-        text: "This is a title",
-        platforms: ["all"]
-      },
-      {
-        type: "description",
-        text: "Most of you are too busy to keep up to date with what's happening in Notesnook. That is unfortunate because Notesnook has come a looooong way.",
-        style: {
-          marginBottom: 1
-        },
-        platforms: ["all"]
-      },
-      {
-        type: "description",
-        text: "To solve this, we are launching the Notesnook Digest — a newsletter to help you stay updated about Notesnook development. And to keep things interesting I'll also sprinkle this newsletter with other interesting stuff like privacy tips & news, interesting books, things I am looking forward to etc.",
-        style: {
-          marginBottom: 1
-        },
-        platforms: ["all"]
-      },
-      {
-        type: "description",
-        text: "So be sure to subscribe. There won't be a proper schedule to this (yet) maybe once or twice a month. I promise no spam — only more awesomeness.",
-        style: {
-          marginBottom: 1
-        },
-        platforms: ["all"]
-      },
-      {
-        type: "description",
-        text: "— May privacy reign.",
-        style: {
-          marginBottom: 1
-        },
-        platforms: ["all"]
-      },
-      {
-        type: "callToActions",
-        actions: [
-          {
-            type: "promo",
-            title: "15% Off",
-            platforms: ["android"],
-            data: "com.streetwriters.notesnook.sub.yr.15"
-          }
-        ],
-        platforms: ["all"]
-      }
-    ]
-  }
- */
-
 export const AnnouncementDialog = () => {
  const { colors } = useThemeColors();
  const [visible, setVisible] = useState(false);
-  const [info, setInfo] = useState();
+  const [info, setInfo] = useState(null);
  const remove = useMessageStore((state) => state.remove);

  useEffect(() => {
@@ -110,9 +51,7 @@ export const AnnouncementDialog = () => {

  const open = (data) => {
    setInfo(data);
-    setImmediate(() => {
-      setVisible(true);
-    });
+    setVisible(true);
  };

  const close = useCallback(() => {
--- a/apps/mobile/app/components/auth/auth-modal.js
+++ b/apps/mobile/app/components/auth/auth-modal.js
@@ -17,16 +17,14 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect, useRef, useState } from "react";
 import { Platform, View } from "react-native";
-import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
 import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
 import {
  eSubscribeEvent,
  eUnSubscribeEvent
 } from "../../services/event-manager";
-import { useUserStore } from "../../stores/use-user-store";
+import { useThemeColors } from "@notesnook/theme";
 import { eCloseLoginDialog, eOpenLoginDialog } from "../../utils/events";
 import { sleep } from "../../utils/time";
 import BaseDialog from "../dialog/base-dialog";
@@ -36,6 +34,7 @@ import { IconButton } from "../ui/icon-button";
 import { hideAuth, initialAuthMode } from "./common";
 import { Login } from "./login";
 import { Signup } from "./signup";
+import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";

 export const AuthMode = {
  login: 0,
@@ -69,9 +68,6 @@ const AuthModal = () => {
  }

  const close = () => {
-    useUserStore.setState({
-      disableAppLockRequests: false
-    });
    actionSheetRef.current?.hide();
    setCurrentAuthMode(AuthMode.login);
    setVisible(false);
@@ -81,11 +77,6 @@ const AuthModal = () => {
    <BaseDialog
      overlayOpacity={0}
      statusBarTranslucent={false}
-      onShow={() => {
-        useUserStore.setState({
-          disableAppLockRequests: true
-        });
-      }}
      onRequestClose={currentAuthMode !== AuthMode.welcomeSignup && close}
      visible={true}
      onClose={close}
@@ -94,14 +85,11 @@ const AuthModal = () => {
      background={colors.primary.background}
      transparent={false}
      animated={false}
-      centered={false}
-      enableSheetKeyboardHandler
    >
      <KeyboardAwareScrollView
        style={{
          width: "100%"
        }}
-        enableAutomaticScroll={false}
        keyboardShouldPersistTaps="handled"
      >
        {currentAuthMode !== AuthMode.login ? (
--- a/apps/mobile/app/components/auth/session-expired.js
+++ b/apps/mobile/app/components/auth/session-expired.js
@@ -69,8 +69,7 @@ export const SessionExpired = () => {
      eSendEvent(eUserLoggedIn, true);
      setVisible(false);
      setFocused(false);
-    },
-    true
+    }
  );

  const logout = async () => {
@@ -143,9 +142,9 @@ export const SessionExpired = () => {
          passwordInputRef.current?.focus();
          setFocused(true);
        }}
-        enableSheetKeyboardHandler={true}
        visible={true}
      >
+        <SheetProvider context="two_factor_verify" />
        <View
          style={{
            width: focused ? "100%" : "99.9%",
@@ -238,8 +237,6 @@ export const SessionExpired = () => {
        </View>
        <Toast context="local" />
        <Dialog context="session_expiry" />
-
-        <SheetProvider context="two_factor_verify" />
      </BaseDialog>
    )
  );
--- a/apps/mobile/app/components/auth/use-login.js
+++ b/apps/mobile/app/components/auth/use-login.js
@@ -33,7 +33,7 @@ export const LoginSteps = {
  passwordAuth: 3
 };

-export const useLogin = (onFinishLogin, sessionExpired = false) => {
+export const useLogin = (onFinishLogin) => {
  const [error, setError] = useState(false);
  const [loading, setLoading] = useState(false);
  const setUser = useUserStore((state) => state.setUser);
@@ -69,7 +69,6 @@ export const useLogin = (onFinishLogin, sessionExpired = false) => {
      switch (step) {
        case LoginSteps.emailAuth: {
          const mfaInfo = await db.user.authenticateEmail(email.current);
-          console.log("email auth", mfaInfo);
          if (mfaInfo) {
            TwoFactorVerification.present(async (mfa, callback) => {
              try {
@@ -102,12 +101,7 @@ export const useLogin = (onFinishLogin, sessionExpired = false) => {
          break;
        }
        case LoginSteps.passwordAuth: {
-          await db.user.authenticatePassword(
-            email.current,
-            password.current,
-            null,
-            sessionExpired
-          );
+          await db.user.authenticatePassword(email.current, password.current);
          finishLogin();
          break;
        }
--- a/apps/mobile/app/components/dialog/base-dialog.js
+++ b/apps/mobile/app/components/dialog/base-dialog.js
@@ -51,8 +51,7 @@ const BaseDialog = ({
  bounce = true,
  closeOnTouch = true,
  useSafeArea = true,
-  avoidKeyboardResize = false,
-  enableSheetKeyboardHandler = false
+  avoidKeyboardResize = false
 }) => {
  const floating = useIsFloatingKeyboard();
  const appState = useAppState();
@@ -66,7 +65,6 @@ const BaseDialog = ({
  }, []);

  useEffect(() => {
-    if (useUserStore.getState().disableAppLockRequests) return;
    if (SettingsService.get().appLockMode === "background") {
      if (appState === "background") {
        setIntervalVisible(false);
@@ -105,9 +103,7 @@ const BaseDialog = ({
          if (lockEvents.current) return;
          if (onShow) {
            onShow();
-            if (!enableSheetKeyboardHandler) {
-              useSettingStore.getState().setSheetKeyboardHandler(false);
-            }
+            useSettingStore.getState().setSheetKeyboardHandler(false);
          }
        }}
        animationType={animation}
@@ -138,7 +134,6 @@ const BaseDialog = ({
              style={[
                styles.backdrop,
                {
-                  alignItems: centered ? "center" : undefined,
                  justifyContent: centered
                    ? "center"
                    : bottom
--- a/apps/mobile/app/components/dialogs/vault/index.js
+++ b/apps/mobile/app/components/dialogs/vault/index.js
@@ -442,7 +442,6 @@ export class VaultDialog extends Component {
      if (this.state.biometricUnlock && !this.state.isBiometryEnrolled) {
        await this._enrollFingerprint(this.password);
      }
-
      if (this.state.goToEditor) {
        this._openInEditor(note);
      } else if (this.state.share) {
@@ -453,6 +452,7 @@ export class VaultDialog extends Component {
        await this._copyNote(note);
      }
    } catch (e) {
+      console.log(e);
      this._takeErrorAction(e);
    }
  };
--- a/apps/mobile/app/components/list-items/note/index.js
+++ b/apps/mobile/app/components/list-items/note/index.js
@@ -99,8 +99,8 @@ const NoteItem = ({
  dateBy = "dateCreated",
  noOpen = false
 }) => {
-  const isEditingNote = useEditorStore(
-    (state) => state.currentEditingNote === item.id
+  const currentEditingNote = useEditorStore(
+    (state) => state.currentEditingNote
  );
  const { colors } = useThemeColors();
  const compactMode = useIsCompactModeEnabled(item);
@@ -112,7 +112,8 @@ const NoteItem = ({
  const reminder = getUpcomingReminder(reminders);
  const noteColor = ColorValues[item.color?.toLowerCase()];
  const tags = getTags(item);
-  const primaryColors = isEditingNote ? colors.selected : colors.primary;
+  const primaryColors =
+    currentEditingNote === item.id ? colors.selected : colors.primary;

  return (
    <>
--- a/apps/mobile/app/components/list-items/selection-wrapper/back-fill.js
+++ b/apps/mobile/app/components/list-items/selection-wrapper/back-fill.js
@@ -25,13 +25,13 @@ import { useEditorStore } from "../../../stores/use-editor-store";

 export const Filler = ({ item }) => {
  const { colors } = useThemeColors();
-  const isEditingNote = useEditorStore(
-    (state) => state.currentEditingNote === item.id
+  const currentEditingNote = useEditorStore(
+    (state) => state.currentEditingNote
  );

  const [selected] = useIsSelected(item);

-  return isEditingNote || selected ? (
+  return currentEditingNote === item.id || selected ? (
    <View
      style={{
        position: "absolute",
@@ -39,11 +39,12 @@ export const Filler = ({ item }) => {
        height: "150%",
        backgroundColor: colors.selected.background,
        borderLeftWidth: 5,
-        borderLeftColor: isEditingNote
-          ? item.color
-            ? colors.static[item.color]
-            : colors.selected.accent
-          : "transparent"
+        borderLeftColor:
+          currentEditingNote === item.id
+            ? item.color
+              ? colors.static[item.color]
+              : colors.selected.accent
+            : "transparent"
      }}
      collapsable={false}
    />
--- a/apps/mobile/app/components/list-items/selection-wrapper/index.js
+++ b/apps/mobile/app/components/list-items/selection-wrapper/index.js
@@ -43,9 +43,6 @@ const SelectionWrapper = ({

  const onLongPress = () => {
    if (!useSelectionStore.getState().selectionMode) {
-      useSelectionStore.setState({
-        selectedItemsList: []
-      });
      useSelectionStore.getState().setSelectionMode(true);
    }
    useSelectionStore.getState().setSelectedItem(item);
--- a/apps/mobile/app/components/merge-conflicts/index.js
+++ b/apps/mobile/app/components/merge-conflicts/index.js
@@ -254,7 +254,6 @@ const MergeConflicts = () => {
      onRequestClose={() => {
        close();
      }}
-      centered={false}
      background={colors?.primary.background}
      supportedOrientations={[
        "portrait",
--- a/apps/mobile/app/components/premium/component.js
+++ b/apps/mobile/app/components/premium/component.js
@@ -165,12 +165,7 @@ export const Component = ({ close, promo }) => {
            }}
            size={SIZE.md}
          >
-            (
-            {Platform.OS === "android"
-              ? pricing.product?.subscriptionOfferDetails[0].pricingPhases
-                  .pricingPhaseList?.[0].formattedPrice
-              : pricing.product?.localizedPrice}{" "}
-            / mo)
+            ({pricing?.product?.localizedPrice} / mo)
          </Paragraph>
        )}

--- a/apps/mobile/app/components/premium/expiring.js
+++ b/apps/mobile/app/components/premium/expiring.js
@@ -48,23 +48,23 @@ export const Expiring = () => {
  const [visible, setVisible] = useState(false);
  const [status, setStatus] = useState({
    title: "Your trial is ending soon",
-    offer: "Get 30% off",
+    offer: null,
    extend: true
  });
  const pricing = usePricing("yearly");
-  const promo =
-    status.offer && pricing?.info
-      ? {
-          promoCode:
-            pricing?.info?.discount > 30
-              ? pricing.info.sku
-              : "com.streetwriters.notesnook.sub.yr.trialoffer",
-          text: `GET ${
-            pricing?.info?.discount > 30 ? pricing?.info?.discount : 30
-          }% OFF on yearly`,
-          discount: pricing?.info?.discount > 30 ? pricing?.info?.discount : 30
-        }
-      : null;
+
+  const promo = status.offer
+    ? {
+        promoCode:
+          pricing?.info?.discount > 30
+            ? pricing.info.sku
+            : "com.streetwriters.notesnook.sub.yr.trialoffer",
+        text: `GET ${
+          pricing?.info?.discount > 30 ? pricing?.info?.discount : 30
+        }% OFF on yearly`,
+        discount: pricing?.info?.discount > 30 ? pricing?.info?.discount : 30
+      }
+    : null;

  useEffect(() => {
    eSubscribeEvent(eOpenTrialEndingDialog, open);
--- a/apps/mobile/app/components/premium/pricing-item.tsx
+++ b/apps/mobile/app/components/premium/pricing-item.tsx
@@ -18,29 +18,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 import React from "react";
-import { Platform, View } from "react-native";
+import { View } from "react-native";
 import { SIZE } from "../../utils/size";
 import { PressableButton } from "../ui/pressable";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
-import RNIap from "react-native-iap";

-export const PricingItem = ({
-  product,
-  onPress,
-  compact,
-  strikethrough
-}: {
-  product: {
-    type: "yearly" | "monthly";
-    data?: RNIap.Subscription;
-    info: string;
-    offerType?: "yearly" | "monthly";
-  };
-  strikethrough?: boolean;
-  onPress?: () => void;
-  compact?: boolean;
-}) => {
+export const PricingItem = ({ product, onPress, compact }) => {
  return (
    <PressableButton
      onPress={onPress}
@@ -52,10 +36,8 @@ export const PricingItem = ({
        paddingHorizontal: 12,
        paddingVertical: compact ? 15 : 10,
        width: compact ? null : "100%",
-        minWidth: 150,
-        opacity: strikethrough ? 0.7 : 1
+        minWidth: 150
      }}
-      disabled={strikethrough}
    >
      {!compact && (
        <View>
@@ -71,25 +53,8 @@ export const PricingItem = ({
      )}

      <View>
-        <Paragraph
-          style={{
-            textDecorationLine: strikethrough ? "line-through" : undefined
-          }}
-          size={SIZE.sm}
-        >
-          <Heading
-            style={{
-              textDecorationLine: strikethrough ? "line-through" : undefined
-            }}
-            size={SIZE.lg - 2}
-          >
-            {Platform.OS === "android"
-              ? (product.data as RNIap.SubscriptionAndroid | undefined)
-                  ?.subscriptionOfferDetails[0].pricingPhases
-                  .pricingPhaseList?.[0]?.formattedPrice
-              : (product.data as RNIap.SubscriptionIOS | undefined)
-                  ?.localizedPrice}
-          </Heading>
+        <Paragraph size={SIZE.sm}>
+          <Heading size={SIZE.lg - 2}>{product?.data?.localizedPrice}/</Heading>
          {product?.type === "yearly" || product?.offerType === "yearly"
            ? "/year"
            : "/month"}
--- a/apps/mobile/app/components/premium/pricing-plans.tsx
+++ b/apps/mobile/app/components/premium/pricing-plans.tsx
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import React, { useCallback, useEffect, useState } from "react";
 import { ActivityIndicator, Platform, Text, View } from "react-native";
 import * as RNIap from "react-native-iap";
-import { DatabaseLogger, db } from "../../common/database";
+import { db } from "../../common/database";
 import { usePricing } from "../../hooks/use-pricing";
 import {
  eSendEvent,
@@ -47,29 +47,11 @@ import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { Walkthrough } from "../walkthroughs";
 import { PricingItem } from "./pricing-item";
-import { useSettingStore } from "../../stores/use-setting-store";
-
-const UUID_PREFIX = "0bdaea";
-const UUID_VERSION = "4";
-const UUID_VARIANT = "a";
-
-function toUUID(str: string) {
-  return [
-    UUID_PREFIX + str.substring(0, 2), // 6 digit prefix + first 2 oid digits
-    str.substring(2, 6), // # next 4 oid digits
-    UUID_VERSION + str.substring(6, 9), // # 1 digit version(0x4) + next 3 oid digits
-    UUID_VARIANT + str.substring(9, 12), // # 1 digit variant(0b101) + 1 zero bit + next 3 oid digits
-    str.substring(12)
-  ].join("-");
-}

 const promoCyclesMonthly = {
  1: "first month",
  2: "first 2 months",
-  3: "first 3 months",
-  4: "first 4 months",
-  5: "first 5 months",
-  6: "first 3 months"
+  3: "first 3 months"
 };

 const promoCyclesYearly = {
@@ -83,24 +65,10 @@ export const PricingPlans = ({
  marginTop,
  heading = true,
  compact = false
-}: {
-  promo?: {
-    promoCode: string;
-  };
-  marginTop?: any;
-  heading?: boolean;
-  compact?: boolean;
 }) => {
  const { colors } = useThemeColors();
  const user = useUserStore((state) => state.user);
-  const [product, setProduct] = useState<{
-    type: string;
-    offerType: "monthly" | "yearly";
-    data: RNIap.Subscription;
-    cycleText: string;
-    info: string;
-  }>();
-
+  const [product, setProduct] = useState(null);
  const [buying, setBuying] = useState(false);
  const [loading, setLoading] = useState(false);
  const userCanRequestTrial =
@@ -122,40 +90,27 @@ export const PricingPlans = ({
    }
  }, [promo?.promoCode]);

-  const getPromo = async (code: string) => {
+  const getPromo = async (code) => {
    try {
-      let skuId: string;
+      let productId;
      if (code.startsWith("com.streetwriters.notesnook")) {
-        skuId = code;
+        productId = code;
      } else {
-        skuId = await db.offers?.getCode(code.split(":")[0], Platform.OS);
+        productId = await db.offers.getCode(code.split(":")[0], Platform.OS);
      }

-      const products = await PremiumService.getProducts();
-      const product = products.find((p) => p.productId === skuId);
+      let products = await PremiumService.getProducts();
+      let product = products.find((p) => p.productId === productId);
      if (!product) return false;
-      const isMonthly = product.productId.indexOf(".mo") > -1;
-
-      const cycleText = isMonthly
+      let isMonthly = product.productId.indexOf(".mo") > -1;
+      let cycleText = isMonthly
        ? promoCyclesMonthly[
-            (Platform.OS === "android"
-              ? (product as RNIap.SubscriptionAndroid)
-                  .subscriptionOfferDetails[0]?.pricingPhases
-                  .pricingPhaseList?.[0].billingCycleCount
-              : parseInt(
-                  (product as RNIap.SubscriptionIOS)
-                    .introductoryPriceNumberOfPeriodsIOS as string
-                )) as keyof typeof promoCyclesMonthly
+            product.introductoryPriceCyclesAndroid ||
+              product.introductoryPriceNumberOfPeriodsIOS
          ]
        : promoCyclesYearly[
-            (Platform.OS === "android"
-              ? (product as RNIap.SubscriptionAndroid)
-                  .subscriptionOfferDetails[0]?.pricingPhases
-                  .pricingPhaseList?.[0].billingCycleCount
-              : parseInt(
-                  (product as RNIap.SubscriptionIOS)
-                    .introductoryPriceNumberOfPeriodsIOS as string
-                )) as keyof typeof promoCyclesYearly
+            product.introductoryPriceCyclesAndroid ||
+              product.introductoryPriceNumberOfPeriodsIOS
          ];

      setProduct({
@@ -163,7 +118,7 @@ export const PricingPlans = ({
        offerType: isMonthly ? "monthly" : "yearly",
        data: product,
        cycleText: cycleText,
-        info: `Pay ${isMonthly ? "monthly" : "yearly"}, cancel anytime`
+        info: "Pay monthly, cancel anytime"
      });
      return true;
    } catch (e) {
@@ -176,41 +131,22 @@ export const PricingPlans = ({
    getSkus();
  }, [getSkus]);

-  const buySubscription = async (product: RNIap.Subscription) => {
-    if (buying || !product) return;
+  const buySubscription = async (product) => {
+    if (buying) return;
    setBuying(true);
    try {
      if (!user) {
        setBuying(false);
        return;
      }
-      useSettingStore.getState().setAppDidEnterBackgroundForAction(true);
-      const androidOfferToken =
-        Platform.OS === "android"
-          ? (product as RNIap.SubscriptionAndroid).subscriptionOfferDetails[0]
-              .offerToken
-          : null;
-
-      DatabaseLogger.info(
-        `Subscription Requested initiated for user ${toUUID(user.id)}`
+      await RNIap.requestSubscription(
+        product?.productId,
+        false,
+        null,
+        -1,
+        user.id,
+        user.id
      );
-
-      await RNIap.requestSubscription({
-        sku: product?.productId,
-        obfuscatedAccountIdAndroid: user.id,
-        obfuscatedProfileIdAndroid: user.id,
-        appAccountToken: toUUID(user.id),
-        andDangerouslyFinishTransactionAutomaticallyIOS: false,
-        subscriptionOffers: androidOfferToken
-          ? [
-              {
-                offerToken: androidOfferToken,
-                sku: product?.productId
-              }
-            ]
-          : undefined
-      });
-      useSettingStore.getState().setAppDidEnterBackgroundForAction(false);
      setBuying(false);
      eSendEvent(eCloseSheet);
      eSendEvent(eClosePremiumDialog);
@@ -231,35 +167,6 @@ export const PricingPlans = ({
    }
  };

-  function getStandardPrice() {
-    if (!product) return;
-    const productType = product.offerType;
-
-    if (Platform.OS === "android") {
-      const pricingPhaseListItem = (product.data as RNIap.SubscriptionAndroid)
-        ?.subscriptionOfferDetails[0]?.pricingPhases.pricingPhaseList?.[1];
-
-      if (!pricingPhaseListItem) {
-        const product =
-          productType === "monthly"
-            ? monthlyPlan?.product
-            : yearlyPlan?.product;
-        return (product as RNIap.SubscriptionAndroid)
-          ?.subscriptionOfferDetails[0]?.pricingPhases.pricingPhaseList?.[0]
-          ?.formattedPrice;
-      }
-
-      return pricingPhaseListItem?.formattedPrice;
-    } else {
-      const productDefault =
-        productType === "monthly" ? monthlyPlan?.product : yearlyPlan?.product;
-      return (
-        (product.data as RNIap.SubscriptionIOS)?.localizedPrice ||
-        (productDefault as RNIap.SubscriptionIOS)?.localizedPrice
-      );
-    }
-  }
-
  return loading ? (
    <View
      style={{
@@ -291,14 +198,7 @@ export const PricingPlans = ({
            }}
            size={SIZE.lg}
          >
-            {(Platform.OS === "android"
-              ? (monthlyPlan?.product as RNIap.SubscriptionAndroid | undefined)
-                  ?.subscriptionOfferDetails[0]?.pricingPhases
-                  .pricingPhaseList?.[0]?.formattedPrice
-              : (monthlyPlan?.product as RNIap.SubscriptionIOS | undefined)
-                  ?.localizedPrice) ||
-              (PremiumService.getMontlySub() as any)?.localizedPrice}
-            / mo
+            {PremiumService.getMontlySub().localizedPrice} / mo
          </Paragraph>
          <Button
            onPress={() => {
@@ -318,7 +218,7 @@ export const PricingPlans = ({
          <Button
            onPress={async () => {
              try {
-                await db.user?.activateTrial();
+                await db.user.activateTrial();
                eSendEvent(eClosePremiumDialog);
                eSendEvent(eCloseSheet);
                await sleep(300);
@@ -339,91 +239,33 @@ export const PricingPlans = ({
      ) : (
        <>
          {product?.type === "promo" ? (
-            <View
+            <Heading
              style={{
                paddingVertical: 15,
-                alignItems: "center"
+                alignSelf: "center",
+                textAlign: "center"
              }}
+              size={SIZE.lg - 4}
            >
-              {product?.offerType === "monthly" ? (
-                <PricingItem
-                  product={{
-                    type: "monthly",
-                    data: monthlyPlan?.product,
-                    info: "Pay once a month, cancel anytime."
-                  }}
-                  strikethrough={true}
-                />
-              ) : (
-                <PricingItem
-                  onPress={() => {
-                    if (!monthlyPlan?.product) return;
-                    buySubscription(monthlyPlan?.product);
-                  }}
-                  product={{
-                    type: "yearly",
-                    data: yearlyPlan?.product,
-                    info: "Pay once a year, cancel anytime."
-                  }}
-                  strikethrough={true}
-                />
-              )}
-
-              <Heading
+              {product.data.introductoryPrice}
+              <Paragraph
                style={{
-                  paddingTop: 15,
-                  fontSize: SIZE.lg
+                  textDecorationLine: "line-through",
+                  color: colors.secondary.paragraph
                }}
+                size={SIZE.sm}
              >
-                Special offer for you
-              </Heading>
-
-              <View
-                style={{
-                  paddingVertical: 20,
-                  paddingBottom: 10
-                }}
-              >
-                <Heading
-                  style={{
-                    alignSelf: "center",
-                    textAlign: "center"
-                  }}
-                  size={SIZE.xxl}
-                >
-                  {Platform.OS === "android"
-                    ? (product.data as RNIap.SubscriptionAndroid)
-                        ?.subscriptionOfferDetails[0].pricingPhases
-                        .pricingPhaseList?.[0]?.formattedPrice
-                    : (product.data as RNIap.SubscriptionIOS)
-                        ?.introductoryPrice ||
-                      (product.data as RNIap.SubscriptionIOS)
-                        ?.localizedPrice}{" "}
-                  {product?.cycleText
-                    ? `for ${product.cycleText}`
-                    : product?.offerType}
-                </Heading>
-                {product?.cycleText ? (
-                  <Paragraph
-                    style={{
-                      color: colors.secondary.paragraph,
-                      alignSelf: "center",
-                      textAlign: "center"
-                    }}
-                    size={SIZE.md}
-                  >
-                    then {getStandardPrice()} {product?.offerType}.
-                  </Paragraph>
-                ) : null}
-              </View>
-            </View>
+                ({product.data.localizedPrice})
+              </Paragraph>{" "}
+              for {product.cycleText}
+            </Heading>
          ) : null}

          {user && !product ? (
            <>
-              {heading || (monthlyPlan?.info?.discount || 0) > 0 ? (
+              {heading || monthlyPlan?.info?.discount > 0 ? (
                <>
-                  {monthlyPlan && (monthlyPlan?.info?.discount || 0) > 0 ? (
+                  {monthlyPlan && monthlyPlan?.info?.discount > 0 ? (
                    <View
                      style={{
                        alignSelf: "center",
@@ -431,12 +273,7 @@ export const PricingPlans = ({
                        marginBottom: 20
                      }}
                    >
-                      <Heading
-                        style={{
-                          textAlign: "center"
-                        }}
-                        color={colors.primary.accent}
-                      >
+                      <Heading color={colors.primary.accent}>
                        Get {monthlyPlan?.info?.discount}% off in{" "}
                        {monthlyPlan?.info?.country}
                      </Heading>
@@ -463,15 +300,12 @@ export const PricingPlans = ({
                }}
              >
                <PricingItem
-                  onPress={() => {
-                    if (!monthlyPlan?.product) return;
-                    buySubscription(monthlyPlan?.product);
-                  }}
+                  onPress={() => buySubscription(monthlyPlan?.product)}
                  compact={compact}
                  product={{
                    type: "monthly",
                    data: monthlyPlan?.product,
-                    info: "Pay once a month, cancel anytime."
+                    info: "Pay monthly, cancel anytime."
                  }}
                />

@@ -485,15 +319,12 @@ export const PricingPlans = ({
                )}

                <PricingItem
-                  onPress={() => {
-                    if (!yearlyPlan?.product) return;
-                    buySubscription(yearlyPlan?.product);
-                  }}
+                  onPress={() => buySubscription(yearlyPlan?.product)}
                  compact={compact}
                  product={{
                    type: "yearly",
                    data: yearlyPlan?.product,
-                    info: "Pay once a year, cancel anytime."
+                    info: "Pay yearly"
                  }}
                />
              </View>
@@ -515,7 +346,7 @@ export const PricingPlans = ({
                        eSendEvent(eCloseSimpleDialog);
                        setBuying(true);
                        try {
-                          if (!(await getPromo(value as string)))
+                          if (!(await getPromo(value)))
                            throw new Error("Error applying promo code");
                          ToastEvent.show({
                            heading: "Discount applied!",
@@ -527,7 +358,7 @@ export const PricingPlans = ({
                          setBuying(false);
                          ToastEvent.show({
                            heading: "Promo code invalid or expired",
-                            message: (e as Error).message,
+                            message: e.message,
                            type: "error",
                            context: "local"
                          });
@@ -565,7 +396,7 @@ export const PricingPlans = ({
                    width={250}
                    style={{
                      paddingHorizontal: 12,
-                      marginTop: product?.type === "promo" ? 0 : 30,
+                      marginTop: 30,
                      marginBottom: 10
                    }}
                  />
@@ -596,10 +427,7 @@ export const PricingPlans = ({
              ) : (
                <>
                  <Button
-                    onPress={() => {
-                      if (!product?.data) return;
-                      buySubscription(product.data);
-                    }}
+                    onPress={() => buySubscription(product.data)}
                    height={40}
                    width="50%"
                    type="accent"
@@ -608,7 +436,7 @@ export const PricingPlans = ({

                  <Button
                    onPress={() => {
-                      setProduct(undefined);
+                      setProduct(null);
                    }}
                    style={{
                      marginTop: 5
@@ -695,7 +523,7 @@ export const PricingPlans = ({
              <Paragraph
                size={SIZE.xs}
                onPress={() => {
-                  openLinkInBrowser("https://notesnook.com/tos")
+                  openLinkInBrowser("https://notesnook.com/tos", colors)
                    .catch(() => {})
                    .then(() => {});
                }}
@@ -710,7 +538,7 @@ export const PricingPlans = ({
              <Paragraph
                size={SIZE.xs}
                onPress={() => {
-                  openLinkInBrowser("https://notesnook.com/privacy")
+                  openLinkInBrowser("https://notesnook.com/privacy", colors)
                    .catch(() => {})
                    .then(() => {});
                }}
--- a/apps/mobile/app/components/sheets/add-to/filtered-list.js
+++ b/apps/mobile/app/components/sheets/add-to/filtered-list.js
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 import React, { useCallback, useEffect, useRef, useState } from "react";
-import { FlashList } from "react-native-actions-sheet";
+import { FlatList } from "react-native-actions-sheet";
 import { db } from "../../../common/database";
 import { ListHeaderInputItem } from "./list-header-item.js";

@@ -54,7 +54,7 @@ export const FilteredList = ({
  }, [data, onChangeText]);

  return (
-    <FlashList
+    <FlatList
      {...restProps}
      data={filtered}
      ref={listRef}
--- a/apps/mobile/app/components/sheets/add-to/index.js
+++ b/apps/mobile/app/components/sheets/add-to/index.js
@@ -161,6 +161,9 @@ const MoveNoteSheet = ({ note, actionSheetRef }) => {
          : "deselected";
        if (itemState[notebook.id] === "selected") {
          count++;
+          contextValue.select(notebook);
+        } else {
+          contextValue.deselect(notebook);
        }
        for (let topic of notebook.topics) {
          itemState[topic.id] = state
@@ -173,6 +176,9 @@ const MoveNoteSheet = ({ note, actionSheetRef }) => {
            : "deselected";
          if (itemState[topic.id] === "selected") {
            count++;
+            contextValue.select(topic);
+          } else {
+            contextValue.deselect(topic);
          }
        }
      }
@@ -183,7 +189,7 @@ const MoveNoteSheet = ({ note, actionSheetRef }) => {
      }
      useItemSelectionStore.getState().setItemState(itemState);
    },
-    [getSelectedNotesCountInItem, selectedItemsList]
+    [contextValue, getSelectedNotesCountInItem, selectedItemsList]
  );

  const getItemsForItem = (item) => {
@@ -208,7 +214,7 @@ const MoveNoteSheet = ({ note, actionSheetRef }) => {
  }

  const updateItemState = useCallback(function (item, state) {
-    const itemState = { ...useItemSelectionStore.getState().itemState };
+    const itemState = useItemSelectionStore.getState().itemState;
    const mergeState = {
      [item.id]: state
    };
@@ -364,93 +370,56 @@ const MoveNoteSheet = ({ note, actionSheetRef }) => {
        </View>

        <SelectionProvider value={contextValue}>
-          <View
+          <FilteredList
            style={{
              paddingHorizontal: 12,
-              maxHeight: dimensions.height * 0.85,
-              height: 50 * (notebooks.length + 2)
+              maxHeight: dimensions.height * 0.85
            }}
-          >
-            <FilteredList
-              ListEmptyComponent={
-                notebooks.length > 0 ? null : (
-                  <View
-                    style={{
-                      width: "100%",
-                      height: "100%",
-                      justifyContent: "center",
-                      alignItems: "center"
-                    }}
-                  >
-                    <Icon
-                      name="book-outline"
-                      color={colors.primary.icon}
-                      size={100}
-                    />
-                    <Paragraph style={{ marginBottom: 10 }}>
-                      You do not have any notebooks.
-                    </Paragraph>
-                  </View>
-                )
-              }
-              estimatedItemSize={50}
-              data={notebooks}
-              hasHeaderSearch={true}
-              renderItem={({ item, index }) => (
-                <ListItem
-                  item={item}
-                  key={item.id}
-                  index={index}
-                  hasNotes={getSelectedNotesCountInItem(item) > 0}
-                  sheetRef={actionSheetRef}
-                  infoText={
-                    <>
-                      {item.topics.length === 1
-                        ? item.topics.length + " topic"
-                        : item.topics.length + " topics"}
-                    </>
-                  }
-                  getListItems={getItemsForItem}
-                  getSublistItemProps={(topic) => ({
-                    hasNotes: getSelectedNotesCountInItem(topic) > 0,
-                    style: {
-                      marginBottom: 0,
-                      height: 40
-                    },
-                    onPress: (item) => {
-                      const itemState =
-                        useItemSelectionStore.getState().itemState;
-                      const currentState = itemState[item.id];
-                      if (currentState !== "selected") {
-                        resetItemState("deselected");
-                        contextValue.select(item);
-                      } else {
-                        contextValue.deselect(item);
-                      }
-                    },
-                    key: item.id,
-                    type: "transparent"
-                  })}
-                  icon={(expanded) => ({
-                    name: expanded ? "chevron-up" : "chevron-down",
-                    color: expanded
-                      ? colors.primary.accent
-                      : colors.primary.paragraph
-                  })}
-                  onScrollEnd={() => {
-                    actionSheetRef.current?.handleChildScrollEnd();
+            ListEmptyComponent={
+              notebooks.length > 0 ? null : (
+                <View
+                  style={{
+                    width: "100%",
+                    height: "100%",
+                    justifyContent: "center",
+                    alignItems: "center"
                  }}
-                  hasSubList={true}
-                  hasHeaderSearch={false}
-                  type="grayBg"
-                  sublistItemType="topic"
-                  onAddItem={(title) => {
-                    return onAddTopic(title, item);
-                  }}
-                  onAddSublistItem={(item) => {
-                    openAddTopicDialog(item);
-                  }}
-                  onPress={(item) => {
+                >
+                  <Icon
+                    name="book-outline"
+                    color={colors.primary.icon}
+                    size={100}
+                  />
+                  <Paragraph style={{ marginBottom: 10 }}>
+                    You do not have any notebooks.
+                  </Paragraph>
+                </View>
+              )
+            }
+            data={notebooks}
+            hasHeaderSearch={true}
+            renderItem={({ item, index }) => (
+              <ListItem
+                item={item}
+                key={item.id}
+                index={index}
+                hasNotes={getSelectedNotesCountInItem(item) > 0}
+                sheetRef={actionSheetRef}
+                infoText={
+                  <>
+                    {item.topics.length === 1
+                      ? item.topics.length + " topic"
+                      : item.topics.length + " topics"}
+                  </>
+                }
+                getListItems={getItemsForItem}
+                getSublistItemProps={(topic) => ({
+                  hasNotes: getSelectedNotesCountInItem(topic) > 0,
+                  style: {
+                    marginBottom: 0,
+                    height: 40
+                  },
+                  onPress: (item) => {
                    const itemState =
                      useItemSelectionStore.getState().itemState;
                    const currentState = itemState[item.id];
@@ -460,16 +429,47 @@ const MoveNoteSheet = ({ note, actionSheetRef }) => {
                    } else {
                      contextValue.deselect(item);
                    }
-                  }}
-                />
-              )}
-              itemType="notebook"
-              onAddItem={async (title) => {
-                return await onAddNotebook(title);
-              }}
-              ListFooterComponent={<View style={{ height: 20 }} />}
-            />
-          </View>
+                  },
+                  key: item.id,
+                  type: "transparent"
+                })}
+                icon={(expanded) => ({
+                  name: expanded ? "chevron-up" : "chevron-down",
+                  color: expanded
+                    ? colors.primary.accent
+                    : colors.primary.paragraph
+                })}
+                onScrollEnd={() => {
+                  actionSheetRef.current?.handleChildScrollEnd();
+                }}
+                hasSubList={true}
+                hasHeaderSearch={false}
+                type="grayBg"
+                sublistItemType="topic"
+                onAddItem={(title) => {
+                  return onAddTopic(title, item);
+                }}
+                onAddSublistItem={(item) => {
+                  openAddTopicDialog(item);
+                }}
+                onPress={(item) => {
+                  const itemState = useItemSelectionStore.getState().itemState;
+                  const currentState = itemState[item.id];
+                  if (currentState !== "selected") {
+                    resetItemState("deselected");
+                    contextValue.select(item);
+                  } else {
+                    contextValue.deselect(item);
+                  }
+                }}
+              />
+            )}
+            itemType="notebook"
+            onAddItem={async (title) => {
+              return await onAddNotebook(title);
+            }}
+            ListFooterComponent={<View style={{ height: 20 }} />}
+          />
        </SelectionProvider>
      </View>
    </>
--- a/apps/mobile/app/components/sheets/add-to/list-item.js
+++ b/apps/mobile/app/components/sheets/add-to/list-item.js
@@ -273,7 +273,6 @@ export const ListItem = ({
            alignSelf: "flex-end",
            maxHeight: 250
          }}
-          estimatedItemSize={40}
          itemType={sublistItemType}
          hasHeaderSearch={hasHeaderSearch}
          renderItem={({ item, index }) => (
--- a/apps/mobile/app/components/sheets/export-notes/index.js
+++ b/apps/mobile/app/components/sheets/export-notes/index.js
@@ -97,16 +97,6 @@ const ExportNotesSheet = ({ notes, update }) => {
      id: notesnook.ids.dialogs.export.md,
      pro: premium
    },
-    {
-      title: "Markdown + Frontmatter",
-      func: async () => {
-        await save("md-frontmatter");
-      },
-      icon: "language-markdown",
-      desc: "View in any text or markdown editor",
-      id: notesnook.ids.dialogs.export.md,
-      pro: premium
-    },
    {
      title: "Plain Text",
      func: async () => {
@@ -188,9 +178,7 @@ const ExportNotesSheet = ({ notes, update }) => {
                >
                  <Icon
                    name={item.icon}
-                    color={
-                      item.pro ? colors.primary.accent : colors.primary.icon
-                    }
+                    color={item.pro ? colors.primary.accent : colors.primary.icon}
                    size={SIZE.xxxl + 10}
                  />
                </View>
--- a/apps/mobile/app/components/sheets/reminder/index.tsx
+++ b/apps/mobile/app/components/sheets/reminder/index.tsx
@@ -531,7 +531,9 @@ export default function ReminderSheet({
              androidVariant="nativeAndroid"
              is24hourSource="locale"
              locale={
-                db.settings?.getTimeFormat() === "24-hour" ? "en_GB" : "en_US"
+                db.settings?.getTimeFormat() === "24-hour"
+                  ? "en_GB.UTF8"
+                  : "en_US.UTF8"
              }
              mode={reminderMode === ReminderModes.Repeat ? "time" : "datetime"}
            />
--- a/apps/mobile/app/components/ui/sheet/index.js
+++ b/apps/mobile/app/components/ui/sheet/index.js
@@ -85,7 +85,6 @@ const SheetWrapper = ({
  };

  useEffect(() => {
-    if (useUserStore.getState().disableAppLockRequests) return;
    if (SettingsService.get().appLockMode === "background") {
      if (appState === "background") {
        const ref = fwdRef || localRef;
--- a/apps/mobile/app/hooks/use-actions.js
+++ b/apps/mobile/app/hooks/use-actions.js
@@ -188,7 +188,7 @@ export const useActions = ({ close = () => null, item }) => {
    Notifications.displayNotification({
      title: item.title,
      message: item.headline || text,
-      subtitle: "",
+      subtitle: item.headline || text,
      bigText: html,
      ongoing: true,
      actions: ["UNPIN"],
--- a/apps/mobile/app/hooks/use-app-events.js
+++ b/apps/mobile/app/hooks/use-app-events.js
@@ -229,25 +229,12 @@ async function saveEditorState() {
    MMKV.setString("appState", state);
  }
 }
-/**
- *
- * @param {RNIap.Purchase} subscription
- */
+
 const onSuccessfulSubscription = async (subscription) => {
-  console.log(
-    "Subscription success!",
-    subscription.transactionId,
-    subscription.obfuscatedAccountIdAndroid,
-    subscription.obfuscatedProfileIdAndroid
-  );
  await PremiumService.subscriptions.set(subscription);
  await PremiumService.subscriptions.verify(subscription);
 };

-/**
- *
- * @param {RNIap.PurchaseError} error
- */
 const onSubscriptionError = async (error) => {
  ToastEvent.show({
    heading: "Failed to subscribe",
@@ -460,6 +447,7 @@ export const useAppEvents = () => {
        }

        clearMessage();
+        subscribeToIAPListeners();
        if (!login) {
          user = await db.user.fetchUser();
          setUser(user);
@@ -478,11 +466,7 @@ export const useAppEvents = () => {
            userEmailConfirmed: true
          });
        }
-
-        subscribeToIAPListeners();
      } catch (e) {
-        DatabaseLogger.error(error);
-
        ToastEvent.error(e, "An error occurred", "global");
      }

@@ -506,15 +490,14 @@ export const useAppEvents = () => {
  );

  const subscribeToIAPListeners = useCallback(async () => {
-    if (Platform.OS === "android") {
-      try {
-        await RNIap.flushFailedPurchasesCachedAsPendingAndroid();
-      } catch (e) {}
-    }
-    refValues.current.subsriptionSuccessListener =
-      RNIap.purchaseUpdatedListener(onSuccessfulSubscription);
-    refValues.current.subsriptionErrorListener =
-      RNIap.purchaseErrorListener(onSubscriptionError);
+    await RNIap.initConnection()
+      .catch(() => null)
+      .then(async () => {
+        refValues.current.subsriptionSuccessListener =
+          RNIap.purchaseUpdatedListener(onSuccessfulSubscription);
+        refValues.current.subsriptionErrorListener =
+          RNIap.purchaseErrorListener(onSubscriptionError);
+      });
  }, []);

  const unSubscribeFromIAPListeners = () => {
--- a/apps/mobile/app/hooks/use-editor-tags.ts
+++ b/apps/mobile/app/hooks/use-editor-tags.ts
@@ -0,0 +1,82 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import { useEffect, useState } from "react";
+import { eSubscribeEvent, eUnSubscribeEvent } from "../services/event-manager";
+import { useEditorStore } from "../stores/use-editor-store";
+import { useTagStore } from "../stores/use-tag-store";
+import { db } from "../common/database";
+import { NoteType } from "app/utils/types";
+import { useCallback } from "react";
+
+/**
+ * A hook that injects/removes tags from tags bar in editor
+ */
+const useEditorTags = () => {
+  const currentEditingNote = useEditorStore(
+    (state) => state.currentEditingNote
+  );
+  const tags = useTagStore((state) => state.tags);
+  const [note, setNote] = useState<NoteType | null>(null);
+  const [noteTags, setNoteTags] = useState<string[]>([]);
+
+  const refreshNote = useCallback(() => {
+    const current = useEditorStore.getState().currentEditingNote;
+    if (!current) {
+      setNote(null);
+      setNoteTags([]);
+      return;
+    }
+    const note = db.notes?.note(current)?.data as NoteType;
+    setNote(note ? { ...note } : null);
+    getTags(note);
+  }, []);
+
+  useEffect(() => {
+    refreshNote();
+  }, [currentEditingNote, refreshNote, tags]);
+
+  const load = useCallback(() => {
+    if (!note) return;
+    //  tiny.call(EditorWebView, renderTags(noteTags));
+  }, [note]);
+
+  useEffect(() => {
+    eSubscribeEvent("updateTags", load);
+    return () => {
+      eUnSubscribeEvent("updateTags", load);
+    };
+  }, [load, noteTags]);
+
+  function getTags(note: NoteType) {
+    if (!note || !note.tags) return [];
+    const tags = note.tags
+      .map((t) => (db.tags?.tag(t) ? { ...db.tags.tag(t) } : null))
+      .filter((t) => t !== null);
+    setNoteTags(tags);
+  }
+
+  useEffect(() => {
+    load();
+  }, [load, noteTags]);
+
+  return [];
+};
+
+export default useEditorTags;
--- a/apps/mobile/app/navigation/tabs-holder.js
+++ b/apps/mobile/app/navigation/tabs-holder.js
@@ -384,16 +384,7 @@ const _TabsHolder = () => {
  }, []);

  useEffect(() => {
-    function updateSystemBars() {
-      changeNavigationBarColor(colors.primary.background, isDark, true);
-      StatusBar.setBackgroundColor("transparent");
-      StatusBar.setTranslucent(true);
-      StatusBar.setBarStyle(isDark ? "light-content" : "dark-content");
-    }
-    updateSystemBars();
-    setTimeout(() => {
-      updateSystemBars();
-    }, 1000);
+    changeNavigationBarColor(colors.primary.background, isDark, true);
  }, [colors.primary.background, isDark]);

  return (
@@ -415,7 +406,11 @@ const _TabsHolder = () => {
            : 0
      }}
    >
-      <StatusBar translucent={true} backgroundColor="transparent" />
+      <StatusBar
+        barStyle={isDark ? "light-content" : "dark-content"}
+        translucent={true}
+        backgroundColor="transparent"
+      />

      {!introCompleted ? (
        <NavigationStack />
--- 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.0-alpha.24",
+    "react-native-actions-sheet": "0.9.0-alpha.23",
    "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
@@ -115,7 +115,7 @@ const Editor = React.memo(
          } else {
            editor.commands.updateImage({
              hash: hash,
-              dataurl: src
+              src: src
            });
          }
        },
@@ -167,7 +167,7 @@ const Editor = React.memo(
          globalThis.noToolbar=${noToolbar};
          globalThis.noHeader=${noHeader};
          `}
-            useSharedProcessPool={false}
+            injectedJavaScript={`globalThis.sessionId="${editor.sessionId}";`}
            javaScriptEnabled={true}
            focusable={true}
            onContentProcessDidTerminate={onError}
--- a/apps/mobile/app/screens/editor/tiptap/commands.ts
+++ b/apps/mobile/app/screens/editor/tiptap/commands.ts
@@ -113,7 +113,7 @@ typeof globalThis.statusBar !== "undefined" && statusBar.current.set({date:"",sa
  };

  setSessionId = async (id: string | null) =>
-    await this.doAsync(`globalThis.sessionId = "${id}";`);
+    await this.doAsync(`globalThis.sessionId = "${id}"`);

  setStatus = async (date: string | undefined, saved: string) =>
    await this.doAsync(
@@ -211,20 +211,9 @@ typeof globalThis.statusBar !== "undefined" && statusBar.current.set({date:"",sa
    );
  };

-  insertImage = async (
-    image: Omit<ImageAttributes, "bloburl"> & {
-      dataurl: string;
-    }
-  ) => {
+  insertImage = async (image: ImageAttributes) => {
    await this.doAsync(
-      `const image = toBlobURL("${image.dataurl}", "${image.hash}");
-      editor && editor.commands.insertImage({
-        ...${JSON.stringify({
-          ...image,
-          dataurl: undefined
-        })},
-        bloburl: image
-      })`
+      `editor && editor.commands.insertImage(${JSON.stringify(image)})`
    );
  };

@@ -236,20 +225,11 @@ typeof globalThis.statusBar !== "undefined" && statusBar.current.set({date:"",sa
    );
  };

-  updateImage = async ({
-    hash,
-    dataurl
-  }: Partial<Omit<ImageAttributes, "bloburl">> & {
-    dataurl: string;
-  }) => {
+  updateImage = async ({ src, hash }: Partial<ImageAttributes>) => {
    await this.doAsync(
-      `const image = toBlobURL("${dataurl}", "${hash}");
-      editor && editor.commands.updateImage(${JSON.stringify({
+      `editor && editor.commands.updateImage(${JSON.stringify({
        hash
-      })}, {
-        ...${JSON.stringify({ hash, preventUpdate: true })},
-        bloburl: image
-      })`
+      })},${JSON.stringify({ dataurl: src, hash, preventUpdate: true })})`
    );
  };

--- a/apps/mobile/app/screens/editor/tiptap/picker.js
+++ b/apps/mobile/app/screens/editor/tiptap/picker.js
@@ -35,7 +35,6 @@ import { FILE_SIZE_LIMIT, IMAGE_SIZE_LIMIT } from "../../../utils/constants";
 import { eCloseSheet } from "../../../utils/events";
 import { editorController, editorState } from "./utils";
 import { useSettingStore } from "../../../stores/use-setting-store";
-import filesystem from "../../../common/filesystem";

 const showEncryptionSheet = (file) => {
  presentSheet({
@@ -231,16 +230,6 @@ const handleImageResponse = async (response, options) => {
  });

  let fileName = image.originalFileName || image.fileName;
-
-  editorController.current?.commands.insertImage({
-    hash: hash,
-    mime: image.type,
-    title: fileName,
-    dataurl: b64,
-    size: image.fileSize,
-    filename: fileName
-  });
-
  if (!(await attachFile(uri, hash, image.type, fileName, options))) return;
  const isPng = /(png)/g.test(image.type);
  const isJpeg = /(jpeg|jpg)/g.test(image.type);
@@ -254,6 +243,15 @@ const handleImageResponse = async (response, options) => {
  }

  if (Platform.OS === "ios") await RNFetchBlob.fs.unlink(uri);
+
+  editorController.current?.commands.insertImage({
+    hash: hash,
+    mime: image.type,
+    title: fileName,
+    dataurl: b64,
+    size: image.fileSize,
+    filename: fileName
+  });
 };

 export async function attachFile(uri, hash, type, filename, options) {
@@ -271,10 +269,6 @@ export async function attachFile(uri, hash, type, filename, options) {
      return false;
    }

-    if (!options.reupload && exists) {
-      options.reupload = (await filesystem.getUploadedFileSize(hash)) <= 0;
-    }
-
    if (!exists || options?.reupload) {
      let key = await db.attachments.generateKey();
      encryptionInfo = await Sodium.encryptFile(key, {
--- a/apps/mobile/app/screens/editor/tiptap/use-editor-events.ts
+++ b/apps/mobile/app/screens/editor/tiptap/use-editor-events.ts
@@ -189,7 +189,7 @@ export const useEditorEvents = (
      readonly: readonly || editorPropReadonly,
      tools: tools || getDefaultPresets().default,
      noHeader: noHeader,
-      noToolbar: noToolbar,
+      noToolbar: readonly || editorPropReadonly || noToolbar,
      doubleSpacedLines: doubleSpacedLines,
      corsProxy: corsProxy,
      fontSize:
@@ -205,6 +205,7 @@ export const useEditorEvents = (
    fullscreen,
    isPremium,
    readonly,
+    editor.sessionId,
    editor.loading,
    deviceMode,
    tools,
@@ -228,8 +229,6 @@ export const useEditorEvents = (
      logger.info("editor handled back event", editorHandledBack);
      return;
    }
-    editorState().currentlyEditing = false;
-    editor.reset();
    setTimeout(async () => {
      if (deviceMode !== "mobile" && fullscreen) {
        if (fullscreen) {
@@ -242,10 +241,14 @@ export const useEditorEvents = (
        editorState().movedAway = true;
        tabBarRef.current?.goToPage(0);
      }
-
-      setTimeout(() => {
-        Navigation.queueRoutesForUpdate();
-      }, 500);
+      setImmediate(() => {
+        useEditorStore.getState().setCurrentlyEditingNote(null);
+        setTimeout(() => {
+          Navigation.queueRoutesForUpdate();
+        }, 500);
+      });
+      editorState().currentlyEditing = false;
+      editor.reset();
    }, 1);
  }, [editor, deviceMode, fullscreen]);

@@ -341,12 +344,8 @@ export const useEditorEvents = (
        });
      }

-      if (editorMessage.type === EventTypes.back) {
-        return onBackPress();
-      }
-
      if (
-        editorMessage.sessionId !== editor.sessionId.current &&
+        editorMessage.sessionId !== editor.sessionId &&
        editorMessage.type !== EditorEvents.status
      ) {
        return;
@@ -432,6 +431,9 @@ export const useEditorEvents = (
          editorState().isFullscreen = true;
          eSendEvent(eOpenFullscreenEditor);
          break;
+        case EventTypes.back:
+          onBackPress();
+          break;
        case EventTypes.link:
          openLinkInBrowser(editorMessage.value as string);
          break;
--- a/apps/mobile/app/screens/editor/tiptap/use-editor.ts
+++ b/apps/mobile/app/screens/editor/tiptap/use-editor.ts
@@ -63,7 +63,8 @@ export const useEditor = (
  const theme = useThemeEngineStore((state) => state.theme);

  const [loading, setLoading] = useState(false);
-  const sessionIdRef = useRef(makeSessionId());
+  const [sessionId, setSessionId] = useState<string>(makeSessionId());
+  const sessionIdRef = useRef(sessionId);
  const editorRef = useRef<WebView>(null);
  const currentNote = useRef<NoteType | null>();
  const currentContent = useRef<Content | null>();
@@ -98,6 +99,10 @@ export const useEditor = (
    postMessage(EditorEvents.theme, theme);
  }, [theme, postMessage]);

+  useEffect(() => {
+    sessionIdRef.current = sessionId;
+  }, [sessionId]);
+
  useEffect(() => {
    commands.setTags(currentNote.current);
  }, [commands, tags]);
@@ -137,7 +142,6 @@ export const useEditor = (
      clearTimeout(timers.current["loading-images"]);
      sessionHistoryId.current = undefined;
      saveCount.current = 0;
-      loadingState.current = undefined;
      lock.current = false;
      useEditorStore.getState().setReadonly(false);
      resetContent && postMessage(EditorEvents.title, "");
@@ -147,8 +151,8 @@ export const useEditor = (

      if (resetState) {
        const newSessionId = makeSessionId();
-        sessionIdRef.current = newSessionId;
        await commands.setSessionId(newSessionId);
+        setSessionId(newSessionId);

        isDefaultEditor &&
          useEditorStore.getState().setCurrentlyEditingNote(null);
@@ -359,6 +363,7 @@ export const useEditor = (
      if (item && item.type === "new") {
        currentNote.current && (await reset());
        const nextSessionId = makeSessionId(item as NoteType);
+        setSessionId(nextSessionId);
        sessionIdRef.current = nextSessionId;
        sessionHistoryId.current = Date.now();
        await commands.setSessionId(nextSessionId);
@@ -400,10 +405,12 @@ export const useEditor = (
        }
        lastContentChangeTime.current = item.dateEdited;
        const nextSessionId = makeSessionId(item as NoteType);
-        sessionIdRef.current = nextSessionId;
        lockedSessionId.current = nextSessionId;
        sessionHistoryId.current = Date.now();
-        await commands.setSessionId(nextSessionId);
+        setSessionId(nextSessionId);
+
+        commands.setSessionId(nextSessionId);
+        sessionIdRef.current = nextSessionId;
        currentNote.current = item as NoteType;
        await commands.setStatus(getFormattedDate(item.dateEdited), "Saved");
        await postMessage(EditorEvents.title, item.title);
@@ -631,7 +638,7 @@ export const useEditor = (

  useEffect(() => {
    state.current.saveCount = 0;
-  }, [loading]);
+  }, [sessionId, loading]);

  const onReady = useCallback(async () => {
    if (!(await isEditorLoaded(editorRef, sessionIdRef.current))) {
@@ -683,7 +690,8 @@ export const useEditor = (
    loading,
    setLoading,
    state,
-    sessionId: sessionIdRef,
+    sessionId,
+    setSessionId,
    note: currentNote,
    onReady,
    saveContent,
--- a/apps/mobile/app/screens/settings/settings-data.tsx
+++ b/apps/mobile/app/screens/settings/settings-data.tsx
@@ -88,8 +88,8 @@ export const settingsGroups: SettingSection[] = [
          return isBasic || !user.subscription?.type
            ? "Subscribe to Pro"
            : isTrial
-            ? "Your free trial has started"
-            : "Subscription details";
+              ? "Your free trial has started"
+              : "Subscription details";
        },
        type: "component",
        component: "subscription",
@@ -111,16 +111,16 @@ export const settingsGroups: SettingSection[] = [
          return user.subscription?.type === 2
            ? "You signed up on " + startDate
            : user.subscription?.type === 1
-            ? "Your free trial will end on " + expiryDate
-            : user.subscription?.type === 6
-            ? subscriptionDaysLeft.time < -3
-              ? "Your subscription has ended"
-              : "Your account will be downgraded to Basic in 3 days"
-            : user.subscription?.type === 7
-            ? `Your subscription will end on ${expiryDate}.`
-            : user.subscription?.type === 5
-            ? `Your subscription will renew on ${expiryDate}.`
-            : "Never hesitate to choose privacy";
+              ? "Your free trial will end on " + expiryDate
+              : user.subscription?.type === 6
+                ? subscriptionDaysLeft.time < -3
+                  ? "Your subscription has ended"
+                  : "Your account will be downgraded to Basic in 3 days"
+                : user.subscription?.type === 7
+                  ? `Your subscription will end on ${expiryDate}.`
+                  : user.subscription?.type === 5
+                    ? `Your subscription will renew on ${expiryDate}.`
+                    : "Never hesitate to choose privacy";
        }
      },
      {
@@ -892,6 +892,16 @@ export const settingsGroups: SettingSection[] = [
        name: "Restore backup",
        description: "Restore backup from phone storage.",
        modifer: () => {
+          const user = useUserStore.getState().user;
+          if (!user || !user?.email) {
+            ToastEvent.show({
+              heading: "Login required",
+              message: "Please log in to your account to restore backup",
+              type: "error",
+              context: "global"
+            });
+            return;
+          }
          eSendEvent(eOpenRestoreDialog);
        }
      },
--- a/apps/mobile/app/screens/settings/subscription.js
+++ b/apps/mobile/app/screens/settings/subscription.js
@@ -42,9 +42,6 @@ export const Subscription = () => {
    user?.subscription?.type !== SUBSCRIPTION_STATUS.PREMIUM &&
    user?.subscription?.type !== SUBSCRIPTION_STATUS.BETA;

-  const hasCancelledPremium =
-    SUBSCRIPTION_STATUS.PREMIUM_CANCELLED === user?.subscription?.type;
-
  const subscriptionProviderInfo =
    SUBSCRIPTION_PROVIDER[user?.subscription?.provider];

@@ -66,7 +63,10 @@ export const Subscription = () => {
      return;
    }

-    if (hasCancelledPremium && Platform.OS === "android") {
+    if (
+      user?.subscription?.type === SUBSCRIPTION_STATUS.PREMIUM_CANCELLED &&
+      Platform.OS === "android"
+    ) {
      if (user.subscription?.provider === 3) {
        ToastEvent.show({
          heading: "Subscribed on web",
@@ -88,13 +88,6 @@ export const Subscription = () => {
    }
  };

-  function getPrice() {
-    return Platform.OS === "android"
-      ? monthlyPlan?.product?.subscriptionOfferDetails[0].pricingPhases
-          .pricingPhaseList?.[0]?.formattedPrice
-      : monthlyPlan?.product?.localizedPrice;
-  }
-
  return (
    <View>
      {isNotPro ? (
@@ -111,16 +104,22 @@ export const Subscription = () => {
          title={
            !user?.isEmailConfirmed
              ? "Confirm your email"
-              : user.subscription?.provider === 3 && hasCancelledPremium
+              : user.subscription?.provider === 3 &&
+                user.subscription?.type ===
+                  SUBSCRIPTION_STATUS.PREMIUM_CANCELLED
              ? "Manage subscription from desktop app"
-              : hasCancelledPremium &&
+              : user.subscription?.type ===
+                  SUBSCRIPTION_STATUS.PREMIUM_CANCELLED &&
                Platform.OS === "android" &&
                Config.GITHUB_RELEASE !== "true"
              ? "Resubscribe from Google Playstore"
-              : user.subscription?.type ===
-                  SUBSCRIPTION_STATUS.PREMIUM_EXPIRED || hasCancelledPremium
-              ? `Resubscribe to Pro (${getPrice() || "$4.49"} / mo)`
-              : `Get Pro (${getPrice() || "$4.49"} / mo)`
+              : user.subscription?.type === SUBSCRIPTION_STATUS.PREMIUM_EXPIRED
+              ? `Resubscribe to Pro (${
+                  monthlyPlan?.product?.localizedPrice || "$4.49"
+                } / mo)`
+              : `Get Pro (${
+                  monthlyPlan?.product?.localizedPrice || "$4.49"
+                } / mo)`
          }
        />
      ) : null}
--- a/apps/mobile/app/services/exporter.js
+++ b/apps/mobile/app/services/exporter.js
@@ -109,7 +109,7 @@ async function makeHtml(note) {

 /**
 *
- * @param {"txt" | "pdf" | "md" | "html" | "md-frontmatter"} type
+ * @param {"txt" | "pdf" | "md" | "html"} type
 */
 async function exportAs(type, note, bulk) {
  let data;
@@ -122,9 +122,6 @@ async function exportAs(type, note, bulk) {
    case "md":
      data = await db.notes.note(note.id).export("md");
      break;
-    case "md-frontmatter":
-      data = await db.notes.note(note.id).export("md-frontmatter");
-      break;
    case "pdf":
      {
        let html = await makeHtml(note);
@@ -162,7 +159,7 @@ async function exportAs(type, note, bulk) {

 /**
 *
- * @param {"txt" | "pdf" | "md" | "html" | "md-frontmatter"} type
+ * @param {"txt" | "pdf" | "md" | "html"} type
 */
 async function exportNote(note, type) {
  let path = await getPath(FolderNames[type]);
@@ -183,7 +180,7 @@ async function exportNote(note, type) {
    filePath: path,
    type: "text/plain",
    name: "Text",
-    fileName: fileName + `.${type === "md-frontmatter" ? "md" : type}`
+    fileName: fileName + `.${type}`
  };
 }

@@ -215,7 +212,7 @@ function getUniqueFileName(fileName, results) {

 /**
 *
- * @param {"txt" | "pdf" | "md" | "html" | "md-frontmatter"} type
+ * @param {"txt" | "pdf" | "md" | "html"} type
 */
 async function bulkExport(notes, type, callback) {
  let path = await getPath(FolderNames[type]);
--- a/apps/mobile/app/services/premium.js
+++ b/apps/mobile/app/services/premium.js
@@ -39,10 +39,6 @@ import { eSendEvent, presentSheet, ToastEvent } from "./event-manager";

 import SettingsService from "./settings";
 let premiumStatus = 0;
-
-/**
- * @type {RNIap.Subscription[]}
- */
 let products = [];
 let user = null;

@@ -72,9 +68,7 @@ async function setPremiumStatus() {
  }
  try {
    await RNIap.initConnection();
-    products = await RNIap.getSubscriptions({
-      skus: itemSkus
-    });
+    products = await RNIap.getSubscriptions(itemSkus);
  } catch (e) {
    console.log("subscriptions: ", e);
  }
@@ -229,21 +223,12 @@ const showVerifyEmailDialog = () => {
 };

 const subscriptions = {
-  /**
-   *
-   * @returns {RNIap.Purchase} subscription
-   */
-  get: () => {
+  get: async () => {
    if (Platform.OS === "android") return;
    let _subscriptions = MMKV.getString("subscriptionsIOS");
    if (!_subscriptions) return [];
    return JSON.parse(_subscriptions);
  },
-  /**
-   *
-   * @param {RNIap.Purchase} subscription
-   * @returns
-   */
  set: async (subscription) => {
    if (Platform.OS === "android") return;
    let _subscriptions = MMKV.getString("subscriptionsIOS");
@@ -278,10 +263,6 @@ const subscriptions = {
      MMKV.setString("subscriptionsIOS", JSON.stringify(_subscriptions));
    }
  },
-  /**
-   *
-   * @param {RNIap.Purchase} subscription
-   */
  verify: async (subscription) => {
    if (Platform.OS === "android") return;

@@ -299,16 +280,12 @@ const subscriptions = {
            "Content-Type": "application/json"
          }
        };
-
-        console.log("Subscription.verify", requestData);
        try {
          let result = await fetch(
-            __DEV__
-              ? "http://192.168.43.5:4264/apple/verify"
-              : "https://payments.streetwriters.co/apple/verify",
+            "https://payments.streetwriters.co/apple/verify",
            requestData
          );
-          console.log("Subscribed", result);
+
          let text = await result.text();

          if (!result.ok) {
@@ -316,8 +293,6 @@ const subscriptions = {
              await subscriptions.clear(subscription);
            }
            return;
-          } else {
-            await subscriptions.clear(subscription);
          }
        } catch (e) {
          console.log("subscription error", e);
@@ -327,18 +302,15 @@ const subscriptions = {
  },
  clear: async (_subscription) => {
    if (Platform.OS === "android") return;
-    let _subscriptions = subscriptions.get();
+    let _subscriptions = await subscriptions.get();
    let subscription = null;
    if (_subscription) {
      subscription = _subscription;
    } else {
      subscription = _subscriptions.length > 0 ? _subscriptions[0] : null;
    }
-
    if (subscription) {
-      await RNIap.finishTransaction({
-        purchase: subscription
-      });
+      await RNIap.finishTransaction(subscription.transactionId);
      await RNIap.clearTransactionIOS();
      await subscriptions.remove(subscription.transactionId);
    }
--- a/apps/mobile/app/utils/constants.js
+++ b/apps/mobile/app/utils/constants.js
@@ -75,7 +75,7 @@ export const SUBSCRIPTION_STATUS_STRINGS = {
  2: Platform.OS === "ios" ? "Pro" : "Beta",
  5: "Pro",
  6: "Expired",
-  7: "Pro (cancelled)"
+  7: "Pro"
 };

 export const SUBSCRIPTION_PROVIDER = {
--- a/apps/mobile/app/utils/functions.js
+++ b/apps/mobile/app/utils/functions.js
@@ -67,10 +67,15 @@ export const deleteItems = async (item, context) => {
    });
    return;
  }
+  if (
+    item &&
+    item.id &&
+    useSelectionStore.getState().selectedItemsList.length === 0
+  ) {
+    useSelectionStore.getState().setSelectedItem(item);
+  }

-  const selectedItemsList = item
-    ? [item]
-    : useSelectionStore.getState().selectedItemsList;
+  const { selectedItemsList } = useSelectionStore.getState();

  let notes = selectedItemsList.filter((i) => i.type === "note");
  let notebooks = selectedItemsList.filter((i) => i.type === "notebook");
@@ -174,9 +179,7 @@ export const deleteItems = async (item, context) => {
    });
  }
  Navigation.queueRoutesForUpdate();
-  if (!item) {
-    useSelectionStore.getState().clearSelection();
-  }
+  useSelectionStore.getState().clearSelection();
  useMenuStore.getState().setMenuPins();
  useMenuStore.getState().setColorNotes();
  SearchService.updateAndSearch();
--- a/apps/mobile/app/utils/note-bundle.js
+++ b/apps/mobile/app/utils/note-bundle.js
@@ -66,37 +66,17 @@ async function createNotes(bundle) {
  const sessionId = bundle.note.sessionId;
  const id = await db.notes.add(bundle.note);

-  if (!bundle.notebooks || !bundle.notebooks.length) {
-    const defaultNotebook = db.settings?.getDefaultNotebook();
-    if (defaultNotebook) {
-      if (!defaultNotebook.topic) {
-        db.relations.add(
-          { type: "notebook", id: defaultNotebook.id },
-          { id, type: "note" }
-        );
-      } else {
-        db.notes.addToNotebook(
-          {
-            id: defaultNotebook?.id,
-            topic: defaultNotebook.topic
-          },
-          id
-        );
-      }
-    }
-  } else {
-    for (const item of bundle.notebooks) {
-      if (item.type === "notebook") {
-        db.relations.add(item, { id, type: "note" });
-      } else {
-        db.notes.addToNotebook(
-          {
-            id: item.notebookId,
-            topic: item.id
-          },
-          id
-        );
-      }
+  for (const item of bundle.notebooks) {
+    if (item.type === "notebook") {
+      db.relations.add(item, { id, type: "note" });
+    } else {
+      db.notes.addToNotebook(
+        {
+          id: item.notebookId,
+          topic: item.id
+        },
+        id
+      );
    }
  }

--- 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 2073
+        versionCode 2064
        versionName getNpmVersion()
        testBuildType System.getProperty('testBuildType', 'debug')
        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
--- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/OnClearFromRecentService.java
+++ b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/OnClearFromRecentService.java
@@ -8,10 +8,6 @@ import com.ammarahmed.mmkv.MMKV;

 public class OnClearFromRecentService extends Service {

-    static {
-        System.loadLibrary("rnmmkv");
-    }
-
    @Override
    public IBinder onBind(Intent intent) {
        return null;
@@ -19,6 +15,7 @@ public class OnClearFromRecentService extends Service {

    @Override
    public int onStartCommand(Intent intent, int flags, int startId) {
+    
        return START_NOT_STICKY;
    }

@@ -34,10 +31,8 @@ public class OnClearFromRecentService extends Service {
            MMKV mmkv = MMKV.mmkvWithID("default",MMKV.SINGLE_PROCESS_MODE);
            mmkv.removeValueForKey("appState");
            stopSelf();
-        } catch (UnsatisfiedLinkError e) {
-
        } catch (Exception e) {
-            
+
        }
        //System.exit(0);
    }
--- a/apps/mobile/native/android/build.gradle
+++ b/apps/mobile/native/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
        minSdkVersion = 21
        compileSdkVersion = 33
        targetSdkVersion = 33
-        ext.kotlinVersion = '1.8.0'
+        ext.kotlinVersion = '1.6.10'
        androidXAnnotation = "1.1.0"
        androidXCoreVersion = "1.7.0"
        androidXCore = "1.7.0"
--- a/apps/mobile/native/android/releasenotes/whatsnew-en-US
+++ b/apps/mobile/native/android/releasenotes/whatsnew-en-US
@@ -1,6 +1,8 @@
- Added support to check/uncheck all items in a checklist
- Now you can open pdfs/images in readonly mode
- Fixed a bug where users are unable to login when app lock is enabled
- Bug fixes and performance improvements
+- Large titles in editor now wrap into multiple lines
+- Added support for font scaling in mobile app
+- Clipper in share extension now supports clipping dynamically loaded websites
+- Cache files are now stored in app's data directory
+- Improved drag/drop support in task lists
+- Bug fixes

 Thank you for using Notesnook!
--- a/apps/mobile/native/fonts/MaterialCommunityIcons.ttf
+++ b/apps/mobile/native/fonts/MaterialCommunityIcons.ttf
--- a/apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj
+++ b/apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj
@@ -997,7 +997,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2065;
+				CURRENT_PROJECT_VERSION = 2057;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1071,7 +1071,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.6.14;
+				MARKETING_VERSION = 2.6.6;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1102,7 +1102,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2065;
+				CURRENT_PROJECT_VERSION = 2057;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1176,7 +1176,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.6.14;
+				MARKETING_VERSION = 2.6.6;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1186,7 +1186,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook;
 				PRODUCT_NAME = Notesnook;
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook App Distribution 2024";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook Distribution 2023";
 				SWIFT_OBJC_BRIDGING_HEADER = "Notesnook-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1335,7 +1335,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2065;
+				CURRENT_PROJECT_VERSION = 2057;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1347,7 +1347,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.14;
+				MARKETING_VERSION = 2.6.6;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
@@ -1378,7 +1378,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2065;
+				CURRENT_PROJECT_VERSION = 2057;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1391,12 +1391,12 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.14;
+				MARKETING_VERSION = 2.6.6;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook Widget Distribution 2024";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook Widget Distribution 2023";
 				SKIP_INSTALL = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
@@ -1421,7 +1421,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Make Note/Make Note.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2065;
+				CURRENT_PROJECT_VERSION = 2057;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1495,7 +1495,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.14;
+				MARKETING_VERSION = 2.6.6;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
@@ -1526,7 +1526,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2065;
+				CURRENT_PROJECT_VERSION = 2057;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1601,12 +1601,12 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.14;
+				MARKETING_VERSION = 2.6.6;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook Share Distribution 2024";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook Share Distrubution 2023";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "Make Note/Make Note-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
--- a/apps/mobile/native/ios/Podfile.lock
+++ b/apps/mobile/native/ios/Podfile.lock
@@ -327,7 +327,7 @@ PODS:
    - React-Core
  - react-native-keep-awake (1.2.0):
    - React-Core
-  - react-native-mmkv-storage (0.10.0-alpha.11):
+  - react-native-mmkv-storage (0.10.0-alpha.9):
    - MMKV (~> 1.3.1)
    - React
    - React-Core
@@ -477,7 +477,7 @@ PODS:
    - React-Core
  - RNGestureHandler (2.12.0):
    - React-Core
-  - RNIap (12.11.0):
+  - RNIap (7.5.6):
    - React-Core
  - RNKeychain (4.0.5):
    - React
@@ -875,7 +875,7 @@ SPEC CHECKSUMS:
  react-native-image-resizer: 00ceb0e05586c7aadf061eea676957a6c2ec60fa
  react-native-in-app-review: db8bb167a5f238e7ceca5c242d6b36ce8c4404a4
  react-native-keep-awake: caee3ff89eaa21dfe29010f0d143566874a04441
-  react-native-mmkv-storage: e798639f91601896f1c84f4eb3d6f19af2f4a160
+  react-native-mmkv-storage: d4ad55ab411b7f0d4e6269d801b31821ef48970b
  react-native-netinfo: ccbe1085dffd16592791d550189772e13bf479e2
  react-native-notification-sounds: da78c828fe1bcbb92d8b505d5261890ed315ff39
  react-native-orientation: f1caf84d65f1a4fd4511a18f2b924e634ad7a628
@@ -911,7 +911,7 @@ SPEC CHECKSUMS:
  RNFileViewer: ce7ca3ac370e18554d35d6355cffd7c30437c592
  RNFlashList: 399bf6a0db68f594ad2c86aaff3ea39564f39f8a
  RNGestureHandler: dec4645026e7401a0899f2846d864403478ff6a5
-  RNIap: fc9af04ee706894a80c9d8f979bae930b0dee191
+  RNIap: d248609d1b8937e63bd904e865c318e9b1457eff
  RNKeychain: 840f8e6f13be0576202aefcdffd26a4f54bfe7b5
  RNNotifee: 2ae3c18196e6f307fa62ae5c8e5305dea03ff147
  RNPrivacySnapshot: 8eaf571478a353f2e5184f5c803164f22428b023
--- a/apps/mobile/native/package.json
+++ b/apps/mobile/native/package.json
@@ -40,11 +40,11 @@
    "react-native-get-random-values": "^1.7.0",
    "react-native-gzip": "1.1.0",
    "react-native-html-to-pdf-lite": "^0.9.1",
-    "react-native-iap": "12.11.0",
+    "react-native-iap": "7.5.6",
    "react-native-image-picker": "4.1.2",
    "react-native-in-app-review": "4.3.3",
    "react-native-keychain": "4.0.5",
-    "react-native-mmkv-storage": "^0.10.0-alpha.11",
+    "react-native-mmkv-storage": "^0.10.0-alpha.9",
    "react-native-modal-datetime-picker": "14.0.0",
    "react-native-navigation-bar-color": "2.0.2",
    "react-native-notification-sounds": "0.5.5",
--- a/apps/mobile/package-lock.json
+++ b/apps/mobile/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@notesnook/mobile",
-  "version": "2.6.14",
+  "version": "2.6.5",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@notesnook/mobile",
-      "version": "2.6.14",
+      "version": "2.6.5",
      "hasInstallScript": true,
      "license": "GPL-3.0-or-later",
      "workspaces": [
@@ -26,8 +26,7 @@
        "@trpc/react-query": "10.38.3",
        "@trpc/server": "10.38.3",
        "react": "18.2.0",
-        "react-native": "0.72.0",
-        "react-native-iap": "12.11.0"
+        "react-native": "0.72.0"
      },
      "devDependencies": {
        "fonteditor-core": "^2.1.11",
@@ -111,29 +110,28 @@
        "@social-embed/lib": "^0.0.2-next.1",
        "@theme-ui/components": ">=0.14.0",
        "@theme-ui/core": ">=0.14.0",
-        "@tiptap/core": "2.1.12",
-        "@tiptap/extension-character-count": "2.1.12",
-        "@tiptap/extension-color": "2.1.12",
-        "@tiptap/extension-font-family": "2.1.12",
-        "@tiptap/extension-history": "2.1.12",
-        "@tiptap/extension-horizontal-rule": "2.1.12",
-        "@tiptap/extension-link": "2.1.12",
-        "@tiptap/extension-list-keymap": "2.1.12",
-        "@tiptap/extension-placeholder": "2.1.12",
-        "@tiptap/extension-subscript": "2.1.12",
-        "@tiptap/extension-superscript": "2.1.12",
-        "@tiptap/extension-table": "2.1.12",
-        "@tiptap/extension-table-cell": "2.1.12",
-        "@tiptap/extension-table-header": "2.1.12",
-        "@tiptap/extension-table-row": "2.1.12",
-        "@tiptap/extension-task-item": "2.1.12",
-        "@tiptap/extension-task-list": "2.1.12",
-        "@tiptap/extension-text-align": "2.1.12",
-        "@tiptap/extension-text-style": "2.1.12",
-        "@tiptap/extension-underline": "2.1.12",
-        "@tiptap/pm": "2.1.12",
-        "@tiptap/starter-kit": "2.1.12",
-        "async-mutex": "^0.4.0",
+        "@tiptap/core": "2.1.11",
+        "@tiptap/extension-character-count": "2.1.11",
+        "@tiptap/extension-color": "2.1.11",
+        "@tiptap/extension-font-family": "2.1.11",
+        "@tiptap/extension-history": "2.1.11",
+        "@tiptap/extension-horizontal-rule": "2.1.11",
+        "@tiptap/extension-link": "2.1.11",
+        "@tiptap/extension-list-keymap": "2.1.11",
+        "@tiptap/extension-placeholder": "2.1.11",
+        "@tiptap/extension-subscript": "2.1.11",
+        "@tiptap/extension-superscript": "2.1.11",
+        "@tiptap/extension-table": "2.1.11",
+        "@tiptap/extension-table-cell": "2.1.11",
+        "@tiptap/extension-table-header": "2.1.11",
+        "@tiptap/extension-table-row": "2.1.11",
+        "@tiptap/extension-task-item": "2.1.11",
+        "@tiptap/extension-task-list": "2.1.11",
+        "@tiptap/extension-text-align": "2.1.11",
+        "@tiptap/extension-text-style": "2.1.11",
+        "@tiptap/extension-underline": "2.1.11",
+        "@tiptap/pm": "2.1.11",
+        "@tiptap/starter-kit": "2.1.11",
        "clipboard-polyfill": "4.0.0",
        "detect-indent": "^7.0.0",
        "entities": "^4.5.0",
@@ -141,7 +139,7 @@
        "nanoid": "^4.0.1",
        "prism-themes": "^1.9.0",
        "prosemirror-codemark": "^0.4.2",
-        "prosemirror-view": "1.32.2",
+        "prosemirror-view": "^1.31.8",
        "re-resizable": "^6.9.9",
        "react-colorful": "^5.5.1",
        "react-modal": "3.13.1",
@@ -191,7 +189,6 @@
        "@mdi/react": "^1.6.0",
        "@notesnook/editor": "file:../editor",
        "@notesnook/theme": "file:../theme",
-        "buffer": "^6.0.3",
        "framer-motion": "^6.5.1",
        "mdi-react": "9.1.0",
        "react": "^17.0.2",
@@ -259,7 +256,7 @@
        "katex": "0.16.2",
        "phone": "^3.1.14",
        "qclone": "^1.2.0",
-        "react-native-actions-sheet": "0.9.0-alpha.24",
+        "react-native-actions-sheet": "0.9.0-alpha.23",
        "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",
@@ -316,11 +313,11 @@
        "react-native-get-random-values": "^1.7.0",
        "react-native-gzip": "1.1.0",
        "react-native-html-to-pdf-lite": "^0.9.1",
-        "react-native-iap": "12.11.0",
+        "react-native-iap": "7.5.6",
        "react-native-image-picker": "4.1.2",
        "react-native-in-app-review": "4.3.3",
        "react-native-keychain": "4.0.5",
-        "react-native-mmkv-storage": "^0.10.0-alpha.11",
+        "react-native-mmkv-storage": "^0.10.0-alpha.9",
        "react-native-modal-datetime-picker": "14.0.0",
        "react-native-navigation-bar-color": "2.0.2",
        "react-native-notification-sounds": "0.5.5",
@@ -5046,169 +5043,6 @@
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
      }
    },
-    "node_modules/@expo/config-plugins": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-6.0.2.tgz",
-      "integrity": "sha512-Cn01fXMHwjU042EgO9oO3Mna0o/UCrW91MQLMbJa4pXM41CYGjNgVy1EVXiuRRx/upegHhvltBw5D+JaUm8aZQ==",
-      "dependencies": {
-        "@expo/config-types": "^48.0.0",
-        "@expo/json-file": "~8.2.37",
-        "@expo/plist": "^0.0.20",
-        "@expo/sdk-runtime-versions": "^1.0.0",
-        "@react-native/normalize-color": "^2.0.0",
-        "chalk": "^4.1.2",
-        "debug": "^4.3.1",
-        "find-up": "~5.0.0",
-        "getenv": "^1.0.0",
-        "glob": "7.1.6",
-        "resolve-from": "^5.0.0",
-        "semver": "^7.3.5",
-        "slash": "^3.0.0",
-        "xcode": "^3.0.1",
-        "xml2js": "0.4.23"
-      }
-    },
-    "node_modules/@expo/config-plugins/node_modules/glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@expo/config-plugins/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@expo/config-plugins/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@expo/config-plugins/node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@expo/config-plugins/node_modules/uuid": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
-      "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/@expo/config-plugins/node_modules/xcode": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/xcode/-/xcode-3.0.1.tgz",
-      "integrity": "sha512-kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA==",
-      "dependencies": {
-        "simple-plist": "^1.1.0",
-        "uuid": "^7.0.3"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/@expo/config-plugins/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/@expo/config-types": {
-      "version": "48.0.0",
-      "resolved": "https://registry.npmjs.org/@expo/config-types/-/config-types-48.0.0.tgz",
-      "integrity": "sha512-DwyV4jTy/+cLzXGAo1xftS6mVlSiLIWZjl9DjTCLPFVgNYQxnh7htPilRv4rBhiNs7KaznWqKU70+4zQoKVT9A=="
-    },
-    "node_modules/@expo/json-file": {
-      "version": "8.2.37",
-      "resolved": "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.37.tgz",
-      "integrity": "sha512-YaH6rVg11JoTS2P6LsW7ybS2CULjf40AbnAHw2F1eDPuheprNjARZMnyHFPkKv7GuxCy+B9GPcbOKgc4cgA80Q==",
-      "dependencies": {
-        "@babel/code-frame": "~7.10.4",
-        "json5": "^2.2.2",
-        "write-file-atomic": "^2.3.0"
-      }
-    },
-    "node_modules/@expo/json-file/node_modules/@babel/code-frame": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "node_modules/@expo/json-file/node_modules/write-file-atomic": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
-      "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
-      "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "node_modules/@expo/plist": {
-      "version": "0.0.20",
-      "resolved": "https://registry.npmjs.org/@expo/plist/-/plist-0.0.20.tgz",
-      "integrity": "sha512-UXQ4LXCfTZ580LDHGJ5q62jSTwJFFJ1GqBu8duQMThiHKWbMJ+gajJh6rsB6EJ3aLUr9wcauxneL5LVRFxwBEA==",
-      "dependencies": {
-        "@xmldom/xmldom": "~0.7.7",
-        "base64-js": "^1.2.3",
-        "xmlbuilder": "^14.0.0"
-      }
-    },
-    "node_modules/@expo/plist/node_modules/@xmldom/xmldom": {
-      "version": "0.7.13",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.13.tgz",
-      "integrity": "sha512-lm2GW5PkosIzccsaZIz7tp8cPADSIlIHWDFTR1N0SzfinhhYgeIQjFMz4rYzanCScr3DqQLeomUDArp6MWKm+g==",
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/@expo/plist/node_modules/xmlbuilder": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-14.0.0.tgz",
-      "integrity": "sha512-ts+B2rSe4fIckR6iquDjsKbQFK2NlUk6iG5nf14mDEyldgoc2nEKZ3jZWMPTxGQwVgToSjt6VGIho1H8/fNFTg==",
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/@expo/sdk-runtime-versions": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@expo/sdk-runtime-versions/-/sdk-runtime-versions-1.0.0.tgz",
-      "integrity": "sha512-Doz2bfiPndXYFPMRwPyGa1k5QaKDVpY806UJj570epIiMzWaYyCtobasyfC++qfIXVb5Ocy7r3tP9d62hAQ7IQ=="
-    },
    "node_modules/@fastify/ajv-compiler": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/@fastify/ajv-compiler/-/ajv-compiler-1.1.0.tgz",
@@ -10319,6 +10153,15 @@
        "url": "https://github.com/fb55/domutils?sponsor=1"
      }
    },
+    "node_modules/dooboolab-welcome": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/dooboolab-welcome/-/dooboolab-welcome-1.3.2.tgz",
+      "integrity": "sha512-2NbMaIIURElxEf/UAoVUFlXrO+7n/FRhLCiQlk4fkbGRh9cJ3/f8VEMPveR9m4Ug2l2Zey+UCXjd6EcBqHJ5bw==",
+      "hasInstallScript": true,
+      "bin": {
+        "dooboolab-welcome": "bin/hello.js"
+      }
+    },
    "node_modules/dtrace-provider": {
      "version": "0.8.8",
      "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.8.tgz",
@@ -12343,14 +12186,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/getenv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/getenv/-/getenv-1.0.0.tgz",
-      "integrity": "sha512-7yetJWqbS9sbn0vIfliPsFgoXMKn/YMF+Wuiog97x+urnSRRRZ7xB+uVkwGKzRgq9CDFfMQnE9ruL5DHv9c6Xg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
    "node_modules/gifwrap": {
      "version": "0.9.4",
      "resolved": "https://registry.npmjs.org/gifwrap/-/gifwrap-0.9.4.tgz",
@@ -18139,9 +17974,9 @@
      }
    },
    "node_modules/react-native-actions-sheet": {
-      "version": "0.9.0-alpha.24",
-      "resolved": "https://registry.npmjs.org/react-native-actions-sheet/-/react-native-actions-sheet-0.9.0-alpha.24.tgz",
-      "integrity": "sha512-NF0oO0vf3DrFsqI+pbQ+HTG2q+VEotkVwhtFr8aLiUFJT876icVOSurCaeqD1t4zHtH2U5qa8vKQxbA/j5Mu8w==",
+      "version": "0.9.0-alpha.23",
+      "resolved": "https://registry.npmjs.org/react-native-actions-sheet/-/react-native-actions-sheet-0.9.0-alpha.23.tgz",
+      "integrity": "sha512-d8sZJHKjme33i34zQ8+oIsGs8wY+GCDtxDboExgpO1OoB9np1y4tGOf3ZHyfIpClITpuy+LT7r9Uz+KfAJTMHA==",
      "peerDependencies": {
        "react-native": "*",
        "react-native-gesture-handler": "*"
@@ -18408,15 +18243,15 @@
      "integrity": "sha512-HeD7YDHO7pL/4n/lAJCo1L4x0+JeKiME95B8jwH8lGBzkcHNX1hmb+CFM9SGSI//YtUL/a2sQjjkkoh6Cf7GNw=="
    },
    "node_modules/react-native-iap": {
-      "version": "12.11.0",
-      "resolved": "https://registry.npmjs.org/react-native-iap/-/react-native-iap-12.11.0.tgz",
-      "integrity": "sha512-KrRHTqbwEypntb/C+zyD2cV7fRi2Izx9NTd0fIb30yUIvIZ5sD5RQd0kOcabqyQYzfSYPAnZVUIXEtOfjwcJFg==",
+      "version": "7.5.6",
+      "resolved": "https://registry.npmjs.org/react-native-iap/-/react-native-iap-7.5.6.tgz",
+      "integrity": "sha512-ua+KTq7NO+/Rw+S9cGDZizR45AdmpQ0LEx9gSubbRD3f5KSTp91mEMHgdyVcqUcxiBuVgRTfv3zy9mbPEdo8Mg==",
      "dependencies": {
-        "@expo/config-plugins": "^6.0.1"
+        "dooboolab-welcome": "1.3.2"
      },
      "peerDependencies": {
        "react": ">=16.13.1",
-        "react-native": ">=0.65.1"
+        "react-native": ">=0.54"
      }
    },
    "node_modules/react-native-image-pan-zoom": {
@@ -18480,9 +18315,9 @@
      "integrity": "sha512-TbiO8AO055EPjaxIuKxrCEOB4r81uQCVDFbtcs+e4pEOHxf6z3JgDC0UU0poJElKfCh37b+TFRxQhg6DbsYJBA=="
    },
    "node_modules/react-native-mmkv-storage": {
-      "version": "0.10.0-alpha.11",
-      "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.10.0-alpha.11.tgz",
-      "integrity": "sha512-rr5i7v9aOgMHZ3a7LjpwCrHd2ULdCX2Q+n+zlDOEgfXV0P+4EloptE39Z4iOQhQPyr3b/s3q9gj+4sS1QCPkHw==",
+      "version": "0.10.0-alpha.9",
+      "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.10.0-alpha.9.tgz",
+      "integrity": "sha512-nv1A0t5dxhcAtMnhqqBodNp94U4QziW1RO352GB3BPpic03abPHj+0HjBJH72VeKKMfYIc0PR5pmo6BbsaPExw==",
      "bin": {
        "mmkv-link": "autolink/postlink/run.js"
      },
@@ -19097,6 +18932,7 @@
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
      "engines": {
        "node": ">=8"
      }
@@ -25724,145 +25560,6 @@
      "integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==",
      "dev": true
    },
-    "@expo/config-plugins": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-6.0.2.tgz",
-      "integrity": "sha512-Cn01fXMHwjU042EgO9oO3Mna0o/UCrW91MQLMbJa4pXM41CYGjNgVy1EVXiuRRx/upegHhvltBw5D+JaUm8aZQ==",
-      "requires": {
-        "@expo/config-types": "^48.0.0",
-        "@expo/json-file": "~8.2.37",
-        "@expo/plist": "^0.0.20",
-        "@expo/sdk-runtime-versions": "^1.0.0",
-        "@react-native/normalize-color": "^2.0.0",
-        "chalk": "^4.1.2",
-        "debug": "^4.3.1",
-        "find-up": "~5.0.0",
-        "getenv": "^1.0.0",
-        "glob": "7.1.6",
-        "resolve-from": "^5.0.0",
-        "semver": "^7.3.5",
-        "slash": "^3.0.0",
-        "xcode": "^3.0.1",
-        "xml2js": "0.4.23"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
-        },
-        "uuid": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
-          "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
-        },
-        "xcode": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/xcode/-/xcode-3.0.1.tgz",
-          "integrity": "sha512-kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA==",
-          "requires": {
-            "simple-plist": "^1.1.0",
-            "uuid": "^7.0.3"
-          }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-        }
-      }
-    },
-    "@expo/config-types": {
-      "version": "48.0.0",
-      "resolved": "https://registry.npmjs.org/@expo/config-types/-/config-types-48.0.0.tgz",
-      "integrity": "sha512-DwyV4jTy/+cLzXGAo1xftS6mVlSiLIWZjl9DjTCLPFVgNYQxnh7htPilRv4rBhiNs7KaznWqKU70+4zQoKVT9A=="
-    },
-    "@expo/json-file": {
-      "version": "8.2.37",
-      "resolved": "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.37.tgz",
-      "integrity": "sha512-YaH6rVg11JoTS2P6LsW7ybS2CULjf40AbnAHw2F1eDPuheprNjARZMnyHFPkKv7GuxCy+B9GPcbOKgc4cgA80Q==",
-      "requires": {
-        "@babel/code-frame": "~7.10.4",
-        "json5": "^2.2.2",
-        "write-file-atomic": "^2.3.0"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-          "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
-        "write-file-atomic": {
-          "version": "2.4.3",
-          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
-          "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "imurmurhash": "^0.1.4",
-            "signal-exit": "^3.0.2"
-          }
-        }
-      }
-    },
-    "@expo/plist": {
-      "version": "0.0.20",
-      "resolved": "https://registry.npmjs.org/@expo/plist/-/plist-0.0.20.tgz",
-      "integrity": "sha512-UXQ4LXCfTZ580LDHGJ5q62jSTwJFFJ1GqBu8duQMThiHKWbMJ+gajJh6rsB6EJ3aLUr9wcauxneL5LVRFxwBEA==",
-      "requires": {
-        "@xmldom/xmldom": "~0.7.7",
-        "base64-js": "^1.2.3",
-        "xmlbuilder": "^14.0.0"
-      },
-      "dependencies": {
-        "@xmldom/xmldom": {
-          "version": "0.7.13",
-          "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.13.tgz",
-          "integrity": "sha512-lm2GW5PkosIzccsaZIz7tp8cPADSIlIHWDFTR1N0SzfinhhYgeIQjFMz4rYzanCScr3DqQLeomUDArp6MWKm+g=="
-        },
-        "xmlbuilder": {
-          "version": "14.0.0",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-14.0.0.tgz",
-          "integrity": "sha512-ts+B2rSe4fIckR6iquDjsKbQFK2NlUk6iG5nf14mDEyldgoc2nEKZ3jZWMPTxGQwVgToSjt6VGIho1H8/fNFTg=="
-        }
-      }
-    },
-    "@expo/sdk-runtime-versions": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@expo/sdk-runtime-versions/-/sdk-runtime-versions-1.0.0.tgz",
-      "integrity": "sha512-Doz2bfiPndXYFPMRwPyGa1k5QaKDVpY806UJj570epIiMzWaYyCtobasyfC++qfIXVb5Ocy7r3tP9d62hAQ7IQ=="
-    },
    "@fastify/ajv-compiler": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/@fastify/ajv-compiler/-/ajv-compiler-1.1.0.tgz",
@@ -26876,28 +26573,28 @@
        "@social-embed/lib": "^0.0.2-next.1",
        "@theme-ui/components": ">=0.14.0",
        "@theme-ui/core": ">=0.14.0",
-        "@tiptap/core": "2.1.12",
-        "@tiptap/extension-character-count": "2.1.12",
-        "@tiptap/extension-color": "2.1.12",
-        "@tiptap/extension-font-family": "2.1.12",
-        "@tiptap/extension-history": "2.1.12",
-        "@tiptap/extension-horizontal-rule": "2.1.12",
-        "@tiptap/extension-link": "2.1.12",
-        "@tiptap/extension-list-keymap": "2.1.12",
-        "@tiptap/extension-placeholder": "2.1.12",
-        "@tiptap/extension-subscript": "2.1.12",
-        "@tiptap/extension-superscript": "2.1.12",
-        "@tiptap/extension-table": "2.1.12",
-        "@tiptap/extension-table-cell": "2.1.12",
-        "@tiptap/extension-table-header": "2.1.12",
-        "@tiptap/extension-table-row": "2.1.12",
-        "@tiptap/extension-task-item": "2.1.12",
-        "@tiptap/extension-task-list": "2.1.12",
-        "@tiptap/extension-text-align": "2.1.12",
-        "@tiptap/extension-text-style": "2.1.12",
-        "@tiptap/extension-underline": "2.1.12",
-        "@tiptap/pm": "2.1.12",
-        "@tiptap/starter-kit": "2.1.12",
+        "@tiptap/core": "2.1.11",
+        "@tiptap/extension-character-count": "2.1.11",
+        "@tiptap/extension-color": "2.1.11",
+        "@tiptap/extension-font-family": "2.1.11",
+        "@tiptap/extension-history": "2.1.11",
+        "@tiptap/extension-horizontal-rule": "2.1.11",
+        "@tiptap/extension-link": "2.1.11",
+        "@tiptap/extension-list-keymap": "2.1.11",
+        "@tiptap/extension-placeholder": "2.1.11",
+        "@tiptap/extension-subscript": "2.1.11",
+        "@tiptap/extension-superscript": "2.1.11",
+        "@tiptap/extension-table": "2.1.11",
+        "@tiptap/extension-table-cell": "2.1.11",
+        "@tiptap/extension-table-header": "2.1.11",
+        "@tiptap/extension-table-row": "2.1.11",
+        "@tiptap/extension-task-item": "2.1.11",
+        "@tiptap/extension-task-list": "2.1.11",
+        "@tiptap/extension-text-align": "2.1.11",
+        "@tiptap/extension-text-style": "2.1.11",
+        "@tiptap/extension-underline": "2.1.11",
+        "@tiptap/pm": "2.1.11",
+        "@tiptap/starter-kit": "2.1.11",
        "@types/katex": "^0.14.0",
        "@types/prismjs": "^1.26.0",
        "@types/react": "17.0.2",
@@ -26905,7 +26602,6 @@
        "@types/react-dom": "17.0.2",
        "@types/react-modal": "3.13.1",
        "@types/tinycolor2": "^1.4.3",
-        "async-mutex": "^0.4.0",
        "clipboard-polyfill": "4.0.0",
        "detect-indent": "^7.0.0",
        "entities": "^4.5.0",
@@ -26917,7 +26613,7 @@
        "prism-themes": "^1.9.0",
        "prosemirror-codemark": "^0.4.2",
        "prosemirror-test-builder": "^1.1.0",
-        "prosemirror-view": "1.32.2",
+        "prosemirror-view": "^1.31.8",
        "re-resizable": "^6.9.9",
        "react": "17.0.2",
        "react-colorful": "^5.5.1",
@@ -26950,7 +26646,6 @@
        "@types/node": "^16.11.11",
        "@types/react": "^17.0.2",
        "@types/react-dom": "^17.0.2",
-        "buffer": "^6.0.3",
        "env-cmd": "^10.1.0",
        "framer-motion": "^6.5.1",
        "ip": "^1.1.8",
@@ -26982,7 +26677,7 @@
        "katex": "0.16.2",
        "phone": "^3.1.14",
        "qclone": "^1.2.0",
-        "react-native-actions-sheet": "0.9.0-alpha.24",
+        "react-native-actions-sheet": "0.9.0-alpha.23",
        "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",
@@ -27074,11 +26769,11 @@
        "react-native-get-random-values": "^1.7.0",
        "react-native-gzip": "1.1.0",
        "react-native-html-to-pdf-lite": "^0.9.1",
-        "react-native-iap": "12.11.0",
+        "react-native-iap": "7.5.6",
        "react-native-image-picker": "4.1.2",
        "react-native-in-app-review": "4.3.3",
        "react-native-keychain": "4.0.5",
-        "react-native-mmkv-storage": "^0.10.0-alpha.11",
+        "react-native-mmkv-storage": "^0.10.0-alpha.9",
        "react-native-modal-datetime-picker": "14.0.0",
        "react-native-navigation-bar-color": "2.0.2",
        "react-native-notification-sounds": "0.5.5",
@@ -30061,6 +29756,11 @@
        "domhandler": "^5.0.3"
      }
    },
+    "dooboolab-welcome": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/dooboolab-welcome/-/dooboolab-welcome-1.3.2.tgz",
+      "integrity": "sha512-2NbMaIIURElxEf/UAoVUFlXrO+7n/FRhLCiQlk4fkbGRh9cJ3/f8VEMPveR9m4Ug2l2Zey+UCXjd6EcBqHJ5bw=="
+    },
    "dtrace-provider": {
      "version": "0.8.8",
      "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.8.tgz",
@@ -31605,11 +31305,6 @@
      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
      "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA=="
    },
-    "getenv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/getenv/-/getenv-1.0.0.tgz",
-      "integrity": "sha512-7yetJWqbS9sbn0vIfliPsFgoXMKn/YMF+Wuiog97x+urnSRRRZ7xB+uVkwGKzRgq9CDFfMQnE9ruL5DHv9c6Xg=="
-    },
    "gifwrap": {
      "version": "0.9.4",
      "resolved": "https://registry.npmjs.org/gifwrap/-/gifwrap-0.9.4.tgz",
@@ -35955,9 +35650,9 @@
      }
    },
    "react-native-actions-sheet": {
-      "version": "0.9.0-alpha.24",
-      "resolved": "https://registry.npmjs.org/react-native-actions-sheet/-/react-native-actions-sheet-0.9.0-alpha.24.tgz",
-      "integrity": "sha512-NF0oO0vf3DrFsqI+pbQ+HTG2q+VEotkVwhtFr8aLiUFJT876icVOSurCaeqD1t4zHtH2U5qa8vKQxbA/j5Mu8w=="
+      "version": "0.9.0-alpha.23",
+      "resolved": "https://registry.npmjs.org/react-native-actions-sheet/-/react-native-actions-sheet-0.9.0-alpha.23.tgz",
+      "integrity": "sha512-d8sZJHKjme33i34zQ8+oIsGs8wY+GCDtxDboExgpO1OoB9np1y4tGOf3ZHyfIpClITpuy+LT7r9Uz+KfAJTMHA=="
    },
    "react-native-actions-shortcuts": {
      "version": "1.0.1",
@@ -36136,11 +35831,11 @@
      "integrity": "sha512-HeD7YDHO7pL/4n/lAJCo1L4x0+JeKiME95B8jwH8lGBzkcHNX1hmb+CFM9SGSI//YtUL/a2sQjjkkoh6Cf7GNw=="
    },
    "react-native-iap": {
-      "version": "12.11.0",
-      "resolved": "https://registry.npmjs.org/react-native-iap/-/react-native-iap-12.11.0.tgz",
-      "integrity": "sha512-KrRHTqbwEypntb/C+zyD2cV7fRi2Izx9NTd0fIb30yUIvIZ5sD5RQd0kOcabqyQYzfSYPAnZVUIXEtOfjwcJFg==",
+      "version": "7.5.6",
+      "resolved": "https://registry.npmjs.org/react-native-iap/-/react-native-iap-7.5.6.tgz",
+      "integrity": "sha512-ua+KTq7NO+/Rw+S9cGDZizR45AdmpQ0LEx9gSubbRD3f5KSTp91mEMHgdyVcqUcxiBuVgRTfv3zy9mbPEdo8Mg==",
      "requires": {
-        "@expo/config-plugins": "^6.0.1"
+        "dooboolab-welcome": "1.3.2"
      }
    },
    "react-native-image-pan-zoom": {
@@ -36186,9 +35881,9 @@
      "integrity": "sha512-TbiO8AO055EPjaxIuKxrCEOB4r81uQCVDFbtcs+e4pEOHxf6z3JgDC0UU0poJElKfCh37b+TFRxQhg6DbsYJBA=="
    },
    "react-native-mmkv-storage": {
-      "version": "0.10.0-alpha.11",
-      "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.10.0-alpha.11.tgz",
-      "integrity": "sha512-rr5i7v9aOgMHZ3a7LjpwCrHd2ULdCX2Q+n+zlDOEgfXV0P+4EloptE39Z4iOQhQPyr3b/s3q9gj+4sS1QCPkHw=="
+      "version": "0.10.0-alpha.9",
+      "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.10.0-alpha.9.tgz",
+      "integrity": "sha512-nv1A0t5dxhcAtMnhqqBodNp94U4QziW1RO352GB3BPpic03abPHj+0HjBJH72VeKKMfYIc0PR5pmo6BbsaPExw=="
    },
    "react-native-modal-datetime-picker": {
      "version": "14.0.0",
@@ -36640,7 +36335,8 @@
    "resolve-from": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true
    },
    "resolve-url": {
      "version": "0.2.1",
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@notesnook/mobile",
-  "version": "2.6.14",
+  "version": "2.6.6",
  "private": true,
  "license": "GPL-3.0-or-later",
  "workspaces": [
@@ -41,7 +41,6 @@
    "@trpc/react-query": "10.38.3",
    "@trpc/server": "10.38.3",
    "react": "18.2.0",
-    "react-native": "0.72.0",
-    "react-native-iap": "12.11.0"
+    "react-native": "0.72.0"
  }
-}
+}
--- a/apps/mobile/patches/react-native-vector-icons+9.2.0.patch
+++ b/apps/mobile/patches/react-native-vector-icons+9.2.0.patch
@@ -7,8 +7,7 @@ index 0000000..0d259dd
 +o/classes
 diff --git a/node_modules/react-native-vector-icons/android/build/.transforms/f1314fc28eaff1170375cbb76465cb24/transformed/classes/classes.dex b/node_modules/react-native-vector-icons/android/build/.transforms/f1314fc28eaff1170375cbb76465cb24/transformed/classes/classes.dex
 new file mode 100644
-index 0000000..d4bdd72
-Binary files /dev/null and b/node_modules/react-native-vector-icons/android/build/.transforms/f1314fc28eaff1170375cbb76465cb24/transformed/classes/classes.dex differ
+index 0000000..e69de29
 diff --git a/node_modules/react-native-vector-icons/android/build/generated/source/buildConfig/debug/com/oblador/vectoricons/BuildConfig.java b/node_modules/react-native-vector-icons/android/build/generated/source/buildConfig/debug/com/oblador/vectoricons/BuildConfig.java
 new file mode 100644
 index 0000000..52a02e0
@@ -85,12 +84,10 @@ index 0000000..9e26dfe
 \ No newline at end of file
 diff --git a/node_modules/react-native-vector-icons/android/build/intermediates/compile_library_classes_jar/debug/classes.jar b/node_modules/react-native-vector-icons/android/build/intermediates/compile_library_classes_jar/debug/classes.jar
 new file mode 100644
-index 0000000..77c2a69
-Binary files /dev/null and b/node_modules/react-native-vector-icons/android/build/intermediates/compile_library_classes_jar/debug/classes.jar differ
+index 0000000..e69de29
 diff --git a/node_modules/react-native-vector-icons/android/build/intermediates/compile_r_class_jar/debug/R.jar b/node_modules/react-native-vector-icons/android/build/intermediates/compile_r_class_jar/debug/R.jar
 new file mode 100644
-index 0000000..bd4434a
-Binary files /dev/null and b/node_modules/react-native-vector-icons/android/build/intermediates/compile_r_class_jar/debug/R.jar differ
+index 0000000..e69de29
 diff --git a/node_modules/react-native-vector-icons/android/build/intermediates/compile_symbol_list/debug/R.txt b/node_modules/react-native-vector-icons/android/build/intermediates/compile_symbol_list/debug/R.txt
 new file mode 100644
 index 0000000..5347f17
@@ -2053,11 +2050,11 @@ index 0000000..5347f17
 +int xml rn_dev_preferences 0x0
 diff --git a/node_modules/react-native-vector-icons/android/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/node_modules/react-native-vector-icons/android/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
 new file mode 100644
-index 0000000..c671bf3
+index 0000000..2dd0b63
 --- /dev/null
 +++ b/node_modules/react-native-vector-icons/android/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@@ -0,0 +1 @@
-+#Mon Oct 02 09:47:12 PKT 2023
+#Wed Aug 02 11:28:45 PKT 2023
 diff --git a/node_modules/react-native-vector-icons/android/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/node_modules/react-native-vector-icons/android/build/intermediates/incremental/debug/packageDebugResources/merger.xml
 new file mode 100644
 index 0000000..08d62cc
@@ -2096,20 +2093,16 @@ index 0000000..ef96fe3
 \ No newline at end of file
 diff --git a/node_modules/react-native-vector-icons/android/build/intermediates/javac/debug/classes/com/oblador/vectoricons/BuildConfig.class b/node_modules/react-native-vector-icons/android/build/intermediates/javac/debug/classes/com/oblador/vectoricons/BuildConfig.class
 new file mode 100644
-index 0000000..1276d6a
-Binary files /dev/null and b/node_modules/react-native-vector-icons/android/build/intermediates/javac/debug/classes/com/oblador/vectoricons/BuildConfig.class differ
+index 0000000..e69de29
 diff --git a/node_modules/react-native-vector-icons/android/build/intermediates/javac/debug/classes/com/oblador/vectoricons/VectorIconsModule$Errors.class b/node_modules/react-native-vector-icons/android/build/intermediates/javac/debug/classes/com/oblador/vectoricons/VectorIconsModule$Errors.class
 new file mode 100644
-index 0000000..3348b06
-Binary files /dev/null and b/node_modules/react-native-vector-icons/android/build/intermediates/javac/debug/classes/com/oblador/vectoricons/VectorIconsModule$Errors.class differ
+index 0000000..e69de29
 diff --git a/node_modules/react-native-vector-icons/android/build/intermediates/javac/debug/classes/com/oblador/vectoricons/VectorIconsModule.class b/node_modules/react-native-vector-icons/android/build/intermediates/javac/debug/classes/com/oblador/vectoricons/VectorIconsModule.class
 new file mode 100644
-index 0000000..de0d974
-Binary files /dev/null and b/node_modules/react-native-vector-icons/android/build/intermediates/javac/debug/classes/com/oblador/vectoricons/VectorIconsModule.class differ
+index 0000000..e69de29
 diff --git a/node_modules/react-native-vector-icons/android/build/intermediates/javac/debug/classes/com/oblador/vectoricons/VectorIconsPackage.class b/node_modules/react-native-vector-icons/android/build/intermediates/javac/debug/classes/com/oblador/vectoricons/VectorIconsPackage.class
 new file mode 100644
-index 0000000..07a935e
-Binary files /dev/null and b/node_modules/react-native-vector-icons/android/build/intermediates/javac/debug/classes/com/oblador/vectoricons/VectorIconsPackage.class differ
+index 0000000..e69de29
 diff --git a/node_modules/react-native-vector-icons/android/build/intermediates/local_only_symbol_list/debug/R-def.txt b/node_modules/react-native-vector-icons/android/build/intermediates/local_only_symbol_list/debug/R-def.txt
 new file mode 100644
 index 0000000..78ac5b8
@@ -2181,8 +2174,7 @@ index 0000000..0be2a09
 \ No newline at end of file
 diff --git a/node_modules/react-native-vector-icons/android/build/intermediates/runtime_library_classes_jar/debug/classes.jar b/node_modules/react-native-vector-icons/android/build/intermediates/runtime_library_classes_jar/debug/classes.jar
 new file mode 100644
-index 0000000..f0a7660
-Binary files /dev/null and b/node_modules/react-native-vector-icons/android/build/intermediates/runtime_library_classes_jar/debug/classes.jar differ
+index 0000000..e69de29
 diff --git a/node_modules/react-native-vector-icons/android/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt b/node_modules/react-native-vector-icons/android/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt
 new file mode 100644
 index 0000000..873e0a9
@@ -3669,8 +3661,7 @@ index 0000000..f4f75c1
 +		INJECTED from /Users/ammarahmed/Repos/apps/notesnook/apps/mobile/node_modules/react-native-vector-icons/android/src/main/AndroidManifest.xml
 diff --git a/node_modules/react-native-vector-icons/android/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/node_modules/react-native-vector-icons/android/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
 new file mode 100644
-index 0000000..26da0e3
-Binary files /dev/null and b/node_modules/react-native-vector-icons/android/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ
+index 0000000..e69de29
 diff --git a/node_modules/react-native-vector-icons/fonts.gradle b/node_modules/react-native-vector-icons/fonts.gradle
 index 5485fac..ef3ccb3 100644
 --- a/node_modules/react-native-vector-icons/fonts.gradle
@@ -3687,7 +3678,7 @@ index 5485fac..ef3ccb3 100644
         generateAssetsTask.dependsOn(fontCopyTask)
     }
 diff --git a/node_modules/react-native-vector-icons/glyphmaps/MaterialCommunityIcons.json b/node_modules/react-native-vector-icons/glyphmaps/MaterialCommunityIcons.json
-index c06a819..13c76cc 100644
+index c06a819..0962de1 100644
 --- a/node_modules/react-native-vector-icons/glyphmaps/MaterialCommunityIcons.json
 +++ b/node_modules/react-native-vector-icons/glyphmaps/MaterialCommunityIcons.json
@@ -1,6598 +1 @@
@@ -10290,7 +10281,7 @@ index c06a819..13c76cc 100644
 -  "blank": 63116
 -}
 \ No newline at end of file
-+{"menu":983900,"lock-open-outline":983872,"key-outline":986582,"pin-off-outline":985392,"pin-outline":985393,"star-off":984273,"star-outline":984274,"link-variant-remove":987393,"link-variant":983865,"bell":983194,"bell-off-outline":985745,"check":983340,"magnify":983881,"plus":984085,"view-list-outline":988299,"view-list":984434,"play":984074,"pause":984036,"notebook-outline":986815,"text-short":985513,"radiobox-marked":984126,"radiobox-blank":984125,"sort-descending":984253,"information":983804,"sort-ascending":984252,"alert":983078,"arrow-right":983124,"bookmark-outline":983235,"checkbox-marked":983346,"checkbox-blank-outline":983345,"unfold-less-horizontal":984398,"minus-circle":983926,"vibrate":984422,"volume-high":984446,"checkbox-blank-circle-outline":983344,"check-circle-outline":984545,"chevron-up":983363,"chevron-down":983360,"calendar":983277,"minus-circle-outline":983927,"close-circle-outline":983386,"qrcode":984114,"text":985512,"cloud":983391,"book-outline":985956,"pound":984099,"clock-plus-outline":989282,"cloud-upload-outline":985982,"export":983559,"message-badge-outline":989506,"square-edit-outline":985356,"content-copy":983439,"delete-restore":985113,"share-variant":984215,"pencil-lock":984046,"sync-off":984296,"content-duplicate":983441,"theme-light-dark":984334,"pencil":984043,"clock-outline":983376,"attachment":983142,"history":983770,"notebook":985134,"bookmark":983232,"delete-outline":985575,"delete":983476,"link":983863,"cloud-upload":983399,"star":984270,"key":983814,"account-outline":983059,"email":983534,"backup-restore":983151,"update":984752,"android":983090,"web":984479,"home-variant-outline":986023,"text-box-multiple-outline":985784,"download":983514,"arrow-left":983117,"dots-horizontal":983512,"chevron-right":983362,"close":983382,"cellphone-key":985422,"message-plus-outline":987323,"email-outline":983536,"shield-lock":985501,"chevron-left":983361,"minus":983924,"crown":983461,"account-cog":988016,"two-factor-authentication":985519,"information-outline":983805,"logout":983875,"autorenew":983146,"sync-alert":984295,"shape":985137,"circle-half":988053,"brightness-6":983263,"note-edit-outline":989058,"format-line-spacing":983672,"format-size":983679,"format-font":984790,"radar":984119,"arrow-decision-outline":985534,"fingerprint":983607,"eye-off-outline":984785,"folder":983627,"lock":983870,"form-textbox":984590,"bell-outline":983196,"bell-ring":983198,"bug":983268,"mail":986811,"file-document":983577,"mastodon":985809,"twitter":984388,"discord":984687,"open-source-initiative":986030,"monitor":983929,"chart-timeline":984686,"cellphone-arrow-down":985557,"alpha-v":985859,"circle-small":985567,"upload":984402,"file-check":983574,"file":983572,"alert-circle-outline":984534,"check-all":983341,"shield-key-outline":986053,"dots-vertical":983513,"emoticon-wink":986232,"sync":984294,"shield":984216,"billboard":987152,"cellphone":983324,"cellphone-lock":985423,"file-lock":983585,"image-multiple":983801,"harddisk":983754,"file-cabinet":985782,"refresh":984144,"emoticon":986216,"palette":984024,"pin":984067,"format-bold":983652,"table":984299,"language-markdown":983892,"gesture-tap-button":987816,"send-lock":985069,"bomb":984721,"file-pdf-box":983590,"language-html5":983837,"clipboard-text-outline":985656,"invert-colors":983809,"select-all":984198,"cog-outline":985275,"arrow-top-right-thick":985542,"checkbox-blank-circle":983343,"note":983962,"drag":983515,"menu-down":983901,"alert-circle":983080,"reload":984147,"card-text":985975,"open-in-new":984012,"eye":983560}
+{"menu":983900,"lock-open-outline":983872,"key-outline":986582,"pin-off-outline":985392,"pin-outline":985393,"star-off":984273,"star-outline":984274,"link-variant-remove":987393,"link-variant":983865,"bell":983194,"bell-off-outline":985745,"check":983340,"magnify":983881,"plus":984085,"view-list-outline":988299,"view-list":984434,"play":984074,"pause":984036,"notebook-outline":986815,"text-short":985513,"radiobox-marked":984126,"radiobox-blank":984125,"sort-descending":984253,"information":983804,"sort-ascending":984252,"alert":983078,"arrow-right":983124,"bookmark-outline":983235,"checkbox-marked":983346,"checkbox-blank-outline":983345,"unfold-less-horizontal":984398,"minus-circle":983926,"vibrate":984422,"volume-high":984446,"checkbox-blank-circle-outline":983344,"check-circle-outline":984545,"chevron-up":983363,"chevron-down":983360,"calendar":983277,"book-outline":985956,"pound":984099,"clock-plus-outline":989282,"cloud-upload-outline":985982,"export":983559,"message-badge-outline":989506,"square-edit-outline":985356,"content-copy":983439,"delete-restore":985113,"share-variant":984215,"pencil-lock":984046,"sync-off":984296,"content-duplicate":983441,"theme-light-dark":984334,"pencil":984043,"clock-outline":983376,"attachment":983142,"history":983770,"notebook":985134,"bookmark":983232,"minus-circle-outline":983927,"delete-outline":985575,"delete":983476,"link":983863,"cloud-upload":983399,"star":984270,"key":983814,"account-outline":983059,"email":983534,"backup-restore":983151,"update":984752,"android":983090,"web":984479,"home-variant-outline":986023,"text-box-multiple-outline":985784,"download":983514,"circle-small":985567,"upload":984402,"file-check":983574,"form-textbox":984590,"fingerprint":983607,"file":983572,"alert-circle-outline":984534,"check-all":983341,"shield-key-outline":986053,"arrow-left":983117,"message-plus-outline":987323,"email-outline":983536,"cellphone-key":985422,"dots-vertical":983513,"close":983382,"chevron-right":983362,"emoticon-wink":986232,"sync":984294,"shield":984216,"billboard":987152,"cellphone":983324,"cellphone-lock":985423,"lock":983870,"file-lock":983585,"image-multiple":983801,"harddisk":983754,"file-cabinet":985782,"refresh":984144,"emoticon":986216,"palette":984024,"pin":984067,"format-bold":983652,"table":984299,"language-markdown":983892,"gesture-tap-button":987816,"send-lock":985069,"bomb":984721,"file-pdf-box":983590,"language-html5":983837,"clipboard-text-outline":985656,"invert-colors":983809,"crown":983461,"select-all":984198,"minus":983924,"information-outline":983805,"cog-outline":985275,"arrow-top-right-thick":985542,"checkbox-blank-circle":983343,"sync-alert":984295,"note":983962,"dots-horizontal":983512,"shield-lock":985501,"chevron-left":983361,"account-cog":988016,"two-factor-authentication":985519,"logout":983875,"autorenew":983146,"shape":985137,"circle-half":988053,"brightness-6":983263,"note-edit-outline":989058,"format-line-spacing":983672,"format-size":983679,"format-font":984790,"radar":984119,"arrow-decision-outline":985534,"eye-off-outline":984785,"folder":983627,"bell-outline":983196,"bell-ring":983198,"bug":983268,"mail":986811,"file-document":983577,"mastodon":985809,"twitter":984388,"discord":984687,"open-source-initiative":986030,"monitor":983929,"chart-timeline":984686,"cellphone-arrow-down":985557,"alpha-v":985859,"alert-circle":983080,"reload":984147,"card-text":985975,"open-in-new":984012,"eye":983560,"drag":983515,"menu-down":983901}
 \ No newline at end of file
 diff --git a/node_modules/react-native-vector-icons/glyphmaps/MaterialCommunityIcons.old.json b/node_modules/react-native-vector-icons/glyphmaps/MaterialCommunityIcons.old.json
 new file mode 100644
--- a/apps/mobile/scripts/optimize-fonts.mjs
+++ b/apps/mobile/scripts/optimize-fonts.mjs
@@ -66,8 +66,6 @@ const EXTRA_ICON_NAMES = [
  "chevron-up",
  "chevron-down",
  "calendar",
-  "minus-circle-outline",
-  "close-circle-outline",
  "qrcode",
  "text",
  "cloud"
--- a/apps/mobile/share/share.js
+++ b/apps/mobile/share/share.js
@@ -21,7 +21,7 @@ import ShareExtension from "@ammarahmed/react-native-share-extension";
 import { getPreviewData } from "@flyerhq/react-native-link-preview";
 import { formatBytes } from "@notesnook/common";
 import { isImage } from "@notesnook/core/dist/utils/filename";
-import { useThemeColors } from "@notesnook/theme";
+import { parseHTML } from "@notesnook/core/dist/utils/html-parser";
 import React, { useCallback, useEffect, useRef, useState } from "react";
 import {
  ActivityIndicator,
@@ -53,9 +53,10 @@ import { getElevationStyle } from "../app/utils/elevation";
 import { eOnLoadNote } from "../app/utils/events";
 import { NoteBundle } from "../app/utils/note-bundle";
 import { Editor } from "./editor";
-import { HtmlLoadingWebViewAgent, fetchHandle } from "./fetch-webview";
 import { Search } from "./search";
 import { initDatabase, useShareStore } from "./store";
+import { useThemeColors } from "@notesnook/theme";
+import { HtmlLoadingWebViewAgent, fetchHandle } from "./fetch-webview";

 const getLinkPreview = (url) => {
  return getPreviewData(url, 5000);
--- a/apps/mobile/tsconfig.json
+++ b/apps/mobile/tsconfig.json
@@ -15,9 +15,7 @@
      "@notesnook/theme": ["../../packages/theme"],
      "@types/react": ["./node_modules/@types/react"]
    },
-    "incremental": true,
-    "maxNodeModuleJsDepth": 5,
-    "downlevelIteration": true
+    "incremental": true
  },
  "exclude": ["native"]
 }
--- a/apps/theme-builder/package-lock.json
+++ b/apps/theme-builder/package-lock.json
@@ -1377,7 +1377,7 @@
    },
    "../web": {
      "name": "@notesnook/web",
-      "version": "2.6.12",
+      "version": "2.6.5",
      "license": "GPL-3.0-or-later",
      "dependencies": {
        "@aws-sdk/util-base64-browser": "^3.208.0",
@@ -1446,7 +1446,6 @@
      "devDependencies": {
        "@babel/core": "^7.22.5",
        "@playwright/test": "^1.36.2",
-        "@swc/core": "1.3.61",
        "@trpc/server": "10.38.3",
        "@types/babel__core": "^7.20.1",
        "@types/file-saver": "^2.0.5",
@@ -1457,8 +1456,7 @@
        "@types/react-dom": "17.0.2",
        "@types/react-modal": "3.13.1",
        "@types/tinycolor2": "^1.4.3",
-        "@types/wicg-file-system-access": "^2020.9.6",
-        "@vitejs/plugin-react-swc": "3.3.2",
+        "@vitejs/plugin-react-swc": "^3.3.2",
        "autoprefixer": "^10.4.14",
        "buffer": "^6.0.3",
        "chalk": "^4.1.0",
@@ -1472,14 +1470,14 @@
        "otplib": "^12.0.1",
        "react": "17.0.2",
        "react-dom": "17.0.2",
-        "rollup": "^3.29.4",
+        "rollup": "^3.27.0",
        "rollup-plugin-visualizer": "^5.9.2",
        "swc-plugin-react-remove-properties": "^0.1.4",
-        "vite": "^4.5.0",
+        "vite": "^4.3.9",
        "vite-plugin-env-compatible": "^1.1.1",
        "vite-plugin-pwa": "^0.16.3",
        "vite-plugin-svgr": "^3.2.0",
-        "vitest": "^0.34.6",
+        "vitest": "^0.32.0",
        "workbox-core": "^7.0.0",
        "workbox-expiration": "^7.0.0",
        "workbox-precaching": "^7.0.0",
@@ -2408,6 +2406,15 @@
        "@trpc/server": "10.38.3"
      }
    },
+    "node_modules/@trpc/server": {
+      "version": "10.38.3",
+      "resolved": "https://registry.npmjs.org/@trpc/server/-/server-10.38.3.tgz",
+      "integrity": "sha512-9s8/kwo2IDB5hwB2SKZZrfevRhdb1f9fdXtIYd3lbQuf2jQaC/LyQuHaIQjDQoUx9updBfsHXcFFPiCP1DL6pg==",
+      "funding": [
+        "https://trpc.io/sponsor"
+      ],
+      "peer": true
+    },
    "node_modules/@types/babel__core": {
      "version": "7.20.1",
      "dev": true,
--- a/apps/web/e2e/models/editor.model.ts
+++ b/apps/web/e2e/models/editor.model.ts
@@ -171,7 +171,7 @@ export class EditorModel {
      await this.tagInput.fill(tag);
      await this.tagInput.press("Enter");
      await this.tags
-        .locator("span", { hasText: new RegExp(`^${tag}$`) })
+        .locator(":scope", { hasText: new RegExp(`^${tag}$`) })
        .waitFor();
    }
  }
@@ -181,7 +181,7 @@ export class EditorModel {
    const count = await this.tags.count();
    for (let i = 0; i < count; ++i) {
      const item = this.tags.nth(i);
-      const tag = await item.locator("span").textContent();
+      const tag = await item.textContent();
      if (tag) tags.push(tag);
    }
    return tags;
--- a/apps/web/e2e/notes.test.ts-snapshots/export-html-Chromium-win32.txt
+++ b/apps/web/e2e/notes.test.ts-snapshots/export-html-Chromium-win32.txt
@@ -8,11 +8,8 @@
      content="This is Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1"
    />
    <title>Test 1 - Notesnook</title>
-    <meta name="created-at" content="22-12-2023 11:33 AM" />
-    <meta name="updated-at" content="22-12-2023 11:33 AM" />
-    
-    
-    
+    <meta name="created-on" content="xxx" />
+    <meta name="last-edited-on" content="xxx" />
    
    <link rel="stylesheet" href="https://app.notesnook.com/assets/editor-styles.css?d=0">

@@ -28,11 +25,6 @@
      color: #202124;
      font-family: "Open Sans", "Noto Sans", Frutiger, Calibri, Myriad, Arial, Ubuntu, Helvetica, -apple-system, BlinkMacSystemFont, sans-serif;
    }
-
-    .math-block {
-      padding-top: 20px;
-      padding-bottom: 20px;
-    }
    
    h1,
    h2,
--- a/apps/web/e2e/notes.test.ts-snapshots/export-md-Chromium-win32.txt
+++ b/apps/web/e2e/notes.test.ts-snapshots/export-md-Chromium-win32.txt
@@ -2,3 +2,6 @@

 This is Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1

+
+---
+
--- a/apps/web/package-lock.json
+++ b/apps/web/package-lock.json
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@notesnook/web",
  "description": "Your private note taking space",
-  "version": "2.6.13",
+  "version": "2.6.6",
  "private": true,
  "main": "./src/app.js",
  "homepage": "https://notesnook.com/",
@@ -74,7 +74,6 @@
  "devDependencies": {
    "@babel/core": "^7.22.5",
    "@playwright/test": "^1.36.2",
-    "@swc/core": "1.3.61",
    "@trpc/server": "10.38.3",
    "@types/babel__core": "^7.20.1",
    "@types/file-saver": "^2.0.5",
@@ -85,8 +84,7 @@
    "@types/react-dom": "17.0.2",
    "@types/react-modal": "3.13.1",
    "@types/tinycolor2": "^1.4.3",
-    "@types/wicg-file-system-access": "^2020.9.6",
-    "@vitejs/plugin-react-swc": "3.3.2",
+    "@vitejs/plugin-react-swc": "^3.3.2",
    "autoprefixer": "^10.4.14",
    "buffer": "^6.0.3",
    "chalk": "^4.1.0",
@@ -100,14 +98,14 @@
    "otplib": "^12.0.1",
    "react": "17.0.2",
    "react-dom": "17.0.2",
-    "rollup": "^3.29.4",
+    "rollup": "^3.27.0",
    "rollup-plugin-visualizer": "^5.9.2",
    "swc-plugin-react-remove-properties": "^0.1.4",
-    "vite": "^4.5.0",
+    "vite": "^4.3.9",
    "vite-plugin-env-compatible": "^1.1.1",
    "vite-plugin-pwa": "^0.16.3",
    "vite-plugin-svgr": "^3.2.0",
-    "vitest": "^0.34.6",
+    "vitest": "^0.32.0",
    "workbox-core": "^7.0.0",
    "workbox-expiration": "^7.0.0",
    "workbox-precaching": "^7.0.0",
--- a/apps/web/public/android-chrome-192x192.png
+++ b/apps/web/public/android-chrome-192x192.png
--- a/apps/web/public/android-chrome-512x512.png
+++ b/apps/web/public/android-chrome-512x512.png
--- a/apps/web/public/apple-touch-icon.png
+++ b/apps/web/public/apple-touch-icon.png
--- a/apps/web/src/app-effects.tsx
+++ b/apps/web/src/app-effects.tsx
@@ -129,6 +129,7 @@ export default function AppEffects({ setShow }: AppEffectsProps) {
    ) {
      const [key, status] = getProcessingStatusFromType(type);

+      console.log("handleDownloadUploadProgresss", key, status, current, total);
      if (current === total) {
        removeStatus(key);
      } else {
--- a/apps/web/src/bootstrap.tsx
+++ b/apps/web/src/bootstrap.tsx
@@ -24,7 +24,6 @@ import Config from "./utils/config";

 import { initalizeLogger, logger } from "./utils/logger";
 import { AuthProps } from "./views/auth";
-import { initializeFeatureChecks } from "./utils/feature-check";

 type Route<TProps = null> = {
  component: () => Promise<{
@@ -143,8 +142,6 @@ function isSessionExpired(path: Routes): RouteWithPath<AuthProps> | null {

 export async function init() {
  await initalizeLogger();
-  await initializeFeatureChecks();
-
  const { path, route } = getRoute();
  return { ...route, path };
 }
--- a/apps/web/src/common/attachments.ts
+++ b/apps/web/src/common/attachments.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 { lazify } from "../utils/lazify";
+import FS from "../interfaces/fs";
 import { db } from "./db";

 async function download(hash: string) {
@@ -42,15 +42,13 @@ export async function saveAttachment(hash: string) {
  if (!response) return;

  const { attachment, key } = response;
-  await lazify(import("../interfaces/fs"), ({ default: FS }) =>
-    FS.saveFile(attachment.metadata.hash, {
-      key,
-      iv: attachment.iv,
-      name: attachment.metadata.filename,
-      type: attachment.metadata.type,
-      isUploaded: !!attachment.dateUploaded
-    })
-  );
+  await FS.saveFile(attachment.metadata.hash, {
+    key,
+    iv: attachment.iv,
+    name: attachment.metadata.filename,
+    type: attachment.metadata.type,
+    isUploaded: !!attachment.dateUploaded
+  });
 }

 type OutputTypeToReturnType = {
@@ -69,15 +67,13 @@ export async function downloadAttachment<
  if (type === "base64" || type === "text")
    return (await db.attachments?.read(hash, type)) as TOutputType;

-  const blob = await lazify(import("../interfaces/fs"), ({ default: FS }) =>
-    FS.decryptFile(attachment.metadata.hash, {
-      key,
-      iv: attachment.iv,
-      name: attachment.metadata.filename,
-      type: attachment.metadata.type,
-      isUploaded: !!attachment.dateUploaded
-    })
-  );
+  const blob = await FS.decryptFile(attachment.metadata.hash, {
+    key,
+    iv: attachment.iv,
+    name: attachment.metadata.filename,
+    type: attachment.metadata.type,
+    isUploaded: !!attachment.dateUploaded
+  });

  if (!blob) return;
  return blob as TOutputType;
@@ -88,9 +84,7 @@ export async function checkAttachment(hash: string) {
  if (!attachment) return { failed: "Attachment not found." };

  try {
-    const size = await lazify(import("../interfaces/fs"), ({ default: FS }) =>
-      FS.getUploadedFileSize(hash)
-    );
+    const size = await FS.getUploadedFileSize(hash);
    if (size <= 0) return { failed: "File length is 0." };
  } catch (e) {
    return { failed: e instanceof Error ? e.message : "Unknown error." };
--- a/apps/web/src/common/db.ts
+++ b/apps/web/src/common/db.ts
@@ -21,7 +21,6 @@ import { EventSourcePolyfill as EventSource } from "event-source-polyfill";
 import { DatabasePersistence, NNStorage } from "../interfaces/storage";
 import { logger } from "../utils/logger";
 import type Database from "@notesnook/core/dist/api";
-import { showMigrationDialog } from "./dialog-controller";

 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
@@ -71,6 +70,7 @@ async function initializeDatabase(persistence: DatabasePersistence) {
  logger.measure("Database initialization");

  if (db.migrations?.required()) {
+    const { showMigrationDialog } = await import("./dialog-controller");
    await showMigrationDialog();
  }

--- a/apps/web/src/common/export.ts
+++ b/apps/web/src/common/export.ts
@@ -25,14 +25,6 @@ import { showToast } from "../utils/toast";
 import { sanitizeFilename } from "@notesnook/common";
 import Vault from "./vault";

-const FORMAT_TO_EXT = {
-  pdf: "pdf",
-  md: "md",
-  txt: "txt",
-  html: "html",
-  "md-frontmatter": "md"
-} as const;
-
 export async function exportToPDF(
  title: string,
  content: string
@@ -49,21 +41,12 @@ export async function exportToPDF(
    iframe.style.width = "0";
    iframe.style.height = "0";
    iframe.style.border = "0";
-    iframe.loading = "eager";

-    iframe.onload = async () => {
+    iframe.onload = () => {
      if (!iframe.contentWindow) return;
      if (iframe.contentDocument) iframe.contentDocument.title = title;
      iframe.contentWindow.onbeforeunload = () => closePrint(false);
      iframe.contentWindow.onafterprint = () => closePrint(true);
-
-      if (
-        iframe.contentDocument &&
-        !!iframe.contentDocument.querySelector(".math-block,.math-inline")
-      ) {
-        await new Promise((resolve) => setTimeout(resolve, 1000));
-      }
-
      iframe.contentWindow.print();
    };

@@ -77,7 +60,7 @@ export async function exportToPDF(
 }

 export async function exportNotes(
-  format: "pdf" | "md" | "txt" | "html" | "md-frontmatter",
+  format: "pdf" | "md" | "txt" | "html",
  noteIds: string[]
 ): Promise<boolean> {
  return await TaskManager.startTask({
@@ -136,21 +119,17 @@ export async function exportNotes(
          return await exportToPDF(note.title, exported);
        }

-        files.push({
-          filename: note.title,
-          content: exported,
-          date: note.dateEdited
-        });
+        files.push({ filename: note.title, content: exported });
      }

      if (!files.length) return false;
      if (files.length === 1) {
        saveAs(
          new Blob([Buffer.from(files[0].content, "utf-8")]),
-          `${sanitizeFilename(files[0].filename)}.${FORMAT_TO_EXT[format]}`
+          `${sanitizeFilename(files[0].filename)}.${format}`
        );
      } else {
-        const zipped = await zip(files, FORMAT_TO_EXT[format]);
+        const zipped = await zip(files, format);
        saveAs(new Blob([zipped.buffer]), "notes.zip");
      }

--- a/apps/web/src/common/index.ts
+++ b/apps/web/src/common/index.ts
@@ -138,9 +138,8 @@ export async function selectBackupFile() {

 export async function importBackup() {
  const backupFile = await selectBackupFile();
-  if (!backupFile) return false;
+  if (!backupFile) return;
  await restoreBackupFile(backupFile);
-  return true;
 }

 export async function restoreBackupFile(backupFile: File) {
--- a/apps/web/src/components/announcements/body.jsx
+++ b/apps/web/src/components/announcements/body.jsx
@@ -291,9 +291,7 @@ function CalltoAction({ action, variant, sx, dismissAnnouncement }) {
          case "link": {
            const url = new URL(action.data);
            const target =
-              url.origin === window.location.origin && !IS_DESKTOP_APP
-                ? "_self"
-                : "_blank";
+              url.origin === window.location.origin ? "_self" : "_blank";
            window.open(action.data, target, "noopener noreferrer");
            break;
          }
--- a/apps/web/src/components/attachment/index.tsx
+++ b/apps/web/src/components/attachment/index.tsx
@@ -164,11 +164,7 @@ export function Attachment({
            <AttachmentError
              color={"icon-error"}
              size={16}
-              title={
-                typeof attachment.failed === "object"
-                  ? attachment.failed.toString()
-                  : attachment.failed
-              }
+              title={attachment.failed}
            />
          ) : attachment.working ? (
            <Loading size={16} />
@@ -294,6 +290,7 @@ const AttachmentMenuItems: (
      key: "download",
      title: status?.type === "download" ? "Cancel download" : "Download",
      icon: Download.path,
+      isDisabled: !attachment.dateUploaded,
      onClick: async () => {
        const isDownloading = status?.type === "download";
        if (isDownloading) {
--- a/apps/web/src/components/auth-container/index.jsx
+++ b/apps/web/src/components/auth-container/index.jsx
@@ -171,10 +171,8 @@ function AuthContainer(props) {
            {testimonial.text} —{" "}
            <Link
              sx={{ fontStyle: "italic", color: "paragraph-secondary" }}
-              href={testimonial.link}  
-              target="_blank"
-              rel="noopener noreferrer"
-              >
+              href={testimonial.link}
+            >
              source
            </Link>
          </Text>
--- a/apps/web/src/components/dialog/index.tsx
+++ b/apps/web/src/components/dialog/index.tsx
@@ -80,10 +80,11 @@ function BaseDialog(props: React.PropsWithChildren<DialogProps>) {
          border: 0,
          zIndex: 999,
          backgroundColor: "var(--backdrop)"
-        },
-        overlay: {
-          opacity: 1
        }
+        // overlay: {
+        //   zIndex: 999,
+        //   background: "var(--backdrop)"
+        // }
      }}
    >
      <ScopedThemeProvider
--- a/apps/web/src/components/editor/header.tsx
+++ b/apps/web/src/components/editor/header.tsx
@@ -26,7 +26,6 @@ import IconTag from "../icon-tag";
 import { db } from "../../common/db";
 import { useMenuTrigger } from "../../hooks/use-menu";
 import { MenuItem } from "@notesnook/ui";
-import { navigate } from "../../navigation";

 type HeaderProps = { readonly: boolean };
 function Header(props: HeaderProps) {
@@ -40,7 +39,7 @@ function Header(props: HeaderProps) {

  return (
    <>
-      {id && (
+      {!readonly && id && (
        <Flex
          sx={{ lineHeight: 2.5, alignItems: "center", flexWrap: "wrap" }}
          data-test-id="tags"
@@ -51,34 +50,24 @@ function Header(props: HeaderProps) {
              key={tag}
              text={db.tags?.alias(tag)}
              icon={Tag}
-              title={tag}
-              onClick={() => {
-                const tagItem = db.tags?.tag(tag);
-                if (!tagItem) {
-                  setTag(tag);
-                  return;
-                }
-                navigate(`/tags/${tagItem.id}`);
-              }}
-              onDismiss={readonly ? undefined : () => setTag(tag)}
+              title={`Click to remove`}
+              onClick={() => setTag(tag)}
              styles={{ container: { mr: 1 }, text: { fontSize: "body" } }}
            />
          ))}
-          {!readonly && (
-            <Autosuggest
-              sessionId={id}
-              filter={(query) =>
-                db.lookup?.tags(filterableTags, query).slice(0, 10) || []
-              }
-              onAdd={(value) => setTag(value)}
-              onSelect={(item) => setTag(item.title)}
-              onRemove={() => {
-                if (tags.length <= 0) return;
-                setTag(tags[tags.length - 1]);
-              }}
-              defaultItems={filterableTags?.slice(0, 10) || []}
-            />
-          )}
+          <Autosuggest
+            sessionId={id}
+            filter={(query) =>
+              db.lookup?.tags(filterableTags, query).slice(0, 10) || []
+            }
+            onAdd={(value) => setTag(value)}
+            onSelect={(item) => setTag(item.title)}
+            onRemove={() => {
+              if (tags.length <= 0) return;
+              setTag(tags[tags.length - 1]);
+            }}
+            defaultItems={filterableTags?.slice(0, 10) || []}
+          />
        </Flex>
      )}
    </>
@@ -97,7 +86,6 @@ type AutosuggestProps = {
 export function Autosuggest(props: AutosuggestProps) {
  const { sessionId, filter, onRemove, onSelect, onAdd, defaultItems } = props;
  const inputRef = useRef<HTMLInputElement>(null);
-  const arrowDown = useRef<boolean>();
  const filteredItems = useRef<any[]>([]);
  const { openMenu, closeMenu, isOpen } = useMenuTrigger();
  const clearInput = useCallback(() => {
@@ -190,13 +178,8 @@ export function Autosuggest(props: AutosuggestProps) {
      data-test-id="editor-tag-input"
      onFocus={() => {
        const text = getInputValue();
+        console.log(defaultItems);
        if (!text) onOpenMenu(defaultItems.slice());
-        else onOpenMenu([]);
-      }}
-      onClick={() => {
-        const text = getInputValue();
-        if (!text) onOpenMenu(defaultItems.slice());
-        else onOpenMenu([]);
      }}
      onChange={(e) => {
        const { value } = e.target;
@@ -208,17 +191,22 @@ export function Autosuggest(props: AutosuggestProps) {
      }}
      onKeyDown={(e) => {
        const text = getInputValue();
-        if (e.key === "Enter" && !!text && isOpen && !arrowDown.current) {
+        if (
+          e.key === "Enter" &&
+          !!text &&
+          isOpen &&
+          filteredItems.current.length <= 0
+        ) {
          onAction("add", text);
+        } else if (e.key === "Enter" && !!text && isOpen) {
+          onAction("select", filteredItems.current[0]);
        } else if (!text && e.key === "Backspace") {
          onRemove();
          closeMenu();
        } else if (e.key === "Escape") {
-          arrowDown.current = false;
          closeMenu();
          e.stopPropagation();
        } else if (e.key === "ArrowUp" || e.key === "ArrowDown") {
-          arrowDown.current = true;
          if (e.key === "ArrowDown" && !text) onOpenMenu(defaultItems.slice());

          e.preventDefault();
--- a/apps/web/src/components/editor/index.tsx
+++ b/apps/web/src/components/editor/index.tsx
@@ -430,15 +430,13 @@ export function Editor(props: EditorProps) {
        onContentChange={onContentChange}
        onChange={onEditorChange}
        onDownloadAttachment={(attachment) => saveAttachment(attachment.hash)}
-        onPreviewAttachment={async (data) => {
-          const { hash } = data;
+        onPreviewAttachment={async ({ hash, dataurl }) => {
          const attachment = db.attachments?.attachment(hash);
          if (attachment && attachment.metadata.type.startsWith("image/")) {
            const container = document.getElementById("dialogContainer");
            if (!(container instanceof HTMLElement)) return;

-            const dataurl =
-              data.bloburl || (await downloadAttachment(hash, "base64"));
+            dataurl = dataurl || (await downloadAttachment(hash, "base64"));
            if (!dataurl)
              return showToast("error", "This image cannot be previewed.");

@@ -557,7 +555,7 @@ function EditorChrome(
        <Box
          id="editorToolbar"
          sx={{
-            display: "flex",
+            display: readonly ? "none" : "flex",
            bg: "background",
            position: "sticky",
            top: 0,
--- a/apps/web/src/components/editor/picker.ts
+++ b/apps/web/src/components/editor/picker.ts
@@ -23,6 +23,7 @@ import { db } from "../../common/db";
 import { showBuyDialog } from "../../common/dialog-controller";
 import { TaskManager } from "../../common/task-manager";
 import { isUserPremium } from "../../hooks/use-is-user-premium";
+import fs from "../../interfaces/fs";
 import { showToast } from "../../utils/toast";
 import { showFilePicker } from "../../utils/file-picker";

@@ -137,7 +138,6 @@ export type Attachment = {
  mime: string;
  size: number;
  dataurl?: string;
-  bloburl?: string;
 };

 type AddAttachmentOptions = {
@@ -151,29 +151,25 @@ async function addAttachment(
  dataurl: string | undefined,
  options: AddAttachmentOptions = {}
 ): Promise<Attachment> {
-  const { default: FS } = await import("../../interfaces/fs");
-  const { expectedFileHash, showProgress = true } = options;
-  let forceWrite = options.forceWrite;
+  const { expectedFileHash, forceWrite, showProgress = true } = options;

  const action = async () => {
-    const reader = file.stream().getReader();
-    const { hash, type: hashType } = await FS.hashStream(reader);
+    const reader: ReadableStreamReader<Uint8Array> = (
+      file.stream() as unknown as ReadableStream<Uint8Array>
+    ).getReader();
+
+    const { hash, type: hashType } = await fs.hashStream(reader);
    reader.releaseLock();

    if (expectedFileHash && hash !== expectedFileHash)
      throw new Error(
        `Please select the same file for reuploading. Expected hash ${expectedFileHash} but got ${hash}.`
      );
-
    const exists = db.attachments?.exists(hash);
-    if (!forceWrite && exists) {
-      forceWrite = (await FS.getUploadedFileSize(hash)) <= 0;
-    }
-
    if (forceWrite || !exists) {
      const key: SerializedKey = await getEncryptionKey();

-      const output = await FS.writeEncryptedFile(file, key, hash);
+      const output = await fs.writeEncryptedFile(file, key, hash);
      if (!output) throw new Error("Could not encrypt file.");

      if (forceWrite && exists) await db.attachments?.reset(hash);
--- a/apps/web/src/components/editor/tiptap.tsx
+++ b/apps/web/src/components/editor/tiptap.tsx
@@ -57,7 +57,6 @@ import { store as editorstore } from "../../stores/editor-store";
 import { ScopedThemeProvider } from "../theme-provider";
 import { writeText } from "clipboard-polyfill";
 import { useStore as useThemeStore } from "../../stores/theme-store";
-import { toBlobURL } from "@notesnook/editor/dist/utils/downloader";

 type OnChangeHandler = (
  id: string | undefined,
@@ -155,10 +154,6 @@ function TipTap(props: TipTapProps) {
  const tiptapOptions = useMemo<Partial<TiptapOptions>>(() => {
    return {
      editorProps: {
-        handleKeyDown(view, event) {
-          if ((event.ctrlKey || event.metaKey) && event.key === "s")
-            event.preventDefault();
-        },
        handlePaste: (view, event) => {
          const hasText = event.clipboardData?.types?.some((type) =>
            type.startsWith("text/")
@@ -447,7 +442,7 @@ function toIEditor(editor: Editor): IEditor {
      if (file.dataurl) {
        editor.current?.commands.insertImage({
          ...file,
-          bloburl: toBlobURL(file.dataurl, file.hash)
+          dataurl: file.dataurl
        });
      } else editor.current?.commands.insertAttachment(file);
    },
@@ -456,7 +451,7 @@ function toIEditor(editor: Editor): IEditor {
    loadImage: (hash, dataurl) =>
      editor.current?.commands.updateImage(
        { hash },
-        { hash, bloburl: toBlobURL(dataurl, hash), preventUpdate: true }
+        { hash, dataurl, preventUpdate: true }
      ),
    sendAttachmentProgress: (hash, type, progress) =>
      editor.current?.commands.setAttachmentProgress({
--- a/apps/web/src/components/editor/title-box.tsx
+++ b/apps/web/src/components/editor/title-box.tsx
@@ -26,8 +26,6 @@ import useTablet from "../../hooks/use-tablet";
 import { useEditorConfig } from "./context";
 import { getFontById } from "@notesnook/editor";
 import { AppEventManager, AppEvents } from "../../common/app-events";
-import { replaceDateTime } from "@notesnook/editor/dist/extensions/date-time";
-import { useStore as useSettingsStore } from "../../stores/setting-store";

 type TitleBoxProps = {
  readonly: boolean;
@@ -40,9 +38,6 @@ function TitleBox(props: TitleBoxProps) {
  const isMobile = useMobile();
  const isTablet = useTablet();
  const { editorConfig } = useEditorConfig();
-  const dateFormat = useSettingsStore((store) => store.dateFormat);
-  const timeFormat = useSettingsStore((store) => store.timeFormat);
-
  const fontFamily = useMemo(
    () => getFontById(editorConfig.fontFamily)?.font || "heading",
    [editorConfig.fontFamily]
@@ -116,11 +111,6 @@ function TitleBox(props: TitleBoxProps) {
      }}
      onChange={(e) => {
        const { sessionId, id } = store.get().session;
-        e.target.value = replaceDateTime(
-          e.target.value,
-          dateFormat,
-          timeFormat
-        );
        debouncedOnTitleChange(sessionId, id, e.target.value);
        updateFontSize(e.target.value.length);
      }}
--- a/apps/web/src/components/group-header/index.tsx
+++ b/apps/web/src/components/group-header/index.tsx
@@ -111,8 +111,7 @@ const sortByMenu: (options: GroupingMenuOptions) => MenuItem = (options) => ({
      {
        key: "dateCreated",
        title: "Date created",
-        isHidden:
-          options.groupingKey === "trash" || options.groupingKey === "tags"
+        isHidden: options.groupingKey === "trash"
      },
      {
        key: "dateEdited",
--- a/apps/web/src/components/icon-tag/index.tsx
+++ b/apps/web/src/components/icon-tag/index.tsx
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 import { Flex, Text } from "@theme-ui/components";
 import { ThemeUICSSObject } from "@theme-ui/core";
-import { Close, Icon } from "../icons";
+import { Icon } from "../icons";

 type IconTagProps = {
  text: string;
@@ -33,20 +33,10 @@ type IconTagProps = {
  };
  testId?: string;
  highlight?: boolean;
-  onDismiss?: () => void;
 };

 function IconTag(props: IconTagProps) {
-  const {
-    icon: Icon,
-    text,
-    title,
-    onClick,
-    onDismiss,
-    styles,
-    testId,
-    highlight
-  } = props;
+  const { icon: Icon, text, title, onClick, styles, testId, highlight } = props;

  return (
    <Flex
@@ -102,22 +92,6 @@ function IconTag(props: IconTagProps) {
      >
        {text}
      </Text>
-      {onDismiss && (
-        <Close
-          size={12}
-          title="Remove"
-          onClick={(e) => {
-            e.preventDefault();
-            e.stopPropagation();
-            onDismiss();
-          }}
-          sx={{
-            ml: 1,
-            ":hover": { bg: "background-error" },
-            ":hover path": { fill: "var(--icon-error) !important" }
-          }}
-        />
-      )}
    </Flex>
  );
 }
--- a/apps/web/src/components/note/index.tsx
+++ b/apps/web/src/components/note/index.tsx
@@ -49,8 +49,7 @@ import {
  AddToNotebook,
  RemoveShortcutLink,
  Plus,
-  Tag,
-  Copy
+  Tag
 } from "../icons";
 import TimeAgo from "../time-ago";
 import ListItem from "../list-item";
@@ -86,7 +85,6 @@ import {
  ReferencesWithDateEdited
 } from "../list-container/types";
 import { SchemeColors } from "@notesnook/theme";
-import Vault from "../../common/vault";

 type NoteProps = {
  tags: Item[];
@@ -305,12 +303,6 @@ const formats = [
    icon: Markdown,
    subtitle: "Can be opened in any plain-text or markdown editor."
  },
-  {
-    type: "md-frontmatter",
-    title: "Markdown + Frontmatter",
-    icon: Markdown,
-    subtitle: "Can be opened in any plain-text or markdown editor."
-  },
  {
    type: "html",
    title: "HTML",
@@ -462,32 +454,6 @@ const menuItems: (note: any, items?: any[]) => MenuItem[] = (
      multiSelect: true,
      isPro: true
    },
-    {
-      type: "button",
-      key: "copy",
-      title: "Copy as",
-      icon: Copy.path,
-      menu: {
-        items: [
-          {
-            type: "button",
-            key: "copy-as-text",
-            tooltip: `Copy as Text`,
-            title: "Text",
-            icon: Plaintext.path,
-            onClick: () => copyNote(note.id, "txt")
-          },
-          {
-            type: "button",
-            key: "copy-as-markdown",
-            tooltip: `Copy as Markdown`,
-            title: "Markdown",
-            icon: Markdown.path,
-            onClick: () => copyNote(note.id, "md")
-          }
-        ]
-      }
-    },
    {
      type: "button",
      key: "duplicate",
@@ -701,25 +667,3 @@ function tagsMenuItems(items: any[]): MenuItem[] {

  return menuItems;
 }
-
-async function copyNote(noteId: string, format: "md" | "txt") {
-  try {
-    const note = db.notes?.note(noteId);
-    if (!note) throw new Error("No note with this id exists.");
-    if (note?.data.locked && !(await Vault.unlockVault()))
-      throw new Error("Please unlock this note to copy it.");
-
-    const rawContent = await db.content?.raw(note.data.contentId);
-    const content = note?.data.locked
-      ? await db.vault?.decryptContent(rawContent)
-      : rawContent;
-
-    const text = await note.export(format, content, false);
-    if (!text) throw new Error(`Could not convert note to ${format}.`);
-    await navigator.clipboard.writeText(text);
-    showToast("success", "Copied!");
-  } catch (e) {
-    if (e instanceof Error)
-      showToast("error", `Failed to copy note: ${e.message}.`);
-  }
-}
--- a/apps/web/src/components/properties/index.jsx
+++ b/apps/web/src/components/properties/index.jsx
@@ -110,11 +110,10 @@ function Properties(props) {
    "reminder"
  );
  const allNotebooks = useMemo(
-    () =>
-      [
-        ...notebooks.map((ref) => db.notebooks.notebook(ref.id)?.data),
-        ...db.relations.to({ id: sessionId, type: "note" }, "notebook")
-      ].filter(Boolean),
+    () => [
+      ...notebooks.map((ref) => db.notebooks.notebook(ref.id)?.data),
+      ...db.relations.to({ id: sessionId, type: "note" }, "notebook")
+    ],
    [sessionId, notebooks]
  );

--- a/apps/web/src/components/search/index.jsx
+++ b/apps/web/src/components/search/index.jsx
@@ -29,7 +29,7 @@ function SearchBox({ onSearch }) {
      id="search"
      name="search"
      type="text"
-      sx={{ m: 0, mx: 2, mt: 1, mb: 1 }}
+      sx={{ m: 0, mx: 2, mt: 1 }}
      placeholder="Type your query here"
      onChange={debounce((e) => onSearch(e.target.value), 250)}
      action={{
--- a/apps/web/src/components/status-bar/index.tsx
+++ b/apps/web/src/components/status-bar/index.tsx
@@ -34,7 +34,7 @@ import {
 import { useStore as useUserStore } from "../../stores/user-store";
 import { useStore as useAppStore } from "../../stores/app-store";
 import TimeAgo from "../time-ago";
-import { hardNavigate, hashNavigate } from "../../navigation";
+import { hardNavigate, hashNavigate, navigate } from "../../navigation";
 import { useAutoUpdater, UpdateStatus } from "../../hooks/use-auto-updater";
 import {
  showIssueDialog,
@@ -50,7 +50,6 @@ function StatusBar() {
  const isLoggedIn = useUserStore((state) => state.isLoggedIn);
  const statuses = useStatus();
  const updateStatus = useAutoUpdater();
-  const isFocusMode = useAppStore((state) => state.isFocusMode);

  return (
    <ScopedThemeProvider
@@ -64,123 +63,124 @@ function StatusBar() {
      }}
      px={2}
    >
-      {isFocusMode ? (
-        <Flex />
-      ) : (
-        <Flex sx={{ gap: 1 }}>
-          {isLoggedIn ? (
-            <>
-              {user?.isEmailConfirmed ? (
-                <Circle size={7} color={"var(--icon-success)"} />
-              ) : (
-                <Button
-                  onClick={() => hashNavigate("/email/verify")}
-                  variant="statusitem"
-                  sx={{
-                    alignItems: "center",
-                    justifyContent: "center",
-                    display: "flex",
-                    height: "100%"
-                  }}
-                >
-                  <Circle size={7} color={"var(--icon-error)"} />
-                  <Text
-                    className="selectable"
-                    variant="subBody"
-                    ml={1}
-                    sx={{ color: "paragraph" }}
-                  >
-                    Email not confirmed
-                  </Text>
-                </Button>
-              )}
-
-              <SyncStatus />
-            </>
-          ) : isLoggedIn === false ? (
+      <Flex>
+        {isLoggedIn ? (
+          <>
            <Button
+              onClick={() =>
+                user?.isEmailConfirmed
+                  ? navigate("/settings")
+                  : hashNavigate("/email/verify")
+              }
              variant="statusitem"
-              onClick={() => hardNavigate("/login")}
              sx={{
                alignItems: "center",
                justifyContent: "center",
                display: "flex"
              }}
-              data-test-id="not-logged-in"
            >
-              <Circle size={7} color="var(--icon-error)" />
-              <Text variant="subBody" ml={1} sx={{ color: "paragraph" }}>
-                Not logged in
+              <Circle
+                size={7}
+                color={
+                  user?.isEmailConfirmed
+                    ? "var(--icon-success)"
+                    : "var(--icon-error)"
+                }
+              />
+              <Text
+                className="selectable"
+                variant="subBody"
+                ml={1}
+                sx={{ color: "paragraph" }}
+              >
+                {user?.email}
+                {user?.isEmailConfirmed ? "" : " (not verified)"}
              </Text>
            </Button>
-          ) : null}
+
+            <SyncStatus />
+          </>
+        ) : isLoggedIn === false ? (
          <Button
            variant="statusitem"
-            onClick={() => showIssueDialog()}
+            onClick={() => hardNavigate("/login")}
            sx={{
              alignItems: "center",
              justifyContent: "center",
              display: "flex"
            }}
-            title="Facing an issue? Click here to create a bug report."
+            data-test-id="not-logged-in"
          >
-            <Issue size={12} />
+            <Circle size={7} color="var(--icon-error)" />
            <Text variant="subBody" ml={1} sx={{ color: "paragraph" }}>
-              Report an issue
+              Not logged in
            </Text>
          </Button>
-          {statuses?.map((status) => {
-            const { key, icon: Icon } = status;
-            return (
-              <Flex
-                key={key}
-                ml={1}
-                sx={{ alignItems: "center", justifyContent: "center" }}
-              >
-                {Icon ? <Icon size={12} /> : <Loading size={12} />}
-                <Text variant="subBody" ml={1} sx={{ color: "paragraph" }}>
-                  {statusToString(status)}
-                </Text>
-              </Flex>
-            );
-          })}
-
-          {updateStatus && updateStatus.type !== "updated" && (
-            <Button
-              variant="statusitem"
-              onClick={async () => {
-                if (updateStatus.type === "available") {
-                  await showUpdateAvailableNotice(updateStatus);
-                } else if (updateStatus.type === "completed") {
-                  installUpdate();
-                } else {
-                  checkForUpdate();
-                }
-              }}
-              sx={{
-                ml: 1,
-                alignItems: "center",
-                justifyContent: "center",
-                display: "flex"
-              }}
+        ) : null}
+        <Button
+          variant="statusitem"
+          onClick={() => showIssueDialog()}
+          sx={{
+            alignItems: "center",
+            justifyContent: "center",
+            display: "flex"
+          }}
+          title="Facing an issue? Click here to create a bug report."
+        >
+          <Issue size={12} />
+          <Text variant="subBody" ml={1} sx={{ color: "paragraph" }}>
+            Report an issue
+          </Text>
+        </Button>
+        {statuses?.map((status) => {
+          const { key, icon: Icon } = status;
+          return (
+            <Flex
+              key={key}
+              ml={1}
+              sx={{ alignItems: "center", justifyContent: "center" }}
            >
-              <Update
-                rotate={
-                  updateStatus.type !== "completed" &&
-                  updateStatus.type !== "available"
-                }
-                color={
-                  updateStatus.type === "available" ? "accent" : "paragraph"
-                }
-                size={12}
-              />
+              {Icon ? <Icon size={12} /> : <Loading size={12} />}
              <Text variant="subBody" ml={1} sx={{ color: "paragraph" }}>
-                {statusToInfoText(updateStatus)}
+                {statusToString(status)}
              </Text>
-            </Button>
-          )}
-        </Flex>
-      )}
+            </Flex>
+          );
+        })}
+
+        {updateStatus && updateStatus.type !== "updated" && (
+          <Button
+            variant="statusitem"
+            onClick={async () => {
+              if (updateStatus.type === "available") {
+                await showUpdateAvailableNotice(updateStatus);
+              } else if (updateStatus.type === "completed") {
+                installUpdate();
+              } else {
+                checkForUpdate();
+              }
+            }}
+            sx={{
+              ml: 1,
+              alignItems: "center",
+              justifyContent: "center",
+              display: "flex"
+            }}
+          >
+            <Update
+              rotate={
+                updateStatus.type !== "completed" &&
+                updateStatus.type !== "available"
+              }
+              color={updateStatus.type === "available" ? "accent" : "paragraph"}
+              size={12}
+            />
+            <Text variant="subBody" ml={1} sx={{ color: "paragraph" }}>
+              {statusToInfoText(updateStatus)}
+            </Text>
+          </Button>
+        )}
+      </Flex>
      <EditorFooter />
    </ScopedThemeProvider>
  );
--- a/apps/web/src/components/theme-provider/index.tsx
+++ b/apps/web/src/components/theme-provider/index.tsx
@@ -59,16 +59,6 @@ export function BaseThemeProvider(

  useEffect(() => {
    useThemeEngineStore.getState().setTheme(theme);
-
-    const themeColorElement = document.head.querySelector(
-      "meta[name='theme-color']"
-    );
-    if (themeColorElement) {
-      themeColorElement.setAttribute(
-        "content",
-        theme.scopes.base.primary.background
-      );
-    }
  }, [theme]);

  return (
--- a/apps/web/src/dialogs/attachments-dialog.tsx
+++ b/apps/web/src/dialogs/attachments-dialog.tsx
@@ -400,7 +400,12 @@ const Sidebar = memo(
            flexDirection: "column",
            justifyContent: "space-between",
            width: 240,
-            backgroundColor: "background"
+            "@supports ((-webkit-backdrop-filter: none) or (backdrop-filter: none))":
+              {
+                backgroundColor: alpha("background", 0.6),
+                backdropFilter: "blur(8px)"
+              },
+            backgroundColor: "var(--background-secondary)"
          }}
        >
          <Flex sx={{ flexDirection: "column" }}>
--- a/apps/web/src/dialogs/buy-dialog/buy-dialog.tsx
+++ b/apps/web/src/dialogs/buy-dialog/buy-dialog.tsx
@@ -99,7 +99,12 @@ export function BuyDialog(props: BuyDialogProps) {
            display: "flex",
            overflow: ["hidden", "hidden", "auto"],
            flexDirection: "column",
-            backgroundColor: "background",
+            "@supports ((-webkit-backdrop-filter: none) or (backdrop-filter: none))":
+              {
+                backgroundColor: alpha("background", 0.8),
+                backdropFilter: "blur(8px)"
+              },
+            backgroundColor: "var(--background-secondary)",
            flexShrink: 0,
            alignItems: "center",
            justifyContent: "center",
--- a/apps/web/src/dialogs/feature-dialog.tsx
+++ b/apps/web/src/dialogs/feature-dialog.tsx
@@ -91,7 +91,9 @@ const features: Record<FeatureKeys, Feature> = {
        ]
      : [
          {
-            title: "Check/uncheck all tasks in a task list"
+            title: "Write protected task lists",
+            subtitle:
+              "You can now write protect specific task lists to prevent any accidental edits."
          }
        ],
    cta: {
--- a/apps/web/src/dialogs/onboarding-dialog.jsx
+++ b/apps/web/src/dialogs/onboarding-dialog.jsx
@@ -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 { Text, Flex, Button, Image, Box, Link } from "@theme-ui/components";
+import { Text, Flex, Button, Image, Box } from "@theme-ui/components";
 import Dialog from "../components/dialog";
 import {
  Pro,
@@ -417,21 +417,9 @@ function CrossPlatform() {
  return (
    <Flex my={4} sx={{ alignItems: "center" }}>
      {isMacStoreApp() ? null : (
-        <Link
-          href="https://play.google.com/store/apps/details?id=com.streetwriters.notesnook"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          <Image src={GooglePlay} sx={{ flexShrink: 0, width: 135 }} />
-        </Link>
+        <Image src={GooglePlay} sx={{ flexShrink: 0, width: 135 }} />
      )}
-      <Link
-        href="https://apps.apple.com/us/app/notesnook-take-private-notes/id1544027013"
-        target="_blank"
-        rel="noopener noreferrer"
-      >
-        <Image src={AppleStore} sx={{ flexShrink: 0, width: 110 }} />
-      </Link>
+      <Image src={AppleStore} sx={{ flexShrink: 0, width: 110 }} />
    </Flex>
  );
 }
--- a/apps/web/src/dialogs/password-dialog.jsx
+++ b/apps/web/src/dialogs/password-dialog.jsx
@@ -105,12 +105,7 @@ function PasswordDialog(props) {
            <Label
              key={check.key}
              mt={2}
-              sx={{
-                fontSize: "body",
-                fontFamily: "body",
-                alignItems: "center",
-                color: "paragraph"
-              }}
+              sx={{ fontSize: "title", alignItems: "center" }}
            >
              <Checkbox id={check.key} name={check.key} />
              {check.title}
--- a/apps/web/src/dialogs/reminder-preview-dialog.tsx
+++ b/apps/web/src/dialogs/reminder-preview-dialog.tsx
@@ -105,7 +105,6 @@ export default function ReminderPreviewDialog(
                id: reminder.id,
                snoozeUntil: Date.now() + time.interval
              });
-              props.onClose(false);
            }}
            sx={{
              borderRadius: 100,
--- a/apps/web/src/dialogs/settings/backup-export-settings.ts
+++ b/apps/web/src/dialogs/settings/backup-export-settings.ts
@@ -62,14 +62,14 @@ export const BackupExportSettings: SettingsGroup[] = [
        key: "restore-backup",
        title: "Restore backup",
        description: "Restore a backup file from your disk drive.",
+        isHidden: () => !useUserStore.getState().isLoggedIn && !IS_TESTING,
        components: [
          {
            type: "button",
            title: "Restore",
            action: async () => {
-              if (await importBackup()) {
-                await useAppStore.getState().refresh();
-              }
+              await importBackup();
+              await useAppStore.getState().refresh();
            },
            variant: "secondary"
          }
@@ -180,11 +180,6 @@ export const BackupExportSettings: SettingsGroup[] = [
              { value: "-", title: "Select format" },
              { value: "txt", title: "Text" },
              { value: "md", title: "Markdown", premium: true },
-              {
-                value: "md-frontmatter",
-                title: "Markdown + Frontmatter",
-                premium: true
-              },
              { value: "html", title: "HTML", premium: true }
            ],
            selectedOption: () => "-",
@@ -192,7 +187,7 @@ export const BackupExportSettings: SettingsGroup[] = [
              if (!db.notes || value === "-") return;
              if (await verifyAccount())
                await exportNotes(
-                  value as "txt" | "md" | "html" | "md-frontmatter",
+                  value as "txt" | "md" | "html",
                  db.notes.all.map((n) => n.id)
                );
            }
--- a/apps/web/src/dialogs/settings/behaviour-settings.ts
+++ b/apps/web/src/dialogs/settings/behaviour-settings.ts
@@ -136,10 +136,9 @@ export const BehaviourSettings: SettingsGroup[] = [
    ]
  },
  {
-    key: "desktop-app",
+    key: "updates",
    section: "behaviour",
-    header: "Desktop app",
-    isHidden: () => !IS_DESKTOP_APP,
+    header: "Updates",
    settings: [
      {
        key: "auto-updates",
@@ -148,7 +147,6 @@ export const BehaviourSettings: SettingsGroup[] = [
          "Automatically download & install updates in the background without prompting first.",
        onStateChange: (listener) =>
          useSettingStore.subscribe((s) => s.autoUpdates, listener),
-        isHidden: () => useSettingStore.getState().isFlatpak,
        components: [
          {
            type: "toggle",
--- a/Show More
+++ b/Show More