mobile: allow underscores in url validation

Mobile release 3.2.12

.github/workflows/core.tests.yml

@@ -9,7 +9,13 @@ on:
       - "packages/core/**"
       # re-run workflow if workflow file changes
       - ".github/workflows/core.tests.yml"
-  pull_request:
+  pull_request_target:
+    branches:
+      - "master"
+    paths:
+      - "packages/core/**"
+      # re-run workflow if workflow file changes
+      - ".github/workflows/core.tests.yml"
     types:
       - "ready_for_review"
       - "opened"
@@ -17,11 +23,21 @@ on:
       - "reopened"
 
 jobs:
-  test:
-    runs-on: ubuntu-22.04
+  authorize:
+    environment: ${{ github.event_name == 'pull_request_target' &&
+      github.event.pull_request.head.repo.full_name != github.repository &&
+      'external' || 'internal' }}
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo true
 
+  test:
+    needs: authorize
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.ref }}
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/desktop.tests.yml

@@ -6,10 +6,16 @@ on:
     branches:
       - "master"
     paths:
-      - "app/desktop/**"
+      - "apps/desktop/**"
       # re-run workflow if workflow file changes
       - ".github/workflows/desktop.tests.yml"
   pull_request:
+    branches:
+      - "master"
+    paths:
+      - "apps/desktop/**"
+      # re-run workflow if workflow file changes
+      - ".github/workflows/desktop.tests.yml"
 
 jobs:
   build:

.github/workflows/editor.tests.yml

@@ -10,6 +10,12 @@ on:
       # re-run workflow if workflow file changes
       - ".github/workflows/editor.tests.yml"
   pull_request:
+    branches:
+      - "master"
+    paths:
+      - "packages/editor/**"
+      # re-run workflow if workflow file changes
+      - ".github/workflows/editor.tests.yml"
     types:
       - "ready_for_review"
       - "opened"

.github/workflows/monograph.publish.yml

@@ -45,7 +45,7 @@ jobs:
       - name: Docker Setup Buildx
         uses: docker/setup-buildx-action@v3
         with:
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8
+          platforms: linux/amd64,linux/arm64
 
       - name: Log in to Docker Hub
         uses: docker/login-action@v3
@@ -77,7 +77,7 @@ jobs:
           context: apps/monograph
           file: apps/monograph/Dockerfile
           push: true
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8
+          platforms: linux/amd64,linux/arm64
           tags: streetwriters/monograph:${{ steps.package_metadata.outputs.app_version }},streetwriters/monograph:latest
           cache-from: streetwriters/monograph:latest
 

.github/workflows/web.tests.yml

@@ -9,7 +9,13 @@ on:
       - "apps/web/**"
       # re-run workflow if workflow file changes
       - ".github/workflows/web.tests.yml"
-  pull_request:
+  pull_request_target:
+    branches:
+      - "master"
+    paths:
+      - "apps/web/**"
+      # re-run workflow if workflow file changes
+      - ".github/workflows/web.tests.yml"
     types:
       - "ready_for_review"
       - "opened"
@@ -17,12 +23,23 @@ on:
       - "reopened"
 
 jobs:
+  authorize:
+    environment: ${{ github.event_name == 'pull_request_target' &&
+      github.event.pull_request.head.repo.full_name != github.repository &&
+      'external' || 'internal' }}
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo true
+
   build:
+    needs: authorize
     name: Build
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.ref }}
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -54,6 +71,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.ref }}
 
       - name: Download build
         uses: actions/download-artifact@v4

apps/desktop/README.md

@@ -24,7 +24,7 @@ Requirements:
 
 Before you can do anything, you'll need to [install Node.js](https://nodejs.org/en/download/) v16 or later on your system.
 
-Once you have completed the setup, the first step is to `clone` the monorepo:
+1. `clone` the monorepo:
 
 ```bash
 git clone https://github.com/streetwriters/notesnook.git
@@ -33,19 +33,28 @@ git clone https://github.com/streetwriters/notesnook.git
 cd notesnook
 ```
 
-Once you are inside the `./notesnook` directory, run the preparation step:
+2. Install dependencies:
 
 ```bash
 # this might take a while to complete
 npm install
 ```
 
-Now you can finally start the desktop app for development:
+3. Run the webapp for desktop environment:
+
+```bash
+cd apps/web
+npm run start:desktop
+```
+
+4. In a separate terminal session, run the desktop app from the root of the project:
 
 ```bash
 npm run start:desktop
 ```
 
+### Release mode
+
 To run the app in release mode:
 
 ```bash

apps/desktop/__tests__/auto-updates.test.ts

@@ -17,230 +17,226 @@ 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 "vitest";
-import { harness } from "./utils.js";
+import { testCleanup, test } from "./test-override.js";
 import { writeFile } from "fs/promises";
 import { Page } from "playwright";
 import { gt, lt } from "semver";
+import { describe } from "vitest";
 
-test("update starts downloading if version is outdated", async (t) => {
-  await harness(
-    t,
-    async ({ page }) => {
-      await page.waitForSelector("#authForm");
+test("update starts downloading if version is outdated", async ({
+  ctx: { page },
+  expect,
+  onTestFinished
+}) => {
+  onTestFinished(testCleanup);
 
-      t.expect(
-        await page.getByRole("button", { name: "Create account" }).isVisible()
-      ).toBe(true);
+  await page.waitForSelector("#authForm");
+  expect(
+    await page.getByRole("button", { name: "Create account" }).isVisible()
+  ).toBe(true);
 
-      await page
-        .getByRole("button", { name: "Skip & go directly to the app" })
-        .click();
+  await page
+    .getByRole("button", { name: "Skip & go directly to the app" })
+    .click();
 
-      await skipDialog(page);
+  await skipDialog(page);
 
-      await page.waitForSelector(".ProseMirror");
+  await page.waitForSelector(".ProseMirror");
 
-      await page
-        .locator(".theme-scope-statusBar")
-        .getByRole("button", { name: /updating/i })
-        .waitFor({ state: "attached" });
-    },
-    { version: "3.0.0" }
-  );
+  await page
+    .locator(".theme-scope-statusBar")
+    .getByRole("button", { name: /updating/i })
+    .waitFor({ state: "attached" });
 });
 
-test("update is only shown if version is outdated and auto updates are disabled", async (t) => {
-  await harness(
-    t,
-    async (ctx) => {
-      await ctx.app.close();
-      await writeFile(
-        ctx.configPath,
-        JSON.stringify({
-          automaticUpdates: false
-        })
-      );
+test("update is only shown if version is outdated and auto updates are disabled", async ({
+  ctx,
+  expect,
+  onTestFinished
+}) => {
+  onTestFinished(testCleanup);
 
-      await ctx.relaunch();
+  await ctx.app.close();
+  await writeFile(
+    ctx.configPath,
+    JSON.stringify({
+      automaticUpdates: false
+    })
+  );
 
-      const { page } = ctx;
+  await ctx.relaunch();
 
-      await page.waitForSelector("#authForm");
+  const { page } = ctx;
 
-      t.expect(
-        await page.getByRole("button", { name: "Create account" }).isVisible()
-      ).toBe(true);
+  await page.waitForSelector("#authForm");
 
-      await page
-        .getByRole("button", { name: "Skip & go directly to the app" })
-        .click();
+  expect(
+    await page.getByRole("button", { name: "Create account" }).isVisible()
+  ).toBe(true);
 
-      await skipDialog(page);
+  await page
+    .getByRole("button", { name: "Skip & go directly to the app" })
+    .click();
 
-      await page.waitForSelector(".ProseMirror");
+  await skipDialog(page);
 
+  await page.waitForSelector(".ProseMirror");
+
+  await page
+    .locator(".theme-scope-statusBar")
+    .getByRole("button", { name: /available/i })
+    .waitFor({ state: "attached" });
+});
+
+describe("update to stable if it is newer", () => {
+  test.scoped({ options: { version: "3.0.0-beta.0" } });
+  test("test", async ({ ctx, expect, onTestFinished }) => {
+    onTestFinished(testCleanup);
+
+    await ctx.app.close();
+    await writeFile(
+      ctx.configPath,
+      JSON.stringify({
+        automaticUpdates: false,
+        releaseTrack: "beta"
+      })
+    );
+
+    await ctx.relaunch();
+
+    const { page } = ctx;
+
+    await page.waitForSelector("#authForm");
+
+    expect(
+      await page.getByRole("button", { name: "Create account" }).isVisible()
+    ).toBe(true);
+
+    await page
+      .getByRole("button", { name: "Skip & go directly to the app" })
+      .click();
+
+    await skipDialog(page);
+
+    await page.waitForSelector(".ProseMirror");
+
+    const updateButton = page
+      .locator(".theme-scope-statusBar")
+      .getByRole("button", { name: /available/i });
+    await updateButton.waitFor({ state: "visible" });
+    const content = await updateButton.textContent();
+    const version = content?.split(" ")?.[0] || "";
+    expect(gt(version, "3.0.0-beta.0")).toBe(true);
+  });
+});
+
+describe("update is not available if it latest stable version is older", () => {
+  test.scoped({ options: { version: "99.0.0-beta.0" } });
+  test("test", async ({ ctx, expect, onTestFinished }) => {
+    onTestFinished(testCleanup);
+
+    await ctx.app.close();
+    await writeFile(
+      ctx.configPath,
+      JSON.stringify({
+        automaticUpdates: false,
+        releaseTrack: "beta"
+      })
+    );
+
+    await ctx.relaunch();
+
+    const { page } = ctx;
+
+    await page.waitForSelector("#authForm");
+
+    expect(
+      await page.getByRole("button", { name: "Create account" }).isVisible()
+    ).toBe(true);
+
+    await page
+      .getByRole("button", { name: "Skip & go directly to the app" })
+      .click();
+
+    await skipDialog(page);
+
+    await page.waitForSelector(".ProseMirror");
+
+    await page
+      .locator(".theme-scope-statusBar")
+      .getByRole("button", { name: /checking for updates/i })
+      .waitFor({ state: "hidden" });
+
+    expect(
       await page
         .locator(".theme-scope-statusBar")
         .getByRole("button", { name: /available/i })
-        .waitFor({ state: "attached" });
-    },
-    { version: "3.0.0" }
-  );
+        .isHidden()
+    ).toBe(true);
+  });
 });
 
-test("update to stable if it is newer", async (t) => {
-  await harness(
-    t,
-    async (ctx) => {
-      await ctx.app.close();
-      await writeFile(
-        ctx.configPath,
-        JSON.stringify({
-          automaticUpdates: false,
-          releaseTrack: "beta"
-        })
-      );
+describe("downgrade to stable on switching to stable release track", () => {
+  test.scoped({ options: { version: "99.0.0-beta.0" } });
+  test("test", async ({ ctx, expect, onTestFinished }) => {
+    onTestFinished(testCleanup);
 
-      await ctx.relaunch();
+    await ctx.app.close();
+    await writeFile(
+      ctx.configPath,
+      JSON.stringify({
+        automaticUpdates: false,
+        releaseTrack: "stable"
+      })
+    );
 
-      const { page } = ctx;
+    await ctx.relaunch();
 
-      await page.waitForSelector("#authForm");
+    const { page } = ctx;
 
-      t.expect(
-        await page.getByRole("button", { name: "Create account" }).isVisible()
-      ).toBe(true);
+    await page.waitForSelector("#authForm");
 
-      await page
-        .getByRole("button", { name: "Skip & go directly to the app" })
-        .click();
+    expect(
+      await page.getByRole("button", { name: "Create account" }).isVisible()
+    ).toBe(true);
 
-      await skipDialog(page);
+    await page
+      .getByRole("button", { name: "Skip & go directly to the app" })
+      .click();
 
-      await page.waitForSelector(".ProseMirror");
+    await skipDialog(page);
 
-      const updateButton = page
-        .locator(".theme-scope-statusBar")
-        .getByRole("button", { name: /available/i });
-      await updateButton.waitFor({ state: "visible" });
-      const content = await updateButton.textContent();
-      const version = content?.split(" ")?.[0] || "";
-      t.expect(gt(version, "3.0.0-beta.0")).toBe(true);
-    },
-    { version: "3.0.0-beta.0" }
-  );
-});
+    await page.waitForSelector(".ProseMirror");
 
-test("update is not available if it latest stable version is older", async (t) => {
-  await harness(
-    t,
-    async (ctx) => {
-      await ctx.app.close();
-      await writeFile(
-        ctx.configPath,
-        JSON.stringify({
-          automaticUpdates: false,
-          releaseTrack: "beta"
-        })
-      );
+    await page
+      .locator(".theme-scope-statusBar")
+      .getByRole("button", { name: /checking for updates/i })
+      .waitFor({ state: "hidden" });
 
-      await ctx.relaunch();
-
-      const { page } = ctx;
-
-      await page.waitForSelector("#authForm");
-
-      t.expect(
-        await page.getByRole("button", { name: "Create account" }).isVisible()
-      ).toBe(true);
-
-      await page
-        .getByRole("button", { name: "Skip & go directly to the app" })
-        .click();
-
-      await skipDialog(page);
-
-      await page.waitForSelector(".ProseMirror");
-
-      await page
-        .locator(".theme-scope-statusBar")
-        .getByRole("button", { name: /checking for updates/i })
-        .waitFor({ state: "hidden" });
-
-      t.expect(
-        await page
-          .locator(".theme-scope-statusBar")
-          .getByRole("button", { name: /available/i })
-          .isHidden()
-      ).toBe(true);
-    },
-    { version: "99.0.0-beta.0" }
-  );
-});
-
-test("downgrade to stable on switching to stable release track", async (t) => {
-  await harness(
-    t,
-    async (ctx) => {
-      await ctx.app.close();
-      await writeFile(
-        ctx.configPath,
-        JSON.stringify({
-          automaticUpdates: false,
-          releaseTrack: "stable"
-        })
-      );
-
-      await ctx.relaunch();
-
-      const { page } = ctx;
-
-      await page.waitForSelector("#authForm");
-
-      t.expect(
-        await page.getByRole("button", { name: "Create account" }).isVisible()
-      ).toBe(true);
-
-      await page
-        .getByRole("button", { name: "Skip & go directly to the app" })
-        .click();
-
-      await skipDialog(page);
-
-      await page.waitForSelector(".ProseMirror");
-
-      await page
-        .locator(".theme-scope-statusBar")
-        .getByRole("button", { name: /checking for updates/i })
-        .waitFor({ state: "hidden" });
-
-      const updateButton = page
-        .locator(".theme-scope-statusBar")
-        .getByRole("button", { name: /available/i });
-      await updateButton.waitFor({ state: "visible" });
-      const content = await updateButton.textContent();
-      const version = content?.split(" ")?.[0] || "";
-      t.expect(lt(version, "99.0.0-beta.0")).toBe(true);
-    },
-    { version: "99.0.0-beta.0" }
-  );
+    const updateButton = page
+      .locator(".theme-scope-statusBar")
+      .getByRole("button", { name: /available/i });
+    await updateButton.waitFor({ state: "visible" });
+    const content = await updateButton.textContent();
+    const version = content?.split(" ")?.[0] || "";
+    expect(lt(version, "99.0.0-beta.0")).toBe(true);
+  });
 });
 
 async function skipDialog(page: Page) {
-  await page
-    .waitForSelector(".ReactModal__Content", {
-      timeout: 1000
-    })
-    .catch(() => {})
-    .then(async () => {
-      const positiveButton = page.locator(
-        "button[data-role='positive-button']"
-      );
-      const negativeButton = page.locator(
-        "button[data-role='negative-button']"
-      );
-      if (await positiveButton.isVisible()) await positiveButton.click();
-      else if (await negativeButton.isVisible()) await negativeButton.click();
-    });
+  try {
+    const dialog = page.locator(".ReactModal__Content");
+    const positiveButton = dialog.locator(
+      "button[data-role='positive-button']"
+    );
+    const negativeButton = dialog.locator(
+      "button[data-role='negative-button']"
+    );
+    if (await positiveButton.isVisible())
+      await positiveButton.click({ timeout: 1000 });
+    else if (await negativeButton.isVisible())
+      await negativeButton.click({ timeout: 1000 });
+  } catch (e) {
+    // ignore error
+  }
 }

apps/desktop/__tests__/global-setup.ts

@@ -0,0 +1,24 @@
+/*
+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 { buildApp } from "./utils";
+
+export default async function setup() {
+  await buildApp();
+}

apps/desktop/__tests__/launch.test.ts

@@ -17,22 +17,24 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { test } from "vitest";
-import { harness } from "./utils.js";
-import assert from "assert";
+import { testCleanup, test } from "./test-override.js";
 
-test("make sure app loads", async (t) => {
-  await harness(t, async ({ page }) => {
-    await page.waitForSelector("#authForm");
+test("make sure app loads", async ({
+  ctx: { page },
+  expect,
+  onTestFinished
+}) => {
+  onTestFinished(testCleanup);
 
-    assert.ok(
-      await page.getByRole("button", { name: "Create account" }).isVisible()
-    );
+  await page.waitForSelector("#authForm");
 
-    await page
-      .getByRole("button", { name: "Skip & go directly to the app" })
-      .click();
+  expect(
+    await page.getByRole("button", { name: "Create account" }).isVisible()
+  ).toBe(true);
 
-    await page.waitForSelector(".ProseMirror");
-  });
+  await page
+    .getByRole("button", { name: "Skip & go directly to the app" })
+    .click();
+
+  await page.waitForSelector(".ProseMirror");
 });

apps/desktop/__tests__/test-override.ts

@@ -0,0 +1,64 @@
+/*
+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 as vitestTest, TestContext } from "vitest";
+import { buildAndLaunchApp, Fixtures, TestOptions } from "./utils";
+import { mkdir, rm } from "fs/promises";
+import path from "path";
+import slugify from "slugify";
+
+export const test = vitestTest.extend<Fixtures>({
+  options: { version: "3.0.0" } as TestOptions,
+  ctx: async ({ options }, use) => {
+    const ctx = await buildAndLaunchApp(options);
+    await use(ctx);
+  }
+});
+
+export async function testCleanup(context: TestContext) {
+  const ctx = (context.task.context as unknown as Fixtures).ctx;
+  if (context.task.result?.state === "fail") {
+    await mkdir("test-results", { recursive: true });
+    await ctx.page.screenshot({
+      path: path.join(
+        "test-results",
+        `${slugify(context.task.name)}-${process.platform}-${
+          process.arch
+        }-error.png`
+      )
+    });
+  }
+  await ctx.app.close();
+  await rm(ctx.userDataDir, {
+    force: true,
+    recursive: true,
+    maxRetries: 3,
+    retryDelay: 5000
+  }).catch(() => {
+    /*ignore */
+  });
+  await rm(ctx.outputDir, {
+    force: true,
+    recursive: true,
+    maxRetries: 3,
+    retryDelay: 5000
+  }).catch(() => {
+    /*ignore */
+  });
+}

apps/desktop/__tests__/utils.ts

@@ -18,146 +18,235 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { execSync } from "child_process";
-import { mkdir } from "fs/promises";
+import { cp, readFile, writeFile } from "fs/promises";
 import { fileURLToPath } from "node:url";
-import path from "path";
+import path, { join, resolve } from "path";
 import { _electron as electron } from "playwright";
-import slugify from "slugify";
-import { TaskContext } from "vitest";
+import { existsSync } from "fs";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const IS_DEBUG = process.env.NN_DEBUG === "true" || process.env.CI === "true";
+const productName = `NotesnookTestHarness`;
+const SOURCE_DIR = resolve("output", productName);
 
-interface AppContext {
+export interface AppContext {
   app: import("playwright").ElectronApplication;
   page: import("playwright").Page;
   configPath: string;
+  userDataDir: string;
+  outputDir: string;
   relaunch: () => Promise<void>;
 }
 
-interface TestOptions {
+export interface TestOptions {
   version: string;
 }
 
-export async function harness(
-  t: TaskContext,
-  cb: (ctx: AppContext) => Promise<void>,
-  options?: TestOptions
-) {
-  const ctx = await buildAndLaunchApp(options);
-
-  t.onTestFinished(async (result) => {
-    if (result.state === "fail") {
-      await mkdir("test-results", { recursive: true });
-      await ctx.page.screenshot({
-        path: path.join(
-          "test-results",
-          `${slugify(t.task.name)}-${process.platform}-${
-            process.arch
-          }-error.png`
-        )
-      });
-    }
-    await ctx.app.close();
-  });
-
-  await cb(ctx);
+export interface Fixtures {
+  options: TestOptions;
+  ctx: AppContext;
 }
 
-async function buildAndLaunchApp(options?: TestOptions): Promise<AppContext> {
-  const productName = makeid(10);
-  const executablePath = await buildApp({ ...options, productName });
-  const { app, page, configPath } = await launchApp(executablePath);
+export async function buildAndLaunchApp(
+  options?: TestOptions
+): Promise<AppContext> {
+  const productName = `notesnooktest${makeid(10)}`;
+  const outputDir = path.join("test-artifacts", `${productName}-output`);
+  const executablePath = await copyBuild({
+    ...options,
+    outputDir
+  });
+  const { app, page, configPath, userDataDir } = await launchApp(
+    executablePath,
+    productName
+  );
   const ctx: AppContext = {
     app,
     page,
     configPath,
+    userDataDir,
+    outputDir,
     relaunch: async () => {
-      const { app, page, configPath } = await launchApp(executablePath);
+      const { app, page, configPath, userDataDir } = await launchApp(
+        executablePath,
+        productName
+      );
       ctx.app = app;
       ctx.page = page;
+      ctx.userDataDir = userDataDir;
       ctx.configPath = configPath;
     }
   };
   return ctx;
 }
 
-async function launchApp(executablePath: string) {
+async function launchApp(executablePath: string, packageName: string) {
+  const userDataDir = resolve(
+    __dirname,
+    "..",
+    "test-artifacts",
+    "user_data_dirs",
+    packageName
+  );
   const app = await electron.launch({
     executablePath,
     args: IS_DEBUG ? [] : ["--hidden"],
-    env:
-      process.platform === "linux"
+    env: {
+      ...(process.platform === "linux"
         ? {
             ...(process.env as Record<string, string>),
             APPIMAGE: "true"
           }
-        : (process.env as Record<string, string>)
+        : (process.env as Record<string, string>)),
+      CUSTOM_USER_DATA_DIR: userDataDir
+    }
   });
 
   const page = await app.firstWindow();
 
-  const userDataDirectory = await app.evaluate((a) => {
-    return a.app.getPath("userData");
-  });
-  const configPath = path.join(userDataDirectory, "config.json");
+  const configPath = path.join(userDataDir, "UserData", "config.json");
   return {
     app,
     page,
-    configPath
+    configPath,
+    userDataDir
   };
 }
 
-async function buildApp({
+let MAX_RETRIES = 3;
+export async function buildApp(version?: string) {
+  if (!existsSync(SOURCE_DIR)) {
+    const args = [
+      "electron-builder",
+      "--dir",
+      `--${process.arch}`,
+      `--config electron-builder.config.js`,
+      `--c.extraMetadata.productName=${productName}`,
+      `--c.compression=store`,
+      "--publish=never"
+    ];
+    if (version) args.push(`--c.extraMetadata.version=${version}`);
+    try {
+      execSync(`npx ${args.join(" ")}`, {
+        stdio: IS_DEBUG ? "inherit" : "ignore",
+        env: {
+          ...process.env,
+          NOTESNOOK_STAGING: "true",
+          NN_PRODUCT_NAME: productName,
+          NN_APP_ID: `com.notesnook.test.${productName}`,
+          NN_OUTPUT_DIR: SOURCE_DIR
+        }
+      });
+    } catch (e) {
+      if (--MAX_RETRIES) {
+        console.log("retrying...");
+        return await buildApp(version);
+      } else throw e;
+    }
+  }
+}
+
+async function copyBuild({
   version,
-  productName
+  outputDir
 }: {
   version?: string;
-  productName: string;
+  outputDir: string;
 }) {
-  const buildRoot = path.join("test-artifacts", `${productName}-build`);
-  const output = path.join("test-artifacts", `${productName}-output`);
-  execSync(`npm run release -- --root ${buildRoot} --skip-tsc-build`, {
-    stdio: IS_DEBUG ? "inherit" : "ignore"
-  });
+  return process.platform === "win32"
+    ? await makeBuildCopyWindows(outputDir, productName, version)
+    : process.platform === "darwin"
+    ? await makeBuildCopyMacOS(outputDir, productName, version)
+    : await makeBuildCopyLinux(outputDir, productName, version);
+}
 
-  const args = [
-    `--config electron-builder.config.js`,
-    `--c.extraMetadata.productName=${productName}`,
-    "--publish=never"
-  ];
-  if (version) args.push(`--c.extraMetadata.version=${version}`);
-
-  execSync(`npx electron-builder --dir --${process.arch} ${args.join(" ")}`, {
-    stdio: IS_DEBUG ? "inherit" : "ignore",
-    env: {
-      ...process.env,
-      NOTESNOOK_STAGING: "true",
-      NN_BUILD_ROOT: buildRoot,
-      NN_PRODUCT_NAME: productName,
-      NN_APP_ID: `com.notesnook.test.${productName}`,
-      NN_OUTPUT_DIR: output
-    }
-  });
-
-  return path.join(
+async function makeBuildCopyLinux(
+  outputDir: string,
+  productName: string,
+  version?: string
+) {
+  const platformDir =
+    process.arch === "arm64" ? "linux-arm64-unpacked" : "linux-unpacked";
+  const appDir = await makeBuildCopy(
+    outputDir,
+    platformDir,
+    "resources",
+    version
+  );
+  return resolve(
     __dirname,
     "..",
-    output,
-    process.platform === "linux"
-      ? process.arch === "arm64"
-        ? "linux-arm64-unpacked"
-        : "linux-unpacked"
-      : process.platform === "darwin"
-      ? process.arch === "arm64"
-        ? `mac-arm64/${productName}.app/Contents/MacOS/`
-        : `mac/${productName}.app/Contents/MacOS/`
-      : "win-unpacked",
-    process.platform === "win32" ? `${productName}.exe` : productName
+    appDir,
+    productName.toLowerCase().replace(/\s+/g, "-")
   );
 }
 
+async function makeBuildCopyWindows(
+  outputDir: string,
+  productName: string,
+  version?: string
+) {
+  const platformDir =
+    process.arch === "arm64" ? "win-arm64-unpacked" : "win-unpacked";
+  const appDir = await makeBuildCopy(
+    outputDir,
+    platformDir,
+    "resources",
+    version
+  );
+  return resolve(__dirname, "..", appDir, `${productName}.exe`);
+}
+
+async function makeBuildCopyMacOS(
+  outputDir: string,
+  productName: string,
+  version?: string
+) {
+  const platformDir = process.arch === "arm64" ? "mac-arm64" : "mac";
+  const appDir = await makeBuildCopy(
+    outputDir,
+    platformDir,
+    join(`${productName}.app`, "Contents", "Resources"),
+    version
+  );
+  return resolve(
+    __dirname,
+    "..",
+    appDir,
+    `${productName}.app`,
+    "Contents",
+    "MacOS",
+    productName
+  );
+}
+
+async function makeBuildCopy(
+  outputDir: string,
+  platformDir: string,
+  resourcesDir: string,
+  version?: string
+) {
+  const appDir = outputDir;
+  await cp(join(SOURCE_DIR, platformDir), outputDir, {
+    recursive: true,
+    preserveTimestamps: true,
+    verbatimSymlinks: true,
+    dereference: false,
+    force: true
+  });
+
+  const packageJsonPath = join(appDir, resourcesDir, "app", "package.json");
+
+  const packageJson = JSON.parse(await readFile(packageJsonPath, "utf-8"));
+  if (version) {
+    packageJson.version = version;
+    await writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2));
+  }
+
+  return appDir;
+}
+
 function makeid(length: number) {
   let result = "";
   const characters =

apps/desktop/package.json

@@ -2,13 +2,15 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "appAppleId": "1544027013",
   "private": true,
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
-  "sideEffects": false,
+  "sideEffects": [
+    "src/overrides.ts"
+  ],
   "exports": {
     ".": {
       "require": {
@@ -55,7 +57,7 @@
     "slugify": "1.6.6",
     "tree-kill": "^1.2.2",
     "undici": "^7.8.0",
-    "vitest": "2.1.8"
+    "vitest": "^3.2.4"
   },
   "optionalDependencies": {
     "dmg-license": "^1.0.11"

apps/desktop/src/main.ts

@@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+import "./overrides";
 import { app, BrowserWindow, nativeTheme, shell } from "electron";
 import { isDevelopment } from "./utils";
 import { registerProtocol, PROTOCOL_URL } from "./utils/protocol";

apps/desktop/src/overrides.ts

@@ -0,0 +1,35 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import { app } from "electron";
+import path from "path";
+
+if (process.env.CUSTOM_USER_DATA_DIR) {
+  app.setPath(
+    "appData",
+    path.join(process.env.CUSTOM_USER_DATA_DIR, "AppData")
+  );
+  app.setPath(
+    "userData",
+    path.join(process.env.CUSTOM_USER_DATA_DIR, "UserData")
+  );
+  app.setPath(
+    "documents",
+    path.join(process.env.CUSTOM_USER_DATA_DIR, "Documents")
+  );
+}

apps/desktop/vitest.config.ts

@@ -21,11 +21,13 @@ import { defineConfig } from "vitest/config";
 
 export default defineConfig({
   test: {
-    testTimeout: process.env.CI ? 120 * 1000 : 120 * 1000,
+    testTimeout: 120 * 1000,
+    hookTimeout: 120 * 1000,
     sequence: {
       concurrent: true,
       shuffle: true
     },
+    globalSetup: "./__tests__/global-setup.ts",
     dir: "./__tests__/",
     exclude: [
       "**/node_modules/**",

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

@@ -137,6 +137,7 @@ export async function deleteFile(
 
 export async function clearFileStorage() {
   try {
+    await createCacheDir();
     const files = await RNFetchBlob.fs.ls(cacheDir);
     const oldCache = await RNFetchBlob.fs.ls(cacheDirOld);
 
@@ -221,6 +222,7 @@ export async function deleteCacheFileByName(name: string) {
 }
 
 export async function deleteDCacheFiles() {
+  await createCacheDir();
   const files = await RNFetchBlob.fs.ls(cacheDir);
   for (const file of files) {
     if (file.includes("_dcache") || file.startsWith("NN_")) {

apps/mobile/app/components/auth/common.js

@@ -33,6 +33,9 @@ export function hideAuth() {
   eSendEvent(eCloseLoginDialog);
   if (initialAuthMode.current === AuthMode.welcomeSignup) {
     Navigation.replace("FluidPanelsView");
+    setTimeout(() => {
+      Navigation.resetRootState();
+    }, 1000);
   } else {
     Navigation.goBack();
   }

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

@@ -89,6 +89,9 @@ const Auth = ({ navigation, route }) => {
               onPress={() => {
                 if (initialAuthMode.current === 2) {
                   Navigation.replace("FluidPanelsView");
+                  setTimeout(() => {
+                    Navigation.resetRootState();
+                  }, 1000);
                 } else {
                   Navigation.goBack();
                 }

apps/mobile/app/components/fluid-panels/index.tsx

@@ -30,6 +30,7 @@ import { BackHandler, Platform, ViewProps } from "react-native";
 import { Gesture, GestureDetector } from "react-native-gesture-handler";
 import Animated, {
   runOnJS,
+  SharedValue,
   useAnimatedReaction,
   useAnimatedStyle,
   useSharedValue,
@@ -67,6 +68,7 @@ export interface TabsRef {
   setScrollEnabled: () => true;
   isDrawerOpen: () => boolean;
   node: RefObject<Animated.View>;
+  tabChangedFromSwipeAction: SharedValue<boolean>;
 }
 
 export const FluidPanels = forwardRef<TabsRef, TabProps>(function FluidTabs(
@@ -116,6 +118,7 @@ export const FluidPanels = forwardRef<TabsRef, TabProps>(function FluidTabs(
   const isLoaded = useRef(false);
   const prevWidths = useRef(widths);
   const isIPhone = Platform.OS === "ios";
+  const tabChangedFromSwipeAction = useSharedValue(false);
 
   useEffect(() => {
     if (deviceMode === "tablet" || fullscreen) {
@@ -191,6 +194,7 @@ export const FluidPanels = forwardRef<TabsRef, TabProps>(function FluidTabs(
             : withTiming(editorPosition);
           currentTab.value = 2;
         }
+        tabChangedFromSwipeAction.value = false;
       },
       goToIndex: (index: number, animated = true) => {
         if (deviceMode === "tablet") {
@@ -210,6 +214,7 @@ export const FluidPanels = forwardRef<TabsRef, TabProps>(function FluidTabs(
             : editorPosition;
           currentTab.value = 2;
         }
+        tabChangedFromSwipeAction.value = false;
       },
       unlock: () => {
         forcedLock.value = false;
@@ -252,7 +257,8 @@ export const FluidPanels = forwardRef<TabsRef, TabProps>(function FluidTabs(
       },
       page: () => (currentTab.value === 1 ? "home" : "editor"),
       setScrollEnabled: () => true,
-      node: node
+      node: node,
+      tabChangedFromSwipeAction: tabChangedFromSwipeAction
     }),
     [
       currentTab,
@@ -262,7 +268,8 @@ export const FluidPanels = forwardRef<TabsRef, TabProps>(function FluidTabs(
       homePosition,
       editorPosition,
       forcedLock,
-      isDrawerOpen
+      isDrawerOpen,
+      tabChangedFromSwipeAction
     ]
   );
 
@@ -362,18 +369,20 @@ export const FluidPanels = forwardRef<TabsRef, TabProps>(function FluidTabs(
           isDrawerOpen.value = true;
           currentTab.value = 1;
           runOnJS(onDrawerStateChange)(true);
+          tabChangedFromSwipeAction.value = true;
           return;
         } else if (!isSwipeLeft && finalValue > 100) {
           translateX.value = withSpring(homePosition, animationConfig);
           isDrawerOpen.value = false;
           currentTab.value = 1;
           runOnJS(onDrawerStateChange)(false);
-
+          tabChangedFromSwipeAction.value = true;
           return;
         } else if (!isSwipeLeft && finalValue < 100) {
           translateX.value = withSpring(0, animationConfig);
           isDrawerOpen.value = true;
           currentTab.value = 1;
+          tabChangedFromSwipeAction.value = true;
           return;
         }
       }
@@ -384,6 +393,8 @@ export const FluidPanels = forwardRef<TabsRef, TabProps>(function FluidTabs(
           translateX.value = withSpring(editorPosition, animationConfig);
           currentTab.value = 2;
           isDrawerOpen.value = false;
+
+          tabChangedFromSwipeAction.value = true;
           return;
         }
       }
@@ -398,6 +409,8 @@ export const FluidPanels = forwardRef<TabsRef, TabProps>(function FluidTabs(
           translateX.value = withSpring(editorPosition, animationConfig);
           currentTab.value = 2;
         }
+
+        tabChangedFromSwipeAction.value = true;
         return;
       }
 

apps/mobile/app/components/list-items/search-result/index.tsx

@@ -153,7 +153,6 @@ export const SearchResult = (props: SearchResultProps) => {
               for (let i = 0; i <= index; i++) {
                 activeIndex += props.item.content[i].length;
               }
-              console.log(activeIndex);
               openNote(activeIndex);
             }}
           >

apps/mobile/app/components/properties/color-tags.tsx

@@ -73,9 +73,6 @@ const ColorItem = ({ item, note }: { item: Color; note: Note }) => {
       testID={notesnook.ids.dialogs.actionsheet.color(item.colorCode)}
       key={item.id}
       onPress={toggleColor}
-      onLongPress={(event) => {
-        NativeTooltip.show(event, item.title, NativeTooltip.POSITIONS.TOP);
-      }}
       style={{
         width: 35,
         height: 35,

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

@@ -21,13 +21,14 @@ import { useThemeColors } from "@notesnook/theme";
 import React from "react";
 import { View } from "react-native";
 import { FlatList } from "react-native-actions-sheet";
+import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { db } from "../../common/database";
 import { DDS } from "../../services/device-detection";
 import { eSendEvent, presentSheet } from "../../services/event-manager";
-import { ColorValues } from "../../utils/colors";
 import { eOnLoadNote } from "../../utils/events";
 import { fluidTabsRef } from "../../utils/global-refs";
 import { AppFontSize } from "../../utils/size";
+import { DefaultAppStyles } from "../../utils/styles";
 import SheetProvider from "../sheet-provider";
 import { IconButton } from "../ui/icon-button";
 import { Pressable } from "../ui/pressable";
@@ -38,8 +39,6 @@ import { DateMeta } from "./date-meta";
 import { Items } from "./items";
 import Notebooks from "./notebooks";
 import { TagStrip, Tags } from "./tags";
-import Icon from "react-native-vector-icons/MaterialCommunityIcons";
-import { DefaultAppStyles } from "../../utils/styles";
 
 const Line = ({ top = 6, bottom = 6 }) => {
   const { colors } = useThemeColors();
@@ -151,7 +150,8 @@ export const Properties = ({ close = () => {}, item, buttons = [] }) => {
               ) : null}
             </View>
 
-            {item.type === "notebook" && item.description ? (
+            {(item.type === "notebook" || item.type === "reminder") &&
+            item.description ? (
               <Paragraph>{item.description}</Paragraph>
             ) : null}
 

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

@@ -65,7 +65,9 @@ const COLUMN_BAR_ITEMS: ActionId[] = [
   "edit-notebook",
   "move-notes",
   "move-notebook",
+  "edit-reminder",
   "pin",
+  "disable-reminder",
   "default-notebook",
   "default-tag",
   "default-homepage",

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

@@ -29,6 +29,10 @@ import { ColorTags } from "./color-tags";
 import { strings } from "@notesnook/intl";
 import { DefaultAppStyles } from "../../utils/styles";
 import ManageTags from "../../screens/manage-tags";
+import {
+  paddingTop,
+  paddingVertical
+} from "deprecated-react-native-prop-types/DeprecatedLayoutPropTypes";
 
 export const Tags = ({ item, close }) => {
   const { colors } = useThemeColors();
@@ -86,7 +90,6 @@ export const TagStrip = ({ item, close }) => {
         flexDirection: "row",
         flexWrap: "wrap",
         alignItems: "center",
-        marginTop: DefaultAppStyles.GAP_VERTICAL,
         gap: 5
       }}
     >
@@ -107,16 +110,13 @@ const TagItem = ({ tag, close }) => {
 
   const style = {
     paddingHorizontal: 0,
-    borderRadius: 100,
-    marginTop: 0,
-    backgroundColor: "transparent"
+    paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL
   };
   return (
     <Button
       onPress={onPress}
       title={"#" + tag.title}
       type="plain"
-      height={20}
       fontSize={AppFontSize.xs}
       style={style}
       textStyle={{

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

@@ -197,16 +197,6 @@ export const SelectionHeader = React.memo(
                     }
                   ]
                 : [
-                    {
-                      title: strings.move(),
-                      onPress: async () => {
-                        const ids = selectedItemsList;
-                        const notebooks = await db.notebooks.all.items(ids);
-                        MoveNotebook.present(notebooks);
-                      },
-                      visible: renderedInRoute === "Notebooks",
-                      icon: "arrow-right-bold-box-outline"
-                    },
                     {
                       title: strings.manageTags(),
                       onPress: async () => {

apps/mobile/app/components/sheet-provider/index.js

@@ -95,8 +95,6 @@ const SheetProvider = ({ context = "global" }) => {
     [context]
   );
 
-  console.log(data?.keyboardHandlerDisabled);
-
   return !visible || !data ? null : (
     <SheetWrapper
       fwdRef={actionSheetRef}

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

@@ -310,6 +310,7 @@ const ExportNotesSheet = ({
                         ToastManager.error(e as Error);
                       });
                     } else {
+                      await sleep(500);
                       FileViewer.open(result?.filePath, {
                         showOpenWithDialog: true,
                         showAppsSuggestions: true
@@ -338,6 +339,7 @@ const ExportNotesSheet = ({
                       .getState()
                       .setAppDidEnterBackgroundForAction(true);
                     if (Platform.OS === "ios") {
+                      await sleep(500);
                       Share.open({
                         url: result?.fileDir + result.fileName
                       }).catch(() => {

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

@@ -38,10 +38,9 @@ import { eCloseSheet, eOnNotebookUpdated } from "../../../utils/events";
 import { AppFontSize } from "../../../utils/size";
 import { DefaultAppStyles } from "../../../utils/styles";
 import { sleep } from "../../../utils/time";
+import { Dialog } from "../../dialog";
 import { Properties } from "../../properties";
-import SheetProvider from "../../sheet-provider";
 import { NotebookItem } from "../../side-menu/notebook-item";
-import { useSideMenuNotebookTreeStore } from "../../side-menu/stores";
 import { IconButton } from "../../ui/icon-button";
 import Paragraph from "../../ui/typography/paragraph";
 import { AddNotebookSheet } from "../add-notebook";
@@ -60,13 +59,8 @@ export const Notebooks = (props: {
   close?: (ctx?: string) => void;
 }) => {
   const tree = useNotebookTreeStore((state) => state.tree);
-  const [isLoading, setIsLoading] = useState(true);
   const { colors } = useThemeColors();
   const [notebooks, setNotebooks] = useState<Notebook[]>();
-  const [filteredNotebooks, setFilteredNotebooks] =
-    React.useState<VirtualizedGrouping<Notebook>>();
-  const searchTimer = React.useRef<NodeJS.Timeout>();
-  const lastQuery = React.useRef<string>();
   const loadRootNotebooks = React.useCallback(async () => {
     const notebooks = await db.relations
       .from(
@@ -95,7 +89,6 @@ export const Notebooks = (props: {
   useEffect(() => {
     (async () => {
       loadRootNotebooks();
-      setIsLoading(false);
     })();
   }, [loadRootNotebooks]);
 
@@ -151,7 +144,7 @@ export const Notebooks = (props: {
         height: 400
       }}
     >
-      <SheetProvider context="local" />
+      <Dialog context="local" />
 
       <View
         style={{
@@ -175,7 +168,7 @@ export const Notebooks = (props: {
           }}
           name="plus"
           onPress={() => {
-            AddNotebookSheet.present(props.rootNotebook, undefined, "local");
+            AddNotebookSheet.present(undefined, props.rootNotebook, "local");
           }}
         />
       </View>
@@ -244,20 +237,18 @@ const NotebookItemWrapper = React.memo(
     const onItemUpdate = React.useCallback(async () => {
       const notebook = await db.notebooks.notebook(item.notebook.id);
       if (notebook) {
-        useSideMenuNotebookTreeStore
-          .getState()
-          .updateItem(item.notebook.id, notebook);
+        useNotebookTreeStore.getState().updateItem(item.notebook.id, notebook);
         if (expanded) {
-          useSideMenuNotebookTreeStore
+          useNotebookTreeStore
             .getState()
             .setTree(
-              await useSideMenuNotebookTreeStore
+              await useNotebookTreeStore
                 .getState()
                 .fetchAndAdd(item.notebook.id, item.depth + 1)
             );
         }
       } else {
-        useSideMenuNotebookTreeStore.getState().removeItem(item.notebook.id);
+        useNotebookTreeStore.getState().removeItem(item.notebook.id);
       }
     }, [expanded, item.depth, item.notebook.id]);
 
@@ -274,17 +265,15 @@ const NotebookItemWrapper = React.memo(
           onToggleExpanded={async () => {
             useNotebookExpandedStore.getState().setExpanded(item.notebook.id);
             if (!expanded) {
-              useSideMenuNotebookTreeStore
+              useNotebookTreeStore
                 .getState()
                 .setTree(
-                  await useSideMenuNotebookTreeStore
+                  await useNotebookTreeStore
                     .getState()
                     .fetchAndAdd(item.notebook.id, item.depth + 1)
                 );
             } else {
-              useSideMenuNotebookTreeStore
-                .getState()
-                .removeChildren(item.notebook.id);
+              useNotebookTreeStore.getState().removeChildren(item.notebook.id);
             }
           }}
           selected={selected}

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

@@ -312,7 +312,6 @@ export const UserSheet = () => {
             icon: "logout",
             title: strings.logout(),
             onPress: async () => {
-              console.log("logout");
               ref.current?.hide();
               await sleep(300);
               logoutUser();

apps/mobile/app/components/side-menu/index.tsx

@@ -211,6 +211,14 @@ const TabBar = (
                         const ids = useSideMenuNotebookSelectionStore
                           .getState()
                           .getSelectedItemIds();
+                        if (!ids.length) {
+                          ToastManager.show({
+                            context: "local",
+                            type: "error",
+                            message: strings.noNotebooksSelectedToMove()
+                          });
+                          return;
+                        }
                         const notebooks = await db.notebooks.all.items(ids);
                         Navigation.navigate("MoveNotebook", {
                           selectedNotebooks: notebooks

apps/mobile/app/components/side-menu/notebook-item.tsx

@@ -49,7 +49,8 @@ export const NotebookItem = ({
   onPress,
   onLongPress,
   onAddNotebook,
-  canDisableSelectionMode
+  canDisableSelectionMode,
+  disableExpand
 }: {
   index: number;
   item: TreeItem;
@@ -64,6 +65,7 @@ export const NotebookItem = ({
   onLongPress?: () => void;
   onAddNotebook?: () => void;
   canDisableSelectionMode?: boolean;
+  disableExpand?: boolean;
 }) => {
   const notebook = item.notebook;
   const isFocused = focused;
@@ -166,7 +168,7 @@ export const NotebookItem = ({
             }
             testID={item.hasChildren ? `expand-notebook-${index}` : ""}
             onPress={() => {
-              if (item.hasChildren) {
+              if (item.hasChildren && !disableExpand) {
                 onToggleExpanded?.();
               } else {
                 onPress?.();
@@ -182,7 +184,7 @@ export const NotebookItem = ({
               borderRadius: defaultBorderRadius
             }}
             name={
-              !item.hasChildren
+              !item.hasChildren || disableExpand
                 ? "book-outline"
                 : expanded
                 ? "chevron-down"

apps/mobile/app/components/side-menu/side-menu-notebooks.tsx

@@ -20,8 +20,9 @@ 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 { FlashList } from "@shopify/flash-list";
 import React, { useEffect, useState } from "react";
-import { FlatList, TextInput, View } from "react-native";
+import { TextInput, View } from "react-native";
 import { db } from "../../common/database";
 import NotebookScreen from "../../screens/notebook";
 import Navigation from "../../services/navigation";
@@ -42,6 +43,7 @@ import {
 useSideMenuNotebookSelectionStore.setState({
   multiSelect: true
 });
+
 export const SideMenuNotebooks = () => {
   const tree = useSideMenuNotebookTreeStore((state) => state.tree);
   const [notebooks, loading] = useNotebooks();
@@ -64,13 +66,19 @@ export const SideMenuNotebooks = () => {
 
   const updateNotebooks = React.useCallback(() => {
     if (lastQuery.current) {
+      // useSideMenuNotebookTreeStore.setState({
+      //   isSearching: true
+      // });
       db.lookup
         .notebooks(lastQuery.current)
-        .sorted()
+        .sorted(db.settings.getGroupOptions("notebooks"))
         .then((filtered) => {
           setFilteredNotebooks(filtered);
         });
     } else {
+      // useSideMenuNotebookTreeStore.setState({
+      //   isSearching: false
+      // });
       setFilteredNotebooks(notebooks);
     }
   }, [notebooks]);
@@ -137,13 +145,13 @@ export const SideMenuNotebooks = () => {
         />
       ) : (
         <>
-          <FlatList
+          <FlashList
             data={tree}
             bounces={false}
             bouncesZoom={false}
             overScrollMode="never"
-            keyExtractor={(item) => item.notebook.id}
-            windowSize={3}
+            // keyExtractor={(item,) => item.notebook.id}
+            estimatedItemSize={30}
             ListHeaderComponent={
               <View
                 style={{
@@ -196,7 +204,9 @@ const NotebookItemWrapper = React.memo(
     const expanded = useSideMenuNotebookExpandedStore(
       (state) => state.expanded[item.notebook.id]
     );
-
+    const disableExpand = useSideMenuNotebookTreeStore(
+      (state) => state.isSearching
+    );
     const selectionEnabled = useSideMenuNotebookSelectionStore(
       (state) => state.enabled
     );
@@ -256,6 +266,7 @@ const NotebookItemWrapper = React.memo(
                 .removeChildren(item.notebook.id);
             }
           }}
+          disableExpand={disableExpand}
           selected={selected}
           selectionEnabled={selectionEnabled}
           selectionStore={useSideMenuNotebookSelectionStore}

apps/mobile/app/components/side-menu/side-menu-tags.tsx

@@ -220,7 +220,7 @@ export const SideMenuTags = () => {
     if (lastQuery.current) {
       db.lookup
         .tags(lastQuery.current.trim())
-        .sorted()
+        .sorted(db.settings.getGroupOptions("tags"))
         .then(async (filtered) => {
           setFilteredTags(filtered);
         });

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

@@ -154,7 +154,7 @@ const Input = ({
         isError = customValidator && value === customValidator();
         break;
       case "url":
-        isError = isURL(value);
+        isError = isURL(value, { allow_underscores: true });
         break;
       case "phonenumber": {
         const result = phone(value, {

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

@@ -54,6 +54,7 @@ type ButtonTypes =
   | "accent"
   | "shade"
   | "secondary"
+  | "selectedAccent"
   | "secondaryAccented"
   | "inverted"
   | "white"
@@ -126,6 +127,18 @@ const buttonTypes = (
       isDark
     )
   },
+  selectedAccent: {
+    primary: colors.selected.accent,
+    text: colors.selected.accentForeground,
+    selected: colors.selected.accent,
+    borderWidth: 0.8,
+    borderColor: getColorLinearShade(colors.selected.accent, 0.05, isDark),
+    borderSelectedColor: getColorLinearShade(
+      colors.selected.accent,
+      0.05,
+      isDark
+    )
+  },
   secondaryAccented: {
     primary: colors.secondary.background,
     text: colors.primary.accent,

apps/mobile/app/components/ui/sheet/index.js

@@ -23,13 +23,11 @@ import { Platform, View } from "react-native";
 import ActionSheet from "react-native-actions-sheet";
 import useGlobalSafeAreaInsets from "../../../hooks/use-global-safe-area-insets";
 import { useSettingStore } from "../../../stores/use-setting-store";
-import { PremiumToast } from "../../premium/premium-toast";
-import { Toast } from "../../toast";
-import { useAppState } from "../../../hooks/use-app-state";
-import SettingsService from "../../../services/settings";
 import { useUserStore } from "../../../stores/use-user-store";
 import { getContainerBorder } from "../../../utils/colors";
-
+import { PremiumToast } from "../../premium/premium-toast";
+import { Toast } from "../../toast";
+import { NotesnookModule } from "../../../utils/notesnook-module";
 /**
  *
  * @param {any} param0
@@ -63,6 +61,8 @@ const SheetWrapper = ({
   const locked = useUserStore((state) => state.appLocked);
 
   let width = dimensions.width > 600 ? 600 : 500;
+  const isGestureNavigationEnabled =
+    NotesnookModule.isGestureNavigationEnabled();
 
   const style = React.useMemo(() => {
     return {
@@ -77,14 +77,18 @@ const SheetWrapper = ({
       borderBottomRightRadius: 0,
       borderBottomLeftRadius: 0,
       ...getContainerBorder(colors.primary.border, 0.5),
-      borderBottomWidth: 0
+      borderBottomWidth: 0,
+      paddingBottom: isGestureNavigationEnabled
+        ? insets.bottom
+        : insets.bottom || 48
     };
   }, [
     colors.primary.background,
     colors.primary.border,
     largeTablet,
     smallTablet,
-    width
+    width,
+    insets.bottom
   ]);
 
   const _onOpen = () => {

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

@@ -336,7 +336,7 @@ const emailconfirmed: { id: string; steps: TStep[] } = {
   steps: [
     {
       title: strings.emailConfirmed(),
-      text: strings.emailNotConfirmedDesc(),
+      text: strings.emailConfirmedDesc(),
       walkthroughItem: (colors) => (
         <SvgView src={WELCOME_SVG(colors.primary.paragraph)} />
       ),

apps/mobile/app/features.ts

@@ -19,9 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { FeatureType } from "./components/sheets/new-feature";
 
-export const features: FeatureType[] = [
-  {
-    title: "Improved Search",
-    body: "Improved search results with better relevance and highlighting."
-  }
-];
+export const features: FeatureType[] = [];

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

@@ -515,6 +515,8 @@ export const useActions = ({
         title: strings.addNotebook(),
         icon: "plus",
         onPress: async () => {
+          close();
+          await sleep(300);
           AddNotebookSheet.present(undefined, item);
         }
       },
@@ -523,6 +525,8 @@ export const useActions = ({
         title: strings.editNotebook(),
         icon: "square-edit-outline",
         onPress: async () => {
+          close();
+          await sleep(300);
           AddNotebookSheet.present(item);
         }
       },

apps/mobile/app/hooks/use-is-floating-keyboard.ts

@@ -26,12 +26,14 @@ import { useCallback } from "react";
  * @returns Is keyboard floating or not
  */
 const useIsFloatingKeyboard = () => {
-  const { width } = useWindowDimensions();
+  const { width, height } = useWindowDimensions();
 
   const [floating, setFloating] = useState<boolean>(false);
   const onKeyboardWillChangeFrame = useCallback(
     (event: KeyboardEvent) => {
-      setFloating(event.endCoordinates.width < width);
+      setFloating(
+        event.endCoordinates.width === 0 || event.endCoordinates.width < width
+      );
     },
     [width]
   );
@@ -41,8 +43,13 @@ const useIsFloatingKeyboard = () => {
       "keyboardWillChangeFrame",
       onKeyboardWillChangeFrame
     );
+    const sub2 = Keyboard.addListener(
+      "keyboardWillShow",
+      onKeyboardWillChangeFrame
+    );
     return () => {
       sub1?.remove();
+      sub2?.remove();
     };
   }, [onKeyboardWillChangeFrame, width]);
 

apps/mobile/app/navigation/fluid-panels-view.tsx

@@ -30,6 +30,10 @@ import React, {
   useState
 } from "react";
 import { Dimensions, LayoutChangeEvent, Platform, View } from "react-native";
+import Orientation, {
+  OrientationType,
+  useDeviceOrientationChange
+} from "react-native-orientation-locker";
 import Animated, {
   useAnimatedStyle,
   useSharedValue,
@@ -67,10 +71,6 @@ import {
 } from "../utils/events";
 import { editorRef, fluidTabsRef } from "../utils/global-refs";
 import { AppNavigationStack } from "./navigation-stack";
-import Orientation, {
-  OrientationType,
-  useDeviceOrientationChange
-} from "react-native-orientation-locker";
 
 const MOBILE_SIDEBAR_SIZE = 0.85;
 
@@ -421,7 +421,6 @@ export const FluidPanelsView = React.memo(
           height: "100%",
           width: "100%",
           backgroundColor: colors.primary.background,
-          paddingBottom: Platform.OS === "android" ? insets?.bottom : 0,
           marginRight:
             orientation === "LANDSCAPE-RIGHT" && Platform.OS === "ios"
               ? insets.right
@@ -536,6 +535,15 @@ const onChangeTab = async (event: { i: number; from: number }) => {
     ) {
       eSendEvent(eUnlockNote);
     }
+
+    if (
+      fluidTabsRef.current?.tabChangedFromSwipeAction.value &&
+      !useTabStore.getState().getNoteIdForTab(useTabStore.getState().currentTab)
+    ) {
+      editorController?.current?.commands?.focus(
+        useTabStore.getState().currentTab
+      );
+    }
   } else {
     if (event.from === 2) {
       deactivateKeepAwake();

apps/mobile/app/navigation/navigation-stack.tsx

@@ -30,6 +30,7 @@ import useNavigationStore, {
 import { useSelectionStore } from "../stores/use-selection-store";
 import { useSettingStore } from "../stores/use-setting-store";
 import { rootNavigatorRef } from "../utils/global-refs";
+import Navigation from "../services/navigation";
 
 const RootStack = createNativeStackNavigator();
 const AppStack = createNativeStackNavigator();
@@ -255,12 +256,18 @@ export const RootNavigation = () => {
     (state) => state.settings.introCompleted
   );
   const clearSelection = useSelectionStore((state) => state.clearSelection);
-  const onStateChange = React.useCallback(() => {
-    if (useSelectionStore.getState().selectionMode) {
-      clearSelection();
-    }
-    hideAllTooltips();
-  }, [clearSelection]);
+  const onStateChange = React.useCallback(
+    (state: any) => {
+      if (useSelectionStore.getState().selectionMode) {
+        clearSelection();
+      }
+      setTimeout(() => {
+        Navigation.resetRootState(state);
+      }, 1000);
+      hideAllTooltips();
+    },
+    [clearSelection]
+  );
 
   return (
     <NavigationContainer onStateChange={onStateChange} ref={rootNavigatorRef}>

apps/mobile/app/screens/add-reminder/index.tsx

@@ -47,6 +47,7 @@ import SettingsService from "../../services/settings";
 import { useRelationStore } from "../../stores/use-relation-store";
 import { AppFontSize, defaultBorderRadius } from "../../utils/size";
 import { DefaultAppStyles } from "../../utils/styles";
+import { getFormattedDate } from "@notesnook/common";
 
 const ReminderModes =
   Platform.OS === "ios"
@@ -114,6 +115,7 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
     !reminder ? referencedItem?.headline : reminder?.description
   );
   const titleRef = useRef<TextInput>(null);
+  const descriptionRef = useRef<TextInput>(null);
   const timer = useRef<NodeJS.Timeout>();
 
   const showDatePicker = () => {
@@ -128,7 +130,7 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
     timer.current = setTimeout(() => {
       hideDatePicker();
       setDate(date);
-    }, 50);
+    }, 10);
   };
   function nth(n: number) {
     return (
@@ -166,8 +168,11 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
         throw new Error(strings.selectDayError());
 
       if (!title.current) throw new Error(strings.setTitleError());
-      if (date.getTime() < Date.now() && reminderMode === "once") {
-        titleRef?.current?.focus();
+      if (
+        date.getTime() < Date.now() &&
+        reminderMode === "once" &&
+        !props.route.params.reminder
+      ) {
         throw new Error(strings.dateError());
       }
 
@@ -242,15 +247,20 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
             defaultValue={reminder?.title || referencedItem?.title}
             placeholder={strings.remindeMeOf()}
             onChangeText={(text) => (title.current = text)}
+            autoFocus
             wrapperStyle={{
               marginTop: DefaultAppStyles.GAP_VERTICAL
             }}
+            onSubmit={() => {
+              descriptionRef.current?.focus();
+            }}
           />
 
           <Input
             defaultValue={
               reminder ? reminder?.description : referencedItem?.headline
             }
+            fwdRef={descriptionRef}
             placeholder={strings.addShortNote()}
             onChangeText={(text) => (details.current = text)}
             containerStyle={{
@@ -290,7 +300,7 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
                 type={
                   reminderMode ===
                   ReminderModes[mode as keyof typeof ReminderModes]
-                    ? "selected"
+                    ? "selectedAccent"
                     : "plain"
                 }
                 onPress={() => {
@@ -443,9 +453,10 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
             >
               <DateTimePickerModal
                 isVisible={isDatePickerVisible}
-                mode="date"
+                mode="datetime"
                 onConfirm={handleConfirm}
                 onCancel={hideDatePicker}
+                isDarkModeEnabled={isDark}
                 is24Hour={db.settings.getTimeFormat() === "24-hour"}
                 date={date || new Date(Date.now())}
               />
@@ -476,7 +487,9 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
                     width: "100%"
                   }}
                   title={
-                    date ? date.toLocaleDateString() : strings.selectDate()
+                    date
+                      ? getFormattedDate(date, "date-time")
+                      : strings.selectDate()
                   }
                   type={date ? "secondaryAccented" : "secondary"}
                   icon="calendar"
@@ -578,7 +591,7 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
                     ReminderNotificationModes[
                       mode as keyof typeof ReminderNotificationModes
                     ]
-                      ? "selected"
+                      ? "selectedAccent"
                       : "plain"
                   }
                   onPress={() => {

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

@@ -131,7 +131,6 @@ const showActionsheet = async () => {
     .getState()
     .getNoteIdForTab(useTabStore.getState().currentTab!);
   if (noteId) {
-    console.log("OPEN NOTE");
     const note = await db.notes?.note(noteId);
     Properties.present(note, false);
   } else {

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

@@ -875,7 +875,6 @@ export const useEditor = (
               }
 
               lastContentChangeTime.current[note.id] = note.dateEdited;
-              console.log(tab.session?.selection);
               await postMessage(
                 NativeEvents.updatehtml,
                 {

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

@@ -96,14 +96,16 @@ export const EditorWrapper = ({ widths }: { widths: any }) => {
         minHeight: "100%",
         backgroundColor: toolBarColors.primary.background,
         borderLeftWidth: DDS.isTab ? 1 : 0,
-        borderLeftColor: DDS.isTab ? colors.secondary.background : "transparent"
+        borderLeftColor: DDS.isTab
+          ? colors.secondary.background
+          : "transparent",
+        paddingBottom: insets.bottom
       }}
     >
       {loading || !introCompleted ? null : (
         <KeyboardAvoidingViewIOS
           behavior="padding"
           style={{
-            marginBottom: getMarginBottom(),
             backgroundColor: colors.primary.background,
             flex: 1
           }}

apps/mobile/app/screens/link-notebooks/index.tsx

@@ -300,6 +300,8 @@ const NotebookItemWrapper = React.memo(
     const expanded = useNotebookExpandedStore(
       (state) => state.expanded[item.notebook.id]
     );
+    const disableExpand = useNotebookTreeStore((state) => state.isSearching);
+
     const selectionEnabled = useNotebookSelectionStore(
       (state) => state.enabled
     );
@@ -371,6 +373,7 @@ const NotebookItemWrapper = React.memo(
           selectionEnabled={selectionEnabled}
           selectionStore={useNotebookSelectionStore}
           onItemUpdate={onItemUpdate}
+          disableExpand={disableExpand}
           focused={false}
           onPress={onPress}
           onAddNotebook={() => {

apps/mobile/app/screens/manage-tags/index.tsx

@@ -112,7 +112,7 @@ const ManageTags = (props: NavigationProps<"ManageTags">) => {
     if (query && query.trim() !== "") {
       db.lookup
         .tags(query)
-        .sorted()
+        .sorted(db.settings.getGroupOptions("tags"))
         .then((items) => {
           setTags(items);
         });
@@ -249,6 +249,7 @@ const ManageTags = (props: NavigationProps<"ManageTags">) => {
       }}
     >
       <Header title={strings.manageTags()} canGoBack />
+
       <View
         style={{
           paddingHorizontal: DefaultAppStyles.GAP

apps/mobile/app/screens/move-notebook/index.tsx

@@ -328,6 +328,8 @@ const NotebookItemWrapper = React.memo(
     const expanded = useNotebookExpandedStore(
       (state) => state.expanded[item.notebook.id]
     );
+    const disableExpand = useNotebookTreeStore((state) => state.isSearching);
+
     const selectionEnabled = useNotebookSelectionStore(
       (state) => state.enabled
     );
@@ -378,6 +380,7 @@ const NotebookItemWrapper = React.memo(
               useNotebookTreeStore.getState().removeChildren(item.notebook.id);
             }
           }}
+          disableExpand={disableExpand}
           selected={selected}
           selectionEnabled={selectionEnabled}
           selectionStore={useNotebookSelectionStore}

apps/mobile/app/services/navigation.ts

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { StackActions } from "@react-navigation/native";
+import { NavigationHelpers, StackActions } from "@react-navigation/native";
 import { NativeStackScreenProps } from "@react-navigation/native-stack";
 import { useFavoriteStore } from "../stores/use-favorite-store";
 import useNavigationStore, {
@@ -166,6 +166,32 @@ function closeDrawer() {
   fluidTabsRef.current?.closeDrawer();
 }
 
+function resetRootState(
+  _state?: ReturnType<NavigationHelpers<any, any>["getState"]>
+) {
+  const state = _state || rootNavigatorRef.getState();
+  const focusedRoute = state.routes[state.index];
+
+  if (state.routes.length < 2) return;
+
+  const routes = state.routes.filter(
+    (route) =>
+      (route.name !== "Auth" && route.name !== "Welcome") ||
+      route.key === focusedRoute.key
+  );
+
+  if (routes.length === state.routes.length) return;
+  if (routes.length === 0) {
+    routes.push(focusedRoute);
+  }
+  const newIndex = routes.findIndex((route) => route.key === focusedRoute.key);
+  rootNavigatorRef.reset({
+    ...state,
+    routes: routes,
+    index: newIndex
+  });
+}
+
 const Navigation = {
   navigate,
   goBack,
@@ -177,7 +203,8 @@ const Navigation = {
   queueRoutesForUpdate,
   routeNeedsUpdate,
   routeNames,
-  routeUpdateFunctions
+  routeUpdateFunctions,
+  resetRootState
 };
 
 export default Navigation;

apps/mobile/app/services/notifications.ts

@@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+import { getFormattedReminderTime } from "@notesnook/common";
 import { isReminderActive, Reminder } from "@notesnook/core";
 import { strings } from "@notesnook/intl";
 import notifee, {
@@ -36,6 +37,7 @@ import dayjs, { Dayjs } from "dayjs";
 import { encodeNonAsciiHTML } from "entities";
 import { Platform } from "react-native";
 import { db, setupDatabase } from "../common/database";
+import { MMKV } from "../common/database/mmkv";
 import { presentDialog } from "../components/dialog/functions";
 import { useTabStore } from "../screens/editor/tiptap/use-tab-store";
 import { editorState } from "../screens/editor/tiptap/utils";
@@ -52,8 +54,6 @@ import { DDS } from "./device-detection";
 import { eSendEvent } from "./event-manager";
 import Navigation from "./navigation";
 import SettingsService from "./settings";
-import { getFormattedReminderTime } from "@notesnook/common";
-import { MMKV } from "../common/database/mmkv";
 
 let pinned: DisplayedNotification[] = [];
 
@@ -454,7 +454,7 @@ async function loadNote(id: string, jump: boolean) {
   const tab = useTabStore.getState().getTabForNote(id);
   if (useTabStore.getState().currentTab !== tab) {
     eSendEvent(eOnLoadNote, {
-      note: note
+      item: note
     });
   }
 }
@@ -916,8 +916,21 @@ async function pinQuickNote(launch: boolean) {
  * A function that checks if reminders need to be reconfigured &
  * reschedules them if anything has changed.
  */
+
 async function setupReminders(checkNeedsScheduling = false) {
   const reminders = ((await db.reminders?.all.items()) as Reminder[]) || [];
+  let notificationsCancelled = false;
+  if (Platform.OS === "android") {
+    // If the API level has changed, cancel all notifications.
+    // This is to ensure that the app does not crash on Android 14+.
+    const API_LEVEL = MMKV.getInt("android_apiLevel");
+    if (API_LEVEL !== (Platform.Version as number)) {
+      await notifee.cancelAllNotifications();
+      notificationsCancelled = true;
+      MMKV.setInt("android_apiLevel", Platform.Version as number);
+    }
+  }
+
   const triggers = await notifee.getTriggerNotifications();
   for (const reminder of reminders) {
     if (reminder.mode === "permanent") {
@@ -927,20 +940,22 @@ async function setupReminders(checkNeedsScheduling = false) {
     // Skip reminders that are not repeating and their trigger date is in past.
     if (reminder.mode === "once" && dayjs().isAfter(reminder.date)) continue;
 
-    const pending = triggers.filter((t) =>
-      t.notification.id?.startsWith(reminder.id)
-    );
+    if (!notificationsCancelled) {
+      const pending = triggers.filter((t) =>
+        t.notification.id?.startsWith(reminder.id)
+      );
 
-    let needsReschedule = pending.length === 0 ? true : false;
-    if (!needsReschedule) {
-      needsReschedule = pending[0].notification.data?.dateModified
-        ? parseInt(pending[0].notification.data?.dateModified as string) <
-          reminder.dateModified
-        : true;
+      let needsReschedule = pending.length === 0 ? true : false;
+      if (!needsReschedule) {
+        needsReschedule = pending[0].notification.data?.dateModified
+          ? parseInt(pending[0].notification.data?.dateModified as string) <
+            reminder.dateModified
+          : true;
+      }
+
+      if (!needsReschedule && checkNeedsScheduling) continue;
     }
 
-    if (!needsReschedule && checkNeedsScheduling) continue;
-
     await scheduleNotification(reminder);
   }
   // Check for any triggers whose notifications

apps/mobile/app/stores/create-notebook-tree-stores.ts

@@ -49,6 +49,7 @@ export function createNotebookTreeStores(
 ) {
   const useNotebookTreeStore = create<{
     tree: TreeItem[];
+    isSearching?: boolean;
     setTree: (tree: TreeItem[]) => void;
     removeItem: (id: string) => void;
     addNotebooks: (
@@ -113,16 +114,32 @@ export function createNotebookTreeStores(
         }
       }
 
-      const newTreeItems = notebooks.map((notebook) => {
-        return {
-          parentId,
-          notebook,
-          depth: depth,
-          hasChildren: items.some((item) => {
-            return item.fromId === notebook.id;
-          })
-        };
-      });
+      const rootTreeItems = newTree.filter((item) => item.parentId === "root");
+      const newTreeItems = notebooks.reduce((acc, notebook) => {
+        if (!rootTreeItems.find((item) => item.notebook.id === notebook.id)) {
+          acc.push({
+            parentId,
+            notebook,
+            depth: depth,
+            hasChildren: false
+          });
+        }
+        return acc;
+      }, [] as TreeItem[]);
+
+      if (parentId === "root") {
+        rootTreeItems.splice(0, 0, ...newTreeItems);
+      }
+
+      for (const treeItem of newTreeItems) {
+        treeItem.hasChildren = items.some((item) => {
+          return (
+            rootTreeItems.findIndex(
+              (treeItem) => treeItem.notebook.id === item.toId
+            ) === -1 && item.fromId === treeItem.notebook.id
+          );
+        });
+      }
 
       newTree.splice(parentIndex + 1, 0, ...newTreeItems);
 
@@ -130,7 +147,7 @@ export function createNotebookTreeStores(
         const expanded =
           useNotebookExpandedStore.getState().expanded[item.notebook.id] &&
           item.hasChildren;
-        if (expanded) {
+        if (expanded && !get().isSearching) {
           newTree = await get().fetchAndAdd(
             item.notebook.id,
             depth + 1,

apps/mobile/app/stores/index.ts

@@ -45,10 +45,10 @@ export function initAfterSync(type: "full" | "send" = "send") {
     useUserStore.setState({
       profile: db.settings.getProfile()
     });
-    eSendEvent(eAfterSync);
   }
   Notifications.setupReminders(true);
   NotePreviewWidget.updateNotes();
+  eSendEvent(eAfterSync);
 }
 
 export async function initialize() {}

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

@@ -43,7 +43,7 @@ export function changeSystemBarColors() {
     const isDark = useThemeStore.getState().colorScheme === "dark";
     changeNavigationBarColor(
       currTheme.scopes.base.primary.background,
-      isDark,
+      !isDark,
       false
     );
     StatusBar.setBackgroundColor("transparent" as any);

apps/mobile/app/utils/notesnook-module.ts

@@ -40,6 +40,7 @@ interface NotesnookModuleInterface {
   hasWidgetNote: (noteId: string) => Promise<boolean>;
   updateWidgetNote: (noteId: string, data: string) => void;
   updateReminderWidget: () => void;
+  isGestureNavigationEnabled: () => boolean;
 }
 
 export const NotesnookModule: NotesnookModuleInterface = Platform.select({
@@ -59,7 +60,8 @@ export const NotesnookModule: NotesnookModuleInterface = Platform.select({
     getWidgetNotes: () => {},
     hasWidgetNote: () => {},
     updateWidgetNote: () => {},
-    updateReminderWidget: () => {}
+    updateReminderWidget: () => {},
+    isGestureNavigationEnabled: () => true
   },
   android: NativeModules.NNativeModule
 });

apps/mobile/app/utils/size/index.js

@@ -89,10 +89,10 @@ function getSize() {
     xs: normalize(13.5) * scale.fontScale,
     sm: normalize(14.5) * scale.fontScale,
     md: normalize(16.5) * scale.fontScale,
-    lg: normalize(22) * scale.fontScale,
-    xl: normalize(24) * scale.fontScale,
-    xxl: normalize(28) * scale.fontScale,
-    xxxl: normalize(32) * scale.fontScale
+    lg: normalize(20) * scale.fontScale,
+    xl: normalize(22) * scale.fontScale,
+    xxl: normalize(25) * scale.fontScale,
+    xxxl: normalize(30) * scale.fontScale
   };
 }
 

apps/mobile/native/android/app/build.gradle

@@ -124,7 +124,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode 3062
+        versionCode 3068
         versionName getNpmVersion()
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/RCTNNativeModule.java

@@ -7,7 +7,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Color;
+import android.os.Build;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.util.Log;
 import android.view.WindowManager;
 import android.widget.RemoteViews;
@@ -217,4 +219,24 @@ public class RCTNNativeModule extends ReactContextBaseJavaModule {
             wm.notifyAppWidgetViewDataChanged(id, R.id.widget_list_view);
         }
     }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public boolean isGestureNavigationEnabled() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            try {
+                String navBarMode = Settings.Secure.getString(
+                        mContext.getContentResolver(),
+                        "navigation_mode"
+                );
+                return "2".equals(navBarMode);
+            } catch (Exception e) {
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
+
+
+
 }

apps/mobile/native/android/releasenotes/whatsnew-en-US

@@ -1,4 +1,5 @@
-- Fix crash on device boot on android 15 devices
+- Improved editor UI for better usability
+- Improved UX for creating and editing reminders
 - Minor bug fixes and improvements
 
 Thank you for using Notesnook!

apps/mobile/native/android/settings.gradle

@@ -5,5 +5,5 @@ rootProject.name = 'Notesnook'
 include ':app'
 includeBuild('../../node_modules/@react-native/gradle-plugin')
 
-include ":lazysodium"
-project(':lazysodium').projectDir = new File(rootProject.projectDir, '../../node_modules/@ammarahmed/react-native-sodium/android/lazysodium')
+include ":lazysodium-android"
+project(':lazysodium-android').projectDir = new File(rootProject.projectDir, '../../node_modules/@ammarahmed/react-native-sodium/android/lazysodium-android/app')

apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj

@@ -1089,7 +1089,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2141;
+				CURRENT_PROJECT_VERSION = 2147;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1163,7 +1163,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.2.6;
+				MARKETING_VERSION = 3.2.12;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1194,7 +1194,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2141;
+				CURRENT_PROJECT_VERSION = 2147;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1268,7 +1268,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.2.6;
+				MARKETING_VERSION = 3.2.12;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1427,7 +1427,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2141;
+				CURRENT_PROJECT_VERSION = 2147;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1439,7 +1439,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.2.6;
+				MARKETING_VERSION = 3.2.12;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
@@ -1470,7 +1470,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2141;
+				CURRENT_PROJECT_VERSION = 2147;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1483,7 +1483,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.2.6;
+				MARKETING_VERSION = 3.2.12;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1513,7 +1513,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Make Note/Make Note.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2141;
+				CURRENT_PROJECT_VERSION = 2147;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1594,7 +1594,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
-				MARKETING_VERSION = 3.2.6;
+				MARKETING_VERSION = 3.2.12;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
@@ -1625,7 +1625,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2141;
+				CURRENT_PROJECT_VERSION = 2147;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1707,7 +1707,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
-				MARKETING_VERSION = 3.2.6;
+				MARKETING_VERSION = 3.2.12;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
 				PRODUCT_NAME = "$(TARGET_NAME)";

apps/mobile/native/ios/Podfile.lock

@@ -1374,7 +1374,7 @@ PODS:
     - SDWebImage (~> 5.11.1)
   - react-native-share-extension (2.9.0):
     - React
-  - react-native-sodium (1.6.4):
+  - react-native-sodium (1.6.5):
     - React
   - react-native-theme-switch-animation (0.6.0):
     - DoubleConversion
@@ -2435,7 +2435,7 @@ SPEC CHECKSUMS:
   react-native-safe-area-context: 9d72abf6d8473da73033b597090a80b709c0b2f1
   react-native-screenguard: 82437eeb0086a90b5e5d7e54130bb04fb406373e
   react-native-share-extension: bcb7e466390a9e50c742f4b1019d6f181aedd7ad
-  react-native-sodium: 5b55f74705005612e12838ffd583927229a65e6a
+  react-native-sodium: 285eec063e4232cb67347ef6a434b85e588d38cb
   react-native-theme-switch-animation: d90fe2de0d9e87a63cd6235d98cba6e7054e9a10
   react-native-webview: 079eca50edf657503318b66687dadfb903731aa8
   React-nativeconfig: ecf4dc92c40b97e2b3f0c619938f78bfd6507b08

apps/mobile/native/package.json

@@ -66,7 +66,7 @@
     "react-native-screenguard": "^1.0.0",
     "@formatjs/intl-locale": "4.0.0",
     "@formatjs/intl-pluralrules": "5.2.14",
-    "@ammarahmed/react-native-sodium": "^1.6.4",
+    "@ammarahmed/react-native-sodium": "^1.6.5",
     "@react-native-community/datetimepicker": "^8.2.0",
     "react-native-exit-app": "github:ammarahm-ed/react-native-exit-app",
     "react-native-begin-background-task": "github:blockfirm/react-native-begin-background-task",

apps/mobile/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/mobile",
-  "version": "3.2.2",
+  "version": "3.2.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/mobile",
-      "version": "3.2.2",
+      "version": "3.2.10",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "workspaces": [
@@ -1098,7 +1098,7 @@
         "refractor": "^4.8.1",
         "sqlite-better-trigram": "^0.0.3",
         "sqlite-regex": "^0.2.4-alpha.1",
-        "sqlite3-fts5-html": "^0.0.3",
+        "sqlite3-fts5-html": "^0.0.4",
         "vitest": "2.1.8",
         "vitest-fetch-mock": "^0.2.2",
         "ws": "^8.13.0"
@@ -28324,7 +28324,7 @@
         "@ammarahmed/react-native-eventsource": "1.1.0",
         "@ammarahmed/react-native-fingerprint-scanner": "^5.0.0",
         "@ammarahmed/react-native-share-extension": "^2.9.0",
-        "@ammarahmed/react-native-sodium": "^1.6.4",
+        "@ammarahmed/react-native-sodium": "^1.6.5",
         "@bam.tech/react-native-image-resizer": "3.0.11",
         "@callstack/repack": "~5.1.2",
         "@formatjs/intl-locale": "4.0.0",
@@ -28478,9 +28478,9 @@
       }
     },
     "node_modules/@ammarahmed/react-native-sodium": {
-      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/@ammarahmed/react-native-sodium/-/react-native-sodium-1.6.4.tgz",
-      "integrity": "sha512-+OIBABV/8IPXVQPRxiub0WW86X/bs14GHnQ1VqtxWGv7phwfyOVzi9c1/LDeRqjCDKBAYHOv2a5PLHZb2RzeGw==",
+      "version": "1.6.5",
+      "resolved": "https://registry.npmjs.org/@ammarahmed/react-native-sodium/-/react-native-sodium-1.6.5.tgz",
+      "integrity": "sha512-x8YkHWHaHiB4QomjTAXyw/aLjrsFMWumJxSRrEeUOVeArVszbrwZ88B+2zAq+sPZ+HSMi/YrnrvgzbwvOCLnNA==",
       "license": "ISC"
     },
     "node_modules/@ampproject/remapping": {

apps/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notesnook/mobile",
-  "version": "3.2.6",
+  "version": "3.2.12",
   "private": true,
   "license": "GPL-3.0-or-later",
   "workspaces": [

apps/mobile/patches/@react-navigation+core+6.4.8.patch

@@ -0,0 +1,39 @@
+diff --git a/node_modules/@react-navigation/core/lib/commonjs/useNavigationCache.js b/node_modules/@react-navigation/core/lib/commonjs/useNavigationCache.js
+index c7f1df6..0141f28 100644
+--- a/node_modules/@react-navigation/core/lib/commonjs/useNavigationCache.js
++++ b/node_modules/@react-navigation/core/lib/commonjs/useNavigationCache.js
+@@ -109,7 +109,7 @@ function useNavigationCache(_ref) {
+         })),
+         isFocused: () => {
+           const state = getState();
+-          if (state.routes[state.index].key !== route.key) {
++          if (state.routes[state.index]?.key !== route.key) {
+             return false;
+           }
+ 
+diff --git a/node_modules/@react-navigation/core/lib/module/useNavigationCache.js b/node_modules/@react-navigation/core/lib/module/useNavigationCache.js
+index c4d65c6..89abe63 100644
+--- a/node_modules/@react-navigation/core/lib/module/useNavigationCache.js
++++ b/node_modules/@react-navigation/core/lib/module/useNavigationCache.js
+@@ -100,7 +100,7 @@ export default function useNavigationCache(_ref) {
+         })),
+         isFocused: () => {
+           const state = getState();
+-          if (state.routes[state.index].key !== route.key) {
++          if (state.routes[state.index]?.key !== route.key) {
+             return false;
+           }
+ 
+diff --git a/node_modules/@react-navigation/core/src/useNavigationCache.tsx b/node_modules/@react-navigation/core/src/useNavigationCache.tsx
+index 390120a..1b0f2d1 100644
+--- a/node_modules/@react-navigation/core/src/useNavigationCache.tsx
++++ b/node_modules/@react-navigation/core/src/useNavigationCache.tsx
+@@ -157,7 +157,7 @@ export default function useNavigationCache<
+         isFocused: () => {
+           const state = getState();
+ 
+-          if (state.routes[state.index].key !== route.key) {
++          if (state.routes[state.index]?.key !== route.key) {
+             return false;
+           }
+ 

apps/mobile/patches/react-native+0.77.2.patch

@@ -1,3 +1,24 @@
+diff --git a/node_modules/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js b/node_modules/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js
+index 77c81f0..be34558 100644
+--- a/node_modules/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js
++++ b/node_modules/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js
+@@ -156,7 +156,8 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
+ 
+     if (
+       Platform.OS === 'ios' &&
+-      this._windowWidth !== this._keyboardEvent.endCoordinates.width
++      this._windowWidth !== this._keyboardEvent.endCoordinates.width && 
++      this._windowWidth > this._keyboardEvent.endCoordinates.width
+     ) {
+       // The keyboard is not the standard bottom-of-the-screen keyboard. For example, floating keyboard on iPadOS.
+       this._setBottom(0);
+diff --git a/node_modules/react-native/scripts/.packager.env b/node_modules/react-native/scripts/.packager.env
+new file mode 100644
+index 0000000..361f5fb
+--- /dev/null
++++ b/node_modules/react-native/scripts/.packager.env
+@@ -0,0 +1 @@
++export RCT_METRO_PORT=8081
 diff --git a/node_modules/react-native/scripts/packager.sh b/node_modules/react-native/scripts/packager.sh
 index 00d6ebc..6846832 100755
 --- a/node_modules/react-native/scripts/packager.sh

apps/mobile/patches/react-native-actions-sheet+0.9.7.patch

@@ -0,0 +1,12 @@
+diff --git a/node_modules/react-native-actions-sheet/dist/src/index.js b/node_modules/react-native-actions-sheet/dist/src/index.js
+index 0e124da..3703153 100644
+--- a/node_modules/react-native-actions-sheet/dist/src/index.js
++++ b/node_modules/react-native-actions-sheet/dist/src/index.js
+@@ -1088,6 +1088,7 @@ export default forwardRef(function ActionSheet(_a, ref) {
+                  * Always true, it causes issue with keyboard handling.
+                  */
+                 statusBarTranslucent: true,
++                navigationBarTranslucent: true
+             }
+             : {
+                 testID: ((_b = props.testIDs) === null || _b === void 0 ? void 0 : _b.root) || props.testID,

apps/monograph/Dockerfile

@@ -1,5 +1,5 @@
 
-FROM oven/bun:1.2.2-alpine
+FROM oven/bun:1.2.21-slim
 
 RUN mkdir -p /home/bun/app && chown -R bun:bun /home/bun/app
 

apps/monograph/app/entry.server.tsx

@@ -90,7 +90,7 @@ function getContentSecurityPolicy(nonce?: string) {
   const connect_src =
     process.env.NODE_ENV === "development"
       ? "'self' ws://localhost:*"
-      : "'self'";
+      : "'self' https://notesnook.com/api/v1/reports/submit";
 
   return (
     `script-src ${script_src} 'strict-dynamic'; ` +

apps/monograph/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/monograph",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/monograph",
-      "version": "1.2.4",
+      "version": "1.2.5",
       "dependencies": {
         "@emotion/cache": "11.11.0",
         "@emotion/react": "11.11.1",

apps/monograph/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notesnook/monograph",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "private": true,
   "sideEffects": false,
   "type": "module",

apps/theme-builder/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/theme-builder",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/theme-builder",
-      "version": "1.3.0",
+      "version": "1.4.0",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@emotion/react": "11.11.1",

apps/theme-builder/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@notesnook/theme-builder",
   "description": "Your private note taking space",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "private": true,
   "main": "./src/app.js",
   "homepage": "https://notesnook.com/",

apps/web/__e2e__/editor.test.ts

@@ -430,12 +430,12 @@ test("control + alt + right arrow should go to next note", async ({ page }) => {
 
   await note1?.openNote();
   await note2?.openNote(true);
-  await page.keyboard.press("Control+Alt+ArrowRight");
+  await page.keyboard.press("ControlOrMeta+Alt+ArrowRight");
 
   expect(await notes.editor.getTitle()).toBe("Note 1");
   expect(await notes.editor.getContent("text")).toBe("Note 1 content");
 
-  await page.keyboard.press("Control+Alt+ArrowRight");
+  await page.keyboard.press("ControlOrMeta+Alt+ArrowRight");
 
   expect(await notes.editor.getTitle()).toBe("Note 2");
   expect(await notes.editor.getContent("text")).toBe("Note 2 content");
@@ -458,12 +458,12 @@ test("control + alt + left arrow should go to previous note", async ({
 
   await note1?.openNote();
   await note2?.openNote(true);
-  await page.keyboard.press("Control+Alt+ArrowLeft");
+  await page.keyboard.press("ControlOrMeta+Alt+ArrowLeft");
 
   expect(await notes.editor.getTitle()).toBe("Note 1");
   expect(await notes.editor.getContent("text")).toBe("Note 1 content");
 
-  await page.keyboard.press("Control+Alt+ArrowLeft");
+  await page.keyboard.press("ControlOrMeta+Alt+ArrowLeft");
 
   expect(await notes.editor.getTitle()).toBe("Note 2");
   expect(await notes.editor.getContent("text")).toBe("Note 2 content");

apps/web/__e2e__/editor.test.ts-snapshots/readonly-edited-note-Chromium-linux.txt

@@ -1 +1 @@
-This is Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1An edit I made
+An edit I madeThis is Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1

apps/web/__e2e__/editor.test.ts-snapshots/readonly-edited-note-Chromium-win32.txt

@@ -1 +1 @@
-This is Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1An edit I made
+An edit I madeThis is Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1

apps/web/__e2e__/editor.test.ts-snapshots/readonly-edited-note-Firefox-win32.txt

@@ -1 +1 @@
-This is Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1An edit I made
+An edit I madeThis is Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1

apps/web/__e2e__/models/settings-view.model.ts

@@ -162,9 +162,9 @@ export class SettingsViewModel {
 
     await appLockSwitch.click();
     await fillPasswordDialog(this.page, userPassword);
-    await this.page.waitForTimeout(100);
+    await this.page.waitForTimeout(500);
     await fillConfirmPasswordDialog(this.page, appLockPassword);
-    await this.page.waitForTimeout(100);
+    await this.page.waitForTimeout(500);
   }
 
   async disableAppLock(appLockPassword: string) {

apps/web/__e2e__/models/utils.ts

@@ -91,6 +91,7 @@ export async function fillReminderDialog(
   }
 
   await confirmDialog(dialog);
+  await dialog.waitFor({ state: "hidden" });
 }
 
 export async function fillItemDialog(page: Page, item: Item) {
@@ -133,7 +134,6 @@ export async function fillConfirmPasswordDialog(page: Page, password: string) {
 export async function confirmDialog(dialog: Locator) {
   const dialogConfirm = dialog.locator(getTestId("dialog-yes"));
   await dialogConfirm.click();
-  // await dialogConfirm.waitFor({ state: "detached" });
 }
 
 export async function denyDialog(page: Page) {

apps/web/__e2e__/reminders.test.ts

@@ -53,16 +53,17 @@ test("adding a one-time reminder before current time should not be possible", as
   await app.goto();
   const reminders = await app.goToReminders();
 
-  await reminders.createReminder({
-    ...ONE_TIME_REMINDER,
-    date: 0
-  });
-
-  expect(
-    await app.toasts.waitForToast(
+  const result = await Promise.race([
+    reminders.createReminder({
+      ...ONE_TIME_REMINDER,
+      date: 0
+    }),
+    app.toasts.waitForToast(
       "Reminder time cannot be earlier than the current time."
     )
-  ).toBeTruthy();
+  ]);
+
+  expect(result).toBeTruthy();
 });
 
 for (const recurringMode of ["Daily", "Weekly", "Monthly"] as const) {

apps/web/__e2e__/tabs.test.ts

@@ -455,6 +455,7 @@ test("if note is active in multiple tabs, moving the note to trash should close
     title: "Note 1"
   });
   await note?.contextMenu.openInNewTab();
+  await page.waitForTimeout(1000);
 
   await note?.contextMenu.moveToTrash();
 

apps/web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/web",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/web",
-      "version": "3.2.3",
+      "version": "3.2.4",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {

apps/web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@notesnook/web",
   "description": "Your private note taking space",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "private": true,
   "main": "./src/app.js",
   "homepage": "https://notesnook.com/",

apps/web/src/app.css

@@ -230,7 +230,7 @@ kbd {
   background: var(--background);
   border-radius: 3px;
   padding: 2px 5px;
-  color: var(--paragraph-secondary);
+  color: var(--paragraph);
 }
 
 .ping {

apps/web/src/app.tsx

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { useState, Suspense, useEffect, useRef } from "react";
+import { Suspense, useEffect, useRef } from "react";
 import { Box, Flex } from "@theme-ui/components";
 import { ScopedThemeProvider } from "./components/theme-provider";
 import useMobile from "./hooks/use-mobile";
@@ -60,6 +60,14 @@ function App() {
     useSettingStore.getState().desktopIntegrationSettings?.nativeTitlebar;
   console.timeEnd("loading app");
 
+  useEffect(() => {
+    if (isMobile) {
+      useStore.setState({
+        isNavPaneCollapsed: false
+      });
+    }
+  }, [isMobile]);
+
   return (
     <>
       {isFocused ? null : (
@@ -216,7 +224,7 @@ function DesktopAppContents() {
               initialSize={380}
               style={{ flex: 1, display: "flex" }}
               snapSize={120}
-              maxSize={500}
+              maxSize={1000}
               className="list-pane"
             >
               <ScopedThemeProvider

apps/web/src/common/dialog-manager.tsx

@@ -45,7 +45,7 @@ class _DialogManager {
         onClose: (result: any) => void;
       }
     >;
-    return new Promise<Result>((resolve, reject) => {
+    return new Promise<Result | false>((resolve, reject) => {
       const close = () => {
         this.openedDialogs.delete(component);
         root.unmount();
@@ -53,7 +53,7 @@ class _DialogManager {
       };
       this.openedDialogs.set(component, () => {
         close();
-        reject(new Error("Dialog force closed."));
+        resolve(false);
       });
       root.render(
         <Dialog
@@ -72,11 +72,14 @@ class _DialogManager {
   }
 
   closeAll() {
-    this.openedDialogs.clear();
     const dialogs = document.querySelectorAll(
       ".ReactModalPortal,[data-react-modal-body-trap]"
     );
     dialogs.forEach((elem) => elem.remove());
+
+    for (const close of this.openedDialogs.values()) {
+      close();
+    }
   }
 
   register<Props extends BaseDialogProps<any>>(

apps/web/src/common/index.ts

@@ -53,7 +53,8 @@ import { MenuItem } from "@notesnook/ui";
 export const CREATE_BUTTON_MAP = {
   notes: {
     title: strings.addItem("note"),
-    onClick: () => useEditorStore.getState().newSession()
+    onClick: () => useEditorStore.getState().newSession(),
+    onAuxClick: () => useEditorStore.getState().addTab()
   },
   notebooks: {
     title: strings.addItem("notebook"),

apps/web/src/common/key-map.ts

@@ -23,6 +23,9 @@ import { useStore as useSearchStore } from "../stores/search-store";
 import { useEditorManager } from "../components/editor/manager";
 import { CommandPaletteDialog } from "../dialogs/command-palette";
 import { hashNavigate } from "../navigation";
+import { getKeybinding, keybindings } from "@notesnook/common";
+import { KeyboardShortcutsDialog } from "../dialogs/keyboard-shortcuts-dialog";
+import { isMac } from "../utils/platform";
 
 function isInEditor(e: KeyboardEvent) {
   return (
@@ -30,200 +33,71 @@ function isInEditor(e: KeyboardEvent) {
   );
 }
 
-const KEYMAP = [
-  // {
-  //   keys: ["command+n", "ctrl+n", "command+alt+n", "ctrl+alt+n"],
-  //   description: "Create a new note",
-  //   global: true,
-  //   action: (e) => {
-  //     e.preventDefault();
-  //     hashNavigate("/notes/create", {
-  //       addNonce: true,
-  //       replace: true,
-  //       notify: true,
-  //     });
-  //   },
-  // },
-  // {
-  //   keys: [
-  //     "command+shift+n",
-  //     "ctrl+shift+n",
-  //     "command+shift+alt+n",
-  //     "ctrl+shift+alt+n",
-  //   ],
-  //   description: "Create a new notebook",
-  //   global: true,
-  //   action: (e) => {
-  //     e.preventDefault();
-  //     hashNavigate("/notebooks/create", {
-  //       replace: true,
-  //       notify: true,
-  //     });
-  //   },
-  // },
-  {
-    keys: [
-      "command+option+right",
-      "ctrl+alt+right",
-      "command+option+shift+right",
-      "ctrl+alt+shift+right",
-      "ctrl+tab",
-      "command+tab"
-    ],
-    description: "Go to next tab",
-    action: () => useEditorStore.getState().focusNextTab()
-  },
-  {
-    keys: [
-      "command+option+left",
-      "ctrl+alt+left",
-      "command+option+shift+left",
-      "ctrl+alt+shift+left",
-      "ctrl+shift+tab",
-      "command+shift+tab"
-    ],
-    description: "Go to previous tab",
-    action: () => useEditorStore.getState().focusPreviousTab()
-  },
-  {
-    keys: ["ctrl+t", "command+t"],
-    description: "Create a new tab",
-    action: () => useEditorStore.getState().addTab()
-  },
-  {
-    keys: ["ctrl+n", "command+n"],
-    description: "Create a new note",
-    action: () => useEditorStore.getState().newSession()
-  },
-  {
-    keys: ["ctrl+w", "command+w"],
-    description:
-      "Close active tab or focus previously activated tab if active tab pinned",
-    action: () => {
-      const activeTab = useEditorStore.getState().getActiveTab();
-      if (activeTab?.pinned) {
-        useEditorStore.getState().focusLastActiveTab();
-        return;
-      }
-      useEditorStore.getState().closeActiveTab();
+const actions: Partial<
+  Record<keyof typeof keybindings, (() => void) | ((e: KeyboardEvent) => void)>
+> = {
+  nextTab: () => useEditorStore.getState().focusNextTab(),
+  previousTab: () => useEditorStore.getState().focusPreviousTab(),
+  newTab: () => useEditorStore.getState().addTab(),
+  newNote: () => useEditorStore.getState().newSession(),
+  closeActiveTab: () => {
+    const activeTab = useEditorStore.getState().getActiveTab();
+    if (activeTab?.pinned) {
+      useEditorStore.getState().focusLastActiveTab();
+      return;
     }
+    useEditorStore.getState().closeActiveTab();
   },
-  {
-    keys: ["ctrl+shift+w", "command+shift+w"],
-    description: "Close all tabs",
-    action: () => useEditorStore.getState().closeAllTabs()
-  },
-  {
-    keys: ["command+f", "ctrl+f"],
-    description: "Search all notes",
-    global: false,
-    action: (e: KeyboardEvent) => {
-      if (isInEditor(e)) {
-        const activeSession = useEditorStore.getState().getActiveSession();
-        if (activeSession?.type === "readonly") {
-          e.preventDefault();
-          const editor = useEditorManager
-            .getState()
-            .getEditor(activeSession.id);
-          editor?.editor?.startSearch();
-        }
-        return;
+  closeAllTabs: () => useEditorStore.getState().closeAllTabs(),
+  searchInNotes: (e: KeyboardEvent) => {
+    if (isInEditor(e)) {
+      const activeSession = useEditorStore.getState().getActiveSession();
+      if (activeSession?.type === "readonly") {
+        e.preventDefault();
+        const editor = useEditorManager.getState().getEditor(activeSession.id);
+        editor?.editor?.startSearch();
       }
-      e.preventDefault();
+      return;
+    }
+    e.preventDefault();
 
-      useSearchStore.setState({ isSearching: true, searchType: "notes" });
-    }
+    useSearchStore.setState({ isSearching: true, searchType: "notes" });
   },
-  // {
-  //   keys: ["alt+n"],
-  //   description: "Go to Notes",
-  //   global: false,
-  //   action: (e) => {
-  //     e.preventDefault();
-  //     navigate("/notes");
-  //   },
-  // },
-  // {
-  //   keys: ["alt+b"],
-  //   description: "Go to Notebooks",
-  //   global: false,
-  //   action: (e) => {
-  //     e.preventDefault();
-  //     navigate("/notebooks");
-  //   },
-  // },
-  // {
-  //   keys: ["alt+f"],
-  //   description: "Go to Favorites",
-  //   global: false,
-  //   action: (e) => {
-  //     e.preventDefault();
-  //     navigate("/favorites");
-  //   },
-  // },
-  // {
-  //   keys: ["alt+t"],
-  //   description: "Go to Tags",
-  //   global: false,
-  //   action: (e) => {
-  //     e.preventDefault();
-  //     navigate("/tags");
-  //   },
-  // },
-  // {
-  //   keys: ["alt+d"],
-  //   description: "Go to Trash",
-  //   global: false,
-  //   action: (e) => {
-  //     e.preventDefault();
-  //     navigate("/trash");
-  //   },
-  // },
-  // {
-  //   keys: ["alt+s"],
-  //   description: "Go to Settings",
-  //   global: false,
-  //   action: (e) => {
-  //     e.preventDefault();
-  //     navigate("/settings");
-  //   },
-  // },
-  // {
-  //   keys: ["command+d", "ctrl+d"],
-  //   description: "Toggle dark/light mode",
-  //   global: true,
-  //   action: (e) => {
-  //     e.preventDefault();
-  //     themestore.get().toggleNightMode();
-  //   },
-  // },
-  {
-    keys: ["ctrl+k", "cmd+k", "ctrl+p", "cmd+p"],
-    description: "Open command palette",
-    action: (e: KeyboardEvent) => {
-      e.preventDefault();
-      CommandPaletteDialog.close();
-      CommandPaletteDialog.show({
-        isCommandMode: e.key === "k"
-      }).catch(() => {});
-    }
+  openCommandPalette: () => {
+    CommandPaletteDialog.close();
+    CommandPaletteDialog.show({
+      isCommandMode: true
+    }).catch(() => {});
   },
-  {
-    keys: ["ctrl+,", "command+,"],
-    description: "Open settings",
-    action: () => hashNavigate("/settings", { replace: true })
-  }
-];
+  openQuickOpen: () => {
+    CommandPaletteDialog.close();
+    CommandPaletteDialog.show({
+      isCommandMode: false
+    }).catch(() => {});
+  },
+  openSettings: (e) => {
+    if (isInEditor(e)) return;
+    hashNavigate("/settings", { replace: true });
+  },
+  openKeyboardShortcuts: () => KeyboardShortcutsDialog.show({})
+};
 
 export function registerKeyMap() {
   hotkeys.filter = function () {
     return true;
   };
 
-  KEYMAP.forEach((key) => {
-    hotkeys(key.keys.join(","), (e) => {
+  Object.entries(actions).forEach(([id, action]) => {
+    const keys = getKeybinding(
+      id as keyof typeof keybindings,
+      IS_DESKTOP_APP,
+      isMac()
+    );
+    if (!keys || keys.length === 0) return;
+
+    hotkeys(keys.join(","), (e) => {
       e.preventDefault();
-      key.action?.(e);
+      action(e);
     });
   });
 }

apps/web/src/components/editor/index.tsx

@@ -243,7 +243,8 @@ const MemoizedEditorView = React.memo(EditorView, (prev, next) => {
     prev.session.needsHydration === next.session.needsHydration &&
     prev.session.activeBlockId === next.session.activeBlockId &&
     prev.session.activeSearchResultIndex ===
-      next.session.activeSearchResultIndex
+      next.session.activeSearchResultIndex &&
+    prev.session.nonce === next.session.nonce
   );
 });
 function EditorView({

apps/web/src/components/importer/components/provider-selector.tsx

@@ -46,7 +46,10 @@ export function ProviderSelector(props: ProviderSelectorProps) {
           sx={{ mt: 1, color: "paragraph", whiteSpace: "pre-wrap" }}
         >
           Can't find your notes app in the list?{" "}
-          <a href="https://github.com/streetwriters/notesnook-importer/issues/new">
+          <a
+            href="https://github.com/streetwriters/notesnook-importer/issues/new"
+            target="_blank"
+          >
             Send us a request.
           </a>
         </Text>

apps/web/src/components/properties/index.tsx

@@ -42,6 +42,7 @@ import {
 } from "../../stores/editor-store";
 import { db } from "../../common/db";
 import { useStore as useAppStore } from "../../stores/app-store";
+import { useStore as useAttachmentStore } from "../../stores/attachment-store";
 import { store as noteStore } from "../../stores/note-store";
 import Toggle from "./toggle";
 import ScrollContainer from "../scroll-container";
@@ -727,26 +728,27 @@ function Reminders({ noteId }: { noteId: string }) {
   );
 }
 function Attachments({ noteId }: { noteId: string }) {
+  const nonce = useAttachmentStore((store) => store.nonce);
   const result = usePromise(
     () =>
       db.attachments
         .ofNote(noteId, "all")
         .sorted({ sortBy: "dateCreated", sortDirection: "desc" }),
-    [noteId]
+    [noteId, nonce]
   );
+
   if (result.status !== "fulfilled" || result.value.length <= 0) return null;
 
   return (
     <Section
       title={strings.dataTypesPluralCamelCase.attachment()}
-      sx={{ borderTop: "1px solid var(--border)" }}
+      sx={{ borderTop: "1px solid var(--border)", mt: 1 }}
     >
       <VirtualizedTable
         estimatedSize={25}
         getItemKey={(index) => result.value.key(index)}
         items={result.value.placeholders}
         style={{
-          marginTop: 5,
           tableLayout: "fixed",
           width: "100%"
         }}

apps/web/src/components/route-container/index.tsx

@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { PropsWithChildren, useEffect, useRef } from "react";
 import { Box } from "@theme-ui/components";
-import { Close, AddReminder } from "../icons";
+import { Close, AddReminder, Menu } from "../icons";
 import { useStore as useSearchStore } from "../../stores/search-store";
 import useMobile from "../../hooks/use-mobile";
 import { debounce, usePromise } from "@notesnook/common";
@@ -27,6 +27,7 @@ import Field from "../field";
 import { strings } from "@notesnook/intl";
 import { RouteResult } from "../../navigation/types";
 import { CREATE_BUTTON_MAP } from "../../common";
+import { AppEventManager, AppEvents } from "../../common/app-events";
 
 export type RouteContainerButtons = {
   search?: {
@@ -133,6 +134,16 @@ function Header(props: RouteContainerProps) {
           if (e.key === "Escape") useSearchStore.getState().resetSearch();
           else useSearchStore.setState({ isSearching: true, searchType: type });
         }}
+        leftActions={[
+          {
+            icon: Menu,
+            hidden: !isMobile,
+            id: "hamburger-menu",
+            onClick: () => {
+              AppEventManager.publish(AppEvents.toggleSideMenu, true);
+            }
+          }
+        ]}
         rightActions={[
           {
             icon: Close,

apps/web/src/components/virtualized-table/index.tsx

@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { Virtualizer } from "@tanstack/react-virtual";
 import { Flex } from "@theme-ui/components";
-import React, { useRef } from "react";
+import React, { useLayoutEffect, useRef, useState } from "react";
 import { TableVirtuoso } from "react-virtuoso";
 
 export type VirtualizedTableRowProps<T, C> = {
@@ -57,6 +57,14 @@ export function VirtualizedTable<T, C>(props: VirtualizedTableProps<T, C>) {
     style
   } = props;
   const containerRef = useRef<HTMLDivElement>(null);
+  const [scrollParent, setScrollParent] = useState(scrollElement);
+
+  useLayoutEffect(() => {
+    setScrollParent(
+      scrollElement ||
+        containerRef.current?.closest<HTMLDivElement>(".ms-container")
+    );
+  }, [scrollElement]);
 
   return (
     <Flex
@@ -67,11 +75,7 @@ export function VirtualizedTable<T, C>(props: VirtualizedTableProps<T, C>) {
       <TableVirtuoso
         data={items}
         context={context}
-        customScrollParent={
-          scrollElement ||
-          containerRef.current?.closest(".ms-container") ||
-          undefined
-        }
+        customScrollParent={scrollParent || undefined}
         increaseViewportBy={300}
         computeItemKey={(index) => getItemKey(index)}
         defaultItemHeight={estimatedSize}

apps/web/src/components/virtualized-tree/index.tsx

@@ -177,7 +177,7 @@ export function VirtualizedTree<T>(props: TreeViewProps<T>) {
       const ids =
         indices.length === nodes.length
           ? nodes.map((c) => c.id)
-          : (indices.map((i) => nodes[i].id).filter(Boolean) as string[]);
+          : (indices.map((i) => nodes[i]?.id).filter(Boolean) as string[]);
       bulkSelect?.(ids);
     },
     focusItemAt: (index) => {

apps/web/src/dialogs/buy-dialog/paddle.tsx

@@ -140,7 +140,7 @@ export function PaddleCheckout(props: PaddleCheckoutProps) {
       if (ev.origin !== PADDLE_ORIGIN) return;
       logger.debug("Paddle event received", { data: ev.data });
       const { event, event_name, callback_data } = ev.data;
-      const { checkout } = callback_data;
+      const { checkout } = callback_data || {};
 
       if (event === PaddleEvents["Checkout.RemoveSpinner"]) setIsLoading(false);
 
@@ -165,7 +165,7 @@ export function PaddleCheckout(props: PaddleCheckoutProps) {
 
       const pricingInfo = getPricingInfo(plan, {
         public_checkout_id: checkout.id,
-        ip_geo_country_code: callback_data.user?.country || "US",
+        ip_geo_country_code: callback_data?.user?.country || "US",
         items: [
           {
             prices: checkout.prices.customer.items,

apps/web/src/dialogs/command-palette/command-palette-dialog.tsx

@@ -17,7 +17,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { debounce, usePromise } from "@notesnook/common";
+import {
+  debounce,
+  formatKey,
+  keybindings,
+  usePromise
+} from "@notesnook/common";
 import { EVENTS, fuzzy, Note, Notebook, Reminder, Tag } from "@notesnook/core";
 import { Box, Button, Flex, Input, Text } from "@theme-ui/components";
 import { useCallback, useEffect, useRef, useState } from "react";
@@ -539,7 +544,10 @@ function getCommandPaletteHelp(isCommandMode: boolean) {
     ...(isCommandMode
       ? [
           {
-            key: isMac() ? "⌘P" : "Ctrl+P",
+            key: keybindings.openQuickOpen
+              .keys(IS_DESKTOP_APP)
+              .map((k) => formatKey(k, isMac(), "+"))
+              .join(" / "),
             description: strings.quickOpen()
           }
         ]
@@ -553,7 +561,10 @@ function getCommandPaletteHelp(isCommandMode: boolean) {
             description: strings.createNewNote()
           },
           {
-            key: isMac() ? "⌘K" : "Ctrl+K",
+            key: keybindings.openCommandPalette
+              .keys(IS_DESKTOP_APP)
+              .map((k) => formatKey(k, isMac(), "+"))
+              .join(" / "),
             description: strings.commandPalette()
           }
         ])

apps/web/src/dialogs/command-palette/commands.ts

@@ -50,6 +50,7 @@ import { notebookMenuItems } from "../../components/notebook";
 import { tagMenuItems } from "../../components/tag";
 import { useEditorManager } from "../../components/editor/manager";
 import Config from "../../utils/config";
+import { KeyboardShortcutsDialog } from "../keyboard-shortcuts-dialog";
 
 export interface BaseCommand {
   id: string;
@@ -181,6 +182,14 @@ const staticCommands: Command[] = [
     group: strings.navigate(),
     type: "command"
   },
+  {
+    id: "keyboard-shortcuts",
+    title: "Keyboard shortcuts",
+    icon: ArrowTopRight,
+    action: () => KeyboardShortcutsDialog.show({}),
+    group: strings.navigate(),
+    type: "command"
+  },
   {
     id: "attachment-manager",
     title: strings.attachmentManager(),

apps/web/src/dialogs/keyboard-shortcuts-dialog.tsx

@@ -0,0 +1,112 @@
+/*
+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 { formatKey, getGroupedKeybindings } from "@notesnook/common";
+import { Flex, Text } from "@theme-ui/components";
+import { DialogManager } from "../common/dialog-manager";
+import Dialog from "../components/dialog";
+import { isMac } from "../utils/platform";
+
+const groupedKeybindings = getGroupedKeybindings(IS_DESKTOP_APP, isMac());
+
+export const KeyboardShortcutsDialog = DialogManager.register(
+  function KeyboardShortcutsDialog(props) {
+    return (
+      <Dialog
+        isOpen={true}
+        title={"Keyboard Shortcuts"}
+        width={750}
+        onClose={() => props.onClose(false)}
+      >
+        <Flex
+          sx={{
+            flexDirection: "column",
+            flexWrap: "nowrap",
+            mt: 2,
+            gap: 1
+          }}
+        >
+          {groupedKeybindings.map((group) => {
+            return (
+              <Flex key={group.category} sx={{ flexDirection: "column" }}>
+                <Text
+                  variant="subtitle"
+                  sx={{
+                    borderBottom: "1px solid var(--border)",
+                    mb: 1,
+                    pb: 1
+                  }}
+                >
+                  {group.category}
+                </Text>
+                {group.shortcuts.map((shortcut) => {
+                  return (
+                    <Flex
+                      key={shortcut.description}
+                      sx={{
+                        mb: 2,
+                        flexDirection: "row",
+                        justifyContent: "space-between"
+                      }}
+                    >
+                      <Text variant="body">{shortcut.description}</Text>
+                      <Keys keys={shortcut.keys} />
+                    </Flex>
+                  );
+                })}
+              </Flex>
+            );
+          })}
+        </Flex>
+      </Dialog>
+    );
+  }
+);
+
+function Keys({ keys }: { keys: string[] }) {
+  return (
+    <Flex sx={{ gap: 1 }}>
+      {keys.map((key, index) => (
+        <>
+          {key.split(" ").map((k) => (
+            <Text
+              key={k}
+              as="code"
+              sx={{
+                bg: "background",
+                color: "paragraph",
+                px: 1,
+                borderRadius: 5,
+                fontSize: "body",
+                border: "1px solid var(--border)"
+              }}
+            >
+              {formatKey(k, isMac())}
+            </Text>
+          ))}
+          {keys.length - 1 !== index && (
+            <Text as="span" sx={{ fontSize: "0.8em" }}>
+              /
+            </Text>
+          )}
+        </>
+      ))}
+    </Flex>
+  );
+}