mobile: set sticky state if not set already

.commitlintrc.js

@@ -10,7 +10,7 @@ const authors = readFileSync("AUTHORS", "utf-8");
 const isAuthor = authors.includes(`<${authorEmail}>`);
 
 const SCOPES = [
-  // for full list of scopes + details see: https://github.com/streetwriters/notesnook/blob/master/CONTRIBUTING.md#commit-guidelines
+  // for full list of scopes + details see: https://github.com/streetwriters/notesnook-private/blob/master/CONTRIBUTING.md#commit-guidelines
 
   "mobile",
   "web",
@@ -36,8 +36,7 @@ const SCOPES = [
   "global",
   "docs",
   "themebuilder",
-  "intl",
-  "webclipper"
+  "intl"
 ];
 
 module.exports = {

.github/workflows/android.e2e.yml

@@ -1,100 +0,0 @@
-name: e2e-android
-on: workflow_dispatch
-
-jobs:
-  e2e-android:
-    runs-on: ubuntu-latest
-    env:
-      API_LEVEL: 34
-      ARCH: x86_64
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Enable KVM
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-
-      - name: Free Disk Space
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: false
-          android: false
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Install node modules
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=mobile
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-version: wrapper
-          cache-read-only: false
-
-      - name: Use specific Java version for the builds
-        uses: joschi/setup-jdk@v2
-        with:
-          java-version: "17"
-          architecture: "x64"
-
-      - name: Install Detox CLI
-        run: npm install detox-cli --global
-
-      - name: Detox build
-        run: |
-          yarn build:android
-          ls apps/mobile/native/android/app/build/outputs/apk
-          ls apps/mobile/native/android/app/build/outputs/apk/release
-
-      - name: Get device name
-        id: device
-        run: |
-          AVD_NAME=$(node -p "require('./apps/mobile/native/.detoxrc.js').devices.emulator.device.avdName")
-          echo "AVD_NAME=$AVD_NAME" >> $GITHUB_OUTPUT
-
-      - name: AVD cache
-        uses: actions/cache@v4
-        id: avd-cache
-        with:
-          path: |
-            ~/.android/avd/*
-            ~/.android/adb*
-          key: ${{ steps.device.outputs.AVD_NAME }}
-
-      - name: create AVD and generate snapshot for caching
-        if: steps.avd-cache.outputs.cache-hit != 'true'
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ env.API_LEVEL }}
-          arch: ${{ env.ARCH }}
-          avd-name: ${{ steps.device.outputs.AVD_NAME }}
-          force-avd-creation: false
-          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: true
-          script: echo "Generated AVD snapshot for caching."
-
-      - name: Detox test
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ env.API_LEVEL }}
-          arch: ${{ env.ARCH }}
-          avd-name: ${{ steps.device.outputs.AVD_NAME }}
-          disable-animations: true
-          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          force-avd-creation: false
-          script: yarn test:android --headless --record-logs failing --record-videos failing --take-screenshots failing
-
-      - name: Upload artifacts
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: detox-artifacts
-          path: artifacts
-          retention-days: 14

.github/workflows/core.tests.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/desktop.publish.yml

@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -84,26 +84,6 @@ jobs:
           files: ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip
           prerelease: ${{ endsWith(steps.app_metadata.outputs.app_version, '-beta') }}
 
-      - name: Generate flatpak sources
-        if: inputs.publish-github && inputs.build-linux
-        run: |
-          sudo apt-get install -y flatpak flatpak-builder pipx
-          git clone https://github.com/flatpak/flatpak-builder-tools.git /tmp/flatpak-builder-tools
-          cd /tmp/flatpak-builder-tools/node
-          pipx install .
-          cd -
-          node scripts/generate-sources.mjs
-
-      - name: Upload flatpak sources
-        uses: softprops/action-gh-release@v1
-        if: inputs.publish-github && inputs.build-linux
-        with:
-          draft: true
-          name: Notesnook Desktop v${{ steps.app_metadata.outputs.app_version }}
-          tag_name: v${{ steps.app_metadata.outputs.app_version }}
-          files: ./generated-sources.json
-          prerelease: ${{ endsWith(steps.app_metadata.outputs.app_version, '-beta') }}
-
   build-macos:
     name: Build for macOS
     needs: build
@@ -112,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -156,12 +136,6 @@ jobs:
           npm ci --ignore-scripts --prefer-offline --no-audit
           npm run bootstrap -- --scope=desktop
 
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/desktop
-
       - name: Install provisioning profile
         run: echo "${{ secrets.MAC_PROVISIONING_PROFILE }}" | base64 --decode > embedded.provisionprofile
         working-directory: ./apps/desktop
@@ -214,7 +188,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -238,12 +212,6 @@ jobs:
           npm ci --ignore-scripts --prefer-offline --no-audit
           npm run bootstrap -- --scope=desktop
 
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/desktop
-
       - name: Build Electron wrapper
         run: npx nx run release --project @notesnook/desktop
         working-directory: ./apps/desktop
@@ -279,7 +247,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup .NET Core SDK
         uses: actions/setup-dotnet@v2
@@ -304,12 +272,6 @@ jobs:
           npm ci --ignore-scripts --prefer-offline --no-audit
           npm run bootstrap -- --scope=desktop
 
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/desktop
-
       - name: Build
         run: npx nx run release --project @notesnook/desktop
 

.github/workflows/desktop.tests.yml

@@ -1,233 +0,0 @@
-name: Test @notesnook/desktop
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - "master"
-    paths:
-      - "app/desktop/**"
-      # re-run workflow if workflow file changes
-      - ".github/workflows/desktop.tests.yml"
-  pull_request:
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=web
-
-      - name: Setup environment
-        run: |
-          echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
-
-      - name: Generate desktop build
-        run: npx nx build:desktop @notesnook/web
-
-      - name: Archive build artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: build
-          path: apps/web/build/**/*
-
-  test-macos-x64:
-    name: Test macOS x64
-    needs: build
-    runs-on: macos-13
-
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Download build
-        uses: actions/download-artifact@v4
-        with:
-          name: build
-          path: ./apps/web/build
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
-
-      - name: Build Electron wrapper
-        run: npx nx run release --project @notesnook/desktop
-        working-directory: ./apps/desktop
-
-      - name: Build app
-        run: |
-          yarn electron-builder --mac --dir --x64
-        working-directory: ./apps/desktop
-
-      - name: Run tests x64
-        run: |
-          EXECUTABLE_PATH=output/mac/Notesnook.app/Contents/MacOS/Notesnook npm run test
-        working-directory: ./apps/desktop
-
-      - name: Upload test results
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: test-results-macos-x64
-          path: apps/desktop/test-results
-          retention-days: 5
-
-  test-macos:
-    name: Test macOS
-    needs: build
-    runs-on: macos-latest
-
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Download build
-        uses: actions/download-artifact@v4
-        with:
-          name: build
-          path: ./apps/web/build
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
-
-      - name: Build Electron wrapper
-        run: npx nx run release --project @notesnook/desktop
-        working-directory: ./apps/desktop
-
-      - name: Build app
-        run: |
-          yarn electron-builder --mac --dir --arm64
-        working-directory: ./apps/desktop
-
-      - name: Run tests arm64
-        run: |
-          EXECUTABLE_PATH=output/mac-arm64/Notesnook.app/Contents/MacOS/Notesnook npm run test
-        working-directory: ./apps/desktop
-
-      - name: Upload test results
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: test-results-macos
-          path: apps/desktop/test-results
-          retention-days: 5
-
-  test-linux:
-    name: Test for Linux
-    needs: build
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Download build
-        uses: actions/download-artifact@v4
-        with:
-          name: build
-          path: ./apps/web/build
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
-
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/desktop
-
-      - name: Build Electron wrapper
-        run: npx nx run release --project @notesnook/desktop
-        working-directory: ./apps/desktop
-
-      - name: Build app
-        run: |
-          yarn electron-builder --linux --dir --arm64 --x64
-        working-directory: ./apps/desktop
-
-      - name: Run tests
-        run: |
-          EXECUTABLE_PATH=output/linux-unpacked/notesnook xvfb-run --auto-servernum --server-args="-screen 0 1920x1080x24" -- npm run test
-        working-directory: ./apps/desktop
-
-      - name: Upload test results
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: test-results-linux
-          path: apps/desktop/test-results
-          retention-days: 5
-
-  test-windows:
-    name: Test for Windows
-    needs: build
-    runs-on: windows-latest
-
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Download build
-        uses: actions/download-artifact@v4
-        with:
-          name: build
-          path: ./apps/web/build
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
-
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/desktop
-
-      - name: Build Electron wrapper
-        run: npx nx run release --project @notesnook/desktop
-        working-directory: ./apps/desktop
-
-      - name: Build app
-        run: |
-          npx cross-env NOTESNOOK_STAGING=true yarn electron-builder --win --dir --arm64 --x64
-        working-directory: ./apps/desktop
-
-      - name: Run tests
-        run: |
-          npx cross-env EXECUTABLE_PATH=output/win-unpacked/Notesnook.exe npm run test
-        working-directory: ./apps/desktop
-
-      - name: Upload test results
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: test-results-win
-          path: apps/desktop/test-results
-          retention-days: 5

.github/workflows/editor.tests.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/help.publish.yml

@@ -1,6 +1,6 @@
 name: Publish Notesnook Help
 
-on:
+on: 
   workflow_dispatch:
   push:
     branches:
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable

.github/workflows/ios.publish.yml

@@ -4,7 +4,7 @@ on: workflow_dispatch
 
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: macos-13
     timeout-minutes: 60
 
     steps:

.github/workflows/theme-builder.publish.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/vericrypt.publish.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/web.benchmarks.yml

@@ -1,44 +0,0 @@
-name: Benchmark @notesnook/web
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - "master"
-    paths:
-      - "apps/web/**"
-      # re-run workflow if workflow file changes
-      - ".github/workflows/web.benchmarks.yml"
-  pull_request:
-
-jobs:
-  bench:
-    name: Bench
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=web
-
-      - name: Setup environment
-        run: |
-          echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
-
-      - name: Build
-        run: npm run build:web
-
-      - name: Install Playwright Browsers
-        run: npx playwright install chromium --with-deps
-        working-directory: apps/web
-
-      - name: Run benchmarks
-        id: benchmark
-        run: node __bench__/app.bench.mjs
-        working-directory: apps/web

.github/workflows/web.publish.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/web.tests.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -53,7 +53,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Download build
         uses: actions/download-artifact@v4

apps/desktop/__tests__/launch.test.mjs

@@ -1,53 +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 test from "node:test";
-import { launchApp } from "./utils.mjs";
-import assert from "assert";
-import slugify from "slugify";
-import path from "path";
-import { mkdir } from "fs/promises";
-
-test("make sure app loads", async (t) => {
-  const { app, page } = await launchApp();
-  try {
-    await page.waitForSelector("#authForm");
-
-    assert.ok(
-      await page.getByRole("button", { name: "Create account" }).isVisible()
-    );
-
-    await page
-      .getByRole("button", { name: "Skip & go directly to the app" })
-      .click();
-
-    await page.waitForSelector(".ProseMirror");
-  } catch (e) {
-    await mkdir("test-results", { recursive: true });
-    await page.screenshot({
-      path: path.join(
-        "test-results",
-        `${slugify(t.name)}-${process.platform}-${process.arch}-error.png`
-      )
-    });
-    throw e;
-  } finally {
-    await app.close();
-  }
-});

apps/desktop/package.json

@@ -2,25 +2,11 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "3.0.22",
+  "version": "3.0.18",
   "appAppleId": "1544027013",
   "private": true,
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
-  "types": "./dist/types/index.d.ts",
-  "sideEffects": false,
-  "exports": {
-    ".": {
-      "require": {
-        "types": "./dist/types/index.d.ts",
-        "default": "./dist/cjs/index.js"
-      },
-      "import": {
-        "types": "./dist/types/index.d.ts",
-        "default": "./dist/esm/index.js"
-      }
-    }
-  },
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "homepage": "https://notesnook.com/",
   "repository": "https://github.com/streetwriters/notesnook",
   "license": "GPL-3.0-or-later",
@@ -29,11 +15,10 @@
     "@notesnook/intl": "file:../../packages/intl",
     "@trpc/client": "10.45.2",
     "@trpc/server": "10.45.2",
-    "better-sqlite3-multiple-ciphers": "11.5.0",
+    "better-sqlite3-multiple-ciphers": "11.2.1",
     "electron-trpc": "0.6.1",
     "electron-updater": "^6.3.4",
     "icojs": "^0.19.4",
-    "sqlite-better-trigram": "^0.0.2",
     "typed-emitter": "^2.1.0",
     "yargs": "^17.7.2",
     "zod": "^3.23.8"
@@ -43,17 +28,14 @@
     "@types/node": "22.7.0",
     "@types/yargs": "^17.0.33",
     "chokidar": "^4.0.1",
-    "electron": "^31.7.4",
-    "electron-builder": "^25.1.8",
+    "electron": "^30.5.1",
+    "electron-builder": "^25.1.7",
     "esbuild": "^0.24.0",
     "node-abi": "^3.68.0",
     "node-gyp-build": "^4.8.2",
-    "playwright": "^1.48.2",
     "prebuildify": "^6.0.1",
-    "slugify": "^1.6.6",
     "tree-kill": "^1.2.2",
-    "undici": "^6.19.8",
-    "vitest": "^2.1.5"
+    "undici": "^6.19.8"
   },
   "optionalDependencies": {
     "dmg-license": "^1.0.11"
@@ -62,11 +44,10 @@
     "start": "node scripts/dev.mjs",
     "staging": "node scripts/build.mjs --run",
     "release": "node scripts/build.mjs",
-    "build": "node ../../scripts/build.mjs",
+    "build": "tsc",
     "bundle": "esbuild electron=./src/main.ts ./src/preload.ts --external:electron --external:fsevents --external:better-sqlite3-multiple-ciphers --external:sodium-native --minify --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=false --define:RELEASE=true",
     "bundle:mas": "esbuild electron=./src/main.ts ./src/preload.ts --minify --external:electron --external:fsevents --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=true --define:RELEASE=true",
-    "postinstall": "patch-package",
-    "test": "node --test --test-timeout 30000 --test-force-exit"
+    "postinstall": "patch-package"
   },
   "author": {
     "name": "Streetwriters (Private) Limited",
@@ -95,20 +76,7 @@
       "node_modules/file-uri-to-path",
       "node_modules/bindings",
       "node_modules/node-gyp-build",
-      "node_modules/sqlite-better-trigram",
       "node_modules/sodium-native/prebuilds/${platform}-${arch}",
-      {
-        "from": "node_modules/sqlite-better-trigram-linux-${arch}",
-        "to": "node_modules/sqlite-better-trigram-linux-${arch}"
-      },
-      {
-        "from": "node_modules/sqlite-better-trigram-darwin-${arch}",
-        "to": "node_modules/sqlite-better-trigram-darwin-${arch}"
-      },
-      {
-        "from": "node_modules/sqlite-better-trigram-windows-${arch}",
-        "to": "node_modules/sqlite-better-trigram-windows-${arch}"
-      },
       "node_modules/sodium-native/index.js",
       "node_modules/sodium-native/package.json"
     ],
@@ -181,12 +149,10 @@
           ]
         }
       ],
-      "signtoolOptions": {
-        "signingHashAlgorithms": [
-          "sha256"
-        ],
-        "sign": "./scripts/sign.js"
-      },
+      "signingHashAlgorithms": [
+        "sha256"
+      ],
+      "sign": "./scripts/sign.js",
       "icon": "assets/icons/app.ico"
     },
     "portable": {

apps/desktop/scripts/build.mjs

@@ -18,17 +18,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import path from "path";
-import fs from "fs/promises";
-import { existsSync } from "fs";
+import fs, { readFile, writeFile } from "fs/promises";
+import { existsSync, readFileSync } from "fs";
 import yargs from "yargs-parser";
 import os from "os";
 import * as childProcess from "child_process";
 import { fileURLToPath } from "url";
-import { patchBetterSQLite3 } from "./patch-better-sqlite3.mjs";
 
 const args = yargs(process.argv);
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
+const packageJson = JSON.parse(
+  readFileSync(path.join(__dirname, "..", "package.json"), "utf-8")
+);
 
 const webAppPath = path.resolve(path.join(__dirname, "..", "..", "web"));
 
@@ -44,6 +46,12 @@ if (args.rebuild || !existsSync(path.join(webAppPath, "build"))) {
 // temporary until there's support for prebuilt binaries for linux ARM
 if (os.platform() === "linux") await patchBetterSQLite3();
 
+// if (os.platform() === "win32")
+//   await exec(
+//     `npx prebuildify --arch=arm64 --strip -t electron@${packageJson.devDependencies.electron}`,
+//     path.join(__dirname, "..", "node_modules", "sodium-native")
+//   );
+
 await fs.cp(path.join(webAppPath, "build"), "build", {
   recursive: true,
   force: true
@@ -55,7 +63,7 @@ if (args.variant === "mas") {
   await exec(`yarn run bundle`);
 }
 
-await exec(`yarn run build`);
+await exec(`yarn tsc`);
 
 if (args.run) {
   await exec(`yarn electron-builder --dir --x64`);
@@ -75,3 +83,21 @@ async function exec(cmd, cwd) {
     cwd: cwd || process.cwd()
   });
 }
+
+async function patchBetterSQLite3() {
+  const jsonPath = path.join(
+    __dirname,
+    "..",
+    "node_modules",
+    "better-sqlite3-multiple-ciphers",
+    "package.json"
+  );
+  const json = JSON.parse(await readFile(jsonPath, "utf-8"));
+
+  json.version = "11.2.2";
+  json.homepage = "https://github.com/thecodrr/better-sqlite3-multiple-ciphers";
+  json.repository.url =
+    "git://github.com/thecodrr/better-sqlite3-multiple-ciphers.git";
+
+  await writeFile(jsonPath, JSON.stringify(json));
+}

apps/desktop/scripts/dev.mjs

@@ -36,8 +36,6 @@ const ENV = {
   FORCE_COLOR: "false",
   COLOR: "0"
 };
-process.chdir(path.join(__dirname, ".."));
-
 await onChange(true);
 
 console.log("Watching...");
@@ -55,13 +53,11 @@ async function onChange(first) {
   if (first) {
     await fs.rm("./build/", { force: true, recursive: true });
 
-    await exec("npm rebuild electron --verbose --foreground-scripts");
-
     await exec("yarn electron-builder install-app-deps");
   }
 
   await exec(`yarn run bundle`);
-  await exec(`yarn run build`);
+  execAsync(`yarn`, [`tsc`]);
 
   if (await isBundleSame()) {
     console.log("Bundle is same. Doing nothing.");

apps/desktop/scripts/patch-better-sqlite3.mjs

@@ -1,48 +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 { readFile, writeFile } from "fs/promises";
-import path from "path";
-import { fileURLToPath } from "url";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-export async function patchBetterSQLite3() {
-  const jsonPath = path.join(
-    __dirname,
-    "..",
-    "node_modules",
-    "better-sqlite3-multiple-ciphers",
-    "package.json"
-  );
-  const json = JSON.parse(await readFile(jsonPath, "utf-8"));
-
-  json.version = "11.5.1";
-  json.homepage = "https://github.com/thecodrr/better-sqlite3-multiple-ciphers";
-  json.repository.url =
-    "git://github.com/thecodrr/better-sqlite3-multiple-ciphers.git";
-
-  await writeFile(jsonPath, JSON.stringify(json));
-}
-
-if (process.argv[1] === __filename) {
-  console.log("Patching better-sqlite3");
-  patchBetterSQLite3();
-}

apps/desktop/src/api/sqlite-kysely.ts

@@ -46,8 +46,6 @@ export class SQLite {
     this.sqlite = require("better-sqlite3-multiple-ciphers")(
       filePath
     ).unsafeMode(true);
-    const betterTrigram = require("sqlite-better-trigram");
-    betterTrigram.load(this.sqlite);
   }
 
   /**

apps/desktop/src/index.ts

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-export { PATHS } from "./constants";
+export * from "./constants";
 export type { AppRouter } from "./api";
 export { type UpdateInfo } from "builder-util-runtime";
 export { type DesktopIntegration } from "./utils/config";

apps/desktop/src/main.ts

@@ -101,7 +101,7 @@ async function createWindow() {
     ...(config.desktopSettings.nativeTitlebar
       ? {}
       : {
-          titleBarStyle: process.platform === "win32" || process.platform === "darwin" ? "hidden" : "default",
+          titleBarStyle: "hidden",
           frame: process.platform === "win32" || process.platform === "darwin",
           titleBarOverlay: {
             height: 37,

apps/desktop/src/preload.ts

@@ -19,21 +19,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* eslint-disable no-var */
 
 import { ELECTRON_TRPC_CHANNEL } from "electron-trpc/main";
+import { type RendererGlobalElectronTRPC } from "electron-trpc/src/types";
 // import type { NNCrypto } from "@notesnook/crypto";
 import { ipcRenderer } from "electron";
 import { platform } from "os";
 
 declare global {
   var os: () => "mas" | ReturnType<typeof platform>;
-  var electronTRPC: any;
+  var electronTRPC: RendererGlobalElectronTRPC;
   // var NativeNNCrypto: (new () => NNCrypto) | undefined;
 }
 
 process.once("loaded", async () => {
-  const electronTRPC = {
-    sendMessage: (operation: any) =>
+  const electronTRPC: RendererGlobalElectronTRPC = {
+    sendMessage: (operation) =>
       ipcRenderer.send(ELECTRON_TRPC_CHANNEL, operation),
-    onMessage: (callback: any) =>
+    onMessage: (callback) =>
       ipcRenderer.on(ELECTRON_TRPC_CHANNEL, (_event, args) => callback(args))
   };
   globalThis.electronTRPC = electronTRPC;

apps/desktop/src/utils/theme.ts

@@ -57,8 +57,7 @@ function getSystemTheme() {
   nativeTheme.themeSource = oldThemeSource;
 
   setTimeout(
-    () =>
-      listeners.forEach((a) => nativeTheme.addListener("updated", () => a())),
+    () => listeners.forEach((a) => nativeTheme.addListener("updated", a)),
     1000
   );
   return currentTheme;
@@ -73,8 +72,7 @@ function changeTheme(theme: Theme) {
   nativeTheme.themeSource = theme;
 
   setTimeout(
-    () =>
-      listeners.forEach((a) => nativeTheme.addListener("updated", () => a())),
+    () => listeners.forEach((a) => nativeTheme.addListener("updated", a)),
     1000
   );
 }

apps/desktop/tsconfig.json

@@ -2,8 +2,7 @@
   "extends": "../../tsconfig",
   "compilerOptions": {
     "outDir": "./dist/",
-    "lib": ["ESNext"],
-    "moduleResolution": "Bundler"
+    "lib": ["ESNext"]
   },
   "include": ["src", "global.d.ts"]
 }

apps/mobile/.gitignore

@@ -39,7 +39,6 @@ DerivedData
 *.xcuserstate
 *.hprof
 **/.xcode.env.local
-native/cache
 # Android/IntelliJ
 #
 rn-build-deps/

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

@@ -17,16 +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 Sodium, { Cipher, Password } from "@ammarahmed/react-native-sodium";
-import { SerializedKey } from "@notesnook/crypto";
+import Sodium from "@ammarahmed/react-native-sodium";
 import { Platform } from "react-native";
 import "react-native-get-random-values";
 import * as Keychain from "react-native-keychain";
 import { MMKVLoader, ProcessingModes } from "react-native-mmkv-storage";
 import { generateSecureRandom } from "react-native-securerandom";
 import { DatabaseLogger } from ".";
-import { ToastManager } from "../../services/event-manager";
 import { MMKV } from "./mmkv";
+import { ToastManager } from "../../services/event-manager";
 
 // Database key cipher is persisted across different user sessions hence it has
 // it's independent storage which we will never clear. This is only used when application has
@@ -63,7 +62,6 @@ const KEYSTORE_CONFIG = Platform.select({
 
 function generatePassword() {
   const length = 80;
-  //@ts-ignore
   const crypto = window.crypto || window.msCrypto;
   if (typeof crypto === "undefined") {
     throw new Error(
@@ -80,27 +78,27 @@ function generatePassword() {
   return secret;
 }
 
-export async function encryptDatabaseKeyWithPassword(appLockPassword: string) {
-  const key = (await getDatabaseKey()) as string;
+export async function encryptDatabaseKeyWithPassword(appLockPassword) {
+  const key = getDatabaseKey();
   const appLockCredentials = await Sodium.deriveKey(
     appLockPassword,
     NOTESNOOK_APPLOCK_KEY_SALT
   );
-  const databaseKeyCipher = (await encrypt(appLockCredentials, key)) as Cipher;
+  const databaseKeyCipher = await encrypt(appLockCredentials, key);
   MMKV.setMap(DB_KEY_CIPHER, databaseKeyCipher);
   // We reset the database key from keychain once app lock password is set.
   await Keychain.resetInternetCredentials(KEYCHAIN_SERVER_DBKEY);
   return true;
 }
 
-export async function restoreDatabaseKeyToKeyChain(appLockPassword: string) {
-  const databaseKeyCipher: Cipher = CipherStorage.getMap(DB_KEY_CIPHER);
-  const databaseKey = (await decrypt(
+export async function restoreDatabaseKeyToKeyChain(appLockPassword) {
+  const databaseKeyCipher = CipherStorage.getMap(DB_KEY_CIPHER);
+  const databaseKey = await decrypt(
     {
       password: appLockPassword
     },
     databaseKeyCipher
-  )) as string;
+  );
 
   await Keychain.setInternetCredentials(
     KEYCHAIN_SERVER_DBKEY,
@@ -112,16 +110,13 @@ export async function restoreDatabaseKeyToKeyChain(appLockPassword: string) {
   return true;
 }
 
-export async function setAppLockVerificationCipher(appLockPassword: string) {
+export async function setAppLockVerificationCipher(appLockPassword) {
   try {
     const appLockCredentials = await Sodium.deriveKey(
       appLockPassword,
       NOTESNOOK_APPLOCK_KEY_SALT
     );
-    const encrypted = (await encrypt(
-      appLockCredentials,
-      generatePassword()
-    )) as Cipher;
+    const encrypted = await encrypt(appLockCredentials, generatePassword());
     CipherStorage.setMap(APPLOCK_CIPHER, encrypted);
     DatabaseLogger.info("setAppLockVerificationCipher");
   } catch (e) {
@@ -134,9 +129,9 @@ export async function clearAppLockVerificationCipher() {
   CipherStorage.removeItem(APPLOCK_CIPHER);
 }
 
-export async function validateAppLockPassword(appLockPassword: string) {
+export async function validateAppLockPassword(appLockPassword) {
   try {
-    const appLockCipher: Cipher = CipherStorage.getMap(APPLOCK_CIPHER);
+    const appLockCipher = CipherStorage.getMap(APPLOCK_CIPHER);
     if (!appLockCipher) return true;
     const key = await Sodium.deriveKey(appLockPassword, appLockCipher.salt);
     const decrypted = await decrypt(key, appLockCipher);
@@ -151,18 +146,17 @@ export async function validateAppLockPassword(appLockPassword: string) {
   }
 }
 
-let DB_KEY: string | undefined;
+let DB_KEY;
 export function clearDatabaseKey() {
   DB_KEY = undefined;
   DatabaseLogger.info("Cleared database key");
 }
 
-export async function getDatabaseKey(appLockPassword?: string) {
+export async function getDatabaseKey(appLockPassword) {
   if (DB_KEY) return DB_KEY;
   try {
     if (appLockPassword) {
-      const databaseKeyCipher: Cipher =
-        CipherStorage.getMap("databaseKeyCipher");
+      const databaseKeyCipher = CipherStorage.getMap("databaseKeyCipher");
       const databaseKey = await decrypt(
         {
           password: appLockPassword
@@ -178,12 +172,13 @@ export async function getDatabaseKey(appLockPassword?: string) {
         KEYCHAIN_SERVER_DBKEY
       );
       if (hasKey) {
-        const credentials = await Keychain.getInternetCredentials(
-          KEYCHAIN_SERVER_DBKEY
+        let credentials = await Keychain.getInternetCredentials(
+          KEYCHAIN_SERVER_DBKEY,
+          KEYSTORE_CONFIG
         );
 
         DatabaseLogger.info("Getting database key from Keychain");
-        DB_KEY = (credentials as Keychain.UserCredentials).password;
+        DB_KEY = credentials.password;
       }
     }
 
@@ -195,7 +190,7 @@ export async function getDatabaseKey(appLockPassword?: string) {
         NOTESNOOK_DB_KEY_SALT
       );
 
-      DB_KEY = derivedDatabaseKey.key as string;
+      DB_KEY = derivedDatabaseKey.key;
 
       await Keychain.setInternetCredentials(
         KEYCHAIN_SERVER_DBKEY,
@@ -207,17 +202,18 @@ export async function getDatabaseKey(appLockPassword?: string) {
 
     if (await Keychain.hasInternetCredentials("notesnook")) {
       const userKeyCredentials = await Keychain.getInternetCredentials(
-        "notesnook"
+        "notesnook",
+        KEYSTORE_CONFIG
       );
 
       if (userKeyCredentials) {
-        const userKeyCipher: Cipher = (await encrypt(
+        const userKeyCipher = await encrypt(
           {
             key: DB_KEY,
             salt: NOTESNOOK_DB_KEY_SALT
           },
           userKeyCredentials.password
-        )) as Cipher;
+        );
         // Store encrypted user key in MMKV
         MMKV.setMap(USER_KEY_CIPHER, userKeyCipher);
         await Keychain.resetInternetCredentials("notesnook");
@@ -227,84 +223,45 @@ export async function getDatabaseKey(appLockPassword?: string) {
 
     return DB_KEY;
   } catch (e) {
-    ToastManager.error(e as Error, "Error getting database key");
+    ToastManager.error(e, "Error getting database key");
     console.log(e, "error");
     DatabaseLogger.error(e);
     return null;
   }
 }
 
-export async function deriveCryptoKeyFallback(data: SerializedKey) {
-  if (Platform.OS !== "ios") return;
+export async function deriveCryptoKey(data) {
   try {
-    if (!data.password || !data.salt)
-      throw new Error(
-        "Invalid password and salt provided to deriveCryptoKeyFallback"
-      );
-
-    const credentials = await Sodium.deriveKeyFallback?.(
-      data.password,
-      data.salt
+    let credentials = await Sodium.deriveKey(data.password, data.salt);
+    const userKeyCipher = await encrypt(
+      {
+        key: await getDatabaseKey(),
+        salt: NOTESNOOK_DB_KEY_SALT
+      },
+      credentials.key
     );
-
-    if (!credentials) return;
-
-    const userKeyCipher = (await encrypt(
-      {
-        key: (await getDatabaseKey()) as string,
-        salt: NOTESNOOK_DB_KEY_SALT
-      },
-      credentials.key as string
-    )) as Cipher<"base64">;
-    DatabaseLogger.info("User key fallback stored: ", {
-      userKeyCipher: !!userKeyCipher
-    });
+    DatabaseLogger.info("User key stored: ", !!userKeyCipher);
 
     // Store encrypted user key in MMKV
     MMKV.setMap(USER_KEY_CIPHER, userKeyCipher);
+    return credentials.key;
   } catch (e) {
     DatabaseLogger.error(e);
   }
 }
 
-export async function deriveCryptoKey(data: SerializedKey) {
+export async function getCryptoKey(_name) {
   try {
-    if (!data.password || !data.salt)
-      throw new Error("Invalid password and salt provided to deriveCryptoKey");
+    const keyCipher = MMKV.getMap(USER_KEY_CIPHER);
 
-    const credentials = (await Sodium.deriveKey(
-      data.password,
-      data.salt
-    )) as Password;
-    const userKeyCipher = (await encrypt(
-      {
-        key: (await getDatabaseKey()) as string,
-        salt: NOTESNOOK_DB_KEY_SALT
-      },
-      credentials.key as string
-    )) as Cipher<"base64">;
-    DatabaseLogger.info("User key stored: ", {
-      userKeyCipher: !!userKeyCipher
-    });
-
-    // Store encrypted user key in MMKV
-    MMKV.setMap(USER_KEY_CIPHER, userKeyCipher);
-  } catch (e) {
-    DatabaseLogger.error(e);
-  }
-}
-
-export async function getCryptoKey() {
-  try {
-    const keyCipher: Cipher = MMKV.getMap(USER_KEY_CIPHER);
     if (!keyCipher) {
       DatabaseLogger.info("User key cipher is null");
-      return undefined;
+      return null;
     }
 
     const key = await decrypt(
       {
-        key: (await getDatabaseKey()) as string,
+        key: await getDatabaseKey(),
         salt: keyCipher.salt
       },
       keyCipher
@@ -317,7 +274,7 @@ export async function getCryptoKey() {
   }
 }
 
-export async function removeCryptoKey() {
+export async function removeCryptoKey(_name) {
   try {
     MMKV.removeItem(USER_KEY_CIPHER);
     await Keychain.resetInternetCredentials("notesnook");
@@ -327,69 +284,44 @@ export async function removeCryptoKey() {
   }
 }
 
-export async function getRandomBytes(length: number) {
+export async function getRandomBytes(length) {
   return await generateSecureRandom(length);
 }
 
-export async function hash(
-  password: string,
-  email: string,
-  options?: { usesFallback?: boolean }
-) {
-  DatabaseLogger.log(`Hashing password: fallback: ${options?.usesFallback}`);
+export async function hash(password, email) {
+  let result = await Sodium.hashPassword(password, email);
+  return result;
+}
 
-  if (options?.usesFallback && Platform.OS !== "ios") {
-    return null;
+export async function generateCryptoKey(password, salt) {
+  try {
+    let credentials = await Sodium.deriveKey(password, salt || null);
+    return credentials;
+  } catch (e) {
+    DatabaseLogger.error(e);
   }
-
-  return (
-    options?.usesFallback
-      ? await Sodium.hashPasswordFallback?.(password, email)
-      : await Sodium.hashPassword(password, email)
-  ) as string;
 }
 
-export async function generateCryptoKey(password: string, salt?: string) {
-  return (await Sodium.deriveKey(password, salt)) as Promise<SerializedKey>;
-}
-
-export function getAlgorithm(base64Variant: number) {
+export function getAlgorithm(base64Variant) {
   return `xcha-argon2i13-${base64Variant}`;
 }
 
-export async function decrypt(password: SerializedKey, data: Cipher<"base64">) {
-  const _data = { ...data };
+export async function decrypt(password, data) {
+  if (!password.password && !password.key) return undefined;
+  if (password.password && password.password === "" && !password.key)
+    return undefined;
+  let _data = { ...data };
   _data.output = "plain";
 
   if (!password.salt) password.salt = data.salt;
-
-  if (Platform.OS === "ios" && !password.key && password.password) {
-    const key = await Sodium.deriveKey(password.password, password.salt);
-    try {
-      return await Sodium.decrypt(key, _data);
-    } catch (e) {
-      const fallbackKey = await Sodium.deriveKeyFallback?.(
-        password.password,
-        password.salt
-      );
-      if (Platform.OS === "ios" && fallbackKey) {
-        DatabaseLogger.info("Using fallback key for decryption");
-      }
-      if (fallbackKey) {
-        return await Sodium.decrypt(fallbackKey, _data);
-      } else {
-        throw e;
-      }
-    }
-  }
-
   return await Sodium.decrypt(password, _data);
 }
 
-export async function decryptMulti(
-  password: Password,
-  data: Cipher<"base64">[]
-) {
+export async function decryptMulti(password, data) {
+  if (!password.password && !password.key) return undefined;
+  if (password.password && password.password === "" && !password.key)
+    return undefined;
+
   data = data.map((d) => {
     d.output = "plain";
     return d;
@@ -399,30 +331,10 @@ export async function decryptMulti(
     password.salt = data[0].salt;
   }
 
-  if (Platform.OS === "ios" && !password.key && password.password) {
-    const key = await Sodium.deriveKey(password.password, password.salt);
-    try {
-      return await Sodium.decryptMulti(key, data);
-    } catch (e) {
-      const fallbackKey = await Sodium.deriveKeyFallback?.(
-        password.password,
-        password.salt as string
-      );
-      if (Platform.OS === "ios" && fallbackKey) {
-        DatabaseLogger.info("Using fallback key for decryption");
-      }
-      if (fallbackKey) {
-        return await Sodium.decryptMulti(fallbackKey, data);
-      } else {
-        throw e;
-      }
-    }
-  }
-
   return await Sodium.decryptMulti(password, data);
 }
 
-export function parseAlgorithm(alg: string) {
+export function parseAlgorithm(alg) {
   if (!alg) return {};
   const [enc, kdf, compressed, compressionAlg, base64variant] = alg.split("-");
   return {
@@ -434,11 +346,16 @@ export function parseAlgorithm(alg: string) {
   };
 }
 
-export async function encrypt(password: SerializedKey, plainText: string) {
-  const result = await Sodium.encrypt<"base64">(password, {
+export async function encrypt(password, data) {
+  if (!password.password && !password.key) return undefined;
+  if (password.password && password.password === "" && !password.key)
+    return undefined;
+
+  let message = {
     type: "plain",
-    data: plainText
-  });
+    data: data
+  };
+  let result = await Sodium.encrypt(password, message);
 
   return {
     ...result,
@@ -446,13 +363,14 @@ export async function encrypt(password: SerializedKey, plainText: string) {
   };
 }
 
-export async function encryptMulti(
-  password: SerializedKey,
-  plainText: string[]
-) {
-  const results = await Sodium.encryptMulti<"base64">(
+export async function encryptMulti(password, data) {
+  if (!password.password && !password.key) return undefined;
+  if (password.password && password.password === "" && !password.key)
+    return undefined;
+
+  let results = await Sodium.encryptMulti(
     password,
-    plainText.map((item) => ({
+    data.map((item) => ({
       type: "plain",
       data: item
     }))

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

@@ -16,26 +16,26 @@ 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 "./logger";
 import { database } from "@notesnook/common";
-import { logger as dbLogger, ICompressor } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
+import { logger as dbLogger } from "@notesnook/core";
+import { Platform } from "react-native";
+import * as Gzip from "react-native-gzip";
+import EventSource from "../../utils/sse/even-source-ios";
+import AndroidEventSource from "../../utils/sse/event-source";
 import {
   SqliteAdapter,
   SqliteIntrospector,
   SqliteQueryCompiler
 } from "@streetwriters/kysely";
-import { Platform } from "react-native";
-import * as Gzip from "react-native-gzip";
-import SettingsService from "../../services/settings";
-import EventSource from "../../utils/sse/even-source-ios";
-import AndroidEventSource from "../../utils/sse/event-source";
-import { FileStorage } from "../filesystem";
-import { getDatabaseKey } from "./encryption";
-import "./logger";
+import filesystem from "../filesystem";
+import Storage from "./storage";
 import { RNSqliteDriver } from "./sqlite.kysely";
-import { Storage } from "./storage";
+import { getDatabaseKey } from "./encryption";
+import SettingsService from "../../services/settings";
+import { strings } from "@notesnook/intl";
 
-export async function setupDatabase(password?: string) {
+export async function setupDatabase(password) {
   const key = await getDatabaseKey(password);
   if (!key) throw new Error(strings.databaseSetupFailed());
 
@@ -47,21 +47,17 @@ export async function setupDatabase(password?: string) {
     SSE_HOST: "https://events.streetwriters.co",
     SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",
     ISSUES_HOST: "https://issues.streetwriters.co",
-    MONOGRAPH_HOST: "https://monogr.ph",
     ...(SettingsService.getProperty("serverUrls") || {})
   });
 
   database.setup({
     storage: Storage,
-    eventsource: (Platform.OS === "ios"
-      ? EventSource
-      : AndroidEventSource) as any,
-    fs: FileStorage,
-    compressor: async () =>
-      ({
-        compress: Gzip.deflate,
-        decompress: Gzip.inflate
-      } as ICompressor),
+    eventsource: Platform.OS === "ios" ? EventSource : AndroidEventSource,
+    fs: filesystem,
+    compressor: {
+      compress: Gzip.deflate,
+      decompress: Gzip.inflate
+    },
     batchSize: 100,
     sqliteOptions: {
       dialect: (name) => ({

apps/mobile/app/common/database/sqlite.kysely.ts

@@ -26,7 +26,7 @@ import { CompiledQuery } from "@streetwriters/kysely";
 import { QuickSQLiteConnection, open } from "react-native-quick-sqlite";
 import { strings } from "@notesnook/intl";
 
-type Config = { dbName: string; async: boolean; location?: string };
+type Config = { dbName: string; async: boolean; location: string };
 
 export class RNSqliteDriver implements Driver {
   private connection?: DatabaseConnection;

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

@@ -16,51 +16,58 @@ 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 { IStorage } from "@notesnook/core";
-import { MMKVInstance } from "react-native-mmkv-storage";
+
+import { Platform } from "react-native";
+import RNFetchBlob from "react-native-blob-util";
 import {
   decrypt,
   decryptMulti,
   deriveCryptoKey,
-  deriveCryptoKeyFallback,
   encrypt,
   encryptMulti,
   generateCryptoKey,
   getCryptoKey,
-  hash
+  getRandomBytes,
+  hash,
+  removeCryptoKey
 } from "./encryption";
 import { MMKV } from "./mmkv";
 
 export class KV {
-  storage: MMKVInstance;
-  constructor(storage: MMKVInstance) {
+  /**
+   * @type {typeof MMKV}
+   */
+  storage = null;
+  constructor(storage) {
     this.storage = storage;
   }
-
-  async read<T>(key: string, isArray?: boolean) {
-    if (!key) return undefined;
-    const data = this.storage.getString(key);
-    if (!data) return undefined;
+  async read(key) {
+    if (!key) return null;
+    let data = this.storage.getString(key);
+    if (!data) return null;
     try {
-      return JSON.parse(data) as T;
+      let parse = JSON.parse(data);
+      return parse;
     } catch (e) {
-      return data as T;
+      return data;
     }
   }
 
-  async write<T>(key: string, data: T) {
+  async write(key, data) {
     this.storage.setString(
       key,
       typeof data === "string" ? data : JSON.stringify(data)
     );
+
+    return true;
   }
 
-  async readMulti<T>(keys: string[]) {
+  async readMulti(keys) {
     if (keys.length <= 0) {
       return [];
     } else {
       try {
-        const data = await this.storage.getMultipleItemsAsync<any>(
+        let data = await this.storage.getMultipleItemsAsync(
           keys.slice(),
           "string"
         );
@@ -72,24 +79,24 @@ export class KV {
             obj = value;
           }
           return [key, obj];
-        }) as [string, T][];
+        });
       } catch (e) {
-        return [];
+        console.log(e);
       }
     }
   }
 
-  async remove(key: string) {
-    this.storage.removeItem(key);
+  async remove(key) {
+    return this.storage.removeItem(key);
   }
 
-  async removeMulti(keys: string[]) {
-    if (!keys) return;
-    this.storage.removeItems(keys);
+  async removeMulti(keys) {
+    if (!keys) return true;
+    return this.storage.removeItems(keys);
   }
 
   async clear() {
-    this.storage.clearStore();
+    return this.storage.clearStore();
   }
 
   async getAllKeys() {
@@ -106,45 +113,54 @@ export class KV {
     return keys;
   }
 
-  async writeMulti(items: [string, any][]) {
-    await this.storage.setMultipleItemsAsync(items, "object");
+  async writeMulti(items) {
+    return this.storage.setMultipleItemsAsync(items, "object");
   }
 }
 
 const DefaultStorage = new KV(MMKV);
 
-export const Storage: IStorage = {
-  write<T>(key: string, data: T): Promise<void> {
-    return DefaultStorage.write(key, data);
-  },
-  writeMulti<T>(entries: [string, T][]): Promise<void> {
-    return DefaultStorage.writeMulti(entries);
-  },
-  readMulti<T>(keys: string[]): Promise<[string, T][]> {
-    return DefaultStorage.readMulti(keys);
-  },
-  read<T>(key: string, isArray?: boolean): Promise<T | undefined> {
-    return DefaultStorage.read(key, isArray);
-  },
-  remove(key: string): Promise<void> {
-    return DefaultStorage.remove(key);
-  },
-  removeMulti(keys: string[]): Promise<void> {
-    return DefaultStorage.removeMulti(keys);
-  },
-  clear(): Promise<void> {
-    return DefaultStorage.clear();
-  },
-  getAllKeys(): Promise<string[]> {
-    return DefaultStorage.getAllKeys();
-  },
-  hash,
-  getCryptoKey,
+async function requestPermission() {
+  if (Platform.OS === "ios") return true;
+  return true;
+}
+async function checkAndCreateDir(path) {
+  let dir =
+    Platform.OS === "ios"
+      ? RNFetchBlob.fs.dirs.DocumentDir + path
+      : RNFetchBlob.fs.dirs.SDCardDir + "/Notesnook/" + path;
+
+  try {
+    let exists = await RNFetchBlob.fs.exists(dir);
+    let isDir = await RNFetchBlob.fs.isDir(dir);
+    if (!exists || !isDir) {
+      await RNFetchBlob.fs.mkdir(dir);
+    }
+  } catch (e) {
+    await RNFetchBlob.fs.mkdir(dir);
+  }
+  return dir;
+}
+
+export default {
+  read: (key) => DefaultStorage.read(key),
+  write: (key, value) => DefaultStorage.write(key, value),
+  readMulti: (keys) => DefaultStorage.readMulti(keys),
+  remove: (key) => DefaultStorage.remove(key),
+  clear: () => DefaultStorage.clear(),
+  getAllKeys: () => DefaultStorage.getAllKeys(),
+  writeMulti: (items) => DefaultStorage.writeMulti(items),
+  removeMulti: (keys) => DefaultStorage.removeMulti(keys),
   encrypt,
-  encryptMulti,
   decrypt,
   decryptMulti,
+  getRandomBytes,
+  checkAndCreateDir,
+  requestPermission,
   deriveCryptoKey,
+  getCryptoKey,
+  removeCryptoKey,
+  hash,
   generateCryptoKey,
-  deriveCryptoKeyFallback
+  encryptMulti
 };

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

@@ -16,6 +16,7 @@ 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 Sodium from "@ammarahmed/react-native-sodium";
 import { getFileNameWithExtension } from "@notesnook/core";
 import { strings } from "@notesnook/intl";
@@ -25,11 +26,11 @@ import RNFetchBlob from "react-native-blob-util";
 import * as ScopedStorage from "react-native-scoped-storage";
 import { subscribe, zip } from "react-native-zip-archive";
 import { ShareComponent } from "../../components/sheets/export-notes/share";
-import { presentSheet, ToastManager } from "../../services/event-manager";
+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 filesystem from "../filesystem";
+import Storage from "../database/storage";
 import { createCacheDir, exists } from "./io";
 import { cacheDir, copyFileAsync, releasePermissions } from "./utils";
 
@@ -50,23 +51,23 @@ export async function downloadAllAttachments() {
 /**
  * Downloads provided attachments to a .zip file
  * on user's device.
- * @param {string[]} attachmentIds
+ * @param {string[]} attachments
  * @param onProgress
  * @returns
  */
-export async function downloadAttachments(attachmentIds: string[]) {
+export async function downloadAttachments(attachments) {
   await createCacheDir();
-  if (!attachmentIds || !attachmentIds.length) return;
+  if (!attachments || !attachments.length) return;
   const groupId = `download-all-${Date.now()}`;
 
   let outputFolder;
   if (Platform.OS === "android") {
     // Ask the user to select a directory to store the file
-    const file = await ScopedStorage.openDocumentTree(true);
+    let file = await ScopedStorage.openDocumentTree(true);
     outputFolder = file.uri;
     if (!outputFolder) return;
   } else {
-    outputFolder = await filesystem.checkAndCreateDir("/downloads/");
+    outputFolder = await Storage.checkAndCreateDir("/downloads/");
   }
 
   // Create the folder to zip;
@@ -82,7 +83,7 @@ export async function downloadAttachments(attachmentIds: string[]) {
   await RNFetchBlob.fs.mkdir(zipSourceFolder);
 
   const isCancelled = () => {
-    if (useAttachmentStore.getState().downloading?.[groupId]?.canceled) {
+    if (useAttachmentStore.getState().downloading[groupId]?.canceled) {
       RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
       useAttachmentStore.getState().setDownloading({
         groupId,
@@ -96,21 +97,19 @@ export async function downloadAttachments(attachmentIds: string[]) {
     }
   };
 
-  for (let i = 0; i < attachmentIds.length; i++) {
+  for (let i = 0; i < attachments.length; i++) {
     if (isCancelled()) return;
-    const attachment = await db.attachments.attachment(attachmentIds[i]);
-    if (!attachment) continue;
-
+    let attachment = await db.attachments.attachment(attachments[i]);
     const hash = attachment.hash;
     try {
       useAttachmentStore.getState().setDownloading({
         groupId: groupId,
         current: i + 1,
-        total: attachmentIds.length,
+        total: attachments.length,
         filename: attachment.hash
       });
       // Download to cache
-      const uri = await downloadAttachment(hash, false, {
+      let uri = await downloadAttachment(hash, false, {
         silent: true,
         cache: true,
         groupId: groupId
@@ -141,7 +140,7 @@ export async function downloadAttachments(attachmentIds: string[]) {
     useAttachmentStore.getState().setDownloading({
       current: 0,
       total: 1,
-      message: strings.savingZipFile(),
+      message: `${strings.savingZipFile()}... ${strings.pleaseWait()}`,
       groupId
     });
     // If all goes well, zip the notesnook-attachments folder in cache.
@@ -151,7 +150,9 @@ export async function downloadAttachments(attachmentIds: string[]) {
         groupId,
         current: progress,
         total: 1,
-        message: strings.savingZipFile((progress * 100).toFixed(1))
+        message: `${strings.savingZipFile()} (${(progress * 100).toFixed(
+          1
+        )}%)... ${strings.pleaseWait()}`
       });
     });
     await zip(zipSourceFolder, zipOutputFile);
@@ -185,7 +186,7 @@ export async function downloadAttachments(attachmentIds: string[]) {
     });
     releasePermissions(outputFolder);
     sub?.remove();
-    ToastManager.error(e as Error, "Error zipping attachments");
+    ToastManager.error(e, "Error zipping attachments");
   }
   // Remove source & zip file from cache.
   RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
@@ -195,71 +196,49 @@ export async function downloadAttachments(attachmentIds: string[]) {
 }
 
 export default async function downloadAttachment(
-  hashOrId: string,
+  hash,
   global = true,
-  options?: {
-    silent?: boolean;
-    cache?: boolean;
-    throwError?: boolean;
-    groupId?: string;
-    base64?: boolean;
-    text?: boolean;
+  options = {
+    silent: false,
+    cache: false,
+    throwError: false,
+    groupId: undefined,
+    base64: false,
+    text: false
   }
 ) {
   await createCacheDir();
 
-  const attachment = await db.attachments.attachment(hashOrId);
+  let attachment = await db.attachments.attachment(hash);
   if (!attachment) {
-    DatabaseLogger.log("Attachment not found", {
-      hash: hashOrId
-    });
+    DatabaseLogger.log("Attachment not found");
     return;
   }
 
-  let folder: {
-    uri: string;
-  } | null = null;
-  if (!options?.cache) {
+  let folder = {};
+  if (!options.cache) {
     if (Platform.OS === "android") {
       folder = await ScopedStorage.openDocumentTree();
       if (!folder) return;
     } else {
-      folder = {
-        uri: await filesystem.checkAndCreateDir("/downloads/")
-      };
+      folder.uri = await Storage.checkAndCreateDir("/downloads/");
     }
   }
 
   try {
-    useAttachmentStore.getState().setDownloading({
-      groupId: options?.groupId || attachment.hash,
-      current: 0,
-      total: 1,
-      filename: attachment.filename
-    });
-
     await db
       .fs()
       .downloadFile(
-        options?.groupId || attachment.hash,
+        options.groupId || attachment.hash,
         attachment.hash,
         attachment.chunkSize
       );
-
-    useAttachmentStore.getState().setDownloading({
-      groupId: options?.groupId || attachment.hash,
-      current: 1,
-      total: 1,
-      filename: attachment.filename,
-      success: true
-    });
-
     if (!(await exists(attachment.hash))) {
       DatabaseLogger.log("Attachment does not exist after download.");
       return;
     }
 
-    if (options?.base64 || options?.text) {
+    if (options.base64 || options.text) {
       DatabaseLogger.log(`Starting to decrypt... hash: ${attachment.hash}`);
       return await db.attachments.read(
         attachment.hash,
@@ -267,16 +246,14 @@ export default async function downloadAttachment(
       );
     }
 
-    const filename = await getFileNameWithExtension(
+    let filename = getFileNameWithExtension(
       attachment.filename,
       attachment.mimeType
     );
 
-    const key = await db.attachments.decryptKey(attachment.key);
+    let key = await db.attachments.decryptKey(attachment.key);
 
-    if (!key) return;
-
-    const info = {
+    let info = {
       iv: attachment.iv,
       salt: attachment.salt,
       length: attachment.size,
@@ -284,18 +261,18 @@ export default async function downloadAttachment(
       hash: attachment.hash,
       hashType: attachment.hashType,
       mime: attachment.mimeType,
-      fileName: options?.cache ? undefined : filename,
-      uri: options?.cache ? undefined : folder?.uri,
+      fileName: options.cache ? undefined : filename,
+      uri: options.cache ? undefined : folder.uri,
       chunkSize: attachment.chunkSize,
       appGroupId: IOS_APPGROUPID
     };
     let fileUri = await Sodium.decryptFile(
       key,
       info,
-      options?.cache ? "cache" : "file"
+      options.cache ? "cache" : "file"
     );
 
-    if (!options?.silent) {
+    if (!options.silent) {
       ToastManager.show({
         heading: strings.network.downloadSuccess(),
         message: strings.network.fileDownloaded(filename),
@@ -303,15 +280,15 @@ export default async function downloadAttachment(
       });
     }
 
-    if (Platform.OS === "ios" && !options?.cache) {
-      fileUri = folder?.uri + `/${filename}`;
+    if (Platform.OS === "ios" && !options.cache) {
+      fileUri = folder.uri + `/${filename}`;
     }
-    if (!options?.silent) {
+    if (!options.silent) {
       presentSheet({
         title: strings.network.fileDownloaded(),
         paragraph: strings.fileSaved(filename, Platform.OS),
         icon: "download",
-        context: global ? "global" : attachment.hash,
+        context: global ? null : attachment.hash,
         component: <ShareComponent uri={fileUri} name={filename} padding={12} />
       });
     }
@@ -326,17 +303,9 @@ export default async function downloadAttachment(
         .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.hash}_dcache`)
         .catch(console.log);
     }
-
-    useAttachmentStore.getState().setDownloading({
-      groupId: options?.groupId || attachment.hash,
-      current: 0,
-      total: 0,
-      filename: attachment.filename,
-      success: false
-    });
     DatabaseLogger.error(e);
     useAttachmentStore.getState().remove(attachment.hash);
-    if (options?.throwError) {
+    if (options.throwError) {
       throw e;
     }
   }

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

@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { RequestOptions } from "@notesnook/core";
 import { strings } from "@notesnook/intl";
 import NetInfo from "@react-native-community/netinfo";
 import RNFetchBlob from "react-native-blob-util";
@@ -27,13 +26,7 @@ import { DatabaseLogger, db } from "../database";
 import { createCacheDir, exists } from "./io";
 import { ABYTES, cacheDir, getUploadedFileSize, parseS3Error } from "./utils";
 
-export async function downloadFile(
-  filename: string,
-  requestOptions: RequestOptions,
-  cancelToken: {
-    cancel: (reason?: string) => Promise<void>;
-  }
-) {
+export async function downloadFile(filename, requestOptions, cancelToken) {
   if (!requestOptions) {
     DatabaseLogger.log(
       `Error downloading file: ${filename}, reason: No requestOptions`
@@ -43,11 +36,9 @@ export async function downloadFile(
 
   DatabaseLogger.log(`Downloading ${filename}`);
   await createCacheDir();
-
-  const { url, headers, chunkSize } = requestOptions;
-  const tempFilePath = `${cacheDir}/${filename}_temp`;
-  const originalFilePath = `${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}`);
@@ -55,8 +46,6 @@ export async function downloadFile(
     }
 
     const attachment = await db.attachments.attachment(filename);
-    if (!attachment) return false;
-
     const size = await getUploadedFileSize(filename);
 
     if (size === -1) {
@@ -82,21 +71,21 @@ export async function downloadFile(
       throw new Error(error);
     }
 
-    const resolveUrlResponse = await fetch(url, {
+    let res = await fetch(url, {
       method: "GET",
       headers
     });
 
-    if (!resolveUrlResponse.ok) {
+    if (!res.ok) {
       DatabaseLogger.log(
-        `Error downloading file: ${filename}, ${resolveUrlResponse.status}, ${resolveUrlResponse.statusText}, reason: Unable to resolve download url`
+        `Error downloading file: ${filename}, ${res.status}, ${res.statusText}, reason: Unable to resolve download url`
       );
       throw new Error(
-        `${resolveUrlResponse.status}: ${strings.failedToResolvedDownloadUrl()}`
+        `${res.status}: ${strings.failedToResolvedDownloadUrl()}`
       );
     }
 
-    const downloadUrl = await resolveUrlResponse.text();
+    const downloadUrl = await res.text();
 
     if (!downloadUrl) {
       DatabaseLogger.log(
@@ -106,12 +95,12 @@ export async function downloadFile(
     }
 
     DatabaseLogger.log(`Download starting: ${filename}`);
-    const request = RNFetchBlob.config({
+    let request = RNFetchBlob.config({
       path: tempFilePath,
       IOSBackgroundTask: true,
       overwrite: true
     })
-      .fetch("GET", downloadUrl)
+      .fetch("GET", downloadUrl, null)
       .progress(async (recieved, total) => {
         useAttachmentStore
           .getState()
@@ -120,14 +109,15 @@ export async function downloadFile(
         DatabaseLogger.log(`Downloading: ${filename}, ${recieved}/${total}`);
       });
 
-    cancelToken.cancel = async (reason) => {
+    cancelToken.cancel = () => {
       useAttachmentStore.getState().remove(filename);
       request.cancel();
       RNFetchBlob.fs.unlink(tempFilePath).catch(console.log);
-      DatabaseLogger.log(`Download cancelled: ${reason} ${filename}`);
+      DatabaseLogger.log(`Download cancelled: ${filename}`);
     };
 
-    const response = await request;
+    let response = await request;
+    console.log(response.info().headers);
 
     const contentType =
       response.info().headers?.["content-type"] ||
@@ -138,10 +128,10 @@ export async function downloadFile(
       throw new Error(`[${error.Code}] ${error.Message}`);
     }
 
-    const status = response.info().status;
+    let status = response.info().status;
     useAttachmentStore.getState().remove(filename);
 
-    if (await exists(originalFilePath)) {
+    if (exists(originalFilePath)) {
       await RNFetchBlob.fs.unlink(originalFilePath).catch(console.log);
     }
 
@@ -153,14 +143,11 @@ export async function downloadFile(
 
     return status >= 200 && status < 300;
   } catch (e) {
-    if (
-      (e as Error).message !== "canceled" &&
-      !(e as Error).message.includes("NoSuchKey")
-    ) {
+    if (e.message !== "canceled" && !e.message.includes("NoSuchKey")) {
       const toast = {
-        heading: strings.downloadError((e as Error).message),
-        message: (e as Error).message,
-        type: "error" as const,
+        heading: strings.downloadError(),
+        message: e.message,
+        type: "error",
         context: "global"
       };
       ToastManager.show(toast);
@@ -171,14 +158,15 @@ export async function downloadFile(
     useAttachmentStore.getState().remove(filename);
     RNFetchBlob.fs.unlink(tempFilePath).catch(console.log);
     RNFetchBlob.fs.unlink(originalFilePath).catch(console.log);
-    DatabaseLogger.error(e, "Download failed: ", {
-      url
+    DatabaseLogger.error(e, {
+      url,
+      headers
     });
     return false;
   }
 }
 
-export async function checkAttachment(hash: string) {
+export async function checkAttachment(hash) {
   const internetState = await NetInfo.fetch();
   const isInternetReachable =
     internetState.isConnected && internetState.isInternetReachable;
@@ -196,7 +184,7 @@ export async function checkAttachment(hash: string) {
         failed: `File length is 0. Please upload this file again from the attachment manager. (File hash: ${hash})`
       };
   } catch (e) {
-    return { failed: (e as Error)?.message };
+    return { failed: e?.message };
   }
   return { success: true };
 }

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

@@ -17,40 +17,24 @@ 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 { IFileStorage } from "@notesnook/core";
 import { checkAttachment, downloadFile } from "./download";
 import {
-  bulkExists,
-  clearCache,
   clearFileStorage,
-  deleteCacheFileByName,
-  deleteCacheFileByPath,
   deleteFile,
   exists,
-  getCacheSize,
-  hashBase64,
   readEncrypted,
-  writeEncryptedBase64
-} from "./io";
-import { uploadFile } from "./upload";
-import {
-  cancelable,
-  checkAndCreateDir,
-  getUploadedFileSize,
-  requestPermission
-} from "./utils";
-
-export default {
-  checkAttachment,
+  writeEncryptedBase64,
+  hashBase64,
   clearCache,
   deleteCacheFileByName,
   deleteCacheFileByPath,
-  getCacheSize,
-  requestPermission,
-  checkAndCreateDir
-};
+  bulkExists,
+  getCacheSize
+} from "./io";
+import { uploadFile } from "./upload";
+import { cancelable, getUploadedFileSize } from "./utils";
 
-export const FileStorage: IFileStorage = {
+export default {
   readEncrypted,
   writeEncryptedBase64,
   hashBase64,
@@ -60,5 +44,10 @@ export const FileStorage: IFileStorage = {
   exists,
   clearFileStorage,
   getUploadedFileSize,
-  bulkExists
+  checkAttachment,
+  clearCache,
+  deleteCacheFileByName,
+  deleteCacheFileByPath,
+  bulkExists,
+  getCacheSize
 };

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

@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import Sodium from "@ammarahmed/react-native-sodium";
-import {
-  FileEncryptionMetadataWithHash,
-  FileEncryptionMetadataWithOutputType,
-  Output,
-  RequestOptions
-} from "@notesnook/core";
-import { DataFormat, SerializedKey } from "@notesnook/crypto";
 import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
 import { eSendEvent } from "../../services/event-manager";
@@ -32,21 +25,17 @@ import { IOS_APPGROUPID } from "../../utils/constants";
 import { DatabaseLogger, db } from "../database";
 import { ABYTES, cacheDir, cacheDirOld, getRandomId } from "./utils";
 
-export async function readEncrypted<TOutputFormat extends DataFormat>(
-  filename: string,
-  key: SerializedKey,
-  cipherData: FileEncryptionMetadataWithOutputType<TOutputFormat>
-) {
+export async function readEncrypted(filename, key, cipherData) {
   await migrateFilesFromCache();
   DatabaseLogger.log("Read encrypted file...");
-  const path = `${cacheDir}/${filename}`;
+  let path = `${cacheDir}/${filename}`;
 
   try {
     if (!(await exists(filename))) {
-      return;
+      return false;
     }
 
-    const output = await Sodium.decryptFile(
+    let output = await Sodium.decryptFile(
       key,
       {
         ...cipherData,
@@ -58,14 +47,15 @@ export async function readEncrypted<TOutputFormat extends DataFormat>(
 
     DatabaseLogger.log("File decrypted...");
 
-    return output as Output<TOutputFormat>;
+    return output;
   } catch (e) {
     RNFetchBlob.fs.unlink(path).catch(console.log);
     DatabaseLogger.error(e);
+    return false;
   }
 }
 
-export async function hashBase64(data: string) {
+export async function hashBase64(data) {
   const hash = await Sodium.hashFile({
     type: "base64",
     data,
@@ -77,70 +67,61 @@ export async function hashBase64(data: string) {
   };
 }
 
-export async function writeEncryptedBase64(
-  data: string,
-  encryptionKey: SerializedKey,
-  mimeType: string
-): Promise<FileEncryptionMetadataWithHash> {
+export async function writeEncryptedBase64(data, key) {
   await createCacheDir();
-  const filepath = cacheDir + `/${getRandomId("imagecache_")}`;
+  let filepath = cacheDir + `/${getRandomId("imagecache_")}`;
   await RNFetchBlob.fs.writeFile(filepath, data, "base64");
-  const output = await Sodium.encryptFile(encryptionKey, {
+  let output = await Sodium.encryptFile(key, {
     uri: Platform.OS === "ios" ? filepath : "file://" + filepath,
     type: "url"
   });
-
   RNFetchBlob.fs.unlink(filepath).catch(console.log);
   console.log("encrypted file output: ", output);
-
+  output.size = output.length;
+  delete output.length;
   return {
     ...output,
     alg: "xcha-stream"
   };
 }
 
-export async function deleteFile(
-  filename: string,
-  requestOptions?: RequestOptions
-): Promise<boolean> {
+export async function deleteFile(filename, data) {
   await createCacheDir();
-  const localFilePath = cacheDir + `/${filename}`;
-  if (!requestOptions) {
-    RNFetchBlob.fs.unlink(localFilePath).catch(console.log);
+  let delFilePath = cacheDir + `/${filename}`;
+  if (!data) {
+    if (!filename) return;
+    RNFetchBlob.fs.unlink(delFilePath).catch(console.log);
     return true;
   }
 
-  const { url, headers } = requestOptions;
-
+  let { url, headers } = data;
   try {
-    const response = await RNFetchBlob.fetch("DELETE", url, headers);
-    const status = response.info().status;
-    const ok = status >= 200 && status < 300;
+    let response = await RNFetchBlob.fetch("DELETE", url, headers);
+    let status = response.info().status;
+    let ok = status >= 200 && status < 300;
     if (ok) {
-      RNFetchBlob.fs.unlink(localFilePath).catch(console.log);
+      RNFetchBlob.fs.unlink(delFilePath).catch(console.log);
     }
     return ok;
   } catch (e) {
-    DatabaseLogger.error(e, "Delete file", {
-      url: url
-    });
+    console.log("delete file: ", e, url, headers);
     return false;
   }
 }
 
 export async function clearFileStorage() {
   try {
-    const files = await RNFetchBlob.fs.ls(cacheDir);
-    const oldCache = await RNFetchBlob.fs.ls(cacheDirOld);
+    let files = await RNFetchBlob.fs.ls(cacheDir);
+    let oldCache = await RNFetchBlob.fs.ls(cacheDirOld);
 
-    for (const file of files) {
+    for (let file of files) {
       await RNFetchBlob.fs.unlink(cacheDir + `/${file}`).catch(console.log);
     }
-    for (const file of oldCache) {
+    for (let file of oldCache) {
       await RNFetchBlob.fs.unlink(cacheDirOld + `/${file}`).catch(console.log);
     }
   } catch (e) {
-    DatabaseLogger.error(e, "clearFileStorage");
+    console.log("clearFileStorage", e);
   }
 }
 
@@ -165,11 +146,11 @@ export async function migrateFilesFromCache() {
       return;
     }
 
-    const files = await RNFetchBlob.fs.ls(cacheDir);
+    let files = await RNFetchBlob.fs.ls(cacheDir);
     console.log("Files to migrate:", files.join(","));
 
-    const oldCache = await RNFetchBlob.fs.ls(cacheDirOld);
-    for (const file of oldCache) {
+    let oldCache = await RNFetchBlob.fs.ls(cacheDirOld);
+    for (let file of oldCache) {
       if (file.startsWith("org.") || file.startsWith("com.")) continue;
       RNFetchBlob.fs
         .mv(cacheDirOld + `/${file}`, cacheDir + `/${file}`)
@@ -178,7 +159,7 @@ export async function migrateFilesFromCache() {
     }
     await RNFetchBlob.fs.createFile(migratedFilesPath, "1", "utf8");
   } catch (e) {
-    DatabaseLogger.error(e, "migrateFilesFromCache");
+    console.log("migrateFilesFromCache", e);
   }
 }
 
@@ -188,14 +169,14 @@ export async function clearCache() {
   eSendEvent("cache-cleared");
 }
 
-export async function deleteCacheFileByPath(path: string) {
+export async function deleteCacheFileByPath(path) {
   await RNFetchBlob.fs.unlink(path).catch(console.log);
 }
 
-export async function deleteCacheFileByName(name: string) {
+export async function deleteCacheFileByName(name) {
   const iosAppGroup =
     Platform.OS === "ios"
-      ? await (RNFetchBlob.fs as any).pathForAppGroup(IOS_APPGROUPID)
+      ? await RNFetchBlob.fs.pathForAppGroup(IOS_APPGROUPID)
       : null;
   const appGroupPath = `${iosAppGroup}/${name}`;
   await RNFetchBlob.fs.unlink(appGroupPath).catch(console.log);
@@ -211,12 +192,12 @@ export async function deleteDCacheFiles() {
   }
 }
 
-export async function exists(filename: string) {
-  const path = `${cacheDir}/${filename}`;
+export async function exists(filename) {
+  let path = `${cacheDir}/${filename}`;
 
   const iosAppGroup =
     Platform.OS === "ios"
-      ? await (RNFetchBlob.fs as any).pathForAppGroup(IOS_APPGROUPID)
+      ? await RNFetchBlob.fs.pathForAppGroup(IOS_APPGROUPID)
       : null;
   const appGroupPath = `${iosAppGroup}/${filename}`;
 
@@ -230,7 +211,6 @@ export async function exists(filename: string) {
 
   if (exists || existsInAppGroup) {
     const attachment = await db.attachments.attachment(filename);
-    if (!attachment) return false;
     const totalChunks = Math.ceil(attachment.size / attachment.chunkSize);
     const totalAbytes = totalChunks * ABYTES;
     const expectedFileSize = attachment.size + totalAbytes;
@@ -254,7 +234,7 @@ export async function exists(filename: string) {
   return exists;
 }
 
-export async function bulkExists(files: string[]) {
+export async function bulkExists(files) {
   try {
     await createCacheDir();
     const cacheFiles = await RNFetchBlob.fs.ls(cacheDir);
@@ -263,7 +243,7 @@ export async function bulkExists(files: string[]) {
     if (Platform.OS === "ios") {
       const iosAppGroup =
         Platform.OS === "ios"
-          ? await (RNFetchBlob.fs as any).pathForAppGroup(IOS_APPGROUPID)
+          ? await RNFetchBlob.fs.pathForAppGroup(IOS_APPGROUPID)
           : null;
       const appGroupFiles = await RNFetchBlob.fs.ls(iosAppGroup);
       missingFiles = missingFiles.filter(
@@ -282,8 +262,8 @@ export async function getCacheSize() {
   const stat = await RNFetchBlob.fs.lstat(`file://` + cacheDir);
   let total = 0;
   console.log("Total files", stat.length);
-  stat.forEach((file) => {
-    total += parseInt(file.size as unknown as string);
+  stat.forEach((s) => {
+    total += parseInt(s.size);
   });
   return total;
 }

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

@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { RequestOptions } from "@notesnook/core";
 import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
 import { ToastManager } from "../../services/event-manager";
@@ -25,22 +24,11 @@ import { useAttachmentStore } from "../../stores/use-attachment-store";
 import { IOS_APPGROUPID } from "../../utils/constants";
 import { DatabaseLogger, db } from "../database";
 import { createCacheDir } from "./io";
-import {
-  cacheDir,
-  checkUpload,
-  FileSizeResult,
-  getUploadedFileSize
-} from "./utils";
+import { cacheDir, checkUpload, getUploadedFileSize } from "./utils";
 
-export async function uploadFile(
-  filename: string,
-  requestOptions: RequestOptions,
-  cancelToken: {
-    cancel: (reason?: string) => Promise<void>;
-  }
-) {
+export async function uploadFile(filename, requestOptions, cancelToken) {
   if (!requestOptions) return false;
-  const { url, headers } = requestOptions;
+  let { url, headers } = requestOptions;
   await createCacheDir();
   DatabaseLogger.info(`Preparing to upload file: ${filename}`);
 
@@ -51,7 +39,7 @@ export async function uploadFile(
     if (!exists && Platform.OS === "ios") {
       const iosAppGroup =
         Platform.OS === "ios"
-          ? await (RNFetchBlob.fs as any).pathForAppGroup(IOS_APPGROUPID)
+          ? await RNFetchBlob.fs.pathForAppGroup(IOS_APPGROUPID)
           : null;
       const appGroupPath = `${iosAppGroup}/${filename}`;
       filePath = appGroupPath;
@@ -66,15 +54,14 @@ export async function uploadFile(
 
     const fileSize = (await RNFetchBlob.fs.stat(filePath)).size;
 
-    const remoteFileSize = await getUploadedFileSize(filename);
-    if (remoteFileSize === FileSizeResult.Error) return false;
-
-    if (remoteFileSize > FileSizeResult.Empty && remoteFileSize === fileSize) {
+    let remoteFileSize = await getUploadedFileSize(filename);
+    if (remoteFileSize === -1) return false;
+    if (remoteFileSize > 0 && remoteFileSize === fileSize) {
       DatabaseLogger.log(`File ${filename} is already uploaded.`);
       return true;
     }
 
-    const uploadUrlResponse = await fetch(url, {
+    let uploadUrlResponse = await fetch(url, {
       method: "PUT",
       headers
     });
@@ -91,8 +78,7 @@ export async function uploadFile(
 
     DatabaseLogger.info(`Starting upload: ${filename}`);
 
-    const uploadRequest = RNFetchBlob.config({
-      //@ts-ignore
+    let uploadRequest = RNFetchBlob.config({
       IOSBackgroundTask: !globalThis["IS_SHARE_EXTENSION"]
     })
       .fetch(
@@ -112,14 +98,14 @@ export async function uploadFile(
         );
       });
 
-    cancelToken.cancel = async () => {
+    cancelToken.cancel = () => {
       useAttachmentStore.getState().remove(filename);
       uploadRequest.cancel();
     };
 
-    const uploadResponse = await uploadRequest;
-    const status = uploadResponse.info().status;
-    const uploaded = status >= 200 && status < 300;
+    let uploadResponse = await uploadRequest;
+    let status = uploadResponse.info().status;
+    let uploaded = status >= 200 && status < 300;
 
     useAttachmentStore.getState().remove(filename);
 
@@ -132,13 +118,12 @@ export async function uploadFile(
       );
     }
     const attachment = await db.attachments.attachment(filename);
-    if (!attachment) return false;
     await checkUpload(filename, requestOptions.chunkSize, attachment.size);
     DatabaseLogger.info(`File upload status: ${filename}, ${status}`);
     return uploaded;
   } catch (e) {
     useAttachmentStore.getState().remove(filename);
-    ToastManager.error(e as Error, "File upload failed");
+    ToastManager.error(e, "File upload failed");
     DatabaseLogger.error(e, "File upload failed", {
       filename
     });

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

@@ -17,11 +17,11 @@ 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, RequestOptions } from "@notesnook/core";
 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";
 
 export const ABYTES = 17;
 export const cacheDirOld = RNFetchBlob.fs.dirs.CacheDir;
@@ -31,13 +31,18 @@ export const cacheDir =
     ? RNFetchBlob.fs.dirs.LibraryDir + "/.cache"
     : RNFetchBlob.fs.dirs.DocumentDir + "/.cache";
 
-export function getRandomId(prefix: string) {
+export function getRandomId(prefix) {
   return Math.random()
     .toString(36)
     .replace("0.", prefix || "");
 }
 
-export function parseS3Error(data?: string) {
+/**
+ *
+ * @param {string | undefined} data
+ * @returns
+ */
+export function parseS3Error(data) {
   const xml = typeof data === "string" ? data : null;
 
   const error = {
@@ -65,19 +70,11 @@ export function parseS3Error(data?: string) {
   }
 }
 
-export function cancelable(
-  operation: (
-    filename: string,
-    requestOptions: RequestOptions,
-    cancelToken: {
-      cancel: (reason?: string) => Promise<void>;
-    }
-  ) => Promise<boolean>
-) {
+export function cancelable(operation) {
   const cancelToken = {
-    cancel: async (reason?: string) => {}
+    cancel: () => {}
   };
-  return (filename: string, requestOptions: RequestOptions) => {
+  return (filename, requestOptions) => {
     return {
       execute: () => operation(filename, requestOptions, cancelToken),
       cancel: async () => {
@@ -87,35 +84,29 @@ export function cancelable(
   };
 }
 
-export function copyFileAsync(source: string, dest: string) {
+export function copyFileAsync(source, dest) {
   return new Promise((resolve, reject) => {
-    //@ts-ignore
-    ScopedStorage.copyFile(source, dest, (e: any, r: any) => {
+    ScopedStorage.copyFile(source, dest, (e, r) => {
       if (e) {
         reject(e);
         return;
       }
-      resolve(true);
+      resolve();
     });
   });
 }
 
-export async function releasePermissions(path: string) {
+export async function releasePermissions(path) {
   if (Platform.OS === "ios") return;
   const uris = await ScopedStorage.getPersistedUriPermissions();
-  for (const uri of uris) {
+  for (let uri of uris) {
     if (path.startsWith(uri)) {
       await ScopedStorage.releasePersistableUriPermission(uri);
     }
   }
 }
 
-export const FileSizeResult = {
-  Empty: 0,
-  Error: -1
-};
-
-export async function getUploadedFileSize(hash: string) {
+export async function getUploadedFileSize(hash) {
   try {
     const url = `${hosts.API_HOST}/s3?name=${hash}`;
     const token = await db.tokenManager.getAccessToken();
@@ -124,20 +115,16 @@ export async function getUploadedFileSize(hash: string) {
       headers: { Authorization: `Bearer ${token}` }
     });
     const contentLength = parseInt(
-      attachmentInfo.headers?.get("content-length") || "0"
+      attachmentInfo.headers?.get("content-length")
     );
-    return isNaN(contentLength) ? FileSizeResult.Empty : contentLength;
+    return isNaN(contentLength) ? 0 : contentLength;
   } catch (e) {
     DatabaseLogger.error(e);
-    return FileSizeResult.Error;
+    return -1;
   }
 }
 
-export async function checkUpload(
-  filename: string,
-  chunkSize: number,
-  expectedSize: number
-) {
+export async function checkUpload(filename, chunkSize, expectedSize) {
   const size = await getUploadedFileSize(filename);
   const totalChunks = Math.ceil(size / chunkSize);
   const decryptedLength = size - totalChunks * ABYTES;
@@ -151,25 +138,3 @@ export async function checkUpload(
       : undefined;
   if (error) throw new Error(error);
 }
-
-export async function requestPermission() {
-  if (Platform.OS === "ios") return true;
-  return true;
-}
-export async function checkAndCreateDir(path: string) {
-  const dir =
-    Platform.OS === "ios"
-      ? RNFetchBlob.fs.dirs.DocumentDir + path
-      : RNFetchBlob.fs.dirs.SDCardDir + "/Notesnook/" + path;
-
-  try {
-    const exists = await RNFetchBlob.fs.exists(dir);
-    const isDir = await RNFetchBlob.fs.isDir(dir);
-    if (!exists || !isDir) {
-      await RNFetchBlob.fs.mkdir(dir);
-    }
-  } catch (e) {
-    await RNFetchBlob.fs.mkdir(dir);
-  }
-  return dir;
-}

apps/mobile/app/components/attachments/actions.tsx

@@ -63,11 +63,9 @@ const Actions = ({
   attachment,
   close,
   setAttachments,
-  fwdRef,
-  context
+  fwdRef
 }: {
   attachment: Attachment;
-  context: string;
   setAttachments: (attachments?: VirtualizedGrouping<Attachment>) => void;
   close?: () => void;
   fwdRef: RefObject<ActionSheetRef>;
@@ -81,6 +79,7 @@ const Actions = ({
   const [loading, setLoading] = useState<{
     name?: string;
   }>({});
+
   const actions = [
     {
       name: strings.network.download(),
@@ -89,7 +88,7 @@ const Actions = ({
           await db.fs().cancel(attachment.hash);
           useAttachmentStore.getState().remove(attachment.hash);
         }
-        downloadAttachment(attachment.hash, context === "global");
+        downloadAttachment(attachment.hash, false);
         fwdRef.current?.hide();
       },
       icon: "download"
@@ -376,7 +375,6 @@ Actions.present = (
         setAttachments={set}
         close={close}
         attachment={attachment}
-        context={context || "global"}
       />
     )
   });

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

@@ -31,7 +31,6 @@ import { ProgressCircleComponent } from "../ui/svg/lazy";
 import Paragraph from "../ui/typography/paragraph";
 import Actions from "./actions";
 import { strings } from "@notesnook/intl";
-import { Pressable } from "../ui/pressable";
 
 function getFileExtension(filename: string) {
   const ext = /^.+\.([^.]+)$/.exec(filename);
@@ -70,7 +69,8 @@ export const AttachmentItem = ({
   };
 
   return errorOnly && attachment && !attachment?.failed ? null : (
-    <Pressable
+    <TouchableOpacity
+      activeOpacity={0.9}
       onPress={onPress}
       style={{
         flexDirection: "row",
@@ -186,6 +186,6 @@ export const AttachmentItem = ({
           )}
         </>
       )}
-    </Pressable>
+    </TouchableOpacity>
   );
 };

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

@@ -206,7 +206,7 @@ export const AttachmentDialog = ({
       errorOnly={currentFilter === "errors"}
       attachments={attachments}
       id={index}
-      context={!isSheet ? "global" : "attachments-list"}
+      context="global"
     />
   );
 
@@ -235,7 +235,7 @@ export const AttachmentDialog = ({
     for (let i = 0; i < filteredAttachments.placeholders.length; i++) {
       if (!getState().isWorking) {
         ToastManager.show({
-          message: strings.attachmentRecheckCancelled(),
+          message: "Attachment recheck cancelled",
           type: "info",
           context: isSheet ? "local" : "global"
         });
@@ -322,7 +322,7 @@ export const AttachmentDialog = ({
       ) : null}
       {!isSheet ? (
         <Header
-          title={strings.manageAttachments()}
+          title="Manage attachments"
           renderedInRoute="SettingsGroup"
           canGoBack
           headerRightButtons={[
@@ -330,23 +330,23 @@ export const AttachmentDialog = ({
               onPress() {
                 onCheck();
               },
-              title: strings.recheckAll()
+              title: "Recheck all"
             },
             {
               onPress() {
                 if (!attachments) return;
                 presentDialog({
-                  title: strings.doActions.download.attachment(
-                    attachments.placeholders.length
-                  ),
-                  positiveText: strings.network.download(),
+                  title: `Download ${attachments.placeholders.length} attachments`,
+                  paragraph:
+                    "Are you sure you want to download all attachments?",
+                  positiveText: "Download",
                   positivePress: async () => {
                     downloadAttachments(await attachments.ids());
                   },
-                  negativeText: strings.cancel()
+                  negativeText: "Cancel"
                 });
               },
-              title: strings.downloadAllAttachments()
+              title: "Download all"
             }
           ]}
         />
@@ -388,14 +388,15 @@ export const AttachmentDialog = ({
               onPress={() => {
                 if (!attachments) return;
                 presentDialog({
-                  title: strings.doActions.download.attachment(
-                    attachments.placeholders.length
-                  ),
-                  positiveText: strings.network.download(),
+                  title: `Download ${attachments.placeholders.length} attachments`,
+                  paragraph:
+                    "Are you sure you want to download all attachments?",
+                  context: "local",
+                  positiveText: "Download",
                   positivePress: async () => {
                     downloadAttachments(await attachments.ids());
                   },
-                  negativeText: strings.cancel()
+                  negativeText: "Cancel"
                 });
               }}
               size={SIZE.lg}
@@ -456,16 +457,14 @@ export const AttachmentDialog = ({
                 <Paragraph>
                   {rechecker.isWorking
                     ? note
-                      ? strings.checkingNoteAttachments()
-                      : strings.checkingAllAttachments()
-                    : strings.attachmentRecheckComplete()}
+                      ? `Checking ${rechecker.filter.toLowerCase()} note attachments`
+                      : `Checking ${rechecker.filter.toLowerCase()} attachments`
+                    : "Attachments recheck complete"}
                 </Paragraph>
                 <Paragraph>
-                  {`${
-                    rechecker.isWorking ? `${strings.pleaseWait()} ` : ""
-                  }${strings.passed()}: ${
+                  {`${rechecker.isWorking ? "Please wait... " : ""}Passed: ${
                     rechecker.passed
-                  }, ${strings.failed()}: ${rechecker.failed}`}
+                  }, Failed: ${rechecker.failed}`}
                 </Paragraph>
               </View>
             </View>

apps/mobile/app/components/auth/change-password.js

@@ -68,14 +68,9 @@ export const ChangePassword = () => {
     }
     setLoading(true);
     try {
-      const result = await BackupService.run(
-        false,
-        "change-password-dialog",
-        "partial"
-      );
-      if (result.error) {
+      const result = await BackupService.run(false, "change-password-dialog");
+      if (!result.error)
         throw new Error(strings.backupFailed() + `: ${result.error}`);
-      }
 
       await db.user.clearSessions();
       await db.user.changePassword(oldPassword.current, password.current);

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

@@ -17,11 +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 { strings } from "@notesnook/intl";
-import { useThemeColors } from "@notesnook/theme";
-import React, { useCallback, useEffect, useRef, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { View } from "react-native";
-import { ScrollView } from "react-native-actions-sheet";
 import { db } from "../../common/database/index";
 import useTimer from "../../hooks/use-timer";
 import {
@@ -29,14 +26,19 @@ import {
   presentSheet,
   ToastManager
 } from "../../services/event-manager";
+import { useThemeColors } from "@notesnook/theme";
 import { eCloseSheet } from "../../utils/events";
 import { SIZE } from "../../utils/size";
 import { Button } from "../ui/button";
 import { IconButton } from "../ui/icon-button";
 import Input from "../ui/input";
 import { Pressable } from "../ui/pressable";
+import Seperator from "../ui/seperator";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
+import { useCallback } from "react";
+import { ScrollView } from "react-native-actions-sheet";
+import { strings } from "@notesnook/intl";
 
 const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
   const { colors } = useThemeColors();
@@ -162,7 +164,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
             textAlign: "center"
           }}
         >
-          {strings["2faCodeHelpText"][currentMethod.method]?.() ||
+          {strings["2faCodeHelpText"][currentMethod.method]() ||
             strings.select2faCodeHelpText()}
         </Paragraph>
 

apps/mobile/app/components/dialogs/attach-image-dialog/index.tsx

@@ -25,7 +25,7 @@ import {
   View
 } from "react-native";
 import { Image as ImageType } from "react-native-image-crop-picker";
-import { useThemeColors } from "@notesnook/theme";
+import { useThemeColors } from "../../../../../../packages/theme/dist";
 import { presentSheet } from "../../../services/event-manager";
 import { SIZE } from "../../../utils/size";
 import { Button } from "../../ui/button";

apps/mobile/app/components/dialogs/pdf-preview/index.js

@@ -188,7 +188,7 @@ const PDFPreview = () => {
                 }}
                 color={colors.static.white}
               >
-                {strings.loadingWithProgress(progress?.percent)}
+                {strings.loadingWithProgress(progress.percent)}
               </Paragraph>
             </Animated.View>
           ) : (

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

@@ -164,7 +164,7 @@ export default function Progress() {
             />
           </View>
 
-          {!data?.canHideProgress ? null : (
+          {data?.canHideProgress ? null : (
             <Button
               title={cancelCallback.current ? "Cancel" : "Hide"}
               type="secondaryAccented"

apps/mobile/app/components/dialogs/vault/index.js

@@ -311,10 +311,8 @@ export class VaultDialog extends Component {
       loading: true
     });
     try {
-      let verified = true;
-      if (await db.user.getUser()) {
-        verified = await db.user.verifyPassword(this.password);
-      }
+      let verified = await db.user.verifyPassword(this.password);
+      if (!(await db.user.getUser())) verified = true;
       if (verified) {
         let noteIds = [];
         if (this.state.deleteAll) {
@@ -322,21 +320,20 @@ export class VaultDialog extends Component {
           const relations = await db.relations.from(vault, "note").get();
           noteIds = relations.map((item) => item.toId);
         }
+
         await db.vault.delete(this.state.deleteAll);
 
-        if (this.state.deleteAll) {
-          noteIds.forEach((id) => {
-            eSendEvent(
-              eUpdateNoteInEditor,
-              {
-                id: id,
-                deleted: true
-              },
-              true
-            );
-          });
-        }
-        console.log("VAULT UPDATED EVENT");
+        noteIds.forEach((id) => {
+          eSendEvent(
+            eUpdateNoteInEditor,
+            {
+              id: id,
+              deleted: true
+            },
+            true
+          );
+        });
+
         eSendEvent("vaultUpdated");
         this.setState({
           loading: false
@@ -460,7 +457,7 @@ export class VaultDialog extends Component {
   async _deleteNote() {
     try {
       await db.vault.remove(this.state.note.id, this.password);
-      await deleteItems("note", [this.state.note.id]);
+      await deleteItems([this.state.note.id], "note");
       this.close();
     } catch (e) {
       this._takeErrorAction(e);
@@ -520,6 +517,7 @@ export class VaultDialog extends Component {
       });
       this.close();
     } else {
+      eSendEvent("vaultUpdated");
       ToastManager.show({
         heading: strings.vaultCreated(),
         type: "success",
@@ -527,7 +525,6 @@ export class VaultDialog extends Component {
       });
       this.close();
     }
-    eSendEvent("vaultUpdated");
   }
 
   _permanantUnlock() {

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

@@ -33,6 +33,7 @@ import { eScrollEvent } from "../../utils/events";
 import { LeftMenus } from "./left-menus";
 import { RightMenus } from "./right-menus";
 import { Title } from "./title";
+import { useNavigation } from "@react-navigation/native";
 
 type HeaderRightButton = {
   title: string;

apps/mobile/app/components/header/right-menus.tsx

@@ -19,8 +19,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { useRef } from "react";
 import { Platform, StyleSheet, View } from "react-native";
+//@ts-ignore
 import { useThemeColors } from "@notesnook/theme";
-import { Menu } from "react-native-material-menu";
+import Menu from "react-native-reanimated-material-menu";
 import { notesnook } from "../../../e2e/test.ids";
 import {
   HeaderRightButton,
@@ -96,16 +97,14 @@ export const RightMenus = ({
           style={{
             borderRadius: 5,
             backgroundColor: contextMenuColors.primary.background,
-            marginTop: 35
+            marginTop: -40
           }}
           onRequestClose={() => {
-            //@ts-ignore
             menuRef.current?.hide();
           }}
           anchor={
             <IconButton
               onPress={() => {
-                //@ts-ignore
                 menuRef.current?.show();
               }}
               name="dots-vertical"
@@ -117,10 +116,9 @@ export const RightMenus = ({
           {headerRightButtons.map((item) => (
             <Button
               style={{
+                width: 150,
                 justifyContent: "flex-start",
-                borderRadius: 0,
-                alignSelf: "flex-start",
-                width: "100%"
+                borderRadius: 0
               }}
               type="plain"
               buttonType={{
@@ -129,7 +127,6 @@ export const RightMenus = ({
               key={item.title}
               title={item.title}
               onPress={async () => {
-                //@ts-ignore
                 menuRef.current?.hide();
                 if (Platform.OS === "ios") await sleep(300);
                 item.onPress();

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

@@ -17,23 +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 { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React from "react";
-import { Linking, ScrollView, useWindowDimensions, View } from "react-native";
+import {
+  Linking,
+  ScrollView,
+  TouchableOpacity,
+  useWindowDimensions,
+  View
+} from "react-native";
 import { SwiperFlatList } from "react-native-swiper-flatlist";
+import Icon from "react-native-vector-icons/MaterialCommunityIcons";
+import { getElevationStyle } from "../../utils/elevation";
 import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
-import { eSendEvent } from "../../services/event-manager";
-import Navigation from "../../services/navigation";
 import SettingsService from "../../services/settings";
 import { useSettingStore } from "../../stores/use-setting-store";
-import { getElevationStyle } from "../../utils/elevation";
-import { eOpenLoginDialog } from "../../utils/events";
 import { SIZE } from "../../utils/size";
-import { AuthMode } from "../auth";
 import { Button } from "../ui/button";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
+import Navigation from "../../services/navigation";
+import { eOpenLoginDialog } from "../../utils/events";
+import { AuthMode } from "../auth";
+import { eSendEvent } from "../../services/event-manager";
+import { strings } from "@notesnook/intl";
 
 const Intro = ({ navigation }) => {
   const { colors } = useThemeColors();
@@ -83,7 +90,7 @@ const Intro = ({ navigation }) => {
         >
           {item.headings?.map((heading) => (
             <Heading
-              key={heading()}
+              key={heading}
               style={{
                 marginBottom: 5
               }}

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

@@ -57,7 +57,10 @@ export const SectionHeader = React.memo<
   }: SectionHeaderProps) {
     const { colors } = useThemeColors();
     const { fontScale } = useWindowDimensions();
-    const groupBy = strings.groupByStrings[groupOptions.groupBy]();
+    const groupBy =
+      strings.groupByStrings[
+        groupOptions.groupBy as keyof typeof strings.groupByStrings
+      ]?.();
     const isCompactModeEnabled = useIsCompactModeEnabled(
       dataType as "note" | "notebook"
     );

apps/mobile/app/components/list-items/notebook/wrapper.tsx

@@ -41,7 +41,7 @@ export const openNotebook = (item: Notebook | BaseTrashItem<Notebook>) => {
       positiveText: strings.restore(),
       negativeText: strings.delete(),
       positivePress: async () => {
-        if ((await db.trash.restore(item.id)) === false) return;
+        await db.trash.restore(item.id);
         Navigation.queueRoutesForUpdate();
         useSelectionStore.getState().setSelectionMode(undefined);
         ToastManager.show({

apps/mobile/app/components/list-items/reminder/index.tsx

@@ -81,8 +81,7 @@ const ReminderItem = React.memo(
           <View
             style={{
               flexDirection: "row",
-              flexWrap: "wrap",
-              marginTop: 5
+              flexWrap: "wrap"
             }}
           >
             {item.disabled ? (
@@ -150,8 +149,10 @@ const ReminderItem = React.memo(
               fontSize={SIZE.xs}
               style={{
                 justifyContent: "flex-start",
-                height: 25,
-                alignSelf: "flex-start"
+                borderWidth: 0,
+                height: 30,
+                alignSelf: "flex-start",
+                marginTop: 5
               }}
             />
           </View>

apps/mobile/app/components/list-items/selection-wrapper/index.tsx

@@ -70,7 +70,6 @@ const SelectionWrapper = ({
   }
 
   const onLongPress = () => {
-    if (isSheet) return;
     if (useSelectionStore.getState().selectionMode !== item.type) {
       useSelectionStore.getState().setSelectionMode(item.type);
     }
@@ -79,7 +78,7 @@ const SelectionWrapper = ({
 
   return (
     <Pressable
-      customColor={isSheet ? colors.secondary.background : "transparent"}
+      customColor={isSheet ? colors.primary.hover : "transparent"}
       testID={testID}
       onLongPress={onLongPress}
       onPress={onPress}

apps/mobile/app/components/list/list-item.wrapper.tsx

@@ -34,13 +34,12 @@ import {
   Reminder,
   Tag,
   TrashItem,
-  VirtualizedGrouping,
-  getSortValue
+  VirtualizedGrouping
 } from "@notesnook/core";
+import { getSortValue } from "@notesnook/core";
 import React, { useCallback, useEffect, useRef, useState } from "react";
 import { View } from "react-native";
 import { db } from "../../common/database";
-import { useIsCompactModeEnabled } from "../../hooks/use-is-compact-mode-enabled";
 import { eSendEvent } from "../../services/event-manager";
 import { RouteName } from "../../stores/use-navigation-store";
 import { eOpenJumpToDialog } from "../../utils/events";
@@ -49,6 +48,7 @@ import { NoteWrapper } from "../list-items/note/wrapper";
 import { NotebookWrapper } from "../list-items/notebook/wrapper";
 import ReminderItem from "../list-items/reminder";
 import TagItem from "../list-items/tag";
+import { useIsCompactModeEnabled } from "../../hooks/use-is-compact-mode-enabled";
 
 type ListItemWrapperProps<TItem = Item> = {
   group?: GroupingKey;

apps/mobile/app/components/note-history/preview.js

@@ -48,7 +48,7 @@ export default function NotePreview({ session, content, note }) {
 
   async function restore() {
     if (note && note.type === "trash") {
-      if ((await db.trash.restore(note.id)) === false) return;
+      await db.trash.restore(note.id);
       Navigation.queueRoutesForUpdate();
       useSelectionStore.getState().setSelectionMode(false);
       ToastManager.show({

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

@@ -137,13 +137,14 @@ export const Items = ({ item, buttons, close }) => {
         style={{
           alignSelf: "flex-start",
           paddingHorizontal: 0,
-          flex: 1
+          width: topBarItemWidth
         }}
       >
         <View
           onPress={item.func}
           style={{
             height: topBarItemWidth,
+            width: topBarItemWidth,
             justifyContent: "center",
             alignItems: "center",
             textAlign: "center",
@@ -168,7 +169,7 @@ export const Items = ({ item, buttons, close }) => {
 
         <Paragraph
           textBreakStrategy="simple"
-          size={SIZE.xxs}
+          size={SIZE.xxs + 1}
           style={{ textAlign: "center" }}
         >
           {item.title}
@@ -241,7 +242,7 @@ export const Items = ({ item, buttons, close }) => {
         showsHorizontalScrollIndicator={false}
         contentContainerStyle={{
           paddingRight: 25,
-          gap: 15
+          gap: 5
         }}
       >
         {topBarItems.map(renderTopBarItem)}

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

@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { Item, ItemType, VirtualizedGrouping } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect, useRef } from "react";
 import {
@@ -27,7 +26,7 @@ import {
   Platform,
   View
 } from "react-native";
-import { Menu } from "react-native-material-menu";
+import Menu from "react-native-reanimated-material-menu/src/Menu";
 import { db } from "../../common/database";
 import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
 import { ToastManager } from "../../services/event-manager";
@@ -47,6 +46,7 @@ import { MoveNotebookSheet } from "../sheets/move-notebook";
 import { Button } from "../ui/button";
 import { IconButton } from "../ui/icon-button";
 import Heading from "../ui/typography/heading";
+import { strings } from "@notesnook/intl";
 
 export const SelectionHeader = React.memo(
   ({
@@ -90,7 +90,7 @@ export const SelectionHeader = React.memo(
 
     const restoreItem = async () => {
       if (!selectedItemsList.length) return;
-      if ((await db.trash.restore(...selectedItemsList)) === false) return;
+      await db.trash.restore(...selectedItemsList);
       Navigation.queueRoutesForUpdate();
 
       clearSelection();
@@ -101,11 +101,10 @@ export const SelectionHeader = React.memo(
     };
 
     const deleteItem = async () => {
-      if (!type) return;
       presentDialog({
-        title: strings.doActions.delete.unknown(type, selectedItemsList.length),
-        paragraph: strings.actionConfirmations.delete.unknown(
-          type,
+        title: strings.deleteItems(type as string, selectedItemsList.length),
+        paragraph: strings.deleteItemsConfirmation(
+          type as string,
           selectedItemsList.length
         ),
         positiveText: strings.delete(),
@@ -220,16 +219,14 @@ export const SelectionHeader = React.memo(
               style={{
                 borderRadius: 5,
                 backgroundColor: contextMenuColors.primary.background,
-                marginTop: 35
+                marginTop: -20
               }}
               onRequestClose={() => {
-                //@ts-ignore
                 menuRef.current?.hide();
               }}
               anchor={
                 <IconButton
                   onPress={() => {
-                    //@ts-ignore
                     menuRef.current?.show();
                   }}
                   name="dots-vertical"
@@ -296,35 +293,15 @@ export const SelectionHeader = React.memo(
                 {
                   title: strings.moveToTrash(),
                   onPress: async () => {
-                    const selection = useSelectionStore.getState();
-                    if (!selection.selectionMode) return;
-                    await deleteItems(
-                      selection.selectionMode as ItemType,
-                      selection.selectedItemsList
-                    );
-                    selection.clearSelection();
-                    selection.setSelectionMode(undefined);
+                    deleteItems(
+                      undefined,
+                      useSelectionStore.getState().selectionMode
+                    ).then(() => {
+                      useSelectionStore.getState().clearSelection();
+                      useSelectionStore.getState().setSelectionMode(undefined);
+                    });
                   },
-                  visible: type === "note" || type === "notebook",
-                  icon: "delete"
-                },
-                {
-                  title: strings.doActions.delete.unknown(
-                    type!,
-                    selectedItemsList.length
-                  ),
-                  onPress: async () => {
-                    const selection = useSelectionStore.getState();
-                    if (!selection.selectionMode) return;
-                    await deleteItems(
-                      selection.selectionMode as ItemType,
-                      selection.selectedItemsList
-                    );
-                    selection.clearSelection();
-                    selection.setSelectionMode(undefined);
-                  },
-                  visible:
-                    type !== "trash" && type !== "note" && type !== "notebook",
+                  visible: type !== "trash",
                   icon: "delete"
                 },
                 {
@@ -343,10 +320,9 @@ export const SelectionHeader = React.memo(
                 !item.visible ? null : (
                   <Button
                     style={{
+                      width: 150,
                       justifyContent: "flex-start",
-                      borderRadius: 0,
-                      alignSelf: "flex-start",
-                      width: "100%"
+                      borderRadius: 0
                     }}
                     type="plain"
                     buttonType={{
@@ -356,7 +332,6 @@ export const SelectionHeader = React.memo(
                     key={item.title}
                     title={item.title}
                     onPress={async () => {
-                      //@ts-ignore
                       menuRef.current?.hide();
                       if (Platform.OS === "ios") await sleep(300);
                       item.onPress();

apps/mobile/app/components/sheets/add-notebook/index.tsx

@@ -81,7 +81,7 @@ export const AddNotebookSheet = ({
       id: notebook?.id
     });
 
-    if (parentNotebook && id) {
+    if (parentNotebook) {
       await db.relations.add(parentNotebook, {
         type: "notebook",
         id: id
@@ -94,8 +94,7 @@ export const AddNotebookSheet = ({
     useNotebookStore.getState().refresh();
 
     const parent =
-      parentNotebook?.id ||
-      (await getParentNotebookId(notebook?.id || (id as string)));
+      parentNotebook?.id || (await getParentNotebookId(notebook?.id || id));
 
     eSendEvent(eOnNotebookUpdated, parent);
     if (notebook) {
@@ -105,7 +104,7 @@ export const AddNotebookSheet = ({
       });
     }
 
-    if (!notebook && showMoveNotesOnComplete && id) {
+    if (!notebook && showMoveNotesOnComplete) {
       MoveNotes.present(await db.notebooks.notebook(id));
     } else {
       close?.(true);

apps/mobile/app/components/sheets/add-to/index.tsx

@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { Note } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React, {
   RefObject,
@@ -50,11 +49,13 @@ import DialogHeader from "../../dialog/dialog-header";
 import SheetProvider from "../../sheet-provider";
 import { Button } from "../../ui/button";
 import { IconButton } from "../../ui/icon-button";
-import Input from "../../ui/input";
 import Paragraph from "../../ui/typography/paragraph";
-import { AddNotebookSheet } from "../add-notebook";
 import { NotebookItem } from "./notebook-item";
 import { useNotebookItemSelectionStore } from "./store";
+import { AddNotebookSheet } from "../add-notebook";
+import Input from "../../ui/input";
+import { presentDialog } from "../../dialog/functions";
+import { strings } from "@notesnook/intl";
 
 async function updateInitialSelectionState(items: string[]) {
   const relations = await db.relations

apps/mobile/app/components/sheets/export-notes/index.tsx

@@ -171,7 +171,7 @@ const ExportNotesSheet = ({
           >
             <DialogHeader
               icon="export"
-              title={strings.exportNotes(ids.length)}
+              title={`${strings.export()} ${strings.notes(ids.length)}`}
             />
           </View>
 

apps/mobile/app/components/sheets/new-feature/index.tsx

@@ -43,7 +43,7 @@ const NewFeature = ({
   version
 }: {
   features: FeatureType[];
-  version?: string;
+  version?: string | null;
 }) => {
   const { colors } = useThemeColors();
 
@@ -57,7 +57,7 @@ const NewFeature = ({
       }}
     >
       <Heading color={colors.secondary.heading} size={SIZE.md}>
-        {strings.newVersionHighlights(version)}
+        {!version ? `${strings.newVersion()} ` : `v${version} `}Highlights 🎉
       </Heading>
 
       <Seperator />
@@ -122,7 +122,7 @@ NewFeature.present = () => {
     component: (
       <NewFeature
         features={features}
-        version={SettingsService.getProperty("version") || undefined}
+        version={SettingsService.getProperty("version")}
       />
     ),
     disableClosing: true

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

@@ -206,7 +206,7 @@ export const NotebookSheet = () => {
       backgroundInteractionEnabled
       gestureEnabled
     >
-      {/* <View
+      <View
         style={{
           position: "absolute",
           right: 24 + normalize(50),
@@ -214,11 +214,17 @@ export const NotebookSheet = () => {
         }}
       >
         <Pressable
-          testID="add-notebook-button"
+          testID={notesnook.buttons.add}
           type="secondary"
           onPress={() => {
             if (!notebook) return;
-            
+            AddNotebookSheet.present(
+              undefined,
+              notebook,
+              undefined,
+              undefined,
+              false
+            );
           }}
           style={{
             borderRadius: 100
@@ -239,7 +245,7 @@ export const NotebookSheet = () => {
             />
           </View>
         </Pressable>
-      </View> */}
+      </View>
 
       <View
         style={{
@@ -301,8 +307,8 @@ export const NotebookSheet = () => {
                   }}
                   onPress={async () => {
                     await deleteItems(
-                      "notebook",
-                      useItemSelectionStore.getState().getSelectedItemIds()
+                      useItemSelectionStore.getState().getSelectedItemIds(),
+                      "notebook"
                     );
                     useSelectionStore.getState().clearSelection();
                     useItemSelectionStore.setState({
@@ -398,27 +404,6 @@ export const NotebookSheet = () => {
                     height: 40 * fontScale
                   }}
                 />
-
-                <IconButton
-                  testID="add-notebook-button"
-                  name="notebook-plus"
-                  onPress={() => {
-                    if (!notebook) return;
-                    AddNotebookSheet.present(
-                      undefined,
-                      notebook,
-                      undefined,
-                      undefined,
-                      false
-                    );
-                  }}
-                  color={colors.primary.icon}
-                  size={22}
-                  style={{
-                    width: 40 * fontScale,
-                    height: 40 * fontScale
-                  }}
-                />
               </>
             )}
           </View>

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

@@ -36,7 +36,7 @@ import Seperator from "../../ui/seperator";
 import Heading from "../../ui/typography/heading";
 import Paragraph from "../../ui/typography/paragraph";
 import { requestInAppReview } from "../../../services/app-review";
-import { hosts, Note } from "@notesnook/core";
+import { Note } from "@notesnook/core";
 import { strings } from "@notesnook/intl";
 
 const PublishNoteSheet = ({
@@ -54,7 +54,7 @@ const PublishNoteSheet = ({
   const [note, setNote] = useState<Note | undefined>(item);
   const [publishing, setPublishing] = useState(false);
   const publishUrl =
-    note && `${hosts.MONOGRAPH_HOST}/${db.monographs.monograph(note?.id)}`;
+    note && `https://monogr.ph/${db.monographs.monograph(note?.id)}`;
   const isPublished = note && db.monographs.isPublished(note?.id);
   const pwdInput = useRef(null);
   const passwordValue = useRef<string>();
@@ -121,8 +121,8 @@ const PublishNoteSheet = ({
       }}
     >
       <DialogHeader
-        title={strings.publishNote()}
-        paragraph={strings.publishNoteDesc()}
+        title={`${strings.publish()} ${strings.note()}`}
+        paragraph={strings.publishDesc()}
       />
 
       {publishing ? (

apps/mobile/app/components/sheets/recovery-key/index.js

@@ -17,17 +17,12 @@ 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 { strings } from "@notesnook/intl";
 import Clipboard from "@react-native-clipboard/clipboard";
 import React, { createRef } from "react";
 import { Platform, View } from "react-native";
-import RNFetchBlob from "react-native-blob-util";
 import FileViewer from "react-native-file-viewer";
 import * as ScopedStorage from "react-native-scoped-storage";
 import Share from "react-native-share";
-import { db } from "../../../common/database";
-import filesystem from "../../../common/filesystem";
 import {
   eSubscribeEvent,
   eUnSubscribeEvent,
@@ -35,6 +30,8 @@ import {
 } from "../../../services/event-manager";
 import { clearMessage } from "../../../services/message";
 import SettingsService from "../../../services/settings";
+import { db } from "../../../common/database";
+import Storage from "../../../common/database/storage";
 import { eOpenRecoveryKeyDialog } from "../../../utils/events";
 import { SIZE } from "../../../utils/size";
 import { sleep } from "../../../utils/time";
@@ -44,6 +41,9 @@ import Seperator from "../../ui/seperator";
 import SheetWrapper from "../../ui/sheet";
 import { QRCode } from "../../ui/svg/lazy";
 import Paragraph from "../../ui/typography/paragraph";
+import RNFetchBlob from "react-native-blob-util";
+import { sanitizeFilename } from "@notesnook/common";
+import { strings } from "@notesnook/intl";
 
 class RecoveryKeySheet extends React.Component {
   constructor(props) {
@@ -126,7 +126,7 @@ class RecoveryKeySheet extends React.Component {
             "base64"
           );
         } else {
-          path = await filesystem.checkAndCreateDir("/");
+          path = await Storage.checkAndCreateDir("/");
           await RNFetchBlob.fs.writeFile(path + fileName, data, "base64");
         }
         ToastManager.show({
@@ -157,7 +157,7 @@ class RecoveryKeySheet extends React.Component {
         if (!file) return;
         path = file.uri;
       } else {
-        path = await filesystem.checkAndCreateDir("/");
+        path = await Storage.checkAndCreateDir("/");
         await RNFetchBlob.fs.writeFile(path + fileName, this.state.key, "utf8");
         path = path + fileName;
       }

apps/mobile/app/components/sheets/relations-list/index.tsx

@@ -16,8 +16,8 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Item, ItemReference, VirtualizedGrouping } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
+import { VirtualizedGrouping } from "@notesnook/core";
+import { Item, ItemReference } from "@notesnook/core";
 import { useThemeColors } from "@notesnook/theme";
 import React, { RefObject, useEffect, useState } from "react";
 import { View } from "react-native";
@@ -37,6 +37,8 @@ import SheetProvider from "../../sheet-provider";
 import { Button } from "../../ui/button";
 import { PressableProps } from "../../ui/pressable";
 import Paragraph from "../../ui/typography/paragraph";
+import { isStringLiteralOrJsxExpression } from "typescript";
+import { strings } from "@notesnook/intl";
 
 type RelationsListProps = {
   actionSheetRef: RefObject<ActionSheetRef>;
@@ -88,14 +90,14 @@ export const RelationsList = ({
         sortDirection: "desc"
       })
       .then((grouped) => {
-        setTimeout(() => {
-          setItems(grouped);
-        }, 300);
+        setItems(grouped);
       });
-  }, [relationType, referenceType, item?.id, item?.type, updater]);
+  }, [relationType, referenceType, item?.id, item?.type]);
 
   return (
-    <View style={{ paddingHorizontal: 12, height: "100%" }}>
+    <View
+      style={{ paddingHorizontal: 12, height: hasNoRelations ? 300 : "100%" }}
+    >
       <SheetProvider context="local" />
       <DialogHeader
         title={title}
@@ -123,9 +125,7 @@ export const RelationsList = ({
             //  width="100%"
             type="inverted"
             icon="plus"
-            title={strings.addItem(
-              referenceType as "notebook" | "tag" | "reminder" | "note"
-            )}
+            title={strings.addItem(referenceType)}
           />
         </View>
       ) : (

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

@@ -68,19 +68,19 @@ export default function ReminderNotify({
 
   const QuickActions = [
     {
-      title: `5 ${strings.timeShort.minute()}`,
+      title: `5 ${strings.timeShort.minute}`,
       time: 5
     },
     {
-      title: `15 ${strings.timeShort.minute()}`,
+      title: `15 ${strings.timeShort.minute}`,
       time: 15
     },
     {
-      title: `30 ${strings.timeShort.minute()}`,
+      title: `30 ${strings.timeShort.minute}`,
       time: 30
     },
     {
-      title: `1 ${strings.timeShort.hour()}`,
+      title: `1 ${strings.timeShort.hour}`,
       time: 60
     }
   ];

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

@@ -124,11 +124,9 @@ export default function ReminderSheet({
   const referencedItem = reference ? (reference as Note) : null;
 
   const title = useRef<string | undefined>(
-    !reminder ? referencedItem?.title : reminder?.title
-  );
-  const details = useRef<string | undefined>(
-    !reminder ? referencedItem?.headline : reminder?.description
+    reminder?.title || referencedItem?.title
   );
+  const details = useRef<string | undefined>(reminder?.description);
   const titleRef = useRef<TextInput>(null);
   const timer = useRef<NodeJS.Timeout>();
 
@@ -545,7 +543,7 @@ export default function ReminderSheet({
         />
 
         {reminderMode === ReminderModes.Permanent ? null : (
-          <RNScrollView
+          <ScrollView
             style={{
               flexDirection: "row",
               marginTop: 12,
@@ -557,7 +555,7 @@ export default function ReminderSheet({
               <Button
                 key={mode}
                 title={strings.reminderNotificationModes[
-                  mode as keyof typeof ReminderNotificationModes
+                  mode as keyof typeof strings.reminderNotificationModes
                 ]()}
                 style={{
                   marginRight: 12,
@@ -590,7 +588,7 @@ export default function ReminderSheet({
                 }}
               />
             ))}
-          </RNScrollView>
+          </ScrollView>
         )}
       </ScrollView>
 

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

@@ -154,9 +154,7 @@ export const Toast = ({ context = "global" }) => {
         >
           <Icon
             name={
-              toastOptions.icon
-                ? toastOptions.icon
-                : toastOptions.type === "success"
+              toastOptions.type === "success"
                 ? "check"
                 : toastOptions.type === "info"
                 ? "information"

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

@@ -70,6 +70,7 @@ interface InputProps extends TextInputProps {
   };
   buttons?: React.ReactNode;
   onBlurInput?: () => void;
+  onPress?: () => void;
   height?: number;
   fontSize?: number;
   onFocusInput?: () => void;

apps/mobile/app/components/ui/reminder-time/index.tsx

@@ -51,6 +51,7 @@ export const ReminderTime = ({
     <Button
       title={time}
       key={reminder.id}
+      height={20}
       icon="bell"
       fontSize={SIZE.xs}
       iconSize={SIZE.sm}
@@ -66,10 +67,12 @@ export const ReminderTime = ({
         marginRight: 0
       }}
       style={{
-        height: "auto",
         borderRadius: 5,
+        marginRight: 5,
+        borderWidth: 0.5,
         borderColor: colors.primary.border,
         paddingHorizontal: 6,
+        marginBottom: 5,
         ...(style as ViewStyle)
       }}
       {...props}

apps/mobile/app/components/walkthroughs/walkthroughs.tsx

@@ -17,9 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Notebook } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
-import { useThemeColors } from "@notesnook/theme";
 import React from "react";
 import { Linking, View } from "react-native";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
@@ -29,22 +26,26 @@ import {
   SUPPORT_SVG,
   WELCOME_SVG
 } from "../../assets/images/assets";
-import useRotator from "../../hooks/use-rotator";
+import { ThemeStore } from "../../stores/use-theme-store";
 import { eSendEvent } from "../../services/event-manager";
-import { getContainerBorder } from "../../utils/colors";
 import { getElevationStyle } from "../../utils/elevation";
 import { eOpenAddNotebookDialog } from "../../utils/events";
 import { SIZE } from "../../utils/size";
-import { PinItem } from "../side-menu/pinned-section";
+import useRotator from "../../hooks/use-rotator";
+import { AccentColorPicker } from "../../screens/settings/appearance";
 import { Button } from "../ui/button";
-import Seperator from "../ui/seperator";
 import { SvgView } from "../ui/svg";
+import { PinItem } from "../side-menu/pinned-section";
+import Seperator from "../ui/seperator";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
+import { useThemeColors } from "@notesnook/theme";
+import { getContainerBorder } from "../../utils/colors";
+import { strings } from "@notesnook/intl";
 
 export type TStep = {
   text?: string;
-  walkthroughItem: (colors: any) => React.ReactNode;
+  walkthroughItem: (colors: ThemeStore["colors"]) => React.ReactNode;
   title?: string;
   button?: {
     type: "next" | "done";
@@ -61,18 +62,18 @@ const NotebookWelcome = () => {
   const { colors } = useThemeColors();
   const data = useRotator([
     {
-      title: strings.workAndOffice(),
-      description: strings.workAndOfficeDesc(),
+      title: "Work and office",
+      description: "Everything related to my job",
       count: 2
     },
     {
-      title: strings.schoolWork(),
-      description: strings.schoolWorkDesc(),
+      title: "School work",
+      description: "I don't like doing this but I have to.",
       count: 5
     },
     {
-      title: strings.recipes(),
-      description: strings.recipesDesc(),
+      title: "Recipes",
+      description: "I love cooking and collecting recipes",
       count: 10
     }
   ]);
@@ -121,17 +122,17 @@ const notebooks: { id: string; steps: TStep[] } = {
   id: "notebooks",
   steps: [
     {
-      title: strings.notebooks(),
-      text: strings.boostProductivityNotebook(),
+      title: "Notebooks",
+      text: "Boost your productivity with Notebooks and organize your notes.",
       walkthroughItem: () => <NotebookWelcome />,
       button: {
         type: "next",
-        title: strings.next()
+        title: "Next"
       }
     },
     {
-      title: strings.notebookNotes(),
-      text: strings.notebookNotesDesc(),
+      title: "Notebook > Notes",
+      text: "Every Notebook can have notes and sub notebooks.",
       walkthroughItem: (colors: any) => (
         <View
           style={{
@@ -153,9 +154,9 @@ const notebooks: { id: string; steps: TStep[] } = {
             }}
           >
             <Heading size={SIZE.md} color={colors.primary.heading}>
-              {strings.workAndOffice()}
+              Work and office
             </Heading>
-            <Paragraph>{strings.workAndOfficeDesc()}</Paragraph>
+            <Paragraph>Everything related to my job in one place.</Paragraph>
 
             <Paragraph
               style={{
@@ -164,7 +165,7 @@ const notebooks: { id: string; steps: TStep[] } = {
               size={SIZE.xs}
               color={colors.secondary.paragraph}
             >
-              {strings.notes(2)}
+              Notebook - 2 notes
             </Paragraph>
           </View>
           <View
@@ -183,7 +184,7 @@ const notebooks: { id: string; steps: TStep[] } = {
                 size={SIZE.sm}
                 name="bookmark"
               />{" "}
-              {strings.tasks()}
+              Tasks
             </Paragraph>
           </View>
           <View
@@ -199,7 +200,7 @@ const notebooks: { id: string; steps: TStep[] } = {
           >
             <Paragraph size={SIZE.xs}>
               <Icon color={colors.primary.icon} size={SIZE.sm} name="note" />{" "}
-              {strings.taskAValue()}
+              February 2022 Week 2
             </Paragraph>
           </View>
           <View
@@ -215,7 +216,7 @@ const notebooks: { id: string; steps: TStep[] } = {
           >
             <Paragraph size={SIZE.xs}>
               <Icon color={colors.primary.icon} size={SIZE.sm} name="note" />{" "}
-              {strings.taskBValue()}
+              February 2022 Week 1
             </Paragraph>
           </View>
           <View
@@ -234,19 +235,19 @@ const notebooks: { id: string; steps: TStep[] } = {
                 size={SIZE.sm}
                 name="bookmark"
               />{" "}
-              {strings.meetings()}
+              Meetings
             </Paragraph>
           </View>
         </View>
       ),
       button: {
         type: "next",
-        title: strings.next()
+        title: "Next"
       }
     },
     {
-      title: strings.easyAccess(),
-      text: strings.easyAccessDesc(),
+      title: "Easy access",
+      text: "You can create shortcuts of frequently accessed notebooks in the side menu",
       walkthroughItem: () => (
         <View
           style={{
@@ -255,31 +256,29 @@ const notebooks: { id: string; steps: TStep[] } = {
           }}
         >
           <PinItem
-            isPlaceholder={true}
-            item={
-              {
-                title: strings.tasks(),
-                type: "notebook"
-              } as Notebook
-            }
+            index={0}
+            placeholder={true}
+            item={{
+              title: "Tasks",
+              type: "topic"
+            }}
             onPress={() => {}}
           />
 
           <PinItem
-            isPlaceholder={true}
-            item={
-              {
-                title: strings.workAndOffice(),
-                type: "notebook"
-              } as Notebook
-            }
+            index={1}
+            placeholder={true}
+            item={{
+              title: "Work and office",
+              type: "notebook"
+            }}
             onPress={() => {}}
           />
         </View>
       ),
       button: {
         type: "done",
-        title: strings.addFirstNotebook(),
+        title: "Add your first notebook",
         action: () => {
           eSendEvent(eOpenAddNotebookDialog);
         }
@@ -288,32 +287,67 @@ const notebooks: { id: string; steps: TStep[] } = {
   ]
 };
 
+const ChooseTheme = () => {
+  return (
+    <View
+      style={{
+        alignItems: "center",
+        marginTop: 20
+      }}
+    >
+      <Heading>Make yourself at home</Heading>
+
+      <Paragraph
+        style={{
+          textAlign: "center",
+          alignSelf: "center",
+          maxWidth: "80%"
+        }}
+        size={SIZE.md}
+      >
+        Pick a theme of your choice
+      </Paragraph>
+      <Seperator />
+      <AccentColorPicker />
+      <Seperator />
+    </View>
+  );
+};
+
 const trialstarted: { id: string; steps: TStep[] } = {
   id: "trialstarted",
   steps: [
     {
-      title: strings.trialStarted(),
-      text: strings.trialStartedDesc(),
+      title: "Your trial is activated",
+      text: "You can use all premium features for free for the next 14 days",
       walkthroughItem: (colors) => (
         <SvgView src={LAUNCH_ROCKET(colors.primary.paragraph)} />
       ),
       button: {
         type: "next",
-        title: strings.next()
+        title: "Next"
+      }
+    },
+
+    {
+      walkthroughItem: () => <ChooseTheme />,
+      button: {
+        type: "next",
+        title: "Next"
       }
     },
     {
-      title: strings.joinTheCause(),
-      text: strings.meetPrivacyMinded(),
+      title: "Join the cause",
+      text: "Meet other privacy-minded people and talk to us directly about your concerns, issues and suggestions.",
       walkthroughItem: (colors) => (
         <SvgView src={COMMUNITY_SVG(colors.primary.paragraph)} />
       ),
       button: {
         type: "done",
-        title: strings.continue()
+        title: "Continue"
       },
       actionButton: {
-        text: strings.joinDiscord(),
+        text: "Join Discord Community",
         action: () => {
           Linking.openURL("https://discord.gg/zQBK97EE22").catch(console.log);
         }
@@ -326,14 +360,14 @@ const emailconfirmed: { id: string; steps: TStep[] } = {
   id: "emailconfirmed",
   steps: [
     {
-      title: strings.emailConfirmed(),
-      text: strings.emailNotConfirmedDesc(),
+      title: "Email confirmed",
+      text: "Your email was confirmed successfully. Thank you for choosing end-to-end encrypted note taking.",
       walkthroughItem: (colors) => (
         <SvgView src={WELCOME_SVG(colors.primary.paragraph)} />
       ),
       button: {
         type: "done",
-        title: strings.continue()
+        title: "Continue"
       }
     }
   ]
@@ -348,14 +382,15 @@ const Support = () => {
       }}
     >
       <SvgView src={SUPPORT_SVG()} />
-      <Heading>{strings.prioritySupport()}</Heading>
+      <Heading>Get Priority Support</Heading>
       <Paragraph
         style={{
           textAlign: "center"
         }}
         size={SIZE.md}
       >
-        {strings.weAreAlwaysListening()}
+        You can reach out to us via multiple channels if you face an issue or
+        want to just talk.
       </Paragraph>
       <Seperator />
 
@@ -370,7 +405,7 @@ const Support = () => {
         }}
         icon="discord"
         type="secondary"
-        title={strings.joinDiscord()}
+        title="Join our community on Discord"
       />
 
       <Button
@@ -384,7 +419,7 @@ const Support = () => {
         }}
         icon="telegram"
         type="secondary"
-        title={strings.joinTelegram()}
+        title="Join our Telegram group"
       />
       <Button
         style={{
@@ -394,7 +429,7 @@ const Support = () => {
         }}
         icon="bug"
         type="secondary"
-        title={strings.reportAnIssue()}
+        title="Submit an issue from Settings"
       />
       <Button
         style={{
@@ -404,7 +439,7 @@ const Support = () => {
         }}
         icon="mail"
         type="secondary"
-        title={strings.emailSupport()}
+        title="Email us at support@streetwriters.co"
       />
     </View>
   );
@@ -414,21 +449,21 @@ const prouser: { id: string; steps: TStep[] } = {
   id: "prouser",
   steps: [
     {
-      title: strings.welcomeToNotesnookPro(),
-      text: strings.thankYouPrivacy(),
+      title: "Welcome to Notesnook Pro",
+      text: "Thank you for reaffirming our idea that privacy comes first",
       walkthroughItem: (colors) => (
         <SvgView src={LAUNCH_ROCKET(colors.primary.paragraph)} />
       ),
       button: {
         type: "next",
-        title: strings.next()
+        title: "Next"
       }
     },
     {
       walkthroughItem: () => <Support />,
       button: {
         type: "done",
-        title: strings.continue()
+        title: "Continue"
       }
     }
   ]

apps/mobile/app/hooks/use-actions.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/>.
 */
 /* eslint-disable no-inner-declarations */
+import { VAULT_ERRORS } from "@notesnook/core";
 import {
   Color,
   ItemReference,
@@ -24,11 +25,8 @@ import {
   Notebook,
   Reminder,
   Tag,
-  TrashItem,
-  VAULT_ERRORS,
-  createInternalLink
+  TrashItem
 } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
 import { DisplayedNotification } from "@notifee/react-native";
 import Clipboard from "@react-native-clipboard/clipboard";
 import React, { useCallback, useEffect, useRef, useState } from "react";
@@ -41,10 +39,8 @@ import NoteHistory from "../components/note-history";
 import { AddNotebookSheet } from "../components/sheets/add-notebook";
 import MoveNoteSheet from "../components/sheets/add-to";
 import ExportNotesSheet from "../components/sheets/export-notes";
-import { MoveNotebookSheet } from "../components/sheets/move-notebook";
 import { MoveNotes } from "../components/sheets/move-notes/movenote";
 import PublishNoteSheet from "../components/sheets/publish-note";
-import { ReferencesList } from "../components/sheets/references";
 import { RelationsList } from "../components/sheets/relations-list/index";
 import ReminderSheet from "../components/sheets/reminder";
 import { useSideBarDraggingStore } from "../components/side-menu/dragging-store";
@@ -64,10 +60,15 @@ import { useRelationStore } from "../stores/use-relation-store";
 import { useSelectionStore } from "../stores/use-selection-store";
 import { useTagStore } from "../stores/use-tag-store";
 import { useUserStore } from "../stores/use-user-store";
+import Errors from "../utils/errors";
 import { eOpenLoginDialog, eUpdateNoteInEditor } from "../utils/events";
 import { deleteItems } from "../utils/functions";
 import { convertNoteToText } from "../utils/note-to-text";
 import { sleep } from "../utils/time";
+import { ReferencesList } from "../components/sheets/references";
+import { createInternalLink } from "@notesnook/core";
+import { MoveNotebookSheet } from "../components/sheets/move-notebook";
+import { strings } from "@notesnook/intl";
 
 export const useActions = ({
   close,
@@ -140,7 +141,7 @@ export const useActions = ({
   async function restoreTrashItem() {
     if (!checkItemSynced()) return;
     close();
-    if ((await db.trash.restore(item.id)) === false) return;
+    await db.trash.restore(item.id);
     Navigation.queueRoutesForUpdate();
     const type = item.type === "trash" ? item.itemType : item.type;
     ToastManager.show({
@@ -254,8 +255,8 @@ export const useActions = ({
       item.type === "color"
     ) {
       presentDialog({
-        title: strings.doActions.delete.unknown(item.type, 1),
-        paragraph: strings.actionConfirmations.delete.unknown(item.type, 1),
+        title: strings.deleteItem(item.type),
+        paragraph: strings.deleteItemConfirmation(item.type),
         positivePress: async () => {
           if (item.type === "reminder") {
             await db.reminders.remove(item.id);
@@ -290,7 +291,7 @@ export const useActions = ({
       });
     } else {
       try {
-        await deleteItems(item.type, [item.id]);
+        await deleteItems([item.id], item.type);
       } catch (e) {
         console.error(e);
       }
@@ -303,8 +304,8 @@ export const useActions = ({
     close();
     await sleep(300);
     presentDialog({
-      title: strings.doActions.delete.unknown(item.itemType, 1),
-      paragraph: strings.actionConfirmations.delete.unknown(item.itemType, 1),
+      title: strings.delete(),
+      paragraph: strings.deleteItemsConfirmation(item.itemType, 1),
       positiveText: strings.delete(),
       negativeText: strings.cancel(),
       positivePress: async () => {
@@ -313,7 +314,7 @@ export const useActions = ({
           Navigation.queueRoutesForUpdate();
           useSelectionStore.getState().setSelectionMode(undefined);
           ToastManager.show({
-            heading: strings.actions.deleted.unknown(item.itemType, 1),
+            heading: strings.itemDeleted(1, item.itemType),
             type: "success",
             context: "local"
           });
@@ -954,10 +955,7 @@ export const useActions = ({
     id: "trash",
     title:
       item.type !== "notebook" && item.type !== "note"
-        ? strings.doActions.delete.unknown(
-            item.type === "trash" ? item.itemType : item.type,
-            1
-          )
+        ? strings.doAction(item.type, 1, "delete")
         : strings.moveToTrash(),
     icon: "delete-outline",
     type: "error",

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

@@ -93,7 +93,6 @@ import { sleep } from "../utils/time";
 import { NotesnookModule } from "../utils/notesnook-module";
 import { changeSystemBarColors } from "../stores/use-theme-store";
 import { strings } from "@notesnook/intl";
-import { endProgress, startProgress } from "../components/dialogs/progress";
 
 const onCheckSyncStatus = async (type: SyncStatusEvent) => {
   const { disableSync, disableAutoSync } = SettingsService.get();
@@ -578,27 +577,6 @@ export const useAppEvents = () => {
       EV.subscribe(EVENTS.uploadCanceled, (data) => {
         useAttachmentStore.getState().setUploading(data);
       }),
-      EV.subscribe(EVENTS.migrationStarted, (name) => {
-        if (
-          name !== "notesnook" ||
-          !SettingsService.getProperty("introCompleted")
-        )
-          return;
-        startProgress({
-          title: "Migrating Data",
-          paragraph: "Please wait while we migrate your data",
-          canHideProgress: false,
-          fillBackground: true
-        });
-      }),
-      EV.subscribe(EVENTS.migrationFinished, (name) => {
-        if (
-          name !== "notesnook" ||
-          !SettingsService.getProperty("introCompleted")
-        )
-          return;
-        endProgress();
-      }),
       EV.subscribe(EVENTS.vaultLocked, async () => {
         // Lock all notes in all tabs...
         for (const tab of useTabStore.getState().tabs) {

apps/mobile/app/hooks/use-vault-status.ts

@@ -18,11 +18,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import React, { useCallback, useEffect } from "react";
-import { db } from "../common/database";
 import BiometricService from "../services/biometrics";
 import { eSubscribeEvent, eUnSubscribeEvent } from "../services/event-manager";
+import { db } from "../common/database";
 
-const VaultStatusDefaults = {
+const VaultStatusCache = {
   exists: false,
   biometryEnrolled: false,
   isBiometryAvailable: false
@@ -35,12 +35,18 @@ export type VaultStatusType = {
 };
 
 export const useVaultStatus = () => {
-  const [vaultStatus, setVaultStatus] = React.useState(VaultStatusDefaults);
+  const [vaultStatus, setVaultStatus] = React.useState(VaultStatusCache);
 
   const checkVaultStatus = useCallback(() => {
     db.vault?.exists().then(async (exists) => {
       const available = await BiometricService.isBiometryAvailable();
       const fingerprint = await BiometricService.hasInternetCredentials();
+      if (
+        VaultStatusCache.exists === exists &&
+        VaultStatusCache.biometryEnrolled === fingerprint &&
+        VaultStatusCache.isBiometryAvailable === available
+      )
+        return;
       setVaultStatus({
         exists: exists,
         biometryEnrolled: fingerprint,

apps/mobile/app/package.json

@@ -17,11 +17,13 @@
     "phone": "^3.1.14",
     "qclone": "^1.2.0",
     "react-native-actions-sheet": "0.9.7",
+    "react-native-check-version": "https://github.com/flexible-agency/react-native-check-version",
     "react-native-drax": "^0.10.2",
     "react-native-image-zoom-viewer": "^3.0.1",
     "react-native-keyboard-aware-scroll-view": "^0.9.5",
     "react-native-progress": "^5.0.0",
     "react-native-qrcode-svg": "^6.0.6",
+    "react-native-reanimated-material-menu": "github:ammarahm-ed/react-native-reanimated-material-menu",
     "react-native-reanimated-progress-bar": "1.0.1",
     "react-native-swiper-flatlist": "3.2.2",
     "timeago.js": "4.0.2",
@@ -32,14 +34,17 @@
     "katex": "0.16.2",
     "@readme/data-urls": "3.0.0",
     "react-native-wheel-color-picker": "^1.3.1",
+    "tinycolor2": "1.6.0",
     "@azure/core-asynciterator-polyfill": "^1.0.2",
+    "@tanstack/react-query": "^4.36.1",
+    "@trpc/client": "10.45.2",
+    "@trpc/react-query": "10.45.2",
+    "@trpc/server": "10.45.2",
     "@streetwriters/kysely": "^0.27.4",
     "pathe": "1.1.2",
     "react-native-format-currency": "0.0.5",
     "@lingui/react": "4.11.2",
-    "@lingui/core": "4.11.2",
-    "react-native-check-version": "^1.3.0",
-    "react-native-material-menu": "^2.0.0"
+    "@lingui/core": "4.11.2"
   },
   "sideEffects": false
 }

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

@@ -146,16 +146,15 @@ const Editor = React.memo(
             onRenderProcessGone={onError}
             nestedScrollEnabled
             onError={onError}
-            injectedJavaScript={`
-              globalThis.__DEV__ = ${__DEV__}
-              globalThis.readonly=${readonly};
-              globalThis.noToolbar=${noToolbar};
-              globalThis.noHeader=${noHeader};
-              globalThis.LINGUI_LOCALE = "${i18n.locale}";
-              globalThis.LINGUI_LOCALE_DATA = ${JSON.stringify({
-                [i18n.locale]: i18n.messages
-              })};
-              globalThis.loadApp();
+            injectedJavaScriptBeforeContentLoaded={`
+          globalThis.LINGUI_LOCALE = "${i18n.locale}";
+          globalThis.LINGUI_LOCALE_DATA = ${JSON.stringify({
+            [i18n.locale]: i18n.messages
+          })};
+          globalThis.__DEV__ = ${__DEV__}
+          globalThis.readonly=${readonly};
+          globalThis.noToolbar=${noToolbar};
+          globalThis.noHeader=${noHeader};
           `}
             useSharedProcessPool={false}
             javaScriptEnabled={true}

apps/mobile/app/screens/editor/readonly-editor.tsx

@@ -34,7 +34,6 @@ import { EditorEvents } from "./tiptap/utils";
 import { useThemeColors } from "@notesnook/theme";
 import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
 import { db } from "../../common/database";
-import { i18n } from "@lingui/core";
 
 const onShouldStartLoadWithRequest = (request: ShouldStartLoadRequest) => {
   if (request.url.includes("https")) {
@@ -144,17 +143,10 @@ export function ReadonlyEditor(props: {
         ref={editorRef}
         key={"readonly-editor:" + props.editorId}
         nestedScrollEnabled
-        injectedJavaScript={`
-        globalThis.__DEV__ = ${__DEV__}
-        globalThis.readonlyEditor=true;
-        globalThis.LINGUI_LOCALE = "${i18n.locale}";
-        globalThis.LINGUI_LOCALE_DATA = ${JSON.stringify({
-          [i18n.locale]: i18n.messages
-        })};
-        globalThis.loadApp();`}
+        injectedJavaScriptBeforeContentLoaded={`globalThis.readonlyEditor=true;`}
+        injectedJavaScript="globalThis.readonlyEditor=true;"
         useSharedProcessPool={false}
         javaScriptEnabled={true}
-        webviewDebuggingEnabled={__DEV__}
         focusable={true}
         setSupportMultipleWindows={false}
         overScrollMode="never"

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

@@ -37,7 +37,6 @@ export type EditorState = {
   scrollPosition: number;
   overlay?: boolean;
   initialLoadCalled?: boolean;
-  editorStateRestored?: boolean;
 };
 
 export type Settings = {

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

@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* eslint-disable @typescript-eslint/no-var-requires */
 import { ItemReference } from "@notesnook/core";
 import type { Attachment } from "@notesnook/editor";
-import { getDefaultPresets } from "@notesnook/editor/dist/cjs/toolbar/tool-definitions";
+import { getDefaultPresets } from "@notesnook/editor/dist/toolbar/tool-definitions";
 import Clipboard from "@react-native-clipboard/clipboard";
 import React, { useCallback, useEffect, useRef } from "react";
 import {

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

@@ -861,13 +861,9 @@ export const useEditor = (
     state.current.currentlyEditing = true;
     state.current.movedAway = false;
 
-    if (!state.current.editorStateRestored) {
-      state.current.isRestoringState = true;
-      if (!DDS.isTab) {
-        tabBarRef.current?.goToPage(1, false);
-      }
+    if (!DDS.isTab) {
+      tabBarRef.current?.goToPage(1, false);
     }
-
     clearAppState();
     state.current.isRestoringState = false;
   }, []);

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

@@ -52,7 +52,7 @@ export const Home = ({ navigation, route }: NavigationProps<"Notes">) => {
       <SelectionHeader id={route.name} items={notes} type="note" />
       <Header
         renderedInRoute={route.name}
-        title={strings.routes[route.name]()}
+        title={strings.routes[route.name as keyof typeof strings.routes]()}
         canGoBack={false}
         hasSearch={true}
         onSearch={() => {
@@ -72,11 +72,13 @@ export const Home = ({ navigation, route }: NavigationProps<"Notes">) => {
           dataType="note"
           renderedInRoute={route.name}
           loading={loading || !isFocused}
-          headerTitle={strings.routes[route.name]()}
+          headerTitle={strings.routes[
+            route.name as keyof typeof strings.routes
+          ]?.()}
           placeholder={{
             title: route.name?.toLowerCase(),
             paragraph: strings.notesEmpty(),
-            button: strings.createNewNote(),
+            button: strings.newNote(),
             action: openEditor,
             loading: strings.loadingNotes()
           }}

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

@@ -196,7 +196,8 @@ const NotesPage = ({
       <Header
         renderedInRoute={route.name}
         title={
-          route.name === "Monographs" ? strings.routes[route.name]() : title
+          title ||
+          strings.routes[route.name as unknown as keyof typeof strings.routes]()
         }
         canGoBack={params?.current?.canGoBack}
         hasSearch={true}

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

@@ -76,7 +76,7 @@ export const Search = ({ route, navigation }: NavigationProps<"Search">) => {
         await results.item(0);
         setResults(results);
         if (results.placeholders?.length === 0) {
-          setSearchStatus(strings.noResultsFound(query));
+          setSearchStatus(`${strings.noResultsFound(query)}`);
         } else {
           setSearchStatus(undefined);
         }
@@ -125,8 +125,10 @@ export const Search = ({ route, navigation }: NavigationProps<"Search">) => {
         loading={loading}
         placeholder={{
           title: route.name,
-          paragraph: searchStatus || strings.searchInRoute(route.params?.title),
-          loading: strings.searchingFor(currentQuery.current as string)
+          paragraph:
+            searchStatus ||
+            `${strings.typeAKeywordToSearchIn(route.params?.title)}`,
+          loading: `${strings.searchingFor(currentQuery.current as string)}...`
         }}
       />
     </>

apps/mobile/app/screens/settings/attachment-group-progress.tsx

@@ -29,7 +29,6 @@ import { useAttachmentProgress } from "../../hooks/use-attachment-progress";
 import { useDBItem } from "../../hooks/use-db-item";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
 import { SIZE } from "../../utils/size";
-import { strings } from "@notesnook/intl";
 
 export const AttachmentGroupProgress = (props: { groupId?: string }) => {
   const { colors } = useThemeColors();
@@ -91,12 +90,11 @@ export const AttachmentGroupProgress = (props: { groupId?: string }) => {
           }}
           numberOfLines={1}
         >
-          {strings.downloading()} {file?.filename}{" "}
-          {formatBytes(file?.size || 0)}{" "}
+          Downloading {file?.filename} {formatBytes(file?.size || 0)}{" "}
           {fileProgress?.percent ? `(${fileProgress.percent})` : ""}
         </Paragraph>
         <Paragraph size={10} color={colors.secondary.paragraph}>
-          {strings.group()}: {props.groupId}
+          Group: {props.groupId}
         </Paragraph>
       </View>
       {props.groupId === "offline-mode" ? null : (

apps/mobile/app/screens/settings/debug.tsx

@@ -17,24 +17,24 @@ 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 { format, LogLevel, logManager } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
-import { LogMessage } from "@notesnook/logger";
-import { useThemeColors } from "@notesnook/theme";
 import Clipboard from "@react-native-clipboard/clipboard";
+import { LogMessage } from "@notesnook/logger";
+import { format, LogLevel, logManager } from "@notesnook/core";
 import React, { useEffect, useRef, useState } from "react";
 import { FlatList, Platform, TouchableOpacity, View } from "react-native";
-import RNFetchBlob from "react-native-blob-util";
 import * as ScopedStorage from "react-native-scoped-storage";
-import filesystem from "../../common/filesystem";
+import RNFetchBlob from "react-native-blob-util";
+import Storage from "../../common/database/storage";
 import { presentDialog } from "../../components/dialog/functions";
 import { IconButton } from "../../components/ui/icon-button";
 import { Notice } from "../../components/ui/notice";
 import Paragraph from "../../components/ui/typography/paragraph";
 import useTimer from "../../hooks/use-timer";
 import { ToastManager } from "../../services/event-manager";
+import { useThemeColors } from "@notesnook/theme";
 import { hexToRGBA } from "../../utils/colors";
+import { sanitizeFilename } from "@notesnook/common";
+import { strings } from "@notesnook/intl";
 
 export default function DebugLogs() {
   const { colors } = useThemeColors();
@@ -148,7 +148,7 @@ export default function DebugLogs() {
         if (!file) return;
         path = file.uri;
       } else {
-        path = await filesystem.checkAndCreateDir("/");
+        path = await Storage.checkAndCreateDir("/");
         await RNFetchBlob.fs.writeFile(path + fileName + ".txt", data, "utf8");
         path = path + fileName;
       }

apps/mobile/app/screens/settings/editor/toolbar-definition.ts

@@ -17,18 +17,18 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Icons } from "@notesnook/editor/dist/cjs/toolbar/icons";
+import { Icons } from "@notesnook/editor/dist/toolbar/icons";
 import { ToolbarGroupDefinition } from "@notesnook/editor";
 import {
   getAllTools,
   getDefaultPresets
-} from "@notesnook/editor/dist/cjs/toolbar/tool-definitions";
+} from "@notesnook/editor/dist/toolbar/tool-definitions";
 import { ToolId } from "@notesnook/editor";
 
-export const tools = getAllTools() as any;
+export const tools = getAllTools();
 export const presets: { [name: string]: ToolbarGroupDefinition[] } = {
-  default: getDefaultPresets().default as any,
-  minimal: getDefaultPresets().minimal as any,
+  default: getDefaultPresets().default,
+  minimal: getDefaultPresets().minimal,
   custom: []
 };
 

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

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { useThemeColors } from "@notesnook/theme";
 import React, { useRef, useState } from "react";
 import { View } from "react-native";
-import { Menu, MenuItem } from "react-native-material-menu";
+import Menu, { MenuItem } from "react-native-reanimated-material-menu";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { Dialog } from "../../../components/dialog";
 import { Pressable } from "../../../components/ui/pressable";
@@ -146,7 +146,7 @@ export function SettingsPicker<T>({
                 onChange(item);
               }
             }}
-            pressColor={colors.primary.hover}
+            underlayColor={colors.primary.hover}
             style={{
               backgroundColor: compareValue(currentValue, item)
                 ? colors.selected.background

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

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { DATE_FORMATS, TIME_FORMATS } from "@notesnook/core";
-import { getFontById, getFonts } from "@notesnook/editor/dist/cjs/utils/font";
+import { getFontById, getFonts } from "@notesnook/editor/dist/utils/font";
 import dayjs from "dayjs";
 import { createSettingsPicker } from ".";
 import { db } from "../../../common/database";
@@ -57,7 +57,7 @@ export const HomePicker = createSettingsPicker({
     });
   },
   formatValue: (item) => {
-    return strings.routes[typeof item === "object" ? item.name : item]?.();
+    return strings.routes[typeof item === "object" ? item.name : item]();
   },
   getItemKey: (item) => item.name,
   options: MenuItemsList.slice(0, MenuItemsList.length - 1),

apps/mobile/app/screens/settings/restore-backup/index.tsx

@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { formatBytes, getFormattedDate } from "@notesnook/common";
 import { LegacyBackupFile } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect, useState } from "react";
 import { ActivityIndicator, FlatList, Platform, View } from "react-native";
@@ -28,7 +27,7 @@ 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 filesystem from "../../../common/filesystem";
+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";
@@ -47,6 +46,7 @@ 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";
+import { strings } from "@notesnook/intl";
 
 type PasswordOrKey = { password?: string; encryptionKey?: string };
 
@@ -153,7 +153,7 @@ const restoreBackup = async (options: {
           if (path === ".nnbackup" || path === "attachments") continue;
 
           updateProgress({
-            progress: `${strings.restoringBackup()} (${count++}/${
+            progress: `${strings.restoringBackup()}... (${count++}/${
               extractedBackupFiles.length
             })`
           });
@@ -242,7 +242,7 @@ const restoreBackup = async (options: {
 
       await db.transaction(async () => {
         updateProgress({
-          progress: strings.restoringBackup()
+          progress: strings.restoringBackup() + "..."
         });
         await db.backup.import(backup, {
           encryptionKey,
@@ -300,7 +300,7 @@ export const RestoreBackup = () => {
           return;
         }
       } else {
-        const path = await filesystem.checkAndCreateDir("/backups/");
+        const path = await storage.checkAndCreateDir("/backups/");
         files = await RNFetchBlob.fs.lstat(path);
       }
       files = files
@@ -533,11 +533,12 @@ const BackupItem = ({
         }}
         onPress={() => {
           presentDialog({
-            title: `${strings.restore()} ${itemName}`,
-            paragraph: strings.restoreBackupConfirm(),
-            positiveText: strings.restore(),
-            negativeText: strings.cancel(),
+            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"

apps/mobile/app/screens/settings/section-item.tsx

@@ -203,15 +203,19 @@ const _SectionItem = ({ item }: { item: SettingSection }) => {
             <Input
               {...item.inputProperties}
               onSubmit={(e) => {
-                SettingsService.set({
-                  [item.property as string]: e.nativeEvent.text
-                });
+                if (e.nativeEvent.text) {
+                  SettingsService.set({
+                    [item.property as string]: e.nativeEvent.text
+                  });
+                }
                 item.inputProperties?.onSubmitEditing?.(e);
               }}
               onChangeText={(text) => {
-                SettingsService.set({
-                  [item.property as string]: text
-                });
+                if (text) {
+                  SettingsService.set({
+                    [item.property as string]: text
+                  });
+                }
                 item.inputProperties?.onSubmitEditing?.(text as any);
               }}
               containerStyle={{ marginTop: 12 }}

apps/mobile/app/screens/settings/server-config.tsx

@@ -32,12 +32,7 @@ import SettingsService from "../../services/settings";
 import { HostId, HostIds } from "../../stores/use-setting-store";
 import { useUserStore } from "../../stores/use-user-store";
 
-export const ServerIds = [
-  "notesnook-sync",
-  "auth",
-  "sse",
-  "monograph"
-] as const;
+export const ServerIds = ["notesnook-sync", "auth", "sse"] as const;
 export type ServerId = (typeof ServerIds)[number];
 type Server = {
   id: ServerId;
@@ -45,7 +40,6 @@ type Server = {
   title: string;
   example: string;
   description: string;
-  versionEndpoint: string;
 };
 type VersionResponse = {
   version: number;
@@ -58,32 +52,21 @@ const SERVERS: Server[] = [
     host: "API_HOST",
     title: strings.syncServer(),
     example: "http://localhost:4326",
-    description: strings.syncServerDesc(),
-    versionEndpoint: "/version"
+    description: strings.syncServerDesc()
   },
   {
     id: "auth",
     host: "AUTH_HOST",
     title: strings.authServer(),
     example: "http://localhost:5326",
-    description: strings.authServerDesc(),
-    versionEndpoint: "/version"
+    description: strings.authServerDesc()
   },
   {
     id: "sse",
     host: "SSE_HOST",
     title: strings.sseServer(),
     example: "http://localhost:7326",
-    description: strings.sseServerDesc(),
-    versionEndpoint: "/version"
-  },
-  {
-    id: "monograph",
-    host: "MONOGRAPH_HOST",
-    title: strings.monographServer(),
-    example: "http://localhost:6326",
-    description: strings.monographServerDesc(),
-    versionEndpoint: "/api/version"
+    description: strings.sseServerDesc()
   }
 ];
 export function ServersConfiguration() {
@@ -152,31 +135,28 @@ export function ServersConfiguration() {
             type="secondary"
             width="100%"
             onPress={async () => {
-              setError(undefined);
               try {
                 for (const host of HostIds) {
                   const url = urls[host];
                   const server = SERVERS.find((s) => s.host === host)!;
-                  if (!server) throw new Error(strings.serverNotFound(host));
                   if (!url) throw new Error(strings.allServerUrlsRequired());
-                  const version = await fetch(`${url}${server.versionEndpoint}`)
+                  const version = await fetch(`${url}/version`)
                     .then((r) => r.json() as Promise<VersionResponse>)
                     .catch(() => undefined);
                   if (!version)
                     throw new Error(
-                      `${strings.couldNotConnectTo(server.title)}`
+                      `${strings.couldNotConnectTo()} ${server.title}.`
                     );
                   if (version.id !== server.id)
                     throw new Error(
-                      `${strings.incorrectServerUrl(url, server.title)}.`
+                      `${strings.incorrectServerUrl(url)} ${server.title}.`
                     );
                   if (!isServerCompatible(version.version)) {
-                    throw new Error(
-                      strings.serverVersionMismatch(server.title, url)
-                    );
+                    throw new Error(strings.serverVersionMismatch());
                   }
                 }
                 setSuccess(true);
+                setError(undefined);
               } catch (e) {
                 setError((e as Error).message);
               }

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

@@ -77,7 +77,6 @@ import { useDragState } from "./editor/state";
 import { verifyUser, verifyUserWithApplock } from "./functions";
 import { SettingSection } from "./types";
 import { getTimeLeft } from "./user-section";
-import Clipboard from "@react-native-clipboard/clipboard";
 
 type User = any;
 
@@ -340,19 +339,21 @@ export const settingsGroups: SettingSection[] = [
               presentDialog({
                 title: strings.clearCacheConfirm(),
                 paragraph: strings.clearCacheConfirmDesc(),
-                positiveText: strings.clear(),
+                positiveText: "Clear",
                 positivePress: async () => {
                   filesystem.clearCache();
                   ToastManager.show({
-                    heading: strings.cacheCleared(),
-                    message: strings.cacheClearedDesc(),
+                    heading: "Cache cleared",
+                    message: "All cached attachments have been removed",
                     type: "success"
                   });
                 }
               });
             },
             description(current) {
-              return strings.clearCacheDesc(current as number);
+              return `${strings.clearCacheDesc()}. Current cache size: ${
+                current as number
+              }`;
             },
             useHook: () => {
               const [cacheSize, setCacheSize] = React.useState(0);
@@ -379,7 +380,7 @@ export const settingsGroups: SettingSection[] = [
               presentDialog({
                 title: strings.logout(),
                 paragraph: strings.logoutConfirmation(),
-                positiveText: strings.logout(),
+                positiveText: "Logout",
                 check: {
                   info: strings.backupDataBeforeLogout(),
                   defaultValue: true
@@ -443,7 +444,7 @@ export const settingsGroups: SettingSection[] = [
                       }
 
                       updateProgress({
-                        progress: strings.loggingOut()
+                        progress: `${strings.loggingOut()}... ${strings.pleaseWait()}`
                       });
 
                       await db.user?.logout();
@@ -803,8 +804,8 @@ export const settingsGroups: SettingSection[] = [
       {
         id: "servers",
         type: "screen",
-        name: strings.servers(),
-        description: strings.serversConfigurationDesc(),
+        name: "Servers",
+        description: "Configure server URLs for Notesnook",
         icon: "server",
         component: "server-config"
       }
@@ -1166,9 +1167,7 @@ export const settingsGroups: SettingSection[] = [
             type: "component",
             hidden: () => !useUserStore.getState().user,
             name: strings.automaticBackupsWithAttachments(),
-            description: [
-              ...strings.automaticBackupsWithAttachmentsDesc()
-            ].join("\n"),
+            description: strings.automaticBackupsWithAttachmentsDesc(),
             component: "autobackupsattachments"
           },
           {
@@ -1386,15 +1385,7 @@ export const settingsGroups: SettingSection[] = [
         name: strings.emailSupport(),
         icon: "mail",
         modifer: () => {
-          Clipboard.setString("support@streetwriters.co");
-          ToastManager.show({
-            heading: strings.emailCopied(),
-            type: "success",
-            icon: "content-copy"
-          });
-          setTimeout(() => {
-            Linking.openURL("mailto:support@streetwriters.co");
-          }, 1000);
+          Linking.openURL("mailto:support@streetwriters.co");
         },
         description: strings.emailSupportDesc()
       },

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

@@ -17,10 +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 { strings } from "@notesnook/intl";
 import React from "react";
 import { Linking, Platform, View } from "react-native";
-import Config from "react-native-config";
 import { Button } from "../../components/ui/button";
 import { usePricing } from "../../hooks/use-pricing";
 import {
@@ -30,9 +28,14 @@ import {
 } from "../../services/event-manager";
 import PremiumService from "../../services/premium";
 import { useUserStore } from "../../stores/use-user-store";
-import { SUBSCRIPTION_STATUS } from "../../utils/constants";
+import {
+  SUBSCRIPTION_PROVIDER,
+  SUBSCRIPTION_STATUS
+} from "../../utils/constants";
 import { eOpenPremiumDialog } from "../../utils/events";
 import { SIZE } from "../../utils/size";
+import Config from "react-native-config";
+import { strings } from "@notesnook/intl";
 export const Subscription = () => {
   const user = useUserStore((state) => state.user);
   const monthlyPlan = usePricing("monthly");

apps/mobile/app/services/background-sync.ts

@@ -30,12 +30,24 @@ import SettingsService from "./settings";
 
 async function doInBackground(callback: () => Promise<void>) {
   if (Platform.OS === "ios") {
-    const bgTaskId = await beginBackgroundTask();
-    const result = await callback();
-    await endBackgroundTask(bgTaskId);
-    return result;
+    try {
+      const bgTaskId = await beginBackgroundTask();
+      const result = await callback();
+      await endBackgroundTask(bgTaskId);
+      return result;
+    } catch (e) {
+      return (e as Error).message;
+    }
   } else {
-    return await callback();
+    // eslint-disable-next-line no-async-promise-executor
+    return new Promise(async (resolve) => {
+      try {
+        const result = await callback();
+        resolve(result);
+      } catch (e) {
+        resolve((e as Error).message);
+      }
+    });
   }
 }
 

apps/mobile/app/services/backup.ts

@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { sanitizeFilename } from "@notesnook/common";
 import { formatDate } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
 import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
 import FileViewer from "react-native-file-viewer";
@@ -27,14 +26,20 @@ import * as ScopedStorage from "react-native-scoped-storage";
 import Share from "react-native-share";
 import { zip } from "react-native-zip-archive";
 import { DatabaseLogger, db } from "../common/database";
-import filesystem, { FileStorage } from "../common/filesystem";
+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, updateProgress } from "../components/dialogs/progress";
+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";
 import SettingsService from "./settings";
+import { strings } from "@notesnook/intl";
 
 const MS_DAY = 86400000;
 const MS_WEEK = MS_DAY * 7;
@@ -173,7 +178,7 @@ async function run(
   let path;
 
   if (Platform.OS === "ios") {
-    path = await filesystem.checkAndCreateDir("/backups");
+    path = await storage.checkAndCreateDir("/backups");
   }
 
   const backupFileName = sanitizeFilename(
@@ -227,7 +232,7 @@ async function run(
         updateProgress({
           progress: `Saving attachments in backup... ${file.hash}`
         });
-        if (await FileStorage.exists(file.hash)) {
+        if (await filesystem.exists(file.hash)) {
           await RNFetchBlob.fs.cp(
             `${cacheDir}/${file.hash}`,
             `${attachmentsDir}/${file.hash}`
@@ -294,7 +299,7 @@ async function run(
       path: path
     };
   } catch (e) {
-    ToastManager.error(e as Error, strings.backupFailed(), context || "global");
+    ToastManager.error(e, strings.backupFailed(), context || "global");
 
     if (
       (e as Error)?.message?.includes("android.net.Uri") &&

apps/mobile/app/services/biometrics.ts

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { Platform } from "react-native";
 import FingerprintScanner, {
   AuthenticateIOS
-} from "@ammarahmed/react-native-fingerprint-scanner";
+} from "react-native-fingerprint-scanner";
 import * as Keychain from "react-native-keychain";
 import { MMKV } from "../common/database/mmkv";
 import Storage from "../common/database/storage";

apps/mobile/app/services/event-manager.ts

@@ -123,7 +123,6 @@ export type PresentSheetOptions = {
 };
 
 export function presentSheet(data: Partial<PresentSheetOptions>) {
-  console.log("PRESENTING...");
   eSendEvent(eOpenSheet, data);
 }
 
@@ -149,31 +148,28 @@ export const ToastManager = {
     type = "error",
     context = "global",
     func,
-    actionText,
-    icon,
-    duration = 3000
+    actionText
   }: ToastOptions) => {
     if (Config.isTesting) return;
     eSendEvent(eShowToast, {
-      heading,
-      message,
-      type,
-      context,
-      func,
-      actionText,
-      icon,
-      duration
+      heading: heading,
+      message: message,
+      type: type,
+      context: context,
+      duration: 3000,
+      func: func,
+      actionText: actionText
     });
   },
   hide: () => eSendEvent(eHideToast),
-  error: (e: Error, title?: string, context?: any, duration = 6000) => {
+  error: (e: Error, title?: string, context?: any, duration = 5000) => {
     ToastManager.show({
       heading: title,
       message: e?.message || "",
       type: "error",
       context: context || "global",
       actionText: "Copy logs",
-      duration: duration,
+      duration: 6000,
       func: () => {
         Clipboard.setString(e?.stack || "");
         ToastManager.show({

apps/mobile/app/services/exporter.ts

@@ -23,6 +23,7 @@ import RNHTMLtoPDF from "react-native-html-to-pdf-lite";
 import * as ScopedStorage from "react-native-scoped-storage";
 import { zip } from "react-native-zip-archive";
 import { DatabaseLogger } from "../common/database/index";
+import Storage from "../common/database/storage";
 
 import {
   exportNote as _exportNote,
@@ -30,13 +31,13 @@ import {
   ExportableNote,
   exportNotes
 } from "@notesnook/common";
-import { FilteredSelector, Note } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
-import { basename, dirname, extname, join } from "pathe";
-import filesystem from "../common/filesystem";
+import { Note } from "@notesnook/core";
+import { FilteredSelector } from "@notesnook/core";
+import { basename, dirname, join, extname } from "pathe";
 import downloadAttachment from "../common/filesystem/download-attachment";
 import { cacheDir } from "../common/filesystem/utils";
 import { unlockVault } from "../utils/unlock-vault";
+import { strings } from "@notesnook/intl";
 
 const FolderNames: { [name: string]: string } = {
   txt: "Text",
@@ -48,7 +49,7 @@ const FolderNames: { [name: string]: string } = {
 async function getPath(type: string) {
   let path =
     Platform.OS === "ios" &&
-    (await filesystem.checkAndCreateDir(`/exported/${type}/`));
+    (await Storage.checkAndCreateDir(`/exported/${type}/`));
 
   if (Platform.OS === "android") {
     const file = await ScopedStorage.openDocumentTree(true);

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

@@ -25,12 +25,7 @@ import { FileType } from "react-native-scoped-storage";
 import create, { State } from "zustand";
 import { ThemeDark, ThemeLight, ThemeDefinition } from "@notesnook/theme";
 import { Reminder } from "@notesnook/core";
-export const HostIds = [
-  "API_HOST",
-  "AUTH_HOST",
-  "SSE_HOST",
-  "MONOGRAPH_HOST"
-] as const;
+export const HostIds = ["API_HOST", "AUTH_HOST", "SSE_HOST"] as const;
 export type HostId = (typeof HostIds)[number];
 
 export type Settings = {