Merge branch 'master' into fix-localization-error

Signed-off-by: Ammar Ahmed <40239442+ammarahm-ed@users.noreply.github.com>

.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-private/blob/master/CONTRIBUTING.md#commit-guidelines
+  // for full list of scopes + details see: https://github.com/streetwriters/notesnook/blob/master/CONTRIBUTING.md#commit-guidelines
 
   "mobile",
   "web",
@@ -36,7 +36,8 @@ const SCOPES = [
   "global",
   "docs",
   "themebuilder",
-  "intl"
+  "intl",
+  "webclipper"
 ];
 
 module.exports = {

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,8 +1,6 @@
 name: Bug Report
 description: Are you facing a bug or a crash in Notesnook?
-labels: ["Type: Bug", "Status: Pending"]
-assignees:
-  - thecodrr
+type: Bug
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,6 +1,6 @@
 name: Feature request
 description: Suggest a feature you are missing in Notesnook
-labels: ["Type: Feature Request", "Status: Pending"]
+type: Feature
 body:
   - type: markdown
     attributes:

.github/workflows/android.e2e.yml

@@ -0,0 +1,100 @@
+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@v3
+      - uses: actions/checkout@v4
 
       - 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@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -84,6 +84,26 @@ 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
@@ -92,7 +112,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -136,6 +156,12 @@ 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
@@ -188,7 +214,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -212,6 +238,12 @@ 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
@@ -247,7 +279,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup .NET Core SDK
         uses: actions/setup-dotnet@v2
@@ -272,6 +304,12 @@ 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

@@ -0,0 +1,233 @@
+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@v3
+        uses: actions/checkout@v4
 
       - 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@v3
+        uses: actions/checkout@v4
       - 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-13
+    runs-on: macos-latest
     timeout-minutes: 60
 
     steps:

.github/workflows/monograph.publish.yml

@@ -32,6 +32,12 @@ jobs:
           npm ci --ignore-scripts --prefer-offline --no-audit
           npm run bootstrap -- --scope=monograph
 
+      - name: Collect package metadata
+        id: package_metadata
+        working-directory: ./apps/monograph
+        run: |
+          echo ::set-output name=app_version::$(cat package.json | jq -r .version)
+
       - name: Generate build
         run: npx nx build @notesnook/monograph
 
@@ -72,7 +78,7 @@ jobs:
           file: apps/monograph/Dockerfile
           push: true
           platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8
-          tags: streetwriters/monograph:latest
+          tags: streetwriters/monograph:${{ steps.package_metadata.outputs.app_version }},streetwriters/monograph:latest
           cache-from: streetwriters/monograph:latest
 
       - name: Generate artifact attestation

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

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

.github/workflows/web.benchmarks.yml

@@ -0,0 +1,44 @@
+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@v3
+        uses: actions/checkout@v4
 
       - 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@v3
+        uses: actions/checkout@v4
 
       - 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@v3
+        uses: actions/checkout@v4
 
       - name: Download build
         uses: actions/download-artifact@v4

apps/desktop/__tests__/launch.test.mjs

@@ -0,0 +1,53 @@
+/*
+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/__tests__/utils.mjs

@@ -0,0 +1,38 @@
+/*
+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 { _electron as electron } from "playwright";
+
+const executablePath = process.env.EXECUTABLE_PATH;
+
+// process.platform === "linux"
+//   ? "output/linux-unpacked/Notesnook"
+//   : process.platform === "darwin"
+//   ? "output/mac/Notesnook.app/Contents/MacOS/Notesnook"
+//   : "output/win-unpacked/Notesnook.exe";
+
+export async function launchApp() {
+  const app = await electron.launch({
+    executablePath
+  });
+
+  const page = await app.firstWindow();
+
+  return { app, page };
+}

apps/desktop/package.json

@@ -2,11 +2,25 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "3.0.18",
+  "version": "3.0.22",
   "appAppleId": "1544027013",
   "private": true,
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "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"
+      }
+    }
+  },
   "homepage": "https://notesnook.com/",
   "repository": "https://github.com/streetwriters/notesnook",
   "license": "GPL-3.0-or-later",
@@ -15,10 +29,11 @@
     "@notesnook/intl": "file:../../packages/intl",
     "@trpc/client": "10.45.2",
     "@trpc/server": "10.45.2",
-    "better-sqlite3-multiple-ciphers": "11.2.1",
+    "better-sqlite3-multiple-ciphers": "11.5.0",
     "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"
@@ -28,14 +43,17 @@
     "@types/node": "22.7.0",
     "@types/yargs": "^17.0.33",
     "chokidar": "^4.0.1",
-    "electron": "^30.5.1",
-    "electron-builder": "^25.1.7",
+    "electron": "^31.7.4",
+    "electron-builder": "^25.1.8",
     "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"
+    "undici": "^6.19.8",
+    "vitest": "^2.1.5"
   },
   "optionalDependencies": {
     "dmg-license": "^1.0.11"
@@ -44,10 +62,11 @@
     "start": "node scripts/dev.mjs",
     "staging": "node scripts/build.mjs --run",
     "release": "node scripts/build.mjs",
-    "build": "tsc",
+    "build": "node ../../scripts/build.mjs",
     "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"
+    "postinstall": "patch-package",
+    "test": "node --test --test-timeout 30000 --test-force-exit"
   },
   "author": {
     "name": "Streetwriters (Private) Limited",
@@ -76,7 +95,20 @@
       "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"
     ],
@@ -149,10 +181,12 @@
           ]
         }
       ],
-      "signingHashAlgorithms": [
-        "sha256"
-      ],
-      "sign": "./scripts/sign.js",
+      "signtoolOptions": {
+        "signingHashAlgorithms": [
+          "sha256"
+        ],
+        "sign": "./scripts/sign.js"
+      },
       "icon": "assets/icons/app.ico"
     },
     "portable": {

apps/desktop/scripts/build.mjs

@@ -18,19 +18,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import path from "path";
-import fs, { readFile, writeFile } from "fs/promises";
-import { existsSync, readFileSync } from "fs";
+import fs from "fs/promises";
+import { existsSync } 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"));
 
@@ -46,12 +44,6 @@ 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
@@ -63,7 +55,7 @@ if (args.variant === "mas") {
   await exec(`yarn run bundle`);
 }
 
-await exec(`yarn tsc`);
+await exec(`yarn run build`);
 
 if (args.run) {
   await exec(`yarn electron-builder --dir --x64`);
@@ -83,21 +75,3 @@ 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,6 +36,8 @@ const ENV = {
   FORCE_COLOR: "false",
   COLOR: "0"
 };
+process.chdir(path.join(__dirname, ".."));
+
 await onChange(true);
 
 console.log("Watching...");
@@ -53,11 +55,13 @@ 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`);
-  execAsync(`yarn`, [`tsc`]);
+  await exec(`yarn run build`);
 
   if (await isBundleSame()) {
     console.log("Bundle is same. Doing nothing.");

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

@@ -0,0 +1,48 @@
+/*
+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,6 +46,8 @@ 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 * from "./constants";
+export { PATHS } 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

@@ -41,8 +41,8 @@ import { i18n } from "@lingui/core";
 
 const locale =
   process.env.NODE_ENV === "development"
-    ? import("@notesnook/intl/dist/locales/$pseudo-LOCALE.json")
-    : import("@notesnook/intl/dist/locales/$en.json");
+    ? import("@notesnook/intl/locales/$pseudo-LOCALE.json")
+    : import("@notesnook/intl/locales/$en.json");
 locale.then(({ default: locale }) => {
   i18n.load({
     en: locale.messages as unknown as Messages
@@ -101,7 +101,7 @@ async function createWindow() {
     ...(config.desktopSettings.nativeTitlebar
       ? {}
       : {
-          titleBarStyle: "hidden",
+          titleBarStyle: process.platform === "win32" || process.platform === "darwin" ? "hidden" : "default",
           frame: process.platform === "win32" || process.platform === "darwin",
           titleBarOverlay: {
             height: 37,

apps/desktop/src/preload.ts

@@ -19,22 +19,21 @@ 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: RendererGlobalElectronTRPC;
+  var electronTRPC: any;
   // var NativeNNCrypto: (new () => NNCrypto) | undefined;
 }
 
 process.once("loaded", async () => {
-  const electronTRPC: RendererGlobalElectronTRPC = {
-    sendMessage: (operation) =>
+  const electronTRPC = {
+    sendMessage: (operation: any) =>
       ipcRenderer.send(ELECTRON_TRPC_CHANNEL, operation),
-    onMessage: (callback) =>
+    onMessage: (callback: any) =>
       ipcRenderer.on(ELECTRON_TRPC_CHANNEL, (_event, args) => callback(args))
   };
   globalThis.electronTRPC = electronTRPC;

apps/desktop/src/utils/theme.ts

@@ -57,7 +57,8 @@ function getSystemTheme() {
   nativeTheme.themeSource = oldThemeSource;
 
   setTimeout(
-    () => listeners.forEach((a) => nativeTheme.addListener("updated", a)),
+    () =>
+      listeners.forEach((a) => nativeTheme.addListener("updated", () => a())),
     1000
   );
   return currentTheme;
@@ -72,7 +73,8 @@ 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,7 +2,8 @@
   "extends": "../../tsconfig",
   "compilerOptions": {
     "outDir": "./dist/",
-    "lib": ["ESNext"]
+    "lib": ["ESNext"],
+    "moduleResolution": "Bundler"
   },
   "include": ["src", "global.d.ts"]
 }

apps/mobile/.gitignore

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

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

@@ -54,10 +54,10 @@ export async function setupDatabase(password) {
     storage: Storage,
     eventsource: Platform.OS === "ios" ? EventSource : AndroidEventSource,
     fs: filesystem,
-    compressor: {
+    compressor: () => ({
       compress: Gzip.deflate,
       decompress: Gzip.inflate
-    },
+    }),
     batchSize: 100,
     sqliteOptions: {
       dialect: (name) => ({

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

@@ -140,7 +140,7 @@ export async function downloadAttachments(attachments) {
     useAttachmentStore.getState().setDownloading({
       current: 0,
       total: 1,
-      message: `${strings.savingZipFile()}... ${strings.pleaseWait()}`,
+      message: strings.savingZipFile(),
       groupId
     });
     // If all goes well, zip the notesnook-attachments folder in cache.
@@ -150,9 +150,7 @@ export async function downloadAttachments(attachments) {
         groupId,
         current: progress,
         total: 1,
-        message: `${strings.savingZipFile()} (${(progress * 100).toFixed(
-          1
-        )}%)... ${strings.pleaseWait()}`
+        message: strings.savingZipFile((progress * 100).toFixed(1))
       });
     });
     await zip(zipSourceFolder, zipOutputFile);
@@ -226,6 +224,13 @@ export default async function downloadAttachment(
   }
 
   try {
+    useAttachmentStore.getState().setDownloading({
+      groupId: options.groupId || attachment.hash,
+      current: 0,
+      total: 1,
+      filename: attachment.filename
+    });
+
     await db
       .fs()
       .downloadFile(
@@ -233,6 +238,15 @@ export default async function downloadAttachment(
         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;
@@ -246,7 +260,7 @@ export default async function downloadAttachment(
       );
     }
 
-    let filename = getFileNameWithExtension(
+    let filename = await getFileNameWithExtension(
       attachment.filename,
       attachment.mimeType
     );
@@ -303,6 +317,14 @@ 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) {

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

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

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

@@ -31,6 +31,7 @@ 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);
@@ -69,8 +70,7 @@ export const AttachmentItem = ({
   };
 
   return errorOnly && attachment && !attachment?.failed ? null : (
-    <TouchableOpacity
-      activeOpacity={0.9}
+    <Pressable
       onPress={onPress}
       style={{
         flexDirection: "row",
@@ -186,6 +186,6 @@ export const AttachmentItem = ({
           )}
         </>
       )}
-    </TouchableOpacity>
+    </Pressable>
   );
 };

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

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

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

@@ -17,8 +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 React, { useEffect, useRef, useState } from "react";
+import { strings } from "@notesnook/intl";
+import { useThemeColors } from "@notesnook/theme";
+import React, { useCallback, 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 {
@@ -26,21 +29,16 @@ 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 }) => {
+const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
   const { colors } = useThemeColors();
   const code = useRef();
   const [currentMethod, setCurrentMethod] = useState({
@@ -138,7 +136,8 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
       <View
         style={{
           alignItems: "center",
-          paddingHorizontal: currentMethod.method ? 12 : 0
+          paddingHorizontal: currentMethod.method ? 12 : 0,
+          gap: 12
         }}
       >
         <IconButton
@@ -163,12 +162,10 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
             textAlign: "center"
           }}
         >
-          {strings["2faCodeHelpText"][currentMethod.method]() ||
+          {strings["2faCodeHelpText"][currentMethod.method]?.() ||
             strings.select2faCodeHelpText()}
         </Paragraph>
 
-        <Seperator />
-
         {currentMethod.method === "sms" || currentMethod.method === "email" ? (
           <Button
             onPress={onSendCode}
@@ -187,8 +184,6 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
           />
         ) : null}
 
-        <Seperator />
-
         {currentMethod.method ? (
           <>
             <Input
@@ -227,7 +222,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
                 minWidth: "50%"
               }}
             />
-            <Seperator />
+
             <Button
               title={loading ? null : strings.next()}
               type="accent"
@@ -235,8 +230,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
               loading={loading}
               onPress={onNext}
               style={{
-                borderRadius: 100,
-                marginBottom: 10
+                borderRadius: 100
               }}
             />
 
@@ -248,6 +242,13 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
               onPress={onRequestSecondaryMethod}
               height={30}
             />
+
+            <Button
+              title={strings.cancel()}
+              type="plain"
+              onPress={onCancel}
+              height={30}
+            />
           </>
         ) : (
           <>
@@ -298,15 +299,16 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
   );
 };
 
-TwoFactorVerification.present = (onMfaLogin, data, context) => {
+TwoFactorVerification.present = (onMfaLogin, data, onCancel, context) => {
   presentSheet({
     component: () => (
-      <TwoFactorVerification onMfaLogin={onMfaLogin} mfaInfo={data} />
+      <TwoFactorVerification
+        onMfaLogin={onMfaLogin}
+        mfaInfo={data}
+        onCancel={onCancel}
+      />
     ),
     context: context || "two_factor_verify",
-    onClose: () => {
-      onMfaLogin();
-    },
     disableClosing: true
   });
 };

apps/mobile/app/components/auth/use-login.js

@@ -72,31 +72,39 @@ export const useLogin = (onFinishLogin, sessionExpired = false) => {
           const mfaInfo = await db.user.authenticateEmail(email.current);
           console.log("email auth", mfaInfo);
           if (mfaInfo) {
-            TwoFactorVerification.present(async (mfa, callback) => {
-              try {
-                const success = await db.user.authenticateMultiFactorCode(
-                  mfa.code,
-                  mfa.method
-                );
+            TwoFactorVerification.present(
+              async (mfa, callback) => {
+                try {
+                  const success = await db.user.authenticateMultiFactorCode(
+                    mfa.code,
+                    mfa.method
+                  );
 
-                if (success) {
-                  setStep(LoginSteps.passwordAuth);
-                  setLoading(false);
-                  setTimeout(() => {
-                    passwordInputRef.current?.focus();
-                  }, 500);
-                  callback && callback(true);
-                }
-                callback && callback(false);
-              } catch (e) {
-                callback && callback(false);
-                if (e.message === "invalid_grant") {
-                  eSendEvent(eCloseSheet, "two_factor_verify");
-                  setLoading(false);
-                  setStep(LoginSteps.emailAuth);
+                  if (success) {
+                    setStep(LoginSteps.passwordAuth);
+                    setLoading(false);
+                    setTimeout(() => {
+                      passwordInputRef.current?.focus();
+                    }, 500);
+                    callback && callback(true);
+                  }
+                  callback && callback(false);
+                } catch (e) {
+                  callback && callback(false);
+                  if (e.message === "invalid_grant") {
+                    eSendEvent(eCloseSheet, "two_factor_verify");
+                    setLoading(false);
+                    setStep(LoginSteps.emailAuth);
+                  }
                 }
+              },
+              mfaInfo,
+              () => {
+                eSendEvent(eCloseSheet, "two_factor_verify");
+                setLoading(false);
+                setStep(LoginSteps.emailAuth);
               }
-            }, mfaInfo);
+            );
           } else {
             finishWithError(new Error(strings.unableToSend2faCode()));
           }

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 "../../../../../../packages/theme/dist";
+import { useThemeColors } from "@notesnook/theme";
 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,8 +311,10 @@ export class VaultDialog extends Component {
       loading: true
     });
     try {
-      let verified = await db.user.verifyPassword(this.password);
-      if (!(await db.user.getUser())) verified = true;
+      let verified = true;
+      if (await db.user.getUser()) {
+        verified = await db.user.verifyPassword(this.password);
+      }
       if (verified) {
         let noteIds = [];
         if (this.state.deleteAll) {
@@ -320,20 +322,21 @@ 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);
 
-        noteIds.forEach((id) => {
-          eSendEvent(
-            eUpdateNoteInEditor,
-            {
-              id: id,
-              deleted: true
-            },
-            true
-          );
-        });
-
+        if (this.state.deleteAll) {
+          noteIds.forEach((id) => {
+            eSendEvent(
+              eUpdateNoteInEditor,
+              {
+                id: id,
+                deleted: true
+              },
+              true
+            );
+          });
+        }
+        console.log("VAULT UPDATED EVENT");
         eSendEvent("vaultUpdated");
         this.setState({
           loading: false
@@ -457,7 +460,7 @@ export class VaultDialog extends Component {
   async _deleteNote() {
     try {
       await db.vault.remove(this.state.note.id, this.password);
-      await deleteItems([this.state.note.id], "note");
+      await deleteItems("note", [this.state.note.id]);
       this.close();
     } catch (e) {
       this._takeErrorAction(e);
@@ -517,7 +520,6 @@ export class VaultDialog extends Component {
       });
       this.close();
     } else {
-      eSendEvent("vaultUpdated");
       ToastManager.show({
         heading: strings.vaultCreated(),
         type: "success",
@@ -525,6 +527,7 @@ export class VaultDialog extends Component {
       });
       this.close();
     }
+    eSendEvent("vaultUpdated");
   }
 
   _permanantUnlock() {
@@ -540,6 +543,7 @@ export class VaultDialog extends Component {
         this.close();
       })
       .catch((e) => {
+        console.log("Error", e);
         this._takeErrorAction(e);
       });
   }
@@ -580,24 +584,17 @@ export class VaultDialog extends Component {
   }
 
   _takeErrorAction(e) {
-    if (
-      e.message === db.vault.ERRORS.wrongPassword ||
-      e.message === "FAILURE"
-    ) {
-      this.setState({
-        wrongPassword: true,
-        visible: true
+    this.setState({
+      wrongPassword: true,
+      visible: true
+    });
+    setTimeout(() => {
+      ToastManager.show({
+        heading: strings.passwordIncorrect(),
+        type: "error",
+        context: "local"
       });
-      setTimeout(() => {
-        ToastManager.show({
-          heading: strings.passwordIncorrect(),
-          type: "error",
-          context: "local"
-        });
-      }, 500);
-
-      return;
-    }
+    }, 500);
   }
 
   _revokeFingerprintAccess = async () => {
@@ -876,9 +873,9 @@ export class VaultDialog extends Component {
             }
             positiveTitle={
               deleteVault
-                ? strings.deleteVault()
+                ? strings.delete()
                 : clearVault
-                ? strings.clearVault()
+                ? strings.clear()
                 : fingerprintAccess
                 ? strings.enable()
                 : this.state.revokeFingerprintAccess

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

@@ -33,7 +33,6 @@ 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,9 +19,8 @@ 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-reanimated-material-menu";
+import { Menu } from "react-native-material-menu";
 import { notesnook } from "../../../e2e/test.ids";
 import {
   HeaderRightButton,
@@ -97,14 +96,16 @@ export const RightMenus = ({
           style={{
             borderRadius: 5,
             backgroundColor: contextMenuColors.primary.background,
-            marginTop: -40
+            marginTop: 35
           }}
           onRequestClose={() => {
+            //@ts-ignore
             menuRef.current?.hide();
           }}
           anchor={
             <IconButton
               onPress={() => {
+                //@ts-ignore
                 menuRef.current?.show();
               }}
               name="dots-vertical"
@@ -116,9 +117,10 @@ export const RightMenus = ({
           {headerRightButtons.map((item) => (
             <Button
               style={{
-                width: 150,
                 justifyContent: "flex-start",
-                borderRadius: 0
+                borderRadius: 0,
+                alignSelf: "flex-start",
+                width: "100%"
               }}
               type="plain"
               buttonType={{
@@ -127,6 +129,7 @@ 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,30 +17,23 @@ 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,
-  TouchableOpacity,
-  useWindowDimensions,
-  View
-} from "react-native";
+import { Linking, ScrollView, 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();
@@ -90,7 +83,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,10 +57,7 @@ export const SectionHeader = React.memo<
   }: SectionHeaderProps) {
     const { colors } = useThemeColors();
     const { fontScale } = useWindowDimensions();
-    const groupBy =
-      strings.groupByStrings[
-        groupOptions.groupBy as keyof typeof strings.groupByStrings
-      ]?.();
+    const groupBy = strings.groupByStrings[groupOptions.groupBy]();
     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 () => {
-        await db.trash.restore(item.id);
+        if ((await db.trash.restore(item.id)) === false) return;
         Navigation.queueRoutesForUpdate();
         useSelectionStore.getState().setSelectionMode(undefined);
         ToastManager.show({

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

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

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

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

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

@@ -34,12 +34,13 @@ import {
   Reminder,
   Tag,
   TrashItem,
-  VirtualizedGrouping
+  VirtualizedGrouping,
+  getSortValue
 } 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";
@@ -48,7 +49,6 @@ 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") {
-      await db.trash.restore(note.id);
+      if ((await db.trash.restore(note.id)) === false) return;
       Navigation.queueRoutesForUpdate();
       useSelectionStore.getState().setSelectionMode(false);
       ToastManager.show({

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

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

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

@@ -18,6 +18,7 @@ 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 {
@@ -26,7 +27,7 @@ import {
   Platform,
   View
 } from "react-native";
-import Menu from "react-native-reanimated-material-menu/src/Menu";
+import { Menu } from "react-native-material-menu";
 import { db } from "../../common/database";
 import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
 import { ToastManager } from "../../services/event-manager";
@@ -46,7 +47,6 @@ 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;
-      await db.trash.restore(...selectedItemsList);
+      if ((await db.trash.restore(...selectedItemsList)) === false) return;
       Navigation.queueRoutesForUpdate();
 
       clearSelection();
@@ -101,10 +101,11 @@ export const SelectionHeader = React.memo(
     };
 
     const deleteItem = async () => {
+      if (!type) return;
       presentDialog({
-        title: strings.deleteItems(type as string, selectedItemsList.length),
-        paragraph: strings.deleteItemsConfirmation(
-          type as string,
+        title: strings.doActions.delete.unknown(type, selectedItemsList.length),
+        paragraph: strings.actionConfirmations.delete.unknown(
+          type,
           selectedItemsList.length
         ),
         positiveText: strings.delete(),
@@ -219,14 +220,16 @@ export const SelectionHeader = React.memo(
               style={{
                 borderRadius: 5,
                 backgroundColor: contextMenuColors.primary.background,
-                marginTop: -20
+                marginTop: 35
               }}
               onRequestClose={() => {
+                //@ts-ignore
                 menuRef.current?.hide();
               }}
               anchor={
                 <IconButton
                   onPress={() => {
+                    //@ts-ignore
                     menuRef.current?.show();
                   }}
                   name="dots-vertical"
@@ -293,15 +296,35 @@ export const SelectionHeader = React.memo(
                 {
                   title: strings.moveToTrash(),
                   onPress: async () => {
-                    deleteItems(
-                      undefined,
-                      useSelectionStore.getState().selectionMode
-                    ).then(() => {
-                      useSelectionStore.getState().clearSelection();
-                      useSelectionStore.getState().setSelectionMode(undefined);
-                    });
+                    const selection = useSelectionStore.getState();
+                    if (!selection.selectionMode) return;
+                    await deleteItems(
+                      selection.selectionMode as ItemType,
+                      selection.selectedItemsList
+                    );
+                    selection.clearSelection();
+                    selection.setSelectionMode(undefined);
                   },
-                  visible: type !== "trash",
+                  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",
                   icon: "delete"
                 },
                 {
@@ -320,9 +343,10 @@ export const SelectionHeader = React.memo(
                 !item.visible ? null : (
                   <Button
                     style={{
-                      width: 150,
                       justifyContent: "flex-start",
-                      borderRadius: 0
+                      borderRadius: 0,
+                      alignSelf: "flex-start",
+                      width: "100%"
                     }}
                     type="plain"
                     buttonType={{
@@ -332,6 +356,7 @@ 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) {
+    if (parentNotebook && id) {
       await db.relations.add(parentNotebook, {
         type: "notebook",
         id: id
@@ -94,7 +94,8 @@ export const AddNotebookSheet = ({
     useNotebookStore.getState().refresh();
 
     const parent =
-      parentNotebook?.id || (await getParentNotebookId(notebook?.id || id));
+      parentNotebook?.id ||
+      (await getParentNotebookId(notebook?.id || (id as string)));
 
     eSendEvent(eOnNotebookUpdated, parent);
     if (notebook) {
@@ -104,7 +105,7 @@ export const AddNotebookSheet = ({
       });
     }
 
-    if (!notebook && showMoveNotesOnComplete) {
+    if (!notebook && showMoveNotesOnComplete && id) {
       MoveNotes.present(await db.notebooks.notebook(id));
     } else {
       close?.(true);

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

@@ -18,6 +18,7 @@ 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,
@@ -49,13 +50,11 @@ 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.export()} ${strings.notes(ids.length)}`}
+              title={strings.exportNotes(ids.length)}
             />
           </View>
 

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

@@ -43,7 +43,7 @@ const NewFeature = ({
   version
 }: {
   features: FeatureType[];
-  version?: string | null;
+  version?: string;
 }) => {
   const { colors } = useThemeColors();
 
@@ -57,7 +57,7 @@ const NewFeature = ({
       }}
     >
       <Heading color={colors.secondary.heading} size={SIZE.md}>
-        {!version ? `${strings.newVersion()} ` : `v${version} `}Highlights 🎉
+        {strings.newVersionHighlights(version)}
       </Heading>
 
       <Seperator />
@@ -122,7 +122,7 @@ NewFeature.present = () => {
     component: (
       <NewFeature
         features={features}
-        version={SettingsService.getProperty("version")}
+        version={SettingsService.getProperty("version") || undefined}
       />
     ),
     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,17 +214,11 @@ export const NotebookSheet = () => {
         }}
       >
         <Pressable
-          testID={notesnook.buttons.add}
+          testID="add-notebook-button"
           type="secondary"
           onPress={() => {
             if (!notebook) return;
-            AddNotebookSheet.present(
-              undefined,
-              notebook,
-              undefined,
-              undefined,
-              false
-            );
+            
           }}
           style={{
             borderRadius: 100
@@ -245,7 +239,7 @@ export const NotebookSheet = () => {
             />
           </View>
         </Pressable>
-      </View>
+      </View> */}
 
       <View
         style={{
@@ -307,8 +301,8 @@ export const NotebookSheet = () => {
                   }}
                   onPress={async () => {
                     await deleteItems(
-                      useItemSelectionStore.getState().getSelectedItemIds(),
-                      "notebook"
+                      "notebook",
+                      useItemSelectionStore.getState().getSelectedItemIds()
                     );
                     useSelectionStore.getState().clearSelection();
                     useItemSelectionStore.setState({
@@ -404,6 +398,27 @@ 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 { Note } from "@notesnook/core";
+import { hosts, 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 && `https://monogr.ph/${db.monographs.monograph(note?.id)}`;
+    note && `${hosts.MONOGRAPH_HOST}/${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.publish()} ${strings.note()}`}
-        paragraph={strings.publishDesc()}
+        title={strings.publishNote()}
+        paragraph={strings.publishNoteDesc()}
       />
 
       {publishing ? (

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 { VirtualizedGrouping } from "@notesnook/core";
-import { Item, ItemReference } from "@notesnook/core";
+import { Item, ItemReference, VirtualizedGrouping } from "@notesnook/core";
+import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React, { RefObject, useEffect, useState } from "react";
 import { View } from "react-native";
@@ -37,8 +37,6 @@ 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>;
@@ -90,14 +88,14 @@ export const RelationsList = ({
         sortDirection: "desc"
       })
       .then((grouped) => {
-        setItems(grouped);
+        setTimeout(() => {
+          setItems(grouped);
+        }, 300);
       });
-  }, [relationType, referenceType, item?.id, item?.type]);
+  }, [relationType, referenceType, item?.id, item?.type, updater]);
 
   return (
-    <View
-      style={{ paddingHorizontal: 12, height: hasNoRelations ? 300 : "100%" }}
-    >
+    <View style={{ paddingHorizontal: 12, height: "100%" }}>
       <SheetProvider context="local" />
       <DialogHeader
         title={title}
@@ -125,7 +123,9 @@ export const RelationsList = ({
             //  width="100%"
             type="inverted"
             icon="plus"
-            title={strings.addItem(referenceType)}
+            title={strings.addItem(
+              referenceType as "notebook" | "tag" | "reminder" | "note"
+            )}
           />
         </View>
       ) : (

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

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

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

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

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

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

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

@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /* eslint-disable no-inner-declarations */
-import { VAULT_ERRORS } from "@notesnook/core";
 import {
   Color,
   ItemReference,
@@ -25,8 +24,11 @@ import {
   Notebook,
   Reminder,
   Tag,
-  TrashItem
+  TrashItem,
+  VAULT_ERRORS,
+  createInternalLink
 } 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";
@@ -39,8 +41,10 @@ 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";
@@ -60,15 +64,10 @@ 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,
@@ -141,7 +140,7 @@ export const useActions = ({
   async function restoreTrashItem() {
     if (!checkItemSynced()) return;
     close();
-    await db.trash.restore(item.id);
+    if ((await db.trash.restore(item.id)) === false) return;
     Navigation.queueRoutesForUpdate();
     const type = item.type === "trash" ? item.itemType : item.type;
     ToastManager.show({
@@ -255,8 +254,8 @@ export const useActions = ({
       item.type === "color"
     ) {
       presentDialog({
-        title: strings.deleteItem(item.type),
-        paragraph: strings.deleteItemConfirmation(item.type),
+        title: strings.doActions.delete.unknown(item.type, 1),
+        paragraph: strings.actionConfirmations.delete.unknown(item.type, 1),
         positivePress: async () => {
           if (item.type === "reminder") {
             await db.reminders.remove(item.id);
@@ -291,7 +290,7 @@ export const useActions = ({
       });
     } else {
       try {
-        await deleteItems([item.id], item.type);
+        await deleteItems(item.type, [item.id]);
       } catch (e) {
         console.error(e);
       }
@@ -304,8 +303,8 @@ export const useActions = ({
     close();
     await sleep(300);
     presentDialog({
-      title: strings.delete(),
-      paragraph: strings.deleteItemsConfirmation(item.itemType, 1),
+      title: strings.doActions.delete.unknown(item.itemType, 1),
+      paragraph: strings.actionConfirmations.delete.unknown(item.itemType, 1),
       positiveText: strings.delete(),
       negativeText: strings.cancel(),
       positivePress: async () => {
@@ -314,7 +313,7 @@ export const useActions = ({
           Navigation.queueRoutesForUpdate();
           useSelectionStore.getState().setSelectionMode(undefined);
           ToastManager.show({
-            heading: strings.itemDeleted(1, item.itemType),
+            heading: strings.actions.deleted.unknown(item.itemType, 1),
             type: "success",
             context: "local"
           });
@@ -775,7 +774,7 @@ export const useActions = ({
     actions.push(
       {
         id: "favorite",
-        title: item.favorite ? strings.favorite() : strings.unfavorite(),
+        title: !item.favorite ? strings.favorite() : strings.unfavorite(),
         icon: item.favorite ? "star-off" : "star-outline",
         func: addToFavorites,
         close: false,
@@ -955,7 +954,10 @@ export const useActions = ({
     id: "trash",
     title:
       item.type !== "notebook" && item.type !== "note"
-        ? strings.doAction(item.type, 1, "delete")
+        ? strings.doActions.delete.unknown(
+            item.type === "trash" ? item.itemType : item.type,
+            1
+          )
         : strings.moveToTrash(),
     icon: "delete-outline",
     type: "error",

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

@@ -93,6 +93,7 @@ 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();
@@ -577,6 +578,27 @@ 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 VaultStatusCache = {
+const VaultStatusDefaults = {
   exists: false,
   biometryEnrolled: false,
   isBiometryAvailable: false
@@ -35,18 +35,12 @@ export type VaultStatusType = {
 };
 
 export const useVaultStatus = () => {
-  const [vaultStatus, setVaultStatus] = React.useState(VaultStatusCache);
+  const [vaultStatus, setVaultStatus] = React.useState(VaultStatusDefaults);
 
   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,13 +17,11 @@
     "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",
@@ -34,17 +32,14 @@
     "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"
+    "@lingui/core": "4.11.2",
+    "react-native-check-version": "^1.3.0",
+    "react-native-material-menu": "^2.0.0"
   },
   "sideEffects": false
 }

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

@@ -146,15 +146,16 @@ const Editor = React.memo(
             onRenderProcessGone={onError}
             nestedScrollEnabled
             onError={onError}
-            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};
+            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();
           `}
             useSharedProcessPool={false}
             javaScriptEnabled={true}

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

@@ -34,6 +34,7 @@ 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")) {
@@ -143,10 +144,17 @@ export function ReadonlyEditor(props: {
         ref={editorRef}
         key={"readonly-editor:" + props.editorId}
         nestedScrollEnabled
-        injectedJavaScriptBeforeContentLoaded={`globalThis.readonlyEditor=true;`}
-        injectedJavaScript="globalThis.readonlyEditor=true;"
+        injectedJavaScript={`
+        globalThis.__DEV__ = ${__DEV__}
+        globalThis.readonlyEditor=true;
+        globalThis.LINGUI_LOCALE = "${i18n.locale}";
+        globalThis.LINGUI_LOCALE_DATA = ${JSON.stringify({
+          [i18n.locale]: i18n.messages
+        })};
+        globalThis.loadApp();`}
         useSharedProcessPool={false}
         javaScriptEnabled={true}
+        webviewDebuggingEnabled={__DEV__}
         focusable={true}
         setSupportMultipleWindows={false}
         overScrollMode="never"

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

@@ -37,6 +37,7 @@ 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/toolbar/tool-definitions";
+import { getDefaultPresets } from "@notesnook/editor/dist/cjs/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

@@ -19,19 +19,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { getFormattedDate } from "@notesnook/common";
 import {
-  EVENTS,
-  isEncryptedContent,
-  NoteContent,
   ContentItem,
   ContentType,
   DeletedItem,
+  EVENTS,
   ItemReference,
   Note,
+  NoteContent,
   TrashItem,
   UnencryptedContentItem,
   isDeleted,
+  isEncryptedContent,
   isTrashItem
 } from "@notesnook/core";
+import { strings } from "@notesnook/intl";
 import { useThemeEngineStore } from "@notesnook/theme";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import WebView from "react-native-webview";
@@ -57,6 +58,7 @@ import {
   eUpdateNoteInEditor
 } from "../../../utils/events";
 import { tabBarRef } from "../../../utils/global-refs";
+import { sleep } from "../../../utils/time";
 import { unlockVault } from "../../../utils/unlock-vault";
 import { onNoteCreated } from "../../notes/common";
 import Commands from "./commands";
@@ -73,8 +75,6 @@ import {
   isEditorLoaded,
   post
 } from "./utils";
-import { sleep } from "../../../utils/time";
-import { strings } from "@notesnook/intl";
 
 type NoteWithContent = Note & {
   content?: NoteContent<false>;
@@ -282,7 +282,7 @@ export const useEditor = (
           if (saved) return;
           commands.setStatus(
             getFormattedDate(note ? note.dateEdited : Date.now(), "date-time"),
-            "Saving",
+            strings.saving(),
             tabId
           );
         }, 50);
@@ -365,7 +365,7 @@ export const useEditor = (
           note = (await db.notes?.note(id)) as Note;
           await commands.setStatus(
             getFormattedDate(note.dateEdited, "date-time"),
-            "Saved",
+            strings.saved(),
             tabId
           );
 
@@ -574,7 +574,7 @@ export const useEditor = (
 
         await commands.setStatus(
           getFormattedDate(item.dateEdited, "date-time"),
-          "Saved",
+          strings.saved(),
           tabId
         );
 
@@ -695,7 +695,7 @@ export const useEditor = (
             if (currentNotes.current[noteId]?.dateEdited !== note.dateEdited) {
               commands.setStatus(
                 getFormattedDate(note.dateEdited, "date-time"),
-                "Saved",
+                strings.saved(),
                 tabId as number
               );
             }
@@ -861,9 +861,13 @@ export const useEditor = (
     state.current.currentlyEditing = true;
     state.current.movedAway = false;
 
-    if (!DDS.isTab) {
-      tabBarRef.current?.goToPage(1, false);
+    if (!state.current.editorStateRestored) {
+      state.current.isRestoringState = true;
+      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 as keyof typeof strings.routes]()}
+        title={strings.routes[route.name]()}
         canGoBack={false}
         hasSearch={true}
         onSearch={() => {
@@ -72,13 +72,11 @@ export const Home = ({ navigation, route }: NavigationProps<"Notes">) => {
           dataType="note"
           renderedInRoute={route.name}
           loading={loading || !isFocused}
-          headerTitle={strings.routes[
-            route.name as keyof typeof strings.routes
-          ]?.()}
+          headerTitle={strings.routes[route.name]()}
           placeholder={{
             title: route.name?.toLowerCase(),
             paragraph: strings.notesEmpty(),
-            button: strings.newNote(),
+            button: strings.createNewNote(),
             action: openEditor,
             loading: strings.loadingNotes()
           }}

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

@@ -196,8 +196,7 @@ const NotesPage = ({
       <Header
         renderedInRoute={route.name}
         title={
-          title ||
-          strings.routes[route.name as unknown as keyof typeof strings.routes]()
+          route.name === "Monographs" ? strings.routes[route.name]() : title
         }
         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,10 +125,8 @@ export const Search = ({ route, navigation }: NavigationProps<"Search">) => {
         loading={loading}
         placeholder={{
           title: route.name,
-          paragraph:
-            searchStatus ||
-            `${strings.typeAKeywordToSearchIn(route.params?.title)}`,
-          loading: `${strings.searchingFor(currentQuery.current as string)}...`
+          paragraph: searchStatus || strings.searchInRoute(route.params?.title),
+          loading: strings.searchingFor(currentQuery.current as string)
         }}
       />
     </>

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

@@ -29,6 +29,7 @@ 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();
@@ -90,11 +91,12 @@ export const AttachmentGroupProgress = (props: { groupId?: string }) => {
           }}
           numberOfLines={1}
         >
-          Downloading {file?.filename} {formatBytes(file?.size || 0)}{" "}
+          {strings.downloading()} {file?.filename}{" "}
+          {formatBytes(file?.size || 0)}{" "}
           {fileProgress?.percent ? `(${fileProgress.percent})` : ""}
         </Paragraph>
         <Paragraph size={10} color={colors.secondary.paragraph}>
-          Group: {props.groupId}
+          {strings.group()}: {props.groupId}
         </Paragraph>
       </View>
       {props.groupId === "offline-mode" ? null : (

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/toolbar/icons";
+import { Icons } from "@notesnook/editor/dist/cjs/toolbar/icons";
 import { ToolbarGroupDefinition } from "@notesnook/editor";
 import {
   getAllTools,
   getDefaultPresets
-} from "@notesnook/editor/dist/toolbar/tool-definitions";
+} from "@notesnook/editor/dist/cjs/toolbar/tool-definitions";
 import { ToolId } from "@notesnook/editor";
 
-export const tools = getAllTools();
+export const tools = getAllTools() as any;
 export const presets: { [name: string]: ToolbarGroupDefinition[] } = {
-  default: getDefaultPresets().default,
-  minimal: getDefaultPresets().minimal,
+  default: getDefaultPresets().default as any,
+  minimal: getDefaultPresets().minimal as any,
   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-reanimated-material-menu";
+import { Menu, MenuItem } from "react-native-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);
               }
             }}
-            underlayColor={colors.primary.hover}
+            pressColor={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/utils/font";
+import { getFontById, getFonts } from "@notesnook/editor/dist/cjs/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,6 +19,7 @@ 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";
@@ -46,7 +47,6 @@ 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,
@@ -533,12 +533,11 @@ const BackupItem = ({
         }}
         onPress={() => {
           presentDialog({
-            title: `Restore ${itemName}`,
-            paragraph: `Are you sure you want to restore this backup?`,
-            positiveText: "Restore",
-            negativeText: "Cancel",
+            title: `${strings.restore()} ${itemName}`,
+            paragraph: strings.restoreBackupConfirm(),
+            positiveText: strings.restore(),
+            negativeText: strings.cancel(),
             positivePress: async () => {
-              console.log("file path", (item as ScopedStorage.FileType).uri);
               restoreBackup({
                 uri:
                   Platform.OS === "android"

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

@@ -32,7 +32,12 @@ 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"] as const;
+export const ServerIds = [
+  "notesnook-sync",
+  "auth",
+  "sse",
+  "monograph"
+] as const;
 export type ServerId = (typeof ServerIds)[number];
 type Server = {
   id: ServerId;
@@ -40,6 +45,7 @@ type Server = {
   title: string;
   example: string;
   description: string;
+  versionEndpoint: string;
 };
 type VersionResponse = {
   version: number;
@@ -52,21 +58,32 @@ const SERVERS: Server[] = [
     host: "API_HOST",
     title: strings.syncServer(),
     example: "http://localhost:4326",
-    description: strings.syncServerDesc()
+    description: strings.syncServerDesc(),
+    versionEndpoint: "/version"
   },
   {
     id: "auth",
     host: "AUTH_HOST",
     title: strings.authServer(),
     example: "http://localhost:5326",
-    description: strings.authServerDesc()
+    description: strings.authServerDesc(),
+    versionEndpoint: "/version"
   },
   {
     id: "sse",
     host: "SSE_HOST",
     title: strings.sseServer(),
     example: "http://localhost:7326",
-    description: strings.sseServerDesc()
+    description: strings.sseServerDesc(),
+    versionEndpoint: "/version"
+  },
+  {
+    id: "monograph",
+    host: "MONOGRAPH_HOST",
+    title: strings.monographServer(),
+    example: "http://localhost:6326",
+    description: strings.monographServerDesc(),
+    versionEndpoint: "/api/version"
   }
 ];
 export function ServersConfiguration() {
@@ -135,28 +152,31 @@ 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}/version`)
+                  const version = await fetch(`${url}${server.versionEndpoint}`)
                     .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());
+                    throw new Error(
+                      strings.serverVersionMismatch(server.title, url)
+                    );
                   }
                 }
                 setSuccess(true);
-                setError(undefined);
               } catch (e) {
                 setError((e as Error).message);
               }

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

@@ -77,6 +77,7 @@ 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;
 
@@ -333,27 +334,25 @@ export const settingsGroups: SettingSection[] = [
           },
           {
             id: "clear-cache",
-            name: "Clear cache",
+            name: strings.clearCache(),
             icon: "delete",
             modifer: async () => {
               presentDialog({
-                title: "Clear cache",
-                paragraph: "Are you sure you want to clear the cache?",
-                positiveText: "Clear",
+                title: strings.clearCacheConfirm(),
+                paragraph: strings.clearCacheConfirmDesc(),
+                positiveText: strings.clear(),
                 positivePress: async () => {
                   filesystem.clearCache();
                   ToastManager.show({
-                    heading: "Cache cleared",
-                    message: "All cached attachments have been removed",
+                    heading: strings.cacheCleared(),
+                    message: strings.cacheClearedDesc(),
                     type: "success"
                   });
                 }
               });
             },
             description(current) {
-              return `Clear all cached attachments. Current cache size: ${
-                current as number
-              }`;
+              return strings.clearCacheDesc(current as number);
             },
             useHook: () => {
               const [cacheSize, setCacheSize] = React.useState(0);
@@ -380,7 +379,7 @@ export const settingsGroups: SettingSection[] = [
               presentDialog({
                 title: strings.logout(),
                 paragraph: strings.logoutConfirmation(),
-                positiveText: "Logout",
+                positiveText: strings.logout(),
                 check: {
                   info: strings.backupDataBeforeLogout(),
                   defaultValue: true
@@ -444,7 +443,7 @@ export const settingsGroups: SettingSection[] = [
                       }
 
                       updateProgress({
-                        progress: `${strings.loggingOut()}... ${strings.pleaseWait()}`
+                        progress: strings.loggingOut()
                       });
 
                       await db.user?.logout();
@@ -804,8 +803,8 @@ export const settingsGroups: SettingSection[] = [
       {
         id: "servers",
         type: "screen",
-        name: "Servers",
-        description: "Configure server URLs for Notesnook",
+        name: strings.servers(),
+        description: strings.serversConfigurationDesc(),
         icon: "server",
         component: "server-config"
       }
@@ -897,7 +896,7 @@ export const settingsGroups: SettingSection[] = [
                 item: {},
                 clearVault: true,
                 novault: true,
-                title: strings.clearVault()
+                title: strings.clearVault() + "?"
               });
             }
           },
@@ -912,7 +911,7 @@ export const settingsGroups: SettingSection[] = [
                 item: {},
                 deleteVault: true,
                 novault: true,
-                title: strings.deleteVault()
+                title: strings.deleteVault() + "?"
               });
             }
           },
@@ -1167,7 +1166,9 @@ export const settingsGroups: SettingSection[] = [
             type: "component",
             hidden: () => !useUserStore.getState().user,
             name: strings.automaticBackupsWithAttachments(),
-            description: strings.automaticBackupsWithAttachmentsDesc(),
+            description: [
+              ...strings.automaticBackupsWithAttachmentsDesc()
+            ].join("\n"),
             component: "autobackupsattachments"
           },
           {
@@ -1385,7 +1386,15 @@ export const settingsGroups: SettingSection[] = [
         name: strings.emailSupport(),
         icon: "mail",
         modifer: () => {
-          Linking.openURL("mailto:support@streetwriters.co");
+          Clipboard.setString("support@streetwriters.co");
+          ToastManager.show({
+            heading: strings.emailCopied(),
+            type: "success",
+            icon: "content-copy"
+          });
+          setTimeout(() => {
+            Linking.openURL("mailto:support@streetwriters.co");
+          }, 1000);
         },
         description: strings.emailSupportDesc()
       },

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

@@ -17,8 +17,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+import { 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 {
@@ -28,14 +30,9 @@ import {
 } from "../../services/event-manager";
 import PremiumService from "../../services/premium";
 import { useUserStore } from "../../stores/use-user-store";
-import {
-  SUBSCRIPTION_PROVIDER,
-  SUBSCRIPTION_STATUS
-} from "../../utils/constants";
+import { 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,24 +30,12 @@ import SettingsService from "./settings";
 
 async function doInBackground(callback: () => Promise<void>) {
   if (Platform.OS === "ios") {
-    try {
-      const bgTaskId = await beginBackgroundTask();
-      const result = await callback();
-      await endBackgroundTask(bgTaskId);
-      return result;
-    } catch (e) {
-      return (e as Error).message;
-    }
+    const bgTaskId = await beginBackgroundTask();
+    const result = await callback();
+    await endBackgroundTask(bgTaskId);
+    return result;
   } else {
-    // 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);
-      }
-    });
+    return await callback();
   }
 }
 

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

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

@@ -25,7 +25,12 @@ 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"] as const;
+export const HostIds = [
+  "API_HOST",
+  "AUTH_HOST",
+  "SSE_HOST",
+  "MONOGRAPH_HOST"
+] as const;
 export type HostId = (typeof HostIds)[number];
 
 export type Settings = {

apps/mobile/app/utils/constants.ts

@@ -32,7 +32,7 @@ export const STORE_LINK =
 
 export const GROUP = {
   default: "default",
-  None: "none",
+  none: "none",
   abc: "abc",
   year: "year",
   week: "week",

apps/mobile/app/utils/functions.ts

@@ -17,6 +17,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+import { ItemType } from "@notesnook/core";
+import { strings } from "@notesnook/intl";
 import { Linking } from "react-native";
 import { db } from "../common/database";
 import { presentDialog } from "../components/dialog/functions";
@@ -24,20 +26,20 @@ import { eSendEvent, ToastManager } from "../services/event-manager";
 import Navigation from "../services/navigation";
 import { useMenuStore } from "../stores/use-menu-store";
 import { useRelationStore } from "../stores/use-relation-store";
-import { useSelectionStore } from "../stores/use-selection-store";
+import { useTagStore } from "../stores/use-tag-store";
 import { eOnNotebookUpdated, eUpdateNoteInEditor } from "./events";
 import { getParentNotebookId } from "./notebooks";
-import { useTagStore } from "../stores/use-tag-store";
-import { strings } from "@notesnook/intl";
 
-function confirmDeleteAllNotes(items, type, context) {
-  return new Promise((resolve) => {
+function confirmDeleteAllNotes(
+  items: string[],
+  type: "notebook",
+  context?: string
+) {
+  return new Promise<{ delete: boolean; deleteNotes: boolean }>((resolve) => {
     presentDialog({
-      title: `Delete ${
-        items.length > 1 ? `${items.length} ${type}s` : `${type}`
-      }?`,
-      positiveText: "Delete",
-      negativeText: "Cancel",
+      title: strings.doActions.delete.notebook(items.length),
+      positiveText: strings.delete(),
+      negativeText: strings.cancel(),
       positivePress: (_inputValue, value) => {
         setTimeout(() => {
           resolve({ delete: true, deleteNotes: value });
@@ -45,22 +47,21 @@ function confirmDeleteAllNotes(items, type, context) {
       },
       onClose: () => {
         setTimeout(() => {
-          resolve({ delete: false });
+          resolve({ delete: false, deleteNotes: false });
         });
       },
       context: context,
       check: {
-        info: `Move all notes in ${
-          items.length > 1 ? `these ${type}s` : `this ${type}`
-        } to trash`,
+        info: strings.deleteContainingNotes(items.length),
         type: "transparent"
       }
     });
   });
 }
 
-async function deleteNotebook(id, deleteNotes) {
+async function deleteNotebook(id: string, deleteNotes: boolean) {
   const notebook = await db.notebooks.notebook(id);
+  if (!notebook) return;
   const parentId = getParentNotebookId(id);
   if (deleteNotes) {
     const noteRelations = await db.relations.from(notebook, "note").get();
@@ -76,14 +77,16 @@ async function deleteNotebook(id, deleteNotes) {
   }
 }
 
-export const deleteItems = async (items, type, context) => {
-  const ids = items ? items : useSelectionStore.getState().selectedItemsList;
-
+export const deleteItems = async (
+  type: ItemType,
+  itemIds: string[],
+  context?: string
+) => {
   if (type === "reminder") {
-    await db.reminders.remove(...ids);
+    await db.reminders.remove(...itemIds);
     useRelationStore.getState().update();
   } else if (type === "note") {
-    for (const id of ids) {
+    for (const id of itemIds) {
       if (db.monographs.isPublished(id)) {
         ToastManager.show({
           heading: strings.someNotesPublished(),
@@ -106,20 +109,20 @@ export const deleteItems = async (items, type, context) => {
       );
     }
   } else if (type === "notebook") {
-    const result = await confirmDeleteAllNotes(ids, "notebook", context);
+    const result = await confirmDeleteAllNotes(itemIds, "notebook", context);
     if (!result.delete) return;
-    for (const id of ids) {
+    for (const id of itemIds) {
       await deleteNotebook(id, result.deleteNotes);
       eSendEvent(eOnNotebookUpdated, await getParentNotebookId(id));
     }
   } else if (type === "tag") {
     presentDialog({
-      title: strings.deleteTags(ids.length),
+      title: strings.doActions.delete.tag(itemIds.length),
       positiveText: strings.delete(),
       negativeText: strings.cancel(),
-      paragraph: strings.deleteTagsConfirm(),
+      paragraph: strings.actionConfirmations.delete.tag(2),
       positivePress: async () => {
-        await db.tags.remove(...ids);
+        await db.tags.remove(...itemIds);
         useTagStore.getState().refresh();
         useRelationStore.getState().update();
       },
@@ -128,14 +131,14 @@ export const deleteItems = async (items, type, context) => {
     return;
   }
 
-  let deletedIds = [...ids];
+  const deletedIds = [...itemIds];
   if (type === "notebook" || type === "note") {
-    let message = strings.movedToTrash(type, ids.length);
+    const message = strings.actions.movedToTrash[type](itemIds.length);
     ToastManager.show({
       heading: message,
       type: "success",
       func: async () => {
-        await db.trash.restore(...deletedIds);
+        if ((await db.trash.restore(...deletedIds)) === false) return;
         Navigation.queueRoutesForUpdate();
         useMenuStore.getState().setMenuPins();
         useMenuStore.getState().setColorNotes();
@@ -150,28 +153,21 @@ export const deleteItems = async (items, type, context) => {
     });
   } else {
     ToastManager.show({
-      heading: strings.deleted(type, ids.length),
+      heading: strings.actions.deleted.unknown(type, itemIds.length),
       type: "success"
     });
   }
 
   Navigation.queueRoutesForUpdate();
-  if (!items) {
-    useSelectionStore.getState().clearSelection();
-  }
   useMenuStore.getState().setColorNotes();
   if (type === "notebook") {
-    ids.forEach(async (id) => {
+    itemIds.forEach(async (id) => {
       eSendEvent(eOnNotebookUpdated, await getParentNotebookId(id));
     });
     useMenuStore.getState().setMenuPins();
   }
 };
 
-export const openLinkInBrowser = async (link) => {
-  try {
-    Linking.openURL(link);
-  } catch (error) {
-    console.log(error.message);
-  }
+export const openLinkInBrowser = async (link: string) => {
+  Linking.openURL(link);
 };

apps/mobile/app/utils/unlock-vault.ts

@@ -34,7 +34,6 @@ export async function unlockVault({
   paragraph: string;
 }) {
   if (unlockPromise) {
-    console.log("Unlocking.... waiting for unlock promise");
     return unlockPromise;
   }
   unlockPromise = new Promise(async (resolve) => {
@@ -58,10 +57,10 @@ export async function unlockVault({
             context: context,
             input: true,
             secureTextEntry: true,
-            positiveText: "Unlock",
+            positiveText: strings.unlock(),
             title: title,
             paragraph: paragraph,
-            inputPlaceholder: "Enter password",
+            inputPlaceholder: strings.enterPassword(),
             positivePress: async (value) => {
               const unlocked = await db.vault.unlock(value);
               if (!unlocked) {

apps/mobile/e2e/globalSetup.ts

@@ -0,0 +1,29 @@
+import { execSync } from "child_process";
+
+import { pathExists, ensureDir } from "fs-extra";
+
+import { resolveConfig } from "detox/internals";
+import { globalSetup } from "detox/runners/jest";
+
+export default async function customGlobalSetup() {
+  const config = await resolveConfig();
+  if (config.device.type === "android.emulator") {
+    await downloadTestButlerAPK();
+  }
+
+  await globalSetup();
+}
+
+async function downloadTestButlerAPK() {
+  const version = "2.2.1";
+  const artifactUrl = `https://repo1.maven.org/maven2/com/linkedin/testbutler/test-butler-app/${version}/test-butler-app-${version}.apk`;
+  const filePath = `cache/test-butler-app.apk`;
+
+  await ensureDir("cache");
+  if (!(await pathExists(filePath))) {
+    console.log(`\nDownloading Test-Butler APK v${version}...`);
+    execSync(`curl -f -o ${filePath} ${artifactUrl}`);
+  }
+}
+
+module.exports = customGlobalSetup;

apps/mobile/e2e/jest.config.js

@@ -1,20 +1,21 @@
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
   rootDir: "..",
-  testMatch: ["<rootDir>/e2e/**/*.e2e.js"],
-  testTimeout: 120000,
   maxWorkers: 1,
-  setupFilesAfterEnv: ["./e2e/setup.js"],
-  globalSetup: "detox/runners/jest/globalSetup",
+  testTimeout: 120000,
+  globalSetup: "./e2e/globalSetup.ts",
   globalTeardown: "detox/runners/jest/globalTeardown",
-  reporters: ["detox/runners/jest/reporter"],
+  setupFilesAfterEnv: ["./e2e/setup.ts"],
   testEnvironment: "detox/runners/jest/testEnvironment",
-  verbose: true,
+  reporters: ["detox/runners/jest/reporter"],
+  testRunner: "jest-circus/runner",
+  testMatch: ["<rootDir>/e2e/**/*.e2e.(js|ts)"],
   transform: {
-    "^.+\\.(js|jsx|ts|tsx)$": [
+    "\\.tsx?$": "ts-jest",
+    "^.+\\.(js|jsx)$": [
       "babel-jest",
       { configFile: "../native/babel.config.js" }
     ]
   },
-  transformIgnorePatterns: ["<rootDir>/../node_modules/"]
+  verbose: true
 };

apps/mobile/e2e/tests/auth.e2e.js

@@ -74,7 +74,7 @@ async function login() {
 // }
 
 describe("AUTH", () => {
-  it("Login", async () => {
+  it.skip("Login", async () => {
     await prepare();
     await openSideMenu();
     await login();

apps/mobile/e2e/tests/index.e2e.ts

@@ -17,23 +17,22 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { navigate, tapByText, prepare, sleep } from "./utils";
+import { Tests } from "./utils";
 
 describe("APP LAUNCH AND NAVIGATION", () => {
   it("App should launch successfully & hide welcome screen", async () => {
-    await prepare();
+    await Tests.prepare();
   });
 
   it("Basic navigation should work", async () => {
-    await prepare();
-    await navigate("Notebooks");
-    await sleep(500);
-    await navigate("Favorites");
-    await navigate("Trash");
-    await navigate("Tags");
-    await navigate("Settings");
-    await navigate("Monographs");
-    await navigate("Reminders");
-    await navigate("Notes");
+    await Tests.prepare();
+    await Tests.navigate("Notebooks");
+    await Tests.navigate("Favorites");
+    await Tests.navigate("Trash");
+    await Tests.navigate("Tags");
+    await Tests.navigate("Settings");
+    await Tests.navigate("Monographs");
+    await Tests.navigate("Reminders");
+    await Tests.navigate("Notes");
   });
 });

apps/mobile/e2e/tests/note.e2e.js

@@ -1,140 +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 { notesnook } from "../test.ids";
-import {
-  navigate,
-  tapById,
-  visibleByText,
-  createNote,
-  prepare,
-  visibleById,
-  notVisibleById,
-  sleep,
-  exitEditor,
-  tapByText,
-  elementByText,
-  elementById
-} from "./utils";
-
-describe("NOTE TESTS", () => {
-  it("Create a note in editor", async () => {
-    await prepare();
-    await createNote();
-  });
-
-  it("Open and close a note", async () => {
-    await prepare();
-    await createNote();
-    await tapById(notesnook.ids.note.get(0));
-    await exitEditor();
-  });
-
-  it.only("Notes properties should show", async () => {
-    await prepare();
-    let note = await createNote();
-    await tapById(notesnook.listitem.menu);
-    await waitFor(elementByText("Created at:")).toBeVisible().withTimeout(500);
-  });
-
-  it("Favorite and unfavorite a note", async () => {
-    await prepare();
-    let note = await createNote();
-    await tapById(notesnook.listitem.menu);
-    await tapById("icon-favorite");
-    await visibleById("icon-star");
-    await navigate("Favorites");
-    await visibleByText(note.body);
-    await sleep(500);
-    await tapById(notesnook.listitem.menu);
-    await tapById("icon-favorite");
-    await expect(element(by.text(note.body))).not.toBeVisible();
-    await navigate("Notes");
-  });
-
-  it("Pin a note to top", async () => {
-    await prepare();
-    await createNote();
-    await tapById(notesnook.listitem.menu);
-    await tapById("icon-pin");
-    await visibleByText("Pinned");
-    await visibleById("icon-pinned");
-    await tapById(notesnook.listitem.menu);
-    await tapById("icon-pin");
-    expect(element(by.id("icon-pinned"))).not.toBeVisible();
-  });
-
-  it("Pin a note in notifications", async () => {
-    await prepare();
-    await createNote();
-    await tapById(notesnook.listitem.menu);
-    await tapById("icon-pin-to-notifications");
-    await visibleByText("Unpin from notifications");
-    await sleep(500);
-    await tapById("icon-pin-to-notifications");
-    await sleep(500);
-    await visibleByText("Pin to notifications");
-  });
-
-  it("Copy note", async () => {
-    await prepare();
-    await createNote();
-    await tapById(notesnook.listitem.menu);
-    await sleep(1000);
-    await waitFor(elementById("icon-copy")).toBeVisible().withTimeout(500);
-    await tapById("icon-copy");
-  });
-
-  it("Assign colors to a note", async () => {
-    await prepare();
-    let note = await createNote();
-    await tapById(notesnook.listitem.menu);
-    await sleep(1000);
-    await tapByText("Add color");
-    await sleep(500);
-    await elementById("color-title-input").typeText("Test color");
-    await tapByText("Add color");
-    await sleep(3000);
-    await visibleById("icon-check");
-    await tapById("icon-color-#efefef");
-    await notVisibleById("icon-check");
-    await tapById("icon-color-#efefef");
-    await device.pressBack();
-    await navigate("Test color");
-    await visibleByText(note.body);
-  });
-
-  it("Delete & restore a note", async () => {
-    await prepare();
-    await createNote();
-    await tapById(notesnook.listitem.menu);
-    await sleep(500);
-    await tapById("icon-trash");
-    await navigate("Trash");
-    await sleep(500);
-    await tapById(notesnook.listitem.menu);
-    await sleep(500);
-    await tapByText("Restore note");
-    await device.pressBack();
-    await sleep(500);
-    await visibleByText(
-      "Test note description that is very long and should not fit in text."
-    );
-  });
-});

apps/mobile/e2e/tests/note.e2e.ts

@@ -0,0 +1,116 @@
+/*
+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 { notesnook } from "../test.ids";
+import { Tests } from "./utils";
+
+describe("NOTE TESTS", () => {
+  it("Create a note in editor", async () => {
+    await Tests.prepare();
+    await Tests.createNote();
+  });
+
+  it("Open and close a note", async () => {
+    await Tests.prepare();
+    await Tests.createNote();
+    await Tests.fromId(notesnook.ids.note.get(0)).waitAndTap();
+    await Tests.exitEditor();
+  });
+
+  it("Notes properties should show", async () => {
+    await Tests.prepare();
+    await Tests.createNote();
+    await Tests.fromId(notesnook.listitem.menu).waitAndTap();
+    await Tests.fromText("Created at").isVisible();
+  });
+
+  it("Favorite and unfavorite a note", async () => {
+    await Tests.prepare();
+    let note = await Tests.createNote();
+    await Tests.fromId(notesnook.listitem.menu).waitAndTap();
+    await Tests.fromId("icon-favorite").waitAndTap();
+    await Tests.fromId("icon-star").isVisible();
+    await Tests.navigate("Favorites");
+    await Tests.fromText(note.body).isVisible();
+    await Tests.fromId(notesnook.listitem.menu).waitAndTap();
+    await Tests.fromId("icon-favorite").waitAndTap();
+    await Tests.fromText(note.body).isNotVisible();
+    await Tests.navigate("Notes");
+  });
+
+  it("Pin a note to top", async () => {
+    await Tests.prepare();
+    await Tests.createNote();
+    await Tests.fromId(notesnook.listitem.menu).waitAndTap();
+    await Tests.fromId("icon-pin").waitAndTap();
+    await Tests.fromText("Pinned").isVisible();
+    await Tests.fromId("icon-pinned").isVisible();
+    await Tests.fromId(notesnook.listitem.menu).waitAndTap();
+    await Tests.fromId("icon-pin").waitAndTap();
+    await Tests.fromText("icon-pinned").isNotVisible();
+  });
+
+  it.skip("Pin a note in notifications", async () => {
+    await Tests.prepare();
+    await Tests.createNote();
+    await Tests.fromId(notesnook.listitem.menu).waitAndTap();
+    await Tests.fromId("icon-pin-to-notifications").waitAndTap();
+    await Tests.fromText("Unpin from notifications").isVisible();
+    await Tests.fromId("icon-pin-to-notifications").waitAndTap();
+    await Tests.fromText("Pin to notifications").isVisible();
+  });
+
+  it("Copy note", async () => {
+    await Tests.prepare();
+    await Tests.createNote();
+    await Tests.fromId(notesnook.listitem.menu).waitAndTap();
+    await Tests.fromId("icon-copy").isVisible();
+    await Tests.fromId("icon-copy").waitAndTap();
+  });
+
+  it("Assign colors to a note", async () => {
+    await Tests.prepare();
+    let note = await Tests.createNote();
+    await Tests.fromId(notesnook.listitem.menu).waitAndTap();
+    await Tests.fromText("Add color").waitAndTap();
+    await Tests.fromId("color-title-input").element.typeText("Test color");
+    await Tests.fromText("Add color").waitAndTap();
+    await Tests.fromId("icon-check").isVisible();
+    await Tests.fromId("icon-color-#efefef").waitAndTap();
+    await Tests.fromId("icon-check").isNotVisible();
+    await Tests.fromId("icon-color-#efefef").waitAndTap();
+    await device.pressBack();
+    await Tests.navigate("Test color");
+    await Tests.fromText(note.body).isVisible();
+  });
+
+  it("Delete & restore a note", async () => {
+    await Tests.prepare();
+    await Tests.createNote();
+    await Tests.fromId(notesnook.listitem.menu).waitAndTap();
+    await Tests.fromId("icon-trash").waitAndTap();
+    await Tests.navigate("Trash");
+    await Tests.fromId(notesnook.listitem.menu).waitAndTap();
+    await Tests.fromText("Restore").waitAndTap();
+    await device.pressBack();
+    await Tests.fromText(
+      "Test note description that is very long and should not fit in text."
+    ).isVisible();
+  });
+});

apps/mobile/e2e/tests/notebook.e2e.js

@@ -1,309 +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 { notesnook } from "../test.ids";
-import {
-  tapById,
-  elementById,
-  visibleByText,
-  tapByText,
-  createNote,
-  prepare,
-  notVisibleById,
-  navigate,
-  elementByText,
-  sleep,
-  notVisibleByText,
-  visibleById,
-  createNotebook
-} from "./utils";
-
-// async function addTopic(title = "Topic") {
-//   await tapById(notesnook.buttons.add);
-//   await elementById("input-title").typeText(title);
-//   await tapByText("Add");
-//   await sleep(500);
-// }
-
-describe("NOTEBOOKS", () => {
-  it("Create a notebook with title only", async () => {
-    await prepare();
-    await navigate("Notebooks");
-    await sleep(500);
-    await tapByText("Add your first notebook");
-    await createNotebook("Notebook 1", false, false);
-    await sleep(500);
-    await device.pressBack();
-    await sleep(500);
-    await visibleByText("Notebook 1");
-  });
-
-  it("Create a notebook title & description", async () => {
-    await prepare();
-    await navigate("Notebooks");
-    await sleep(500);
-    await tapByText("Add your first notebook");
-    await createNotebook("Notebook 1", true, false);
-    await sleep(500);
-    await device.pressBack();
-    await sleep(500);
-    await visibleByText("Notebook 1");
-  });
-
-  it("Create a notebook, move notes", async () => {
-    await prepare();
-    let note = await createNote();
-    await navigate("Notebooks");
-    await sleep(500);
-    await tapByText("Add your first notebook");
-    await createNotebook("Notebook 1", true, true);
-    await sleep(500);
-    await tapById("listitem.select");
-    await tapByText("Move selected notes");
-    await sleep(500);
-    await tapByText("Notebook 1");
-    await sleep(500);
-    await visibleByText(note.body);
-  });
-
-  it("Add a sub notebook to a notebook", async () => {
-    await prepare();
-    await navigate("Notebooks");
-    await sleep(500);
-    await tapByText("Add your first notebook");
-    await createNotebook("Notebook 1", true, false);
-    await sleep(500);
-    await device.pressBack();
-    await sleep(500);
-    await tapByText("Notebook 1");
-    await sleep(500);
-    await tapById("add-notebook-button");
-    await createNotebook("Sub notebook", true, true);
-    await sleep(500);
-    await device.pressBack();
-    await visibleByText("Sub notebook");
-    await tapById(notesnook.ids.notebook.menu);
-    await tapByText("Move to trash");
-    await sleep(300);
-    await tapByText("Delete");
-    await notVisibleByText("Sub notebook");
-  });
-
-  it("Remove a sub notebook from notebook", async () => {
-    await prepare();
-    await navigate("Notebooks");
-    await sleep(500);
-    await tapByText("Add your first notebook");
-    await createNotebook("Notebook 1", true, false);
-    await sleep(500);
-    await device.pressBack();
-    await sleep(500);
-    await tapByText("Notebook 1");
-    await sleep(500);
-    await tapById("add-notebook-button");
-    await createNotebook("Sub notebook", true, true);
-    await sleep(500);
-    await device.pressBack();
-    await visibleByText("Sub notebook");
-  });
-
-  it("Edit notebook", async () => {
-    await prepare();
-    await navigate("Notebooks");
-    await sleep(500);
-    await tapById(notesnook.buttons.add);
-    await createNotebook("Notebook 1", true);
-    await sleep(500);
-    await device.pressBack();
-    await tapById(notesnook.ids.notebook.menu);
-    await tapByText("Edit notebook");
-    await elementById(notesnook.ids.dialogs.notebook.inputs.title).typeText(
-      " (edited)"
-    );
-    await tapByText("Save");
-    await visibleByText("Notebook 1 (edited)");
-  });
-
-  it("Edit a sub notebook", async () => {
-    await prepare();
-    await navigate("Notebooks");
-    await sleep(500);
-    await tapById(notesnook.buttons.add);
-    await createNotebook("Notebook 1", true);
-    await sleep(500);
-    await device.pressBack();
-    await sleep(500);
-    await tapByText("Notebook 1");
-    await sleep(500);
-    await tapById("add-notebook-button");
-    await createNotebook("Sub notebook", true, true);
-    await device.pressBack();
-    await sleep(500);
-    await tapById(notesnook.ids.notebook.menu);
-    await tapByText("Edit notebook");
-    await sleep(500);
-    await elementById(notesnook.ids.dialogs.notebook.inputs.title).typeText(
-      " (edited)"
-    );
-    await tapByText("Save");
-    await sleep(500);
-    await visibleByText("Sub notebook (edited)");
-  });
-
-  it("Add a note to notebook", async () => {
-    await prepare();
-    await navigate("Notebooks");
-    await tapByText("Add your first notebook");
-    await sleep(500);
-    await createNotebook("Notebook 1", true, true);
-    await sleep(500);
-    await device.pressBack();
-    await sleep(500);
-    await tapByText("Notebook 1");
-    await createNote();
-  });
-
-  it("Remove note from Notebook", async () => {
-    await prepare();
-    await navigate("Notebooks");
-    await tapByText("Add your first notebook");
-    await createNotebook("Notebook 1", true, true);
-    await sleep(500);
-    await device.pressBack();
-    await sleep(500);
-    await tapByText("Notebook 1");
-    await sleep(500);
-    let note = await createNote();
-    await elementByText(note.body).longPress();
-    await tapById("select-minus");
-    await notVisibleById(note.title);
-  });
-
-  it("Add/Remove note to notebook from home", async () => {
-    await prepare();
-    await navigate("Notebooks");
-    await sleep(500);
-    await tapByText("Add your first notebook");
-    await createNotebook("Notebook 1", true, false);
-    await sleep(500);
-    await device.pressBack();
-    await sleep(500);
-    await navigate("Notes");
-    await createNote();
-    await tapById(notesnook.listitem.menu);
-    await tapById("icon-notebooks");
-    await sleep(500);
-    await tapByText("Notebook 1");
-    await tapByText("Save");
-    await sleep(300);
-    await visibleByText("Notebook 1");
-  });
-
-  it("Edit notebook title, description", async () => {
-    await prepare();
-    await navigate("Notebooks");
-    await sleep(500);
-    await tapByText("Add your first notebook");
-    await createNotebook();
-    await sleep(500);
-    await device.pressBack();
-    await sleep(500);
-    await visibleByText("Notebook 1");
-    await tapById(notesnook.ids.notebook.menu);
-    await tapByText("Edit notebook");
-    await sleep(500);
-    await elementById(notesnook.ids.dialogs.notebook.inputs.title).typeText(
-      " (Edited)"
-    );
-    await elementById(
-      notesnook.ids.dialogs.notebook.inputs.description
-    ).clearText();
-    await elementById(
-      notesnook.ids.dialogs.notebook.inputs.description
-    ).typeText("Description of Notebook 1 (Edited)");
-
-    await tapByText("Save");
-    await sleep(500);
-    await visibleByText("Notebook 1 (Edited)");
-    await visibleByText("Description of Notebook 1 (Edited)");
-  });
-
-  it.skip("Move notebook to trash", async () => {
-    await prepare();
-    await navigate("Notebooks");
-
-    await sleep(500);
-    await tapByText("Add your first notebook");
-    await createNotebook("Notebook 1", false, false);
-    await sleep(500);
-    await device.pressBack();
-    await sleep(500);
-    await visibleByText("Notebook 1");
-    await tapById(notesnook.ids.notebook.menu);
-    await tapByText("Move to trash");
-    await sleep(2000);
-    await tapByText("Delete");
-    await sleep(4000);
-    await navigate("Trash");
-    await visibleByText("Notebook 1");
-  });
-
-  it("Move notebook to trash with notes", async () => {
-    await prepare();
-    let note = await createNote();
-    await navigate("Notebooks");
-
-    await sleep(500);
-    await tapByText("Add your first notebook");
-    await createNotebook("Notebook 1", false, true);
-    await sleep(500);
-    await tapById("listitem.select");
-    await tapByText("Move selected notes");
-    await sleep(500);
-    await visibleByText("Notebook 1");
-    await tapById(notesnook.ids.notebook.menu);
-    await tapByText("Move to trash");
-    await sleep(2000);
-    await tapByText("Move all notes in this notebook to trash");
-    await sleep(500);
-    await tapByText("Delete");
-    await sleep(4000);
-    await navigate("Trash");
-    await visibleByText("Notebook 1");
-    await visibleByText(note.body);
-  });
-
-  it("Pin notebook to side menu", async () => {
-    await prepare();
-    await navigate("Notebooks");
-
-    await sleep(500);
-    await tapByText("Add your first notebook");
-    await createNotebook("Notebook 1", false, false);
-    await sleep(500);
-    await device.pressBack();
-    await sleep(500);
-    await visibleByText("Notebook 1");
-    await tapById(notesnook.ids.notebook.menu);
-    await tapByText("Add Shortcut");
-    let menu = elementById(notesnook.ids.default.header.buttons.left);
-    await menu.tap();
-    await visibleByText("Notebook 1");
-  });
-});

apps/mobile/e2e/tests/notebook.e2e.ts

@@ -0,0 +1,233 @@
+/*
+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 { notesnook } from "../test.ids";
+import { Tests } from "./utils";
+
+describe("NOTEBOOKS", () => {
+  it("Create a notebook with title only", async () => {
+    await Tests.prepare();
+    await Tests.navigate("Notebooks");
+    await Tests.fromText("Add your first notebook").waitAndTap();
+    await Tests.createNotebook("Notebook 1", false);
+    await device.pressBack();
+    await Tests.fromText("Notebook 1").isVisible();
+  });
+
+  it("Create a notebook title & description", async () => {
+    await Tests.prepare();
+    await Tests.navigate("Notebooks");
+    await Tests.fromText("Add your first notebook").waitAndTap();
+    await Tests.createNotebook("Notebook 1", true);
+    await device.pressBack();
+    await Tests.fromText("Notebook 1").isVisible();
+  });
+
+  it("Create a notebook, move notes", async () => {
+    await Tests.prepare();
+    let note = await Tests.createNote();
+    await Tests.navigate("Notebooks");
+    await Tests.fromText("Add your first notebook").waitAndTap();
+    await Tests.createNotebook("Notebook 1", true);
+    await Tests.fromId("listitem.select").waitAndTap();
+    await Tests.fromText("Move selected notes").waitAndTap();
+    await Tests.fromText("Notebook 1").waitAndTap();
+    await Tests.fromText(note.body).isVisible();
+  });
+
+  it("Add a sub notebook to a notebook", async () => {
+    await Tests.prepare();
+    await Tests.navigate("Notebooks");
+    await Tests.fromText("Add your first notebook").waitAndTap();
+    await Tests.createNotebook("Notebook 1", true);
+    await device.pressBack();
+    await Tests.fromText("Notebook 1").waitAndTap();
+    await Tests.sleep(500);
+    await Tests.fromId("add-notebook-button").waitAndTap();
+    await Tests.createNotebook("Sub notebook", true);
+    await Tests.fromText("Sub notebook").isVisible();
+    await Tests.fromId(notesnook.ids.notebook.menu).waitAndTap();
+    await Tests.sleep(500);
+    await Tests.fromText("Move to trash").waitAndTap();
+    await Tests.fromText("Delete").waitAndTap();
+    await Tests.fromText("Sub notebook").isNotVisible();
+  });
+
+  it("Remove a sub notebook from notebook", async () => {
+    await Tests.prepare();
+    await Tests.navigate("Notebooks");
+    await Tests.fromText("Add your first notebook").waitAndTap();
+    await Tests.createNotebook("Notebook 1", true);
+    await device.pressBack();
+    await Tests.fromText("Notebook 1").waitAndTap();
+    await Tests.sleep(500);
+    await Tests.fromId("add-notebook-button").waitAndTap();
+    await Tests.createNotebook("Sub notebook", true);
+    await Tests.fromText("Sub notebook").isVisible();
+  });
+
+  it("Edit notebook", async () => {
+    await Tests.prepare();
+    await Tests.navigate("Notebooks");
+    await Tests.fromId(notesnook.buttons.add).waitAndTap();
+    await Tests.createNotebook("Notebook 1", true);
+    await device.pressBack();
+    await Tests.fromId(notesnook.ids.notebook.menu).waitAndTap();
+    await Tests.fromText("Edit notebook").waitAndTap();
+    await Tests.fromId(
+      notesnook.ids.dialogs.notebook.inputs.title
+    ).element.typeText(" (edited)");
+    await Tests.fromText("Save").waitAndTap();
+    await Tests.fromText("Notebook 1 (edited)").isVisible();
+  });
+
+  it("Edit a sub notebook", async () => {
+    await Tests.prepare();
+    await Tests.navigate("Notebooks");
+    await Tests.fromId(notesnook.buttons.add).waitAndTap();
+    await Tests.createNotebook("Notebook 1", true);
+    await device.pressBack();
+    await Tests.fromText("Notebook 1").waitAndTap();
+    await Tests.sleep(500);
+    await Tests.fromId("add-notebook-button").waitAndTap();
+    await Tests.createNotebook("Sub notebook", true);
+    await Tests.fromId(notesnook.ids.notebook.menu).waitAndTap();
+    await Tests.sleep(500);
+    await Tests.fromText("Edit notebook").waitAndTap();
+    await Tests.fromId(
+      notesnook.ids.dialogs.notebook.inputs.title
+    ).element.typeText(" (edited)");
+    await Tests.fromText("Save").waitAndTap();
+    await Tests.fromText("Sub notebook (edited)").isVisible();
+  });
+
+  it("Add a note to notebook", async () => {
+    await Tests.prepare();
+    await Tests.navigate("Notebooks");
+    await Tests.fromText("Add your first notebook").waitAndTap();
+    await Tests.createNotebook("Notebook 1", true);
+    await device.pressBack();
+    await Tests.fromText("Notebook 1").waitAndTap();
+    await Tests.createNote();
+  });
+
+  it.skip("Remove note from Notebook", async () => {
+    await Tests.prepare();
+    await Tests.navigate("Notebooks");
+    await Tests.fromText("Add your first notebook").waitAndTap();
+    await Tests.createNotebook("Notebook 1", true);
+    await device.pressBack();
+    await Tests.fromText("Notebook 1").waitAndTap();
+    await Tests.sleep(500);
+    let note = await Tests.createNote();
+    await Tests.fromText(note.body).element.longPress();
+    await Tests.fromId("select-minus").waitAndTap();
+    await Tests.fromId(note.title).isNotVisible();
+  });
+
+  it("Add/Remove note to notebook from home", async () => {
+    await Tests.prepare();
+    await Tests.navigate("Notebooks");
+    await Tests.fromText("Add your first notebook").waitAndTap();
+    await Tests.createNotebook("Notebook 1", true);
+    await device.pressBack();
+    await Tests.navigate("Notes");
+    await Tests.createNote();
+    await Tests.fromId(notesnook.listitem.menu).waitAndTap();
+    await Tests.sleep(500);
+    await Tests.fromId("icon-notebooks").waitAndTap();
+    await Tests.fromText("Notebook 1").waitAndTap();
+    await Tests.fromText("Save").waitAndTap();
+    await Tests.fromText("Notebook 1").isVisible();
+  });
+
+  it("Edit notebook title, description", async () => {
+    await Tests.prepare();
+    await Tests.navigate("Notebooks");
+    await Tests.fromText("Add your first notebook").waitAndTap();
+    await Tests.createNotebook();
+    await device.pressBack();
+    await Tests.fromText("Notebook 1").isVisible();
+    await Tests.fromId(notesnook.ids.notebook.menu).waitAndTap();
+    await Tests.sleep(500);
+    await Tests.fromText("Edit notebook").waitAndTap();
+    await Tests.fromId(
+      notesnook.ids.dialogs.notebook.inputs.title
+    ).element.typeText(" (Edited)");
+    await Tests.fromId(
+      notesnook.ids.dialogs.notebook.inputs.description
+    ).element.clearText();
+    await Tests.fromId(
+      notesnook.ids.dialogs.notebook.inputs.description
+    ).element.typeText("Description of Notebook 1 (Edited)");
+    await Tests.fromText("Save").waitAndTap();
+    await Tests.fromText("Notebook 1 (Edited)").isVisible();
+    await Tests.fromText("Description of Notebook 1 (Edited)").isVisible();
+  });
+
+  it.skip("Move notebook to trash", async () => {
+    await Tests.prepare();
+    await Tests.navigate("Notebooks");
+    await Tests.fromText("Add your first notebook").waitAndTap();
+    await Tests.createNotebook("Notebook 1", false);
+    await device.pressBack();
+    await Tests.fromText("Notebook 1").isVisible();
+    await Tests.fromId(notesnook.ids.notebook.menu).waitAndTap();
+    await Tests.sleep(500);
+    await Tests.fromText("Move to trash").waitAndTap();
+    await Tests.fromText("Delete").waitAndTap();
+    await Tests.navigate("Trash");
+    await Tests.fromText("Notebook 1").isVisible();
+  });
+
+  it("Move notebook to trash with notes", async () => {
+    await Tests.prepare();
+    let note = await Tests.createNote();
+    await Tests.navigate("Notebooks");
+    await Tests.fromText("Add your first notebook").waitAndTap();
+    await Tests.createNotebook("Notebook 1", false);
+    await Tests.fromId("listitem.select").waitAndTap();
+    await Tests.fromText("Move selected notes").waitAndTap();
+    await Tests.fromText("Notebook 1").isVisible();
+    await Tests.fromId(notesnook.ids.notebook.menu).waitAndTap();
+    await Tests.sleep(500);
+    await Tests.fromText("Move to trash").waitAndTap();
+    await Tests.fromText(
+      "Move all notes in this notebook to trash"
+    ).waitAndTap();
+    await Tests.fromText("Delete").waitAndTap();
+    await Tests.navigate("Trash");
+    await Tests.fromText("Notebook 1").isVisible();
+    await Tests.fromText(note.body).isVisible();
+  });
+
+  it.skip("Pin notebook to side menu", async () => {
+    await Tests.prepare();
+    await Tests.navigate("Notebooks");
+    await Tests.fromText("Add your first notebook").waitAndTap();
+    await Tests.createNotebook("Notebook 1", false);
+    await device.pressBack();
+    await Tests.fromText("Notebook 1").isVisible();
+    await Tests.fromId(notesnook.ids.notebook.menu).waitAndTap();
+    await Tests.sleep(500);
+    await Tests.fromText("Add Shortcut").waitAndTap();
+    await Tests.fromId(notesnook.ids.default.header.buttons.left).waitAndTap();
+    await Tests.fromText("Notebook 1").isVisible();
+  });
+});