mobile: do not zip note without attachments

mobile: fix itemExists error
web: add menu items to open, view & unpublish a monograph (fixes #4812 )
2026-08-30 10:39:07 +02:00 · 2024-09-12 12:53:32 +05:00 · 2024-09-11 14:12:56 +05:00 · 2024-09-11 13:56:18 +05:00 · 2024-09-11 13:33:35 +05:00 · 2024-09-11 13:26:57 +05:00
229 changed files with 13463 additions and 4768 deletions
--- a/apps/desktop/package-lock.json
+++ b/apps/desktop/package-lock.json
@@ -1,23 +1,21 @@
 {
  "name": "@notesnook/desktop",
-  "version": "3.0.13",
+  "version": "3.0.17",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@notesnook/desktop",
-      "version": "3.0.13",
+      "version": "3.0.17",
      "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"
@@ -42,6 +40,7 @@
    "../../packages/crypto": {
      "name": "@notesnook/crypto",
      "version": "2.0.7",
+      "extraneous": true,
      "license": "GPL-3.0-or-later",
      "dependencies": {
        "@notesnook/sodium": "file:../sodium"
@@ -113,7 +112,6 @@
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.2.tgz",
      "integrity": "sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==",
-      "dev": true,
      "dependencies": {
        "debug": "^4.1.1",
        "env-paths": "^2.2.0",
@@ -134,7 +132,6 @@
      "version": "8.1.0",
      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-      "dev": true,
      "dependencies": {
        "graceful-fs": "^4.2.0",
        "jsonfile": "^4.0.0",
@@ -148,7 +145,6 @@
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
-      "dev": true,
      "optionalDependencies": {
        "graceful-fs": "^4.1.6"
      }
@@ -157,7 +153,6 @@
      "version": "6.3.0",
      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
      "bin": {
        "semver": "bin/semver.js"
      }
@@ -166,7 +161,6 @@
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true,
      "engines": {
        "node": ">= 4.0.0"
      }
@@ -820,10 +814,6 @@
        "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",
@@ -838,7 +828,6 @@
      "version": "4.6.0",
      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
-      "dev": true,
      "engines": {
        "node": ">=10"
      },
@@ -850,7 +839,6 @@
      "version": "4.0.6",
      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
-      "dev": true,
      "dependencies": {
        "defer-to-connect": "^2.0.0"
      },
@@ -895,7 +883,6 @@
      "version": "6.0.3",
      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
      "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
-      "dev": true,
      "dependencies": {
        "@types/http-cache-semantics": "*",
        "@types/keyv": "^3.1.4",
@@ -924,14 +911,12 @@
    "node_modules/@types/http-cache-semantics": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
-      "dev": true
+      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="
    },
    "node_modules/@types/keyv": {
      "version": "3.1.4",
      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
      "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
-      "dev": true,
      "dependencies": {
        "@types/node": "*"
      }
@@ -945,8 +930,7 @@
    "node_modules/@types/node": {
      "version": "18.16.1",
      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.1.tgz",
-      "integrity": "sha512-DZxSZWXxFfOlx7k7Rv4LAyiMroaxa3Ly/7OOzZO8cBNho0YzAi4qlbrx8W27JGqG57IgR/6J7r+nOJWw6kcvZA==",
-      "devOptional": true
+      "integrity": "sha512-DZxSZWXxFfOlx7k7Rv4LAyiMroaxa3Ly/7OOzZO8cBNho0YzAi4qlbrx8W27JGqG57IgR/6J7r+nOJWw6kcvZA=="
    },
    "node_modules/@types/plist": {
      "version": "3.0.2",
@@ -962,7 +946,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
-      "dev": true,
      "dependencies": {
        "@types/node": "*"
      }
@@ -992,7 +975,6 @@
      "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": "*"
@@ -1133,6 +1115,80 @@
        "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",
@@ -1272,7 +1328,6 @@
      "version": "3.2.0",
      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",
      "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",
-      "dev": true,
      "optional": true
    },
    "node_modules/brace-expansion": {
@@ -1323,7 +1378,6 @@
      "version": "0.2.13",
      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-      "dev": true,
      "engines": {
        "node": "*"
      }
@@ -1386,7 +1440,6 @@
      "version": "5.0.4",
      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
-      "dev": true,
      "engines": {
        "node": ">=10.6.0"
      }
@@ -1395,7 +1448,6 @@
      "version": "7.0.4",
      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz",
      "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==",
-      "dev": true,
      "dependencies": {
        "clone-response": "^1.0.2",
        "get-stream": "^5.1.0",
@@ -1515,7 +1567,6 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
-      "dev": true,
      "dependencies": {
        "mimic-response": "^1.0.0"
      },
@@ -1569,6 +1620,22 @@
        "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",
@@ -1636,7 +1703,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==",
-      "optional": true
+      "devOptional": true
    },
    "node_modules/crc": {
      "version": "3.8.0",
@@ -1647,6 +1714,33 @@
        "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",
@@ -1739,7 +1833,6 @@
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-      "dev": true,
      "engines": {
        "node": ">=10"
      }
@@ -1748,7 +1841,6 @@
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "has-property-descriptors": "^1.0.0",
@@ -1782,7 +1874,6 @@
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-      "dev": true,
      "optional": true
    },
    "node_modules/dir-compare": {
@@ -1899,7 +1990,6 @@
      "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",
@@ -1939,6 +2029,19 @@
        "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",
@@ -1986,7 +2089,6 @@
      "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"
      }
@@ -2008,7 +2110,6 @@
      "version": "2.2.1",
      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-      "dev": true,
      "engines": {
        "node": ">=6"
      }
@@ -2023,7 +2124,6 @@
      "version": "4.1.1",
      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-      "dev": true,
      "optional": true
    },
    "node_modules/esbuild": {
@@ -2077,7 +2177,6 @@
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
      "optional": true,
      "engines": {
        "node": ">=10"
@@ -2098,7 +2197,6 @@
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-      "dev": true,
      "dependencies": {
        "debug": "^4.1.1",
        "get-stream": "^5.1.0",
@@ -2139,7 +2237,6 @@
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-      "dev": true,
      "dependencies": {
        "pend": "~1.2.0"
      }
@@ -2294,7 +2391,6 @@
      "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": {
@@ -2309,7 +2405,6 @@
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "function-bind": "^1.1.1",
@@ -2325,7 +2420,6 @@
      "version": "5.2.0",
      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
      "dependencies": {
        "pump": "^3.0.0"
      },
@@ -2400,7 +2494,6 @@
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
      "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "boolean": "^3.0.1",
@@ -2418,7 +2511,6 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "define-properties": "^1.1.3"
@@ -2434,7 +2526,6 @@
      "version": "11.8.6",
      "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
      "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
-      "dev": true,
      "dependencies": {
        "@sindresorhus/is": "^4.0.0",
        "@szmarczak/http-timer": "^4.0.5",
@@ -2464,7 +2555,6 @@
      "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"
@@ -2486,7 +2576,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "get-intrinsic": "^1.1.1"
@@ -2499,7 +2588,6 @@
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-      "dev": true,
      "optional": true,
      "engines": {
        "node": ">= 0.4"
@@ -2512,7 +2600,6 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
      "optional": true,
      "engines": {
        "node": ">= 0.4"
@@ -2536,8 +2623,7 @@
    "node_modules/http-cache-semantics": {
      "version": "4.1.1",
      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
-      "dev": true
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="
    },
    "node_modules/http-proxy-agent": {
      "version": "5.0.0",
@@ -2557,7 +2643,6 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
-      "dev": true,
      "dependencies": {
        "quick-lru": "^5.1.1",
        "resolve-alpn": "^1.0.0"
@@ -2725,6 +2810,13 @@
        "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",
@@ -2820,8 +2912,7 @@
    "node_modules/json-buffer": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
    },
    "node_modules/json-schema-traverse": {
      "version": "0.4.1",
@@ -2833,7 +2924,6 @@
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
-      "dev": true,
      "optional": true
    },
    "node_modules/json5": {
@@ -2863,7 +2953,6 @@
      "version": "4.5.2",
      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz",
      "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==",
-      "dev": true,
      "dependencies": {
        "json-buffer": "3.0.1"
      }
@@ -2882,27 +2971,107 @@
      "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"
      }
@@ -2922,7 +3091,6 @@
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
      "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "escape-string-regexp": "^4.0.0"
@@ -2968,7 +3136,6 @@
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "dev": true,
      "engines": {
        "node": ">=4"
      }
@@ -3075,6 +3242,7 @@
      "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",
@@ -3094,7 +3262,6 @@
      "version": "6.1.0",
      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-      "dev": true,
      "engines": {
        "node": ">=10"
      },
@@ -3118,7 +3285,6 @@
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
      "optional": true,
      "engines": {
        "node": ">= 0.4"
@@ -3136,7 +3302,6 @@
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
-      "dev": true,
      "engines": {
        "node": ">=8"
      }
@@ -3214,8 +3379,7 @@
    "node_modules/pend": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-      "dev": true
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
    },
    "node_modules/picomatch": {
      "version": "2.3.1",
@@ -3293,11 +3457,17 @@
        "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"
      }
@@ -3337,7 +3507,6 @@
      "version": "5.1.1",
      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-      "dev": true,
      "engines": {
        "node": ">=10"
      },
@@ -3404,6 +3573,16 @@
        "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",
@@ -3427,14 +3606,12 @@
    "node_modules/resolve-alpn": {
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
-      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
-      "dev": true
+      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="
    },
    "node_modules/responselike": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
-      "dev": true,
      "dependencies": {
        "lowercase-keys": "^2.0.0"
      },
@@ -3455,7 +3632,6 @@
      "version": "2.15.4",
      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
      "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "boolean": "^3.0.1",
@@ -3535,14 +3711,12 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
      "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
-      "dev": true,
      "optional": true
    },
    "node_modules/serialize-error": {
      "version": "7.0.1",
      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
      "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
-      "dev": true,
      "optional": true,
      "dependencies": {
        "type-fest": "^0.13.1"
@@ -3558,7 +3732,6 @@
      "version": "0.13.1",
      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
-      "dev": true,
      "optional": true,
      "engines": {
        "node": ">=10"
@@ -3667,15 +3840,6 @@
        "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",
@@ -3699,7 +3863,6 @@
      "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": {
@@ -3799,7 +3962,6 @@
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
      "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==",
-      "dev": true,
      "dependencies": {
        "debug": "^4.1.0"
      },
@@ -4001,8 +4163,7 @@
    "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==",
-      "dev": true
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
    },
    "node_modules/universalify": {
      "version": "2.0.0",
@@ -4151,12 +4312,48 @@
      "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.13",
+  "version": "3.0.17",
  "appAppleId": "1544027013",
  "private": true,
  "main": "./dist/index.js",
@@ -11,14 +11,12 @@
  "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,19 +29,37 @@ 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;
-    cancellationToken = new CancellationToken();
-    await autoUpdater
-      .downloadUpdate(cancellationToken)
-      .finally(() => (cancellationToken = undefined));
+    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);
+    });
  }),
  check: t.procedure.query(async () => {
-    await autoUpdater.checkForUpdates().catch(console.error);
+    if (cancellationToken) return;
+    clearTimeout(downloadTimeout);
+    await new Promise<void>((resolve) => {
+      downloadTimeout = setTimeout(async () => {
+        await autoUpdater
+          .checkForUpdates()
+          .catch(console.error)
+          .finally(resolve);
+      }, 1000);
+    });
  }),

  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
@@ -1,156 +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 { 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,29 +28,7 @@ import filesystem from "../filesystem";
 import Storage from "./storage";
 import { RNSqliteDriver } from "./sqlite.kysely";
 import { getDatabaseKey } from "./encryption";
-
-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"
-      }
-);
+import SettingsService from "../../services/settings";

 export async function setupDatabase(password) {
  const key = await getDatabaseKey(password);
@@ -59,6 +37,15 @@ 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,
-  decryptMulti,
-  encryptMulti
+  removeCryptoKey
 } from "./encryption";
 import { MMKV } from "./mmkv";

--- a/apps/mobile/app/common/filesystem/compress.js
+++ b/apps/mobile/app/common/filesystem/compress.js
@@ -20,7 +20,6 @@ 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,24 +18,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 import Sodium from "@ammarahmed/react-native-sodium";
-import {
-  getFileNameWithExtension,
-  isImage,
-  isDocument
-} from "@notesnook/core/dist/utils/filename";
+import { getFileNameWithExtension } 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 { cacheDir, copyFileAsync, releasePermissions } from "./utils";
 import { createCacheDir, exists } from "./io";
-import { IOS_APPGROUPID } from "../../utils/constants";
+import { cacheDir, copyFileAsync, releasePermissions } from "./utils";

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

    return fileUri;
  } catch (e) {
-    DatabaseLogger.error(e);
    if (attachment.dateUploaded) {
      RNFetchBlob.fs
        .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.hash}`)
@@ -296,6 +286,7 @@ 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,31 +17,54 @@ 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, data, cancelToken) {
-  if (!data) {
-    DatabaseLogger.log(`Error downloading file: ${filename}, reason: No data`);
+export async function downloadFile(filename, requestOptions, cancelToken) {
+  if (!requestOptions) {
+    DatabaseLogger.log(
+      `Error downloading file: ${filename}, reason: No requestOptions`
+    );
    return false;
  }

  DatabaseLogger.log(`Downloading ${filename}`);
  await createCacheDir();
-  let { url, headers } = data;
-  let path = `${cacheDir}/${filename}`;
-
+  let { url, headers, chunkSize } = requestOptions;
+  let tempFilePath = `${cacheDir}/${filename}_temp`;
+  let originalFilePath = `${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",
@@ -63,34 +86,51 @@ export async function downloadFile(filename, data, cancelToken) {
      );
      throw new Error("Unable to resolve download url");
    }
-    let totalSize = 0;
+
    DatabaseLogger.log(`Download starting: ${filename}`);
    let request = RNFetchBlob.config({
-      path: path,
+      path: tempFilePath,
      IOSBackgroundTask: true
    })
      .fetch("GET", downloadUrl, null)
-      .progress((recieved, total) => {
+      .progress(async (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;
-    await fileCheck(response, totalSize);
+    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}`);
+    }
+
    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") {
+    if (e.message !== "canceled" && !e.message.includes("NoSuchKey")) {
      ToastManager.show({
        heading: "Error downloading file",
        message: e.message,
@@ -106,7 +146,8 @@ export async function downloadFile(filename, data, cancelToken) {
    }

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

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

 export default {
  readEncrypted,
@@ -39,5 +44,10 @@ export default {
  exists,
  clearFileStorage,
  getUploadedFileSize,
-  checkAttachment
+  checkAttachment,
+  clearCache,
+  deleteCacheFileByName,
+  deleteCacheFileByPath,
+  bulkExists,
+  getCacheSize
 };
--- a/apps/mobile/app/common/filesystem/io.js
+++ b/apps/mobile/app/common/filesystem/io.js
@@ -20,9 +20,10 @@ 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 { cacheDir, cacheDirOld, getRandomId } from "./utils";
+import { ABYTES, cacheDir, cacheDirOld, getRandomId } from "./utils";

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

-const ABYTES = 17;
+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);
+    }
+  }
+}
+
 export async function exists(filename) {
  let path = `${cacheDir}/${filename}`;

@@ -200,3 +229,29 @@ 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,32 +17,30 @@ 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 RNFetchBlob from "react-native-blob-util";
-import { useAttachmentStore } from "../../stores/use-attachment-store";
-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 { getUploadedFileSize } from "./download";
+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 { createCacheDir } from "./io";
+import { cacheDir, getUploadedFileSize } from "./utils";

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

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

-    const isUploaded = uploadedFileSize !== 0;
-    if (isUploaded) {
+    if (uploadedFileSize !== 0) {
      DatabaseLogger.log(`File ${filename} is already uploaded.`);
      return true;
    }
@@ -117,9 +115,6 @@ export async function uploadFile(filename, data, 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,10 +17,13 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-import * 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 =
@@ -34,24 +37,36 @@ export function getRandomId(prefix) {
    .replace("0.", prefix || "");
 }

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

-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}`);
+  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;
    }
+    return error;
+  } catch (e) {
+    return error;
  }
 }

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

      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,6 +35,7 @@ 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();
@@ -77,6 +78,7 @@ 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();
-                  }, 1);
+                  }, 500);
                  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,6 +23,7 @@ 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";
@@ -35,8 +36,7 @@ import { Expiring } from "../premium/expiring";
 import SheetProvider from "../sheet-provider";
 import RateAppSheet from "../sheets/rate-app";
 import RecoveryKeySheet from "../sheets/recovery-key";
-import RestoreDataSheet from "../sheets/restore-data";
-import { AppLockPassword } from "../dialogs/applock-password";
+import Progress from "../dialogs/progress";

 const DialogProvider = () => {
  const { colors } = useThemeColors();
@@ -52,7 +52,6 @@ const DialogProvider = () => {
      <RecoveryKeySheet colors={colors} />
      <SheetProvider />
      <SheetProvider context="sync_progress" />
-      <RestoreDataSheet />
      <ResultDialog />
      <VaultDialog colors={colors} />
      <RateAppSheet />
@@ -62,6 +61,7 @@ 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,21 +32,29 @@ const DialogContainer = ({
 }: ViewProps & {
  width?: any;
  height?: any;
+  noBorder?: boolean;
 }) => {
  const { colors } = useThemeColors();

  return (
    <View
      {...restProps}
-      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)
-      }}
+      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)
+            }
+      ]}
    />
  );
 };
--- 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?: (value: any) => void;
+  positivePress?: (...args: any[]) => void;
  onClose?: () => void;
  positiveType?:
    | "transparent"
@@ -45,6 +45,15 @@ 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,6 +37,7 @@ 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();
@@ -62,7 +63,8 @@ export const Dialog = ({ context = "global" }) => {
    disableBackdropClosing: false,
    check: {
      info: "Check",
-      type: "transparent"
+      type: "transparent",
+      defaultValue: false
    }
  });

@@ -86,7 +88,7 @@ export const Dialog = ({ context = "global" }) => {
      if (!data.context) data.context = "global";
      if (data.context !== context) return;
      setDialogInfo(data);
-      setChecked(false);
+      setChecked(data.check?.defaultValue);
      values.current.inputValue = data.defaultValue;
      setVisible(true);
    },
@@ -180,6 +182,19 @@ 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
@@ -198,7 +213,7 @@ export const Dialog = ({ context = "global" }) => {
              iconSize={20}
              width="100%"
              title={dialogInfo.check.info}
-              type={checked ? dialogInfo.check.type || "selected" : "plain"}
+              type={checked ? dialogInfo.check.type || "plain" : "plain"}
            />
          </>
        ) : null}
--- a/apps/mobile/app/components/dialogs/pdf-preview/index.js
+++ b/apps/mobile/app/components/dialogs/pdf-preview/index.js
@@ -44,6 +44,7 @@ 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;
@@ -124,6 +125,7 @@ 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
@@ -0,0 +1,198 @@
+/*
+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,9 +43,6 @@ 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();
@@ -217,44 +214,6 @@ 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, "Backup failed");
+        ToastManager.error(error as Error, "Backup failed");
        if (report) {
-          reportError(error);
+          reportError(error as Error);
        }
        setLoading(false);
        return;
--- a/apps/mobile/app/components/sheets/restore-data/index.js
+++ b/apps/mobile/app/components/sheets/restore-data/index.js
@@ -1,600 +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 { 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}
+      disabled={loading || restProps.disabled}
      type={type}
      accentColor={accentColor}
      accentText={accentText}
@@ -132,6 +132,7 @@ 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,6 +41,7 @@ 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>;
@@ -49,7 +50,8 @@ interface InputProps extends TextInputProps {
    | "email"
    | "confirmPassword"
    | "username"
-    | "phonenumber";
+    | "phonenumber"
+    | "url";
  loading?: boolean;
  onSubmit?: (
    event: NativeSyntheticEvent<TextInputSubmitEditingEventData>
@@ -151,6 +153,9 @@ 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,10 +26,7 @@ import {
 } from "@notesnook/core/dist/common";
 import { EventManagerSubscription } from "@notesnook/core/dist/utils/event-manager";
 import notifee from "@notifee/react-native";
-import NetInfo, {
-  NetInfoState,
-  NetInfoSubscription
-} from "@react-native-community/netinfo";
+import NetInfo, { NetInfoSubscription } from "@react-native-community/netinfo";
 import React, { useCallback, useEffect, useRef } from "react";
 import {
  AppState,
@@ -47,6 +44,7 @@ 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";
@@ -97,7 +95,6 @@ import {
 import { getGithubVersion } from "../utils/github-version";
 import { tabBarRef } from "../utils/global-refs";
 import { sleep } from "../utils/time";
-import { initializeLogger } from "../common/database/logger";

 const onCheckSyncStatus = async (type: SyncStatusEvent) => {
  const { disableSync, disableAutoSync } = SettingsService.get();
@@ -362,6 +359,7 @@ 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");
@@ -391,18 +389,15 @@ 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;
    }>
  >({});

@@ -465,14 +460,31 @@ export const useAppEvents = () => {
    const user = await db.user.getUser();
    if (PremiumService.get() && user) {
      if (
-        await BackupService.checkBackupRequired(SettingsService.get().reminder)
+        SettingsService.get().backupDirectoryAndroid ||
+        Platform.OS !== "android"
      ) {
-        if (
-          !SettingsService.get().backupDirectoryAndroid &&
-          Platform.OS === "android"
-        )
-          return;
-        sleep(2000).then(() => BackupService.run());
+        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);
      }
    }
  }, []);
@@ -533,7 +545,6 @@ export const useAppEvents = () => {
        setRecoveryKeyMessage();
      }
      if (!user?.isEmailConfirmed) setEmailVerifyMessage();
-      refValues.current.isUserReady = true;

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

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

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

-  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;
+  async function reconnectSSE() {
    try {
-      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;
+      if (refValues.current?.isConnectingSSE) return;
+      refValues.current.isConnectingSSE = true;
+      await db.connectSSE();
+      refValues.current.isConnectingSSE = false;
    } catch (e) {
-      refValues.current.isReconnecting = false;
+      refValues.current.isConnectingSSE = false;
+      DatabaseLogger.error(e as Error);
    }
  }

--- a/apps/mobile/app/screens/editor/tiptap/picker.ts
+++ b/apps/mobile/app/screens/editor/tiptap/picker.ts
@@ -19,6 +19,7 @@ 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, {
@@ -41,7 +42,6 @@ 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
      ))
-    )
-      return;
+    ) {
+      throw new Error("Failed to attach file");
+    }
    if (Platform.OS === "ios") await RNFetchBlob.fs.unlink(uri);

-    if (!fileOptions.tabId) return;
    if (
-      fileOptions.tabId &&
+      fileOptions.tabId !== undefined &&
      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");
    }

-    setTimeout(() => {
-      eSendEvent(eCloseSheet);
-    }, 1000);
+    eSendEvent(eCloseSheet);
  } catch (e) {
    eSendEvent(eCloseSheet);
    ToastManager.show({
-      heading: (e as Error).message,
-      message: "You need internet access to attach a file",
+      heading: "Failed to attach file",
+      message: (e as Error).message,
      type: "error",
      context: "global"
    });
@@ -203,7 +203,6 @@ 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 = await db.vaults.itemExists(
-            currentNotes.current[noteId] as ItemReference
-          );
+          const locked = note
+            ? await db.vaults.itemExists(note as ItemReference)
+            : false;

          if (note) {
            if (!locked && tab?.noteLocked) {
--- a/apps/mobile/app/screens/settings/components.tsx
+++ b/apps/mobile/app/screens/settings/components.tsx
@@ -32,9 +32,12 @@ import {
  TimeFormatPicker,
  TrashIntervalPicker,
  BackupReminderPicker,
-  ApplockTimerPicker
+  ApplockTimerPicker,
+  BackupWithAttachmentsReminderPicker
 } 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 />,
@@ -51,5 +54,8 @@ export const components: { [name: string]: ReactElement } = {
  "date-format-selector": <DateFormatPicker />,
  "time-format-selector": <TimeFormatPicker />,
  "theme-selector": <ThemeSelector />,
-  "applock-timer": <ApplockTimerPicker />
+  "applock-timer": <ApplockTimerPicker />,
+  autobackupsattachments: <BackupWithAttachmentsReminderPicker />,
+  backuprestore: <RestoreBackup />,
+  "server-config": <ServersConfiguration />
 };
--- a/apps/mobile/app/screens/settings/home.tsx
+++ b/apps/mobile/app/screens/settings/home.tsx
@@ -18,35 +18,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 import { NativeStackScreenProps } from "@react-navigation/native-stack";
-import React, { useEffect, useState } from "react";
+import React from "react";
 import { View } from "react-native";
 import Animated, { FadeInDown } from "react-native-reanimated";
 import DelayLayout from "../../components/delay-layout";
-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 { Header } from "../../components/header";
 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");
@@ -62,16 +49,6 @@ const Home = ({
      <SectionGroup item={item} />
    );

-  useEffect(() => {
-    function settingsLoading(state: boolean) {
-      setLoading(state || true);
-    }
-    eSubscribeEvent("settings-loading", settingsLoading);
-    return () => {
-      eUnSubscribeEvent("settings-loading", settingsLoading);
-    };
-  }, []);
-
  return (
    <>
      <Header
@@ -81,57 +58,6 @@ 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"
-      ? "Never"
+    return item === "useroff" || item === "off" || item === "never"
+      ? "Off"
      : item.slice(0, 1).toUpperCase() + item.slice(1);
  },
  getItemKey: (item) => item,
@@ -140,6 +140,31 @@ 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
@@ -0,0 +1,558 @@
+/*
+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
@@ -0,0 +1,213 @@
+/*
+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,6 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+import { formatBytes } from "@notesnook/common";
 import notifee from "@notifee/react-native";
 import dayjs from "dayjs";
 import React from "react";
@@ -24,12 +25,19 @@ 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 { db } from "../../common/database";
+import ScreenGuardModule from "react-native-screenguard";
+import { DatabaseLogger, 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";
@@ -42,6 +50,7 @@ import BiometricService from "../../services/biometrics";
 import {
  ToastManager,
  eSendEvent,
+  eSubscribeEvent,
  openVault,
  presentSheet
 } from "../../services/event-manager";
@@ -60,8 +69,7 @@ import {
  eCloseSheet,
  eCloseSimpleDialog,
  eOpenLoginDialog,
-  eOpenRecoveryKeyDialog,
-  eOpenRestoreDialog
+  eOpenRecoveryKeyDialog
 } from "../../utils/events";
 import { NotesnookModule } from "../../utils/notesnook-module";
 import { sleep } from "../../utils/time";
@@ -70,7 +78,6 @@ 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;

@@ -331,45 +338,144 @@ 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: "Log out",
+            name: "Logout",
            description:
-              "Logging out will clear all data stored on THIS DEVICE.",
+              "Logging out will clear all data stored on this device.",
            icon: "logout",
-            modifer: () => {
+            modifer: async () => {
+              const hasUnsyncedChanges = await db.hasUnsyncedChanges();
              presentDialog({
                title: "Logout",
                paragraph:
-                  "Logging out will clear all data stored on THIS DEVICE. Make sure you have synced all your changes before logging out.",
+                  "Are you sure you want to logout and clear all data stored on this device?",
                positiveText: "Logout",
-                positivePress: async () => {
-                  try {
-                    eSendEvent(eCloseSimpleDialog);
-                    setTimeout(async () => {
-                      eSendEvent("settings-loading", true);
-                      Navigation.popToTop();
+                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"
+                      });
+
                      await db.user?.logout();
                      setLoginMessage();
                      await PremiumService.setPremiumStatus();
                      await BiometricService.resetCredentials();
                      MMKV.clearStore();
                      clearAllStores();
-                      refreshAllStores();
+                      setImmediate(() => {
+                        refreshAllStores();
+                      });
                      Navigation.queueRoutesForUpdate();
                      SettingsService.resetSettings();
                      useUserStore.getState().setUser(null);
                      useUserStore.getState().setSyncing(false);
-                      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);
-                  }
+                      endProgress();
+                    } catch (e) {
+                      DatabaseLogger.error(e);
+                      ToastManager.error(e as Error, "Error logging out");
+                      endProgress();
+                    }
+                  }, 300);
                }
              });
            }
@@ -395,12 +501,18 @@ export const settingsGroups: SettingSection[] = [
                  try {
                    const verified = await db.user?.verifyPassword(value);
                    if (verified) {
-                      eSendEvent("settings-loading", true);
-                      await db.user?.deleteUser(value);
-                      await BiometricService.resetCredentials();
-                      SettingsService.set({
-                        introCompleted: true
-                      });
+                      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);
                    } else {
                      ToastManager.show({
                        heading: "Incorrect password",
@@ -411,9 +523,9 @@ export const settingsGroups: SettingSection[] = [
                      });
                    }

-                    eSendEvent("settings-loading", false);
+                    endProgress();
                  } catch (e) {
-                    eSendEvent("settings-loading", false);
+                    endProgress();
                    console.log(e);
                    ToastManager.error(
                      e as Error,
@@ -434,6 +546,25 @@ 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",
@@ -689,6 +820,14 @@ export const settingsGroups: SettingSection[] = [
            type: "switch"
          }
        ]
+      },
+      {
+        id: "servers",
+        type: "screen",
+        name: "Servers",
+        description: "Configure server URLs for Notesnook",
+        icon: "server",
+        component: "server-config"
      }
    ]
  },
@@ -696,15 +835,6 @@ 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",
@@ -1041,7 +1171,8 @@ export const settingsGroups: SettingSection[] = [
          {
            id: "backup-now",
            name: "Backup now",
-            description: "Create a backup of your data",
+            description:
+              "Take a partial backup of your data that does not include attachments",
            modifer: async () => {
              const user = useUserStore.getState().user;
              if (!user || SettingsService.getProperty("encryptedBackup")) {
@@ -1052,14 +1183,41 @@ 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:
-              "Backup your data once every week or daily automatically.",
+              "Set the interval to create a partial backup (without attachments) 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",
@@ -1151,9 +1309,8 @@ export const settingsGroups: SettingSection[] = [
        id: "restore-backup",
        name: "Restore backup",
        description: "Restore backup from phone storage.",
-        modifer: () => {
-          eSendEvent(eOpenRestoreDialog);
-        }
+        type: "screen",
+        component: "backuprestore"
      },
      {
        id: "export-notes",
@@ -1333,9 +1490,9 @@ export const settingsGroups: SettingSection[] = [
        }
      },
      {
-        id: "join-mastodom",
+        id: "join-mastodon",
        name: "Follow us on Mastodon",
-        description: "We are on mastodom",
+        description: "We are on mastodon",
        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,14 +16,15 @@ 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 BackgroundFetch from "@ammarahmed/react-native-background-fetch";
+import { AppRegistry, AppState, 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 { AppState, AppRegistry } from "react-native";
+import { deleteDCacheFiles } from "../common/filesystem/io";
+import { useUserStore } from "../stores/use-user-store";
 import Notifications from "./notifications";
 import SettingsService from "./settings";

@@ -114,15 +115,19 @@ async function onBackgroundSyncStarted() {
      await db.init();
    }
    const user = await db.user?.getUser();
-    if (user) {
+    if (user && !useUserStore.getState().syncing) {
+      useUserStore.getState().setSyncing(true);
      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);
  }
@@ -132,11 +137,13 @@ 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.ts
+++ b/apps/mobile/app/services/backup.ts
@@ -17,6 +17,8 @@ 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";
@@ -25,8 +27,14 @@ 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";
@@ -37,14 +45,14 @@ const MS_WEEK = MS_DAY * 7;
 const MONTH = MS_DAY * 30;

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

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

-async function updateNextBackupTime() {
+async function updateNextBackupTime(type: "full" | "partial") {
  SettingsService.set({
    nextBackupRequestTime: Date.now() + 86400000 * 3,
-    lastBackupDate: Date.now()
+    [type === "full" ? "lastFullBackupDate" : "lastBackupDate"]: Date.now()
  });
 }
 /**
@@ -153,77 +161,124 @@ async function updateNextBackupTime() {
 * @param {string=} context
 * @returns {Promise<{path?: string, error?: Error, report?: boolean}}>
 */
-async function run(progress = false, context) {
-  let androidBackupDirectory = await checkBackupDirExists(false, context);
+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;
+
  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) {
-    presentSheet({
-      title: "Backing up your data",
-      paragraph:
-        "All your backups are stored in 'Phone Storage/Notesnook/backups/' folder",
-      progress: true
+    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
    });
  }

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

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

+  const attachmentsDir = zipSourceFolder + "/attachments";
+  if (backupType === "full") {
+    await RNFetchBlob.fs.mkdir(attachmentsDir);
+  }
+
  try {
    const user = await db.user.getUser();
-    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"
-      );
+    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}`
+          );
+        }
+      }
    }

+    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("Copyied zip file...");
+
+      console.log("Copied zip file...");
      path = file.uri;
    } else {
      path = zipOutputFile;
    }
-    RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
-    updateNextBackupTime();

-    let showBackupCompleteSheet =
+    RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
+    if (Platform.OS === "android") {
+      RNFetchBlob.fs.unlink(zipOutputFile).catch(console.log);
+    }
+
+    updateNextBackupTime(backupType || "partial");
+
+    if (progress) {
+      endProgress();
+    }
+
+    const canShowCompletionStatus =
      progress && SettingsService.get().showBackupCompleteSheet;

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

    await sleep(300);

-    if (showBackupCompleteSheet) {
+    if (canShowCompletionStatus) {
      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"
    });
@@ -251,16 +303,26 @@ async function run(progress = false, context) {
      path: path
    };
  } catch (e) {
-    ToastManager.error(e, "Backup failed", context || "global");
+    ToastManager.error(e as Error, "Backup failed", context || "global");

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

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

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

 const checkAndRun = async () => {
-  let settings = SettingsService.get();
-  if (await checkBackupRequired(settings.reminder)) {
+  const settings = SettingsService.get();
+  if (await checkBackupRequired(settings?.reminder)) {
    try {
      await run();
    } catch (e) {
--- a/apps/mobile/app/services/exporter.ts
+++ b/apps/mobile/app/services/exporter.ts
@@ -111,52 +111,6 @@ async function resolveFileFunctions(
  };
 }

-async function createZip(
-  totalNotes: number,
-  cacheFolder: string,
-  type: "txt" | "pdf" | "md" | "html" | "md-frontmatter",
-  path: string,
-  callback: (progress?: string) => void
-) {
-  const fileName = `nn-export-${totalNotes}-${type}-${Date.now()}.zip`;
-  const dir = path;
-  try {
-    callback("Creating zip");
-    const zipOutputPath =
-      Platform.OS === "ios"
-        ? join(path, fileName)
-        : join(RNFetchBlob.fs.dirs.CacheDir, fileName);
-    await zip(cacheFolder, zipOutputPath);
-
-    callback("Saving zip file");
-    if (Platform.OS === "android") {
-      const file = await ScopedStorage.createFile(
-        path,
-        fileName,
-        "application/zip"
-      );
-      path = file.uri;
-      await copyFileAsync("file://" + zipOutputPath, path);
-      await RNFetchBlob.fs.unlink(zipOutputPath);
-      callback();
-    } else {
-      path = zipOutputPath;
-    }
-    RNFetchBlob.fs.unlink(cacheFolder);
-  } catch (e) {
-    DatabaseLogger.error(e as Error);
-  }
-
-  return {
-    filePath: path,
-    fileDir: dir,
-    type: "application/zip",
-    name: "zip",
-    fileName: fileName,
-    count: totalNotes
-  };
-}
-
 async function exportNoteToFile(
  item: ExportableNote,
  type: "txt" | "pdf" | "md" | "html" | "md-frontmatter",
@@ -269,6 +223,8 @@ async function exportNote(
  const { mkdir, writeFile, cacheFolder } = fileFuncions;

  let currentAttachmentProgress = 0;
+  let hasAttachments = false;
+  let noteItem;
  for await (const item of _exportNote(note, {
    format: type,
    unlockVault: unlockVaultForNoteExport as () => Promise<boolean>
@@ -281,6 +237,7 @@ async function exportNote(
    if (item.type === "note") {
      callback(`Exporting note`);
      try {
+        noteItem = item;
        await exportNoteToFile(item, type, mkdir, writeFile);
      } catch (e) {
        console.log("exportNoteToFile", item.type, e);
@@ -289,6 +246,7 @@ async function exportNote(
      currentAttachmentProgress += 1;
      callback(`Downloading attachments (${currentAttachmentProgress})`);
      try {
+        hasAttachments = true;
        await exportAttachmentToFile(item, mkdir, cacheFolder);
      } catch (e) {
        console.log("exportAttachmentToFile", item.path, e);
@@ -296,9 +254,90 @@ async function exportNote(
    }
  }

-  return createZip(1, cacheFolder, type, path, callback);
+  if (!hasAttachments) {
+    return createFile(noteItem as ExportableNote, type, path, cacheFolder);
+  } else {
+    return createZip(1, cacheFolder, type, path, callback);
+  }
 }

+async function createZip(
+  totalNotes: number,
+  cacheFolder: string,
+  type: "txt" | "pdf" | "md" | "html" | "md-frontmatter",
+  path: string,
+  callback: (progress?: string) => void
+) {
+  const fileName = `nn-export-${totalNotes}-${type}-${Date.now()}.zip`;
+  const dir = path;
+  try {
+    callback("Creating zip");
+    const zipOutputPath =
+      Platform.OS === "ios"
+        ? join(path, fileName)
+        : join(RNFetchBlob.fs.dirs.CacheDir, fileName);
+    await zip(cacheFolder, zipOutputPath);
+
+    callback("Saving zip file");
+    if (Platform.OS === "android") {
+      const file = await ScopedStorage.createFile(
+        path,
+        fileName,
+        "application/zip"
+      );
+      path = file.uri;
+      await copyFileAsync("file://" + zipOutputPath, path);
+      await RNFetchBlob.fs.unlink(zipOutputPath);
+      callback();
+    } else {
+      path = zipOutputPath;
+    }
+    RNFetchBlob.fs.unlink(cacheFolder);
+  } catch (e) {
+    DatabaseLogger.error(e as Error);
+  }
+
+  return {
+    filePath: path,
+    fileDir: dir,
+    type: "application/zip",
+    name: "zip",
+    fileName: fileName,
+    count: totalNotes
+  };
+}
+
+async function createFile(
+  noteItem: ExportableNote,
+  type: keyof typeof FileMime,
+  path: string,
+  cacheFolder: string
+) {
+  const file = await ScopedStorage.createFile(
+    path,
+    basename(noteItem?.path as string),
+    FileMime[type]
+  );
+  const exportedFile = join(cacheFolder, noteItem?.path as string);
+  await copyFileAsync("file://" + exportedFile, file.uri);
+  return {
+    filePath: file.uri,
+    fileDir: path,
+    type: FileMime[type],
+    name: type,
+    fileName: basename(noteItem?.path as string),
+    count: 1
+  };
+}
+
+const FileMime = {
+  pdf: "application/pdf",
+  txt: "text/plain",
+  md: "text/markdown",
+  html: "text/html",
+  "md-frontmatter": "text/markdown"
+};
+
 const Exporter = {
  exportNote,
  bulkExport
--- a/apps/mobile/app/services/settings.ts
+++ b/apps/mobile/app/services/settings.ts
@@ -30,6 +30,7 @@ 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") {
@@ -40,10 +41,15 @@ function reset() {
 }

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

--- a/apps/mobile/app/services/sync.ts
+++ b/apps/mobile/app/services/sync.ts
@@ -30,7 +30,9 @@ export const ignoredMessages = [
  "Sync already running",
  "Not allowed to start service intent",
  "WebSocket failed to connect",
-  "Failed to start the HttpConnection before"
+  "Failed to start the HttpConnection before",
+  "Could not connect to the Sync server",
+  "Network request failed"
 ];
 let pendingSync: any = undefined;
 let syncTimer: NodeJS.Timeout;
@@ -61,58 +63,45 @@ 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 ||
-      !status.isInternetReachable ||
-      SettingsService.get().disableSync
-    ) {
+    if (!user || SettingsService.get().disableSync) {
+      userstore.setSyncing(false);
      initAfterSync();
      pendingSync = undefined;
      return onCompleted?.(SyncStatus.Failed);
    }
-    userstore.setSyncing(true);

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

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

-      if (error) {
-        throw error;
-      }
+      if (error) throw error;
    } catch (e) {
-      error = e;
+      error = e as Error;
+      DatabaseLogger.error(error, "[Client] Failed to sync");
      if (
-        !ignoredMessages.find((message) =>
-          (e as Error).message?.includes(message)
-        ) &&
-        userstore.user &&
-        status.isConnected &&
-        status.isInternetReachable
+        !ignoredMessages.find((message) => error?.message?.includes(message)) &&
+        userstore.user
      ) {
-        userstore.setSyncing(false, SyncStatus.Failed);
+        const status = await NetInfo.fetch();
        if (status.isConnected && status.isInternetReachable) {
          ToastManager.error(e as Error, "Sync failed", context);
        }
      }
-
-      DatabaseLogger.error(e, "[Client] Failed to sync");
    } finally {
      initAfterSync();
      userstore.setSyncing(
@@ -120,16 +109,14 @@ const run = async (
        error ? SyncStatus.Failed : SyncStatus.Passed
      );
      onCompleted?.(error ? SyncStatus.Failed : SyncStatus.Passed);
-      setImmediate(() => {
-        if (pendingSync)
-          Sync.run(
-            pendingSync.context,
-            pendingSync.forced,
-            pendingSync.type,
-            pendingSync.onCompleted,
-            pendingSync.lastSyncTime
-          );
-      });
+      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,6 +25,8 @@ 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;
@@ -32,7 +34,8 @@ export type Settings = {
  fontScale?: number;
  forcePortraitOnTablet?: boolean;
  useSystemTheme?: boolean;
-  reminder?: string;
+  reminder: "daily" | "off" | "useroff" | "weekly" | "monthly";
+  fullBackupReminder: "never" | "weekly" | "monthly";
  encryptedBackup?: boolean;
  homepage?: string;
  sort?: string;
@@ -42,7 +45,6 @@ export type Settings = {
  appLockTimer: number;
  appLockEnabled?: boolean;
  appLockMode?: "none" | "background" | "launch";
-  telemetry?: boolean;
  notebooksListMode?: "normal" | "compact";
  notesListMode?: "normal" | "compact";
  devMode?: boolean;
@@ -52,8 +54,8 @@ export type Settings = {
  rateApp?: boolean | number;
  migrated?: boolean;
  introCompleted?: boolean;
-  nextBackupRequestTime?: number | undefined;
-  lastBackupDate?: number | undefined;
+  nextBackupRequestTime?: number;
+  lastBackupDate?: number;
  userEmailConfirmed?: boolean;
  recoveryKeySaved?: boolean;
  backupDirectoryAndroid?: FileType | null;
@@ -82,6 +84,10 @@ export type Settings = {
  backgroundSync?: boolean;
  applockKeyboardType: "numeric" | "default";
  settingsVersion?: number;
+  backupType: "full" | "partial";
+  offlineMode?: boolean;
+  lastFullBackupDate?: number;
+  serverUrls?: Record<HostId, string>;
 };

 type DimensionsType = {
@@ -127,6 +133,12 @@ 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,
@@ -139,7 +151,6 @@ export const defaultSettings: SettingStore["settings"] = {
  screenshotMode: true,
  privacyScreen: false,
  appLockMode: "none",
-  telemetry: false,
  notebooksListMode: "normal",
  notesListMode: "normal",
  devMode: false,
@@ -150,7 +161,7 @@ export const defaultSettings: SettingStore["settings"] = {
  migrated: false,
  introCompleted: Config.isTesting ? true : false,
  nextBackupRequestTime: undefined,
-  lastBackupDate: undefined,
+  lastBackupDate: 0,
  userEmailConfirmed: false,
  recoveryKeySaved: false,
  showBackupCompleteSheet: true,
@@ -171,7 +182,10 @@ export const defaultSettings: SettingStore["settings"] = {
  biometricsAuthEnabled: false,
  appLockHasPasswordSecurity: false,
  backgroundSync: true,
-  settingsVersion: 0
+  settingsVersion: 0,
+  backupType: "partial",
+  fullBackupReminder: "never",
+  lastFullBackupDate: 0
 };

 export const useSettingStore = create<SettingStore>((set, get) => ({
--- a/apps/mobile/native/android/app/build.gradle
+++ b/apps/mobile/native/android/app/build.gradle
@@ -49,7 +49,6 @@ 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:
@@ -117,7 +116,7 @@ android {
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
        multiDexEnabled true
-        versionCode 3024
+        versionCode 3027
        versionName getNpmVersion()
        testBuildType System.getProperty('testBuildType', 'debug')
        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -169,8 +168,12 @@ 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,6 +3,7 @@ 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;
@@ -19,8 +20,12 @@ public class BootRecieverService extends BroadcastReceiver {
             network connections
             **/
            Intent serviceIntent = new Intent(context, BootTaskService.class);
-            context.startService(serviceIntent);
-            HeadlessJsTaskService.acquireWakeLockNow(context);
+              if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                  context.startForegroundService(serviceIntent);
+              } else {
+                  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,15 +1,24 @@
 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(),
@@ -17,4 +26,31 @@ 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,5 +1,7 @@
 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;
@@ -9,11 +11,24 @@ 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);
-        startActivityAndCollapse(intent);
+        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);
+        }
    }
 }
--- a/apps/mobile/native/android/releasenotes/whatsnew-en-US
+++ b/apps/mobile/native/android/releasenotes/whatsnew-en-US
@@ -1,3 +1,6 @@
- Bug fixes and performance improvements
+- 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

 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,6 +11,10 @@ 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",
@@ -19,8 +23,7 @@ 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 = 2111;
+				CURRENT_PROJECT_VERSION = 2114;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1135,7 +1135,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.14;
+				MARKETING_VERSION = 3.0.17;
 				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 = 2111;
+				CURRENT_PROJECT_VERSION = 2114;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1240,7 +1240,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.14;
+				MARKETING_VERSION = 3.0.17;
 				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 = 2111;
+				CURRENT_PROJECT_VERSION = 2114;
 				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.14;
+				MARKETING_VERSION = 3.0.17;
 				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 = 2111;
+				CURRENT_PROJECT_VERSION = 2114;
 				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.14;
+				MARKETING_VERSION = 3.0.17;
 				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 = 2111;
+				CURRENT_PROJECT_VERSION = 2114;
 				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.14;
+				MARKETING_VERSION = 3.0.17;
 				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 = 2111;
+				CURRENT_PROJECT_VERSION = 2114;
 				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.14;
+				MARKETING_VERSION = 3.0.17;
 				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.13",
+  "version": "3.0.15",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@notesnook/mobile",
-      "version": "3.0.13",
+      "version": "3.0.15",
      "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",
-      "devOptional": true,
+      "dev": 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",
-      "devOptional": true,
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@types/prop-types": "*",
@@ -7217,7 +7217,7 @@
    },
    "../../packages/editor-mobile/node_modules/@types/scheduler": {
      "version": "0.16.8",
-      "devOptional": true,
+      "dev": true,
      "license": "MIT"
    },
    "../../packages/editor-mobile/node_modules/@types/semver": {
@@ -12075,7 +12075,7 @@
    },
    "../../packages/editor-mobile/node_modules/immer": {
      "version": "9.0.21",
-      "devOptional": true,
+      "dev": true,
      "license": "MIT",
      "funding": {
        "type": "opencollective",
@@ -22464,6 +22464,7 @@
    },
    "../../packages/editor/node_modules/js-tokens": {
      "version": "4.0.0",
+      "dev": true,
      "license": "MIT"
    },
    "../../packages/editor/node_modules/json-parse-even-better-errors": {
@@ -22519,6 +22520,7 @@
    },
    "../../packages/editor/node_modules/loose-envify": {
      "version": "1.4.0",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "js-tokens": "^3.0.0 || ^4.0.0"
@@ -23040,6 +23042,7 @@
    },
    "../../packages/editor/node_modules/react": {
      "version": "18.2.0",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "loose-envify": "^1.1.0"
@@ -23058,6 +23061,7 @@
    },
    "../../packages/editor/node_modules/react-dom": {
      "version": "18.2.0",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "loose-envify": "^1.1.0",
@@ -23177,6 +23181,7 @@
    },
    "../../packages/editor/node_modules/scheduler": {
      "version": "0.23.0",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "loose-envify": "^1.1.0"
@@ -23806,17 +23811,19 @@
      "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.5",
+        "@types/libsodium-wrappers-sumo": "0.7.8",
        "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"
      }
    },
@@ -28713,6 +28720,7 @@
    },
    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/types": "^7.22.5"
@@ -28836,6 +28844,7 @@
    },
    "node_modules/@babel/helper-hoist-variables": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/types": "^7.22.5"
@@ -29106,6 +29115,7 @@
    },
    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -29119,6 +29129,7 @@
    },
    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -29268,6 +29279,7 @@
    },
    "node_modules/@babel/plugin-proposal-private-property-in-object": {
      "version": "7.21.0-placeholder-for-preset-env.2",
+      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=6.9.0"
@@ -29278,6 +29290,7 @@
    },
    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
      "version": "7.18.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
@@ -29313,6 +29326,7 @@
    },
    "node_modules/@babel/plugin-syntax-class-properties": {
      "version": "7.12.13",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.12.13"
@@ -29323,6 +29337,7 @@
    },
    "node_modules/@babel/plugin-syntax-class-static-block": {
      "version": "7.14.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.14.5"
@@ -29359,6 +29374,7 @@
    },
    "node_modules/@babel/plugin-syntax-export-namespace-from": {
      "version": "7.8.3",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.8.3"
@@ -29383,6 +29399,7 @@
    },
    "node_modules/@babel/plugin-syntax-import-assertions": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -29396,6 +29413,7 @@
    },
    "node_modules/@babel/plugin-syntax-import-attributes": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -29409,6 +29427,7 @@
    },
    "node_modules/@babel/plugin-syntax-import-meta": {
      "version": "7.10.4",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.10.4"
@@ -29419,6 +29438,7 @@
    },
    "node_modules/@babel/plugin-syntax-json-strings": {
      "version": "7.8.3",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.8.0"
@@ -29515,6 +29535,7 @@
    },
    "node_modules/@babel/plugin-syntax-top-level-await": {
      "version": "7.14.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.14.5"
@@ -29541,6 +29562,7 @@
    },
    "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
      "version": "7.18.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
@@ -29568,6 +29590,7 @@
    },
    "node_modules/@babel/plugin-transform-async-generator-functions": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-environment-visitor": "^7.22.5",
@@ -29599,6 +29622,7 @@
    },
    "node_modules/@babel/plugin-transform-block-scoped-functions": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -29625,6 +29649,7 @@
    },
    "node_modules/@babel/plugin-transform-class-properties": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-class-features-plugin": "^7.22.5",
@@ -29639,6 +29664,7 @@
    },
    "node_modules/@babel/plugin-transform-class-static-block": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-class-features-plugin": "^7.22.5",
@@ -29702,6 +29728,7 @@
    },
    "node_modules/@babel/plugin-transform-dotall-regex": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
@@ -29716,6 +29743,7 @@
    },
    "node_modules/@babel/plugin-transform-duplicate-keys": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -29729,6 +29757,7 @@
    },
    "node_modules/@babel/plugin-transform-dynamic-import": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -29743,6 +29772,7 @@
    },
    "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",
@@ -29757,6 +29787,7 @@
    },
    "node_modules/@babel/plugin-transform-export-namespace-from": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -29786,6 +29817,7 @@
    },
    "node_modules/@babel/plugin-transform-for-of": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -29814,6 +29846,7 @@
    },
    "node_modules/@babel/plugin-transform-json-strings": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -29841,6 +29874,7 @@
    },
    "node_modules/@babel/plugin-transform-logical-assignment-operators": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -29855,6 +29889,7 @@
    },
    "node_modules/@babel/plugin-transform-member-expression-literals": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -29868,6 +29903,7 @@
    },
    "node_modules/@babel/plugin-transform-modules-amd": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-module-transforms": "^7.22.5",
@@ -29897,6 +29933,7 @@
    },
    "node_modules/@babel/plugin-transform-modules-systemjs": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-hoist-variables": "^7.22.5",
@@ -29913,6 +29950,7 @@
    },
    "node_modules/@babel/plugin-transform-modules-umd": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-module-transforms": "^7.22.5",
@@ -29941,6 +29979,7 @@
    },
    "node_modules/@babel/plugin-transform-new-target": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -29968,6 +30007,7 @@
    },
    "node_modules/@babel/plugin-transform-numeric-separator": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -29982,6 +30022,7 @@
    },
    "node_modules/@babel/plugin-transform-object-rest-spread": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/compat-data": "^7.22.5",
@@ -29999,6 +30040,7 @@
    },
    "node_modules/@babel/plugin-transform-object-super": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -30013,6 +30055,7 @@
    },
    "node_modules/@babel/plugin-transform-optional-catch-binding": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -30071,6 +30114,7 @@
      "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",
@@ -30086,6 +30130,7 @@
    },
    "node_modules/@babel/plugin-transform-property-literals": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -30155,6 +30200,7 @@
    },
    "node_modules/@babel/plugin-transform-regenerator": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5",
@@ -30169,6 +30215,7 @@
    },
    "node_modules/@babel/plugin-transform-reserved-words": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -30260,6 +30307,7 @@
    },
    "node_modules/@babel/plugin-transform-typeof-symbol": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -30289,6 +30337,7 @@
    },
    "node_modules/@babel/plugin-transform-unicode-escapes": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.22.5"
@@ -30302,6 +30351,7 @@
    },
    "node_modules/@babel/plugin-transform-unicode-property-regex": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
@@ -30330,6 +30380,7 @@
    },
    "node_modules/@babel/plugin-transform-unicode-sets-regex": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
@@ -30344,6 +30395,7 @@
    },
    "node_modules/@babel/preset-env": {
      "version": "7.22.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/compat-data": "^7.22.5",
@@ -30436,6 +30488,7 @@
    },
    "node_modules/@babel/preset-env/node_modules/semver": {
      "version": "6.3.0",
+      "dev": true,
      "license": "ISC",
      "bin": {
        "semver": "bin/semver.js"
@@ -30459,6 +30512,7 @@
    },
    "node_modules/@babel/preset-modules": {
      "version": "0.1.5",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/helper-plugin-utils": "^7.0.0",
@@ -33766,6 +33820,7 @@
    },
    "node_modules/@types/eslint": {
      "version": "8.40.2",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@types/estree": "*",
@@ -33774,6 +33829,7 @@
    },
    "node_modules/@types/eslint-scope": {
      "version": "3.7.4",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@types/eslint": "*",
@@ -33782,6 +33838,7 @@
    },
    "node_modules/@types/estree": {
      "version": "1.0.1",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/@types/graceful-fs": {
@@ -33884,12 +33941,12 @@
    },
    "node_modules/@types/prop-types": {
      "version": "15.7.5",
-      "devOptional": true,
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/@types/react": {
      "version": "18.2.13",
-      "devOptional": true,
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@types/prop-types": "*",
@@ -33932,7 +33989,7 @@
    },
    "node_modules/@types/scheduler": {
      "version": "0.16.3",
-      "devOptional": true,
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/@types/semver": {
@@ -34244,6 +34301,7 @@
    },
    "node_modules/@webassemblyjs/ast": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/helper-numbers": "1.11.6",
@@ -34252,18 +34310,22 @@
    },
    "node_modules/@webassemblyjs/floating-point-hex-parser": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/@webassemblyjs/helper-api-error": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/@webassemblyjs/helper-buffer": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/@webassemblyjs/helper-numbers": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
@@ -34273,10 +34335,12 @@
    },
    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/@webassemblyjs/helper-wasm-section": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/ast": "1.11.6",
@@ -34287,6 +34351,7 @@
    },
    "node_modules/@webassemblyjs/ieee754": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@xtuc/ieee754": "^1.2.0"
@@ -34294,6 +34359,7 @@
    },
    "node_modules/@webassemblyjs/leb128": {
      "version": "1.11.6",
+      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
        "@xtuc/long": "4.2.2"
@@ -34301,10 +34367,12 @@
    },
    "node_modules/@webassemblyjs/utf8": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/@webassemblyjs/wasm-edit": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/ast": "1.11.6",
@@ -34319,6 +34387,7 @@
    },
    "node_modules/@webassemblyjs/wasm-gen": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/ast": "1.11.6",
@@ -34330,6 +34399,7 @@
    },
    "node_modules/@webassemblyjs/wasm-opt": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/ast": "1.11.6",
@@ -34340,6 +34410,7 @@
    },
    "node_modules/@webassemblyjs/wasm-parser": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/ast": "1.11.6",
@@ -34352,6 +34423,7 @@
    },
    "node_modules/@webassemblyjs/wast-printer": {
      "version": "1.11.6",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@webassemblyjs/ast": "1.11.6",
@@ -34409,10 +34481,12 @@
    },
    "node_modules/@xtuc/ieee754": {
      "version": "1.2.0",
+      "dev": true,
      "license": "BSD-3-Clause"
    },
    "node_modules/@xtuc/long": {
      "version": "4.2.2",
+      "dev": true,
      "license": "Apache-2.0"
    },
    "node_modules/@yarnpkg/lockfile": {
@@ -34465,6 +34539,7 @@
    },
    "node_modules/acorn-import-assertions": {
      "version": "1.9.0",
+      "dev": true,
      "license": "MIT",
      "peerDependencies": {
        "acorn": "^8"
@@ -35378,6 +35453,7 @@
    },
    "node_modules/chrome-trace-event": {
      "version": "1.0.3",
+      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=6.0"
@@ -35824,7 +35900,7 @@
    },
    "node_modules/csstype": {
      "version": "3.1.2",
-      "devOptional": true,
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/date-fns": {
@@ -36401,29 +36477,9 @@
        "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",
@@ -36528,6 +36584,7 @@
    },
    "node_modules/es-module-lexer": {
      "version": "1.3.0",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/es-set-tostringtag": {
@@ -36863,6 +36920,7 @@
    },
    "node_modules/eslint-scope": {
      "version": "5.1.1",
+      "dev": true,
      "license": "BSD-2-Clause",
      "dependencies": {
        "esrecurse": "^4.3.0",
@@ -36874,6 +36932,7 @@
    },
    "node_modules/eslint-scope/node_modules/estraverse": {
      "version": "4.3.0",
+      "dev": true,
      "license": "BSD-2-Clause",
      "engines": {
        "node": ">=4.0"
@@ -37040,6 +37099,7 @@
    },
    "node_modules/esrecurse": {
      "version": "4.3.0",
+      "dev": true,
      "license": "BSD-2-Clause",
      "dependencies": {
        "estraverse": "^5.2.0"
@@ -37050,6 +37110,7 @@
    },
    "node_modules/estraverse": {
      "version": "5.3.0",
+      "dev": true,
      "license": "BSD-2-Clause",
      "engines": {
        "node": ">=4.0"
@@ -37057,6 +37118,7 @@
    },
    "node_modules/esutils": {
      "version": "2.0.3",
+      "dev": true,
      "license": "BSD-2-Clause",
      "engines": {
        "node": ">=0.10.0"
@@ -37820,6 +37882,7 @@
    },
    "node_modules/glob-to-regexp": {
      "version": "0.4.1",
+      "dev": true,
      "license": "BSD-2-Clause"
    },
    "node_modules/global": {
@@ -39866,6 +39929,7 @@
    },
    "node_modules/json-parse-even-better-errors": {
      "version": "2.3.1",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/json-schema-ref-resolver": {
@@ -40399,6 +40463,7 @@
    },
    "node_modules/loader-runner": {
      "version": "4.3.0",
+      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=6.11.5"
@@ -42629,6 +42694,7 @@
    },
    "node_modules/randombytes": {
      "version": "2.1.0",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "safe-buffer": "^5.1.0"
@@ -43598,6 +43664,7 @@
    },
    "node_modules/regenerator-transform": {
      "version": "0.15.1",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/runtime": "^7.8.4"
@@ -43845,12 +43912,6 @@
        "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,
@@ -43965,6 +44026,7 @@
    },
    "node_modules/serialize-javascript": {
      "version": "6.0.1",
+      "dev": true,
      "license": "BSD-3-Clause",
      "dependencies": {
        "randombytes": "^2.1.0"
@@ -44617,6 +44679,7 @@
    },
    "node_modules/tapable": {
      "version": "2.2.1",
+      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=6"
@@ -44695,6 +44758,7 @@
    },
    "node_modules/terser-webpack-plugin": {
      "version": "5.3.9",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@jridgewell/trace-mapping": "^0.3.17",
@@ -44727,6 +44791,7 @@
    },
    "node_modules/terser-webpack-plugin/node_modules/jest-worker": {
      "version": "27.5.1",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@types/node": "*",
@@ -44739,6 +44804,7 @@
    },
    "node_modules/terser-webpack-plugin/node_modules/supports-color": {
      "version": "8.1.1",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "has-flag": "^4.0.0"
@@ -45332,6 +45398,7 @@
    },
    "node_modules/watchpack": {
      "version": "2.4.0",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "glob-to-regexp": "^0.4.1",
@@ -45354,6 +45421,7 @@
    },
    "node_modules/webpack": {
      "version": "5.88.2",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@types/eslint-scope": "^3.7.3",
@@ -45468,6 +45536,7 @@
    },
    "node_modules/webpack-sources": {
      "version": "3.2.3",
+      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=10.13.0"
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@notesnook/mobile",
-  "version": "3.0.14",
+  "version": "3.0.17",
  "private": true,
  "license": "GPL-3.0-or-later",
  "workspaces": [
--- a/apps/mobile/patches/@react-native+community-cli-plugin+0.74.87.patch
+++ b/apps/mobile/patches/@react-native+community-cli-plugin+0.74.87.patch
--- a/apps/mobile/patches/jetifier+1.6.8.patch
+++ b/apps/mobile/patches/jetifier+1.6.8.patch
@@ -1,13 +0,0 @@
-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,6 +45,7 @@ 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,6 +990,7 @@
        "@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),
+      () => this.menu.getItem(format).click(),
      null
    );

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

-    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");
+    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"
+    );
  }

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

  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.13",
+  "version": "3.0.17",
  "private": true,
  "main": "./src/app.js",
  "homepage": "https://notesnook.com/",
@@ -15,9 +15,10 @@
    "@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",
+    "@notesnook-importer/core": "^2.1.1",
    "@notesnook/common": "file:../../packages/common",
    "@notesnook/core": "file:../../packages/core",
    "@notesnook/crypto": "file:../../packages/crypto",
@@ -56,7 +57,6 @@
    "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,11 +22,16 @@ 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 { resetNotices, scheduleBackups } from "./common/notices";
+import { useStore as useSettingStore } from "./stores/setting-store";
+import {
+  resetNotices,
+  scheduleBackups,
+  scheduleFullBackups
+} from "./common/notices";
 import { introduceFeatures, showUpgradeReminderDialogs } from "./common";
 import { AppEventManager, AppEvents } from "./common/app-events";
 import { db } from "./common/db";
-import { EV, EVENTS } from "@notesnook/core/dist/common";
+import { CHECK_IDS, 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";
@@ -40,6 +45,7 @@ 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;
@@ -64,11 +70,27 @@ export default function AppEffects({ setShow }: AppEffectsProps) {
          if (isUserPremium()) {
            return { type, result: true };
          } else {
-            showToast(
-              "error",
-              "Please upgrade your account to Pro to use this feature.",
-              [{ text: "Upgrade now", onClick: () => BuyDialog.show({}) }]
-            );
+            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({}) }
+            ]);
            return { type, result: false };
          }
        }
@@ -90,6 +112,10 @@ 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,7 +125,9 @@ function DesktopAppContents({ show, setShow }: DesktopAppContentsProps) {
  const middlePane = useRef<ImperativePanelHandle>(null);

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

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

  try {
-    const size = await lazify(
-      import("../interfaces/fs"),
-      ({ getUploadedFileSize }) => getUploadedFileSize(hash)
+    await lazify(import("../interfaces/fs"), ({ checkUpload }) =>
+      checkUpload(hash, attachment.chunkSize, attachment.size)
    );
-    if (size === 0) throw new Error("File length is 0.");
-    else if (size === -1) throw new Error("File verification check failed.");
+    await db.attachments.markAsFailed(attachment.id);
  } 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,6 +26,7 @@ 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) {
@@ -45,7 +46,8 @@ 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"
+    SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",
+    ...Config.get("serverUrls", {})
  });

  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 } from "../utils/streams/zip-stream";
+import { createZipStream, ZipFile } 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,6 +41,10 @@ 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: {
@@ -78,9 +82,11 @@ export async function createBackup(
  options: {
    rescueMode?: boolean;
    noVerify?: boolean;
-  } = {}
+    mode?: "full" | "partial";
+    background?: boolean;
+  } = { mode: "partial" }
 ) {
-  const { rescueMode, noVerify } = options;
+  const { rescueMode, noVerify, mode, background } = options;
  const { isLoggedIn } = useUserStore.getState();
  const { encryptBackups, toggleEncryptBackups } = useSettingStore.getState();
  if (!isLoggedIn && encryptBackups) toggleEncryptBackups();
@@ -99,7 +105,7 @@ export async function createBackup(
      type: "date-time",
      dateFormat: "YYYY-MM-DD",
      timeFormat: "24-hour"
-    })}-${new Date().getSeconds()}`,
+    })}-${new Date().getSeconds()}${mode === "full" ? "-full" : ""}`,
    { replacement: "-" }
  );
  const directory = Config.get("backupStorageLocation", PATHS.backupsDirectory);
@@ -110,23 +116,47 @@ export async function createBackup(

  const encoder = new TextEncoder();
  const error = await TaskManager.startTask<Error | void>({
-    type: "modal",
+    type: background ? "status" : "modal",
+    id: "creating-backup",
    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({
+      await new ReadableStream<ZipFile>({
        start() {},
        async pull(controller) {
-          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)
-            });
+          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
+              });
+            }
          }
          controller.close();
        }
@@ -191,6 +221,8 @@ 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;
@@ -199,7 +231,13 @@ export async function restoreBackupFile(backupFile: File) {
            isValid = true;
            continue;
          }
-          entries.push(entry);
+          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);
        }
        if (!isValid)
          console.warn(
@@ -212,18 +250,27 @@ export async function restoreBackupFile(backupFile: File) {
            if (backup.encrypted) {
              if (!cachedPassword && !cachedKey) {
                const result = await BackupPasswordDialog.show({
-                  validate: async ({ password, key }) => {
-                    if (!password && !key) return false;
-                    await db.backup?.import(backup, password, key);
+                  validate: async ({ password, key: encryptionKey }) => {
+                    if (!password && !encryptionKey) return false;
+                    await db.backup?.import(backup, {
+                      password,
+                      encryptionKey,
+                      attachmentsKey
+                    });
                    cachedPassword = password;
-                    cachedKey = key;
+                    cachedKey = encryptionKey;
                    return true;
                  }
                });
                if (!result) break;
-              } else await db.backup?.import(backup, cachedPassword, cachedKey);
+              } else
+                await db.backup?.import(backup, {
+                  password: cachedPassword,
+                  encryptionKey: cachedKey,
+                  attachmentsKey
+                });
            } else {
-              await db.backup?.import(backup);
+              await db.backup?.import(backup, { attachmentsKey });
            }

            report({
@@ -234,6 +281,37 @@ 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) {
@@ -326,10 +404,10 @@ export async function showUpgradeReminderDialogs() {
 async function restore(
  backup: LegacyBackupFile,
  password?: string,
-  key?: string
+  encryptionKey?: string
 ) {
  try {
-    await db.backup?.import(backup, password, key);
+    await db.backup?.import(backup, { password, encryptionKey });
    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,6 +46,7 @@ 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")}...`
@@ -66,6 +67,7 @@ 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")}...`
@@ -92,6 +94,7 @@ 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];
@@ -119,6 +122,7 @@ 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,12 +38,18 @@ export type Notice = {
  params?: any;
 };

-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 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 async function scheduleBackups() {
  const backupInterval = Config.get("backupReminderOffset", 0);
@@ -62,6 +68,23 @@ 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) {
@@ -175,9 +198,9 @@ function isIgnored(key: keyof typeof NoticesData) {
 }

 let openedToast: { hide: () => void } | null = null;
-async function saveBackup() {
+async function saveBackup(mode: "full" | "partial" = "partial") {
  if (IS_DESKTOP_APP) {
-    await createBackup({ noVerify: true });
+    await createBackup({ noVerify: true, mode, background: true });
  } else if (isUserPremium() && !IS_TESTING) {
    if (openedToast !== null) return;
    openedToast = showToast(
@@ -196,7 +219,7 @@ async function saveBackup() {
        {
          text: "Download",
          onClick: async () => {
-            await createBackup();
+            await createBackup({ mode });
            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";
-type TaskAction<T> = (report: ProgressReportCallback) => T | Promise<T>;
+export type TaskAction<T> = (report: ProgressReportCallback) => T | Promise<T>;
 type BaseTaskDefinition<TTaskType extends TaskType, TReturnType> = {
  type: TTaskType;
  action: TaskAction<TReturnType>;
@@ -31,6 +31,7 @@ type StatusTaskDefinition<TReturnType> = BaseTaskDefinition<
  "status",
  TReturnType
 > & {
+  title: string;
  id: string;
 };

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

 type TaskDefinition<TReturnType> =
@@ -59,6 +60,10 @@ 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,12 +29,22 @@ 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, ...restProps } = props;
+  const {
+    isClosed,
+    title,
+    color,
+    children,
+    testId,
+    sx,
+    containerSx,
+    ...restProps
+  } = props;
  const [isContentHidden, setIsContentHidden] = useState(false);

  useEffect(() => {
@@ -69,8 +79,9 @@ export default function Accordion(
      </Flex>
      <Flex
        sx={{
-          display: isContentHidden ? "none" : "flex",
-          flexDirection: "column"
+          flexDirection: "column",
+          ...containerSx,
+          display: isContentHidden ? "none" : "flex"
        }}
      >
        {children}
--- a/apps/web/src/components/announcements/body.jsx
+++ b/apps/web/src/components/announcements/body.jsx
@@ -24,7 +24,6 @@ import {
  Image as RebassImage,
  Text as RebassText
 } from "@theme-ui/components";
-import { ANALYTICS_EVENTS, trackEvent } from "../../utils/analytics";
 import {
  Sync,
  Notebook,
@@ -284,7 +283,6 @@ 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,7 +19,6 @@ 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";
@@ -59,7 +58,6 @@ 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,13 +18,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 import { useMemo } from "react";
-import { Box, Flex, Image, Link, Text } from "@theme-ui/components";
-import { useStore as useThemeStore } from "../../stores/theme-store";
-import { getRandom } from "@notesnook/common";
+import { Box, Button, Flex, Image, Link, Text } from "@theme-ui/components";
+import { getRandom, usePromise } 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 = [
  {
@@ -74,10 +75,16 @@ 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={{
@@ -165,7 +172,6 @@ function AuthContainer(props) {
          <Text variant={"heading"} sx={{ fontSize: 48 }}>
            {title}
          </Text>
-
          <Text
            variant="body"
            mt={10}
@@ -193,6 +199,34 @@ 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,6 +50,7 @@ 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,14 +240,13 @@ function withProgress<T>(
        ({ type, total, loaded }: AttachmentProgress) => {
          if (type !== "encrypt") return;
          report({
-            current: loaded,
-            total: total,
+            current: Math.round((loaded / total) * 100),
+            total: 100,
            text: file.name
          });
        }
      );
-      event.unsubscribe();
-      return action();
+      return action().finally(() => event.unsubscribe());
    }
  });
 }
--- a/apps/web/src/components/error-text/index.tsx
+++ b/apps/web/src/components/error-text/index.tsx
@@ -30,8 +30,14 @@ export function ErrorText(props: ErrorTextProps) {
    <Flex
      bg="var(--background-error)"
      p={1}
-      mt={2}
-      sx={{ borderRadius: "default", ...sx, maxHeight: 300, overflowY: "auto" }}
+      sx={{
+        borderRadius: "default",
+        mt: 2,
+        ...sx,
+        alignItems: "flex-start",
+        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,6 +55,7 @@ function Field(props: FieldProps) {
    type,
    inputRef,
    validate,
+    disabled,
    ...inputProps
  } = props;
  const [isPasswordVisible, setIsPasswordVisible] = useState(false);
@@ -66,6 +67,8 @@ 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,7 +214,9 @@ import {
  mdiLink,
  mdiWindowClose,
  mdiFileMusicOutline,
-  mdiBroom
+  mdiBroom,
+  mdiServerSecurity,
+  mdiOpenInNew
 } from "@mdi/js";
 import { useTheme } from "@emotion/react";
 import { Theme } from "@notesnook/theme";
@@ -541,6 +543,7 @@ 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");
@@ -550,3 +553,4 @@ 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,7 +50,8 @@ import {
  RemoveShortcutLink,
  Plus,
  Copy,
-  Tag as TagIcon
+  Tag as TagIcon,
+  OpenInNew
 } from "../icons";
 import TimeAgo from "../time-ago";
 import ListItem from "../list-item";
@@ -430,17 +431,53 @@ const menuItems: (
    {
      type: "button",
      key: "publish",
-      isDisabled:
-        //!isSynced ||
-        !db.monographs.isPublished(note.id) && context?.locked,
+      isDisabled: !db.monographs.isPublished(note.id) && context?.locked,
      icon: Publish.path,
      title: "Publish",
-      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");
-      }
+      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")
    },
    {
      type: "button",
--- a/apps/web/src/components/placeholders/index.tsx
+++ b/apps/web/src/components/placeholders/index.tsx
@@ -28,8 +28,9 @@ 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 (syncStatus.key === "syncing" && context === "notes") {
+  if (isFirstSync && 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,7 +26,6 @@ import {
  Update,
  SyncError,
  Alert,
-  Issue,
  SyncOff,
  Icon
 } from "../icons";
@@ -40,7 +39,6 @@ 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,6 +72,7 @@ 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,6 +49,8 @@ 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,14 +197,15 @@ export const AttachmentsDialog = DialogManager.register(
                      variant="secondary"
                      key={tool.title}
                      title={tool.title}
-                      onClick={() =>
-                        tool.onClick({
-                          selected
-                          // : attachments.filter(
-                          //   (a) => selected.indexOf(a.id) > -1
-                          // )
-                        })
-                      }
+                      onClick={() => {
+                        try {
+                          tool.onClick({
+                            selected
+                          });
+                        } catch (e) {
+                          showToast("error", (e as Error).message);
+                        }
+                      }}
                      disabled={!selected.length}
                      sx={{ bg: "transparent", p: 1 }}
                    >
@@ -254,7 +255,14 @@ export const AttachmentsDialog = DialogManager.register(
                      >
                        <Label>
                          <Checkbox
-                            sx={{ width: 18, height: 18 }}
+                            sx={{
+                              width: 18,
+                              height: 18,
+                              color:
+                                selected.length === attachments.length
+                                  ? "accent"
+                                  : "icon"
+                            }}
                            onChange={async (e) => {
                              setSelected(
                                e.currentTarget.checked
@@ -264,6 +272,7 @@ 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,12 +175,8 @@ function SideBar(props: SideBarProps) {
          const result = await TaskManager.startTask({
            type: "status",
            id: "trialActivation",
-            action: (report) => {
-              report({
-                text: "Activating trial"
-              });
-              return db.user.activateTrial();
-            }
+            title: "Activating trial",
+            action: () => 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 3 notebooks (no limit on topics) and 5 tags."
+    info: "* Free users can only create 20 notebooks and 5 tags."
  },

  {
@@ -399,8 +399,7 @@ const sections: Section[] = [
      {
        id: "backup-encryption",
        title: "Backup encryption",
-        icon: EncryptedBackup,
-        pro: true
+        icon: EncryptedBackup
      }
    ]
  },
@@ -408,7 +407,6 @@ 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",
@@ -423,7 +421,8 @@ const sections: Section[] = [
      {
        id: "default-home-page",
        title: "Change default home page",
-        icon: Home
+        icon: Home,
+        pro: true
      }
    ]
  }
--- a/apps/web/src/dialogs/buy-dialog/paddle.tsx
+++ b/apps/web/src/dialogs/buy-dialog/paddle.tsx
@@ -32,17 +32,19 @@ 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 = isDev ? 1506 : 128190;
+const VENDOR_ID = import.meta.env.DEV || IS_TESTING ? 1506 : 128190;
 const PADDLE_ORIGIN =
  import.meta.env.DEV || IS_TESTING
    ? "https://sandbox-buy.paddle.com"
    : "https://buy.paddle.com";
-const CHECKOUT_CREATE_ORIGIN =
+const SUBSCRIPTION_MANAGEMENT_URL =
  import.meta.env.DEV || IS_TESTING
-    ? "https://sandbox-create-checkout.paddle.com"
-    : "https://create-checkout.paddle.com";
+    ? "https://sandbox-subscription-management.paddle.com"
+    : "https://subscription-management.paddle.com";
 const CHECKOUT_SERVICE_ORIGIN =
  import.meta.env.DEV || IS_TESTING
    ? "https://sandbox-checkout-service.paddle.com"
@@ -102,6 +104,7 @@ 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;

@@ -109,8 +112,10 @@ 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();
@@ -124,9 +129,9 @@ export function PaddleCheckout(props: PaddleCheckoutProps) {
      appliedCouponCode.current = pricingInfo.coupon;
      setCheckoutId(checkout.id);
    }
-    window.addEventListener("message", onMessage);
+    window.addEventListener("message", onMessage, false);
    return () => {
-      window.removeEventListener("message", onMessage);
+      window.removeEventListener("message", onMessage, false);
    };
  }, [onPriceUpdated, updatePrice, plan, onCompleted]);

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

 async function getCheckoutURL(params: PaddleCheckoutProps) {
  const { plan, theme, user } = params;
-  const BASE_URL = `${CHECKOUT_CREATE_ORIGIN}/checkout/product/${plan.id}`;
+  const BASE_URL = `${PADDLE_ORIGIN}/paddlejs?ccsURL=${CHECKOUT_SERVICE_ORIGIN}/create/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", "false");
-  queryParams.set("paddlejs-version", "2.0.14");
+  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("popup", "true");
  queryParams.set("paddle_js", "true");
  queryParams.set("is_popup", "true");
-  queryParams.set("parent_url", window.location.href);
+  queryParams.set("parent_url", window.location.origin);
+  queryParams.set("parentURL", window.location.origin);
+  queryParams.set("referring_domain", window.location.hostname);
  const fullURL = `${BASE_URL}?${queryParams.toString()}`;
  return fullURL;
 }
--- a/apps/web/src/dialogs/confirm.tsx
+++ b/apps/web/src/dialogs/confirm.tsx
@@ -17,14 +17,15 @@ 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 { Box, Checkbox, Label, Text } from "@theme-ui/components";
+import { Checkbox, Flex, 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 { AppVersion, getChangelog } from "../utils/version";
+import { 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<
@@ -36,6 +37,7 @@ export type ConfirmDialogProps<TCheckId extends string> = BaseDialogProps<
  positiveButtonText?: string;
  negativeButtonText?: string;
  message?: string;
+  warnings?: string[];
  checks?: Partial<Record<TCheckId, Check>>;
 };

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

-export function showLogoutConfirmation() {
-  return ConfirmDialog.show({
+export async function showLogoutConfirmation() {
+  return await ConfirmDialog.show({
    title: `Logout?`,
    message:
-      "Logging out will clear all data stored on THIS DEVICE. Make sure you have synced all your changes before logging out.",
+      "Are you sure you want to log out and clear all data stored on THIS DEVICE?",
    positiveButtonText: "Yes",
-    negativeButtonText: "No"
+    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
+      }
+    }
  });
 }

--- 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);
+            props.onClose(colorId || false);
          }}
        >
          <Field
--- a/apps/web/src/dialogs/feature-dialog.tsx
+++ b/apps/web/src/dialogs/feature-dialog.tsx
@@ -90,9 +90,23 @@ const features: Record<FeatureKeys, Feature> = {
            )
          }
        ]
-      : IS_DESKTOP_APP
-      ? []
-      : [],
+      : [
+          {
+            title: "Full offline mode",
+            subtitle:
+              "You can now download all your attachments upfront so they are always available on your device even without an Internet connection. To enable just go to Settings > Sync and toggle Full Offline Mode."
+          },
+          {
+            title: "Backup with attachments",
+            subtitle:
+              "You can now backup your notes alongwith all your attachments - kind of like a full account snapshot."
+          },
+          {
+            title: "Self hosting",
+            subtitle:
+              "This release also adds initial support for changing server URLs i.e. to connect your own instance of Notesnook. Please note that this is still experimental and may not work as expected."
+          }
+        ],
    cta: {
      title: "Got it",
      icon: Checkmark,
--- a/apps/web/src/dialogs/item-dialog.tsx
+++ b/apps/web/src/dialogs/item-dialog.tsx
@@ -93,8 +93,8 @@ export const CreateTagDialog = {
      title: "Create tag",
      subtitle: "You can create as many tags as you want."
    }).then(async (title) => {
-      if (!title) return;
-      await db.tags.add({ title });
+      if (!title || !(await db.tags.add({ title }))) return;
+
      showToast("success", "Tag created!");
      useTagStore.getState().refresh();
    })
--- a/apps/web/src/dialogs/loading-dialog.tsx
+++ b/apps/web/src/dialogs/loading-dialog.tsx
@@ -1,57 +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 { useEffect } from "react";
-import { Box, Text } from "@theme-ui/components";
-import Dialog from "../components/dialog";
-import { Loading } from "../components/icons";
-
-type LoadingDialogProps<T> = {
-  onClose: (result: T | boolean) => void;
-  action: () => T | Promise<T>;
-  title: string;
-  description: string;
-  message?: string;
-};
-
-function LoadingDialog<T>(props: LoadingDialogProps<T>) {
-  const { onClose, action, description, message, title } = props;
-  useEffect(() => {
-    (async function () {
-      try {
-        onClose(await action());
-      } catch (e) {
-        onClose(false);
-        throw e;
-      }
-    })();
-  }, [onClose, action]);
-
-  return (
-    <Dialog isOpen={true} title={title} description={description}>
-      <Box>
-        <Text as="span" variant="body">
-          {message}
-        </Text>
-        <Loading sx={{ my: 2 }} color="accent" />
-      </Box>
-    </Dialog>
-  );
-}
-export default LoadingDialog;
--- a/apps/web/src/dialogs/onboarding-dialog.tsx
+++ b/apps/web/src/dialogs/onboarding-dialog.tsx
@@ -37,7 +37,6 @@ import DarkUI from "../assets/dark1.png";
 import GooglePlay from "../assets/play.png";
 import AppleStore from "../assets/apple.png";
 import { useStore as useThemeStore } from "../stores/theme-store";
-import { Checkbox, Label } from "@theme-ui/components";
 import { Features } from "../components/announcements/body";
 import { TaskManager } from "../common/task-manager";
 import { db } from "../common/db";
@@ -64,8 +63,7 @@ const newUserSteps: Step[] = [
    title: "Safe & encrypted notes",
    subtitle: "Write with freedom. Never compromise on privacy again.",
    buttonText: "Get started",
-    image: <Note style={{ flexShrink: 0, width: 120, height: 120 }} />,
-    component: TrackingConsent
+    image: <Note style={{ flexShrink: 0, width: 120, height: 120 }} />
  },
  {
    title: "Choose your style",
@@ -421,28 +419,6 @@ function ThemeSelector() {
  );
 }

-function TrackingConsent() {
-  const [enableTelemetry, setEnableTelemetry] = usePersistentState(
-    "telemetry",
-    false
-  );
-  return (
-    <Label variant="text.subBody" my={4} sx={{ width: "80%" }}>
-      <Checkbox
-        checked={enableTelemetry}
-        onChange={(e) => {
-          setEnableTelemetry(e.target.checked);
-        }}
-        sx={{ width: 14 }}
-      />
-      <Text>
-        Help improve Notesnook by sending completely anonymized product
-        analytics.
-      </Text>
-    </Label>
-  );
-}
-
 function CrossPlatform() {
  return (
    <Flex my={4} sx={{ alignItems: "center" }}>
@@ -513,12 +489,8 @@ function TrialOffer({ onClose }: { onClose: () => void }) {
              const result = await TaskManager.startTask({
                type: "status",
                id: "trialActivation",
-                action: (report) => {
-                  report({
-                    text: "Activating trial"
-                  });
-                  return db.user.activateTrial();
-                }
+                title: "Activating trial",
+                action: () => db.user.activateTrial()
              });
              if (result) onClose();
            } catch (e) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ammar Ahmed	4ca87ce6a1	mobile: do not zip note without attachments	2024-09-12 12:53:32 +05:00
Ammar Ahmed	b5be5e0b59	mobile: fix itemExists error	2024-09-11 14:12:56 +05:00
Abdullah Atta	05695cfcc8	web: add menu items to open, view & unpublish a monograph (fixes #4812 )	2024-09-11 13:56:18 +05:00
Abdullah Atta	423e1c6816	web: update features list (fixes #6514 )	2024-09-11 13:33:35 +05:00
Ammar Ahmed	6db1cf5cc1	clipper: add images only for pro users (#6528 )	2024-09-11 13:26:57 +05:00
Ammar Ahmed	2e4a87abd9	core: fix export title has appended `Notesnook` to end (#6529 )	2024-09-11 13:26:20 +05:00
Ammar Ahmed	c26988134f	editor: fix heading and p gap (#6530 ) * editor: fix heading and p gap * Update packages/editor/styles/styles.css Signed-off-by: Abdullah Atta <thecodrr@protonmail.com> --------- Signed-off-by: Abdullah Atta <thecodrr@protonmail.com> Co-authored-by: Abdullah Atta <abdullahatta@streetwriters.co>	2024-09-11 13:24:58 +05:00
Abdullah Atta	bcffdd0f91	editor: improve toolbar popup controls	2024-09-11 13:22:53 +05:00
Abdullah Atta	de1051d52d	editor: remove unnecessary useMemo dependency	2024-09-11 13:22:53 +05:00
Abdullah Atta	b1a360e445	editor: add more neutral default colors for highlight	2024-09-11 13:22:53 +05:00
Abdullah Atta	49e85dfa87	editor: position color picker according to mouse position	2024-09-11 13:22:53 +05:00
Abdullah Atta	452ff12071	editor: use ref instead of document.getElementById	2024-09-11 13:22:53 +05:00
Muhammad Ali	1b6fc40633	editor: fix input is not editable in color picker	2024-09-11 13:22:53 +05:00
Ammar Ahmed	82b28f8263	mobile: fix pricingPhases undefined error	2024-09-10 14:02:41 +05:00
Abdullah Atta	6e47eae30a	web: fix error when registering task with invalid time (fixes #4890 )	2024-09-10 09:41:16 +05:00
Abdullah Atta	4040f2ecc4	common: fix notes with empty title exporting with empty filename (fixes #6088 )	2024-09-10 09:36:55 +05:00
Abdullah Atta	2293866c61	core: fix note title can be set to empty	2024-09-10 09:27:38 +05:00
Ammar Ahmed	2cb4a10076	clipper: add safe querySelector method	2024-09-09 14:57:49 +05:00
Abdullah Atta	2f7b8d3377	web: add clear instructions on how to import from other apps	2024-09-09 13:14:17 +05:00
Abdullah Atta	983220b2f2	web: add support for importing nested notebooks	2024-09-09 13:13:46 +05:00
Ammar Ahmed	ca2848e491	mobile: release v3.0.17	2024-09-06 12:58:36 +05:00
Ammar Ahmed	48e5c4d908	mobile: fix crash in background on boot	2024-09-06 12:33:34 +05:00
Ammar Ahmed	5774dd8c60	mobile: fix crash on opening app from tile	2024-09-06 12:33:00 +05:00
Steve Divskinsy	9d65184f42	docs(help): Fix typo in is-there-an-eta.md docs(help): Fix typo in is-there-an-eta.md - unnecessary was incorrectly spelled Signed-off-by: Stephen Argent <stevesbrain@users.noreply.github.com> Signed-off-by: Steve Divskinsy <stevesbrain@users.noreply.github.com>	2024-09-05 20:10:54 +05:00
Abdullah Atta	395b2750e8	web: increase table viewport by 300px	2024-09-05 09:45:58 +05:00
Abdullah Atta	3bfb1d57a5	web: fix attachment downloading stuck on error	2024-09-05 09:45:44 +05:00
Abdullah Atta	e59b432007	web: ensure file exists & is of the right size after encryption	2024-09-05 09:41:06 +05:00
Abdullah Atta	efbc566386	web: compare uploaded file size with actual file size after upload	2024-09-05 09:40:45 +05:00
Abdullah Atta	2576f1dd00	web: handle errors in attachment manager	2024-09-05 09:39:29 +05:00
Abdullah Atta	7d9388bd27	web: check select all checkbox when all attachments are selected	2024-09-05 09:38:57 +05:00
Abdullah Atta	1979cd2ea4	web: show progress when rechecking attachments in bulk	2024-09-05 09:38:29 +05:00
Abdullah Atta	7bd5dfb772	web: add support for configuring server urls from login screen	2024-09-04 11:07:23 +05:00
Abdullah Atta	ac7c88218b	core: fix custom server urls not working in production	2024-09-04 11:06:38 +05:00
Abdullah Atta	fb642233c8	docs(help): add xkcd comic just for kicks and laughs	2024-09-04 09:36:22 +05:00
Abdullah Atta	6e2a19d7e0	docs(help): add "is there an eta for X feature" FAQ	2024-09-04 09:20:02 +05:00
Abdullah Atta	4d4993c570	docs(help): improve merge conflicts documentation	2024-09-04 09:10:35 +05:00
Abdullah Atta	916e097cb3	clipper(web): bump version to v0.3.4	2024-09-03 11:52:53 +05:00
Abdullah Atta	6def76e1bb	web: bump version to 3.0.17	2024-09-03 10:39:09 +05:00
Ammar Ahmed	d93ec27c9e	mobile: release v3.0.16	2024-09-02 16:29:13 +05:00
Abdullah Atta	15329597a5	core: fix notes search for queries less than 3 letters (#6489 )	2024-09-02 15:29:18 +05:00
Abdullah Atta	49caf23436	web: show loader when loading next page in themes	2024-09-02 14:58:13 +05:00
Abdullah Atta	e6d8401c56	desktop: fix multiple updates running simultaneously	2024-09-02 14:21:13 +05:00
Abdullah Atta	11a5e8c180	core: delete all relations with fromId/toId set to null	2024-09-02 14:20:58 +05:00
Abdullah Atta	5bd7a081c1	core: do not allow invalid reference to be added in relations	2024-09-02 14:20:58 +05:00
Abdullah Atta	a740a5db81	clipper(web): fix tags not assigned to clip	2024-09-02 14:20:58 +05:00
Abdullah Atta	a61f2efacf	web: fix type errors	2024-09-02 13:43:05 +05:00
Brogio	51a253f3e2	mobile: fix typo in settings (#6485 ) Fix typo Signed-off-by: Brogio <contact@brog.io>	2024-09-02 12:18:49 +05:00
Abdullah Atta	19ed753079	clipper(web): only clip images if user is premium	2024-08-29 12:56:10 +05:00
Abdullah Atta	4a85c49f5d	desktop: remove `sodium-native` package for now	2024-08-28 15:08:52 +05:00
Abdullah Atta	16dd4b3359	web: bump version to 3.0.16	2024-08-28 14:45:31 +05:00
Abdullah Atta	9279c671ac	desktop: fix `ft.dirname is not a function` for "good"	2024-08-28 14:44:40 +05:00
Abdullah Atta	225b21977e	crypto: remove `libsodium-sumo` patch	2024-08-28 13:46:29 +05:00
Abdullah Atta	026b9212c4	web: bump version to v3.0.15	2024-08-28 13:33:56 +05:00
Abdullah Atta	5ce59c6125	desktop: fix `ft.dirname is not a function` error	2024-08-28 13:32:38 +05:00
Ammar Ahmed	b7c81a956c	mobile: release v3.0.15	2024-08-28 12:50:12 +05:00
Abdullah Atta	873f976fd3	crypto: fix `ft.dirname` is not a function	2024-08-28 12:49:14 +05:00
Ammar Ahmed	7d8a16c463	mobile: make sure settings get reset properly on logout	2024-08-28 10:29:05 +05:00
Ammar Ahmed	f5841985fa	mobile: hide select folder button on ios	2024-08-28 10:29:05 +05:00
Ammar Ahmed	da86cbbe32	mobile: fix password input not focused automatically on login	2024-08-28 10:29:05 +05:00
Ammar Ahmed	ed115d3f9e	mobile: set encrypted backups on signup	2024-08-28 10:29:05 +05:00
Ammar Ahmed	e52e74523a	mobile: fix boot task	2024-08-28 10:29:05 +05:00
Ammar Ahmed	7e43c3b373	mobile: fix background sync	2024-08-28 10:29:05 +05:00
Ammar Ahmed	e6db186b62	mobile: fix automatic backups	2024-08-28 10:29:05 +05:00
Ammar Ahmed	998e62ade7	mobile: fix file picker does not attach file when tabId=0	2024-08-28 10:29:05 +05:00
Abdullah Atta	ac16bc74fc	web: fix cache file store	2024-08-27 18:07:42 +05:00
Abdullah Atta	2aee26b082	web: restore attachment files even if they are already uploaded	2024-08-27 18:07:27 +05:00
Abdullah Atta	a188920d96	web: show but disable automatic backup settings for basic users	2024-08-27 18:07:11 +05:00
Abdullah Atta	1f3defc28c	web: bump version to 3.0.14	2024-08-27 16:20:12 +05:00
Ammar Ahmed	7aeeabfb3a	mobile: run sync on startup	2024-08-27 16:06:11 +05:00
Abdullah Atta	6641d3e625	web: prevent multiple simultaneous syncs	2024-08-27 16:06:11 +05:00
Abdullah Atta	72031617eb	web: run sync immediately on init	2024-08-27 16:06:11 +05:00
Abdullah Atta	78090b700b	web: remove debouncer for page visibility and connection changes	2024-08-27 16:06:11 +05:00
Abdullah Atta	f2f8d81b98	core: do not run sync before connecting sse	2024-08-27 16:06:11 +05:00
Abdullah Atta	84d68ca67b	core: add more tests	2024-08-27 16:04:51 +05:00
Abdullah Atta	6368e47712	clipper(web): bump version to 0.3.3	2024-08-27 13:23:37 +05:00
Abdullah Atta	0f17b01a74	desktop: disable native crypto	2024-08-27 13:07:09 +05:00
Abdullah Atta	025e23356a	editor: fix crash on drag dropping an embed node	2024-08-27 13:03:20 +05:00
Muhammad Ali	ac85002dff	editor: fix crash when adding tasklist using md in heading or other nodes (#5923 ) * editor: fixed adding tasklist using md in heading * editor: reset nodes before converting them to a task list --------- Co-authored-by: Abdullah Atta <abdullahatta@streetwriters.co>	2024-08-27 12:49:19 +05:00
ChampionBuffalo	3a23e4fbaf	web: Fix `isNarrow` overriding user-preference of navpane Signed-off-by: ChampionBuffalo <49675578+ChampionBuffalo1@users.noreply.github.com>	2024-08-27 12:36:48 +05:00
Muhammad Ali	3547663af8	docs: add merge-conflicts file to help (#6420 ) * Update merge-conflicts.md edited merge conflict file Signed-off-by: Muhammad Ali <alihamuh@gmail.com> * Update merge-conflicts.md Signed-off-by: Muhammad Ali <alihamuh@gmail.com> * Update merge-conflicts.md Signed-off-by: Muhammad Ali <alihamuh@gmail.com> * Update merge-conflicts.md Signed-off-by: Muhammad Ali <alihamuh@gmail.com> * Update merge-conflicts.md Signed-off-by: Muhammad Ali <alihamuh@gmail.com> * Update merge-conflicts.md Signed-off-by: Muhammad Ali <alihamuh@gmail.com> * Update merge-conflicts.md Signed-off-by: Muhammad Ali <alihamuh@gmail.com> * Update merge-conflicts.md Signed-off-by: Muhammad Ali <alihamuh@gmail.com> * docs(help): update merge conflicts * docs: added merge-conflicts file --------- Signed-off-by: Muhammad Ali <alihamuh@gmail.com> Co-authored-by: Abdullah Atta <abdullahatta@streetwriters.co>	2024-08-23 16:43:41 +05:00
Abdullah Atta	c5dfc02085	web: minor refactors	2024-08-21 13:14:17 +05:00
Ammar Ahmed	bb9a6431bf	mobile: remove telemetry	2024-08-20 15:08:41 +05:00
Abdullah Atta	624d3d7ce8	web: remove unused analytics import	2024-08-20 15:08:41 +05:00
Abdullah Atta	170b0aa49a	web: get rid of all telemetry & analytics code	2024-08-20 15:08:41 +05:00
Muhammad Ali	07cfd74506	Delete docs/help/contents/merge-conflict.md Signed-off-by: Muhammad Ali <alihamuh@gmail.com>	2024-08-20 14:56:56 +05:00
Muhammad Ali	1d40054ac0	Create merge-conflict.md Signed-off-by: Muhammad Ali <alihamuh@gmail.com>	2024-08-20 14:56:09 +05:00
Muhammad Ali	5cd37f4b64	Create merge-conflicts.md Signed-off-by: Muhammad Ali <alihamuh@gmail.com>	2024-08-20 14:53:51 +05:00
Tai Lam	25675f71e8	help: Capitalize all instances of "URL" (#6402 ) Capitalize all instances of "URL" Signed-off-by: Tai Lam <47955724+taivlam@users.noreply.github.com>	2024-08-20 12:55:27 +05:00
Ammar Ahmed	202534fca9	mobile: correctly handle error on backup failed	2024-08-19 10:51:14 +05:00
Ammar Ahmed	a57558d8ab	mobile: fix restoring backups	2024-08-19 10:50:44 +05:00
Ammar Ahmed	f1c201dca9	core: fix reset attachment failed status	2024-08-19 10:50:44 +05:00
Ammar Ahmed	a73bff83fa	mobile: bump version	2024-08-17 17:59:44 +05:00
Abdullah Atta	e4428299bc	web: fix trial expired reminder dialog shown again and again	2024-08-16 18:10:35 +05:00
Abdullah Atta	487567ffbc	web: upgrade paddle checkout code	2024-08-16 18:06:07 +05:00
Abdullah Atta	efd83e6de3	web: add debug logging to checkout	2024-08-16 11:22:13 +05:00
Ammar Ahmed	a07230f707	mobile: remove old patches	2024-08-16 10:52:16 +05:00
Abdullah Atta	35a2e11afd	web: improve toast shown to basic users on using pro features	2024-08-16 10:28:39 +05:00
Abdullah Atta	cf4a7a3d34	core: limit notebooks to 20 on basic plan	2024-08-16 10:28:39 +05:00
Abdullah Atta	86e661ccd6	core: do not allow creating colors in basic plan	2024-08-16 10:28:39 +05:00
Abdullah Atta	e7be9b35ed	core: limit tags to 5 on basic plan	2024-08-16 10:28:39 +05:00
Muhammad Ali	53a367b0b2	clipper(web): fix web clipper not capturing images (#6348 ) * clipper: added config settings for images * clipper(web): enable image clipping * clipper(web): fix clipper not respecting cors proxy setting --------- Co-authored-by: Abdullah Atta <abdullahatta@streetwriters.co>	2024-08-16 10:28:14 +05:00
Ammar Ahmed	b6206e2ca7	mobile: take backup before logout	2024-08-14 12:53:57 +05:00
Abdullah Atta	a910c819f2	web: fix error text ui	2024-08-14 12:53:57 +05:00
Abdullah Atta	6dd7a4960f	web: show warning if there are unsynced changes on logout	2024-08-14 12:53:57 +05:00
Abdullah Atta	c4e15b8f90	web: ask to create backup before logout in all cases	2024-08-14 12:53:57 +05:00
Abdullah Atta	f458a4b86a	web: check unsynced changes and ask for backup before logout	2024-08-14 12:53:57 +05:00
Abdullah Atta	8a44a7b99a	core: add api for checking unsynced changes	2024-08-14 12:53:57 +05:00
Ammar Ahmed	25065c01a0	mobile: Fix apk size increase in v3.0.13	2024-08-14 12:19:42 +05:00
Abdullah Atta	87ae9e86e7	editor: remove 500ms debounce from image observer	2024-08-14 09:18:26 +05:00
Abdullah Atta	782c53b622	web: impl chunkSize method for faster file size calculation	2024-08-14 09:18:26 +05:00
Abdullah Atta	cb52b390ab	fs: add chunkSize method for faster file size calculation	2024-08-14 09:18:26 +05:00
Abdullah Atta	5a49941003	core: cache attachment key for faster attachment reading	2024-08-14 09:18:26 +05:00
Ammar Ahmed	6797b9b621	mobile: prompt before restoring a backup	2024-08-13 15:47:10 +05:00
Ammar Ahmed	031a1b31b4	mobile: fix backup success toast	2024-08-13 15:40:10 +05:00
Ammar Ahmed	4e5762be45	mobile: check server compatible	2024-08-13 11:19:47 +05:00
Abdullah Atta	7a6ba5d1d1	web: check server version compatibility when testing connection	2024-08-13 11:19:47 +05:00
Abdullah Atta	cc3ccd041d	core: add function for checking compability with server	2024-08-13 11:19:47 +05:00
Ammar Ahmed	31453dc098	mobile: server configuration settings	2024-08-13 11:19:47 +05:00
Abdullah Atta	2e84099c80	web: fix typo	2024-08-13 11:19:47 +05:00
Abdullah Atta	5bbc0cd452	web: add support for changing server urls	2024-08-13 11:19:47 +05:00
Abdullah Atta	22aae401ba	web: improve checks before download & upload of attachment	2024-08-13 11:09:03 +05:00
Ammar Ahmed	97f135cd07	mobile: fix attachment downloading	2024-08-13 11:09:03 +05:00
Abdullah Atta	976f933233	web: check for s3 errors on downloading attachment	2024-08-13 11:09:03 +05:00
Ammar Ahmed	95fe1044d6	mobile: clean temp backup folders and files	2024-08-13 11:09:03 +05:00
Ammar Ahmed	677201e979	mobile: fix wording	2024-08-13 11:09:03 +05:00
Ammar Ahmed	6ec9370afb	mobile: add support for attachments cache	2024-08-13 11:09:03 +05:00
Abdullah Atta	bea0f1ab0e	core: fix conflicts being shown on non-conflicted notes	2024-08-13 11:09:03 +05:00
Abdullah Atta	5357be4741	web: cancel attachments caching on disabling offline mode	2024-08-13 11:09:03 +05:00
Abdullah Atta	02fdec74ce	web: fix bulk exists check for files	2024-08-13 11:09:03 +05:00
Abdullah Atta	dbc907ceeb	web: write downloading files to temporary location before moving	2024-08-13 11:09:03 +05:00
Abdullah Atta	7bb53a5e0c	fs: add support for moving files	2024-08-13 11:09:03 +05:00
Abdullah Atta	69cb24149d	core: fix progress when bulk downloading files	2024-08-13 11:09:03 +05:00
Abdullah Atta	438d412ae9	web: fix "too much recursion" error	2024-08-13 11:09:03 +05:00
Abdullah Atta	1b71edef45	web: change offline mode api	2024-08-13 11:09:03 +05:00
Abdullah Atta	a4c0e8412b	fs: add support for listing all files	2024-08-13 11:09:03 +05:00
Abdullah Atta	fbcb8675ca	core: optimize attachment caching in offline mode	2024-08-13 11:09:03 +05:00
Ammar Ahmed	fbf5c82d04	mobile: update wording	2024-08-13 11:09:03 +05:00
Ammar Ahmed	fa40c539ed	mobile: fix restoring backup files	2024-08-13 11:09:03 +05:00
Ammar Ahmed	f3218fdc31	mobile: fix restoring backup	2024-08-13 11:09:03 +05:00
Ammar Ahmed	d12ed967e3	mobile: add support for offline mode, backup with attachments	2024-08-13 11:09:03 +05:00
Abdullah Atta	b6021dc76b	web: fix backup tests for good	2024-08-13 11:09:03 +05:00
Abdullah Atta	f95442a828	web: fix backup tests	2024-08-13 11:09:03 +05:00
Abdullah Atta	846aae312e	core: fix backup tests	2024-08-13 11:09:03 +05:00
Abdullah Atta	68fdbcb7fc	web: better status reports when taking backups in background	2024-08-13 11:09:03 +05:00
Abdullah Atta	b938c58b67	web: take automatic backups in background	2024-08-13 11:09:03 +05:00
Abdullah Atta	759fba06ae	web: add options to create backups with attachments	2024-08-13 11:09:03 +05:00
Abdullah Atta	10e24ae632	web: add support for backup/restore of attachments	2024-08-13 11:09:03 +05:00
Abdullah Atta	341032c884	core: add support for including attachments in backups	2024-08-13 11:09:03 +05:00
Abdullah Atta	aa1fa0ca81	crypto: throw error if chunk decryption fails	2024-08-13 11:09:03 +05:00
Abdullah Atta	398432efde	web: add setting to toggle full offline mode	2024-08-13 11:09:03 +05:00
Abdullah Atta	57ddaafc16	core: download all attachments when full offline mode is on	2024-08-13 11:09:03 +05:00
Abdullah Atta	e4a755c69f	web: optimize attachment uploading	2024-08-13 11:09:03 +05:00
Abdullah Atta	053f70cdb4	fs: get rid of chunks property in file metadata	2024-08-13 11:09:03 +05:00
Abdullah Atta	cdcdc43cad	web: fix encryption progress when attaching files	2024-08-13 11:09:03 +05:00
Abdullah Atta	f1111191b1	clipper: ignore stylesheets that throw cors error	2024-08-13 11:07:20 +05:00
Abdullah Atta	529e2a4dfd	clipper(web): move to react 18	2024-08-13 11:07:20 +05:00
Abdullah Atta	d88d07a2b0	core: fix `Cannot read properties of null (reading 'length')` in migration	2024-08-11 11:48:19 +05:00
Abdullah Atta	197ff36c20	web: only show sync status in placeholder on first sync	2024-08-11 11:19:15 +05:00