mobile: bump version

2026-08-31 19:19:34 +02:00 · 2024-08-17 17:51:32 +05:00
233 changed files with 4755 additions and 13424 deletions
--- a/apps/desktop/package-lock.json
+++ b/apps/desktop/package-lock.json
@@ -1,21 +1,23 @@
 {
  "name": "@notesnook/desktop",
-  "version": "3.0.17",
+  "version": "3.0.13",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@notesnook/desktop",
-      "version": "3.0.17",
+      "version": "3.0.13",
      "hasInstallScript": true,
      "license": "GPL-3.0-or-later",
      "dependencies": {
+        "@notesnook/crypto": "file:../../packages/crypto",
        "@trpc/client": "10.38.3",
        "@trpc/server": "10.38.3",
        "better-sqlite3-multiple-ciphers": "^9.5.0",
        "electron-trpc": "0.5.2",
        "electron-updater": "^6.2.1",
        "icojs": "^0.17.1",
+        "sodium-native": "^4.1.1",
        "typed-emitter": "^2.1.0",
        "yargs": "^17.6.2",
        "zod": "^3.21.4"
@@ -40,7 +42,6 @@
    "../../packages/crypto": {
      "name": "@notesnook/crypto",
      "version": "2.0.7",
-      "extraneous": true,
      "license": "GPL-3.0-or-later",
      "dependencies": {
        "@notesnook/sodium": "file:../sodium"
@@ -112,6 +113,7 @@
      "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",
@@ -132,6 +134,7 @@
      "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",
@@ -145,6 +148,7 @@
      "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"
      }
@@ -153,6 +157,7 @@
      "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"
      }
@@ -161,6 +166,7 @@
      "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"
      }
@@ -814,6 +820,10 @@
        "node": ">=10"
      }
    },
+    "node_modules/@notesnook/crypto": {
+      "resolved": "../../packages/crypto",
+      "link": true
+    },
    "node_modules/@pkgjs/parseargs": {
      "version": "0.11.0",
      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -828,6 +838,7 @@
      "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"
      },
@@ -839,6 +850,7 @@
      "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"
      },
@@ -883,6 +895,7 @@
      "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",
@@ -911,12 +924,14 @@
    "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=="
+      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
+      "dev": true
    },
    "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": "*"
      }
@@ -930,7 +945,8 @@
    "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=="
+      "integrity": "sha512-DZxSZWXxFfOlx7k7Rv4LAyiMroaxa3Ly/7OOzZO8cBNho0YzAi4qlbrx8W27JGqG57IgR/6J7r+nOJWw6kcvZA==",
+      "devOptional": true
    },
    "node_modules/@types/plist": {
      "version": "3.0.2",
@@ -946,6 +962,7 @@
      "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": "*"
      }
@@ -975,6 +992,7 @@
      "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": "*"
@@ -1115,80 +1133,6 @@
        "electron-builder-squirrel-windows": "24.13.3"
      }
    },
-    "node_modules/archiver": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.2.tgz",
-      "integrity": "sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "archiver-utils": "^2.1.0",
-        "async": "^3.2.4",
-        "buffer-crc32": "^0.2.1",
-        "readable-stream": "^3.6.0",
-        "readdir-glob": "^1.1.2",
-        "tar-stream": "^2.2.0",
-        "zip-stream": "^4.1.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/archiver-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz",
-      "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.2.0",
-        "lazystream": "^1.0.0",
-        "lodash.defaults": "^4.2.0",
-        "lodash.difference": "^4.5.0",
-        "lodash.flatten": "^4.4.0",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.union": "^4.6.0",
-        "normalize-path": "^3.0.0",
-        "readable-stream": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/archiver-utils/node_modules/readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/archiver-utils/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/archiver-utils/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
    "node_modules/argparse": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -1328,6 +1272,7 @@
      "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": {
@@ -1378,6 +1323,7 @@
      "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": "*"
      }
@@ -1440,6 +1386,7 @@
      "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"
      }
@@ -1448,6 +1395,7 @@
      "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",
@@ -1567,6 +1515,7 @@
      "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"
      },
@@ -1620,22 +1569,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/compress-commons": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.2.tgz",
-      "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "buffer-crc32": "^0.2.13",
-        "crc32-stream": "^4.0.2",
-        "normalize-path": "^3.0.0",
-        "readable-stream": "^3.6.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
    "node_modules/concat-map": {
      "version": "0.0.1",
      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -1703,7 +1636,7 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-      "devOptional": true
+      "optional": true
    },
    "node_modules/crc": {
      "version": "3.8.0",
@@ -1714,33 +1647,6 @@
        "buffer": "^5.1.0"
      }
    },
-    "node_modules/crc-32": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
-      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
-      "dev": true,
-      "peer": true,
-      "bin": {
-        "crc32": "bin/crc32.njs"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/crc32-stream": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.3.tgz",
-      "integrity": "sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "crc-32": "^1.2.0",
-        "readable-stream": "^3.4.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
    "node_modules/cross-spawn": {
      "version": "7.0.3",
      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -1833,6 +1739,7 @@
      "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"
      }
@@ -1841,6 +1748,7 @@
      "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",
@@ -1874,6 +1782,7 @@
      "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": {
@@ -1990,6 +1899,7 @@
      "version": "29.3.1",
      "resolved": "https://registry.npmjs.org/electron/-/electron-29.3.1.tgz",
      "integrity": "sha512-auge1/6RVqgUd6TgIq88wKdUCJi2cjESi3jy7d+6X4JzvBGprKBqMJ8JSSFpu/Px1YJrFUKAxfy6SC+TQf1uLw==",
+      "dev": true,
      "hasInstallScript": true,
      "dependencies": {
        "@electron/get": "^2.0.0",
@@ -2029,19 +1939,6 @@
        "node": ">=14.0.0"
      }
    },
-    "node_modules/electron-builder-squirrel-windows": {
-      "version": "24.13.3",
-      "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-24.13.3.tgz",
-      "integrity": "sha512-oHkV0iogWfyK+ah9ZIvMDpei1m9ZRpdXcvde1wTpra2U8AFDNNpqJdnin5z+PM1GbQ5BoaKCWas2HSjtR0HwMg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "app-builder-lib": "24.13.3",
-        "archiver": "^5.3.1",
-        "builder-util": "24.13.1",
-        "fs-extra": "^10.1.0"
-      }
-    },
    "node_modules/electron-publish": {
      "version": "24.13.1",
      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.13.1.tgz",
@@ -2089,6 +1986,7 @@
      "version": "20.12.7",
      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz",
      "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==",
+      "dev": true,
      "dependencies": {
        "undici-types": "~5.26.4"
      }
@@ -2110,6 +2008,7 @@
      "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"
      }
@@ -2124,6 +2023,7 @@
      "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": {
@@ -2177,6 +2077,7 @@
      "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"
@@ -2197,6 +2098,7 @@
      "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",
@@ -2237,6 +2139,7 @@
      "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"
      }
@@ -2391,6 +2294,7 @@
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true,
      "optional": true
    },
    "node_modules/get-caller-file": {
@@ -2405,6 +2309,7 @@
      "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",
@@ -2420,6 +2325,7 @@
      "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"
      },
@@ -2494,6 +2400,7 @@
      "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",
@@ -2511,6 +2418,7 @@
      "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"
@@ -2526,6 +2434,7 @@
      "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",
@@ -2555,6 +2464,7 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
      "optional": true,
      "dependencies": {
        "function-bind": "^1.1.1"
@@ -2576,6 +2486,7 @@
      "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"
@@ -2588,6 +2499,7 @@
      "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"
@@ -2600,6 +2512,7 @@
      "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"
@@ -2623,7 +2536,8 @@
    "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=="
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+      "dev": true
    },
    "node_modules/http-proxy-agent": {
      "version": "5.0.0",
@@ -2643,6 +2557,7 @@
      "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"
@@ -2810,13 +2725,6 @@
        "node": ">=0.12.0"
      }
    },
-    "node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true,
-      "peer": true
-    },
    "node_modules/isbinaryfile": {
      "version": "5.0.2",
      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.2.tgz",
@@ -2912,7 +2820,8 @@
    "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=="
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
    },
    "node_modules/json-schema-traverse": {
      "version": "0.4.1",
@@ -2924,6 +2833,7 @@
      "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": {
@@ -2953,6 +2863,7 @@
      "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"
      }
@@ -2971,107 +2882,27 @@
      "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz",
      "integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q=="
    },
-    "node_modules/lazystream": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
-      "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "readable-stream": "^2.0.5"
-      },
-      "engines": {
-        "node": ">= 0.6.3"
-      }
-    },
-    "node_modules/lazystream/node_modules/readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/lazystream/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/lazystream/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
    "node_modules/lodash": {
      "version": "4.17.21",
      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
      "dev": true
    },
-    "node_modules/lodash.defaults": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/lodash.difference": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
-      "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==",
-      "dev": true,
-      "peer": true
-    },
    "node_modules/lodash.escaperegexp": {
      "version": "4.1.2",
      "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz",
      "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw=="
    },
-    "node_modules/lodash.flatten": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
-      "dev": true,
-      "peer": true
-    },
    "node_modules/lodash.isequal": {
      "version": "4.5.0",
      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
    },
-    "node_modules/lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/lodash.union": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
-      "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==",
-      "dev": true,
-      "peer": true
-    },
    "node_modules/lowercase-keys": {
      "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"
      }
@@ -3091,6 +2922,7 @@
      "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"
@@ -3136,6 +2968,7 @@
      "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"
      }
@@ -3242,7 +3075,6 @@
      "version": "4.8.0",
      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.0.tgz",
      "integrity": "sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og==",
-      "dev": true,
      "bin": {
        "node-gyp-build": "bin.js",
        "node-gyp-build-optional": "optional.js",
@@ -3262,6 +3094,7 @@
      "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"
      },
@@ -3285,6 +3118,7 @@
      "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"
@@ -3302,6 +3136,7 @@
      "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"
      }
@@ -3379,7 +3214,8 @@
    "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=="
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+      "dev": true
    },
    "node_modules/picomatch": {
      "version": "2.3.1",
@@ -3457,17 +3293,11 @@
        "prebuildify": "bin.js"
      }
    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true,
-      "peer": true
-    },
    "node_modules/progress": {
      "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"
      }
@@ -3507,6 +3337,7 @@
      "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"
      },
@@ -3573,16 +3404,6 @@
        "url": "https://github.com/sponsors/Borewit"
      }
    },
-    "node_modules/readdir-glob": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz",
-      "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "minimatch": "^5.1.0"
-      }
-    },
    "node_modules/readdirp": {
      "version": "3.6.0",
      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -3606,12 +3427,14 @@
    "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=="
+      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
+      "dev": true
    },
    "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"
      },
@@ -3632,6 +3455,7 @@
      "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",
@@ -3711,12 +3535,14 @@
      "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"
@@ -3732,6 +3558,7 @@
      "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"
@@ -3840,6 +3667,15 @@
        "npm": ">= 3.0.0"
      }
    },
+    "node_modules/sodium-native": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-4.1.1.tgz",
+      "integrity": "sha512-LXkAfRd4FHtkQS4X6g+nRcVaN7mWVNepV06phIsC6+IZFvGh1voW5TNQiQp2twVaMf05gZqQjuS+uWLM6gHhNQ==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "node-gyp-build": "^4.8.0"
+      }
+    },
    "node_modules/source-map": {
      "version": "0.6.1",
      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -3863,6 +3699,7 @@
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "dev": true,
      "optional": true
    },
    "node_modules/stat-mode": {
@@ -3962,6 +3799,7 @@
      "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"
      },
@@ -4163,7 +4001,8 @@
    "node_modules/undici-types": {
      "version": "5.26.5",
      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
    },
    "node_modules/universalify": {
      "version": "2.0.0",
@@ -4312,48 +4151,12 @@
      "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"
      }
    },
-    "node_modules/zip-stream": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.1.tgz",
-      "integrity": "sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "archiver-utils": "^3.0.4",
-        "compress-commons": "^4.1.2",
-        "readable-stream": "^3.6.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/zip-stream/node_modules/archiver-utils": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-3.0.4.tgz",
-      "integrity": "sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "glob": "^7.2.3",
-        "graceful-fs": "^4.2.0",
-        "lazystream": "^1.0.0",
-        "lodash.defaults": "^4.2.0",
-        "lodash.difference": "^4.5.0",
-        "lodash.flatten": "^4.4.0",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.union": "^4.6.0",
-        "normalize-path": "^3.0.0",
-        "readable-stream": "^3.6.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
    "node_modules/zod": {
      "version": "3.21.4",
      "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz",
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -2,7 +2,7 @@
  "name": "@notesnook/desktop",
  "productName": "Notesnook",
  "description": "Your private note taking space",
-  "version": "3.0.17",
+  "version": "3.0.13",
  "appAppleId": "1544027013",
  "private": true,
  "main": "./dist/index.js",
@@ -11,12 +11,14 @@
  "repository": "https://github.com/streetwriters/notesnook",
  "license": "GPL-3.0-or-later",
  "dependencies": {
+    "@notesnook/crypto": "file:../../packages/crypto",
    "@trpc/client": "10.38.3",
    "@trpc/server": "10.38.3",
    "better-sqlite3-multiple-ciphers": "^9.5.0",
    "electron-trpc": "0.5.2",
    "electron-updater": "^6.2.1",
    "icojs": "^0.17.1",
+    "sodium-native": "^4.1.1",
    "typed-emitter": "^2.1.0",
    "yargs": "^17.6.2",
    "zod": "^3.21.4"
--- a/apps/desktop/src/api/updater.ts
+++ b/apps/desktop/src/api/updater.ts
@@ -29,37 +29,19 @@ type Progress = { percent: number };

 const t = initTRPC.create();
 let cancellationToken: CancellationToken | undefined = undefined;
-let downloadTimeout: NodeJS.Timeout | undefined = undefined;

 export const updaterRouter = t.router({
  autoUpdates: t.procedure.query(() => config.automaticUpdates),
  install: t.procedure.query(() => autoUpdater.quitAndInstall()),
  download: t.procedure.query(async () => {
    if (cancellationToken) return;
-    clearTimeout(downloadTimeout);
-    await new Promise<string[]>((resolve, reject) => {
-      downloadTimeout = setTimeout(async () => {
-        cancellationToken = new CancellationToken();
-        autoUpdater.isUpdaterActive();
-        await autoUpdater
-          .downloadUpdate(cancellationToken)
-          .then(resolve)
-          .catch(reject)
-          .finally(() => (cancellationToken = undefined));
-      }, 1000);
-    });
+    cancellationToken = new CancellationToken();
+    await autoUpdater
+      .downloadUpdate(cancellationToken)
+      .finally(() => (cancellationToken = undefined));
  }),
  check: t.procedure.query(async () => {
-    if (cancellationToken) return;
-    clearTimeout(downloadTimeout);
-    await new Promise<void>((resolve) => {
-      downloadTimeout = setTimeout(async () => {
-        await autoUpdater
-          .checkForUpdates()
-          .catch(console.error)
-          .finally(resolve);
-      }, 1000);
-    });
+    await autoUpdater.checkForUpdates().catch(console.error);
  }),

  toggleAutoUpdates: t.procedure
--- a/apps/desktop/src/preload.ts
+++ b/apps/desktop/src/preload.ts
@@ -20,14 +20,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 import { ELECTRON_TRPC_CHANNEL } from "electron-trpc/main";
 import { type RendererGlobalElectronTRPC } from "electron-trpc/src/types";
-// import type { NNCrypto } from "@notesnook/crypto";
+import type { NNCrypto } from "@notesnook/crypto";
 import { ipcRenderer } from "electron";
 import { platform } from "os";

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

 process.once("loaded", async () => {
@@ -40,5 +40,5 @@ process.once("loaded", async () => {
  globalThis.electronTRPC = electronTRPC;
 });

-// globalThis.NativeNNCrypto = require("@notesnook/crypto").NNCrypto;
+globalThis.NativeNNCrypto = require("@notesnook/crypto").NNCrypto;
 globalThis.os = () => (MAC_APP_STORE ? "mas" : platform());
--- a/apps/mobile/app/common/analytics/index.js
+++ b/apps/mobile/app/common/analytics/index.js
@@ -0,0 +1,156 @@
+/*
+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 { Platform } from "react-native";
+import { MMKV } from "../database/mmkv";
+import { useSettingStore } from "../../stores/use-setting-store";
+
+const WEBSITE_ID = "3c6890ce-8410-49d5-8831-15fb2eb28a21";
+const baseUrl = "https://analytics.streetwriters.co/api/collect";
+
+const UA =
+  Platform.OS === "ios"
+    ? "Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1"
+    : `
+Mozilla/5.0 (Linux; Android 8.0.0; SM-G960F Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36`;
+
+/**
+ *
+ * @param {Routes} route
+ * @param {Routes[]} conditions
+ * @returns
+ */
+async function canUpdateAnalytics(route, conditions = []) {
+  if (!useSettingStore?.getState()?.settings?.telemetry) return false;
+  let eventsList = MMKV.getString("notesnookUserEvents");
+
+  if (eventsList) {
+    eventsList = JSON.parse(eventsList);
+  }
+
+  if (eventsList && eventsList[route]) {
+    console.log("analytics: event already sent", route);
+    return false;
+  }
+  if (route !== "/welcome") {
+    for (let cond of conditions) {
+      if (!eventsList || !eventsList[cond]) {
+        console.log("analytics: conditions not met for event", route, cond);
+        return false;
+      }
+    }
+  }
+  console.log("analytics: will send event", route);
+  return true;
+}
+
+async function saveAnalytics(route, value = true) {
+  let eventsList = MMKV.getString("notesnookUserEvents");
+  if (eventsList) {
+    eventsList = JSON.parse(eventsList);
+  } else {
+    eventsList = {};
+  }
+  eventsList[route] = value;
+  MMKV.setString("notesnookUserEvents", JSON.stringify(eventsList));
+}
+
+/**
+ *@typedef {"/welcome" | "/home" | "/signup" | "/first-note" | "/account-created" | "/pro-sheet" | "/pro-plans" | "/iap-native" | "/pro-screen" | "/editor" | "/editor-toolbar" | "/properties" | "/sidemenu"} Routes
+ * @param {Routes} prevRoute
+ * @param {Routes} route
+ * @param {Routes[]} conditions
+ * @param {boolean} once
+ * @returns
+ */
+
+async function pageView(
+  route,
+  prevRoute = "",
+  conditions = ["/welcome"],
+  once = true
+) {
+  if (__DEV__) return;
+  if (!(await canUpdateAnalytics(route, conditions)) && once) return;
+  let body = {
+    payload: {
+      website: WEBSITE_ID,
+      url: `notesnook-${Platform.OS}${prevRoute}${route}`,
+      referrer: `https://notesnook.com/notesnook-${Platform.OS}${prevRoute}`,
+      hostname: `notesnook-${Platform.OS}`,
+      language: "en-US",
+      screen: "1920x1080"
+    },
+    type: "pageview"
+  };
+
+  try {
+    let response = await fetch(baseUrl, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "User-Agent": UA
+      },
+      body: JSON.stringify(body)
+    });
+    console.log("analytics: event sent", route);
+    await saveAnalytics(route);
+    return await response.text();
+  } catch (e) {
+    console.log(e);
+  }
+}
+
+async function sendEvent(type, value, once = true) {
+  if (__DEV__) return;
+  if (!(await canUpdateAnalytics(type)) && once) return;
+  let body = {
+    payload: {
+      website: WEBSITE_ID,
+      url: "/",
+      event_type: type,
+      event_value: value,
+      hostname: "notesnook-android-app",
+      language: "en-US",
+      screen: "1920x1080"
+    },
+    type: "event"
+  };
+
+  try {
+    let response = await fetch(baseUrl, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "User-Agent": UA
+      },
+      body: JSON.stringify(body)
+    });
+    console.log(response.status);
+    return await response.text();
+  } catch (e) {
+    console.log(e);
+  }
+}
+
+export default {
+  sendEvent,
+  pageView,
+  saveAnalytics
+};
--- a/apps/mobile/app/common/database/index.js
+++ b/apps/mobile/app/common/database/index.js
@@ -28,7 +28,29 @@ import filesystem from "../filesystem";
 import Storage from "./storage";
 import { RNSqliteDriver } from "./sqlite.kysely";
 import { getDatabaseKey } from "./encryption";
-import SettingsService from "../../services/settings";
+
+database.host(
+  __DEV__
+    ? {
+        API_HOST: "https://api.notesnook.com",
+        AUTH_HOST: "https://auth.streetwriters.co",
+        SSE_HOST: "https://events.streetwriters.co",
+        SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",
+        ISSUES_HOST: "https://issues.streetwriters.co"
+        // API_HOST: "http://192.168.43.5:5264",
+        // AUTH_HOST: "http://192.168.43.5:8264",
+        // SSE_HOST: "http://192.168.43.5:7264",
+        // SUBSCRIPTIONS_HOST: "http://192.168.43.5:9264",
+        // ISSUES_HOST: "http://192.168.43.5:2624"
+      }
+    : {
+        API_HOST: "https://api.notesnook.com",
+        AUTH_HOST: "https://auth.streetwriters.co",
+        SSE_HOST: "https://events.streetwriters.co",
+        SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",
+        ISSUES_HOST: "https://issues.streetwriters.co"
+      }
+);

 export async function setupDatabase(password) {
  const key = await getDatabaseKey(password);
@@ -37,15 +59,6 @@ export async function setupDatabase(password) {

  console.log("Opening database with key:", !!key);

-  database.host({
-    API_HOST: "https://api.notesnook.com",
-    AUTH_HOST: "https://auth.streetwriters.co",
-    SSE_HOST: "https://events.streetwriters.co",
-    SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",
-    ISSUES_HOST: "https://issues.streetwriters.co",
-    ...(SettingsService.getProperty("serverUrls") || {})
-  });
-
  database.setup({
    storage: Storage,
    eventsource: Platform.OS === "ios" ? EventSource : AndroidEventSource,
--- a/apps/mobile/app/common/database/storage.js
+++ b/apps/mobile/app/common/database/storage.js
@@ -21,15 +21,15 @@ import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
 import {
  decrypt,
-  decryptMulti,
  deriveCryptoKey,
  encrypt,
-  encryptMulti,
  generateCryptoKey,
  getCryptoKey,
  getRandomBytes,
  hash,
-  removeCryptoKey
+  removeCryptoKey,
+  decryptMulti,
+  encryptMulti
 } from "./encryption";
 import { MMKV } from "./mmkv";

--- a/apps/mobile/app/common/filesystem/compress.js
+++ b/apps/mobile/app/common/filesystem/compress.js
@@ -20,6 +20,7 @@ import { Dimensions, Image, Platform } from "react-native";
 import ImageResizer from "@bam.tech/react-native-image-resizer";
 import RNFetchBlob from "react-native-blob-util";

+console.log("hello world");
 /**
 * Scale down & compress images to screen width
 * for loading in editor.
--- a/apps/mobile/app/common/filesystem/download-attachment.js
+++ b/apps/mobile/app/common/filesystem/download-attachment.js
@@ -18,20 +18,24 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 import Sodium from "@ammarahmed/react-native-sodium";
-import { getFileNameWithExtension } from "@notesnook/core/dist/utils/filename";
+import {
+  getFileNameWithExtension,
+  isImage,
+  isDocument
+} from "@notesnook/core/dist/utils/filename";
 import React from "react";
 import { Platform } from "react-native";
-import RNFetchBlob from "react-native-blob-util";
 import * as ScopedStorage from "react-native-scoped-storage";
 import { subscribe, zip } from "react-native-zip-archive";
+import RNFetchBlob from "react-native-blob-util";
 import { ShareComponent } from "../../components/sheets/export-notes/share";
 import { ToastManager, presentSheet } from "../../services/event-manager";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
-import { IOS_APPGROUPID } from "../../utils/constants";
 import { DatabaseLogger, db } from "../database";
 import Storage from "../database/storage";
-import { createCacheDir, exists } from "./io";
 import { cacheDir, copyFileAsync, releasePermissions } from "./utils";
+import { createCacheDir, exists } from "./io";
+import { IOS_APPGROUPID } from "../../utils/constants";

 export const FileDownloadStatus = {
  Success: 1,
@@ -207,11 +211,7 @@ export default async function downloadAttachment(
  try {
    await db
      .fs()
-      .downloadFile(
-        options.groupId || attachment.hash,
-        attachment.hash,
-        attachment.chunkSize
-      );
+      .downloadFile(options.groupId || attachment.hash, attachment.hash);
    if (!(await exists(attachment.hash))) {
      DatabaseLogger.log("Attachment does not exist after download.");
      return;
@@ -259,6 +259,15 @@ export default async function downloadAttachment(
      });
    }

+    if (
+      attachment.dateUploaded &&
+      !isImage(attachment.mimeType) &&
+      !isDocument(attachment.mimeType)
+    ) {
+      RNFetchBlob.fs
+        .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.hash}`)
+        .catch(console.log);
+    }
    if (Platform.OS === "ios" && !options.cache) {
      fileUri = folder.uri + `/${filename}`;
    }
@@ -278,6 +287,7 @@ export default async function downloadAttachment(

    return fileUri;
  } catch (e) {
+    DatabaseLogger.error(e);
    if (attachment.dateUploaded) {
      RNFetchBlob.fs
        .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.hash}`)
@@ -286,7 +296,6 @@ export default async function downloadAttachment(
        .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.hash}_dcache`)
        .catch(console.log);
    }
-    DatabaseLogger.error(e);
    useAttachmentStore.getState().remove(attachment.hash);
    if (options.throwError) {
      throw e;
--- a/apps/mobile/app/common/filesystem/download.js
+++ b/apps/mobile/app/common/filesystem/download.js
@@ -17,54 +17,31 @@ 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 hosts from "@notesnook/core/dist/utils/constants";
 import NetInfo from "@react-native-community/netinfo";
 import RNFetchBlob from "react-native-blob-util";
 import { ToastManager } from "../../services/event-manager";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
 import { DatabaseLogger, db } from "../database";
+import { cacheDir, fileCheck } from "./utils";
 import { createCacheDir, exists } from "./io";
-import { ABYTES, cacheDir, getUploadedFileSize, parseS3Error } from "./utils";

-export async function downloadFile(filename, requestOptions, cancelToken) {
-  if (!requestOptions) {
-    DatabaseLogger.log(
-      `Error downloading file: ${filename}, reason: No requestOptions`
-    );
+export async function downloadFile(filename, data, cancelToken) {
+  if (!data) {
+    DatabaseLogger.log(`Error downloading file: ${filename}, reason: No data`);
    return false;
  }

  DatabaseLogger.log(`Downloading ${filename}`);
  await createCacheDir();
-  let { url, headers, chunkSize } = requestOptions;
-  let tempFilePath = `${cacheDir}/${filename}_temp`;
-  let originalFilePath = `${cacheDir}/${filename}`;
+  let { url, headers } = data;
+  let path = `${cacheDir}/${filename}`;
+
  try {
    if (await exists(filename)) {
      DatabaseLogger.log(`File Exists already: ${filename}`);
      return true;
    }
-    const attachment = await db.attachments.attachment(filename);
-    const size = await getUploadedFileSize(filename);
-
-    if (size === -1) {
-      const error = `Uploaded file verification failed. (File hash: ${filename})`;
-      throw new Error(error);
-    }
-
-    if (size === 0) {
-      const error = `File length is 0. Please upload this file again from the attachment manager. (File hash: ${filename})`;
-      await db.attachments.markAsFailed(attachment.id, error);
-      throw new Error(error);
-    }
-
-    const totalChunks = Math.ceil(size / chunkSize);
-    const decryptedLength = size - totalChunks * ABYTES;
-
-    if (attachment && attachment.size !== decryptedLength) {
-      const error = `File length mismatch. Expected ${attachment.size} but got ${decryptedLength} bytes. Please upload this file again from the attachment manager. (File hash: ${filename})`;
-      await db.attachments.markAsFailed(attachment.id, error);
-      throw new Error(error);
-    }

    let res = await fetch(url, {
      method: "GET",
@@ -86,51 +63,34 @@ export async function downloadFile(filename, requestOptions, cancelToken) {
      );
      throw new Error("Unable to resolve download url");
    }
-
+    let totalSize = 0;
    DatabaseLogger.log(`Download starting: ${filename}`);
    let request = RNFetchBlob.config({
-      path: tempFilePath,
+      path: path,
      IOSBackgroundTask: true
    })
      .fetch("GET", downloadUrl, null)
-      .progress(async (recieved, total) => {
+      .progress((recieved, total) => {
        useAttachmentStore
          .getState()
          .setProgress(0, total, filename, recieved, "download");
-
+        totalSize = total;
        DatabaseLogger.log(`Downloading: ${filename}, ${recieved}/${total}`);
      });

    cancelToken.cancel = () => {
      useAttachmentStore.getState().remove(filename);
      request.cancel();
-      RNFetchBlob.fs.unlink(tempFilePath).catch(console.log);
      DatabaseLogger.log(`Download cancelled: ${filename}`);
    };

    let response = await request;
-    console.log(response.info().headers);
-
-    const contentType =
-      response.info().headers?.["content-type"] ||
-      response.info().headers?.["Content-Type"];
-
-    if (contentType === "application/xml") {
-      const error = parseS3Error(await response.text());
-      throw new Error(`[${error.Code}] ${error.Message}`);
-    }
-
+    await fileCheck(response, totalSize);
    let status = response.info().status;
    useAttachmentStore.getState().remove(filename);
-    await RNFetchBlob.fs.mv(tempFilePath, originalFilePath);
-
-    if (!(await exists(filename))) {
-      throw new Error("File size mismatch");
-    }
-
    return status >= 200 && status < 300;
  } catch (e) {
-    if (e.message !== "canceled" && !e.message.includes("NoSuchKey")) {
+    if (e.message !== "canceled") {
      ToastManager.show({
        heading: "Error downloading file",
        message: e.message,
@@ -146,8 +106,7 @@ export async function downloadFile(filename, requestOptions, cancelToken) {
    }

    useAttachmentStore.getState().remove(filename);
-    RNFetchBlob.fs.unlink(tempFilePath).catch(console.log);
-    RNFetchBlob.fs.unlink(originalFilePath).catch(console.log);
+    RNFetchBlob.fs.unlink(path).catch(console.log);
    DatabaseLogger.error(e, {
      url,
      headers
@@ -156,23 +115,37 @@ export async function downloadFile(filename, requestOptions, cancelToken) {
  }
 }

+export async function getUploadedFileSize(hash) {
+  try {
+    const url = `${hosts.API_HOST}/s3?name=${hash}`;
+    const token = await db.tokenManager.getAccessToken();
+    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) {
+    DatabaseLogger.error(e);
+    return -1;
+  }
+}
+
 export async function checkAttachment(hash) {
  const internetState = await NetInfo.fetch();
  const isInternetReachable =
    internetState.isConnected && internetState.isInternetReachable;
-  if (!isInternetReachable) return;
+  if (!isInternetReachable) return { success: true };
  const attachment = await db.attachments.attachment(hash);
  if (!attachment) return { failed: "Attachment not found." };

  try {
    const size = await getUploadedFileSize(hash);
-    console.log("File Size", size);
    if (size === -1) return { success: true };

-    if (size === 0)
-      return {
-        failed: `File length is 0. Please upload this file again from the attachment manager. (File hash: ${hash})`
-      };
+    if (size === 0) return { failed: "File length is 0." };
  } catch (e) {
    return { failed: e?.message };
  }
--- a/apps/mobile/app/common/filesystem/index.js
+++ b/apps/mobile/app/common/filesystem/index.js
@@ -17,22 +17,17 @@ 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 { checkAttachment, downloadFile } from "./download";
+import { checkAttachment, downloadFile, getUploadedFileSize } from "./download";
 import {
  clearFileStorage,
  deleteFile,
  exists,
  readEncrypted,
  writeEncryptedBase64,
-  hashBase64,
-  clearCache,
-  deleteCacheFileByName,
-  deleteCacheFileByPath,
-  bulkExists,
-  getCacheSize
+  hashBase64
 } from "./io";
 import { uploadFile } from "./upload";
-import { cancelable, getUploadedFileSize } from "./utils";
+import { cancelable } from "./utils";

 export default {
  readEncrypted,
@@ -44,10 +39,5 @@ export default {
  exists,
  clearFileStorage,
  getUploadedFileSize,
-  checkAttachment,
-  clearCache,
-  deleteCacheFileByName,
-  deleteCacheFileByPath,
-  bulkExists,
-  getCacheSize
+  checkAttachment
 };
--- a/apps/mobile/app/common/filesystem/io.js
+++ b/apps/mobile/app/common/filesystem/io.js
@@ -20,10 +20,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import Sodium from "@ammarahmed/react-native-sodium";
 import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
-import { eSendEvent } from "../../services/event-manager";
 import { IOS_APPGROUPID } from "../../utils/constants";
 import { DatabaseLogger, db } from "../database";
-import { ABYTES, cacheDir, cacheDirOld, getRandomId } from "./utils";
+import { cacheDir, cacheDirOld, getRandomId } from "./utils";

 export async function readEncrypted(filename, key, cipherData) {
  await migrateFilesFromCache();
@@ -159,35 +158,7 @@ export async function migrateFilesFromCache() {
  }
 }

-export async function clearCache() {
-  await RNFetchBlob.fs.unlink(cacheDir).catch(console.log);
-  await createCacheDir();
-  eSendEvent("cache-cleared");
-}
-
-export async function deleteCacheFileByPath(path) {
-  await RNFetchBlob.fs.unlink(path).catch(console.log);
-}
-
-export async function deleteCacheFileByName(name) {
-  const iosAppGroup =
-    Platform.OS === "ios"
-      ? await RNFetchBlob.fs.pathForAppGroup(IOS_APPGROUPID)
-      : null;
-  const appGroupPath = `${iosAppGroup}/${name}`;
-  await RNFetchBlob.fs.unlink(appGroupPath).catch(console.log);
-  await RNFetchBlob.fs.unlink(`${cacheDir}/${name}`).catch(console.log);
-}
-
-export async function deleteDCacheFiles() {
-  const files = await RNFetchBlob.fs.ls(cacheDir);
-  for (const file of files) {
-    if (file.includes("_dcache")) {
-      await RNFetchBlob.fs.unlink(file).catch(console.log);
-    }
-  }
-}
-
+const ABYTES = 17;
 export async function exists(filename) {
  let path = `${cacheDir}/${filename}`;

@@ -229,29 +200,3 @@ export async function exists(filename) {
  }
  return exists;
 }
-
-export async function bulkExists(files) {
-  const cacheFiles = await RNFetchBlob.fs.ls(cacheDir);
-  let missingFiles = files.filter((file) => !cacheFiles.includes(file));
-
-  if (Platform.OS === "ios") {
-    const iosAppGroup =
-      Platform.OS === "ios"
-        ? await RNFetchBlob.fs.pathForAppGroup(IOS_APPGROUPID)
-        : null;
-    const appGroupFiles = await RNFetchBlob.fs.ls(iosAppGroup);
-    missingFiles = missingFiles.filter((file) => !appGroupFiles.includes(file));
-  }
-
-  return missingFiles;
-}
-
-export async function getCacheSize() {
-  const stat = await RNFetchBlob.fs.lstat(`file://` + cacheDir);
-  let total = 0;
-  console.log("Total files", stat.length);
-  stat.forEach((s) => {
-    total += parseInt(s.size);
-  });
-  return total;
-}
--- a/apps/mobile/app/common/filesystem/upload.js
+++ b/apps/mobile/app/common/filesystem/upload.js
@@ -17,30 +17,32 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
-import { ToastManager } from "../../services/event-manager";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
-import { IOS_APPGROUPID } from "../../utils/constants";
 import { DatabaseLogger, db } from "../database";
+import { cacheDir } from "./utils";
+import { isImage, isDocument } from "@notesnook/core/dist/utils/filename";
+import { Platform } from "react-native";
+import { IOS_APPGROUPID } from "../../utils/constants";
 import { createCacheDir } from "./io";
-import { cacheDir, getUploadedFileSize } from "./utils";
+import { getUploadedFileSize } from "./download";
+import { ToastManager } from "../../services/event-manager";

-export async function uploadFile(filename, requestOptions, cancelToken) {
-  if (!requestOptions) return false;
-  let { url, headers } = requestOptions;
+export async function uploadFile(filename, data, cancelToken) {
+  if (!data) return false;
+  let { url, headers } = data;
  await createCacheDir();
  DatabaseLogger.info(`Preparing to upload file: ${filename}`);

  try {
    const uploadedFileSize = await getUploadedFileSize(filename);
-
    if (uploadedFileSize === -1) {
-      const error = `Uploaded file verification failed. (File hash: ${filename})`;
-      throw new Error(error);
+      DatabaseLogger.log("Upload verification failed.");
+      return false;
    }

-    if (uploadedFileSize !== 0) {
+    const isUploaded = uploadedFileSize !== 0;
+    if (isUploaded) {
      DatabaseLogger.log(`File ${filename} is already uploaded.`);
      return true;
    }
@@ -115,6 +117,9 @@ export async function uploadFile(filename, requestOptions, cancelToken) {
      );
      let attachment = await db.attachments.attachment(filename);
      if (!attachment) return result;
+      if (!isImage(attachment.mimeType) && !isDocument(attachment.mimeType)) {
+        RNFetchBlob.fs.unlink(`${cacheDir}/${filename}`).catch(console.log);
+      }
    } else {
      const fileInfo = await RNFetchBlob.fs.stat(uploadFilePath);
      throw new Error(
--- a/apps/mobile/app/common/filesystem/utils.js
+++ b/apps/mobile/app/common/filesystem/utils.js
@@ -17,13 +17,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+import * as ScopedStorage from "react-native-scoped-storage";
 import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
-import * as ScopedStorage from "react-native-scoped-storage";
-import { DatabaseLogger, db } from "../database";
-import hosts from "@notesnook/core/dist/utils/constants";

-export const ABYTES = 17;
 export const cacheDirOld = RNFetchBlob.fs.dirs.CacheDir;

 export const cacheDir =
@@ -37,36 +34,24 @@ export function getRandomId(prefix) {
    .replace("0.", prefix || "");
 }

-/**
- *
- * @param {string | undefined} data
- * @returns
- */
-export function parseS3Error(data) {
-  const xml = typeof data === "string" ? data : null;
+export function extractValueFromXmlTag(code, xml) {
+  if (!xml.includes(code)) return `Unknown ${code}`;
+  return xml.slice(
+    xml.indexOf(`<${code}>`) + code.length + 2,
+    xml.indexOf(`</${code}>`)
+  );
+}

-  const error = {
-    Code: "UNKNOWN",
-    Message: xml
-  };
-
-  try {
-    if (!xml) return error;
-    const doc = new DOMParser().parseFromString(xml, "text/xml");
-
-    const ErrorElement = doc.getElementsByTagName("Error")[0];
-    if (!ErrorElement) return error;
-
-    for (const child of ErrorElement.children) {
-      if (
-        child.textContent &&
-        (child.tagName === "Code" || child.tagName === "Message")
-      )
-        error[child.tagName] = child.textContent;
+export async function fileCheck(response, totalSize) {
+  if (totalSize < 1000) {
+    let text = await response.text();
+    if (text.startsWith("<?xml")) {
+      let errorJson = {
+        Code: extractValueFromXmlTag("Code", text),
+        Message: extractValueFromXmlTag("Message", text)
+      };
+      throw new Error(`${errorJson.Code}: ${errorJson.Message}`);
    }
-    return error;
-  } catch (e) {
-    return error;
  }
 }

@@ -74,11 +59,12 @@ export function cancelable(operation) {
  const cancelToken = {
    cancel: () => {}
  };
-  return (filename, requestOptions) => {
+  return (filename, { url, headers }) => {
    return {
-      execute: () => operation(filename, requestOptions, cancelToken),
+      execute: () => operation(filename, { url, headers }, cancelToken),
      cancel: async () => {
        await cancelToken.cancel();
+        RNFetchBlob.fs.unlink(`${cacheDir}/${filename}`).catch(console.log);
      }
    };
  };
@@ -105,21 +91,3 @@ export async function releasePermissions(path) {
    }
  }
 }
-
-export async function getUploadedFileSize(hash) {
-  try {
-    const url = `${hosts.API_HOST}/s3?name=${hash}`;
-    const token = await db.tokenManager.getAccessToken();
-    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) {
-    DatabaseLogger.error(e);
-    return -1;
-  }
-}
--- a/apps/mobile/app/components/attachments/actions.tsx
+++ b/apps/mobile/app/components/attachments/actions.tsx
@@ -118,14 +118,12 @@ const Actions = ({
        setLoading({
          name: "Run file check"
        });
-        const result = await filesystem.checkAttachment(attachment.hash);
-        if (!result) return;
-
-        if (result.failed) {
-          db.attachments.markAsFailed(attachment.id, result.failed);
-          setFailed(result.failed);
+        const res = await filesystem.checkAttachment(attachment.hash);
+        if (res.failed) {
+          db.attachments.markAsFailed(attachment.id, res.failed);
+          setFailed(res.failed);
          ToastManager.show({
-            heading: "File check failed with error: " + result.failed,
+            heading: "File check failed with error: " + res.failed,
            type: "error",
            context: "local"
          });
--- a/apps/mobile/app/components/attachments/index.tsx
+++ b/apps/mobile/app/components/attachments/index.tsx
@@ -122,11 +122,10 @@ export const AttachmentDialog = ({ note }: { note?: Note }) => {
      const attachment = (await attachments.item(i))?.item;
      if (!attachment) continue;
      const result = await filesystem.checkAttachment(attachment.hash);
-      if (!result) return;
      if (result.failed) {
        await db.attachments.markAsFailed(attachment.hash, result.failed);
      } else {
-        await db.attachments.markAsFailed(attachment.id);
+        await db.attachments.markAsFailed(attachment.id, undefined);
      }
    }
    refresh();
--- a/apps/mobile/app/components/auth/change-password.js
+++ b/apps/mobile/app/components/auth/change-password.js
@@ -68,8 +68,7 @@ export const ChangePassword = () => {
    setLoading(true);
    try {
      const result = await BackupService.run(false, "change-password-dialog");
-      if (result.error)
-        throw new Error(`Failed to create backup: ${result.error}`);
+      if (!result) throw new Error("Failed to create backup");

      await db.user.clearSessions();
      await db.user.changePassword(oldPassword.current, password.current);
--- a/apps/mobile/app/components/auth/signup.js
+++ b/apps/mobile/app/components/auth/signup.js
@@ -35,7 +35,6 @@ import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { hideAuth } from "./common";
 import { useSettingStore } from "../../stores/use-setting-store";
-import SettingsService from "../../services/settings";

 export const Signup = ({ changeMode, trial }) => {
  const { colors } = useThemeColors();
@@ -78,7 +77,6 @@ export const Signup = ({ changeMode, trial }) => {
      clearMessage();
      setEmailVerifyMessage();
      hideAuth();
-      SettingsService.setProperty("encryptedBackup", true);
      await sleep(300);
      if (trial) {
        PremiumService.sheet(null, null, true);
--- a/apps/mobile/app/components/auth/use-login.js
+++ b/apps/mobile/app/components/auth/use-login.js
@@ -83,7 +83,7 @@ export const useLogin = (onFinishLogin, sessionExpired = false) => {
                  setLoading(false);
                  setTimeout(() => {
                    passwordInputRef.current?.focus();
-                  }, 500);
+                  }, 1);
                  callback && callback(true);
                }
                callback && callback(false);
--- a/apps/mobile/app/components/dialog-provider/index.js
+++ b/apps/mobile/app/components/dialog-provider/index.js
@@ -23,7 +23,6 @@ import { AnnouncementDialog } from "../announcements";
 import AuthModal from "../auth/auth-modal";
 import { SessionExpired } from "../auth/session-expired";
 import { Dialog } from "../dialog";
-import { AppLockPassword } from "../dialogs/applock-password";
 import JumpToSectionDialog from "../dialogs/jump-to-section";
 import { LoadingDialog } from "../dialogs/loading";
 import PDFPreview from "../dialogs/pdf-preview";
@@ -36,7 +35,8 @@ import { Expiring } from "../premium/expiring";
 import SheetProvider from "../sheet-provider";
 import RateAppSheet from "../sheets/rate-app";
 import RecoveryKeySheet from "../sheets/recovery-key";
-import Progress from "../dialogs/progress";
+import RestoreDataSheet from "../sheets/restore-data";
+import { AppLockPassword } from "../dialogs/applock-password";

 const DialogProvider = () => {
  const { colors } = useThemeColors();
@@ -52,6 +52,7 @@ const DialogProvider = () => {
      <RecoveryKeySheet colors={colors} />
      <SheetProvider />
      <SheetProvider context="sync_progress" />
+      <RestoreDataSheet />
      <ResultDialog />
      <VaultDialog colors={colors} />
      <RateAppSheet />
@@ -61,7 +62,6 @@ const DialogProvider = () => {
      <SessionExpired />
      <PDFPreview />
      <JumpToSectionDialog />
-      <Progress />
    </>
  );
 };
--- a/apps/mobile/app/components/dialog/dialog-container.tsx
+++ b/apps/mobile/app/components/dialog/dialog-container.tsx
@@ -32,29 +32,21 @@ const DialogContainer = ({
 }: ViewProps & {
  width?: any;
  height?: any;
-  noBorder?: boolean;
 }) => {
  const { colors } = useThemeColors();

  return (
    <View
      {...restProps}
-      style={[
-        style,
-        {
-          width: width || DDS.isTab ? 500 : "85%",
-          maxHeight: height || 450,
-          borderRadius: 10,
-          backgroundColor: colors.primary.background,
-          paddingTop: 12
-        },
-        restProps?.noBorder
-          ? {}
-          : {
-              ...getElevationStyle(5),
-              ...getContainerBorder(colors.secondary.background, 0.8, 0.05)
-            }
-      ]}
+      style={{
+        ...getElevationStyle(5),
+        width: width || DDS.isTab ? 500 : "85%",
+        maxHeight: height || 450,
+        borderRadius: 10,
+        backgroundColor: colors.primary.background,
+        paddingTop: 12,
+        ...getContainerBorder(colors.secondary.background, 0.8, 0.05)
+      }}
    />
  );
 };
--- a/apps/mobile/app/components/dialog/functions.ts
+++ b/apps/mobile/app/components/dialog/functions.ts
@@ -25,7 +25,7 @@ type DialogInfo = {
  paragraph?: string;
  positiveText?: string;
  negativeText?: string;
-  positivePress?: (...args: any[]) => void;
+  positivePress?: (value: any) => void;
  onClose?: () => void;
  positiveType?:
    | "transparent"
@@ -45,15 +45,6 @@ type DialogInfo = {
  context: "global" | "local" | (string & {});
  secureTextEntry?: boolean;
  keyboardType?: string;
-  check?: {
-    info: string;
-    type?: string;
-    defaultValue?: boolean;
-  };
-  notice: {
-    text: string;
-    type: "alert" | "information";
-  };
 };

 export function presentDialog(data: Partial<DialogInfo>): void {
--- a/apps/mobile/app/components/dialog/index.js
+++ b/apps/mobile/app/components/dialog/index.js
@@ -37,7 +37,6 @@ import DialogHeader from "./dialog-header";
 import { useCallback } from "react";
 import { Button } from "../ui/button";
 import { getContainerBorder } from "../../utils/colors";
-import { Notice } from "../ui/notice";

 export const Dialog = ({ context = "global" }) => {
  const { colors } = useThemeColors();
@@ -63,8 +62,7 @@ export const Dialog = ({ context = "global" }) => {
    disableBackdropClosing: false,
    check: {
      info: "Check",
-      type: "transparent",
-      defaultValue: false
+      type: "transparent"
    }
  });

@@ -88,7 +86,7 @@ export const Dialog = ({ context = "global" }) => {
      if (!data.context) data.context = "global";
      if (data.context !== context) return;
      setDialogInfo(data);
-      setChecked(data.check?.defaultValue);
+      setChecked(false);
      values.current.inputValue = data.defaultValue;
      setVisible(true);
    },
@@ -182,19 +180,6 @@ export const Dialog = ({ context = "global" }) => {
          </View>
        ) : null}

-        {dialogInfo?.notice ? (
-          <View
-            style={{
-              paddingHorizontal: 12
-            }}
-          >
-            <Notice
-              type={dialogInfo.notice.type || "information"}
-              text={dialogInfo.notice.text}
-            />
-          </View>
-        ) : null}
-
        {dialogInfo.check ? (
          <>
            <Button
@@ -213,7 +198,7 @@ export const Dialog = ({ context = "global" }) => {
              iconSize={20}
              width="100%"
              title={dialogInfo.check.info}
-              type={checked ? dialogInfo.check.type || "plain" : "plain"}
+              type={checked ? dialogInfo.check.type || "selected" : "plain"}
            />
          </>
        ) : null}
--- a/apps/mobile/app/components/dialogs/pdf-preview/index.js
+++ b/apps/mobile/app/components/dialogs/pdf-preview/index.js
@@ -44,7 +44,6 @@ import { ProgressBarComponent } from "../../ui/svg/lazy";
 import Paragraph from "../../ui/typography/paragraph";
 import { sleep } from "../../../utils/time";
 import { MMKV } from "../../../common/database/mmkv";
-import { deleteCacheFileByPath } from "../../../common/filesystem/io";

 const WIN_WIDTH = Dimensions.get("window").width;
 const WIN_HEIGHT = Dimensions.get("window").height;
@@ -125,7 +124,6 @@ const PDFPreview = () => {
  );

  const close = () => {
-    deleteCacheFileByPath(pdfSource);
    setPDFSource(null);
    setVisible(false);
    setPassword("");
--- a/apps/mobile/app/components/dialogs/progress/index.tsx
+++ b/apps/mobile/app/components/dialogs/progress/index.tsx
@@ -1,198 +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 { useThemeColors } from "@notesnook/theme";
-import React, { useEffect } from "react";
-import { View } from "react-native";
-import { eSendEvent, eSubscribeEvent } from "../../../services/event-manager";
-import { SIZE } from "../../../utils/size";
-import { Dialog } from "../../dialog";
-import BaseDialog from "../../dialog/base-dialog";
-import DialogContainer from "../../dialog/dialog-container";
-import { Button } from "../../ui/button";
-import { ProgressBarComponent } from "../../ui/svg/lazy";
-import Heading from "../../ui/typography/heading";
-import Paragraph from "../../ui/typography/paragraph";
-
-export type ProgressOptions = {
-  progress?: string;
-  cancelCallback?: () => void;
-  title?: string;
-  paragraph?: string;
-  fillBackground?: boolean;
-  canHideProgress?: boolean;
-};
-
-export const PROGRESS_EVENTS = {
-  start: "startProgress",
-  end: "endProgress",
-  update: "updateProgress"
-};
-
-export default function Progress() {
-  const { colors } = useThemeColors();
-  const [progress, setProgress] = React.useState<string | undefined>();
-  const [visible, setVisible] = React.useState(false);
-  const cancelCallback = React.useRef<() => void>();
-  const [data, setData] = React.useState<{
-    title?: string;
-    paragraph?: string;
-    fillBackground?: boolean;
-    canHideProgress?: boolean;
-  }>();
-
-  useEffect(() => {
-    const events = [
-      eSubscribeEvent(PROGRESS_EVENTS.start, (options: ProgressOptions) => {
-        setProgress(options.progress);
-        cancelCallback.current = options.cancelCallback;
-        console.log("options", options.fillBackground);
-        setData({
-          title: options.title,
-          paragraph: options.paragraph,
-          fillBackground: options.fillBackground,
-          canHideProgress: options.canHideProgress
-        });
-        setVisible(true);
-      }),
-      eSubscribeEvent(PROGRESS_EVENTS.end, () => {
-        setProgress(undefined);
-        setVisible(false);
-        setData(undefined);
-        cancelCallback.current?.();
-        cancelCallback.current = undefined;
-      }),
-      eSubscribeEvent(PROGRESS_EVENTS.update, (options: ProgressOptions) => {
-        setProgress(options.progress);
-        if (options.cancelCallback) {
-          cancelCallback.current = options.cancelCallback;
-        }
-
-        const data: ProgressOptions = {};
-        if (options.title) data.title = options.title;
-        if (options.paragraph) data.paragraph = options.paragraph;
-        if (options.fillBackground)
-          data.fillBackground = options.fillBackground;
-
-        setData((current) => {
-          return {
-            ...current,
-            ...data
-          };
-        });
-      })
-    ];
-    return () => {
-      events.forEach((event) => event?.unsubscribe());
-      cancelCallback.current = undefined;
-    };
-  }, []);
-
-  return !visible ? null : (
-    <BaseDialog
-      background={data?.fillBackground ? colors.primary.background : undefined}
-      visible
-    >
-      <DialogContainer
-        style={{
-          paddingHorizontal: 12,
-          paddingBottom: 10
-        }}
-        noBorder={data?.fillBackground ? true : false}
-      >
-        <Dialog context="local" />
-        <View
-          style={{
-            justifyContent: "center",
-            alignItems: "center",
-            paddingHorizontal: 12,
-            gap: 10,
-            paddingBottom: 20
-          }}
-        >
-          <Heading
-            style={{
-              textAlign: "center"
-            }}
-            color={colors.primary.paragraph}
-            size={SIZE.lg}
-          >
-            {data?.title}
-          </Heading>
-          <Paragraph
-            style={{
-              textAlign: "center"
-            }}
-            color={colors.secondary.paragraph}
-          >
-            {progress ? progress : data?.paragraph}
-          </Paragraph>
-
-          <View
-            style={{
-              flexDirection: "row",
-              width: 100,
-              paddingVertical: 12
-            }}
-          >
-            <ProgressBarComponent
-              height={5}
-              width={100}
-              animated={true}
-              useNativeDriver
-              indeterminate
-              indeterminateAnimationDuration={2000}
-              unfilledColor={colors.secondary.background}
-              color={colors.primary.accent}
-              borderWidth={0}
-            />
-          </View>
-
-          {data?.canHideProgress ? null : (
-            <Button
-              title={cancelCallback.current ? "Cancel" : "Hide"}
-              type="secondaryAccented"
-              onPress={() => {
-                if (cancelCallback.current) {
-                  cancelCallback.current?.();
-                }
-                setVisible(false);
-                setProgress(undefined);
-                setData(undefined);
-              }}
-              width="100%"
-            />
-          )}
-        </View>
-      </DialogContainer>
-    </BaseDialog>
-  );
-}
-
-export function startProgress(options: ProgressOptions) {
-  eSendEvent(PROGRESS_EVENTS.start, options);
-}
-
-export function endProgress() {
-  eSendEvent(PROGRESS_EVENTS.end);
-}
-
-export function updateProgress(options: ProgressOptions) {
-  eSendEvent(PROGRESS_EVENTS.update, options);
-}
--- a/apps/mobile/app/components/intro/index.js
+++ b/apps/mobile/app/components/intro/index.js
@@ -43,6 +43,9 @@ import { eSendEvent } from "../../services/event-manager";

 const Intro = ({ navigation }) => {
  const { colors } = useThemeColors();
+  const isTelemetryEnabled = useSettingStore(
+    (state) => state.settings.telemetry
+  );
  const { width, height } = useWindowDimensions();
  const deviceMode = useSettingStore((state) => state.deviceMode);
  const insets = useGlobalSafeAreaInsets();
@@ -214,6 +217,44 @@ const Intro = ({ navigation }) => {
          type="accent"
          title="Get started"
        />
+
+        <TouchableOpacity
+          activeOpacity={1}
+          style={{
+            flexDirection: "row",
+            alignSelf: "center",
+            width: "90%",
+            marginBottom: 12,
+            paddingHorizontal: 12,
+            justifyContent: "center",
+            padding: 12,
+            maxWidth: 500
+          }}
+          onPress={() => {
+            SettingsService.set({ telemetry: !isTelemetryEnabled });
+          }}
+        >
+          <Icon
+            size={SIZE.md}
+            name={
+              isTelemetryEnabled ? "checkbox-marked" : "checkbox-blank-outline"
+            }
+            color={
+              isTelemetryEnabled ? colors.primary.accent : colors.primary.icon
+            }
+          />
+
+          <Paragraph
+            style={{
+              flexShrink: 1,
+              marginLeft: 6
+            }}
+            size={SIZE.xs}
+          >
+            Help improve Notesnook by sending completely anonymized{" "}
+            <Heading size={SIZE.xs}>private analytics and bug reports.</Heading>
+          </Paragraph>
+        </TouchableOpacity>
      </View>
    </ScrollView>
  );
--- a/apps/mobile/app/components/premium/component.js
+++ b/apps/mobile/app/components/premium/component.js
@@ -167,7 +167,7 @@ export const Component = ({ close, promo }) => {
          >
            (
            {Platform.OS === "android"
-              ? pricing.product?.subscriptionOfferDetails[0]?.pricingPhases
+              ? pricing.product?.subscriptionOfferDetails[0].pricingPhases
                  .pricingPhaseList?.[0].formattedPrice
              : pricing.product?.localizedPrice}{" "}
            / mo)
--- a/apps/mobile/app/components/premium/pricing-item.tsx
+++ b/apps/mobile/app/components/premium/pricing-item.tsx
@@ -85,7 +85,7 @@ export const PricingItem = ({
          >
            {Platform.OS === "android"
              ? (product.data as RNIap.SubscriptionAndroid | undefined)
-                  ?.subscriptionOfferDetails?.[0]?.pricingPhases
+                  ?.subscriptionOfferDetails[0].pricingPhases
                  .pricingPhaseList?.[0]?.formattedPrice
              : (product.data as RNIap.SubscriptionIOS | undefined)
                  ?.localizedPrice}
--- a/apps/mobile/app/components/premium/pricing-plans.tsx
+++ b/apps/mobile/app/components/premium/pricing-plans.tsx
@@ -393,7 +393,7 @@ export const PricingPlans = ({
                >
                  {Platform.OS === "android"
                    ? (product.data as RNIap.SubscriptionAndroid)
-                        ?.subscriptionOfferDetails[0]?.pricingPhases
+                        ?.subscriptionOfferDetails[0].pricingPhases
                        .pricingPhaseList?.[0]?.formattedPrice
                    : (product.data as RNIap.SubscriptionIOS)
                        ?.introductoryPrice ||
--- a/apps/mobile/app/components/sheets/migrate/index.tsx
+++ b/apps/mobile/app/components/sheets/migrate/index.tsx
@@ -95,9 +95,9 @@ export default function Migrate() {
      await sleep(1);
      const { error, report } = await BackupService.run(false, "local");
      if (error) {
-        ToastManager.error(error as Error, "Backup failed");
+        ToastManager.error(error, "Backup failed");
        if (report) {
-          reportError(error as Error);
+          reportError(error);
        }
        setLoading(false);
        return;
--- a/apps/mobile/app/components/sheets/restore-data/index.js
+++ b/apps/mobile/app/components/sheets/restore-data/index.js
@@ -0,0 +1,600 @@
+/*
+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 { getFormattedDate } from "@notesnook/common";
+import { EVENTS } from "@notesnook/core/dist/common";
+import { useThemeColors } from "@notesnook/theme";
+import React, { useCallback, useEffect, useRef, useState } from "react";
+import { ActivityIndicator, Platform, View } from "react-native";
+import { FlatList } from "react-native-actions-sheet";
+import RNFetchBlob from "react-native-blob-util";
+import DocumentPicker from "react-native-document-picker";
+import * as ScopedStorage from "react-native-scoped-storage";
+import { unzip } from "react-native-zip-archive";
+import { db } from "../../../common/database";
+import storage from "../../../common/database/storage";
+import { cacheDir, copyFileAsync } from "../../../common/filesystem/utils";
+import {
+  ToastManager,
+  eSubscribeEvent,
+  eUnSubscribeEvent
+} from "../../../services/event-manager";
+import Navigation from "../../../services/navigation";
+import SettingsService from "../../../services/settings";
+import { refreshAllStores } from "../../../stores/create-db-collection-store";
+import { eCloseRestoreDialog, eOpenRestoreDialog } from "../../../utils/events";
+import { SIZE } from "../../../utils/size";
+import { Dialog } from "../../dialog";
+import DialogHeader from "../../dialog/dialog-header";
+import { presentDialog } from "../../dialog/functions";
+import { Toast } from "../../toast";
+import { Button } from "../../ui/button";
+import Seperator from "../../ui/seperator";
+import SheetWrapper from "../../ui/sheet";
+import Paragraph from "../../ui/typography/paragraph";
+import { useUserStore } from "../../../stores/use-user-store";
+
+const RestoreDataSheet = () => {
+  const [visible, setVisible] = useState(false);
+  const [restoring, setRestoring] = useState(false);
+  const sheet = useRef();
+  useEffect(() => {
+    const open = async () => {
+      setVisible(true);
+      setTimeout(() => {
+        sheet.current?.show();
+      }, 1);
+    };
+    eSubscribeEvent(eOpenRestoreDialog, open);
+    eSubscribeEvent(eCloseRestoreDialog, close);
+    return () => {
+      eUnSubscribeEvent(eOpenRestoreDialog, open);
+      eUnSubscribeEvent(eCloseRestoreDialog, close);
+    };
+  }, [close]);
+
+  const close = useCallback(() => {
+    if (restoring) {
+      showIsWorking();
+      return;
+    }
+    sheet.current?.hide();
+    setTimeout(() => {
+      setVisible(false);
+    }, 150);
+  }, [restoring]);
+
+  const showIsWorking = () => {
+    ToastManager.show({
+      heading: "Restoring Backup",
+      message: "Your backup data is being restored. please wait.",
+      type: "error",
+      context: "local"
+    });
+  };
+
+  return !visible ? null : (
+    <SheetWrapper
+      fwdRef={sheet}
+      gestureEnabled={!restoring}
+      closeOnTouchBackdrop={!restoring}
+      onClose={() => {
+        setVisible(false);
+        close();
+      }}
+    >
+      <RestoreDataComponent
+        close={close}
+        restoring={restoring}
+        setRestoring={setRestoring}
+        actionSheetRef={sheet}
+      />
+      <Toast context="local" />
+    </SheetWrapper>
+  );
+};
+
+export default RestoreDataSheet;
+
+const RestoreDataComponent = ({ close, setRestoring, restoring }) => {
+  const { colors } = useThemeColors();
+  const [files, setFiles] = useState([]);
+  const [loading, setLoading] = useState(true);
+  const [backupDirectoryAndroid, setBackupDirectoryAndroid] = useState(false);
+  const [progress, setProgress] = useState();
+  useEffect(() => {
+    const subscription = db.eventManager.subscribe(
+      EVENTS.migrationProgress,
+      (progress) => {
+        setProgress(progress);
+      }
+    );
+    return () => {
+      subscription?.unsubscribe();
+    };
+  }, []);
+
+  useEffect(() => {
+    setTimeout(() => {
+      checkBackups();
+    }, 1000);
+  }, []);
+
+  const restore = async (item) => {
+    if (restoring) {
+      return;
+    }
+
+    try {
+      const file = Platform.OS === "ios" ? item.path : item.uri;
+      console.log(file);
+      if (file.endsWith(".nnbackupz")) {
+        setRestoring(true);
+
+        if (Platform.OS === "android") {
+          const cacheFile = `file://${RNFetchBlob.fs.dirs.CacheDir}/backup.zip`;
+          if (await RNFetchBlob.fs.exists(cacheFile)) {
+            await RNFetchBlob.fs.unlink(cacheFile);
+          }
+          await RNFetchBlob.fs.createFile(cacheFile, "", "utf8");
+          console.log("copying");
+          await copyFileAsync(file, cacheFile);
+          console.log("copied");
+          await restoreFromZip(cacheFile);
+        } else {
+          await restoreFromZip(file, false);
+        }
+      } else if (file.endsWith(".nnbackup")) {
+        let backup;
+        if (Platform.OS === "android") {
+          backup = await ScopedStorage.readFile(file, "utf8");
+        } else {
+          backup = await RNFetchBlob.fs.readFile(file, "utf8");
+        }
+        await restoreFromNNBackup(JSON.parse(backup));
+      }
+    } catch (e) {
+      console.log("error", e);
+      setRestoring(false);
+      backupError(e);
+    }
+  };
+
+  const withPassword = () => {
+    return new Promise((resolve) => {
+      let resolved = false;
+      presentDialog({
+        context: "local",
+        title: "Encrypted backup",
+        input: true,
+        inputPlaceholder: "Password",
+        paragraph: "Please enter password of this backup file",
+        positiveText: "Restore",
+        secureTextEntry: true,
+        onClose: () => {
+          if (resolved) return;
+          resolve(undefined);
+        },
+        negativeText: "Cancel",
+        positivePress: async (password, isEncryptionKey) => {
+          resolve({
+            value: password,
+            isEncryptionKey
+          });
+          resolved = true;
+          return true;
+        },
+        check: {
+          info: "Use encryption key",
+          type: "transparent"
+        }
+      });
+    });
+  };
+
+  const checkBackups = async () => {
+    try {
+      let files = [];
+      if (Platform.OS === "android") {
+        let backupDirectory = SettingsService.get().backupDirectoryAndroid;
+        if (backupDirectory) {
+          setBackupDirectoryAndroid(backupDirectory);
+          files = await ScopedStorage.listFiles(backupDirectory.uri);
+        } else {
+          setLoading(false);
+          return;
+        }
+      } else {
+        let path = await storage.checkAndCreateDir("/backups/");
+        files = await RNFetchBlob.fs.lstat(path);
+      }
+      files = files
+        .filter((file) => {
+          const name = Platform.OS === "android" ? file.name : file.filename;
+          return name.endsWith(".nnbackup") || name.endsWith(".nnbackupz");
+        })
+        .sort(function (a, b) {
+          let timeA = a.lastModified;
+          let timeB = b.lastModified;
+          return timeB - timeA;
+        });
+      setFiles(files);
+      setLoading(false);
+    } catch (e) {
+      console.log(e);
+      setLoading(false);
+    }
+  };
+
+  const restoreBackup = async (backup, password, key) => {
+    await db.transaction(async () => {
+      await db.backup.import(backup, password, key);
+    });
+    await db.initCollections();
+    refreshAllStores();
+    ToastManager.show({
+      heading: "Backup restored successfully.",
+      type: "success",
+      context: "global"
+    });
+    Navigation.queueRoutesForUpdate();
+    return true;
+  };
+
+  const backupError = (e) => {
+    console.log(e.stack);
+    ToastManager.show({
+      heading: "Restore failed",
+      message:
+        e.message ||
+        "The selected backup data file is invalid. You must select a *.nnbackup file to restore.",
+      type: "error",
+      context: "local"
+    });
+  };
+
+  /**
+   *
+   * @param {string} file
+   */
+  async function restoreFromZip(file, remove) {
+    try {
+      const zipOutputFolder = `${cacheDir}/backup_extracted`;
+      if (await RNFetchBlob.fs.exists(zipOutputFolder)) {
+        await RNFetchBlob.fs.unlink(zipOutputFolder);
+        await RNFetchBlob.fs.mkdir(zipOutputFolder);
+      }
+      await unzip(file, zipOutputFolder);
+      console.log("Unzipped files successfully to", zipOutputFolder);
+
+      const backupFiles = await RNFetchBlob.fs.ls(zipOutputFolder);
+
+      // if (backupFiles.findIndex((file) => file === ".nnbackup") === -1) {
+      //   throw new Error("Backup file is invalid");
+      // }
+
+      await db.transaction(async () => {
+        let password;
+        let key;
+        console.log(
+          `Found ${backupFiles?.length} files to restore from backup`
+        );
+        for (const path of backupFiles) {
+          if (path === ".nnbackup") continue;
+          const filePath = `${zipOutputFolder}/${path}`;
+          const data = await RNFetchBlob.fs.readFile(filePath, "utf8");
+          const parsed = JSON.parse(data);
+
+          if (parsed.encrypted && !password) {
+            console.log("Backup is encrypted...", "requesting password");
+            const { value, isEncryptionKey } = await withPassword();
+
+            if (isEncryptionKey) {
+              key = value;
+            } else {
+              password = value;
+            }
+            if (!password && !key) throw new Error("Failed to decrypt backup");
+          }
+          await db.backup.import(parsed, password, key);
+          console.log("Imported", path);
+        }
+      });
+      // Remove files from cache
+      RNFetchBlob.fs.unlink(zipOutputFolder).catch(console.log);
+      if (remove) {
+        RNFetchBlob.fs.unlink(file).catch(console.log);
+      }
+
+      refreshAllStores();
+      Navigation.queueRoutesForUpdate();
+      setRestoring(false);
+      close();
+      ToastManager.show({
+        heading: "Backup restored successfully.",
+        type: "success",
+        context: "global"
+      });
+    } catch (e) {
+      backupError(e);
+      setRestoring(false);
+    }
+  }
+
+  /**
+   *
+   * @param {string} file
+   */
+  async function restoreFromNNBackup(backup) {
+    try {
+      if (backup.data.iv && backup.data.salt) {
+        const { value, isEncryptionKey } = await withPassword();
+
+        let key;
+        let password;
+        if (isEncryptionKey) {
+          key = value;
+        } else {
+          password = value;
+        }
+
+        if (key || password) {
+          try {
+            await restoreBackup(backup, password, key);
+            close();
+            setRestoring(false);
+          } catch (e) {
+            setRestoring(false);
+            backupError(e);
+          }
+        } else {
+          setRestoring(false);
+        }
+      } else {
+        await restoreBackup(backup);
+        setRestoring(false);
+        close();
+      }
+    } catch (e) {
+      setRestoring(false);
+      backupError(e);
+    }
+  }
+
+  const button = {
+    title: "Restore from files",
+    onPress: async () => {
+      if (restoring) {
+        return;
+      }
+      try {
+        useUserStore.setState({
+          disableAppLockRequests: true
+        });
+        console.log("disabled...");
+        const file = await DocumentPicker.pickSingle({
+          copyTo: "cachesDirectory"
+        });
+
+        setTimeout(() => {
+          useUserStore.setState({
+            disableAppLockRequests: false
+          });
+        }, 1000);
+
+        if (file.name.endsWith(".nnbackupz")) {
+          setRestoring(true);
+          await restoreFromZip(file.fileCopyUri, true);
+        } else if (file.name.endsWith(".nnbackup")) {
+          RNFetchBlob.fs.unlink(file.fileCopyUri).catch(console.log);
+          setRestoring(true);
+          const data = await fetch(file.uri);
+          await restoreFromNNBackup(await data.json());
+        }
+      } catch (e) {
+        console.log("error", e.stack);
+        setTimeout(() => {
+          useUserStore.setState({
+            disableAppLockRequests: false
+          });
+        }, 1000);
+        setRestoring(false);
+        backupError(e);
+      }
+    }
+  };
+
+  const renderItem = ({ item, index }) => (
+    <View
+      style={{
+        minHeight: 50,
+        justifyContent: "space-between",
+        alignItems: "center",
+        width: "100%",
+        borderRadius: 0,
+        flexDirection: "row",
+        borderBottomWidth: 0.5,
+        borderBottomColor: colors.primary.border
+      }}
+    >
+      <View
+        style={{
+          maxWidth: "75%"
+        }}
+      >
+        <Paragraph size={SIZE.sm} style={{ width: "100%", maxWidth: "100%" }}>
+          {getFormattedDate(item?.lastModified * 1)}
+        </Paragraph>
+        <Paragraph size={SIZE.xs}>
+          {(item.filename || item.name).replace(".nnbackup", "")}
+        </Paragraph>
+      </View>
+      <Button
+        title="Restore"
+        height={30}
+        type="accent"
+        style={{
+          borderRadius: 100,
+          paddingHorizontal: 12
+        }}
+        fontSize={SIZE.sm - 1}
+        onPress={() => restore(item, index)}
+      />
+    </View>
+  );
+
+  return (
+    <>
+      <View>
+        <Dialog context="local" />
+        <View
+          style={{
+            flexDirection: "row",
+            justifyContent: "space-between",
+            paddingHorizontal: 8,
+            paddingRight: 8,
+            alignItems: "center",
+            paddingTop: restoring ? 8 : 0
+          }}
+        >
+          <DialogHeader
+            title="Backups"
+            paragraph={`All the backups are stored in ${
+              Platform.OS === "ios"
+                ? "File Manager/Notesnook/Backups"
+                : "selected backups folder."
+            }`}
+            button={button}
+          />
+        </View>
+        <Seperator half />
+        <FlatList
+          ListEmptyComponent={
+            !restoring ? (
+              loading ? (
+                <View
+                  style={{
+                    justifyContent: "center",
+                    alignItems: "center",
+                    height: 100
+                  }}
+                >
+                  <ActivityIndicator
+                    color={colors.primary.accent}
+                    size={SIZE.lg}
+                  />
+                </View>
+              ) : (
+                <View
+                  style={{
+                    justifyContent: "center",
+                    alignItems: "center",
+                    height: 100
+                  }}
+                >
+                  {Platform.OS === "android" && !backupDirectoryAndroid ? (
+                    <>
+                      <Button
+                        title="Select backups folder"
+                        icon="folder"
+                        onPress={async () => {
+                          let folder = await ScopedStorage.openDocumentTree(
+                            true
+                          );
+                          let subfolder;
+                          if (folder.name !== "Notesnook backups") {
+                            subfolder = await ScopedStorage.createDirectory(
+                              folder.uri,
+                              "Notesnook backups"
+                            );
+                          } else {
+                            subfolder = folder;
+                          }
+                          SettingsService.set({
+                            backupDirectoryAndroid: subfolder
+                          });
+                          setBackupDirectoryAndroid(subfolder);
+                          setLoading(true);
+                          checkBackups();
+                        }}
+                        style={{
+                          marginTop: 10,
+                          paddingHorizontal: 12
+                        }}
+                        height={30}
+                        width={null}
+                      />
+
+                      <Paragraph
+                        style={{
+                          textAlign: "center",
+                          marginTop: 5
+                        }}
+                        size={SIZE.xs}
+                        textBreakStrategy="balanced"
+                        color={colors.secondary.paragraph}
+                      >
+                        Select the folder that includes your backup files to
+                        list them here.
+                      </Paragraph>
+                    </>
+                  ) : (
+                    <Paragraph color={colors.secondary.paragraph}>
+                      No backups found
+                    </Paragraph>
+                  )}
+                </View>
+              )
+            ) : (
+              <View
+                style={{
+                  justifyContent: "center",
+                  alignItems: "center",
+                  height: 200
+                }}
+              >
+                <ActivityIndicator color={colors.primary.accent} />
+                <Paragraph color={colors.secondary.paragraph}>
+                  Restoring {progress ? progress?.collection : null}
+                  {progress ? `(${progress.current}/${progress.total}) ` : null}
+                  ...Please wait.
+                </Paragraph>
+              </View>
+            )
+          }
+          keyExtractor={(item) => item.name || item.filename}
+          style={{
+            paddingHorizontal: 12
+          }}
+          data={restoring || loading ? [] : files}
+          renderItem={renderItem}
+          ListFooterComponent={
+            restoring || loading || files.length === 0 ? null : (
+              <View
+                style={{
+                  height: 200
+                }}
+              />
+            )
+          }
+        />
+      </View>
+    </>
+  );
+};
--- a/apps/mobile/app/components/ui/button/index.tsx
+++ b/apps/mobile/app/components/ui/button/index.tsx
@@ -112,7 +112,7 @@ export const Button = ({
          NativeTooltip.show(event, tooltipText, NativeTooltip.POSITIONS.TOP);
        }
      }}
-      disabled={loading || restProps.disabled}
+      disabled={loading}
      type={type}
      accentColor={accentColor}
      accentText={accentText}
@@ -132,7 +132,6 @@ export const Button = ({
        justifyContent: "center",
        alignItems: "center",
        flexDirection: "row",
-        opacity: restProps?.disabled ? 0.5 : 1,
        ...(style as ViewStyle)
      }}
    >
--- a/apps/mobile/app/components/ui/input/index.tsx
+++ b/apps/mobile/app/components/ui/input/index.tsx
@@ -41,7 +41,6 @@ import { SIZE } from "../../../utils/size";
 import { IconButton } from "../icon-button";
 import Paragraph from "../typography/paragraph";
 import phone from "phone";
-import isURL from "validator/lib/isURL";

 interface InputProps extends TextInputProps {
  fwdRef?: RefObject<TextInput>;
@@ -50,8 +49,7 @@ interface InputProps extends TextInputProps {
    | "email"
    | "confirmPassword"
    | "username"
-    | "phonenumber"
-    | "url";
+    | "phonenumber";
  loading?: boolean;
  onSubmit?: (
    event: NativeSyntheticEvent<TextInputSubmitEditingEventData>
@@ -153,9 +151,6 @@ const Input = ({
      case "confirmPassword":
        isError = customValidator && value === customValidator();
        break;
-      case "url":
-        isError = isURL(value);
-        break;
      case "phonenumber": {
        const result = phone(value, {
          strictDetection: true,
--- a/apps/mobile/app/hooks/use-app-events.tsx
+++ b/apps/mobile/app/hooks/use-app-events.tsx
@@ -26,7 +26,10 @@ import {
 } from "@notesnook/core/dist/common";
 import { EventManagerSubscription } from "@notesnook/core/dist/utils/event-manager";
 import notifee from "@notifee/react-native";
-import NetInfo, { NetInfoSubscription } from "@react-native-community/netinfo";
+import NetInfo, {
+  NetInfoState,
+  NetInfoSubscription
+} from "@react-native-community/netinfo";
 import React, { useCallback, useEffect, useRef } from "react";
 import {
  AppState,
@@ -44,7 +47,6 @@ import { checkVersion } from "react-native-check-version";
 import Config from "react-native-config";
 import * as RNIap from "react-native-iap";
 import { DatabaseLogger, db, setupDatabase } from "../common/database";
-import { initializeLogger } from "../common/database/logger";
 import { MMKV } from "../common/database/mmkv";
 import Migrate from "../components/sheets/migrate";
 import NewFeature from "../components/sheets/new-feature";
@@ -95,7 +97,7 @@ import {
 import { getGithubVersion } from "../utils/github-version";
 import { tabBarRef } from "../utils/global-refs";
 import { sleep } from "../utils/time";
-import { NotesnookModule } from "../utils/notesnook-module";
+import { initializeLogger } from "../common/database/logger";

 const onCheckSyncStatus = async (type: SyncStatusEvent) => {
  const { disableSync, disableAutoSync } = SettingsService.get();
@@ -255,9 +257,9 @@ async function saveEditorState() {
      movedAway: editorState().movedAway,
      timestamp: Date.now()
    });
-    NotesnookModule.setAppState(state);
+    MMKV.setString("appState", state);
  } else {
-    NotesnookModule.setAppState("");
+    MMKV.removeItem("appState");
  }
 }

@@ -360,7 +362,6 @@ const initializeDatabase = async (password?: string) => {
    try {
      await setupDatabase(password);
      await db.init();
-      Sync.run();
    } catch (e) {
      DatabaseLogger.error(e as Error);
      ToastManager.error(e as Error, "Error initializing database", "global");
@@ -390,15 +391,18 @@ export const useAppEvents = () => {
  ]);

  const syncedOnLaunch = useRef(false);
+
  const refValues = useRef<
    Partial<{
      subsriptionSuccessListener: EmitterSubscription;
      subsriptionErrorListener: EmitterSubscription;
+      isUserReady: boolean;
      prevState: AppStateStatus;
+      showingDialog: boolean;
      removeInternetStateListener: NetInfoSubscription;
+      isReconnecting: boolean;
      initialUrl: string;
      backupDidWait: boolean;
-      isConnectingSSE: boolean;
    }>
  >({});

@@ -461,31 +465,14 @@ export const useAppEvents = () => {
    const user = await db.user.getUser();
    if (PremiumService.get() && user) {
      if (
-        SettingsService.get().backupDirectoryAndroid ||
-        Platform.OS !== "android"
+        await BackupService.checkBackupRequired(SettingsService.get().reminder)
      ) {
-        const partialBackup = await BackupService.checkBackupRequired(
-          SettingsService.get().reminder,
-          "lastBackupDate"
-        );
-        const fullBackup = await BackupService.checkBackupRequired(
-          SettingsService.get().fullBackupReminder,
-          "lastFullBackupDate"
-        );
-
-        await sleep(2000);
-
-        if (partialBackup) {
-          await BackupService.run();
-        }
-
-        if (fullBackup) {
-          await BackupService.run(true, undefined, "full");
-        }
-      }
-
-      if (SettingsService.getProperty("offlineMode")) {
-        db.attachments.cacheAttachments().catch(console.log);
+        if (
+          !SettingsService.get().backupDirectoryAndroid &&
+          Platform.OS === "android"
+        )
+          return;
+        sleep(2000).then(() => BackupService.run());
      }
    }
  }, []);
@@ -546,6 +533,7 @@ export const useAppEvents = () => {
        setRecoveryKeyMessage();
      }
      if (!user?.isEmailConfirmed) setEmailVerifyMessage();
+      refValues.current.isUserReady = true;

      syncedOnLaunch.current = true;
      if (!isLogin) {
@@ -619,21 +607,20 @@ export const useAppEvents = () => {
  }, [onSyncComplete, onUserUpdated]);

  useEffect(() => {
-    const onInternetStateChanged = async () => {
+    const onInternetStateChanged = async (state: NetInfoState) => {
      if (!syncedOnLaunch.current) return;
-      Sync.run("global", false, "full");
-      reconnectSSE();
+      reconnectSSE(state);
    };

    const onAppStateChanged = async (state: AppStateStatus) => {
      if (state === "active") {
        notifee.setBadgeCount(0);
        updateStatusBarColor();
+
        checkAutoBackup();
-        Sync.run("global", false, "full");
-        reconnectSSE();
+        await reconnectSSE();
        await checkForShareExtensionLaunchedInBackground();
-        NotesnookModule.setAppState("");
+        MMKV.removeItem("appState");
        let user = await db.user.getUser();
        if (user && !user?.isEmailConfirmed) {
          try {
@@ -717,15 +704,42 @@ export const useAppEvents = () => {
    }
  }, [appLocked, syncing, checkAutoBackup]);

-  async function reconnectSSE() {
+  async function reconnectSSE(connection?: NetInfoState) {
+    if (refValues.current?.isReconnecting || !refValues.current?.isUserReady)
+      return;
+
+    if (useSettingStore.getState().appDidEnterBackgroundForAction) {
+      useSettingStore.getState().setAppDidEnterBackgroundForAction(false);
+      console.log("AppDidEnterForegroundAfterAction");
+      return;
+    }
+
+    if (SettingsService.get().sessionExpired) {
+      refValues.current.isReconnecting = false;
+      return;
+    }
+
+    refValues.current.isReconnecting = true;
+    let connectionState = connection;
    try {
-      if (refValues.current?.isConnectingSSE) return;
-      refValues.current.isConnectingSSE = true;
-      await db.connectSSE();
-      refValues.current.isConnectingSSE = false;
+      if (!connectionState) {
+        connectionState = await NetInfo.fetch();
+      }
+
+      const user = await db.user.getUser();
+      if (
+        user &&
+        connectionState.isConnected &&
+        connectionState.isInternetReachable
+      ) {
+        await db.connectSSE();
+      } else {
+        useUserStore.getState().setSyncing(false);
+        await db.syncer.stop();
+      }
+      refValues.current.isReconnecting = false;
    } catch (e) {
-      refValues.current.isConnectingSSE = false;
-      DatabaseLogger.error(e as Error);
+      refValues.current.isReconnecting = false;
    }
  }

--- a/apps/mobile/app/screens/editor/tiptap/picker.ts
+++ b/apps/mobile/app/screens/editor/tiptap/picker.ts
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 import Sodium from "@ammarahmed/react-native-sodium";
 import { isImage } from "@notesnook/core/dist/utils/filename";
-import { basename } from "pathe";
 import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
 import DocumentPicker, {
@@ -42,6 +41,7 @@ import { FILE_SIZE_LIMIT, IMAGE_SIZE_LIMIT } from "../../../utils/constants";
 import { eCloseSheet } from "../../../utils/events";
 import { useTabStore } from "./use-tab-store";
 import { editorController, editorState } from "./utils";
+import { basename } from "pathe";

 const showEncryptionSheet = (file: DocumentPickerResponse) => {
  presentSheet({
@@ -123,13 +123,13 @@ const file = async (fileOptions: PickerOptions) => {
        file.name,
        fileOptions
      ))
-    ) {
-      throw new Error("Failed to attach file");
-    }
+    )
+      return;
    if (Platform.OS === "ios") await RNFetchBlob.fs.unlink(uri);

+    if (!fileOptions.tabId) return;
    if (
-      fileOptions.tabId !== undefined &&
+      fileOptions.tabId &&
      fileOptions.noteId &&
      useTabStore.getState().getNoteIdForTab(fileOptions.tabId) ===
        fileOptions.noteId
@@ -158,16 +158,16 @@ const file = async (fileOptions: PickerOptions) => {
          fileOptions.tabId
        );
      }
-    } else {
-      throw new Error("Failed to attach file, no tabId is set");
    }

-    eSendEvent(eCloseSheet);
+    setTimeout(() => {
+      eSendEvent(eCloseSheet);
+    }, 1000);
  } catch (e) {
    eSendEvent(eCloseSheet);
    ToastManager.show({
-      heading: "Failed to attach file",
-      message: (e as Error).message,
+      heading: (e as Error).message,
+      message: "You need internet access to attach a file",
      type: "error",
      context: "global"
    });
@@ -203,6 +203,7 @@ const camera = async (options: PickerOptions) => {
      type: "error",
      context: "global"
    });
+    console.log("attachment error:", e);
  }
 };

--- a/apps/mobile/app/screens/editor/tiptap/use-editor.ts
+++ b/apps/mobile/app/screens/editor/tiptap/use-editor.ts
@@ -660,9 +660,9 @@ export const useEditor = (
          lock.current = true;

          // Handle this case where note was locked on another device and synced.
-          const locked = note
-            ? await db.vaults.itemExists(note as ItemReference)
-            : false;
+          const locked = await db.vaults.itemExists(
+            currentNotes.current[noteId] as ItemReference
+          );

          if (note) {
            if (!locked && tab?.noteLocked) {
--- a/apps/mobile/app/screens/editor/tiptap/utils.ts
+++ b/apps/mobile/app/screens/editor/tiptap/utils.ts
@@ -31,7 +31,6 @@ import { useTabStore } from "./use-tab-store";
 import { parseInternalLink } from "@notesnook/core";
 import { eOnLoadNote } from "../../../utils/events";
 import { db } from "../../../common/database";
-import { NotesnookModule } from "../../../utils/notesnook-module";
 export const textInput = createRef<TextInput>();
 export const editorController =
  createRef<useEditorType>() as MutableRefObject<useEditorType>;
@@ -166,7 +165,7 @@ const canRestoreAppState = (appState: AppState) => {
 let appState: AppState | undefined;
 export function getAppState() {
  if (appState && canRestoreAppState(appState)) return appState as AppState;
-  const json = NotesnookModule.getAppState();
+  const json = MMKV.getString("appState");
  if (json) {
    appState = JSON.parse(json) as AppState;
    if (canRestoreAppState(appState)) {
@@ -181,7 +180,7 @@ export function getAppState() {

 export function clearAppState() {
  appState = undefined;
-  NotesnookModule.setAppState("");
+  MMKV.removeItem("appState");
 }

 export async function openInternalLink(url: string) {
--- a/apps/mobile/app/screens/settings/components.tsx
+++ b/apps/mobile/app/screens/settings/components.tsx
@@ -32,12 +32,9 @@ import {
  TimeFormatPicker,
  TrashIntervalPicker,
  BackupReminderPicker,
-  ApplockTimerPicker,
-  BackupWithAttachmentsReminderPicker
+  ApplockTimerPicker
 } from "./picker/pickers";
 import ThemeSelector from "./theme-selector";
-import { RestoreBackup } from "./restore-backup";
-import { ServersConfiguration } from "./server-config";

 export const components: { [name: string]: ReactElement } = {
  colorpicker: <AccentColorPicker />,
@@ -54,8 +51,5 @@ export const components: { [name: string]: ReactElement } = {
  "date-format-selector": <DateFormatPicker />,
  "time-format-selector": <TimeFormatPicker />,
  "theme-selector": <ThemeSelector />,
-  "applock-timer": <ApplockTimerPicker />,
-  autobackupsattachments: <BackupWithAttachmentsReminderPicker />,
-  backuprestore: <RestoreBackup />,
-  "server-config": <ServersConfiguration />
+  "applock-timer": <ApplockTimerPicker />
 };
--- a/apps/mobile/app/screens/settings/home.tsx
+++ b/apps/mobile/app/screens/settings/home.tsx
@@ -18,22 +18,35 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 import { NativeStackScreenProps } from "@react-navigation/native-stack";
-import React from "react";
+import React, { useEffect, useState } from "react";
 import { View } from "react-native";
 import Animated, { FadeInDown } from "react-native-reanimated";
 import DelayLayout from "../../components/delay-layout";
-import { Header } from "../../components/header";
+import BaseDialog from "../../components/dialog/base-dialog";
+import { ProgressBarComponent } from "../../components/ui/svg/lazy";
+import Heading from "../../components/ui/typography/heading";
+import Paragraph from "../../components/ui/typography/paragraph";
 import { useNavigationFocus } from "../../hooks/use-navigation-focus";
+import {
+  eSubscribeEvent,
+  eUnSubscribeEvent
+} from "../../services/event-manager";
 import useNavigationStore from "../../stores/use-navigation-store";
+import { useThemeColors } from "@notesnook/theme";
+import { SIZE } from "../../utils/size";
 import { SectionGroup } from "./section-group";
 import { settingsGroups } from "./settings-data";
 import { RouteParams, SettingSection } from "./types";
 import SettingsUserSection from "./user-section";
+import { Header } from "../../components/header";
 const keyExtractor = (item: SettingSection) => item.id;

 const Home = ({
  navigation
 }: NativeStackScreenProps<RouteParams, "SettingsHome">) => {
+  const { colors } = useThemeColors();
+  const [loading, setLoading] = useState(false);
+
  useNavigationFocus(navigation, {
    onFocus: () => {
      useNavigationStore.getState().setFocusedRouteId("Settings");
@@ -49,6 +62,16 @@ const Home = ({
      <SectionGroup item={item} />
    );

+  useEffect(() => {
+    function settingsLoading(state: boolean) {
+      setLoading(state || true);
+    }
+    eSubscribeEvent("settings-loading", settingsLoading);
+    return () => {
+      eUnSubscribeEvent("settings-loading", settingsLoading);
+    };
+  }, []);
+
  return (
    <>
      <Header
@@ -58,6 +81,57 @@ const Home = ({
        id="Settings"
      />
      <DelayLayout delay={300} type="settings">
+        {loading && (
+          //@ts-ignore // Migrate to typescript required.
+          <BaseDialog animated={false} bounce={false} visible={true}>
+            <View
+              style={{
+                width: "100%",
+                height: "100%",
+                backgroundColor: colors.primary.background,
+                justifyContent: "center",
+                alignItems: "center"
+              }}
+            >
+              <View
+                style={{
+                  width: "100%",
+                  height: "100%",
+                  backgroundColor: colors.primary.background,
+                  justifyContent: "center",
+                  alignItems: "center"
+                }}
+              >
+                <Heading color={colors.primary.paragraph} size={SIZE.lg}>
+                  Logging out
+                </Heading>
+                <Paragraph color={colors.secondary.paragraph}>
+                  Please wait while we log out and clear app data.
+                </Paragraph>
+                <View
+                  style={{
+                    flexDirection: "row",
+                    width: 100,
+                    marginTop: 15
+                  }}
+                >
+                  <ProgressBarComponent
+                    height={5}
+                    width={100}
+                    animated={true}
+                    useNativeDriver
+                    indeterminate
+                    indeterminateAnimationDuration={2000}
+                    unfilledColor={colors.secondary.background}
+                    color={colors.primary.accent}
+                    borderWidth={0}
+                  />
+                </View>
+              </View>
+            </View>
+          </BaseDialog>
+        )}
+
        <Animated.FlatList
          entering={FadeInDown}
          data={settingsGroups}
--- a/apps/mobile/app/screens/settings/picker/pickers.jsx
+++ b/apps/mobile/app/screens/settings/picker/pickers.jsx
@@ -121,8 +121,8 @@ export const BackupReminderPicker = createSettingsPicker({
    SettingsService.set({ reminder: item });
  },
  formatValue: (item) => {
-    return item === "useroff" || item === "off" || item === "never"
-      ? "Off"
+    return item === "useroff"
+      ? "Never"
      : item.slice(0, 1).toUpperCase() + item.slice(1);
  },
  getItemKey: (item) => item,
@@ -140,31 +140,6 @@ export const BackupReminderPicker = createSettingsPicker({
  }
 });

-export const BackupWithAttachmentsReminderPicker = createSettingsPicker({
-  getValue: () => useSettingStore.getState().settings.fullBackupReminder,
-  updateValue: (item) => {
-    SettingsService.set({ fullBackupReminder: item });
-  },
-  formatValue: (item) => {
-    return item === "useroff" || item === "off" || item === "never"
-      ? "Off"
-      : item.slice(0, 1).toUpperCase() + item.slice(1);
-  },
-  getItemKey: (item) => item,
-  options: ["never", "weekly", "monthly"],
-  compareValue: (current, item) => current === item,
-  premium: true,
-  requiresVerification: () => {
-    return (
-      !useSettingStore.getState().settings.encryptedBackup &&
-      useUserStore.getState().user
-    );
-  },
-  onCheckOptionIsPremium: (item) => {
-    return item !== "never";
-  }
-});
-
 export const ApplockTimerPicker = createSettingsPicker({
  getValue: () => useSettingStore.getState().settings.appLockTimer,
  updateValue: (item) => {
--- a/apps/mobile/app/screens/settings/restore-backup/index.tsx
+++ b/apps/mobile/app/screens/settings/restore-backup/index.tsx
@@ -1,558 +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 { formatBytes, getFormattedDate } from "@notesnook/common";
-import { LegacyBackupFile } from "@notesnook/core";
-import { useThemeColors } from "@notesnook/theme";
-import React, { useEffect, useState } from "react";
-import { ActivityIndicator, FlatList, Platform, View } from "react-native";
-import RNFetchBlob, { ReactNativeBlobUtilStat } from "react-native-blob-util";
-import DocumentPicker from "react-native-document-picker";
-import * as ScopedStorage from "react-native-scoped-storage";
-import { unzip } from "react-native-zip-archive";
-import { DatabaseLogger, db } from "../../../common/database";
-import storage from "../../../common/database/storage";
-import { deleteCacheFileByName } from "../../../common/filesystem/io";
-import { cacheDir, copyFileAsync } from "../../../common/filesystem/utils";
-import { presentDialog } from "../../../components/dialog/functions";
-import {
-  endProgress,
-  startProgress,
-  updateProgress
-} from "../../../components/dialogs/progress";
-import { Button } from "../../../components/ui/button";
-import Heading from "../../../components/ui/typography/heading";
-import Paragraph from "../../../components/ui/typography/paragraph";
-import { SectionItem } from "../../../screens/settings/section-item";
-import { ToastManager } from "../../../services/event-manager";
-import Navigation from "../../../services/navigation";
-import SettingsService from "../../../services/settings";
-import { refreshAllStores } from "../../../stores/create-db-collection-store";
-import { useUserStore } from "../../../stores/use-user-store";
-import { SIZE } from "../../../utils/size";
-
-type PasswordOrKey = { password?: string; encryptionKey?: string };
-
-const withPassword = () => {
-  return new Promise<PasswordOrKey>((resolve) => {
-    let resolved = false;
-    presentDialog({
-      context: "local",
-      title: "Encrypted backup",
-      input: true,
-      inputPlaceholder: "Password",
-      paragraph: "Please enter password of this backup file",
-      positiveText: "Restore",
-      secureTextEntry: true,
-      onClose: () => {
-        if (resolved) return;
-        resolve({});
-      },
-      negativeText: "Cancel",
-      positivePress: async (password, isEncryptionKey) => {
-        resolve({
-          encryptionKey: isEncryptionKey ? password : undefined,
-          password: isEncryptionKey ? undefined : password
-        });
-        resolved = true;
-        return true;
-      },
-      check: {
-        info: "Use encryption key",
-        type: "transparent"
-      }
-    });
-  });
-};
-
-const restoreBackup = async (options: {
-  uri: string;
-  deleteFile?: boolean;
-}) => {
-  try {
-    const isLegacyBackup = options.uri.endsWith(".nnbackup");
-
-    startProgress({
-      title: "Restoring backup",
-      paragraph: "Preparing to restore backup file...",
-      canHideProgress: false
-    });
-
-    let filePath = options.uri;
-    let deleteBackupFile = options.deleteFile;
-
-    if (!isLegacyBackup) {
-      if (Platform.OS === "android") {
-        updateProgress({
-          progress: `Copying backup file to cache...`
-        });
-        const cacheFile = `file://${RNFetchBlob.fs.dirs.CacheDir}/backup.zip`;
-        if (await RNFetchBlob.fs.exists(cacheFile)) {
-          await RNFetchBlob.fs.unlink(cacheFile);
-        }
-
-        await RNFetchBlob.fs.createFile(cacheFile, "", "utf8");
-        if (filePath.startsWith("content://")) {
-          await copyFileAsync(filePath, cacheFile);
-        } else {
-          await RNFetchBlob.fs.cp(filePath, cacheFile);
-        }
-        filePath = cacheFile;
-        deleteBackupFile = true;
-      }
-
-      const zipOutputFolder = `${cacheDir}/backup_extracted`;
-      if (await RNFetchBlob.fs.exists(zipOutputFolder)) {
-        await RNFetchBlob.fs.unlink(zipOutputFolder);
-        await RNFetchBlob.fs.mkdir(zipOutputFolder);
-      }
-      updateProgress({
-        progress: `Extracting files from backup...`
-      });
-      await unzip(filePath, zipOutputFolder);
-
-      const extractedBackupFiles = await RNFetchBlob.fs.ls(zipOutputFolder);
-
-      const extractedAttachments = extractedBackupFiles.includes("attachments")
-        ? await RNFetchBlob.fs.ls(`${zipOutputFolder}/attachments`)
-        : [];
-
-      const attachmentsKeyPath: any = extractedAttachments?.find(
-        (path) => path === ".attachments_key"
-      );
-      const attachmentsKey = attachmentsKeyPath
-        ? await JSON.parse(
-            await RNFetchBlob.fs.readFile(
-              `${zipOutputFolder}/attachments/${attachmentsKeyPath}`,
-              "utf8"
-            )
-          )
-        : undefined;
-
-      let count = 0;
-      await db.transaction(async () => {
-        let passwordOrKey: PasswordOrKey;
-        for (const path of extractedBackupFiles) {
-          if (path === ".nnbackup" || path === "attachments") continue;
-
-          updateProgress({
-            progress: `Restoring data (${count++}/${
-              extractedBackupFiles.length
-            })`
-          });
-
-          const filePath = `${zipOutputFolder}/${path}`;
-          const data = await RNFetchBlob.fs.readFile(filePath, "utf8");
-          const backup = JSON.parse(data);
-
-          const isEncryptedBackup = backup.encrypted;
-
-          passwordOrKey = !isEncryptedBackup
-            ? ({} as PasswordOrKey)
-            : await withPassword();
-
-          if (
-            isEncryptedBackup &&
-            !passwordOrKey?.encryptionKey &&
-            !passwordOrKey?.password
-          ) {
-            endProgress();
-            throw new Error("Failed to decrypt backup");
-          }
-
-          await db.backup.import(backup, {
-            ...passwordOrKey,
-            attachmentsKey: attachmentsKey
-          });
-        }
-      });
-
-      await db.initCollections();
-      count = 0;
-      for (const path of extractedAttachments) {
-        if (path === ".attachments_key") continue;
-        updateProgress({
-          progress: `Restoring attachments (${count++}/${
-            extractedAttachments.length
-          })`
-        });
-        const hash = path;
-        const attachment = await db.attachments.attachment(hash as string);
-        if (!attachment) continue;
-
-        console.log("Saving attachment file", hash);
-        await deleteCacheFileByName(hash);
-        await RNFetchBlob.fs.cp(
-          `${zipOutputFolder}/attachments/${hash}`,
-          `${cacheDir}/${hash}`
-        );
-      }
-      updateProgress({
-        progress: `Cleaning up...`
-      });
-      // Remove files from cache
-      RNFetchBlob.fs.unlink(zipOutputFolder).catch(console.log);
-      if (Platform.OS === "android" || deleteBackupFile) {
-        RNFetchBlob.fs.unlink(filePath).catch(console.log);
-      }
-    } else {
-      updateProgress({
-        progress: `Reading backup file...`
-      });
-      const rawData =
-        Platform.OS === "android"
-          ? await ScopedStorage.readFile(filePath, "utf8")
-          : await RNFetchBlob.fs.readFile(filePath, "utf8");
-      const backup: LegacyBackupFile = JSON.parse(rawData) as LegacyBackupFile;
-
-      const isEncryptedBackup =
-        typeof backup.data !== "string" && backup.data.cipher;
-
-      updateProgress({
-        progress: isEncryptedBackup
-          ? `Backup is encrypted, decrypting...`
-          : "Preparing to restore backup file..."
-      });
-
-      const { encryptionKey, password } = isEncryptedBackup
-        ? ({} as PasswordOrKey)
-        : await withPassword();
-
-      if (isEncryptedBackup && !encryptionKey && !password) {
-        endProgress();
-        throw new Error("Failed to decrypt backup");
-      }
-
-      await db.transaction(async () => {
-        updateProgress({
-          progress: "Restoring backup..."
-        });
-        await db.backup.import(backup, {
-          encryptionKey,
-          password
-        });
-      });
-      endProgress();
-    }
-
-    ToastManager.show({
-      heading: "Backup restored successfully",
-      type: "success"
-    });
-
-    await db.initCollections();
-    refreshAllStores();
-    Navigation.queueRoutesForUpdate();
-    endProgress();
-  } catch (e) {
-    endProgress();
-    DatabaseLogger.error(e as Error);
-    ToastManager.error(e as Error, `Failed to restore backup`);
-  }
-};
-
-const BACKUP_FILES_CACHE: (ReactNativeBlobUtilStat | ScopedStorage.FileType)[] =
-  [];
-
-export const RestoreBackup = () => {
-  const { colors } = useThemeColors();
-  const [files, setFiles] =
-    useState<(ReactNativeBlobUtilStat | ScopedStorage.FileType)[]>(
-      BACKUP_FILES_CACHE
-    );
-  const [loading, setLoading] = useState(true);
-  const [backupDirectoryAndroid, setBackupDirectoryAndroid] =
-    useState<ScopedStorage.FileType>();
-
-  useEffect(() => {
-    setTimeout(() => {
-      checkBackups();
-    }, 1000);
-  }, []);
-
-  const checkBackups = async () => {
-    try {
-      let files: (ReactNativeBlobUtilStat | ScopedStorage.FileType)[] = [];
-      if (Platform.OS === "android") {
-        const backupDirectory = SettingsService.get().backupDirectoryAndroid;
-        if (backupDirectory) {
-          setBackupDirectoryAndroid(backupDirectory);
-          files = await ScopedStorage.listFiles(backupDirectory.uri);
-        } else {
-          setLoading(false);
-          return;
-        }
-      } else {
-        const path = await storage.checkAndCreateDir("/backups/");
-        files = await RNFetchBlob.fs.lstat(path);
-      }
-      files = files
-        .filter((file) => {
-          const name =
-            Platform.OS === "android"
-              ? (file as ScopedStorage.FileType).name
-              : (file as ReactNativeBlobUtilStat).filename;
-          return name.endsWith(".nnbackup") || name.endsWith(".nnbackupz");
-        })
-        .sort(function (a, b) {
-          const timeA = a.lastModified;
-          const timeB = b.lastModified;
-          return timeB - timeA;
-        });
-
-      setFiles(files);
-      BACKUP_FILES_CACHE.splice(0, BACKUP_FILES_CACHE.length, ...files);
-    } catch (e) {
-      e;
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  const renderItem = React.useCallback(
-    ({
-      item,
-      index
-    }: {
-      item: ReactNativeBlobUtilStat | ScopedStorage.FileType;
-      index: number;
-    }) => <BackupItem item={item} index={index} />,
-    []
-  );
-
-  return (
-    <>
-      <FlatList
-        data={[0]}
-        renderItem={() => {
-          return (
-            <View>
-              <SectionItem
-                item={{
-                  id: "restore-from-files",
-                  name: "Restore from files",
-                  icon: "folder",
-                  modifer: async () => {
-                    useUserStore.setState({
-                      disableAppLockRequests: true
-                    });
-                    const file = await DocumentPicker.pickSingle({
-                      copyTo: "cachesDirectory"
-                    });
-
-                    setTimeout(() => {
-                      useUserStore.setState({
-                        disableAppLockRequests: false
-                      });
-                    }, 1000);
-
-                    restoreBackup({
-                      uri:
-                        Platform.OS === "android"
-                          ? (("file://" + file.fileCopyUri) as string)
-                          : (file.fileCopyUri as string),
-                      deleteFile: true
-                    });
-                  },
-                  description:
-                    "Select a backup file from your device to restore backup"
-                }}
-              />
-
-              {Platform.OS === "android" ? (
-                <SectionItem
-                  item={{
-                    id: "select-backup-folder",
-                    name: "Select folder with backup files",
-                    icon: "folder",
-                    modifer: async () => {
-                      const folder = await ScopedStorage.openDocumentTree(true);
-                      let subfolder;
-                      if (folder.name !== "Notesnook backups") {
-                        subfolder = await ScopedStorage.createDirectory(
-                          folder.uri,
-                          "Notesnook backups"
-                        );
-                      } else {
-                        subfolder = folder;
-                      }
-                      SettingsService.set({
-                        backupDirectoryAndroid: subfolder
-                      });
-                      setBackupDirectoryAndroid(subfolder);
-                      setLoading(true);
-                      checkBackups();
-                    },
-                    description:
-                      "Select folder where Notesnook backup files are stored to view and restore them from the app"
-                  }}
-                />
-              ) : null}
-
-              <FlatList
-                ListHeaderComponent={
-                  <View
-                    style={{
-                      backgroundColor: colors.primary.background,
-                      marginBottom: 10
-                    }}
-                  >
-                    <Heading color={colors.primary.accent} size={SIZE.xs}>
-                      RECENT BACKUPS
-                    </Heading>
-                  </View>
-                }
-                stickyHeaderIndices={[0]}
-                ListEmptyComponent={
-                  loading ? (
-                    <View
-                      style={{
-                        justifyContent: "center",
-                        alignItems: "center",
-                        height: 300,
-                        paddingHorizontal: 50
-                      }}
-                    >
-                      <ActivityIndicator
-                        color={colors.primary.accent}
-                        size={SIZE.lg}
-                      />
-                    </View>
-                  ) : (
-                    <View
-                      style={{
-                        justifyContent: "center",
-                        alignItems: "center",
-                        gap: 12,
-                        height: 300,
-                        paddingHorizontal: 50
-                      }}
-                    >
-                      <Paragraph
-                        style={{
-                          textAlign: "center"
-                        }}
-                        color={colors.secondary.paragraph}
-                      >
-                        No backups were found.{" "}
-                        {!backupDirectoryAndroid
-                          ? `Please select a folder with backup files to view them here.`
-                          : null}
-                      </Paragraph>
-                    </View>
-                  )
-                }
-                windowSize={2}
-                keyExtractor={(item) =>
-                  (item as ScopedStorage.FileType).name ||
-                  (item as ReactNativeBlobUtilStat).filename
-                }
-                style={{
-                  paddingHorizontal: 12
-                }}
-                ListFooterComponent={
-                  <View
-                    style={{
-                      height: 200
-                    }}
-                  />
-                }
-                data={files}
-                renderItem={renderItem}
-              />
-            </View>
-          );
-        }}
-      />
-    </>
-  );
-};
-
-const BackupItem = ({
-  item,
-  index
-}: {
-  item: ReactNativeBlobUtilStat | ScopedStorage.FileType;
-  index: number;
-}) => {
-  const { colors } = useThemeColors();
-
-  const isLegacyBackup =
-    item.path?.endsWith(".nnbackup") ||
-    (item as ScopedStorage.FileType).uri?.endsWith(".nnbackup");
-  const itemName = (
-    (item as ReactNativeBlobUtilStat).filename ||
-    (item as ScopedStorage.FileType).name
-  )
-    .replace(".nnbackupz", "")
-    .replace(".nnbackup", "");
-
-  return (
-    <View
-      style={{
-        justifyContent: "space-between",
-        alignItems: "center",
-        width: "100%",
-        borderRadius: 0,
-        flexDirection: "row",
-        borderBottomWidth: 0.5,
-        borderBottomColor: colors.primary.border,
-        paddingVertical: 12
-      }}
-    >
-      <View>
-        <Paragraph size={SIZE.sm}>{itemName}</Paragraph>
-        <Paragraph
-          size={SIZE.xs}
-          color={colors.secondary.paragraph}
-          style={{ width: "100%", maxWidth: "100%" }}
-        >
-          Created on {getFormattedDate(item?.lastModified, "date-time")}
-          {isLegacyBackup ? "(Legacy backup)" : ""} (
-          {formatBytes((item as ReactNativeBlobUtilStat).size)})
-        </Paragraph>
-      </View>
-      <Button
-        title="Restore"
-        type="secondaryAccented"
-        style={{
-          paddingHorizontal: 12,
-          height: 35
-        }}
-        onPress={() => {
-          presentDialog({
-            title: `Restore ${itemName}`,
-            paragraph: `Are you sure you want to restore this backup?`,
-            positiveText: "Restore",
-            negativeText: "Cancel",
-            positivePress: async () => {
-              console.log("file path", (item as ScopedStorage.FileType).uri);
-              restoreBackup({
-                uri:
-                  Platform.OS === "android"
-                    ? (item as ScopedStorage.FileType).uri
-                    : (item as ReactNativeBlobUtilStat).path
-              });
-            }
-          });
-        }}
-      />
-    </View>
-  );
-};
--- a/apps/mobile/app/screens/settings/server-config.tsx
+++ b/apps/mobile/app/screens/settings/server-config.tsx
@@ -1,213 +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 { isServerCompatible } from "@notesnook/core";
-import { useThemeColors } from "@notesnook/theme";
-import React, { useState } from "react";
-import { View } from "react-native";
-import { presentDialog } from "../../components/dialog/functions";
-import { Button } from "../../components/ui/button";
-import Input from "../../components/ui/input";
-import { Notice } from "../../components/ui/notice";
-import Paragraph from "../../components/ui/typography/paragraph";
-import SettingsService from "../../services/settings";
-import { HostId, HostIds } from "../../stores/use-setting-store";
-import { useUserStore } from "../../stores/use-user-store";
-import { ToastManager } from "../../services/event-manager";
-
-export const ServerIds = ["notesnook-sync", "auth", "sse"] as const;
-export type ServerId = (typeof ServerIds)[number];
-type Server = {
-  id: ServerId;
-  host: HostId;
-  title: string;
-  example: string;
-  description: string;
-};
-type VersionResponse = {
-  version: number;
-  id: string;
-  instance: string;
-};
-const SERVERS: Server[] = [
-  {
-    id: "notesnook-sync",
-    host: "API_HOST",
-    title: "Sync server",
-    example: "http://localhost:4326",
-    description: "Server used to sync your notes & other data between devices."
-  },
-  {
-    id: "auth",
-    host: "AUTH_HOST",
-    title: "Auth server",
-    example: "http://localhost:5326",
-    description: "Server used for login/sign up and authentication."
-  },
-  {
-    id: "sse",
-    host: "SSE_HOST",
-    title: "Events server",
-    example: "http://localhost:7326",
-    description: "Server used to receive important notifications & events."
-  }
-];
-export function ServersConfiguration() {
-  const { colors } = useThemeColors();
-  const [error, setError] = useState<string>();
-  const [success, setSuccess] = useState<boolean>();
-  const [urls, setUrls] = useState<Partial<Record<HostId, string>>>(
-    SettingsService.getProperty("serverUrls") || {}
-  );
-  const isLoggedIn = useUserStore((state) => !!state.user);
-
-  return (
-    <View
-      style={{
-        paddingHorizontal: 12,
-        gap: 12,
-        marginTop: 12
-      }}
-    >
-      {isLoggedIn ? (
-        <Notice
-          text="You must log out in order to change/reset server URLs."
-          type="alert"
-        />
-      ) : null}
-
-      <View style={{ flexDirection: "column" }}>
-        {SERVERS.map((server) => (
-          <Input
-            key={server.id}
-            editable={!isLoggedIn}
-            placeholder={`${server.id} e.g. ${server.example}`}
-            validationType="url"
-            defaultValue={urls[server.host]}
-            errorMessage="Please enter a valid URL."
-            onChangeText={(value) =>
-              setUrls((s) => {
-                s[server.host] = value;
-                return s;
-              })
-            }
-          />
-        ))}
-
-        {error ? (
-          <Paragraph
-            style={{
-              paddingVertical: 12
-            }}
-            color={colors.error.paragraph}
-          >
-            {error}
-          </Paragraph>
-        ) : null}
-
-        {success === true ? (
-          <Paragraph
-            style={{
-              paddingVertical: 12
-            }}
-            color={colors.success.paragraph}
-          >
-            Connected to all servers sucessfully.
-          </Paragraph>
-        ) : null}
-        <View style={{ marginTop: 1, justifyContent: "flex-end", gap: 12 }}>
-          <Button
-            disabled={isLoggedIn}
-            type="secondary"
-            width="100%"
-            onPress={async () => {
-              try {
-                for (const host of HostIds) {
-                  const url = urls[host];
-                  const server = SERVERS.find((s) => s.host === host)!;
-                  if (!url) throw new Error("All server urls are required.");
-                  const version = await fetch(`${url}/version`)
-                    .then((r) => r.json() as Promise<VersionResponse>)
-                    .catch(() => undefined);
-                  if (!version)
-                    throw new Error(`Could not connect to ${server.title}.`);
-                  if (version.id !== server.id)
-                    throw new Error(
-                      `The URL you have given (${url}) does not point to the ${server.title}.`
-                    );
-                  if (!isServerCompatible(version.version)) {
-                    throw new Error(
-                      `The server version is not compatible with the app.`
-                    );
-                  }
-                }
-                setSuccess(true);
-                setError(undefined);
-              } catch (e) {
-                setError((e as Error).message);
-              }
-            }}
-            title="Test connection"
-          />
-
-          <Button
-            type="accent"
-            disabled={isLoggedIn}
-            width="100%"
-            onPress={async () => {
-              if (!success) {
-                ToastManager.show({
-                  heading: "Test connection before changing server urls"
-                });
-                return;
-              }
-              SettingsService.setProperty(
-                "serverUrls",
-                urls as Record<HostId, string>
-              );
-
-              presentDialog({
-                title: "Server url changed",
-                paragraph: "Restart the app for changes to take effect.",
-                negativeText: "Done"
-              });
-            }}
-            title="Save"
-          />
-
-          <Button
-            disabled={isLoggedIn}
-            type="error"
-            width="100%"
-            title="Reset server urls"
-            onPress={async () => {
-              if (isLoggedIn) return;
-              SettingsService.setProperty("serverUrls", undefined);
-              presentDialog({
-                title: "Server urls reset",
-                paragraph: "Restart the app for changes to take effect.",
-                negativeText: "Done"
-              });
-            }}
-          />
-        </View>
-      </View>
-    </View>
-  );
-}
--- a/apps/mobile/app/screens/settings/settings-data.tsx
+++ b/apps/mobile/app/screens/settings/settings-data.tsx
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-import { formatBytes } from "@notesnook/common";
 import notifee from "@notifee/react-native";
 import dayjs from "dayjs";
 import React from "react";
@@ -25,19 +24,12 @@ import { Appearance, Linking, Platform } from "react-native";
 import { getVersion } from "react-native-device-info";
 import * as RNIap from "react-native-iap";
 import { enabled } from "react-native-privacy-snapshot";
-import ScreenGuardModule from "react-native-screenguard";
-import { DatabaseLogger, db } from "../../common/database";
+import { db } from "../../common/database";
 import { MMKV } from "../../common/database/mmkv";
-import filesystem from "../../common/filesystem";
 import { AttachmentDialog } from "../../components/attachments";
 import { ChangePassword } from "../../components/auth/change-password";
 import { presentDialog } from "../../components/dialog/functions";
 import { AppLockPassword } from "../../components/dialogs/applock-password";
-import {
-  endProgress,
-  startProgress,
-  updateProgress
-} from "../../components/dialogs/progress";
 import { ChangeEmail } from "../../components/sheets/change-email";
 import ExportNotesSheet from "../../components/sheets/export-notes";
 import { Issue } from "../../components/sheets/github/issue";
@@ -50,7 +42,6 @@ import BiometricService from "../../services/biometrics";
 import {
  ToastManager,
  eSendEvent,
-  eSubscribeEvent,
  openVault,
  presentSheet
 } from "../../services/event-manager";
@@ -69,7 +60,8 @@ import {
  eCloseSheet,
  eCloseSimpleDialog,
  eOpenLoginDialog,
-  eOpenRecoveryKeyDialog
+  eOpenRecoveryKeyDialog,
+  eOpenRestoreDialog
 } from "../../utils/events";
 import { NotesnookModule } from "../../utils/notesnook-module";
 import { sleep } from "../../utils/time";
@@ -78,6 +70,7 @@ import { useDragState } from "./editor/state";
 import { verifyUser, verifyUserWithApplock } from "./functions";
 import { SettingSection } from "./types";
 import { getTimeLeft } from "./user-section";
+import ScreenGuardModule from "react-native-screenguard";

 type User = any;

@@ -338,144 +331,45 @@ export const settingsGroups: SettingSection[] = [
            },
            description: "Verify your subscription to Notesnook Pro"
          },
-          {
-            id: "clear-cache",
-            name: "Clear cache",
-            icon: "delete",
-            modifer: async () => {
-              presentDialog({
-                title: "Clear cache",
-                paragraph: "Are you sure you want to clear the cache?",
-                positiveText: "Clear",
-                positivePress: async () => {
-                  filesystem.clearCache();
-                  ToastManager.show({
-                    heading: "Cache cleared",
-                    message: "All cached attachments have been removed",
-                    type: "success"
-                  });
-                }
-              });
-            },
-            description(current) {
-              return `Clear all cached attachments. Current cache size: ${
-                current as number
-              }`;
-            },
-            useHook: () => {
-              const [cacheSize, setCacheSize] = React.useState(0);
-              React.useEffect(() => {
-                filesystem.getCacheSize().then(setCacheSize).catch(console.log);
-                const sub = eSubscribeEvent("cache-cleared", () => {
-                  setCacheSize(0);
-                });
-                return () => {
-                  sub?.unsubscribe();
-                };
-              }, []);
-              return formatBytes(cacheSize);
-            }
-          },
-
          {
            id: "logout",
-            name: "Logout",
+            name: "Log out",
            description:
-              "Logging out will clear all data stored on this device.",
+              "Logging out will clear all data stored on THIS DEVICE.",
            icon: "logout",
-            modifer: async () => {
-              const hasUnsyncedChanges = await db.hasUnsyncedChanges();
+            modifer: () => {
              presentDialog({
                title: "Logout",
                paragraph:
-                  "Are you sure you want to logout and clear all data stored on this device?",
+                  "Logging out will clear all data stored on THIS DEVICE. Make sure you have synced all your changes before logging out.",
                positiveText: "Logout",
-                check: {
-                  info: "Take a backup before logging out",
-                  defaultValue: true
-                },
-                notice: hasUnsyncedChanges
-                  ? {
-                      text: "You have unsynced notes. Take a backup or sync your notes to avoid losing your critical data.",
-                      type: "alert"
-                    }
-                  : undefined,
-                positivePress: async (_, takeBackup) => {
-                  eSendEvent(eCloseSimpleDialog);
-                  setTimeout(async () => {
-                    try {
-                      startProgress({
-                        fillBackground: true,
-                        title: "Logging out",
-                        canHideProgress: true,
-                        paragraph:
-                          "Please wait while we log out and clear app data."
-                      });
-
-                      Navigation.navigate("Notes");
-
-                      if (takeBackup) {
-                        updateProgress({
-                          progress: "Taking a backup of your notes"
-                        });
-
-                        try {
-                          const result = await BackupService.run(
-                            false,
-                            "local",
-                            "partial"
-                          );
-                          if (result.error) throw result.error as Error;
-                        } catch (e) {
-                          DatabaseLogger.error(e);
-                          const error = e;
-                          const canLogout = await new Promise((resolve) => {
-                            presentDialog({
-                              context: "local",
-                              title: "Backup failed",
-                              paragraph: `${
-                                (error as Error).message
-                              }. Do you want to continue logging out?`,
-                              positiveText: "Continue",
-                              positivePress: () => {
-                                resolve(true);
-                              },
-                              onClose: () => {
-                                resolve(false);
-                              }
-                            });
-                          });
-                          if (!canLogout) {
-                            endProgress();
-                            return;
-                          }
-                        }
-                      }
-
-                      updateProgress({
-                        progress: "Logging out... please wait"
-                      });
-
+                positivePress: async () => {
+                  try {
+                    eSendEvent(eCloseSimpleDialog);
+                    setTimeout(async () => {
+                      eSendEvent("settings-loading", true);
+                      Navigation.popToTop();
                      await db.user?.logout();
                      setLoginMessage();
                      await PremiumService.setPremiumStatus();
                      await BiometricService.resetCredentials();
                      MMKV.clearStore();
                      clearAllStores();
-                      setImmediate(() => {
-                        refreshAllStores();
-                      });
+                      refreshAllStores();
                      Navigation.queueRoutesForUpdate();
                      SettingsService.resetSettings();
                      useUserStore.getState().setUser(null);
                      useUserStore.getState().setSyncing(false);
-                      endProgress();
-                    } catch (e) {
-                      DatabaseLogger.error(e);
-                      ToastManager.error(e as Error, "Error logging out");
-                      endProgress();
-                    }
-                  }, 300);
+                      Navigation.goBack();
+                      Navigation.popToTop();
+                      setTimeout(() => {
+                        eSendEvent("settings-loading", false);
+                      }, 3000);
+                    }, 300);
+                  } catch (e) {
+                    ToastManager.error(e as Error, "Error logging out");
+                    eSendEvent("settings-loading", false);
+                  }
                }
              });
            }
@@ -501,18 +395,12 @@ export const settingsGroups: SettingSection[] = [
                  try {
                    const verified = await db.user?.verifyPassword(value);
                    if (verified) {
-                      setTimeout(async () => {
-                        startProgress({
-                          title: "Deleting account",
-                          paragraph: "Please wait while we delete your account"
-                        });
-                        Navigation.navigate("Notes");
-                        await db.user?.deleteUser(value);
-                        await BiometricService.resetCredentials();
-                        SettingsService.set({
-                          introCompleted: true
-                        });
-                      }, 300);
+                      eSendEvent("settings-loading", true);
+                      await db.user?.deleteUser(value);
+                      await BiometricService.resetCredentials();
+                      SettingsService.set({
+                        introCompleted: true
+                      });
                    } else {
                      ToastManager.show({
                        heading: "Incorrect password",
@@ -523,9 +411,9 @@ export const settingsGroups: SettingSection[] = [
                      });
                    }

-                    endProgress();
+                    eSendEvent("settings-loading", false);
                  } catch (e) {
-                    endProgress();
+                    eSendEvent("settings-loading", false);
                    console.log(e);
                    ToastManager.error(
                      e as Error,
@@ -546,25 +434,6 @@ export const settingsGroups: SettingSection[] = [
        type: "screen",
        icon: "autorenew",
        sections: [
-          {
-            id: "offline-mode",
-            name: "Full offline mode",
-            description: "Download everything including attachments on sync",
-            type: "switch",
-            property: "offlineMode",
-            modifer: () => {
-              const current = SettingsService.get().offlineMode;
-              if (current) {
-                SettingsService.setProperty("offlineMode", false);
-                db.fs().cancel("offline-mode");
-                return;
-              }
-              PremiumService.verify(() => {
-                SettingsService.setProperty("offlineMode", true);
-                db.attachments.cacheAttachments().catch(console.log);
-              });
-            }
-          },
          {
            id: "auto-sync",
            name: "Disable auto sync",
@@ -820,14 +689,6 @@ export const settingsGroups: SettingSection[] = [
            type: "switch"
          }
        ]
-      },
-      {
-        id: "servers",
-        type: "screen",
-        name: "Servers",
-        description: "Configure server URLs for Notesnook",
-        icon: "server",
-        component: "server-config"
      }
    ]
  },
@@ -835,6 +696,15 @@ export const settingsGroups: SettingSection[] = [
    id: "privacy-security",
    name: "Privacy and security",
    sections: [
+      {
+        id: "temeltery",
+        type: "switch",
+        name: "Telemetry",
+        icon: "radar",
+        description:
+          "Contribute towards a better Notesnook. All tracking information is anonymous.",
+        property: "telemetry"
+      },
      {
        id: "marketing-emails",
        type: "switch",
@@ -1171,8 +1041,7 @@ export const settingsGroups: SettingSection[] = [
          {
            id: "backup-now",
            name: "Backup now",
-            description:
-              "Take a partial backup of your data that does not include attachments",
+            description: "Create a backup of your data",
            modifer: async () => {
              const user = useUserStore.getState().user;
              if (!user || SettingsService.getProperty("encryptedBackup")) {
@@ -1183,41 +1052,14 @@ export const settingsGroups: SettingSection[] = [
              verifyUser(null, () => BackupService.run(true));
            }
          },
-          {
-            id: "backup-now",
-            name: "Backup now with attachments",
-            hidden: () => !useUserStore.getState().user,
-            description: "Take a full backup of your data with all attachments",
-            modifer: async () => {
-              const user = useUserStore.getState().user;
-              if (!user || SettingsService.getProperty("encryptedBackup")) {
-                await BackupService.run(true, undefined, "full");
-                return;
-              }
-
-              verifyUser(null, () =>
-                BackupService.run(true, undefined, "full")
-              );
-            }
-          },
          {
            id: "auto-backups",
            type: "component",
            name: "Automatic backups",
            description:
-              "Set the interval to create a partial backup (without attachments) automatically.",
+              "Backup your data once every week or daily automatically.",
            component: "autobackups"
          },
-          {
-            id: "auto-backups-with-attachments",
-            type: "component",
-            hidden: () => !useUserStore.getState().user,
-            name: "Automatic backups with attachments",
-            description: `Set the interval to create a backup (with attachments) automatically.
-
-NOTE: Creating a backup with attachments can take a while, and also fail completely. The app will try to resume/restart the backup in case of interruptions.`,
-            component: "autobackupsattachments"
-          },
          {
            id: "select-backup-dir",
            name: "Select backup directory",
@@ -1309,8 +1151,9 @@ NOTE: Creating a backup with attachments can take a while, and also fail complet
        id: "restore-backup",
        name: "Restore backup",
        description: "Restore backup from phone storage.",
-        type: "screen",
-        component: "backuprestore"
+        modifer: () => {
+          eSendEvent(eOpenRestoreDialog);
+        }
      },
      {
        id: "export-notes",
@@ -1490,9 +1333,9 @@ NOTE: Creating a backup with attachments can take a while, and also fail complet
        }
      },
      {
-        id: "join-mastodon",
+        id: "join-mastodom",
        name: "Follow us on Mastodon",
-        description: "We are on mastodon",
+        description: "We are on mastodom",
        icon: "mastodon",
        modifer: () => {
          Linking.openURL("https://fosstodon.org/@notesnook").catch(
--- a/apps/mobile/app/screens/settings/subscription.js
+++ b/apps/mobile/app/screens/settings/subscription.js
@@ -90,7 +90,7 @@ export const Subscription = () => {

  function getPrice() {
    return Platform.OS === "android"
-      ? monthlyPlan?.product?.subscriptionOfferDetails[0]?.pricingPhases
+      ? monthlyPlan?.product?.subscriptionOfferDetails[0].pricingPhases
          .pricingPhaseList?.[0]?.formattedPrice
      : monthlyPlan?.product?.localizedPrice;
  }
--- a/apps/mobile/app/services/background-sync.ts
+++ b/apps/mobile/app/services/background-sync.ts
@@ -16,15 +16,14 @@ 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 BackgroundFetch from "@ammarahmed/react-native-background-fetch";
-import { AppRegistry, AppState, Platform } from "react-native";
+import { Platform } from "react-native";
 import {
  beginBackgroundTask,
  endBackgroundTask
 } from "react-native-begin-background-task";
+import BackgroundFetch from "@ammarahmed/react-native-background-fetch";
 import { DatabaseLogger, db, setupDatabase } from "../common/database";
-import { deleteDCacheFiles } from "../common/filesystem/io";
-import { useUserStore } from "../stores/use-user-store";
+import { AppState, AppRegistry } from "react-native";
 import Notifications from "./notifications";
 import SettingsService from "./settings";

@@ -115,19 +114,15 @@ async function onBackgroundSyncStarted() {
      await db.init();
    }
    const user = await db.user?.getUser();
-    if (user && !useUserStore.getState().syncing) {
-      useUserStore.getState().setSyncing(true);
+    if (user) {
      await db.sync({
        type: "full",
        force: false
      });
-      useUserStore.getState().setSyncing(false);
    }
    await Notifications.setupReminders();
-    deleteDCacheFiles();
    DatabaseLogger.info("BACKGROUND SYNC COMPLETE");
  } catch (e) {
-    useUserStore.getState().setSyncing(false);
    DatabaseLogger.error(e as Error);
    console.log("BACKGROUND SYNC ERROR", (e as Error).message);
  }
@@ -137,13 +132,11 @@ const onBoot = async () => {
  try {
    if (!SettingsService.getProperty("backgroundSync")) {
      DatabaseLogger.info("BACKGROUND SYNC ON BOOT DISABLED");
-
      return;
    }

    DatabaseLogger.info("BOOT TASK STARTED");
    if (!db.isInitialized) {
-      await setupDatabase();
      await db.init();
    }

--- a/apps/mobile/app/services/backup.js
+++ b/apps/mobile/app/services/backup.js
@@ -17,8 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-import { sanitizeFilename } from "@notesnook/common";
-import { formatDate } from "@notesnook/core/dist/utils/date";
 import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
 import FileViewer from "react-native-file-viewer";
@@ -27,14 +25,8 @@ import Share from "react-native-share";
 import { zip } from "react-native-zip-archive";
 import { DatabaseLogger, db } from "../common/database";
 import storage from "../common/database/storage";
-import filesystem from "../common/filesystem";
 import { cacheDir, copyFileAsync } from "../common/filesystem/utils";
 import { presentDialog } from "../components/dialog/functions";
-import {
-  endProgress,
-  startProgress,
-  updateProgress
-} from "../components/dialogs/progress";
 import { eCloseSheet } from "../utils/events";
 import { sleep } from "../utils/time";
 import { ToastManager, eSendEvent, presentSheet } from "./event-manager";
@@ -45,14 +37,14 @@ const MS_WEEK = MS_DAY * 7;
 const MONTH = MS_DAY * 30;

 async function getDirectoryAndroid() {
-  const folder = await ScopedStorage.openDocumentTree(true);
+  let folder = await ScopedStorage.openDocumentTree(true);
  if (!folder) return null;
  let subfolder;
  if (!folder.name.includes("Notesnook backups")) {
-    const files = await ScopedStorage.listFiles(folder.uri);
-    for (const file of files) {
-      if (file.type === "directory" && file.name === "Notesnook backups") {
-        subfolder = file;
+    let folderFiles = await ScopedStorage.listFiles(folder.uri);
+    for (let f of folderFiles) {
+      if (f.type === "directory" && f.name === "Notesnook backups") {
+        subfolder = f;
      }
    }
    if (!subfolder) {
@@ -75,10 +67,10 @@ async function checkBackupDirExists(reset = false, context = "global") {
  let dir = SettingsService.get().backupDirectoryAndroid;
  if (reset) dir = null;
  if (dir) {
-    const allDirs = await ScopedStorage.getPersistedUriPermissions();
+    let allDirs = await ScopedStorage.getPersistedUriPermissions();
    let exists = allDirs.findIndex((d) => {
-      return d === dir?.uri || dir?.uri.includes(d);
-    }) as number | boolean;
+      return d === dir.uri || dir.uri.includes(d);
+    });
    exists = exists !== -1;
    dir = exists ? dir : null;
  }
@@ -108,7 +100,7 @@ async function checkBackupDirExists(reset = false, context = "global") {
  return dir;
 }

-async function presentBackupCompleteSheet(backupFilePath: string) {
+async function presentBackupCompleteSheet(backupFilePath) {
  presentSheet({
    title: "Backup complete",
    icon: "cloud-upload",
@@ -131,7 +123,7 @@ async function presentBackupCompleteSheet(backupFilePath: string) {
              showOpenWithDialog: true,
              showAppsSuggestions: true,
              shareFile: true
-            } as any).catch(console.log);
+            }).catch(console.log);
          }
        },
        actionText: "Share"
@@ -150,10 +142,10 @@ async function presentBackupCompleteSheet(backupFilePath: string) {
  });
 }

-async function updateNextBackupTime(type: "full" | "partial") {
+async function updateNextBackupTime() {
  SettingsService.set({
    nextBackupRequestTime: Date.now() + 86400000 * 3,
-    [type === "full" ? "lastFullBackupDate" : "lastBackupDate"]: Date.now()
+    lastBackupDate: Date.now()
  });
 }
 /**
@@ -161,124 +153,77 @@ async function updateNextBackupTime(type: "full" | "partial") {
 * @param {string=} context
 * @returns {Promise<{path?: string, error?: Error, report?: boolean}}>
 */
-async function run(
-  progress = false,
-  context?: string,
-  backupType: "full" | "partial" = "partial"
-) {
-  console.log("Creating backup:", backupType, progress, context);
-
-  const androidBackupDirectory = (await checkBackupDirExists(
-    false,
-    context
-  )) as ScopedStorage.FileType;
-
+async function run(progress = false, context) {
+  let androidBackupDirectory = await checkBackupDirExists(false, context);
  if (!androidBackupDirectory)
    return {
      error: new Error("Backup directory not selected"),
      report: false
    };

-  let path;
-
-  if (Platform.OS === "ios") {
-    path = await storage.checkAndCreateDir("/backups");
-  }
-
-  const backupFileName = sanitizeFilename(
-    `${formatDate(Date.now(), {
-      type: "date-time",
-      dateFormat: "YYYY-MM-DD",
-      timeFormat: "24-hour"
-    })}-${new Date().getSeconds()}${backupType === "full" ? "-full" : ""}`,
-    { replacement: "-" }
-  );
-
  if (progress) {
-    startProgress({
-      title: `Creating ${backupType === "full" ? "a full " : ""}backup`,
-      paragraph: `Please wait while we create a backup of your data. This may take a few minutes.`,
-      progress: undefined
+    presentSheet({
+      title: "Backing up your data",
+      paragraph:
+        "All your backups are stored in 'Phone Storage/Notesnook/backups/' folder",
+      progress: true
    });
  }

-  const zipSourceFolder = `${cacheDir}/backup_temp`;
+  let path;
+  let backupFileName = "notesnook_backup_" + Date.now();
+
+  if (Platform.OS === "ios") {
+    path = await storage.checkAndCreateDir("/backups/");
+  }
+
+  const zipSourceFolder = `${cacheDir}/${backupFileName}`;
  const zipOutputFile =
    Platform.OS === "ios"
      ? `${path}/${backupFileName}.nnbackupz`
      : `${cacheDir}/${backupFileName}.nnbackupz`;

-  await RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
-  await RNFetchBlob.fs.mkdir(zipSourceFolder);
+  try {
+    if (await RNFetchBlob.fs.exists(zipSourceFolder))
+      await RNFetchBlob.fs.unlink(zipSourceFolder);
+  } catch (e) {}

-  const attachmentsDir = zipSourceFolder + "/attachments";
-  if (backupType === "full") {
-    await RNFetchBlob.fs.mkdir(attachmentsDir);
-  }
+  await RNFetchBlob.fs.mkdir(zipSourceFolder);

  try {
    const user = await db.user.getUser();
-    for await (const file of db.backup.export({
-      type: "mobile",
-      encrypt: SettingsService.get().encryptedBackup && !!user,
-      mode: backupType
-    })) {
-      if (file.type === "file") {
-        updateProgress({
-          progress: `Writing backup chunk of size... ${file?.data?.length}`
-        });
-        await RNFetchBlob.fs.writeFile(
-          `${zipSourceFolder}/${file.path}`,
-          file.data,
-          "utf8"
-        );
-      } else if (file.type === "attachment") {
-        updateProgress({
-          progress: `Saving attachments in backup... ${file.hash}`
-        });
-        if (await filesystem.exists(file.hash)) {
-          await RNFetchBlob.fs.cp(
-            `${cacheDir}/${file.hash}`,
-            `${attachmentsDir}/${file.hash}`
-          );
-        }
-      }
+    for await (const file of db.backup.export(
+      "mobile",
+      SettingsService.get().encryptedBackup && user
+    )) {
+      console.log("Writing backup chunk of size...", file?.data?.length);
+      await RNFetchBlob.fs.writeFile(
+        `${zipSourceFolder}/${file.path}`,
+        file.data,
+        "utf8"
+      );
    }

-    updateProgress({
-      progress: "Creating backup zip file..."
-    });
-
    await zip(zipSourceFolder, zipOutputFile);

    if (Platform.OS === "android") {
      // Move the zip to user selected directory.
      const file = await ScopedStorage.createFile(
-        androidBackupDirectory?.uri,
+        androidBackupDirectory.uri,
        `${backupFileName}.nnbackupz`,
        "application/nnbackupz"
      );
      console.log("Copying zip file...");
      await copyFileAsync(`file://${zipOutputFile}`, file.uri);
-
-      console.log("Copied zip file...");
+      console.log("Copyied zip file...");
      path = file.uri;
    } else {
      path = zipOutputFile;
    }
-
    RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
-    if (Platform.OS === "android") {
-      RNFetchBlob.fs.unlink(zipOutputFile).catch(console.log);
-    }
+    updateNextBackupTime();

-    updateNextBackupTime(backupType || "partial");
-
-    if (progress) {
-      endProgress();
-    }
-
-    const canShowCompletionStatus =
+    let showBackupCompleteSheet =
      progress && SettingsService.get().showBackupCompleteSheet;

    if (context) {
@@ -289,12 +234,15 @@ async function run(

    await sleep(300);

-    if (canShowCompletionStatus) {
+    if (showBackupCompleteSheet) {
      presentBackupCompleteSheet(path);
+    } else {
+      progress && eSendEvent(eCloseSheet);
    }

    ToastManager.show({
      heading: "Backup successful",
+      message: "Your backup is stored in Notesnook folder on your phone.",
      type: "success",
      context: "global"
    });
@@ -303,26 +251,16 @@ async function run(
      path: path
    };
  } catch (e) {
-    ToastManager.error(e as Error, "Backup failed", context || "global");
+    ToastManager.error(e, "Backup failed", context || "global");

-    if (
-      (e as Error)?.message?.includes("android.net.Uri") &&
-      androidBackupDirectory
-    ) {
+    if (e?.message?.includes("android.net.Uri") && androidBackupDirectory) {
      SettingsService.setProperty("backupDirectoryAndroid", null);
-      return run(progress, context, backupType);
-    }
-
-    RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
-    if (Platform.OS === "android") {
-      RNFetchBlob.fs.unlink(zipOutputFile).catch(console.log);
+      return run(progress, context);
    }

    DatabaseLogger.error(e);
    await sleep(300);
-    if (progress) {
-      endProgress();
-    }
+    progress && eSendEvent(eCloseSheet);
    return {
      error: e,
      report: true
@@ -330,41 +268,34 @@ async function run(
  }
 }

-async function checkBackupRequired(
-  type: "daily" | "off" | "useroff" | "weekly" | "monthly" | "never",
-  lastBackupDateType: "lastBackupDate" | "lastFullBackupDate" = "lastBackupDate"
-) {
-  console.log(lastBackupDateType, type);
-  if (type === "off" || type === "useroff" || type === "never" || !type) return;
-  const now = Date.now();
-  const lastBackupDate = SettingsService.getProperty(lastBackupDateType) as
-    | number
-    | "never";
+async function getLastBackupDate() {
+  return SettingsService.get().lastBackupDate;
+}

-  if (
-    lastBackupDate === undefined ||
-    lastBackupDate === "never" ||
-    lastBackupDate === 0
-  ) {
+async function checkBackupRequired(type) {
+  if (type === "off" || type === "useroff") return;
+  let now = Date.now();
+  let lastBackupDate = await getLastBackupDate();
+  if (!lastBackupDate || lastBackupDate === "never") {
    return true;
  }
-
+  lastBackupDate = parseInt(lastBackupDate);
  if (type === "daily" && lastBackupDate + MS_DAY < now) {
-    DatabaseLogger.info(`Daily backup started: ${type}`);
+    DatabaseLogger.info("Daily backup started");
    return true;
  } else if (type === "weekly" && lastBackupDate + MS_WEEK < now) {
-    DatabaseLogger.info(`Weekly backup started: ${type}`);
+    DatabaseLogger.info("Weekly backup started");
    return true;
  } else if (type === "monthly" && lastBackupDate + MONTH < now) {
-    DatabaseLogger.info(`Monthly backup started: ${type}`);
+    DatabaseLogger.info("Monthly backup started");
    return true;
  }
  return false;
 }

 const checkAndRun = async () => {
-  const settings = SettingsService.get();
-  if (await checkBackupRequired(settings?.reminder)) {
+  let settings = SettingsService.get();
+  if (await checkBackupRequired(settings.reminder)) {
    try {
      await run();
    } catch (e) {
--- a/apps/mobile/app/services/notifications.ts
+++ b/apps/mobile/app/services/notifications.ts
@@ -35,21 +35,22 @@ import dayjs, { Dayjs } from "dayjs";
 import { encodeNonAsciiHTML } from "entities";
 import { Platform } from "react-native";
 import { db, setupDatabase } from "../common/database";
+import { MMKV } from "../common/database/mmkv";
 import { presentDialog } from "../components/dialog/functions";
-import { useTabStore } from "../screens/editor/tiptap/use-tab-store";
 import { editorState } from "../screens/editor/tiptap/utils";
 import { useRelationStore } from "../stores/use-relation-store";
 import { useReminderStore } from "../stores/use-reminder-store";
 import { useSettingStore } from "../stores/use-setting-store";
-import { useUserStore } from "../stores/use-user-store";
+import { eOnLoadNote } from "../utils/events";
 import { tabBarRef } from "../utils/global-refs";
 import { convertNoteToText } from "../utils/note-to-text";
-import { NotesnookModule } from "../utils/notesnook-module";
 import { sleep } from "../utils/time";
 import { DDS } from "./device-detection";
 import { eSendEvent } from "./event-manager";
 import Navigation from "./navigation";
 import SettingsService from "./settings";
+import { useUserStore } from "../stores/use-user-store";
+import { useTabStore } from "../screens/editor/tiptap/use-tab-store";

 let pinned: DisplayedNotification[] = [];

@@ -125,7 +126,7 @@ const onEvent = async ({ type, detail }: Event) => {
  if (type === EventType.PRESS) {
    notifee.decrementBadgeCount();
    if (notification?.data?.type === "quickNote") return;
-    NotesnookModule.setAppState("");
+    MMKV.removeItem("appState");
    if (notification?.data?.type === "reminder" && notification?.id) {
      const reminder = await db.reminders?.reminder(
        notification.id?.split("_")[0]
@@ -409,7 +410,9 @@ async function loadNote(id: string, jump: boolean) {
  if (!DDS.isTab && jump) {
    tabBarRef.current?.goToPage(1);
  }
-  NotesnookModule.setAppState(
+
+  MMKV.setString(
+    "appState",
    JSON.stringify({
      editing: true,
      movedAway: false,
--- a/apps/mobile/app/services/settings.ts
+++ b/apps/mobile/app/services/settings.ts
@@ -30,7 +30,6 @@ import { scale, updateSize } from "../utils/size";
 import { DatabaseLogger } from "../common/database";
 import { useUserStore } from "../stores/use-user-store";
 import ScreenGuardModule from "react-native-screenguard";
-
 function reset() {
  const settings = get();
  if (settings.reminder !== "off" && settings.reminder !== "useroff") {
@@ -41,15 +40,10 @@ function reset() {
 }

 function resetSettings() {
-  const settings: SettingStore["settings"] = {
-    ...defaultSettings,
-    introCompleted: true,
-    serverUrls: get().serverUrls,
-    backupDirectoryAndroid: undefined
-  };
-
-  MMKV.setString("appSettings", JSON.stringify(settings));
-  set(settings);
+  MMKV.setString(
+    "appSettings",
+    JSON.stringify({ ...defaultSettings, introCompleted: true })
+  );
  init();
 }

--- a/apps/mobile/app/services/sync.ts
+++ b/apps/mobile/app/services/sync.ts
@@ -30,9 +30,7 @@ export const ignoredMessages = [
  "Sync already running",
  "Not allowed to start service intent",
  "WebSocket failed to connect",
-  "Failed to start the HttpConnection before",
-  "Could not connect to the Sync server",
-  "Network request failed"
+  "Failed to start the HttpConnection before"
 ];
 let pendingSync: any = undefined;
 let syncTimer: NodeJS.Timeout;
@@ -63,45 +61,58 @@ const run = async (

  clearTimeout(syncTimer);
  syncTimer = setTimeout(async () => {
+    const status = await NetInfo.fetch();
    const userstore = useUserStore.getState();
-    userstore.setSyncing(true);
    const user = await db.user.getUser();
+    if (!status.isInternetReachable) {
+      DatabaseLogger.warn("Internet not reachable");
+    }

-    if (!user || SettingsService.get().disableSync) {
-      userstore.setSyncing(false);
+    if (
+      !user ||
+      !status.isInternetReachable ||
+      SettingsService.get().disableSync
+    ) {
      initAfterSync();
      pendingSync = undefined;
      return onCompleted?.(SyncStatus.Failed);
    }
+    userstore.setSyncing(true);

-    let error: Error | undefined = undefined;
+    let error = null;

    try {
      await BackgroundSync.doInBackground(async () => {
        try {
          await db.sync({
            type: type,
-            force: forced,
-            offlineMode: SettingsService.get().offlineMode
+            force: forced
          });
        } catch (e) {
-          error = e as Error;
+          error = e;
        }
      });

-      if (error) throw error;
+      if (error) {
+        throw error;
+      }
    } catch (e) {
-      error = e as Error;
-      DatabaseLogger.error(error, "[Client] Failed to sync");
+      error = e;
      if (
-        !ignoredMessages.find((message) => error?.message?.includes(message)) &&
-        userstore.user
+        !ignoredMessages.find((message) =>
+          (e as Error).message?.includes(message)
+        ) &&
+        userstore.user &&
+        status.isConnected &&
+        status.isInternetReachable
      ) {
-        const status = await NetInfo.fetch();
+        userstore.setSyncing(false, SyncStatus.Failed);
        if (status.isConnected && status.isInternetReachable) {
          ToastManager.error(e as Error, "Sync failed", context);
        }
      }
+
+      DatabaseLogger.error(e, "[Client] Failed to sync");
    } finally {
      initAfterSync();
      userstore.setSyncing(
@@ -109,14 +120,16 @@ const run = async (
        error ? SyncStatus.Failed : SyncStatus.Passed
      );
      onCompleted?.(error ? SyncStatus.Failed : SyncStatus.Passed);
-      if (pendingSync)
-        Sync.run(
-          pendingSync.context,
-          pendingSync.forced,
-          pendingSync.type,
-          pendingSync.onCompleted,
-          pendingSync.lastSyncTime
-        );
+      setImmediate(() => {
+        if (pendingSync)
+          Sync.run(
+            pendingSync.context,
+            pendingSync.forced,
+            pendingSync.type,
+            pendingSync.onCompleted,
+            pendingSync.lastSyncTime
+          );
+      });
    }
  }, 300);
 };
--- a/apps/mobile/app/stores/use-setting-store.ts
+++ b/apps/mobile/app/stores/use-setting-store.ts
@@ -25,8 +25,6 @@ import { FileType } from "react-native-scoped-storage";
 import create, { State } from "zustand";
 import { ThemeDark, ThemeLight, ThemeDefinition } from "@notesnook/theme";
 import { Reminder } from "@notesnook/core/dist/types";
-export const HostIds = ["API_HOST", "AUTH_HOST", "SSE_HOST"] as const;
-export type HostId = (typeof HostIds)[number];

 export type Settings = {
  showToolbarOnTop?: boolean;
@@ -34,8 +32,7 @@ export type Settings = {
  fontScale?: number;
  forcePortraitOnTablet?: boolean;
  useSystemTheme?: boolean;
-  reminder: "daily" | "off" | "useroff" | "weekly" | "monthly";
-  fullBackupReminder: "never" | "weekly" | "monthly";
+  reminder?: string;
  encryptedBackup?: boolean;
  homepage?: string;
  sort?: string;
@@ -45,6 +42,7 @@ export type Settings = {
  appLockTimer: number;
  appLockEnabled?: boolean;
  appLockMode?: "none" | "background" | "launch";
+  telemetry?: boolean;
  notebooksListMode?: "normal" | "compact";
  notesListMode?: "normal" | "compact";
  devMode?: boolean;
@@ -54,8 +52,8 @@ export type Settings = {
  rateApp?: boolean | number;
  migrated?: boolean;
  introCompleted?: boolean;
-  nextBackupRequestTime?: number;
-  lastBackupDate?: number;
+  nextBackupRequestTime?: number | undefined;
+  lastBackupDate?: number | undefined;
  userEmailConfirmed?: boolean;
  recoveryKeySaved?: boolean;
  backupDirectoryAndroid?: FileType | null;
@@ -84,10 +82,6 @@ export type Settings = {
  backgroundSync?: boolean;
  applockKeyboardType: "numeric" | "default";
  settingsVersion?: number;
-  backupType: "full" | "partial";
-  offlineMode?: boolean;
-  lastFullBackupDate?: number;
-  serverUrls?: Record<HostId, string>;
 };

 type DimensionsType = {
@@ -133,12 +127,6 @@ export const defaultSettings: SettingStore["settings"] = {
  applockKeyboardType: "numeric",
  appLockTimer: 0,
  showToolbarOnTop: false,
-  disableAutoSync: false,
-  disableRealtimeSync: false,
-  disableSync: false,
-  appLockEnabled: false,
-  backupDirectoryAndroid: null,
-  offlineMode: false,
  showKeyboardOnOpen: false,
  fontScale: 1,
  forcePortraitOnTablet: false,
@@ -151,6 +139,7 @@ export const defaultSettings: SettingStore["settings"] = {
  screenshotMode: true,
  privacyScreen: false,
  appLockMode: "none",
+  telemetry: false,
  notebooksListMode: "normal",
  notesListMode: "normal",
  devMode: false,
@@ -161,7 +150,7 @@ export const defaultSettings: SettingStore["settings"] = {
  migrated: false,
  introCompleted: Config.isTesting ? true : false,
  nextBackupRequestTime: undefined,
-  lastBackupDate: 0,
+  lastBackupDate: undefined,
  userEmailConfirmed: false,
  recoveryKeySaved: false,
  showBackupCompleteSheet: true,
@@ -182,10 +171,7 @@ export const defaultSettings: SettingStore["settings"] = {
  biometricsAuthEnabled: false,
  appLockHasPasswordSecurity: false,
  backgroundSync: true,
-  settingsVersion: 0,
-  backupType: "partial",
-  fullBackupReminder: "never",
-  lastFullBackupDate: 0
+  settingsVersion: 0
 };

 export const useSettingStore = create<SettingStore>((set, get) => ({
--- a/apps/mobile/app/utils/notesnook-module.ts
+++ b/apps/mobile/app/utils/notesnook-module.ts
@@ -23,17 +23,13 @@ interface NotesnookModuleInterface {
  getActivityName: () => Promise<string>;
  setBackgroundColor: (color: string) => void;
  setSecureMode: (enabled: boolean) => void;
-  setAppState: (appState: string) => void;
-  getAppState: () => string;
 }

 export const NotesnookModule: NotesnookModuleInterface = Platform.select({
  ios: {
    getActivityName: () => {},
    setBackgroundColor: () => {},
-    setSecureMode: () => {},
-    setAppState: () => {},
-    getAppState: () => {}
+    setSecureMode: () => {}
  },
  android: NativeModules.NNativeModule
 });
--- a/apps/mobile/native/android/app/build.gradle
+++ b/apps/mobile/native/android/app/build.gradle
@@ -49,6 +49,7 @@ react {
    //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
    hermesFlags = ["-O", "-output-source-map"]
 }
+println(projectDir);

 /**
 * Set this to true to create two separate APKs instead of one:
@@ -116,7 +117,7 @@ android {
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
        multiDexEnabled true
-        versionCode 3027
+        versionCode 3024
        versionName getNpmVersion()
        testBuildType System.getProperty('testBuildType', 'debug')
        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -168,12 +169,8 @@ android {
      pickFirst 'lib/x86_64/libc++_shared.so'
      pickFirst 'lib/armeabi-v7a/libc++_shared.so'
      pickFirst 'lib/arm64-v8a/libc++_shared.so'
-      jniLibs {
-            useLegacyPackaging isBuildingAAB == false
-    }
  }

-    
    // applicationVariants are e.g. debug, release
    applicationVariants.all { variant ->
        variant.outputs.each { output ->
--- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/BootRecieverService.java
+++ b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/BootRecieverService.java
@@ -3,7 +3,6 @@ package com.streetwriters.notesnook;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.util.Log;
 import android.app.ActivityManager;
 import com.facebook.react.HeadlessJsTaskService;
@@ -20,12 +19,8 @@ public class BootRecieverService extends BroadcastReceiver {
             network connections
             **/
            Intent serviceIntent = new Intent(context, BootTaskService.class);
-              if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                  context.startForegroundService(serviceIntent);
-              } else {
-                  context.startService(serviceIntent);
-              }
-              HeadlessJsTaskService.acquireWakeLockNow(context);
+            context.startService(serviceIntent);
+            HeadlessJsTaskService.acquireWakeLockNow(context);
        }
    }

--- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/BootTaskService.java
+++ b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/BootTaskService.java
@@ -1,24 +1,15 @@
 package com.streetwriters.notesnook;

-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.content.Context;
 import android.content.Intent;
-import android.util.Log;
-
-import androidx.core.app.NotificationCompat;
-
 import com.facebook.react.HeadlessJsTaskService;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.jstasks.HeadlessJsTaskConfig;
 import javax.annotation.Nullable;

 public class BootTaskService extends HeadlessJsTaskService {
-    Notification notification;
+
    @Override
  protected @Nullable HeadlessJsTaskConfig getTaskConfig(Intent intent) {
-      Log.d("BootTask", "Task Started");
      return new HeadlessJsTaskConfig(
              "com.streetwriters.notesnook.BOOT_TASK",
              Arguments.createMap(),
@@ -26,31 +17,4 @@ public class BootTaskService extends HeadlessJsTaskService {
              false // optional: defines whether or not the task is allowed in foreground. Default is false
      );
  }
-
-    @Override
-    public void onHeadlessJsTaskFinish(int taskId) {
-        super.onHeadlessJsTaskFinish(taskId);
-        Log.d("BootTask", "Task completed");
-        stopSelf();
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-            NotificationChannel channel = new NotificationChannel("com.streetwriters.notesnook",
-                    "Default",
-                    NotificationManager.IMPORTANCE_DEFAULT);
-
-            ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).createNotificationChannel(channel);
-            notification = new NotificationCompat.Builder(this, channel.getId())
-                    .setContentTitle("Sync on boot")
-                    .setContentText("")
-                    .setSmallIcon(R.drawable.ic_stat_name)
-                    .build();
-            startForeground(1, notification);
-        }
-
-        return super.onStartCommand(intent, flags, startId);
-    }
 }
--- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotesnookTileService.java
+++ b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotesnookTileService.java
@@ -1,7 +1,5 @@
 package com.streetwriters.notesnook;

-import android.annotation.SuppressLint;
-import android.app.PendingIntent;
 import android.content.Intent;
 import android.os.Build;
 import android.service.quicksettings.Tile;
@@ -11,24 +9,11 @@ import androidx.annotation.RequiresApi;

@RequiresApi(api = Build.VERSION_CODES.N)
 public class NotesnookTileService extends TileService {
-    @SuppressLint("StartActivityAndCollapseDeprecated")
    @Override
    public void onClick() {
        super.onClick();
        Intent intent = new Intent(this.getApplicationContext(), ShareActivity.class);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            startActivityAndCollapse(
-                    PendingIntent.getActivity(
-                            this.getApplicationContext(),
-                            0,
-                            intent,
-                            PendingIntent.FLAG_IMMUTABLE
-                    )
-            );
-        } else {
-            startActivityAndCollapse(intent);
-        }
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivityAndCollapse(intent);
    }
 }
--- 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
@@ -1,12 +1,17 @@
 package com.streetwriters.notesnook;
 import android.app.Service;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.IBinder;
 import android.util.Log;

+import com.ammarahmed.mmkv.MMKV;
+
 public class OnClearFromRecentService extends Service {

+    static {
+        System.loadLibrary("rnmmkv");
+    }
+
    @Override
    public IBinder onBind(Intent intent) {
        return null;
@@ -25,12 +30,15 @@ public class OnClearFromRecentService extends Service {
    @Override
    public void onTaskRemoved(Intent rootIntent) {
        try {
-            SharedPreferences appStateDetails = getApplicationContext().getSharedPreferences("appStateDetails", MODE_PRIVATE);
-            SharedPreferences.Editor edit = appStateDetails.edit();
-            edit.remove("appState");
-            edit.apply();
+            MMKV.initialize(getApplicationContext());
+            MMKV mmkv = MMKV.mmkvWithID("default",MMKV.SINGLE_PROCESS_MODE);
+            mmkv.removeValueForKey("appState");
            stopSelf();
-        } catch (UnsatisfiedLinkError | Exception e) {
+        } catch (UnsatisfiedLinkError e) {
+
+        } catch (Exception e) {
+            
        }
+        //System.exit(0);
    }
 }
--- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/RCTNNativeModule.java
+++ b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/RCTNNativeModule.java
@@ -1,10 +1,7 @@
 package com.streetwriters.notesnook;


-import android.content.Context;
-import android.content.SharedPreferences;
 import android.graphics.Color;
-import android.util.Log;
 import android.view.WindowManager;

 import com.facebook.react.bridge.Promise;
@@ -70,21 +67,6 @@ public class RCTNNativeModule extends ReactContextBaseJavaModule {
        }
    }

-    @ReactMethod
-    public void setAppState(final String appState) {
-        SharedPreferences appStateDetails = getReactApplicationContext().getSharedPreferences("appStateDetails", Context.MODE_PRIVATE);
-        SharedPreferences.Editor edit = appStateDetails.edit();
-        edit.putString("appState", appState);
-        edit.apply();
-    }
-
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    public String getAppState() {
-        SharedPreferences appStateDetails = getReactApplicationContext().getSharedPreferences("appStateDetails", Context.MODE_PRIVATE);
-        String appStateValue = appStateDetails.getString("appState", "");
-        return appStateValue.isEmpty() ? null : appStateValue;
-    }
-


 }
--- a/apps/mobile/native/android/releasenotes/whatsnew-en-US
+++ b/apps/mobile/native/android/releasenotes/whatsnew-en-US
@@ -1,6 +1,3 @@
- Fix crash when launching Notesnook from Notification tiles
- Fix app crashing on background on boot
- Fix self-hosted server urls not working
- Bug fixes and small improvements
+- Bug fixes and performance improvements

 Thank you for using Notesnook!
--- a/apps/mobile/native/fonts/MaterialCommunityIcons.ttf
+++ b/apps/mobile/native/fonts/MaterialCommunityIcons.ttf
--- a/apps/mobile/native/index.js
+++ b/apps/mobile/native/index.js
@@ -11,10 +11,6 @@ import NetInfo from "@react-native-community/netinfo";
 import { enableFreeze } from "react-native-screens";
 import {BackgroundSync} from '../app/services/background-sync';

-BackgroundSync.registerHeadlessTask();
-BackgroundSync.start();
-Notifications.init();
-
 enableFreeze(true);
 NetInfo.configure({
  reachabilityUrl: "https://notesnook.com",
@@ -23,7 +19,8 @@ NetInfo.configure({
    return response?.status >= 200 && response?.status < 300;
  }
 });
-
+BackgroundSync.start();
+Notifications.init();

 const appName = appJson.name;
 if (Config.isTesting) {
--- a/apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj
+++ b/apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj
@@ -1061,7 +1061,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2114;
+				CURRENT_PROJECT_VERSION = 2111;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1135,7 +1135,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.17;
+				MARKETING_VERSION = 3.0.14;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1166,7 +1166,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2114;
+				CURRENT_PROJECT_VERSION = 2111;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1240,7 +1240,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.17;
+				MARKETING_VERSION = 3.0.14;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1399,7 +1399,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2114;
+				CURRENT_PROJECT_VERSION = 2111;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1411,7 +1411,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.0.17;
+				MARKETING_VERSION = 3.0.14;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
@@ -1442,7 +1442,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2114;
+				CURRENT_PROJECT_VERSION = 2111;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1455,7 +1455,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.0.17;
+				MARKETING_VERSION = 3.0.14;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1485,7 +1485,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Make Note/Make Note.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2114;
+				CURRENT_PROJECT_VERSION = 2111;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1559,7 +1559,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.0.17;
+				MARKETING_VERSION = 3.0.14;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
@@ -1590,7 +1590,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2114;
+				CURRENT_PROJECT_VERSION = 2111;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1665,7 +1665,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.0.17;
+				MARKETING_VERSION = 3.0.14;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
 				PRODUCT_NAME = "$(TARGET_NAME)";
--- a/apps/mobile/package-lock.json
+++ b/apps/mobile/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@notesnook/mobile",
-  "version": "3.0.15",
+  "version": "3.0.13",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@notesnook/mobile",
-      "version": "3.0.15",
+      "version": "3.0.13",
      "hasInstallScript": true,
      "license": "GPL-3.0-or-later",
      "workspaces": [
@@ -7166,7 +7166,7 @@
    },
    "../../packages/editor-mobile/node_modules/@types/prop-types": {
      "version": "15.7.11",
-      "dev": true,
+      "devOptional": true,
      "license": "MIT"
    },
    "../../packages/editor-mobile/node_modules/@types/q": {
@@ -7186,7 +7186,7 @@
    },
    "../../packages/editor-mobile/node_modules/@types/react": {
      "version": "18.2.39",
-      "dev": true,
+      "devOptional": true,
      "license": "MIT",
      "dependencies": {
        "@types/prop-types": "*",
@@ -7217,7 +7217,7 @@
    },
    "../../packages/editor-mobile/node_modules/@types/scheduler": {
      "version": "0.16.8",
-      "dev": true,
+      "devOptional": true,
      "license": "MIT"
    },
    "../../packages/editor-mobile/node_modules/@types/semver": {
@@ -12075,7 +12075,7 @@
    },
    "../../packages/editor-mobile/node_modules/immer": {
      "version": "9.0.21",
-      "dev": true,
+      "devOptional": true,
      "license": "MIT",
      "funding": {
        "type": "opencollective",
@@ -22464,7 +22464,6 @@
    },
    "../../packages/editor/node_modules/js-tokens": {
      "version": "4.0.0",
-      "dev": true,
      "license": "MIT"
    },
    "../../packages/editor/node_modules/json-parse-even-better-errors": {
@@ -22520,7 +22519,6 @@
    },
    "../../packages/editor/node_modules/loose-envify": {
      "version": "1.4.0",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "js-tokens": "^3.0.0 || ^4.0.0"
@@ -23042,7 +23040,6 @@
    },
    "../../packages/editor/node_modules/react": {
      "version": "18.2.0",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "loose-envify": "^1.1.0"
@@ -23061,7 +23058,6 @@
    },
    "../../packages/editor/node_modules/react-dom": {
      "version": "18.2.0",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "loose-envify": "^1.1.0",
@@ -23181,7 +23177,6 @@
    },
    "../../packages/editor/node_modules/scheduler": {
      "version": "0.23.0",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "loose-envify": "^1.1.0"
@@ -23811,19 +23806,17 @@
      "name": "@notesnook/sodium",
      "version": "2.0.7",
      "dev": true,
-      "hasInstallScript": true,
      "license": "GPL-3.0-or-later",
-      "dependencies": {
-        "libsodium-wrappers-sumo": "^0.7.15"
-      },
      "devDependencies": {
-        "@types/libsodium-wrappers-sumo": "0.7.8",
+        "@types/libsodium-wrappers-sumo": "0.7.5",
        "benny": "^3.7.1",
+        "libsodium-wrappers-sumo": "^0.7.11",
        "sodium-native": "^4.1.1",
        "ts-node": "^10.9.1",
        "vitest": "^0.32.2"
      },
      "peerDependencies": {
+        "libsodium-wrappers-sumo": ">=0.7",
        "sodium-native": ">=4"
      }
    },
@@ -28720,7 +28713,6 @@
    },
    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/types": "^7.22.5"
@@ -28844,7 +28836,6 @@
    },
    "node_modules/@babel/helper-hoist-variables": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/types": "^7.22.5"
@@ -29115,7 +29106,6 @@
    },
    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -29129,7 +29119,6 @@
    },
    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -29279,7 +29268,6 @@
    },
    "node_modules/@babel/plugin-proposal-private-property-in-object": {
      "version": "7.21.0-placeholder-for-preset-env.2",
-      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=6.9.0"
@@ -29290,7 +29278,6 @@
    },
    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
      "version": "7.18.6",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
@@ -29326,7 +29313,6 @@
    },
    "node_modules/@babel/plugin-syntax-class-properties": {
      "version": "7.12.13",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.12.13"
@@ -29337,7 +29323,6 @@
    },
    "node_modules/@babel/plugin-syntax-class-static-block": {
      "version": "7.14.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.14.5"
@@ -29374,7 +29359,6 @@
    },
    "node_modules/@babel/plugin-syntax-export-namespace-from": {
      "version": "7.8.3",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.8.3"
@@ -29399,7 +29383,6 @@
    },
    "node_modules/@babel/plugin-syntax-import-assertions": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -29413,7 +29396,6 @@
    },
    "node_modules/@babel/plugin-syntax-import-attributes": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -29427,7 +29409,6 @@
    },
    "node_modules/@babel/plugin-syntax-import-meta": {
      "version": "7.10.4",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.10.4"
@@ -29438,7 +29419,6 @@
    },
    "node_modules/@babel/plugin-syntax-json-strings": {
      "version": "7.8.3",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.8.0"
@@ -29535,7 +29515,6 @@
    },
    "node_modules/@babel/plugin-syntax-top-level-await": {
      "version": "7.14.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.14.5"
@@ -29562,7 +29541,6 @@
    },
    "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
      "version": "7.18.6",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
@@ -29590,7 +29568,6 @@
    },
    "node_modules/@babel/plugin-transform-async-generator-functions": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-environment-visitor": "^7.22.5",
@@ -29622,7 +29599,6 @@
    },
    "node_modules/@babel/plugin-transform-block-scoped-functions": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -29649,7 +29625,6 @@
    },
    "node_modules/@babel/plugin-transform-class-properties": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-class-features-plugin": "^7.22.5",
@@ -29664,7 +29639,6 @@
    },
    "node_modules/@babel/plugin-transform-class-static-block": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-class-features-plugin": "^7.22.5",
@@ -29728,7 +29702,6 @@
    },
    "node_modules/@babel/plugin-transform-dotall-regex": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
@@ -29743,7 +29716,6 @@
    },
    "node_modules/@babel/plugin-transform-duplicate-keys": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -29757,7 +29729,6 @@
    },
    "node_modules/@babel/plugin-transform-dynamic-import": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -29772,7 +29743,6 @@
    },
    "node_modules/@babel/plugin-transform-exponentiation-operator": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
@@ -29787,7 +29757,6 @@
    },
    "node_modules/@babel/plugin-transform-export-namespace-from": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -29817,7 +29786,6 @@
    },
    "node_modules/@babel/plugin-transform-for-of": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -29846,7 +29814,6 @@
    },
    "node_modules/@babel/plugin-transform-json-strings": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -29874,7 +29841,6 @@
    },
    "node_modules/@babel/plugin-transform-logical-assignment-operators": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -29889,7 +29855,6 @@
    },
    "node_modules/@babel/plugin-transform-member-expression-literals": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -29903,7 +29868,6 @@
    },
    "node_modules/@babel/plugin-transform-modules-amd": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-module-transforms": "^7.22.5",
@@ -29933,7 +29897,6 @@
    },
    "node_modules/@babel/plugin-transform-modules-systemjs": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-hoist-variables": "^7.22.5",
@@ -29950,7 +29913,6 @@
    },
    "node_modules/@babel/plugin-transform-modules-umd": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-module-transforms": "^7.22.5",
@@ -29979,7 +29941,6 @@
    },
    "node_modules/@babel/plugin-transform-new-target": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -30007,7 +29968,6 @@
    },
    "node_modules/@babel/plugin-transform-numeric-separator": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -30022,7 +29982,6 @@
    },
    "node_modules/@babel/plugin-transform-object-rest-spread": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/compat-data": "^7.22.5",
@@ -30040,7 +29999,6 @@
    },
    "node_modules/@babel/plugin-transform-object-super": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -30055,7 +30013,6 @@
    },
    "node_modules/@babel/plugin-transform-optional-catch-binding": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -30114,7 +30071,6 @@
      "version": "7.24.7",
      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz",
      "integrity": "sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==",
-      "license": "MIT",
      "dependencies": {
        "@babel/helper-annotate-as-pure": "^7.24.7",
        "@babel/helper-create-class-features-plugin": "^7.24.7",
@@ -30130,7 +30086,6 @@
    },
    "node_modules/@babel/plugin-transform-property-literals": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -30200,7 +30155,6 @@
    },
    "node_modules/@babel/plugin-transform-regenerator": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -30215,7 +30169,6 @@
    },
    "node_modules/@babel/plugin-transform-reserved-words": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -30307,7 +30260,6 @@
    },
    "node_modules/@babel/plugin-transform-typeof-symbol": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -30337,7 +30289,6 @@
    },
    "node_modules/@babel/plugin-transform-unicode-escapes": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -30351,7 +30302,6 @@
    },
    "node_modules/@babel/plugin-transform-unicode-property-regex": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
@@ -30380,7 +30330,6 @@
    },
    "node_modules/@babel/plugin-transform-unicode-sets-regex": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
@@ -30395,7 +30344,6 @@
    },
    "node_modules/@babel/preset-env": {
      "version": "7.22.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/compat-data": "^7.22.5",
@@ -30488,7 +30436,6 @@
    },
    "node_modules/@babel/preset-env/node_modules/semver": {
      "version": "6.3.0",
-      "dev": true,
      "license": "ISC",
      "bin": {
        "semver": "bin/semver.js"
@@ -30512,7 +30459,6 @@
    },
    "node_modules/@babel/preset-modules": {
      "version": "0.1.5",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.0.0",
@@ -33820,7 +33766,6 @@
    },
    "node_modules/@types/eslint": {
      "version": "8.40.2",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@types/estree": "*",
@@ -33829,7 +33774,6 @@
    },
    "node_modules/@types/eslint-scope": {
      "version": "3.7.4",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@types/eslint": "*",
@@ -33838,7 +33782,6 @@
    },
    "node_modules/@types/estree": {
      "version": "1.0.1",
-      "dev": true,
      "license": "MIT"
    },
    "node_modules/@types/graceful-fs": {
@@ -33941,12 +33884,12 @@
    },
    "node_modules/@types/prop-types": {
      "version": "15.7.5",
-      "dev": true,
+      "devOptional": true,
      "license": "MIT"
    },
    "node_modules/@types/react": {
      "version": "18.2.13",
-      "dev": true,
+      "devOptional": true,
      "license": "MIT",
      "dependencies": {
        "@types/prop-types": "*",
@@ -33989,7 +33932,7 @@
    },
    "node_modules/@types/scheduler": {
      "version": "0.16.3",
-      "dev": true,
+      "devOptional": true,
      "license": "MIT"
    },
    "node_modules/@types/semver": {
@@ -34301,7 +34244,6 @@
    },
    "node_modules/@webassemblyjs/ast": {
      "version": "1.11.6",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/helper-numbers": "1.11.6",
@@ -34310,22 +34252,18 @@
    },
    "node_modules/@webassemblyjs/floating-point-hex-parser": {
      "version": "1.11.6",
-      "dev": true,
      "license": "MIT"
    },
    "node_modules/@webassemblyjs/helper-api-error": {
      "version": "1.11.6",
-      "dev": true,
      "license": "MIT"
    },
    "node_modules/@webassemblyjs/helper-buffer": {
      "version": "1.11.6",
-      "dev": true,
      "license": "MIT"
    },
    "node_modules/@webassemblyjs/helper-numbers": {
      "version": "1.11.6",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
@@ -34335,12 +34273,10 @@
    },
    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
      "version": "1.11.6",
-      "dev": true,
      "license": "MIT"
    },
    "node_modules/@webassemblyjs/helper-wasm-section": {
      "version": "1.11.6",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/ast": "1.11.6",
@@ -34351,7 +34287,6 @@
    },
    "node_modules/@webassemblyjs/ieee754": {
      "version": "1.11.6",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@xtuc/ieee754": "^1.2.0"
@@ -34359,7 +34294,6 @@
    },
    "node_modules/@webassemblyjs/leb128": {
      "version": "1.11.6",
-      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
        "@xtuc/long": "4.2.2"
@@ -34367,12 +34301,10 @@
    },
    "node_modules/@webassemblyjs/utf8": {
      "version": "1.11.6",
-      "dev": true,
      "license": "MIT"
    },
    "node_modules/@webassemblyjs/wasm-edit": {
      "version": "1.11.6",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/ast": "1.11.6",
@@ -34387,7 +34319,6 @@
    },
    "node_modules/@webassemblyjs/wasm-gen": {
      "version": "1.11.6",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/ast": "1.11.6",
@@ -34399,7 +34330,6 @@
    },
    "node_modules/@webassemblyjs/wasm-opt": {
      "version": "1.11.6",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/ast": "1.11.6",
@@ -34410,7 +34340,6 @@
    },
    "node_modules/@webassemblyjs/wasm-parser": {
      "version": "1.11.6",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/ast": "1.11.6",
@@ -34423,7 +34352,6 @@
    },
    "node_modules/@webassemblyjs/wast-printer": {
      "version": "1.11.6",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/ast": "1.11.6",
@@ -34481,12 +34409,10 @@
    },
    "node_modules/@xtuc/ieee754": {
      "version": "1.2.0",
-      "dev": true,
      "license": "BSD-3-Clause"
    },
    "node_modules/@xtuc/long": {
      "version": "4.2.2",
-      "dev": true,
      "license": "Apache-2.0"
    },
    "node_modules/@yarnpkg/lockfile": {
@@ -34539,7 +34465,6 @@
    },
    "node_modules/acorn-import-assertions": {
      "version": "1.9.0",
-      "dev": true,
      "license": "MIT",
      "peerDependencies": {
        "acorn": "^8"
@@ -35453,7 +35378,6 @@
    },
    "node_modules/chrome-trace-event": {
      "version": "1.0.3",
-      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=6.0"
@@ -35900,7 +35824,7 @@
    },
    "node_modules/csstype": {
      "version": "3.1.2",
-      "dev": true,
+      "devOptional": true,
      "license": "MIT"
    },
    "node_modules/date-fns": {
@@ -36477,9 +36401,29 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/encoding": {
+      "version": "0.1.13",
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "iconv-lite": "^0.6.2"
+      }
+    },
+    "node_modules/encoding/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
    "node_modules/enhanced-resolve": {
      "version": "5.15.0",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "graceful-fs": "^4.2.4",
@@ -36584,7 +36528,6 @@
    },
    "node_modules/es-module-lexer": {
      "version": "1.3.0",
-      "dev": true,
      "license": "MIT"
    },
    "node_modules/es-set-tostringtag": {
@@ -36920,7 +36863,6 @@
    },
    "node_modules/eslint-scope": {
      "version": "5.1.1",
-      "dev": true,
      "license": "BSD-2-Clause",
      "dependencies": {
        "esrecurse": "^4.3.0",
@@ -36932,7 +36874,6 @@
    },
    "node_modules/eslint-scope/node_modules/estraverse": {
      "version": "4.3.0",
-      "dev": true,
      "license": "BSD-2-Clause",
      "engines": {
        "node": ">=4.0"
@@ -37099,7 +37040,6 @@
    },
    "node_modules/esrecurse": {
      "version": "4.3.0",
-      "dev": true,
      "license": "BSD-2-Clause",
      "dependencies": {
        "estraverse": "^5.2.0"
@@ -37110,7 +37050,6 @@
    },
    "node_modules/estraverse": {
      "version": "5.3.0",
-      "dev": true,
      "license": "BSD-2-Clause",
      "engines": {
        "node": ">=4.0"
@@ -37118,7 +37057,6 @@
    },
    "node_modules/esutils": {
      "version": "2.0.3",
-      "dev": true,
      "license": "BSD-2-Clause",
      "engines": {
        "node": ">=0.10.0"
@@ -37882,7 +37820,6 @@
    },
    "node_modules/glob-to-regexp": {
      "version": "0.4.1",
-      "dev": true,
      "license": "BSD-2-Clause"
    },
    "node_modules/global": {
@@ -39929,7 +39866,6 @@
    },
    "node_modules/json-parse-even-better-errors": {
      "version": "2.3.1",
-      "dev": true,
      "license": "MIT"
    },
    "node_modules/json-schema-ref-resolver": {
@@ -40463,7 +40399,6 @@
    },
    "node_modules/loader-runner": {
      "version": "4.3.0",
-      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=6.11.5"
@@ -42694,7 +42629,6 @@
    },
    "node_modules/randombytes": {
      "version": "2.1.0",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "safe-buffer": "^5.1.0"
@@ -43664,7 +43598,6 @@
    },
    "node_modules/regenerator-transform": {
      "version": "0.15.1",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/runtime": "^7.8.4"
@@ -43912,6 +43845,12 @@
        "node": ">=10"
      }
    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "license": "MIT",
+      "optional": true,
+      "peer": true
+    },
    "node_modules/sanitize-filename": {
      "version": "1.6.3",
      "dev": true,
@@ -44026,7 +43965,6 @@
    },
    "node_modules/serialize-javascript": {
      "version": "6.0.1",
-      "dev": true,
      "license": "BSD-3-Clause",
      "dependencies": {
        "randombytes": "^2.1.0"
@@ -44679,7 +44617,6 @@
    },
    "node_modules/tapable": {
      "version": "2.2.1",
-      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=6"
@@ -44758,7 +44695,6 @@
    },
    "node_modules/terser-webpack-plugin": {
      "version": "5.3.9",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@jridgewell/trace-mapping": "^0.3.17",
@@ -44791,7 +44727,6 @@
    },
    "node_modules/terser-webpack-plugin/node_modules/jest-worker": {
      "version": "27.5.1",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@types/node": "*",
@@ -44804,7 +44739,6 @@
    },
    "node_modules/terser-webpack-plugin/node_modules/supports-color": {
      "version": "8.1.1",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "has-flag": "^4.0.0"
@@ -45398,7 +45332,6 @@
    },
    "node_modules/watchpack": {
      "version": "2.4.0",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "glob-to-regexp": "^0.4.1",
@@ -45421,7 +45354,6 @@
    },
    "node_modules/webpack": {
      "version": "5.88.2",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@types/eslint-scope": "^3.7.3",
@@ -45536,7 +45468,6 @@
    },
    "node_modules/webpack-sources": {
      "version": "3.2.3",
-      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=10.13.0"
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@notesnook/mobile",
-  "version": "3.0.17",
+  "version": "3.0.14",
  "private": true,
  "license": "GPL-3.0-or-later",
  "workspaces": [
--- a/apps/mobile/patches/@react-native+community-cli-plugin+0.74.86.patch
+++ b/apps/mobile/patches/@react-native+community-cli-plugin+0.74.86.patch
--- a/apps/mobile/patches/jetifier+1.6.8.patch
+++ b/apps/mobile/patches/jetifier+1.6.8.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/jetifier/index.js b/node_modules/jetifier/index.js
+index ae3979c..ed609e9 100644
+--- a/node_modules/jetifier/index.js
+++ b/node_modules/jetifier/index.js
+@@ -6,7 +6,7 @@ const cpus = require('os').cpus().length;
+ 
+ const arg = process.argv.slice(2)[0];
+ const mode = arg && ((arg === 'reverse') || (arg === '-r')) ? 'reverse' : 'forward';
+-const SEARCH_DIR = 'node_modules';
+const SEARCH_DIR = '../node_modules';
+ 
+ const classesMapping = getClassesMapping();
+ const files = readDir(SEARCH_DIR);
--- a/apps/mobile/scripts/optimize-fonts.mjs
+++ b/apps/mobile/scripts/optimize-fonts.mjs
@@ -45,7 +45,6 @@ const EXTRA_ICON_NAMES = [
  "view-list-outline",
  "view-list",
  "tab-plus",
-  "server",
  "play",
  "pause",
  "notebook-outline",
--- a/apps/theme-builder/package-lock.json
+++ b/apps/theme-builder/package-lock.json
@@ -990,7 +990,6 @@
        "@dnd-kit/sortable": "^8.0.0",
        "@emotion/react": "11.11.1",
        "@hazae41/foras": "^2.1.4",
-        "@henrygd/queue": "^1.0.6",
        "@mdi/js": "^7.2.96",
        "@mdi/react": "^1.6.1",
        "@notesnook-importer/core": "^2.0.0",
--- a/apps/web/e2e/models/note-properties.model.ts
+++ b/apps/web/e2e/models/note-properties.model.ts
@@ -258,7 +258,7 @@ export class NoteContextMenuModel extends BaseProperties {

    const zip = await downloadAndReadFile(
      this.noteLocator.page(),
-      () => this.menu.getItem(format).click(),
+      this.menu.getItem(format),
      null
    );

--- a/apps/web/e2e/models/settings-view.model.ts
+++ b/apps/web/e2e/models/settings-view.model.ts
@@ -113,17 +113,16 @@ export class SettingsViewModel {
    const item = await this.navigation.findItem("Backup & export");
    await item?.click();

-    return await downloadAndReadFile(
-      this.page,
-      async () => {
-        const backupData = this.page
-          .locator(getTestId("setting-create-backup"))
-          .locator("select");
-        await backupData.selectOption({ value: "partial", label: "Backup" });
-        if (password) await fillPasswordDialog(this.page, password);
-      },
-      "utf-8"
-    );
+    const backupData = this.page
+      .locator(getTestId("setting-create-backup"))
+      .locator("button");
+
+    if (password) {
+      await backupData.click();
+      await fillPasswordDialog(this.page, password);
+    }
+
+    return await downloadAndReadFile(this.page, backupData, "utf-8");
  }

  async restoreData(filename: string, password?: string) {
--- a/apps/web/e2e/utils/index.ts
+++ b/apps/web/e2e/utils/index.ts
@@ -103,12 +103,12 @@ async function editNote(page: Page, note: Partial<Note>, noDelay = false) {

 async function downloadAndReadFile(
  page: Page,
-  action: () => Promise<void>,
+  action: Locator,
  encoding: BufferEncoding | null | undefined = "utf-8"
 ) {
  const [download] = await Promise.all([
    page.waitForEvent("download"),
-    action()
+    await action.click()
  ]);

  const dir = fs.mkdtempSync(join(tmpdir(), "nntests_"));
--- 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": "3.0.17",
+  "version": "3.0.13",
  "private": true,
  "main": "./src/app.js",
  "homepage": "https://notesnook.com/",
@@ -15,10 +15,9 @@
    "@dnd-kit/sortable": "^8.0.0",
    "@emotion/react": "11.11.1",
    "@hazae41/foras": "^2.1.4",
-    "@henrygd/queue": "^1.0.6",
    "@mdi/js": "^7.2.96",
    "@mdi/react": "^1.6.1",
-    "@notesnook-importer/core": "^2.1.1",
+    "@notesnook-importer/core": "^2.0.0",
    "@notesnook/common": "file:../../packages/common",
    "@notesnook/core": "file:../../packages/core",
    "@notesnook/crypto": "file:../../packages/crypto",
@@ -57,6 +56,7 @@
    "hotkeys-js": "^3.8.3",
    "katex": "0.16.2",
    "kysely": "^0.26.3",
+    "libsodium-wrappers": "^0.7.13",
    "mac-scrollbar": "^0.13.5",
    "marked": "^4.1.0",
    "mutative": "^1.0.6",
--- a/apps/web/src/app-effects.tsx
+++ b/apps/web/src/app-effects.tsx
@@ -22,16 +22,11 @@ import { useStore } from "./stores/app-store";
 import { useStore as useUserStore } from "./stores/user-store";
 import { useEditorStore } from "./stores/editor-store";
 import { useStore as useAnnouncementStore } from "./stores/announcement-store";
-import { useStore as useSettingStore } from "./stores/setting-store";
-import {
-  resetNotices,
-  scheduleBackups,
-  scheduleFullBackups
-} from "./common/notices";
+import { resetNotices, scheduleBackups } from "./common/notices";
 import { introduceFeatures, showUpgradeReminderDialogs } from "./common";
 import { AppEventManager, AppEvents } from "./common/app-events";
 import { db } from "./common/db";
-import { CHECK_IDS, EV, EVENTS } from "@notesnook/core/dist/common";
+import { EV, EVENTS } from "@notesnook/core/dist/common";
 import { registerKeyMap } from "./common/key-map";
 import { isUserPremium } from "./hooks/use-is-user-premium";
 import { updateStatus, removeStatus, getStatus } from "./hooks/use-status";
@@ -45,7 +40,6 @@ import { desktop } from "./common/desktop-bridge";
 import { BuyDialog } from "./dialogs/buy-dialog";
 import { FeatureDialog } from "./dialogs/feature-dialog";
 import { AnnouncementDialog } from "./dialogs/announcement-dialog";
-import { logger } from "./utils/logger";

 type AppEffectsProps = {
  setShow: (show: boolean) => void;
@@ -70,27 +64,11 @@ export default function AppEffects({ setShow }: AppEffectsProps) {
          if (isUserPremium()) {
            return { type, result: true };
          } else {
-            let sentence = "Please upgrade your account to Pro ";
-            switch (type) {
-              case CHECK_IDS.noteColor:
-                sentence += "to add colors.";
-                break;
-              case CHECK_IDS.noteTag:
-                sentence += "to add more tags.";
-                break;
-              case CHECK_IDS.notebookAdd:
-                sentence += "to add more notebooks.";
-                break;
-              case CHECK_IDS.vaultAdd:
-                sentence += "to use the notes vault.";
-                break;
-              default:
-                sentence += "to use this feature.";
-                break;
-            }
-            showToast("error", sentence, [
-              { text: "Upgrade now", onClick: () => BuyDialog.show({}) }
-            ]);
+            showToast(
+              "error",
+              "Please upgrade your account to Pro to use this feature.",
+              [{ text: "Upgrade now", onClick: () => BuyDialog.show({}) }]
+            );
            return { type, result: false };
          }
        }
@@ -112,10 +90,6 @@ export default function AppEffects({ setShow }: AppEffectsProps) {
        if (onboardingKey) await OnboardingDialog.show({ type: onboardingKey });
        await FeatureDialog.show({ featureName: "highlights" });
        await scheduleBackups();
-        await scheduleFullBackups();
-        if (useSettingStore.getState().isFullOfflineMode)
-          // NOTE: we deliberately don't await here because we don't want to pause execution.
-          db.attachments.cacheAttachments().catch(logger.error);
      })();

      return () => {
--- a/apps/web/src/app.tsx
+++ b/apps/web/src/app.tsx
@@ -125,9 +125,7 @@ function DesktopAppContents({ show, setShow }: DesktopAppContentsProps) {
  const middlePane = useRef<ImperativePanelHandle>(null);

  useEffect(() => {
-    const size = navPane.current?.getSize();
-    // Toggle `isNarrow` to true if panel size isn't set to narrow by user 
-    setIsNarrow((size && size <= 5) || isTablet);
+    setIsNarrow(isTablet);
  }, [isTablet]);

  // useEffect(() => {
--- a/apps/web/src/common/attachments.ts
+++ b/apps/web/src/common/attachments.ts
@@ -116,10 +116,12 @@ export async function checkAttachment(hash: string) {
  if (!attachment) return { failed: "Attachment not found." };

  try {
-    await lazify(import("../interfaces/fs"), ({ checkUpload }) =>
-      checkUpload(hash, attachment.chunkSize, attachment.size)
+    const size = await lazify(
+      import("../interfaces/fs"),
+      ({ getUploadedFileSize }) => getUploadedFileSize(hash)
    );
-    await db.attachments.markAsFailed(attachment.id);
+    if (size === 0) throw new Error("File length is 0.");
+    else if (size === -1) throw new Error("File verification check failed.");
  } catch (e) {
    const reason = e instanceof Error ? e.message : "Unknown error.";
    await db.attachments.markAsFailed(attachment.id, reason);
--- a/apps/web/src/common/db.ts
+++ b/apps/web/src/common/db.ts
@@ -26,7 +26,6 @@ import { isFeatureSupported } from "../utils/feature-check";
 import { generatePassword } from "../utils/password-generator";
 import { deriveKey, useKeyStore } from "../interfaces/key-store";
 import { logManager } from "@notesnook/core/dist/logger";
-import Config from "../utils/config";

 const db = database;
 async function initializeDatabase(persistence: DatabasePersistence) {
@@ -46,8 +45,7 @@ async function initializeDatabase(persistence: DatabasePersistence) {
    AUTH_HOST: "https://auth.streetwriters.co",
    SSE_HOST: "https://events.streetwriters.co",
    ISSUES_HOST: "https://issues.streetwriters.co",
-    SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",
-    ...Config.get("serverUrls", {})
+    SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co"
  });

  const storage = new NNStorage(
--- a/apps/web/src/common/index.ts
+++ b/apps/web/src/common/index.ts
@@ -31,7 +31,7 @@ import { PATHS } from "@notesnook/desktop";
 import { TaskManager } from "./task-manager";
 import { EVENTS } from "@notesnook/core/dist/common";
 import { createWritableStream } from "./desktop-bridge";
-import { createZipStream, ZipFile } from "../utils/streams/zip-stream";
+import { createZipStream } from "../utils/streams/zip-stream";
 import { FeatureDialog, FeatureKeys } from "../dialogs/feature-dialog";
 import { ZipEntry, createUnzipIterator } from "../utils/streams/unzip-stream";
 import { User } from "@notesnook/core";
@@ -41,10 +41,6 @@ import { formatDate } from "@notesnook/core/dist/utils/date";
 import { showPasswordDialog } from "../dialogs/password-dialog";
 import { BackupPasswordDialog } from "../dialogs/backup-password-dialog";
 import { ReminderDialog } from "../dialogs/reminder-dialog";
-import { Cipher, SerializedKey } from "@notesnook/crypto";
-import { ChunkedStream } from "../utils/streams/chunked-stream";
-import { isFeatureSupported } from "../utils/feature-check";
-import { NNCrypto } from "../interfaces/nncrypto";

 export const CREATE_BUTTON_MAP = {
  notes: {
@@ -82,11 +78,9 @@ export async function createBackup(
  options: {
    rescueMode?: boolean;
    noVerify?: boolean;
-    mode?: "full" | "partial";
-    background?: boolean;
-  } = { mode: "partial" }
+  } = {}
 ) {
-  const { rescueMode, noVerify, mode, background } = options;
+  const { rescueMode, noVerify } = options;
  const { isLoggedIn } = useUserStore.getState();
  const { encryptBackups, toggleEncryptBackups } = useSettingStore.getState();
  if (!isLoggedIn && encryptBackups) toggleEncryptBackups();
@@ -105,7 +99,7 @@ export async function createBackup(
      type: "date-time",
      dateFormat: "YYYY-MM-DD",
      timeFormat: "24-hour"
-    })}-${new Date().getSeconds()}${mode === "full" ? "-full" : ""}`,
+    })}-${new Date().getSeconds()}`,
    { replacement: "-" }
  );
  const directory = Config.get("backupStorageLocation", PATHS.backupsDirectory);
@@ -116,47 +110,23 @@ export async function createBackup(

  const encoder = new TextEncoder();
  const error = await TaskManager.startTask<Error | void>({
-    type: background ? "status" : "modal",
-    id: "creating-backup",
+    type: "modal",
    title: "Creating backup",
    subtitle: "We are creating a backup of your data. Please wait...",
    action: async (report) => {
      const writeStream = await createWritableStream(filePath);
-      await new ReadableStream<ZipFile>({
+
+      await new ReadableStream({
        start() {},
        async pull(controller) {
-          const { streamablefs } = await import("../interfaces/fs");
-          for await (const output of db.backup!.export({
-            type: "web",
-            encrypt: encryptedBackups,
-            mode
-          })) {
-            if (output.type === "file") {
-              const file = output;
-              report({
-                text: background
-                  ? `Creating backup (${file.path})`
-                  : `Saving file ${file.path}`
-              });
-              controller.enqueue({
-                path: file.path,
-                data: encoder.encode(file.data)
-              });
-            } else if (output.type === "attachment") {
-              report({
-                text: background
-                  ? `Creating backup (${output.hash})`
-                  : `Saving attachment ${output.hash}`,
-                total: output.total,
-                current: output.current
-              });
-              const handle = await streamablefs.readFile(output.hash);
-              if (!handle) continue;
-              controller.enqueue({
-                path: output.path,
-                data: handle.readable
-              });
-            }
+          for await (const file of db.backup!.export("web", encryptedBackups)) {
+            report({
+              text: `Saving chunk ${file.path}`
+            });
+            controller.enqueue({
+              path: file.path,
+              data: encoder.encode(file.data)
+            });
          }
          controller.close();
        }
@@ -221,8 +191,6 @@ export async function restoreBackupFile(backupFile: File) {
        let cachedKey: string | undefined = undefined;
        // const { read, totalFiles } = await Reader(backupFile);
        const entries: ZipEntry[] = [];
-        const attachments: ZipEntry[] = [];
-        let attachmentsKey: SerializedKey | Cipher<"base64"> | undefined;
        let filesProcessed = 0;

        let isValid = false;
@@ -231,13 +199,7 @@ export async function restoreBackupFile(backupFile: File) {
            isValid = true;
            continue;
          }
-          if (entry.name === "attachments/.attachments_key")
-            attachmentsKey = JSON.parse(await entry.text()) as
-              | SerializedKey
-              | Cipher<"base64">;
-          else if (entry.name.startsWith("attachments/"))
-            attachments.push(entry);
-          else entries.push(entry);
+          entries.push(entry);
        }
        if (!isValid)
          console.warn(
@@ -250,27 +212,18 @@ export async function restoreBackupFile(backupFile: File) {
            if (backup.encrypted) {
              if (!cachedPassword && !cachedKey) {
                const result = await BackupPasswordDialog.show({
-                  validate: async ({ password, key: encryptionKey }) => {
-                    if (!password && !encryptionKey) return false;
-                    await db.backup?.import(backup, {
-                      password,
-                      encryptionKey,
-                      attachmentsKey
-                    });
+                  validate: async ({ password, key }) => {
+                    if (!password && !key) return false;
+                    await db.backup?.import(backup, password, key);
                    cachedPassword = password;
-                    cachedKey = encryptionKey;
+                    cachedKey = key;
                    return true;
                  }
                });
                if (!result) break;
-              } else
-                await db.backup?.import(backup, {
-                  password: cachedPassword,
-                  encryptionKey: cachedKey,
-                  attachmentsKey
-                });
+              } else await db.backup?.import(backup, cachedPassword, cachedKey);
            } else {
-              await db.backup?.import(backup, { attachmentsKey });
+              await db.backup?.import(backup);
            }

            report({
@@ -281,37 +234,6 @@ export async function restoreBackupFile(backupFile: File) {
          }
        });
        await db.initCollections();
-
-        const { ABYTES, streamablefs } = await import("../interfaces/fs");
-        let current = 0;
-        for (const entry of attachments) {
-          const hash = entry.name.replace("attachments/", "");
-
-          report({
-            text: `Importing attachment ${hash}`,
-            total: attachments.length,
-            current: current++
-          });
-
-          const attachment = await db.attachments.attachment(hash);
-          if (!attachment) continue;
-
-          await streamablefs.deleteFile(attachment.hash);
-          const handle = await streamablefs.createFile(
-            attachment.hash,
-            attachment.size,
-            attachment.mimeType
-          );
-          await entry
-            .stream()
-            .pipeThrough(
-              new ChunkedStream(
-                attachment.chunkSize + ABYTES,
-                isFeatureSupported("opfs") ? "copy" : "nocopy"
-              )
-            )
-            .pipeTo(handle.writeable);
-        }
      }
    });
    if (error) {
@@ -404,10 +326,10 @@ export async function showUpgradeReminderDialogs() {
 async function restore(
  backup: LegacyBackupFile,
  password?: string,
-  encryptionKey?: string
+  key?: string
 ) {
  try {
-    await db.backup?.import(backup, { password, encryptionKey });
+    await db.backup?.import(backup, password, key);
    showToast("success", "Backup restored!");
  } catch (e) {
    logger.error(e as Error, "Could not restore the backup");
--- a/apps/web/src/common/multi-select.ts
+++ b/apps/web/src/common/multi-select.ts
@@ -46,7 +46,6 @@ async function moveNotesToTrash(ids: string[], confirm = true) {
  await TaskManager.startTask({
    type: "status",
    id: "deleteNotes",
-    title: "Deleting notes",
    action: async (report) => {
      report({
        text: `Deleting ${pluralize(items.length, "note")}...`
@@ -67,7 +66,6 @@ async function moveNotebooksToTrash(ids: string[]) {
  await TaskManager.startTask({
    type: "status",
    id: "deleteNotebooks",
-    title: "Deleting notebooks",
    action: async (report) => {
      report({
        text: `Deleting ${pluralize(ids.length, "notebook")}...`
@@ -94,7 +92,6 @@ async function deleteAttachments(ids: string[]) {
  await TaskManager.startTask({
    type: "status",
    id: "deleteAttachments",
-    title: "Deleting attachments",
    action: async (report) => {
      for (let i = 0; i < ids.length; ++i) {
        const id = ids[i];
@@ -122,7 +119,6 @@ async function moveRemindersToTrash(ids: string[]) {
  await TaskManager.startTask({
    type: "status",
    id: "deleteReminders",
-    title: "Deleting reminders",
    action: async (report) => {
      report({
        text: `Deleting ${pluralize(ids.length, "reminder")}...`
--- a/apps/web/src/common/notices.ts
+++ b/apps/web/src/common/notices.ts
@@ -38,18 +38,12 @@ export type Notice = {
  params?: any;
 };

-export const BACKUP_CRON_EXPRESSIONS = {
-  0: "",
-  1: "0 0 8 * * *", // daily at 8 AM
-  2: "0 0 8 * * 1", // Every monday at 8 AM
-  3: "0 0 0 1 * *" // 1st day of every month
-};
-
-export const FULL_BACKUP_CRON_EXPRESSIONS = {
-  0: "",
-  1: "0 0 8 * * 1", // Every monday at 8 AM
-  2: "0 0 0 1 * *" // 1st day of every month
-};
+export const BACKUP_CRON_EXPRESSIONS = [
+  "",
+  "0 0 8 * * *", // daily at 8 AM
+  "0 0 8 * * 1", // Every monday at 8 AM
+  "0 0 0 1 * *" // 1st day of every month
+];

 export async function scheduleBackups() {
  const backupInterval = Config.get("backupReminderOffset", 0);
@@ -68,23 +62,6 @@ export async function scheduleBackups() {
  );
 }

-export async function scheduleFullBackups() {
-  const backupInterval = Config.get("fullBackupReminderOffset", 0);
-
-  await TaskScheduler.stop("automatic-full-backups");
-  if (!backupInterval) return false;
-
-  console.log("Scheduling automatic full backups");
-  await TaskScheduler.register(
-    "automatic-full-backups",
-    FULL_BACKUP_CRON_EXPRESSIONS[backupInterval],
-    () => {
-      console.log("Backing up automatically");
-      saveBackup("full");
-    }
-  );
-}
-
 export function shouldAddAutoBackupsDisabledNotice() {
  const backupInterval = Config.get("backupReminderOffset", 0);
  if (!isUserPremium() && backupInterval) {
@@ -198,9 +175,9 @@ function isIgnored(key: keyof typeof NoticesData) {
 }

 let openedToast: { hide: () => void } | null = null;
-async function saveBackup(mode: "full" | "partial" = "partial") {
+async function saveBackup() {
  if (IS_DESKTOP_APP) {
-    await createBackup({ noVerify: true, mode, background: true });
+    await createBackup({ noVerify: true });
  } else if (isUserPremium() && !IS_TESTING) {
    if (openedToast !== null) return;
    openedToast = showToast(
@@ -219,7 +196,7 @@ async function saveBackup(mode: "full" | "partial" = "partial") {
        {
          text: "Download",
          onClick: async () => {
-            await createBackup({ mode });
+            await createBackup();
            openedToast?.hide();
            openedToast = null;
          },
--- a/apps/web/src/common/task-manager.ts
+++ b/apps/web/src/common/task-manager.ts
@@ -21,7 +21,7 @@ import { ProgressDialog } from "../dialogs/progress-dialog";
 import { removeStatus, updateStatus } from "../hooks/use-status";

 type TaskType = "status" | "modal";
-export type TaskAction<T> = (report: ProgressReportCallback) => T | Promise<T>;
+type TaskAction<T> = (report: ProgressReportCallback) => T | Promise<T>;
 type BaseTaskDefinition<TTaskType extends TaskType, TReturnType> = {
  type: TTaskType;
  action: TaskAction<TReturnType>;
@@ -31,7 +31,6 @@ type StatusTaskDefinition<TReturnType> = BaseTaskDefinition<
  "status",
  TReturnType
 > & {
-  title: string;
  id: string;
 };

@@ -40,7 +39,7 @@ type ModalTaskDefinition<TReturnType> = BaseTaskDefinition<
  TReturnType
 > & {
  title: string;
-  subtitle?: string;
+  subtitle: string;
 };

 type TaskDefinition<TReturnType> =
@@ -60,10 +59,6 @@ export class TaskManager {
    switch (task.type) {
      case "status": {
        const statusTask = task;
-        updateStatus({
-          key: statusTask.id,
-          status: task.title
-        });
        const result = await statusTask.action((progress) => {
          let percentage: number | undefined = undefined;
          if (progress.current && progress.total)
--- a/apps/web/src/components/accordion/index.tsx
+++ b/apps/web/src/components/accordion/index.tsx
@@ -29,22 +29,12 @@ export type AccordionProps = {
  testId?: string;
  buttonSx?: FlexProps["sx"];
  titleSx?: FlexProps["sx"];
-  containerSx?: FlexProps["sx"];
 };

 export default function Accordion(
  props: PropsWithChildren<AccordionProps> & FlexProps
 ) {
-  const {
-    isClosed,
-    title,
-    color,
-    children,
-    testId,
-    sx,
-    containerSx,
-    ...restProps
-  } = props;
+  const { isClosed, title, color, children, testId, sx, ...restProps } = props;
  const [isContentHidden, setIsContentHidden] = useState(false);

  useEffect(() => {
@@ -79,9 +69,8 @@ export default function Accordion(
      </Flex>
      <Flex
        sx={{
-          flexDirection: "column",
-          ...containerSx,
-          display: isContentHidden ? "none" : "flex"
+          display: isContentHidden ? "none" : "flex",
+          flexDirection: "column"
        }}
      >
        {children}
--- a/apps/web/src/components/announcements/body.jsx
+++ b/apps/web/src/components/announcements/body.jsx
@@ -24,6 +24,7 @@ import {
  Image as RebassImage,
  Text as RebassText
 } from "@theme-ui/components";
+import { ANALYTICS_EVENTS, trackEvent } from "../../utils/analytics";
 import {
  Sync,
  Notebook,
@@ -283,6 +284,7 @@ function CalltoAction({ action, variant, sx, dismissAnnouncement }) {
      onClick={async () => {
        if (dismissAnnouncement) dismissAnnouncement();
        DialogManager.closeAll();
+        trackEvent(ANALYTICS_EVENTS.announcementCta, action);
        switch (action.type) {
          case "link": {
            const url = new URL(action.data);
--- a/apps/web/src/components/announcements/index.jsx
+++ b/apps/web/src/components/announcements/index.jsx
@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 import { Flex, Text } from "@theme-ui/components";
 import { Cross } from "../icons";
+import { ANALYTICS_EVENTS, trackEvent } from "../../utils/analytics";
 import AnnouncementBody from "./body";
 import { useStore as useAnnouncementStore } from "../../stores/announcement-store";
 import Notice from "../notice";
@@ -58,6 +59,7 @@ function Announcements() {
        }}
        title="Dismiss announcement"
        onClick={() => {
+          trackEvent(ANALYTICS_EVENTS.announcementDismissed, announcement);
          dismiss(announcement.id);
        }}
      >
--- a/apps/web/src/components/auth-container/index.jsx
+++ b/apps/web/src/components/auth-container/index.jsx
@@ -18,14 +18,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 import { useMemo } from "react";
-import { Box, Button, Flex, Image, Link, Text } from "@theme-ui/components";
-import { getRandom, usePromise } from "@notesnook/common";
+import { Box, Flex, Image, Link, Text } from "@theme-ui/components";
+import { useStore as useThemeStore } from "../../stores/theme-store";
+import { getRandom } from "@notesnook/common";
 import Grberk from "../../assets/testimonials/grberk.jpeg";
 import Holenstein from "../../assets/testimonials/holenstein.jpg";
 import Jason from "../../assets/testimonials/jason.jpg";
 import Cameron from "../../assets/testimonials/cameron.jpg";
-import hosts from "@notesnook/core/dist/utils/constants";
-import { SettingsDialog } from "../../dialogs/settings";

 const testimonials = [
  {
@@ -75,16 +74,10 @@ function randomTitle() {
 }

 function AuthContainer(props) {
+  const colorScheme = useThemeStore((store) => store.colorScheme);
  const testimonial = useMemo(() => randomTestimonial(), []);
  const title = useMemo(() => randomTitle(), []);

-  const version = usePromise(
-    async () =>
-      await fetch(`${hosts.API_HOST}/version`)
-        .then((r) => r.json())
-        .catch(() => undefined)
-  );
-
  return (
    <Flex
      sx={{
@@ -172,6 +165,7 @@ function AuthContainer(props) {
          <Text variant={"heading"} sx={{ fontSize: 48 }}>
            {title}
          </Text>
+
          <Text
            variant="body"
            mt={10}
@@ -199,34 +193,6 @@ function AuthContainer(props) {
              <Text variant="subBody">@{testimonial.username}</Text>
            </Flex>
          </Flex>
-
-          <Flex
-            mt={2}
-            pt={2}
-            sx={{
-              justifyContent: "space-between",
-              borderTop: "1px solid var(--border)",
-              width: "100%"
-            }}
-          >
-            <Text variant={"subBody"}>
-              {version.status === "fulfilled" &&
-              version.value.instance !== "default" ? (
-                <>
-                  Using{" "}
-                  {version.value.instance + ` (v${version.value.version})`}
-                </>
-              ) : (
-                <>Using official Notesnook instance.</>
-              )}
-            </Text>
-            <Button
-              variant="anchor"
-              onClick={() => SettingsDialog.show({ activeSection: "servers" })}
-            >
-              Configure
-            </Button>
-          </Flex>
        </Flex>
      </Box>
      <Flex
--- a/apps/web/src/components/editor/header.tsx
+++ b/apps/web/src/components/editor/header.tsx
@@ -50,7 +50,6 @@ function Header(props: HeaderProps) {
      const id =
        (await db.tags.find(value))?.id ??
        (await db.tags.add({ title: value }));
-      if (!id) return;
      await db.relations.add({ id, type: "tag" }, { type: "note", id: noteId });
      await useTagStore.getState().refresh();
    }
--- a/apps/web/src/components/editor/picker.ts
+++ b/apps/web/src/components/editor/picker.ts
@@ -240,13 +240,14 @@ function withProgress<T>(
        ({ type, total, loaded }: AttachmentProgress) => {
          if (type !== "encrypt") return;
          report({
-            current: Math.round((loaded / total) * 100),
-            total: 100,
+            current: loaded,
+            total: total,
            text: file.name
          });
        }
      );
-      return action().finally(() => event.unsubscribe());
+      event.unsubscribe();
+      return action();
    }
  });
 }
--- a/apps/web/src/components/error-text/index.tsx
+++ b/apps/web/src/components/error-text/index.tsx
@@ -30,14 +30,8 @@ export function ErrorText(props: ErrorTextProps) {
    <Flex
      bg="var(--background-error)"
      p={1}
-      sx={{
-        borderRadius: "default",
-        mt: 2,
-        ...sx,
-        alignItems: "flex-start",
-        maxHeight: 300,
-        overflowY: "auto"
-      }}
+      mt={2}
+      sx={{ borderRadius: "default", ...sx, maxHeight: 300, overflowY: "auto" }}
      {...restProps}
    >
      <ErrorIcon size={15} color="var(--icon-error)" />
--- a/apps/web/src/components/field/index.tsx
+++ b/apps/web/src/components/field/index.tsx
@@ -55,7 +55,6 @@ function Field(props: FieldProps) {
    type,
    inputRef,
    validate,
-    disabled,
    ...inputProps
  } = props;
  const [isPasswordVisible, setIsPasswordVisible] = useState(false);
@@ -67,8 +66,6 @@ function Field(props: FieldProps) {
      sx={{
        m: "2px",
        mr: "2px",
-        opacity: disabled ? 0.7 : 1,
-        pointerEvents: disabled ? "none" : "all",
        ...sx,
        flexDirection: "column"
      }}
--- a/apps/web/src/components/icons/index.tsx
+++ b/apps/web/src/components/icons/index.tsx
@@ -214,9 +214,7 @@ import {
  mdiLink,
  mdiWindowClose,
  mdiFileMusicOutline,
-  mdiBroom,
-  mdiServerSecurity,
-  mdiOpenInNew
+  mdiBroom
 } from "@mdi/js";
 import { useTheme } from "@emotion/react";
 import { Theme } from "@notesnook/theme";
@@ -543,7 +541,6 @@ export const Documentation = createIcon(mdiFileDocumentOutline);
 export const Legal = createIcon(mdiGavel);
 export const Desktop = createIcon(mdiDesktopClassic);
 export const Notification = createIcon(mdiBellBadgeOutline);
-export const Servers = createIcon(mdiServerSecurity);
 export const Calendar = createIcon(mdiCalendarBlank);

 export const WindowMinimize = createIcon("M4 20v-2h16v2H4Z");
@@ -553,4 +550,3 @@ export const WindowRestore = createIcon(
 );
 export const WindowClose = createIcon(mdiWindowClose);
 export const ClearCache = createIcon(mdiBroom);
-export const OpenInNew = createIcon(mdiOpenInNew);
--- a/apps/web/src/components/note/index.tsx
+++ b/apps/web/src/components/note/index.tsx
@@ -50,8 +50,7 @@ import {
  RemoveShortcutLink,
  Plus,
  Copy,
-  Tag as TagIcon,
-  OpenInNew
+  Tag as TagIcon
 } from "../icons";
 import TimeAgo from "../time-ago";
 import ListItem from "../list-item";
@@ -431,53 +430,17 @@ const menuItems: (
    {
      type: "button",
      key: "publish",
-      isDisabled: !db.monographs.isPublished(note.id) && context?.locked,
+      isDisabled:
+        //!isSynced ||
+        !db.monographs.isPublished(note.id) && context?.locked,
      icon: Publish.path,
      title: "Publish",
-      menu: db.monographs.isPublished(note.id)
-        ? {
-            items: [
-              {
-                type: "button",
-                key: "open",
-                title: "Open",
-                icon: OpenInNew.path,
-                onClick: async () => {
-                  const url = `https://monogr.ph/${note.id}`;
-                  window.open(url, "_blank");
-                }
-              },
-              {
-                type: "button",
-                key: "copy-link",
-                title: "Copy link",
-                icon: Copy.path,
-                onClick: async () => {
-                  const url = `https://monogr.ph/${note.id}`;
-                  await writeToClipboard({
-                    "text/plain": url,
-                    "text/html": `<a href="${url}">${note.title}</a>`,
-                    "text/markdown": `[${note.title}](${url})`
-                  });
-                }
-              },
-              {
-                type: "separator",
-                key: "sep"
-              },
-              {
-                type: "button",
-                key: "unpublish",
-                title: "Unpublish",
-                icon: Publish.path,
-                onClick: async () => {
-                  await useMonographStore.getState().unpublish(note.id);
-                }
-              }
-            ]
-          }
-        : undefined,
-      onClick: () => showPublishView(note, "bottom")
+      isChecked: db.monographs.isPublished(note.id),
+      onClick: async () => {
+        const isPublished = db.monographs.isPublished(note.id);
+        if (isPublished) await useMonographStore.getState().unpublish(note.id);
+        else await showPublishView(note, "bottom");
+      }
    },
    {
      type: "button",
--- a/apps/web/src/components/placeholders/index.tsx
+++ b/apps/web/src/components/placeholders/index.tsx
@@ -28,9 +28,8 @@ function Placeholder(props: PlaceholderProps) {
  const { context, text } = props;
  const tip = useTip(context);
  const syncStatus = useAppStore((store) => store.syncStatus);
-  const isFirstSync = useAppStore((store) => store.lastSynced === 0);

-  if (isFirstSync && syncStatus.key === "syncing" && context === "notes") {
+  if (syncStatus.key === "syncing" && context === "notes") {
    return (
      <Flex
        variant="columnCenter"
--- a/apps/web/src/components/status-bar/index.tsx
+++ b/apps/web/src/components/status-bar/index.tsx
@@ -26,6 +26,7 @@ import {
  Update,
  SyncError,
  Alert,
+  Issue,
  SyncOff,
  Icon
 } from "../icons";
@@ -39,6 +40,7 @@ import { checkForUpdate, installUpdate } from "../../utils/updater";
 import { getTimeAgo, toTitleCase } from "@notesnook/common";
 import { User } from "@notesnook/core";
 import { showUpdateAvailableNotice } from "../../dialogs/confirm";
+import { IssueDialog } from "../../dialogs/issue-dialog";

 function StatusBar() {
  const user = useUserStore((state) => state.user);
--- a/apps/web/src/components/virtualized-table/index.tsx
+++ b/apps/web/src/components/virtualized-table/index.tsx
@@ -72,7 +72,6 @@ export function VirtualizedTable<T, C>(props: VirtualizedTableProps<T, C>) {
          containerRef.current?.closest(".ms-container") ||
          undefined
        }
-        increaseViewportBy={300}
        computeItemKey={(index) => getItemKey(index)}
        defaultItemHeight={estimatedSize}
        fixedHeaderContent={() => <>{header}</>}
--- a/apps/web/src/dialogs/add-notebook-dialog.tsx
+++ b/apps/web/src/dialogs/add-notebook-dialog.tsx
@@ -49,8 +49,6 @@ export const AddNotebookDialog = DialogManager.register(
        title: title.current,
        description: description.current
      });
-      if (!id) return;
-
      if (parentId) {
        await db.relations.add(
          { type: "notebook", id: parentId },
--- a/apps/web/src/dialogs/attachments-dialog.tsx
+++ b/apps/web/src/dialogs/attachments-dialog.tsx
@@ -197,15 +197,14 @@ export const AttachmentsDialog = DialogManager.register(
                      variant="secondary"
                      key={tool.title}
                      title={tool.title}
-                      onClick={() => {
-                        try {
-                          tool.onClick({
-                            selected
-                          });
-                        } catch (e) {
-                          showToast("error", (e as Error).message);
-                        }
-                      }}
+                      onClick={() =>
+                        tool.onClick({
+                          selected
+                          // : attachments.filter(
+                          //   (a) => selected.indexOf(a.id) > -1
+                          // )
+                        })
+                      }
                      disabled={!selected.length}
                      sx={{ bg: "transparent", p: 1 }}
                    >
@@ -255,14 +254,7 @@ export const AttachmentsDialog = DialogManager.register(
                      >
                        <Label>
                          <Checkbox
-                            sx={{
-                              width: 18,
-                              height: 18,
-                              color:
-                                selected.length === attachments.length
-                                  ? "accent"
-                                  : "icon"
-                            }}
+                            sx={{ width: 18, height: 18 }}
                            onChange={async (e) => {
                              setSelected(
                                e.currentTarget.checked
@@ -272,7 +264,6 @@ export const AttachmentsDialog = DialogManager.register(
                                  : []
                              );
                            }}
-                            checked={selected.length === attachments.length}
                          />
                        </Label>
                      </Text>
--- a/apps/web/src/dialogs/buy-dialog/buy-dialog.tsx
+++ b/apps/web/src/dialogs/buy-dialog/buy-dialog.tsx
@@ -175,8 +175,12 @@ function SideBar(props: SideBarProps) {
          const result = await TaskManager.startTask({
            type: "status",
            id: "trialActivation",
-            title: "Activating trial",
-            action: () => db.user.activateTrial()
+            action: (report) => {
+              report({
+                text: "Activating trial"
+              });
+              return db.user.activateTrial();
+            }
          });
          if (result) onClose();
        } catch (e) {
--- a/apps/web/src/dialogs/buy-dialog/features.tsx
+++ b/apps/web/src/dialogs/buy-dialog/features.tsx
@@ -312,7 +312,7 @@ const sections: Section[] = [
        icon: Pin
      }
    ],
-    info: "* Free users can only create 20 notebooks and 5 tags."
+    info: "* Free users can only create 3 notebooks (no limit on topics) and 5 tags."
  },

  {
@@ -399,7 +399,8 @@ const sections: Section[] = [
      {
        id: "backup-encryption",
        title: "Backup encryption",
-        icon: EncryptedBackup
+        icon: EncryptedBackup,
+        pro: true
      }
    ]
  },
@@ -407,6 +408,7 @@ const sections: Section[] = [
    title: "Personalize & make Notesnook your own",
    detail:
      "Change app themes to match your style. Custom themes are coming soon.",
+    pro: true,
    features: [
      {
        id: "10-themes",
@@ -421,8 +423,7 @@ const sections: Section[] = [
      {
        id: "default-home-page",
        title: "Change default home page",
-        icon: Home,
-        pro: true
+        icon: Home
      }
    ]
  }
--- a/apps/web/src/dialogs/buy-dialog/paddle.tsx
+++ b/apps/web/src/dialogs/buy-dialog/paddle.tsx
@@ -32,19 +32,17 @@ import {
 } from "./types";
 import { ScrollContainer } from "@notesnook/ui";
 import useMobile from "../../hooks/use-mobile";
-import { logger } from "../../utils/logger";
-import { isFeatureSupported } from "../../utils/feature-check";

 // const isDev = false; // import.meta.env.DEV;
-const VENDOR_ID = import.meta.env.DEV || IS_TESTING ? 1506 : 128190;
+// const VENDOR_ID = isDev ? 1506 : 128190;
 const PADDLE_ORIGIN =
  import.meta.env.DEV || IS_TESTING
    ? "https://sandbox-buy.paddle.com"
    : "https://buy.paddle.com";
-const SUBSCRIPTION_MANAGEMENT_URL =
+const CHECKOUT_CREATE_ORIGIN =
  import.meta.env.DEV || IS_TESTING
-    ? "https://sandbox-subscription-management.paddle.com"
-    : "https://subscription-management.paddle.com";
+    ? "https://sandbox-create-checkout.paddle.com"
+    : "https://create-checkout.paddle.com";
 const CHECKOUT_SERVICE_ORIGIN =
  import.meta.env.DEV || IS_TESTING
    ? "https://sandbox-checkout-service.paddle.com"
@@ -104,7 +102,6 @@ export function PaddleCheckout(props: PaddleCheckoutProps) {
  useEffect(() => {
    async function onMessage(ev: MessageEvent<PaddleEvent>) {
      if (ev.origin !== PADDLE_ORIGIN) return;
-      logger.debug("Paddle event received", { data: ev.data });
      const { event_name, callback_data } = ev.data;
      const { checkout } = callback_data;

@@ -112,10 +109,8 @@ export function PaddleCheckout(props: PaddleCheckoutProps) {
        !checkout ||
        !checkout.id ||
        SUBSCRIBED_EVENTS.indexOf(event_name) === -1
-      ) {
-        logger.debug("Ignoring paddle event", { event_name });
+      )
        return;
-      }

      if (event_name === PaddleEvents["Checkout.Complete"]) {
        onCompleted && onCompleted();
@@ -129,9 +124,9 @@ export function PaddleCheckout(props: PaddleCheckoutProps) {
      appliedCouponCode.current = pricingInfo.coupon;
      setCheckoutId(checkout.id);
    }
-    window.addEventListener("message", onMessage, false);
+    window.addEventListener("message", onMessage);
    return () => {
-      window.removeEventListener("message", onMessage, false);
+      window.removeEventListener("message", onMessage);
    };
  }, [onPriceUpdated, updatePrice, plan, onCompleted]);

@@ -193,7 +188,6 @@ export function PaddleCheckout(props: PaddleCheckoutProps) {
          frameBorder={"0"}
          ref={checkoutRef}
          src={sourceUrl}
-          allow={`payment ${PADDLE_ORIGIN} ${SUBSCRIPTION_MANAGEMENT_URL};`}
          style={{
            //   padding: "0px 30px",
            height: "1000px",
@@ -212,28 +206,21 @@ export function PaddleCheckout(props: PaddleCheckoutProps) {

 async function getCheckoutURL(params: PaddleCheckoutProps) {
  const { plan, theme, user } = params;
-  const BASE_URL = `${PADDLE_ORIGIN}/paddlejs?ccsURL=${CHECKOUT_SERVICE_ORIGIN}/create/checkout/product/${plan.id}`;
+  const BASE_URL = `${CHECKOUT_CREATE_ORIGIN}/checkout/product/${plan.id}`;
  const queryParams = new URLSearchParams();
  queryParams.set("product", plan.id);
-  queryParams.set("vendor", VENDOR_ID.toString());
  queryParams.set("passthrough", JSON.stringify({ userId: user.id }));
  queryParams.set("guest_email", user.email);
  queryParams.set("quantity_variable", "0");
  queryParams.set("disable_logout", "true");
  queryParams.set("display_mode_theme", theme);
  queryParams.set("display_mode", "inline");
-  queryParams.set(
-    "apple_pay_enabled",
-    JSON.stringify(isFeatureSupported("applePaySupported"))
-  );
-  queryParams.set("paddlejs-version", "2.0.81");
-  queryParams.set("checkout_initiated", new Date().getTime().toString());
+  queryParams.set("apple_pay_enabled", "false");
+  queryParams.set("paddlejs-version", "2.0.14");
  queryParams.set("popup", "true");
  queryParams.set("paddle_js", "true");
  queryParams.set("is_popup", "true");
-  queryParams.set("parent_url", window.location.origin);
-  queryParams.set("parentURL", window.location.origin);
-  queryParams.set("referring_domain", window.location.hostname);
+  queryParams.set("parent_url", window.location.href);
  const fullURL = `${BASE_URL}?${queryParams.toString()}`;
  return fullURL;
 }
--- a/apps/web/src/dialogs/confirm.tsx
+++ b/apps/web/src/dialogs/confirm.tsx
@@ -17,15 +17,14 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-import { Checkbox, Flex, Label, Text } from "@theme-ui/components";
+import { Box, Checkbox, Label, Text } from "@theme-ui/components";
 import { useRef } from "react";
 import { mdToHtml } from "../utils/md";
 import Dialog from "../components/dialog";
 import { BaseDialogProps, DialogManager } from "../common/dialog-manager";
 import { db } from "../common/db";
-import { getChangelog } from "../utils/version";
+import { AppVersion, getChangelog } from "../utils/version";
 import { downloadUpdate } from "../utils/updater";
-import { ErrorText } from "../components/error-text";

 type Check = { text: string; default?: boolean };
 export type ConfirmDialogProps<TCheckId extends string> = BaseDialogProps<
@@ -37,7 +36,6 @@ export type ConfirmDialogProps<TCheckId extends string> = BaseDialogProps<
  positiveButtonText?: string;
  negativeButtonText?: string;
  message?: string;
-  warnings?: string[];
  checks?: Partial<Record<TCheckId, Check>>;
 };

@@ -52,7 +50,6 @@ export const ConfirmDialog = DialogManager.register(function ConfirmDialog<
    negativeButtonText,
    positiveButtonText,
    message,
-    warnings,
    checks
  } = props;
  const checkedItems = useRef<Record<TCheckId, boolean>>({} as any);
@@ -65,12 +62,6 @@ export const ConfirmDialog = DialogManager.register(function ConfirmDialog<
      width={width}
      description={subtitle}
      onClose={() => onClose(false)}
-      onOpen={() => {
-        for (const checkId in checks) {
-          checkedItems.current[checkId as TCheckId] =
-            checks[checkId as TCheckId]?.default || false;
-        }
-      }}
      positiveButton={
        positiveButtonText
          ? {
@@ -89,10 +80,8 @@ export const ConfirmDialog = DialogManager.register(function ConfirmDialog<
          : undefined
      }
    >
-      <Flex
+      <Box
        sx={{
-          flexDirection: "column",
-          gap: 1,
          pb: !negativeButtonText && !positiveButtonText ? 2 : 0,
          p: { m: 0 }
        }}
@@ -104,9 +93,6 @@ export const ConfirmDialog = DialogManager.register(function ConfirmDialog<
            dangerouslySetInnerHTML={{ __html: mdToHtml(message) }}
          />
        ) : null}
-        {warnings?.map((text) => (
-          <ErrorText key={text} error={text} sx={{ mt: 0 }} />
-        ))}
        {checks
          ? Object.entries<Check | undefined>(checks).map(
              ([id, check]) =>
@@ -115,17 +101,12 @@ export const ConfirmDialog = DialogManager.register(function ConfirmDialog<
                    key={id}
                    id={id}
                    variant="text.body"
-                    sx={{ fontWeight: "bold" }}
+                    sx={{ alignItems: "center" }}
                  >
                    <Checkbox
                      name={id}
                      defaultChecked={check.default}
-                      sx={{
-                        mr: "small",
-                        width: 18,
-                        height: 18,
-                        color: "accent"
-                      }}
+                      sx={{ mr: "small", width: 18, height: 18 }}
                      onChange={(e) =>
                        (checkedItems.current[id as TCheckId] =
                          e.currentTarget.checked)
@@ -136,7 +117,7 @@ export const ConfirmDialog = DialogManager.register(function ConfirmDialog<
                )
            )
          : null}
-      </Flex>
+      </Box>
    </Dialog>
  );
 });
@@ -162,24 +143,13 @@ export function showMultiPermanentDeleteConfirmation(length: number) {
  });
 }

-export async function showLogoutConfirmation() {
-  return await ConfirmDialog.show({
+export function showLogoutConfirmation() {
+  return ConfirmDialog.show({
    title: `Logout?`,
    message:
-      "Are you sure you want to log out and clear all data stored on THIS DEVICE?",
+      "Logging out will clear all data stored on THIS DEVICE. Make sure you have synced all your changes before logging out.",
    positiveButtonText: "Yes",
-    negativeButtonText: "No",
-    warnings: (await db.hasUnsyncedChanges())
-      ? [
-          "You have unsynced notes. Take a backup or sync your notes to avoid losing critical data."
-        ]
-      : [],
-    checks: {
-      backup: {
-        text: "Take a backup before logging out?",
-        default: true
-      }
-    }
+    negativeButtonText: "No"
  });
 }

--- a/apps/web/src/dialogs/create-color-dialog.tsx
+++ b/apps/web/src/dialogs/create-color-dialog.tsx
@@ -63,7 +63,7 @@ export const CreateColorDialog = DialogManager.register(
              colorCode: form.color,
              title: form.title
            });
-            props.onClose(colorId || false);
+            props.onClose(colorId);
          }}
        >
          <Field
--- a/Show More
+++ b/Show More