web: bump version to 3.2.0-beta.6

Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>

.github/workflows/android.publish.internal.yml

@@ -69,6 +69,8 @@ jobs:
         run: |
           sed -i -e 's/arguments/arguments "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",/g' apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle
           sed -i -e 's/arguments/arguments "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",/g' apps/mobile/node_modules/react-native-reanimated/android/build.gradle
+          sed -i -e 's/defaultConfig {/ndkVersion safeExtGet('ndkVersion', "25.2.9519653")\n  defaultConfig {/g' apps/mobile/node_modules/react-native-reanimated//android/build.gradle
+          sed -i -e 's/defaultConfig {/ndkVersion safeExtGet('ndkVersion', "25.2.9519653")\n  defaultConfig {/g' apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle
 
       - name: CCache Stats Before Build
         run: ccache -sv

.github/workflows/android.publish.yml

@@ -69,6 +69,8 @@ jobs:
         run: |
           sed -i -e 's/arguments/arguments "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",/g' apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle
           sed -i -e 's/arguments/arguments "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",/g' apps/mobile/node_modules/react-native-reanimated/android/build.gradle
+          sed -i -e 's/defaultConfig {/ndkVersion safeExtGet('ndkVersion', "25.2.9519653")\n  defaultConfig {/g' apps/mobile/node_modules/react-native-reanimated//android/build.gradle
+          sed -i -e 's/defaultConfig {/ndkVersion safeExtGet('ndkVersion', "25.2.9519653")\n  defaultConfig {/g' apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle
 
       - name: CCache Stats Before Build
         run: ccache -sv

.github/workflows/core.tests.yml

@@ -9,13 +9,7 @@ on:
       - "packages/core/**"
       # re-run workflow if workflow file changes
       - ".github/workflows/core.tests.yml"
-  pull_request_target:
-    branches:
-      - "master"
-    paths:
-      - "packages/core/**"
-      # re-run workflow if workflow file changes
-      - ".github/workflows/core.tests.yml"
+  pull_request:
     types:
       - "ready_for_review"
       - "opened"
@@ -23,21 +17,11 @@ 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
-
   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.publish.yml

@@ -107,8 +107,7 @@ jobs:
           name: Notesnook Desktop v${{ steps.app_metadata.outputs.app_version }}
           tag_name: v${{ steps.app_metadata.outputs.app_version }}
           files: ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip
-          prerelease: ${{ inputs.release-track == 'beta' }}
-          target_commitish: ${{ github.ref }}
+          prerelease: ${{ endsWith(steps.app_metadata.outputs.app_version, '-beta') }}
 
       - name: Generate flatpak sources
         if: inputs.publish-github && inputs.build-linux
@@ -234,7 +233,7 @@ jobs:
         working-directory: ./apps/desktop
 
   build-linux-x64:
-    name: Build for Linux x64
+    name: Build for Linux
     needs: build
     if: inputs.build-linux
     runs-on: ubuntu-22.04
@@ -251,7 +250,7 @@ jobs:
         run: echo "SNAPCRAFT_STORE_CREDENTIALS=${{ secrets.snapcraft_token }}" >> $GITHUB_ENV
 
       - name: Install Snapcraft
-        uses: samuelmeuli/action-snapcraft@v3
+        uses: samuelmeuli/action-snapcraft@v1
         if: inputs.publish-snap
 
       - name: Download build
@@ -294,15 +293,11 @@ jobs:
       - name: Publish on Snapcraft
         if: inputs.publish-snap
         run: |
-          if [ ${{ inputs.release-track }} == 'beta' ]; then
-            snapcraft upload --release=beta ./output/notesnook_linux_amd64.snap
-          else
-            snapcraft upload --release=stable ./output/notesnook_linux_amd64.snap
-          fi
+          snapcraft upload --release=stable ./output/notesnook_linux_amd64.snap
         working-directory: ./apps/desktop
 
   build-linux-arm64:
-    name: Build for Linux arm64
+    name: Build for Linux
     needs: build
     if: inputs.build-linux
     runs-on: ubuntu-22.04-arm
@@ -314,13 +309,13 @@ jobs:
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
 
-      # - name: Setup Snapcraft Auth
-      #   if: inputs.publish-snap
-      #   run: echo "SNAPCRAFT_STORE_CREDENTIALS=${{ secrets.snapcraft_token }}" >> $GITHUB_ENV
+      - name: Setup Snapcraft Auth
+        if: inputs.publish-snap
+        run: echo "SNAPCRAFT_STORE_CREDENTIALS=${{ secrets.snapcraft_token }}" >> $GITHUB_ENV
 
-      # - name: Install Snapcraft
-      #   uses: samuelmeuli/action-snapcraft@v1
-      #   if: inputs.publish-snap
+      - name: Install Snapcraft
+        uses: samuelmeuli/action-snapcraft@v1
+        if: inputs.publish-snap
 
       - name: Download build
         uses: actions/download-artifact@v4
@@ -342,11 +337,11 @@ jobs:
         run: npx nx run release --project @notesnook/desktop
         working-directory: ./apps/desktop
 
-      # - name: Build snap
-      #   if: inputs.publish-snap
-      #   run: |
-      #     yarn electron-builder --config=electron-builder.config.js --linux snap:arm64 -p never
-      #   working-directory: ./apps/desktop
+      - name: Build snap
+        if: inputs.publish-snap
+        run: |
+          yarn electron-builder --config=electron-builder.config.js --linux snap:arm64 -p never
+        working-directory: ./apps/desktop
 
       - name: Build AppImage
         env:
@@ -359,11 +354,11 @@ jobs:
           fi
         working-directory: ./apps/desktop
 
-      # - name: Publish on Snapcraft
-      #   if: inputs.publish-snap
-      #   run: |
-      #     snapcraft upload --release=stable ./output/notesnook_linux_arm64.snap
-      #   working-directory: ./apps/desktop
+      - name: Publish on Snapcraft
+        if: inputs.publish-snap
+        run: |
+          snapcraft upload --release=stable ./output/notesnook_linux_arm64.snap
+        working-directory: ./apps/desktop
 
   build-windows:
     name: Build for Windows

.github/workflows/desktop.tests.yml

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

.github/workflows/editor.tests.yml

@@ -10,12 +10,6 @@ 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/ios.publish.yml

@@ -59,10 +59,7 @@ jobs:
           key: ${{ runner.os }}-pods-${{ hashFiles('apps/mobile/native/ios/Podfile.lock') }}
 
       - name: Install Pods
-        run: |
-          cd apps/mobile/native/ios
-          bundle install
-          RCT_NEW_ARCH_ENABLED=0 bundle exec pod install
+        run: npm run prepare:ios
 
       - name: CCache Stats Before Build
         run: ccache -sv

.github/workflows/web.tests.yml

@@ -9,13 +9,7 @@ on:
       - "apps/web/**"
       # re-run workflow if workflow file changes
       - ".github/workflows/web.tests.yml"
-  pull_request_target:
-    branches:
-      - "master"
-    paths:
-      - "apps/web/**"
-      # re-run workflow if workflow file changes
-      - ".github/workflows/web.tests.yml"
+  pull_request:
     types:
       - "ready_for_review"
       - "opened"
@@ -23,23 +17,12 @@ 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
@@ -71,8 +54,6 @@ 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

README.md

@@ -66,7 +66,7 @@ We take all queries, issues and bug reports that you might have. Feel free to as
 
 ## Additional Resources
 
-- [Migrating & Importing your data from other apps — Importer](https://help.notesnook.com/importing-notes)
+- [Migrating & Importing your data from other apps — Importer](https://importer.notesnook.com/)
 - [Privacy policy](https://notesnook.com/privacy) & [Terms of service](https://notesnook.com/terms)
 - [Verify Notesnook encryption claims yourself — Vericrypt](https://vericrypt.notesnook.com/)
 - [Why Notesnook requires an email address?](https://blog.notesnook.com/why-notesnook-requires-an-email-address/)

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.
 
-1. `clone` the monorepo:
+Once you have completed the setup, the first step is to `clone` the monorepo:
 
 ```bash
 git clone https://github.com/streetwriters/notesnook.git
@@ -33,28 +33,19 @@ git clone https://github.com/streetwriters/notesnook.git
 cd notesnook
 ```
 
-2. Install dependencies:
+Once you are inside the `./notesnook` directory, run the preparation step:
 
 ```bash
 # this might take a while to complete
 npm install
 ```
 
-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:
+Now you can finally start the desktop app for development:
 
 ```bash
 npm run start:desktop
 ```
 
-### Release mode
-
 To run the app in release mode:
 
 ```bash
@@ -67,10 +58,10 @@ This will compile and run the app in production mode but it won't generate any p
 npm run release -- --rebuild
 
 # For macOS
-npx electron-builder --config=electron-builder.config.js --mac dmg --arm64 --x64 --publish never
+npx electron-builder --config=electron-builder.config.js --mac dmg --arm64 --x64 -publish never
 
 # For Linux (AppImage)
-npx electron-builder --config=electron-builder.config.js --linux AppImage:x64 AppImage:arm64 --publish never
+npx electron-builder --config=electron-builder.config.js --linux AppImage:x64 AppImage:arm64 -publish never
 
 # For Windows
 npx electron-builder --config=electron-builder.config.js --win --publish never

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

@@ -17,226 +17,230 @@ 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 { testCleanup, test } from "./test-override.js";
+import { test } from "vitest";
+import { harness } from "./utils.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 ({
-  ctx: { page },
-  expect,
-  onTestFinished
-}) => {
-  onTestFinished(testCleanup);
+test("update starts downloading if version is outdated", async (t) => {
+  await harness(
+    t,
+    async ({ page }) => {
+      await page.waitForSelector("#authForm");
 
-  await page.waitForSelector("#authForm");
-  expect(
-    await page.getByRole("button", { name: "Create account" }).isVisible()
-  ).toBe(true);
+      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 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" });
-});
-
-test("update is only shown if version is outdated and auto updates are disabled", async ({
-  ctx,
-  expect,
-  onTestFinished
-}) => {
-  onTestFinished(testCleanup);
-
-  await ctx.app.close();
-  await writeFile(
-    ctx.configPath,
-    JSON.stringify({
-      automaticUpdates: false
-    })
+      await page
+        .locator(".theme-scope-statusBar")
+        .getByRole("button", { name: /updating/i })
+        .waitFor({ state: "attached" });
+    },
+    { version: "3.0.0" }
   );
-
-  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: /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);
+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
+        })
+      );
 
-    await ctx.app.close();
-    await writeFile(
-      ctx.configPath,
-      JSON.stringify({
-        automaticUpdates: false,
-        releaseTrack: "beta"
-      })
-    );
+      await ctx.relaunch();
 
-    await ctx.relaunch();
+      const { page } = ctx;
 
-    const { page } = ctx;
+      await page.waitForSelector("#authForm");
 
-    await page.waitForSelector("#authForm");
+      t.expect(
+        await page.getByRole("button", { name: "Create account" }).isVisible()
+      ).toBe(true);
 
-    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");
-
-    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 })
-        .isHidden()
-    ).toBe(true);
-  });
+        .waitFor({ state: "attached" });
+    },
+    { version: "3.0.0" }
+  );
 });
 
-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);
+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"
+        })
+      );
 
-    await ctx.app.close();
-    await writeFile(
-      ctx.configPath,
-      JSON.stringify({
-        automaticUpdates: false,
-        releaseTrack: "stable"
-      })
-    );
+      await ctx.relaunch();
 
-    await ctx.relaunch();
+      const { page } = ctx;
 
-    const { page } = ctx;
+      await page.waitForSelector("#authForm");
 
-    await page.waitForSelector("#authForm");
+      t.expect(
+        await page.getByRole("button", { name: "Create account" }).isVisible()
+      ).toBe(true);
 
-    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");
+      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
-      .locator(".theme-scope-statusBar")
-      .getByRole("button", { name: /checking for updates/i })
-      .waitFor({ state: "hidden" });
+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"
+        })
+      );
 
-    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);
-  });
+      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" }
+  );
 });
 
 async function skipDialog(page: Page) {
-  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
-  }
+  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();
+    });
 }

apps/desktop/__tests__/global-setup.ts

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

apps/desktop/__tests__/launch.test.ts

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

apps/desktop/__tests__/test-override.ts

@@ -1,64 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { test 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,233 +18,144 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { execSync } from "child_process";
-import { cp, readFile, writeFile } from "fs/promises";
+import { mkdir } from "fs/promises";
 import { fileURLToPath } from "node:url";
-import path, { join, resolve } from "path";
+import path from "path";
 import { _electron as electron } from "playwright";
-import { existsSync } from "fs";
+import slugify from "slugify";
+import { TaskContext } from "vitest";
 
 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);
 
-export interface AppContext {
+interface AppContext {
   app: import("playwright").ElectronApplication;
   page: import("playwright").Page;
   configPath: string;
-  userDataDir: string;
-  outputDir: string;
   relaunch: () => Promise<void>;
 }
 
-export interface TestOptions {
+interface TestOptions {
   version: string;
 }
 
-export interface Fixtures {
-  options: TestOptions;
-  ctx: AppContext;
+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 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
-  );
+async function buildAndLaunchApp(options?: TestOptions): Promise<AppContext> {
+  const productName = makeid(10);
+  const executablePath = await buildApp({ ...options, productName });
+  const { app, page, configPath } = await launchApp(executablePath);
   const ctx: AppContext = {
     app,
     page,
     configPath,
-    userDataDir,
-    outputDir,
     relaunch: async () => {
-      const { app, page, configPath, userDataDir } = await launchApp(
-        executablePath,
-        productName
-      );
+      const { app, page, configPath } = await launchApp(executablePath);
       ctx.app = app;
       ctx.page = page;
-      ctx.userDataDir = userDataDir;
       ctx.configPath = configPath;
     }
   };
   return ctx;
 }
 
-async function launchApp(executablePath: string, packageName: string) {
-  const userDataDir = resolve(
-    __dirname,
-    "..",
-    "test-artifacts",
-    "user_data_dirs",
-    packageName
-  );
+async function launchApp(executablePath: string) {
   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>)),
-      CUSTOM_USER_DATA_DIR: userDataDir
-    }
+        : (process.env as Record<string, string>)
   });
 
   const page = await app.firstWindow();
 
-  const configPath = path.join(userDataDir, "UserData", "config.json");
+  const userDataDirectory = await app.evaluate((a) => {
+    return a.app.getPath("userData");
+  });
+  const configPath = path.join(userDataDirectory, "config.json");
   return {
     app,
     page,
-    configPath,
-    userDataDir
+    configPath
   };
 }
 
-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({
+async function buildApp({
   version,
-  outputDir
+  productName
 }: {
   version?: string;
-  outputDir: string;
+  productName: string;
 }) {
-  return process.platform === "win32"
-    ? await makeBuildCopyWindows(outputDir, productName, version)
-    : process.platform === "darwin"
-    ? await makeBuildCopyMacOS(outputDir, productName, version)
-    : await makeBuildCopyLinux(outputDir, productName, version);
-}
-
-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,
-    "..",
-    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 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"
   });
 
-  const packageJsonPath = join(appDir, resourcesDir, "app", "package.json");
+  const args = [
+    `--config electron-builder.config.js`,
+    `--c.extraMetadata.productName=${productName}`,
+    "--publish=never"
+  ];
+  if (version) args.push(`--c.extraMetadata.version=${version}`);
 
-  const packageJson = JSON.parse(await readFile(packageJsonPath, "utf-8"));
-  if (version) {
-    packageJson.version = version;
-    await writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2));
-  }
+  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 appDir;
+  return path.join(
+    __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
+  );
 }
 
 function makeid(length: number) {

apps/desktop/electron-builder.config.js

@@ -38,9 +38,6 @@ const linuxExecutableName = process.env.NN_PRODUCT_NAME
 const year = new Date().getFullYear();
 const isBeta = pkg.version.includes("-beta");
 
-/**
- * @type {import("app-builder-lib").Configuration}
- */
 module.exports = {
   appId: appId,
   productName: productName,
@@ -197,8 +194,7 @@ module.exports = {
   snap: {
     autoStart: false,
     confinement: "strict",
-    allowNativeWayland: true,
-    base: "core22"
+    allowNativeWayland: true
   },
   extraResources: ["app-update.yml", "./assets/**"],
   extraMetadata: {

apps/desktop/package.json

@@ -2,15 +2,13 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "3.2.3",
+  "version": "3.2.0-beta.6",
   "appAppleId": "1544027013",
   "private": true,
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
-  "sideEffects": [
-    "src/overrides.ts"
-  ],
+  "sideEffects": false,
   "exports": {
     ".": {
       "require": {
@@ -32,12 +30,12 @@
     "@notesnook/ui": "file:../../packages/ui",
     "@trpc/client": "10.45.2",
     "@trpc/server": "10.45.2",
-    "better-sqlite3-multiple-ciphers": "^11.10.0",
+    "better-sqlite3-multiple-ciphers": "11.3.0",
     "electron-trpc": "0.7.1",
     "electron-updater": "^6.6.2",
     "icojs": "^0.19.5",
     "sqlite-better-trigram": "0.0.3",
-    "sqlite3-fts5-html": "^0.0.4",
+    "sqlite3-fts5-html": "^0.0.3",
     "typed-emitter": "^2.1.0",
     "yargs": "^17.7.2",
     "zod": "3.24.3"
@@ -57,7 +55,7 @@
     "slugify": "1.6.6",
     "tree-kill": "^1.2.2",
     "undici": "^7.8.0",
-    "vitest": "^3.2.4"
+    "vitest": "2.1.8"
   },
   "optionalDependencies": {
     "dmg-license": "^1.0.11"

apps/desktop/patches/app-builder-lib+26.0.12.patch

@@ -1,13 +0,0 @@
-diff --git a/node_modules/app-builder-lib/out/targets/snap.js b/node_modules/app-builder-lib/out/targets/snap.js
-index 0b5405e..753f6c6 100644
---- a/node_modules/app-builder-lib/out/targets/snap.js
-+++ b/node_modules/app-builder-lib/out/targets/snap.js
-@@ -115,7 +115,7 @@ class SnapTarget extends core_1.Target {
-         else {
-             const archTriplet = archNameToTriplet(arch);
-             appDescriptor.environment = {
--                DISABLE_WAYLAND: options.allowNativeWayland ? "" : "1",
-+                DISABLE_WAYLAND: options.allowNativeWayland ? "0" : "1",
-                 PATH: "$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH",
-                 SNAP_DESKTOP_RUNTIME: "$SNAP/gnome-platform",
-                 LD_LIBRARY_PATH: [

apps/desktop/patches/better-sqlite3-multiple-ciphers+11.3.0.patch

@@ -1,5 +1,5 @@
 diff --git a/node_modules/better-sqlite3-multiple-ciphers/deps/defines.gypi b/node_modules/better-sqlite3-multiple-ciphers/deps/defines.gypi
-index 1a14ecd..ff938f1 100644
+index 1a14ecd..dabcce2 100644
 --- a/node_modules/better-sqlite3-multiple-ciphers/deps/defines.gypi
 +++ b/node_modules/better-sqlite3-multiple-ciphers/deps/defines.gypi
 @@ -38,5 +38,6 @@

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

@@ -33,8 +33,6 @@ export class SQLite {
   initialized = false;
   preparedStatements: Map<string, Statement<unknown[]>> = new Map();
   retryCounter: Record<string, number> = {};
-  extensionsLoaded = false;
-
   constructor() {
     console.log("new sqlite worker");
   }
@@ -48,6 +46,10 @@ export class SQLite {
     this.sqlite = require("better-sqlite3-multiple-ciphers")(
       filePath
     ).unsafeMode(true);
+    const betterTrigram = require("sqlite-better-trigram");
+    const fts5Html = require("sqlite3-fts5-html");
+    betterTrigram.load(this.sqlite);
+    fts5Html.load(this.sqlite);
   }
 
   /**
@@ -115,20 +117,6 @@ export class SQLite {
     } catch (e) {
       if (e instanceof Error) e.message += ` (query: ${sql})`;
       throw e;
-    } finally {
-      // Since SQLite 3.48.0 (SQLite3MC v2.0.2) it's not possible to load fts5
-      // extensions before database has been decrypting. This is because
-      // executing a `SELECT` now accesses the underlying databases resulting in
-      // an error. Since FTS5 extensions depend on `SELECT fts5` to load the
-      // fts5 API, we must wait decrypt the database before we can load
-      // the extensions.
-      if (!this.extensionsLoaded && (await this.isDatabaseReady())) {
-        const betterTrigram = require("sqlite-better-trigram");
-        const fts5Html = require("sqlite3-fts5-html");
-        betterTrigram.load(this.sqlite);
-        fts5Html.load(this.sqlite);
-        this.extensionsLoaded = true;
-      }
     }
   }
 
@@ -156,22 +144,4 @@ export class SQLite {
       retryDelay: 500
     });
   }
-
-  /**
-   * This just executes `SELECT 1` on the database to make sure its ready.
-   * On an encrypted database, this will fail until `PRAGMA key` has been
-   * called.
-   */
-  private async isDatabaseReady() {
-    // return this.exec(`SELECT 1;`)
-    //   .then(() => true)
-    //   .catch(() => false);
-    if (!this.sqlite) return false;
-    try {
-      this.sqlite.prepare(`SELECT 1;`).run();
-      return true;
-    } catch {
-      return false;
-    }
-  }
 }

apps/desktop/src/main.ts

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

apps/desktop/src/overrides.ts

@@ -1,35 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-import { 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,13 +21,11 @@ import { defineConfig } from "vitest/config";
 
 export default defineConfig({
   test: {
-    testTimeout: 120 * 1000,
-    hookTimeout: 120 * 1000,
+    testTimeout: process.env.CI ? 120 * 1000 : 120 * 1000,
     sequence: {
       concurrent: true,
       shuffle: true
     },
-    globalSetup: "./__tests__/global-setup.ts",
     dir: "./__tests__/",
     exclude: [
       "**/node_modules/**",

apps/mobile/.gitignore

@@ -69,7 +69,6 @@ buck-out/
 */fastlane/report.xml
 */fastlane/Preview.html
 */fastlane/screenshots
-native/vendor
 
 # Bundle artifact
 *.jsbundle

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

@@ -137,7 +137,6 @@ 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);
 
@@ -222,7 +221,6 @@ 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/attachments/actions.tsx

@@ -167,7 +167,6 @@ const Actions = ({
               setAttachments();
               eSendEvent(eDBItemUpdate, attachment.id);
             }
-            return true;
           },
           positiveText: strings.rename()
         });

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

@@ -17,20 +17,26 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { strings } from "@notesnook/intl";
 import React, { useRef, useState } from "react";
 import { View } from "react-native";
 import { db } from "../../common/database";
-import BackupService from "../../services/backup";
-import { eSendEvent, ToastManager } from "../../services/event-manager";
-import Navigation from "../../services/navigation";
+import {
+  eSendEvent,
+  presentSheet,
+  ToastManager
+} from "../../services/event-manager";
 import { useUserStore } from "../../stores/use-user-store";
-import { eOpenRecoveryKeyDialog } from "../../utils/events";
-import { DefaultAppStyles } from "../../utils/styles";
-import { Dialog } from "../dialog";
+import { eCloseSheet, eOpenRecoveryKeyDialog } from "../../utils/events";
+import DialogHeader from "../dialog/dialog-header";
 import { Button } from "../ui/button";
 import Input from "../ui/input";
 import { Notice } from "../ui/notice";
+import Seperator from "../ui/seperator";
+import { Dialog } from "../dialog";
+import BackupService from "../../services/backup";
+import { sleep } from "../../utils/time";
+import { strings } from "@notesnook/intl";
+import { DefaultAppStyles } from "../../utils/styles";
 
 export const ChangePassword = () => {
   const passwordInputRef = useRef();
@@ -79,7 +85,8 @@ export const ChangePassword = () => {
         context: "global"
       });
       setLoading(false);
-      Navigation.goBack();
+      eSendEvent(eCloseSheet);
+      await sleep(300);
       eSendEvent(eOpenRecoveryKeyDialog);
     } catch (e) {
       setLoading(false);
@@ -101,6 +108,9 @@ export const ChangePassword = () => {
       }}
     >
       <Dialog context="change-password-dialog" />
+      <DialogHeader title={strings.changePassword()} />
+      <Seperator />
+
       <Input
         fwdRef={oldPasswordInputRef}
         onChangeText={(value) => {
@@ -150,3 +160,9 @@ export const ChangePassword = () => {
     </View>
   );
 };
+
+ChangePassword.present = () => {
+  presentSheet({
+    component: <ChangePassword />
+  });
+};

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

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

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

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

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

@@ -39,7 +39,6 @@ import { hideAuth } from "./common";
 import { ForgotPassword } from "./forgot-password";
 import { useLogin } from "./use-login";
 import { DefaultAppStyles } from "../../utils/styles";
-import { Dialog } from "../dialog";
 
 const LoginSteps = {
   emailAuth: 1,
@@ -90,7 +89,7 @@ export const Login = ({ changeMode }) => {
   return (
     <>
       <ForgotPassword />
-      <Dialog context="two_factor_verify" />
+      <SheetProvider context="two_factor_verify" />
       <View
         style={{
           borderRadius: DDS.isTab ? 5 : 0,

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

@@ -24,8 +24,12 @@ import { View } from "react-native";
 import { ScrollView } from "react-native-actions-sheet";
 import { db } from "../../common/database/index";
 import useTimer from "../../hooks/use-timer";
-import { eSendEvent, ToastManager } from "../../services/event-manager";
-import { eCloseSimpleDialog } from "../../utils/events";
+import {
+  eSendEvent,
+  presentSheet,
+  ToastManager
+} from "../../services/event-manager";
+import { eCloseSheet } from "../../utils/events";
 import { AppFontSize } from "../../utils/size";
 import { Button } from "../ui/button";
 import { IconButton } from "../ui/icon-button";
@@ -34,7 +38,6 @@ import { Pressable } from "../ui/pressable";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { DefaultAppStyles } from "../../utils/styles";
-import { presentDialog } from "../dialog/functions";
 
 const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
   const { colors } = useThemeColors();
@@ -43,7 +46,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
     method: mfaInfo?.primaryMethod,
     isPrimary: true
   });
-  const { seconds, start, reset } = useTimer(currentMethod.method);
+  const { seconds, start } = useTimer(currentMethod.method);
   const [loading, setLoading] = useState(false);
   const inputRef = useRef();
   const [sending, setSending] = useState(false);
@@ -59,7 +62,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
       },
       (result) => {
         if (result) {
-          eSendEvent(eCloseSimpleDialog, "two_factor_verify");
+          eSendEvent(eCloseSheet, "two_factor_verify");
         }
         setLoading(false);
       }
@@ -130,12 +133,6 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
     <ScrollView
       keyboardShouldPersistTaps="handled"
       keyboardDismissMode="interactive"
-      style={{
-        width: "100%",
-        height: "100%",
-        backgroundColor: colors.primary.background,
-        paddingTop: 60
-      }}
     >
       <View
         style={{
@@ -239,10 +236,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
             <Button
               title={strings.cancel()}
               type="secondaryAccented"
-              onPress={() => {
-                reset();
-                onCancel();
-              }}
+              onPress={onCancel}
               width={250}
             />
 
@@ -303,7 +297,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
 };
 
 TwoFactorVerification.present = (onMfaLogin, data, onCancel, context) => {
-  presentDialog({
+  presentSheet({
     component: () => (
       <TwoFactorVerification
         onMfaLogin={onMfaLogin}
@@ -312,9 +306,7 @@ TwoFactorVerification.present = (onMfaLogin, data, onCancel, context) => {
       />
     ),
     context: context || "two_factor_verify",
-    disableClosing: true,
-    transparent: false,
-    statusBarTranslucent: true
+    disableClosing: true
   });
 };
 

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

@@ -24,7 +24,7 @@ import { clearMessage } from "../../services/message";
 import PremiumService from "../../services/premium";
 import SettingsService from "../../services/settings";
 import { useUserStore } from "../../stores/use-user-store";
-import { eCloseSimpleDialog } from "../../utils/events";
+import { eCloseSheet } from "../../utils/events";
 import TwoFactorVerification from "./two-factor";
 import { strings } from "@notesnook/intl";
 
@@ -92,7 +92,7 @@ export const useLogin = (onFinishLogin, sessionExpired = false) => {
                 } catch (e) {
                   callback && callback(false);
                   if (e.message === "invalid_grant") {
-                    eSendEvent(eCloseSimpleDialog, "two_factor_verify");
+                    eSendEvent(eCloseSheet, "two_factor_verify");
                     setLoading(false);
                     setStep(LoginSteps.emailAuth);
                   }
@@ -100,7 +100,7 @@ export const useLogin = (onFinishLogin, sessionExpired = false) => {
               },
               mfaInfo,
               () => {
-                eSendEvent(eCloseSimpleDialog, "two_factor_verify");
+                eSendEvent(eCloseSheet, "two_factor_verify");
                 setLoading(false);
                 setStep(LoginSteps.emailAuth);
               }

apps/mobile/app/components/container/floating-button.tsx

@@ -36,7 +36,6 @@ import { getElevationStyle } from "../../utils/elevation";
 import { AppFontSize, normalize } from "../../utils/size";
 import { DefaultAppStyles } from "../../utils/styles";
 import { hexToRGBA, RGB_Linear_Shade } from "../../utils/colors";
-import useKeyboard from "../../hooks/use-keyboard";
 
 interface FloatingButtonProps {
   onPress: () => void;

apps/mobile/app/components/dialog/dialog-buttons.js

@@ -26,7 +26,7 @@ import { notesnook } from "../../../e2e/test.ids";
 import { getColorLinearShade } from "../../utils/colors";
 import { AppFontSize } from "../../utils/size";
 import { DefaultAppStyles } from "../../utils/styles";
-import { Button, ButtonProps } from "../ui/button";
+import { Button } from "../ui/button";
 import Paragraph from "../ui/typography/paragraph";
 
 const DialogButtons = ({
@@ -37,14 +37,6 @@ const DialogButtons = ({
   loading,
   doneText,
   positiveType
-}: {
-  onPressPositive?: () => void;
-  onPressNegative: () => void;
-  positiveTitle: string;
-  negativeTitle?: string;
-  loading?: boolean;
-  doneText?: string;
-  positiveType?: ButtonProps["type"];
 }) => {
   const { colors, isDark } = useThemeColors();
 

apps/mobile/app/components/dialog/dialog-header.tsx

@@ -21,7 +21,7 @@ import React from "react";
 import { Text, View, ViewStyle } from "react-native";
 import { useThemeColors } from "@notesnook/theme";
 import { AppFontSize } from "../../utils/size";
-import { Button, ButtonProps } from "../ui/button";
+import { Button } from "../ui/button";
 import { PressableProps } from "../ui/pressable";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
@@ -31,7 +31,13 @@ type DialogHeaderProps = {
   icon?: string;
   title?: string;
   paragraph?: string;
-  button?: ButtonProps;
+  button?: {
+    onPress?: () => void;
+    loading?: boolean;
+    title?: string;
+    type?: PressableProps["type"];
+    icon?: string;
+  };
   paragraphColor?: string;
   padding?: number;
   centered?: boolean;
@@ -89,14 +95,17 @@ const DialogHeader = ({
 
             {button ? (
               <Button
+                onPress={button.onPress}
                 style={{
                   borderRadius: 100,
                   paddingHorizontal: DefaultAppStyles.GAP
                 }}
+                loading={button.loading}
                 fontSize={13}
+                title={button.title}
+                icon={button.icon}
                 type={button.type || "secondary"}
                 height={30}
-                {...button}
               />
             ) : null}
           </View>

apps/mobile/app/components/dialog/functions.ts

@@ -17,20 +17,15 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { KeyboardTypeOptions } from "react-native";
 import { eSendEvent } from "../../services/event-manager";
 import { eCloseSimpleDialog, eOpenSimpleDialog } from "../../utils/events";
-import { ButtonProps } from "../ui/button";
 
-export type DialogInfo = {
+type DialogInfo = {
   title?: string;
   paragraph?: string;
-  positiveText: string;
-  negativeText: string;
-  background?: string;
-  transparent?: boolean;
-  statusBarTranslucent?: boolean;
-  positivePress?: (...args: any[]) => Promise<any>;
+  positiveText?: string;
+  negativeText?: string;
+  positivePress?: (...args: any[]) => void;
   onClose?: () => void;
   positiveType?:
     | "transparent"
@@ -49,18 +44,16 @@ export type DialogInfo = {
   // eslint-disable-next-line @typescript-eslint/ban-types
   context: "global" | "local" | (string & {});
   secureTextEntry?: boolean;
-  keyboardType?: KeyboardTypeOptions;
+  keyboardType?: string;
   check?: {
     info: string;
-    type?: ButtonProps["type"];
+    type?: string;
     defaultValue?: boolean;
   };
   notice: {
     text: string;
     type: "alert" | "information";
   };
-  disableBackdropClosing: boolean;
-  component: JSX.Element | ((close?: () => void) => JSX.Element);
 };
 
 export function presentDialog(data: Partial<DialogInfo>): void {

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

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React, { useCallback, useEffect, useRef, useState } from "react";
-import { TextInput, View, ViewStyle } from "react-native";
+import { View } from "react-native";
 import { DDS } from "../../services/device-detection";
 import {
   eSubscribeEvent,
@@ -40,26 +40,42 @@ import Seperator from "../ui/seperator";
 import BaseDialog from "./base-dialog";
 import DialogButtons from "./dialog-buttons";
 import DialogHeader from "./dialog-header";
-import { DialogInfo } from "./functions";
 
-export const Dialog = ({ context = "global" }: { context?: string }) => {
+export const Dialog = ({ context = "global" }) => {
   const { colors } = useThemeColors();
-  const [visible, setVisible] = useState<boolean>();
-  const [checked, setChecked] = useState<boolean>();
-  const [loading, setLoading] = useState<boolean>();
-  const values = useRef<{
-    inputValue?: string;
-  }>({
+  const [visible, setVisible] = useState(false);
+  const [checked, setChecked] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const values = useRef({
     inputValue: undefined
   });
-  const inputRef = useRef<TextInput>(null);
-  const [dialogInfo, setDialogInfo] = useState<DialogInfo>();
+  const inputRef = useRef();
+  const [dialogInfo, setDialogInfo] = useState({
+    title: "",
+    paragraph: "",
+    positiveText: strings.done(),
+    negativeText: strings.cancel(),
+    positivePress: () => {},
+    onClose: () => {},
+    positiveType: "transparent",
+    icon: null,
+    paragraphColor: colors.primary.paragraph,
+    input: false,
+    inputPlaceholder: "Enter some text",
+    defaultValue: "",
+    disableBackdropClosing: false,
+    check: {
+      info: "Check",
+      type: "transparent",
+      defaultValue: false
+    }
+  });
 
   const onPressPositive = async () => {
-    if (dialogInfo?.positivePress) {
+    if (dialogInfo.positivePress) {
       inputRef.current?.blur();
       setLoading(true);
-      let result = false;
+      let result;
       try {
         result = await dialogInfo.positivePress(
           values.current.inputValue || dialogInfo.defaultValue,
@@ -81,7 +97,7 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
   };
 
   const show = useCallback(
-    (data: DialogInfo) => {
+    (data) => {
       if (!data.context) data.context = "global";
       if (data.context !== context) return;
       setDialogInfo(data);
@@ -92,14 +108,6 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
     [context]
   );
 
-  const hide = React.useCallback(() => {
-    setChecked(false);
-    values.current.inputValue = undefined;
-    setVisible(false);
-    setDialogInfo(undefined);
-    dialogInfo?.onClose?.();
-  }, [dialogInfo]);
-
   useEffect(() => {
     eSubscribeEvent(eOpenSimpleDialog, show);
     eSubscribeEvent(eCloseSimpleDialog, hide);
@@ -110,14 +118,21 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
     };
   }, [hide, show]);
 
+  const hide = React.useCallback(() => {
+    setChecked(false);
+    values.current.inputValue = undefined;
+    setVisible(false);
+    dialogInfo.onClose?.();
+  }, [dialogInfo]);
+
   const onNegativePress = async () => {
-    if (dialogInfo?.onClose) {
+    if (dialogInfo.onClose) {
       await dialogInfo.onClose();
     }
     hide();
   };
 
-  const style: ViewStyle = {
+  const style = {
     ...getElevationStyle(5),
     width: DDS.isTab ? 400 : "85%",
     maxHeight: 450,
@@ -128,19 +143,11 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
     overflow: "hidden"
   };
 
-  return visible && dialogInfo ? (
+  return visible ? (
     <BaseDialog
-      statusBarTranslucent={
-        dialogInfo.statusBarTranslucent === undefined
-          ? false
-          : dialogInfo.statusBarTranslucent
-      }
+      statusBarTranslucent={false}
       bounce={!dialogInfo.input}
       closeOnTouch={!dialogInfo.disableBackdropClosing}
-      background={dialogInfo.background}
-      transparent={
-        dialogInfo.transparent === undefined ? true : dialogInfo.transparent
-      }
       onShow={async () => {
         if (dialogInfo.input) {
           inputRef.current?.setNativeProps({
@@ -153,99 +160,89 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
       visible={true}
       onRequestClose={hide}
     >
-      {typeof dialogInfo.component === "function"
-        ? dialogInfo.component(() => hide())
-        : dialogInfo.component}
+      <View style={style}>
+        <DialogHeader
+          title={dialogInfo.title}
+          icon={dialogInfo.icon}
+          paragraph={dialogInfo.paragraph}
+          paragraphColor={dialogInfo.paragraphColor}
+          padding={12}
+          style={{
+            minHeight: 0
+          }}
+        />
+        <Seperator half />
 
-      {dialogInfo.component ? null : (
-        <View style={style}>
-          <DialogHeader
-            title={dialogInfo.title}
-            icon={dialogInfo.icon}
-            paragraph={dialogInfo.paragraph}
-            paragraphColor={dialogInfo.paragraphColor}
-            padding={12}
+        {dialogInfo.input ? (
+          <View
             style={{
-              minHeight: 0
+              paddingHorizontal: DefaultAppStyles.GAP
             }}
-          />
-          <Seperator half />
-
-          {dialogInfo.input ? (
-            <View
-              style={{
-                paddingHorizontal: DefaultAppStyles.GAP
+          >
+            <Input
+              fwdRef={inputRef}
+              autoCapitalize="none"
+              onChangeText={(value) => {
+                values.current.inputValue = value;
               }}
-            >
-              <Input
-                fwdRef={inputRef}
-                autoCapitalize="none"
-                onChangeText={(value) => {
-                  values.current.inputValue = value;
-                }}
-                testID="input-value"
-                secureTextEntry={dialogInfo.secureTextEntry}
-                //defaultValue={dialogInfo.defaultValue}
-                onSubmit={() => {
-                  onPressPositive();
-                }}
-                returnKeyLabel="Done"
-                returnKeyType="done"
-                keyboardType={dialogInfo.keyboardType || "default"}
-                placeholder={dialogInfo.inputPlaceholder}
-              />
-            </View>
-          ) : null}
+              testID="input-value"
+              secureTextEntry={dialogInfo.secureTextEntry}
+              //defaultValue={dialogInfo.defaultValue}
+              onSubmit={onPressPositive}
+              returnKeyLabel="Done"
+              returnKeyType="done"
+              keyboardType={dialogInfo.keyboardType || "default"}
+              placeholder={dialogInfo.inputPlaceholder}
+            />
+          </View>
+        ) : null}
 
-          {dialogInfo?.notice ? (
-            <View
-              style={{
-                paddingHorizontal: DefaultAppStyles.GAP
+        {dialogInfo?.notice ? (
+          <View
+            style={{
+              paddingHorizontal: DefaultAppStyles.GAP
+            }}
+          >
+            <Notice
+              type={dialogInfo.notice.type || "information"}
+              text={dialogInfo.notice.text}
+            />
+          </View>
+        ) : null}
+
+        {dialogInfo.check ? (
+          <>
+            <Button
+              onPress={() => {
+                setChecked(!checked);
               }}
-            >
-              <Notice
-                type={dialogInfo.notice.type || "information"}
-                text={dialogInfo.notice.text}
-              />
-            </View>
-          ) : null}
+              icon={
+                checked
+                  ? "check-circle-outline"
+                  : "checkbox-blank-circle-outline"
+              }
+              iconColor={checked ? colors.secondary.icon : colors.primary.icon}
+              style={{
+                justifyContent: "flex-start"
+              }}
+              height={35}
+              iconSize={20}
+              width="100%"
+              title={dialogInfo.check.info}
+              type={checked ? dialogInfo.check.type || "plain" : "plain"}
+            />
+          </>
+        ) : null}
 
-          {dialogInfo.check ? (
-            <>
-              <Button
-                onPress={() => {
-                  setChecked(!checked);
-                }}
-                icon={
-                  checked
-                    ? "check-circle-outline"
-                    : "checkbox-blank-circle-outline"
-                }
-                iconColor={
-                  checked ? colors.secondary.icon : colors.primary.icon
-                }
-                style={{
-                  justifyContent: "flex-start"
-                }}
-                height={35}
-                iconSize={20}
-                width="100%"
-                title={dialogInfo.check.info}
-                type={checked ? dialogInfo.check.type || "plain" : "plain"}
-              />
-            </>
-          ) : null}
-
-          <DialogButtons
-            onPressNegative={onNegativePress}
-            onPressPositive={dialogInfo.positivePress && onPressPositive}
-            loading={loading}
-            positiveTitle={dialogInfo.positiveText}
-            negativeTitle={dialogInfo.negativeText}
-            positiveType={dialogInfo.positiveType}
-          />
-        </View>
-      )}
+        <DialogButtons
+          onPressNegative={onNegativePress}
+          onPressPositive={dialogInfo.positivePress && onPressPositive}
+          loading={loading}
+          positiveTitle={dialogInfo.positiveText}
+          negativeTitle={dialogInfo.negativeText}
+          positiveType={dialogInfo.positiveType}
+        />
+      </View>
       <Toast context="local" />
     </BaseDialog>
   ) : null;

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

@@ -17,15 +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 { strings } from "@notesnook/intl";
-import { useThemeColors } from "@notesnook/theme";
 import React, { useCallback, useEffect, useRef, useState } from "react";
 import { Dimensions, TextInput, View } from "react-native";
 import Orientation from "react-native-orientation-locker";
 import Pdf from "react-native-pdf";
-import { MMKV } from "../../../common/database/mmkv";
+import Animated, { FadeIn, FadeOut } from "react-native-reanimated";
 import downloadAttachment from "../../../common/filesystem/download-attachment";
-import { deleteCacheFileByPath, exists } from "../../../common/filesystem/io";
 import { cacheDir } from "../../../common/filesystem/utils";
 import { useAttachmentProgress } from "../../../hooks/use-attachment-progress";
 import useGlobalSafeAreaInsets from "../../../hooks/use-global-safe-area-insets";
@@ -33,9 +30,8 @@ import {
   eSubscribeEvent,
   eUnSubscribeEvent
 } from "../../../services/event-manager";
+import { useThemeColors } from "@notesnook/theme";
 import { AppFontSize } from "../../../utils/size";
-import { DefaultAppStyles } from "../../../utils/styles";
-import { sleep } from "../../../utils/time";
 import { Dialog } from "../../dialog";
 import BaseDialog from "../../dialog/base-dialog";
 import { presentDialog } from "../../dialog/functions";
@@ -43,6 +39,11 @@ import SheetProvider from "../../sheet-provider";
 import { IconButton } from "../../ui/icon-button";
 import { ProgressBarComponent } from "../../ui/svg/lazy";
 import Paragraph from "../../ui/typography/paragraph";
+import { sleep } from "../../../utils/time";
+import { MMKV } from "../../../common/database/mmkv";
+import { deleteCacheFileByPath } from "../../../common/filesystem/io";
+import { strings } from "@notesnook/intl";
+import { DefaultAppStyles } from "../../../utils/styles";
 
 const WIN_WIDTH = Dimensions.get("window").width;
 const WIN_HEIGHT = Dimensions.get("window").height;
@@ -104,19 +105,15 @@ const PDFPreview = () => {
   const open = useCallback(
     async (attachment) => {
       setVisible(true);
+      setLoading(true);
       setTimeout(async () => {
         setAttachment(attachment);
         let hash = attachment.hash;
         if (!hash) return;
-        if (!(await exists(hash))) setLoading(true);
         const uri = await downloadAttachment(hash, false, {
           silent: true,
           cache: true
         });
-        if (!(await exists(hash))) {
-          setVisible(false);
-          return;
-        }
         const path = `${cacheDir}/${uri}`;
         snapshotValue.current = snapshot.current;
         setPDFSource("file://" + path);
@@ -169,7 +166,8 @@ const PDFPreview = () => {
           }}
         >
           {loading ? (
-            <View
+            <Animated.View
+              exiting={FadeOut}
               style={{
                 flex: 1,
                 justifyContent: "center",
@@ -190,7 +188,7 @@ const PDFPreview = () => {
               >
                 {strings.loadingWithProgress(progress?.percent)}
               </Paragraph>
-            </View>
+            </Animated.View>
           ) : (
             <>
               <View
@@ -272,42 +270,49 @@ const PDFPreview = () => {
                 </View>
               </View>
               {pdfSource ? (
-                <Pdf
-                  source={{
-                    uri: pdfSource
-                  }}
-                  ref={pdfRef}
-                  onLoadComplete={(numberOfPages) => {
-                    setNumPages(numberOfPages);
-                  }}
-                  onPageChanged={(page) => {
-                    setCurrentPage(page);
-                    inputRef.current?.setNativeProps({
-                      text: page + ""
-                    });
-                    saveSnapshot({
-                      currentPage: page,
-                      scale: snapshot?.current?.scale
-                    });
-                  }}
-                  // scale={snapshotValue.current?.scale}
-                  // onScaleChanged={(scale) => {
-                  //   saveSnapshot({
-                  //     currentPage: snapshot?.current?.currentPage,
-                  //     scale: scale
-                  //   });
-                  // }}
-                  page={snapshotValue?.current?.currentPage}
-                  password={password}
-                  maxScale={6}
-                  onError={onError}
-                  onPressLink={(uri) => {}}
+                <Animated.View
                   style={{
-                    flex: 1,
-                    width: width,
-                    height: Dimensions.get("window").height
+                    flex: 1
                   }}
-                />
+                  entering={FadeIn}
+                >
+                  <Pdf
+                    source={{
+                      uri: pdfSource
+                    }}
+                    ref={pdfRef}
+                    onLoadComplete={(numberOfPages) => {
+                      setNumPages(numberOfPages);
+                    }}
+                    onPageChanged={(page) => {
+                      setCurrentPage(page);
+                      inputRef.current?.setNativeProps({
+                        text: page + ""
+                      });
+                      saveSnapshot({
+                        currentPage: page,
+                        scale: snapshot?.current?.scale
+                      });
+                    }}
+                    // scale={snapshotValue.current?.scale}
+                    // onScaleChanged={(scale) => {
+                    //   saveSnapshot({
+                    //     currentPage: snapshot?.current?.currentPage,
+                    //     scale: scale
+                    //   });
+                    // }}
+                    page={snapshotValue?.current?.currentPage}
+                    password={password}
+                    maxScale={6}
+                    onError={onError}
+                    onPressLink={(uri) => {}}
+                    style={{
+                      flex: 1,
+                      width: width,
+                      height: Dimensions.get("window").height
+                    }}
+                  />
+                </Animated.View>
               ) : null}
             </>
           )}

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

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

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

@@ -97,6 +97,7 @@ export const Header = ({
         style={{
           flexDirection: "row",
           justifyContent: "space-between",
+          marginTop: DefaultAppStyles.GAP_SMALL,
           borderRadius: 10,
           paddingVertical: 3,
           borderWidth: hasSearch ? 1 : 0,

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

@@ -17,26 +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 { Reminder } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React from "react";
 import { View } from "react-native";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { notesnook } from "../../../../e2e/test.ids";
-import useIsSelected from "../../../hooks/use-selected";
-import AddReminder from "../../../screens/add-reminder";
-import { eSendEvent } from "../../../services/event-manager";
-import { useSelectionStore } from "../../../stores/use-selection-store";
-import { eCloseSheet } from "../../../utils/events";
-import { AppFontSize, defaultBorderRadius } from "../../../utils/size";
-import { DefaultAppStyles } from "../../../utils/styles";
+import { defaultBorderRadius, AppFontSize } from "../../../utils/size";
 import { Properties } from "../../properties";
-import AppIcon from "../../ui/AppIcon";
+import ReminderSheet from "../../sheets/reminder";
 import { IconButton } from "../../ui/icon-button";
 import { ReminderTime } from "../../ui/reminder-time";
 import Heading from "../../ui/typography/heading";
 import Paragraph from "../../ui/typography/paragraph";
 import SelectionWrapper, { selectItem } from "../selection-wrapper";
+import { strings } from "@notesnook/intl";
+import { useSelectionStore } from "../../../stores/use-selection-store";
+import useIsSelected from "../../../hooks/use-selected";
+import AppIcon from "../../ui/AppIcon";
+import { DefaultAppStyles } from "../../../utils/styles";
 
 const ReminderItem = React.memo(
   ({
@@ -51,10 +49,8 @@ const ReminderItem = React.memo(
     const { colors } = useThemeColors();
     const openReminder = () => {
       if (selectItem(item)) return;
-      AddReminder.present(item, undefined);
-      if (isSheet) {
-        eSendEvent(eCloseSheet);
-      }
+
+      ReminderSheet.present(item, undefined, isSheet);
     };
     const selectionMode = useSelectionStore((state) => state.selectionMode);
     const [selected] = useIsSelected(item);

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

@@ -105,8 +105,8 @@ export const SearchResult = (props: SearchResultProps) => {
               flexShrink: 1
             }}
           >
-            {props.item.title.map((title, index) => (
-              <React.Fragment key={props.item.id + index + "-srt"}>
+            {props.item.title.map((title) => (
+              <>
                 {title.prefix}
                 <Heading
                   size={AppFontSize.sm}
@@ -118,7 +118,7 @@ export const SearchResult = (props: SearchResultProps) => {
                   {title.match}
                 </Heading>
                 {title.suffix}
-              </React.Fragment>
+              </>
             ))}
           </Heading>
         </View>
@@ -158,8 +158,8 @@ export const SearchResult = (props: SearchResultProps) => {
             }}
           >
             <Paragraph>
-              {content.map((match, index) => (
-                <React.Fragment key={props.item.id + index + "src"}>
+              {content.map((match) => (
+                <>
                   {match.prefix}
                   <Paragraph
                     size={AppFontSize.sm}
@@ -171,7 +171,7 @@ export const SearchResult = (props: SearchResultProps) => {
                     {match.match}
                   </Paragraph>
                   {match.suffix}
-                </React.Fragment>
+                </>
               ))}
             </Paragraph>
           </Pressable>

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

@@ -73,6 +73,9 @@ 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/items.tsx

@@ -67,7 +67,6 @@ const COLUMN_BAR_ITEMS: ActionId[] = [
   "move-notebook",
   "pin",
   "default-notebook",
-  "default-tag",
   "default-homepage",
   "add-shortcut",
   "reorder",

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

@@ -24,11 +24,11 @@ import { TaggedNotes } from "../../screens/notes/tagged";
 import { useThemeColors } from "@notesnook/theme";
 import { AppFontSize } from "../../utils/size";
 import { sleep } from "../../utils/time";
+import ManageTagsSheet from "../sheets/manage-tags";
 import { Button } from "../ui/button";
 import { ColorTags } from "./color-tags";
 import { strings } from "@notesnook/intl";
 import { DefaultAppStyles } from "../../utils/styles";
-import ManageTags from "../../screens/manage-tags";
 
 export const Tags = ({ item, close }) => {
   const { colors } = useThemeColors();
@@ -47,8 +47,7 @@ export const Tags = ({ item, close }) => {
     >
       <Button
         onPress={async () => {
-          ManageTags.present([item.id]);
-          close();
+          ManageTagsSheet.present([item.id]);
         }}
         buttonType={{
           text: colors.primary.accent

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

@@ -42,11 +42,10 @@ import { DefaultAppStyles } from "../../utils/styles";
 import { sleep } from "../../utils/time";
 import { presentDialog } from "../dialog/functions";
 import ExportNotesSheet from "../sheets/export-notes";
-
+import ManageTagsSheet from "../sheets/manage-tags";
 import { MoveNotebook } from "../../screens/move-notebook";
 import { IconButton } from "../ui/icon-button";
 import NativeTooltip from "../../utils/tooltip";
-import ManageTags from "../../screens/manage-tags";
 
 export const SelectionHeader = React.memo(
   ({
@@ -197,10 +196,20 @@ 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 () => {
-                        ManageTags.present(selectedItemsList);
+                        ManageTagsSheet.present(selectedItemsList);
                       },
                       visible: type === "note",
                       icon: "pound"

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

@@ -24,22 +24,23 @@ import { TextInput, View } from "react-native";
 import { notesnook } from "../../../../e2e/test.ids";
 import { db } from "../../../common/database";
 import { DDS } from "../../../services/device-detection";
-import { ToastManager, eSendEvent } from "../../../services/event-manager";
+import {
+  ToastManager,
+  eSendEvent,
+  presentSheet
+} from "../../../services/event-manager";
 import Navigation from "../../../services/navigation";
 import { useMenuStore } from "../../../stores/use-menu-store";
 import { useNotebookStore } from "../../../stores/use-notebook-store";
 import { useRelationStore } from "../../../stores/use-relation-store";
 import { eOnNotebookUpdated } from "../../../utils/events";
 import { getParentNotebookId } from "../../../utils/notebooks";
+import { AppFontSize } from "../../../utils/size";
+import { Button } from "../../ui/button";
 import Input from "../../ui/input";
-import { useSettingStore } from "../../../stores/use-setting-store";
-import DialogHeader from "../../dialog/dialog-header";
-import DialogButtons from "../../dialog/dialog-buttons";
-import { presentDialog } from "../../dialog/functions";
-import { getElevationStyle } from "../../../utils/elevation";
-import { defaultBorderRadius } from "../../../utils/size";
-import { useThemeColors } from "@notesnook/theme";
-import { getContainerBorder } from "../../../utils/colors";
+import Seperator from "../../ui/seperator";
+import Heading from "../../ui/typography/heading";
+import { DefaultAppStyles } from "../../../utils/styles";
 
 export const AddNotebookSheet = ({
   notebook,
@@ -54,7 +55,6 @@ export const AddNotebookSheet = ({
   showMoveNotesOnComplete: boolean;
   defaultTitle?: string;
 }) => {
-  const { colors } = useThemeColors();
   const title = useRef(notebook?.title || defaultTitle);
   const description = useRef(notebook?.description);
   const titleInput = useRef<TextInput>(null);
@@ -124,66 +124,57 @@ export const AddNotebookSheet = ({
   return (
     <View
       style={{
-        ...getElevationStyle(5),
-        width: DDS.isTab ? 400 : "85%",
-        maxHeight: 450,
-        borderRadius: defaultBorderRadius,
-        backgroundColor: colors.primary.background,
-        paddingTop: 12,
-        ...getContainerBorder(colors.primary.border, 0.5),
-        overflow: "hidden"
+        maxHeight: DDS.isTab ? "90%" : "97%",
+        borderRadius: DDS.isTab ? 5 : 0,
+        paddingHorizontal: DefaultAppStyles.GAP
       }}
     >
-      <View
+      <Heading size={AppFontSize.lg}>
+        {notebook ? strings.editNotebook() : strings.newNotebook()}
+      </Heading>
+
+      <Seperator />
+
+      <Input
+        fwdRef={titleInput}
+        testID={notesnook.ids.dialogs.notebook.inputs.title}
+        onChangeText={(value) => {
+          title.current = value;
+        }}
+        onLayout={() => {
+          setImmediate(() => {
+            titleInput?.current?.focus();
+          });
+        }}
+        placeholder={strings.enterNotebookTitle()}
+        onSubmit={() => {
+          descriptionInput.current?.focus();
+        }}
+        returnKeyLabel="Next"
+        returnKeyType="next"
+        defaultValue={notebook ? notebook.title : title.current}
+      />
+
+      <Input
+        fwdRef={descriptionInput}
+        testID={notesnook.ids.dialogs.notebook.inputs.description}
+        onChangeText={(value) => {
+          description.current = value;
+        }}
+        placeholder={strings.enterNotebookDescription()}
+        returnKeyLabel={strings.next()}
+        returnKeyType="next"
+        defaultValue={notebook ? notebook.description : ""}
+      />
+
+      <Button
+        title={notebook ? strings.save() : strings.add()}
+        type="accent"
         style={{
-          paddingHorizontal: 12
+          paddingHorizontal: DefaultAppStyles.GAP * 2,
+          width: "100%"
         }}
-      >
-        <DialogHeader
-          title={notebook ? strings.editNotebook() : strings.newNotebook()}
-        />
-
-        <Input
-          fwdRef={titleInput}
-          testID={notesnook.ids.dialogs.notebook.inputs.title}
-          onChangeText={(value) => {
-            title.current = value;
-          }}
-          onLayout={() => {
-            setTimeout(() => {
-              titleInput?.current?.focus();
-            }, 300);
-          }}
-          placeholder={strings.enterNotebookTitle()}
-          onSubmit={() => {
-            descriptionInput.current?.focus();
-          }}
-          returnKeyLabel="Next"
-          returnKeyType="next"
-          defaultValue={notebook ? notebook.title : title.current}
-        />
-
-        <Input
-          fwdRef={descriptionInput}
-          testID={notesnook.ids.dialogs.notebook.inputs.description}
-          onChangeText={(value) => {
-            description.current = value;
-          }}
-          placeholder={strings.enterNotebookDescription()}
-          returnKeyLabel={strings.next()}
-          returnKeyType="next"
-          defaultValue={notebook ? notebook.description : ""}
-        />
-      </View>
-      <DialogButtons
-        onPressNegative={() => {
-          title.current = undefined;
-          close?.(false);
-          useSettingStore.getState().setSheetKeyboardHandler(true);
-        }}
-        positiveTitle={notebook ? strings.save() : strings.add()}
-        negativeTitle={strings.cancel()}
-        onPressPositive={onSaveChanges}
+        onPress={onSaveChanges}
       />
     </View>
   );
@@ -197,9 +188,9 @@ AddNotebookSheet.present = (
   showMoveNotesOnComplete = true,
   defaultTitle?: string
 ) => {
-  presentDialog({
+  presentSheet({
     context: context,
-    component: (close) => (
+    component: (ref, close) => (
       <AddNotebookSheet
         notebook={notebook}
         parentNotebook={parentNotebook}

apps/mobile/app/components/sheets/change-email/index.tsx

@@ -16,22 +16,35 @@ 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 React, { useRef, useState } from "react";
+import React, { RefObject, useRef, useState } from "react";
 import { TextInput, View } from "react-native";
+import { ActionSheetRef } from "react-native-actions-sheet";
 import { db } from "../../../common/database";
-import { eSendEvent, ToastManager } from "../../../services/event-manager";
+import {
+  eSendEvent,
+  presentSheet,
+  PresentSheetOptions,
+  ToastManager
+} from "../../../services/event-manager";
+import DialogHeader from "../../dialog/dialog-header";
+import { Button } from "../../ui/button";
+import Input from "../../ui/input";
 import { eUserLoggedIn } from "../../../utils/events";
 import { strings } from "@notesnook/intl";
 import { DefaultAppStyles } from "../../../utils/styles";
-import Input from "../../../components/ui/input";
-import { Button } from "../../../components/ui/button";
+
+type ChangeEmailProps = {
+  actionSheetRef: RefObject<ActionSheetRef>;
+  close?: () => void;
+  update?: (options: PresentSheetOptions) => void;
+};
 
 enum EmailChangeSteps {
   verify,
   changeEmail
 }
 
-export const ChangeEmail = () => {
+export const ChangeEmail = ({ close }: ChangeEmailProps) => {
   const [step, setStep] = useState(EmailChangeSteps.verify);
   const emailChangeData = useRef<{
     email?: string;
@@ -90,6 +103,10 @@ export const ChangeEmail = () => {
 
   return (
     <View style={{ paddingHorizontal: DefaultAppStyles.GAP }}>
+      <DialogHeader
+        title={strings.changeEmail()}
+        paragraph={strings.changeEmailDesc()}
+      />
       <View
         style={{
           marginTop: DefaultAppStyles.GAP_VERTICAL
@@ -139,12 +156,23 @@ export const ChangeEmail = () => {
             : strings.changeEmail()
         }
         type="accent"
-        style={{
-          width: "100%"
-        }}
+        width={250}
         loading={loading}
         onPress={onSubmit}
+        style={{
+          borderRadius: 100,
+          height: 45,
+          marginTop: 2
+        }}
       />
     </View>
   );
 };
+
+ChangeEmail.present = () => {
+  presentSheet({
+    component: (ref, close, update) => (
+      <ChangeEmail actionSheetRef={ref} close={close} update={update} />
+    )
+  });
+};

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

@@ -310,7 +310,6 @@ const ExportNotesSheet = ({
                         ToastManager.error(e as Error);
                       });
                     } else {
-                      await sleep(500);
                       FileViewer.open(result?.filePath, {
                         showOpenWithDialog: true,
                         showAppsSuggestions: true
@@ -339,7 +338,6 @@ 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/manage-tags/index.tsx

@@ -29,30 +29,27 @@ import React, {
   useRef,
   useState
 } from "react";
-import { SafeAreaView } from "react-native-safe-area-context";
 import { TextInput, View, useWindowDimensions } from "react-native";
 import { ActionSheetRef } from "react-native-actions-sheet";
 import { FlashList } from "react-native-actions-sheet/dist/src/views/FlashList";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
-import { db } from "../../common/database";
-import { useDBItem } from "../../hooks/use-db-item";
-import { ToastManager } from "../../services/event-manager";
-import Navigation, { NavigationProps } from "../../services/navigation";
+import { db } from "../../../common/database";
+import { useDBItem } from "../../../hooks/use-db-item";
+import { ToastManager, presentSheet } from "../../../services/event-manager";
+import Navigation from "../../../services/navigation";
 import {
   ItemSelection,
   createItemSelectionStore
-} from "../../stores/item-selection-store";
-import { useRelationStore } from "../../stores/use-relation-store";
-import { useTagStore } from "../../stores/use-tag-store";
-import { defaultBorderRadius, AppFontSize } from "../../utils/size";
-import Input from "../../components/ui/input";
-import { Pressable } from "../../components/ui/pressable";
-import Heading from "../../components/ui/typography/heading";
-import Paragraph from "../../components/ui/typography/paragraph";
+} from "../../../stores/item-selection-store";
+import { useRelationStore } from "../../../stores/use-relation-store";
+import { useTagStore } from "../../../stores/use-tag-store";
+import { defaultBorderRadius, AppFontSize } from "../../../utils/size";
+import Input from "../../ui/input";
+import { Pressable } from "../../ui/pressable";
+import Heading from "../../ui/typography/heading";
+import Paragraph from "../../ui/typography/paragraph";
 import { strings } from "@notesnook/intl";
-import { DefaultAppStyles } from "../../utils/styles";
-import { Header } from "../../components/header";
-import { useNavigationFocus } from "../../hooks/use-navigation-focus";
+import { DefaultAppStyles } from "../../../utils/styles";
 
 async function updateInitialSelectionState(items: string[]) {
   const relations = await db.relations
@@ -88,14 +85,16 @@ async function updateInitialSelectionState(items: string[]) {
 
 const useTagItemSelection = createItemSelectionStore(true);
 
-const ManageTags = (props: NavigationProps<"ManageTags">) => {
+const ManageTagsSheet = (props: {
+  ids?: string[];
+  actionSheetRef: RefObject<ActionSheetRef>;
+}) => {
   const { colors } = useThemeColors();
-  const ids = props.route.params.ids || [];
+  const ids = useMemo(() => props.ids || [], [props.ids]);
   const [tags, setTags] = useState<VirtualizedGrouping<Tag>>();
   const [query, setQuery] = useState<string>();
   const inputRef = useRef<TextInput>(null);
   const [focus, setFocus] = useState(false);
-  useNavigationFocus(props.navigation, { focusOnInit: true });
   const [queryExists, setQueryExists] = useState(false);
   const dimensions = useWindowDimensions();
   const refreshSelection = useCallback(() => {
@@ -240,117 +239,112 @@ const ManageTags = (props: NavigationProps<"ManageTags">) => {
   );
 
   return (
-    <SafeAreaView
+    <View
       style={{
         width: "100%",
         alignSelf: "center",
-        backgroundColor: colors.primary.background,
-        gap: DefaultAppStyles.GAP_VERTICAL
+        paddingHorizontal: DefaultAppStyles.GAP,
+        maxHeight: dimensions.height * 0.85
       }}
     >
-      <Header title={strings.manageTags()} canGoBack />
+      <Input
+        button={{
+          icon: "magnify",
+          color: colors.primary.accent,
+          size: AppFontSize.lg,
+          onPress: () => {}
+        }}
+        testID="tag-input"
+        fwdRef={inputRef}
+        autoCapitalize="none"
+        onChangeText={(v) => {
+          setQuery(sanitizeTag(v));
+          checkQueryExists(sanitizeTag(v));
+        }}
+        onFocusInput={() => {
+          setFocus(true);
+        }}
+        onBlurInput={() => {
+          setFocus(false);
+        }}
+        onSubmit={() => {
+          onSubmit();
+        }}
+        placeholder={strings.searchForTags()}
+      />
+
+      {query && !queryExists ? (
+        <Pressable
+          key={"query_item"}
+          style={{
+            flexDirection: "row",
+            marginVertical: 5,
+            justifyContent: "space-between",
+            padding: DefaultAppStyles.GAP
+          }}
+          onPress={onSubmit}
+          type="selected"
+        >
+          <Heading size={AppFontSize.sm} color={colors.selected.heading}>
+            {strings.add()} {'"' + "#" + query + '"'}
+          </Heading>
+          <Icon
+            name="plus"
+            color={colors.selected.icon}
+            size={AppFontSize.lg}
+          />
+        </Pressable>
+      ) : null}
+
       <View
         style={{
-          paddingHorizontal: DefaultAppStyles.GAP
+          width: "100%",
+          flexGrow: 1,
+          height: "100%"
         }}
       >
-        <Input
-          button={{
-            icon: "magnify",
-            color: colors.primary.accent,
-            size: AppFontSize.lg,
-            onPress: () => {}
-          }}
-          testID="tag-input"
-          fwdRef={inputRef}
-          autoCapitalize="none"
-          onChangeText={(v) => {
-            setQuery(sanitizeTag(v));
-            checkQueryExists(sanitizeTag(v));
-          }}
-          onFocusInput={() => {
-            setFocus(true);
-          }}
-          onBlurInput={() => {
-            setFocus(false);
-          }}
-          onSubmit={() => {
-            onSubmit();
-          }}
-          placeholder={strings.searchForTags()}
-        />
-
-        {query && !queryExists ? (
-          <Pressable
-            key={"query_item"}
-            style={{
-              flexDirection: "row",
-              justifyContent: "space-between",
-              paddingHorizontal: DefaultAppStyles.GAP,
-              paddingVertical: DefaultAppStyles.GAP_VERTICAL
-            }}
-            onPress={onSubmit}
-            type="selected"
-          >
-            <Heading size={AppFontSize.sm} color={colors.selected.heading}>
-              {strings.add()} {'"' + "#" + query + '"'}
-            </Heading>
-            <Icon
-              name="plus"
-              color={colors.selected.icon}
-              size={AppFontSize.lg}
-            />
-          </Pressable>
-        ) : null}
-
-        <View
-          style={{
-            width: "100%",
-            flexGrow: 1,
-            height: "100%"
-          }}
-        >
-          <FlashList
-            data={tags?.placeholders}
-            keyboardShouldPersistTaps
-            keyboardDismissMode="interactive"
-            estimatedItemSize={50}
-            renderItem={renderTag}
-            ListEmptyComponent={
-              <View
-                style={{
-                  width: "100%",
-                  height: 200,
-                  justifyContent: "center",
-                  alignItems: "center"
-                }}
+        <FlashList
+          data={tags?.placeholders}
+          keyboardShouldPersistTaps
+          keyboardDismissMode="interactive"
+          estimatedItemSize={50}
+          renderItem={renderTag}
+          ListEmptyComponent={
+            <View
+              style={{
+                width: "100%",
+                height: 200,
+                justifyContent: "center",
+                alignItems: "center"
+              }}
+            >
+              <Heading size={50} color={colors.secondary.heading}>
+                #
+              </Heading>
+              <Paragraph
+                textBreakStrategy="balanced"
+                color={colors.secondary.paragraph}
               >
-                <Heading size={50} color={colors.secondary.heading}>
-                  #
-                </Heading>
-                <Paragraph
-                  textBreakStrategy="balanced"
-                  color={colors.secondary.paragraph}
-                >
-                  {strings.emptyPlaceholders("tag")}
-                </Paragraph>
-              </View>
-            }
-            ListFooterComponent={<View style={{ height: 50 }} />}
-          />
-        </View>
+                {strings.emptyPlaceholders("tag")}
+              </Paragraph>
+            </View>
+          }
+          ListFooterComponent={<View style={{ height: 50 }} />}
+        />
       </View>
-    </SafeAreaView>
+    </View>
   );
 };
 
-ManageTags.present = (ids?: string[]) => {
-  Navigation.push("ManageTags", {
-    ids: ids
+ManageTagsSheet.present = (ids?: string[]) => {
+  presentSheet({
+    component: (ref) => {
+      return <ManageTagsSheet actionSheetRef={ref} ids={ids} />;
+    }
   });
 };
 
-export default ManageTags;
+export default ManageTagsSheet;
 
 const TagItem = ({
   id,

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

@@ -34,7 +34,7 @@ import { AppFontSize } from "../../../utils/size";
 import DialogHeader from "../../dialog/dialog-header";
 import List from "../../list";
 import SheetProvider from "../../sheet-provider";
-import { Button, ButtonProps } from "../../ui/button";
+import { Button } from "../../ui/button";
 import { PressableProps } from "../../ui/pressable";
 import Paragraph from "../../ui/typography/paragraph";
 import { DefaultAppStyles } from "../../../utils/styles";
@@ -47,10 +47,18 @@ type RelationsListProps = {
   referenceType: string;
   relationType: "to" | "from";
   title: string;
-  button?: ButtonProps;
+  button?: Button;
   onAdd: () => void;
 };
 
+type Button = {
+  onPress?: (() => void) | undefined;
+  loading?: boolean | undefined;
+  title?: string | undefined;
+  type?: PressableProps["type"];
+  icon?: string;
+};
+
 const IconsByType = {
   reminder: "bell"
 };
@@ -146,7 +154,7 @@ RelationsList.present = ({
   referenceType: string;
   relationType: "to" | "from";
   title: string;
-  button?: ButtonProps;
+  button?: Button;
   onAdd: () => void;
 }) => {
   presentSheet({

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

@@ -0,0 +1,630 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import { useThemeColors } from "@notesnook/theme";
+import React, { RefObject, useRef, useState } from "react";
+import {
+  Platform,
+  TextInput,
+  View,
+  ScrollView as RNScrollView
+} from "react-native";
+import { ActionSheetRef, ScrollView } from "react-native-actions-sheet";
+import DateTimePickerModal from "react-native-modal-datetime-picker";
+import {
+  PresentSheetOptions,
+  ToastManager,
+  presentSheet
+} from "../../../services/event-manager";
+import { defaultBorderRadius, AppFontSize } from "../../../utils/size";
+import { Button } from "../../ui/button";
+import Input from "../../ui/input";
+
+import dayjs from "dayjs";
+import DatePicker from "react-native-date-picker";
+import { db } from "../../../common/database";
+import { DDS } from "../../../services/device-detection";
+import Navigation from "../../../services/navigation";
+import Notifications from "../../../services/notifications";
+import PremiumService from "../../../services/premium";
+import SettingsService from "../../../services/settings";
+import { useRelationStore } from "../../../stores/use-relation-store";
+import { Dialog } from "../../dialog";
+import { ReminderTime } from "../../ui/reminder-time";
+import Heading from "../../ui/typography/heading";
+import Paragraph from "../../ui/typography/paragraph";
+import { Note, Reminder } from "@notesnook/core";
+import { strings } from "@notesnook/intl";
+import { DefaultAppStyles } from "../../../utils/styles";
+
+type ReminderSheetProps = {
+  actionSheetRef: RefObject<ActionSheetRef>;
+  close?: (ctx?: string) => void;
+  update?: (options: PresentSheetOptions) => void;
+  reminder?: Reminder;
+  reference?: Note;
+};
+
+const ReminderModes =
+  Platform.OS === "ios"
+    ? {
+        Once: "once",
+        Repeat: "repeat"
+      }
+    : {
+        Once: "once",
+        Repeat: "repeat",
+        Permanent: "permanent"
+      };
+
+const RecurringModes = {
+  Daily: "day",
+  Week: "week",
+  Month: "month",
+  Year: "year"
+};
+
+const WeekDays = new Array(7).fill(true);
+const MonthDays = new Array(31).fill(true);
+const WeekDayNames = {
+  0: "Sunday",
+  1: "Monday",
+  2: "Tuesday",
+  3: "Wednesday",
+  4: "Thursday",
+  5: "Friday",
+  6: "Saturday"
+};
+
+const ReminderNotificationModes = {
+  Silent: "silent",
+  Vibrate: "vibrate",
+  Urgent: "urgent"
+};
+
+export default function ReminderSheet({
+  actionSheetRef,
+  close,
+  update,
+  reminder,
+  reference
+}: ReminderSheetProps) {
+  const { colors, isDark } = useThemeColors();
+  const [reminderMode, setReminderMode] = useState<Reminder["mode"]>(
+    reminder?.mode || "once"
+  );
+  const [recurringMode, setRecurringMode] = useState<Reminder["recurringMode"]>(
+    reminder?.recurringMode || "week"
+  );
+  const [selectedDays, setSelectedDays] = useState<number[]>(
+    reminder?.selectedDays || []
+  );
+  const [date, setDate] = useState<Date>(
+    new Date(reminder?.date || Date.now())
+  );
+  const [reminderNotificationMode, setReminderNotificatioMode] = useState<
+    Reminder["priority"]
+  >(reminder?.priority || SettingsService.get().reminderNotificationMode);
+  const [isDatePickerVisible, setDatePickerVisibility] = useState(false);
+  const [repeatFrequency, setRepeatFrequency] = useState(1);
+  const referencedItem = reference ? (reference as Note) : null;
+
+  const title = useRef<string | undefined>(
+    !reminder ? referencedItem?.title : reminder?.title
+  );
+  const details = useRef<string | undefined>(
+    !reminder ? referencedItem?.headline : reminder?.description
+  );
+  const titleRef = useRef<TextInput>(null);
+  const timer = useRef<NodeJS.Timeout>();
+
+  const showDatePicker = () => {
+    setDatePickerVisibility(true);
+  };
+
+  const hideDatePicker = () => {
+    setDatePickerVisibility(false);
+  };
+
+  const handleConfirm = (date: Date) => {
+    timer.current = setTimeout(() => {
+      hideDatePicker();
+      setDate(date);
+    }, 50);
+  };
+  function nth(n: number) {
+    return (
+      ["st", "nd", "rd"][(((((n < 0 ? -n : n) + 90) % 100) - 10) % 10) - 1] ||
+      "th"
+    );
+  }
+
+  function getSelectedDaysText(selectedDays: number[]) {
+    const text = selectedDays
+      .sort((a, b) => a - b)
+      .map((day, index) => {
+        const isLast = index === selectedDays.length - 1;
+        const isSecondLast = index === selectedDays.length - 2;
+        const joinWith = isSecondLast ? " & " : isLast ? "" : ", ";
+        return recurringMode === RecurringModes.Week
+          ? WeekDayNames[day as keyof typeof WeekDayNames] + joinWith
+          : `${day}${nth(day)} ${joinWith}`;
+      })
+      .join("");
+    return text;
+  }
+
+  async function saveReminder() {
+    try {
+      if (!(await Notifications.checkAndRequestPermissions(true)))
+        throw new Error(strings.noNotificationPermission());
+      if (!date && reminderMode !== ReminderModes.Permanent) return;
+      if (
+        reminderMode === ReminderModes.Repeat &&
+        recurringMode !== "day" &&
+        recurringMode !== "year" &&
+        selectedDays.length === 0
+      )
+        throw new Error(strings.selectDayError());
+
+      if (!title.current) throw new Error(strings.setTitleError());
+      if (date.getTime() < Date.now() && reminderMode === "once") {
+        titleRef?.current?.focus();
+        throw new Error(strings.dateError());
+      }
+
+      date.setSeconds(0, 0);
+
+      const reminderId = await db.reminders?.add({
+        id: reminder?.id,
+        date: date?.getTime(),
+        priority: reminderNotificationMode,
+        title: title.current,
+        description: details.current,
+        recurringMode: recurringMode,
+        selectedDays: selectedDays,
+        mode: reminderMode,
+        localOnly: reminderMode === "permanent",
+        snoozeUntil:
+          date?.getTime() > Date.now() ? undefined : reminder?.snoozeUntil,
+        disabled: false
+      });
+      if (!reminderId) return;
+      const _reminder = await db.reminders?.reminder(reminderId);
+
+      if (reference && _reminder) {
+        await db.relations?.add(reference, {
+          id: _reminder?.id as string,
+          type: _reminder?.type
+        });
+      }
+      Notifications.scheduleNotification(_reminder as Reminder);
+      Navigation.queueRoutesForUpdate();
+      useRelationStore.getState().update();
+      close?.();
+    } catch (e) {
+      ToastManager.error(e as Error, undefined, "local");
+    }
+  }
+
+  return (
+    <View
+      style={{
+        paddingHorizontal: DefaultAppStyles.GAP,
+        maxHeight: "100%"
+      }}
+    >
+      <Heading size={AppFontSize.lg}>
+        {reminder ? strings.editReminder() : strings.newReminder()}
+      </Heading>
+
+      <Dialog context="local" />
+      <ScrollView
+        bounces={false}
+        style={{
+          marginBottom: DDS.isTab ? 25 : undefined
+        }}
+      >
+        <Input
+          fwdRef={titleRef}
+          defaultValue={reminder?.title || referencedItem?.title}
+          placeholder={strings.remindeMeOf()}
+          onChangeText={(text) => (title.current = text)}
+          wrapperStyle={{
+            marginTop: DefaultAppStyles.GAP_VERTICAL
+          }}
+        />
+
+        <Input
+          defaultValue={
+            reminder ? reminder?.description : referencedItem?.headline
+          }
+          placeholder={strings.addShortNote()}
+          onChangeText={(text) => (details.current = text)}
+          containerStyle={{
+            maxHeight: 80
+          }}
+          multiline
+          textAlignVertical="top"
+          inputStyle={{
+            minHeight: 80,
+            paddingVertical: DefaultAppStyles.GAP_VERTICAL
+          }}
+          height={80}
+          wrapperStyle={{
+            marginBottom: DefaultAppStyles.GAP_VERTICAL
+          }}
+        />
+
+        <ScrollView
+          style={{
+            flexDirection: "row",
+            marginBottom: DefaultAppStyles.GAP_VERTICAL,
+            height: 50
+          }}
+          horizontal
+        >
+          {Object.keys(ReminderModes).map((mode) => (
+            <Button
+              key={mode}
+              title={strings.reminderModes(
+                ReminderModes[mode as keyof typeof ReminderModes] as string
+              )}
+              style={{
+                marginRight: 12,
+                borderRadius: 100,
+                minWidth: 70,
+                paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL
+              }}
+              proTag={mode === "Repeat"}
+              height={35}
+              type={
+                reminderMode ===
+                ReminderModes[mode as keyof typeof ReminderModes]
+                  ? "selected"
+                  : "plain"
+              }
+              onPress={() => {
+                if (mode === "Repeat" && !PremiumService.get()) return;
+                setReminderMode(
+                  ReminderModes[
+                    mode as keyof typeof ReminderModes
+                  ] as Reminder["mode"]
+                );
+                if (mode === "Repeat") {
+                  setSelectedDays((days) => {
+                    if (days.length > 0) return days;
+                    if (days.indexOf(date.getDay()) > -1) {
+                      return days;
+                    }
+                    days.push(date.getDay());
+                    return [...days];
+                  });
+                }
+              }}
+            />
+          ))}
+        </ScrollView>
+
+        {reminderMode === ReminderModes.Repeat ? (
+          <View
+            style={{
+              backgroundColor: colors.secondary.background,
+              padding: DefaultAppStyles.GAP,
+              borderRadius: defaultBorderRadius,
+              marginBottom: DefaultAppStyles.GAP_VERTICAL
+            }}
+          >
+            <View
+              style={{
+                flexDirection: "row",
+                marginBottom:
+                  recurringMode === "day" || recurringMode === "year" ? 0 : 12,
+                alignItems: "center"
+              }}
+            >
+              {Object.keys(RecurringModes).map((mode) => (
+                <Button
+                  key={mode}
+                  title={strings.recurringModes(
+                    RecurringModes[mode as keyof typeof RecurringModes]
+                  )}
+                  style={{
+                    marginRight: 6,
+                    borderRadius: 100,
+                    paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL
+                  }}
+                  type={
+                    recurringMode ===
+                    RecurringModes[mode as keyof typeof RecurringModes]
+                      ? "selected"
+                      : "plain"
+                  }
+                  onPress={() => {
+                    setRecurringMode(
+                      RecurringModes[
+                        mode as keyof typeof RecurringModes
+                      ] as Reminder["recurringMode"]
+                    );
+                    setSelectedDays([]);
+                    setRepeatFrequency(1);
+                  }}
+                />
+              ))}
+            </View>
+
+            <RNScrollView showsHorizontalScrollIndicator={false} horizontal>
+              {recurringMode === RecurringModes.Daily ||
+              recurringMode === RecurringModes.Year
+                ? null
+                : recurringMode === RecurringModes.Week
+                ? WeekDays.map((item, index) => (
+                    <Button
+                      key={strings.weekDayNamesShort[
+                        index as keyof typeof strings.weekDayNamesShort
+                      ]()}
+                      title={strings.weekDayNamesShort[
+                        index as keyof typeof strings.weekDayNamesShort
+                      ]()}
+                      type={
+                        selectedDays.indexOf(index) > -1 ? "selected" : "plain"
+                      }
+                      fontSize={AppFontSize.xs}
+                      style={{
+                        height: 40,
+                        borderRadius: 100,
+                        marginRight: 10
+                      }}
+                      onPress={() => {
+                        setSelectedDays((days) => {
+                          if (days.indexOf(index) > -1) {
+                            days.splice(days.indexOf(index), 1);
+                            return [...days];
+                          }
+                          days.push(index);
+                          return [...days];
+                        });
+                      }}
+                    />
+                  ))
+                : MonthDays.map((item, index) => (
+                    <Button
+                      key={index + "monthday"}
+                      title={index + 1 + ""}
+                      type={
+                        selectedDays.indexOf(index + 1) > -1
+                          ? "selected"
+                          : "plain"
+                      }
+                      fontSize={AppFontSize.xs}
+                      style={{
+                        height: 40,
+                        borderRadius: 100,
+                        marginRight: 10
+                      }}
+                      onPress={() => {
+                        setSelectedDays((days) => {
+                          if (days.indexOf(index + 1) > -1) {
+                            days.splice(days.indexOf(index + 1), 1);
+                            return [...days];
+                          }
+                          days.push(index + 1);
+                          return [...days];
+                        });
+                      }}
+                    />
+                  ))}
+            </RNScrollView>
+          </View>
+        ) : null}
+
+        {reminderMode === ReminderModes.Permanent ? null : (
+          <View
+            style={{
+              width: "100%",
+              flexDirection: "column",
+              justifyContent: "center",
+              marginBottom: DefaultAppStyles.GAP_VERTICAL,
+              alignItems: "center"
+            }}
+          >
+            <DateTimePickerModal
+              isVisible={isDatePickerVisible}
+              mode="date"
+              onConfirm={handleConfirm}
+              onCancel={hideDatePicker}
+              is24Hour={db.settings.getTimeFormat() === "24-hour"}
+              date={date || new Date(Date.now())}
+            />
+
+            <DatePicker
+              date={date}
+              maximumDate={dayjs(date).add(3, "months").toDate()}
+              onDateChange={handleConfirm}
+              textColor={isDark ? colors.static.white : colors.static.black}
+              fadeToColor={colors.primary.background}
+              theme={isDark ? "dark" : "light"}
+              androidVariant="nativeAndroid"
+              is24hourSource="locale"
+              locale={
+                db.settings?.getTimeFormat() === "24-hour" ? "en_GB" : "en_US"
+              }
+              mode={
+                reminderMode === ReminderModes.Repeat &&
+                recurringMode !== "year"
+                  ? "time"
+                  : "datetime"
+              }
+            />
+
+            {reminderMode === ReminderModes.Repeat ? null : (
+              <Button
+                style={{
+                  width: "100%"
+                }}
+                title={date ? date.toLocaleDateString() : strings.selectDate()}
+                type={date ? "secondaryAccented" : "secondary"}
+                icon="calendar"
+                fontSize={AppFontSize.sm}
+                onPress={() => {
+                  showDatePicker();
+                }}
+              />
+            )}
+          </View>
+        )}
+
+        {reminderMode === ReminderModes.Once ||
+        reminderMode === ReminderModes.Permanent ? null : (
+          <View
+            style={{
+              borderRadius: defaultBorderRadius,
+              flexDirection: "row",
+              paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL,
+              alignItems: "center",
+              justifyContent: "flex-start",
+              marginBottom: DefaultAppStyles.GAP_VERTICAL
+            }}
+          >
+            <>
+              <Paragraph
+                size={AppFontSize.xxs}
+                color={colors.secondary.paragraph}
+              >
+                {recurringMode === RecurringModes.Daily
+                  ? strings.reminderRepeatStrings.day(
+                      dayjs(date).format("hh:mm A")
+                    )
+                  : recurringMode === RecurringModes.Year
+                  ? strings.reminderRepeatStrings.year(
+                      dayjs(date).format("dddd, MMMM D, h:mm A")
+                    )
+                  : selectedDays.length === 7 &&
+                    recurringMode === RecurringModes.Week
+                  ? strings.reminderRepeatStrings.week.daily(
+                      dayjs(date).format("hh:mm A")
+                    )
+                  : selectedDays.length === 0
+                  ? strings.reminderRepeatStrings[
+                      recurringMode as "week" | "month"
+                    ].selectDays()
+                  : strings.reminderRepeatStrings.repeats(
+                      repeatFrequency,
+                      recurringMode as string,
+                      getSelectedDaysText(selectedDays),
+                      dayjs(date).format("hh:mm A")
+                    )}
+              </Paragraph>
+            </>
+          </View>
+        )}
+
+        <ReminderTime
+          reminder={reminder}
+          style={{
+            width: "100%",
+            justifyContent: "flex-start",
+            borderWidth: 0,
+            paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL,
+            alignSelf: "flex-start"
+          }}
+        />
+
+        {reminderMode === ReminderModes.Permanent ? null : (
+          <RNScrollView
+            style={{
+              flexDirection: "row",
+              marginTop: DefaultAppStyles.GAP_VERTICAL,
+              height: 50
+            }}
+            horizontal
+          >
+            {Object.keys(ReminderNotificationModes).map((mode) => (
+              <Button
+                key={mode}
+                title={strings.reminderNotificationModes(
+                  mode as keyof typeof ReminderNotificationModes
+                )}
+                style={{
+                  marginRight: 12,
+                  borderRadius: 100,
+                  paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL
+                }}
+                icon={
+                  mode === "Silent"
+                    ? "minus-circle"
+                    : mode === "Vibrate"
+                    ? "vibrate"
+                    : "volume-high"
+                }
+                height={35}
+                type={
+                  reminderNotificationMode ===
+                  ReminderNotificationModes[
+                    mode as keyof typeof ReminderNotificationModes
+                  ]
+                    ? "selected"
+                    : "plain"
+                }
+                onPress={() => {
+                  const _mode = ReminderNotificationModes[
+                    mode as keyof typeof ReminderNotificationModes
+                  ] as Reminder["priority"];
+                  SettingsService.set({
+                    reminderNotificationMode: _mode
+                  });
+                  setReminderNotificatioMode(_mode);
+                }}
+              />
+            ))}
+          </RNScrollView>
+        )}
+      </ScrollView>
+
+      <Button
+        title={strings.save()}
+        type="accent"
+        style={{
+          paddingHorizontal: DefaultAppStyles.GAP * 2,
+          marginTop: DefaultAppStyles.GAP_VERTICAL,
+          width: "100%"
+        }}
+        onPress={saveReminder}
+      />
+    </View>
+  );
+}
+
+ReminderSheet.present = (
+  reminder?: Reminder,
+  reference?: Note,
+  isSheet?: boolean
+) => {
+  presentSheet({
+    context: isSheet ? "local" : undefined,
+    component: (ref, close, update) => (
+      <ReminderSheet
+        actionSheetRef={ref}
+        close={close}
+        update={update}
+        reminder={reminder}
+        reference={reference}
+      />
+    )
+  });
+};

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

@@ -40,7 +40,6 @@ import Sync from "../../../services/sync";
 
 import Clipboard from "@react-native-clipboard/clipboard";
 import { logoutUser } from "../../../screens/settings/logout";
-import { sleep } from "../../../utils/time";
 export const UserSheet = () => {
   const ref = useSheetRef();
   const { colors } = useThemeColors();
@@ -311,11 +310,10 @@ export const UserSheet = () => {
           {
             icon: "logout",
             title: strings.logout(),
-            onPress: async () => {
+            onPress: () => {
               console.log("logout");
-              ref.current?.hide();
-              await sleep(300);
               logoutUser();
+              ref.current?.hide();
             },
             hidden: !user
           }

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

@@ -211,14 +211,6 @@ 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,8 +49,7 @@ export const NotebookItem = ({
   onPress,
   onLongPress,
   onAddNotebook,
-  canDisableSelectionMode,
-  disableExpand
+  canDisableSelectionMode
 }: {
   index: number;
   item: TreeItem;
@@ -65,7 +64,6 @@ export const NotebookItem = ({
   onLongPress?: () => void;
   onAddNotebook?: () => void;
   canDisableSelectionMode?: boolean;
-  disableExpand?: boolean;
 }) => {
   const notebook = item.notebook;
   const isFocused = focused;
@@ -95,11 +93,7 @@ export const NotebookItem = ({
     <View
       style={{
         paddingLeft:
-          item.depth === 0
-            ? undefined
-            : item.depth < 6
-            ? 15 * item.depth
-            : 15 * 5,
+          item.depth > 0 && item.depth < 6 ? 15 * item.depth : undefined,
         width: "100%",
         marginTop: 2
       }}
@@ -168,7 +162,7 @@ export const NotebookItem = ({
             }
             testID={item.hasChildren ? `expand-notebook-${index}` : ""}
             onPress={() => {
-              if (item.hasChildren && !disableExpand) {
+              if (item.hasChildren) {
                 onToggleExpanded?.();
               } else {
                 onPress?.();
@@ -184,7 +178,7 @@ export const NotebookItem = ({
               borderRadius: defaultBorderRadius
             }}
             name={
-              !item.hasChildren || disableExpand
+              !item.hasChildren
                 ? "book-outline"
                 : expanded
                 ? "chevron-down"

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

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

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

@@ -321,9 +321,6 @@ const Input = ({
                 bottom={10}
                 onPress={button.onPress}
                 color={button.color}
-                style={{
-                  marginRight: -8
-                }}
               />
             )}
 

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

@@ -23,11 +23,13 @@ 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 { 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";
+import { useAppState } from "../../../hooks/use-app-state";
+import SettingsService from "../../../services/settings";
+import { useUserStore } from "../../../stores/use-user-store";
+import { getContainerBorder } from "../../../utils/colors";
+
 /**
  *
  * @param {any} param0
@@ -61,10 +63,6 @@ const SheetWrapper = ({
   const locked = useUserStore((state) => state.appLocked);
 
   let width = dimensions.width > 600 ? 600 : 500;
-  const isGestureNavigationEnabled =
-    NotesnookModule.isGestureNavigationEnabled();
-
-  console.log(isGestureNavigationEnabled);
 
   const style = React.useMemo(() => {
     return {
@@ -79,18 +77,14 @@ const SheetWrapper = ({
       borderBottomRightRadius: 0,
       borderBottomLeftRadius: 0,
       ...getContainerBorder(colors.primary.border, 0.5),
-      borderBottomWidth: 0,
-      paddingBottom: isGestureNavigationEnabled
-        ? insets.bottom
-        : insets.bottom || 48
+      borderBottomWidth: 0
     };
   }, [
     colors.primary.background,
     colors.primary.border,
     largeTablet,
     smallTablet,
-    width,
-    insets.bottom
+    width
   ]);
 
   const _onOpen = () => {

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

@@ -41,6 +41,7 @@ import ExportNotesSheet from "../components/sheets/export-notes";
 import PublishNoteSheet from "../components/sheets/publish-note";
 import { ReferencesList } from "../components/sheets/references";
 import { RelationsList } from "../components/sheets/relations-list/index";
+import ReminderSheet from "../components/sheets/reminder";
 import { useSideBarDraggingStore } from "../components/side-menu/dragging-store";
 import { ButtonProps } from "../components/ui/button";
 import { useTabStore } from "../screens/editor/tiptap/use-tab-store";
@@ -53,20 +54,19 @@ import {
 } from "../services/event-manager";
 import Navigation from "../services/navigation";
 import Notifications from "../services/notifications";
-import SettingsService from "../services/settings";
-import { useArchivedStore } from "../stores/use-archived-store";
 import { useMenuStore } from "../stores/use-menu-store";
 import useNavigationStore from "../stores/use-navigation-store";
 import { useRelationStore } from "../stores/use-relation-store";
 import { useSelectionStore } from "../stores/use-selection-store";
-import { useSettingStore } from "../stores/use-setting-store";
 import { useTagStore } from "../stores/use-tag-store";
 import { useUserStore } from "../stores/use-user-store";
 import { eUpdateNoteInEditor } from "../utils/events";
 import { deleteItems } from "../utils/functions";
 import { convertNoteToText } from "../utils/note-to-text";
 import { sleep } from "../utils/time";
-import AddReminder from "../screens/add-reminder";
+import SettingsService from "../services/settings";
+import { useSettingStore } from "../stores/use-setting-store";
+import { useArchivedStore } from "../stores/use-archived-store";
 
 export type ActionId =
   | "select"
@@ -110,8 +110,7 @@ export type ActionId =
   | "favorite"
   | "remove-from-notebook"
   | "trash"
-  | "default-homepage"
-  | "default-tag";
+  | "default-homepage";
 
 export type Action = {
   id: ActionId;
@@ -159,8 +158,6 @@ export const useActions = ({
   const [defaultNotebook, setDefaultNotebook] = useState(
     db.settings.getDefaultNotebook()
   );
-  const [defaultTag, setDefaultTag] = useState(db.settings.getDefaultTag());
-
   const [noteInCurrentNotebook, setNoteInCurrentNotebook] = useState(false);
   const [locked, setLocked] = useState(false);
   const isHomepage = useSettingStore(
@@ -448,8 +445,7 @@ export const useActions = ({
         title: strings.editReminder(),
         icon: "pencil",
         onPress: async () => {
-          AddReminder.present(item);
-          close();
+          ReminderSheet.present(item);
         }
       }
     );
@@ -473,39 +469,15 @@ export const useActions = ({
   }
 
   if (item.type === "tag" || item.type === "notebook") {
-    actions.push(
-      {
-        id: "add-shortcut",
-        title: isPinnedToMenu
-          ? strings.removeShortcut()
-          : strings.addShortcut(),
-        icon: isPinnedToMenu ? "link-variant-remove" : "link-variant",
-        onPress: createMenuShortcut,
-        isToggle: true,
-        checked: isPinnedToMenu,
-        activeColor: colors.error.paragraph
-      },
-      {
-        id: "default-tag",
-        title:
-          defaultTag === item.id
-            ? strings.removeAsDefault()
-            : strings.setAsDefault(),
-        hidden: item.type !== "tag",
-        icon: "pound",
-        onPress: async () => {
-          if (defaultTag === item.id) {
-            await db.settings.setDefaultTag(undefined);
-            setDefaultTag(undefined);
-          } else {
-            await db.settings.setDefaultTag(item.id);
-            setDefaultTag(item.id);
-          }
-          close();
-        },
-        checked: defaultTag === item.id
-      }
-    );
+    actions.push({
+      id: "add-shortcut",
+      title: isPinnedToMenu ? strings.removeShortcut() : strings.addShortcut(),
+      icon: isPinnedToMenu ? "link-variant-remove" : "link-variant",
+      onPress: createMenuShortcut,
+      isToggle: true,
+      checked: isPinnedToMenu,
+      activeColor: colors.error.paragraph
+    });
   }
 
   if (item.type === "notebook") {
@@ -515,8 +487,6 @@ export const useActions = ({
         title: strings.addNotebook(),
         icon: "plus",
         onPress: async () => {
-          close();
-          await sleep(300);
           AddNotebookSheet.present(undefined, item);
         }
       },
@@ -525,8 +495,6 @@ export const useActions = ({
         title: strings.editNotebook(),
         icon: "square-edit-outline",
         onPress: async () => {
-          close();
-          await sleep(300);
           AddNotebookSheet.present(item);
         }
       },
@@ -685,8 +653,7 @@ export const useActions = ({
 
     async function pinToNotifications() {
       if (notifPinned) {
-        await Notifications.remove(item.id);
-        await sleep(500);
+        Notifications.remove(item.id);
         await Notifications.get();
         setNotifPinned(isNotePinnedInNotifications(item));
         return;
@@ -700,8 +667,7 @@ export const useActions = ({
         return;
       }
 
-      await Notifications.pinNote(item.id);
-      await sleep(500);
+      Notifications.pinNote(item.id);
       await Notifications.get();
       setNotifPinned(isNotePinnedInNotifications(item));
     }
@@ -913,18 +879,12 @@ export const useActions = ({
             referenceType: "reminder",
             relationType: "from",
             title: strings.dataTypesPluralCamelCase.reminder(),
-            onAdd: () => {
-              AddReminder.present(undefined, item);
-              close();
-            },
+            onAdd: () => ReminderSheet.present(undefined, item, true),
             button: {
-              type: "plain",
-              onPress: () => {
-                AddReminder.present(undefined, item);
-                close();
-              },
-              icon: "plus",
-              iconSize: 20
+              title: strings.add(),
+              type: "accent",
+              onPress: () => ReminderSheet.present(undefined, item, true),
+              icon: "plus"
             }
           });
         }
@@ -968,8 +928,7 @@ export const useActions = ({
         title: strings.remindMe(),
         icon: "clock-plus-outline",
         onPress: () => {
-          close();
-          AddReminder.present(undefined, item);
+          ReminderSheet.present(undefined, item);
         }
       },
       {

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

@@ -49,6 +49,7 @@ import { MMKV } from "../common/database/mmkv";
 import { endProgress, startProgress } from "../components/dialogs/progress";
 import Migrate from "../components/sheets/migrate";
 import NewFeature from "../components/sheets/new-feature";
+import ReminderSheet from "../components/sheets/reminder";
 import { Walkthrough } from "../components/walkthroughs";
 import {
   resetTabStore,
@@ -102,7 +103,6 @@ import { getGithubVersion } from "../utils/github-version";
 import { fluidTabsRef } from "../utils/global-refs";
 import { NotesnookModule } from "../utils/notesnook-module";
 import { sleep } from "../utils/time";
-import AddReminder from "../screens/add-reminder";
 
 const onCheckSyncStatus = async (type: SyncStatusEvent) => {
   const { disableSync, disableAutoSync } = SettingsService.get();
@@ -182,10 +182,10 @@ const onAppOpenedFromURL = async (event: { url: string }) => {
       const id = new URL(url).searchParams.get("id");
       if (id) {
         const reminder = await db.reminders.reminder(id);
-        if (reminder) AddReminder.present(reminder);
+        if (reminder) ReminderSheet.present(reminder);
       }
     } else if (url.startsWith("https://notesnook.com/new_reminder")) {
-      AddReminder.present();
+      ReminderSheet.present();
     }
   } catch (e) {
     console.error(e);

apps/mobile/app/hooks/use-timer.ts

@@ -52,14 +52,7 @@ const useTimer = (initialId?: string) => {
     };
   }, [seconds, id]);
 
-  const reset = () => {
-    if (id) {
-      timers[id] = 0;
-      setSeconds(0);
-    }
-  };
-
-  return { seconds, setId, start, reset };
+  return { seconds, setId, start };
 };
 
 export default useTimer;

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

@@ -30,10 +30,6 @@ 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,
@@ -71,6 +67,10 @@ 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,6 +421,7 @@ 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
@@ -529,20 +530,17 @@ const onChangeTab = async (event: { i: number; from: number }) => {
     activateKeepAwake();
     eSendEvent(eOnEnterEditor);
 
-    if (
-      useTabStore.getState().getTab(useTabStore.getState().currentTab)?.session
-        ?.locked
-    ) {
-      eSendEvent(eUnlockNote);
-    }
-
-    if (
-      fluidTabsRef.current?.tabChangedFromSwipeAction.value &&
-      !useTabStore.getState().getNoteIdForTab(useTabStore.getState().currentTab)
-    ) {
-      editorController?.current?.commands?.focus(
-        useTabStore.getState().currentTab
-      );
+    if (!useTabStore.getState().getCurrentNoteId()) {
+      eSendEvent(eOnLoadNote, {
+        newNote: true
+      });
+    } else {
+      if (
+        useTabStore.getState().getTab(useTabStore.getState().currentTab)
+          ?.session?.locked
+      ) {
+        eSendEvent(eUnlockNote);
+      }
     }
   } else {
     if (event.from === 2) {

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

@@ -21,7 +21,6 @@ import { useThemeColors } from "@notesnook/theme";
 import { NavigationContainer } from "@react-navigation/native";
 import { createNativeStackNavigator } from "@react-navigation/native-stack";
 import * as React from "react";
-import { db } from "../common/database";
 import { hideAllTooltips } from "../hooks/use-tooltip";
 import SettingsService from "../services/settings";
 import useNavigationStore, {
@@ -30,6 +29,7 @@ import useNavigationStore, {
 import { useSelectionStore } from "../stores/use-selection-store";
 import { useSettingStore } from "../stores/use-setting-store";
 import { rootNavigatorRef } from "../utils/global-refs";
+import { db } from "../common/database";
 
 const RootStack = createNativeStackNavigator();
 const AppStack = createNativeStackNavigator();
@@ -247,8 +247,6 @@ let LinkNotebooks: any = null;
 let MoveNotebook: any = null;
 let MoveNotes: any = null;
 let Settings: any = null;
-let ManageTags: any = null;
-let AddReminder: any = null;
 
 export const RootNavigation = () => {
   const introCompleted = useSettingStore(
@@ -328,24 +326,6 @@ export const RootNavigation = () => {
             return Settings;
           }}
         />
-
-        <RootStack.Screen
-          name="ManageTags"
-          getComponent={() => {
-            ManageTags =
-              ManageTags || require("../screens/manage-tags").default;
-            return ManageTags;
-          }}
-        />
-
-        <RootStack.Screen
-          name="AddReminder"
-          getComponent={() => {
-            AddReminder =
-              AddReminder || require("../screens/add-reminder").default;
-            return AddReminder;
-          }}
-        />
       </RootStack.Navigator>
     </NavigationContainer>
   );

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

@@ -1,608 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-import { Note, Reminder } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
-import { useThemeColors } from "@notesnook/theme";
-import dayjs from "dayjs";
-import React, { useRef, useState } from "react";
-import {
-  KeyboardAvoidingView,
-  Platform,
-  ScrollView,
-  TextInput,
-  View
-} from "react-native";
-import DatePicker from "react-native-date-picker";
-import DateTimePickerModal from "react-native-modal-datetime-picker";
-import { SafeAreaView } from "react-native-safe-area-context";
-import { db } from "../../common/database";
-import { Dialog } from "../../components/dialog";
-import { Header } from "../../components/header";
-import { Button } from "../../components/ui/button";
-import Input from "../../components/ui/input";
-import { ReminderTime } from "../../components/ui/reminder-time";
-import Paragraph from "../../components/ui/typography/paragraph";
-import { DDS } from "../../services/device-detection";
-import { ToastManager } from "../../services/event-manager";
-import Navigation, { NavigationProps } from "../../services/navigation";
-import Notifications from "../../services/notifications";
-import PremiumService from "../../services/premium";
-import SettingsService from "../../services/settings";
-import { useRelationStore } from "../../stores/use-relation-store";
-import { AppFontSize, defaultBorderRadius } from "../../utils/size";
-import { DefaultAppStyles } from "../../utils/styles";
-
-const ReminderModes =
-  Platform.OS === "ios"
-    ? {
-        Once: "once",
-        Repeat: "repeat"
-      }
-    : {
-        Once: "once",
-        Repeat: "repeat",
-        Permanent: "permanent"
-      };
-
-const RecurringModes = {
-  Daily: "day",
-  Week: "week",
-  Month: "month",
-  Year: "year"
-};
-
-const WeekDays = new Array(7).fill(true);
-const MonthDays = new Array(31).fill(true);
-const WeekDayNames = {
-  0: "Sunday",
-  1: "Monday",
-  2: "Tuesday",
-  3: "Wednesday",
-  4: "Thursday",
-  5: "Friday",
-  6: "Saturday"
-};
-
-const ReminderNotificationModes = {
-  Silent: "silent",
-  Vibrate: "vibrate",
-  Urgent: "urgent"
-};
-
-export default function AddReminder(props: NavigationProps<"AddReminder">) {
-  const { reminder, reference } = props.route.params;
-  const { colors, isDark } = useThemeColors();
-  const [reminderMode, setReminderMode] = useState<Reminder["mode"]>(
-    reminder?.mode || "once"
-  );
-  const [recurringMode, setRecurringMode] = useState<Reminder["recurringMode"]>(
-    reminder?.recurringMode || "week"
-  );
-  const [selectedDays, setSelectedDays] = useState<number[]>(
-    reminder?.selectedDays || []
-  );
-  const [date, setDate] = useState<Date>(
-    new Date(reminder?.date || Date.now())
-  );
-  const [reminderNotificationMode, setReminderNotificatioMode] = useState<
-    Reminder["priority"]
-  >(reminder?.priority || SettingsService.get().reminderNotificationMode);
-  const [isDatePickerVisible, setDatePickerVisibility] = useState(false);
-  const [repeatFrequency, setRepeatFrequency] = useState(1);
-  const referencedItem = reference ? (reference as Note) : null;
-
-  const title = useRef<string | undefined>(
-    !reminder ? referencedItem?.title : reminder?.title
-  );
-  const details = useRef<string | undefined>(
-    !reminder ? referencedItem?.headline : reminder?.description
-  );
-  const titleRef = useRef<TextInput>(null);
-  const timer = useRef<NodeJS.Timeout>();
-
-  const showDatePicker = () => {
-    setDatePickerVisibility(true);
-  };
-
-  const hideDatePicker = () => {
-    setDatePickerVisibility(false);
-  };
-
-  const handleConfirm = (date: Date) => {
-    timer.current = setTimeout(() => {
-      hideDatePicker();
-      setDate(date);
-    }, 50);
-  };
-  function nth(n: number) {
-    return (
-      ["st", "nd", "rd"][(((((n < 0 ? -n : n) + 90) % 100) - 10) % 10) - 1] ||
-      "th"
-    );
-  }
-
-  function getSelectedDaysText(selectedDays: number[]) {
-    const text = selectedDays
-      .sort((a, b) => a - b)
-      .map((day, index) => {
-        const isLast = index === selectedDays.length - 1;
-        const isSecondLast = index === selectedDays.length - 2;
-        const joinWith = isSecondLast ? " & " : isLast ? "" : ", ";
-        return recurringMode === RecurringModes.Week
-          ? WeekDayNames[day as keyof typeof WeekDayNames] + joinWith
-          : `${day}${nth(day)} ${joinWith}`;
-      })
-      .join("");
-    return text;
-  }
-
-  async function saveReminder() {
-    try {
-      if (!(await Notifications.checkAndRequestPermissions(true)))
-        throw new Error(strings.noNotificationPermission());
-      if (!date && reminderMode !== ReminderModes.Permanent) return;
-      if (
-        reminderMode === ReminderModes.Repeat &&
-        recurringMode !== "day" &&
-        recurringMode !== "year" &&
-        selectedDays.length === 0
-      )
-        throw new Error(strings.selectDayError());
-
-      if (!title.current) throw new Error(strings.setTitleError());
-      if (date.getTime() < Date.now() && reminderMode === "once") {
-        titleRef?.current?.focus();
-        throw new Error(strings.dateError());
-      }
-
-      date.setSeconds(0, 0);
-
-      const reminderId = await db.reminders?.add({
-        id: reminder?.id,
-        date: date?.getTime(),
-        priority: reminderNotificationMode,
-        title: title.current,
-        description: details.current,
-        recurringMode: recurringMode,
-        selectedDays: selectedDays,
-        mode: reminderMode,
-        localOnly: reminderMode === "permanent",
-        snoozeUntil:
-          date?.getTime() > Date.now() ? undefined : reminder?.snoozeUntil,
-        disabled: false
-      });
-      if (!reminderId) return;
-      const _reminder = await db.reminders?.reminder(reminderId);
-
-      if (reference && _reminder) {
-        await db.relations?.add(reference, {
-          id: _reminder?.id as string,
-          type: _reminder?.type
-        });
-      }
-      Notifications.scheduleNotification(_reminder as Reminder);
-      Navigation.queueRoutesForUpdate();
-      useRelationStore.getState().update();
-      Navigation.goBack();
-    } catch (e) {
-      ToastManager.error(e as Error, undefined);
-    }
-  }
-
-  const KeyboardViewIOS = Platform.OS === "ios" ? KeyboardAvoidingView : View;
-
-  return (
-    <SafeAreaView
-      style={{
-        backgroundColor: colors.primary.background,
-        flex: 1
-      }}
-    >
-      <KeyboardViewIOS
-        behavior="padding"
-        style={{
-          flex: 1
-        }}
-      >
-        <Header
-          title={reminder ? strings.editReminder() : strings.newReminder()}
-          canGoBack
-          rightButton={{
-            name: "check",
-            onPress: saveReminder
-          }}
-        />
-        <Dialog context="local" />
-        <ScrollView
-          style={{
-            marginBottom: DDS.isTab ? 25 : undefined,
-            paddingHorizontal: DefaultAppStyles.GAP
-          }}
-          keyboardDismissMode="interactive"
-          keyboardShouldPersistTaps="handled"
-        >
-          <Input
-            fwdRef={titleRef}
-            defaultValue={reminder?.title || referencedItem?.title}
-            placeholder={strings.remindeMeOf()}
-            onChangeText={(text) => (title.current = text)}
-            wrapperStyle={{
-              marginTop: DefaultAppStyles.GAP_VERTICAL
-            }}
-          />
-
-          <Input
-            defaultValue={
-              reminder ? reminder?.description : referencedItem?.headline
-            }
-            placeholder={strings.addShortNote()}
-            onChangeText={(text) => (details.current = text)}
-            containerStyle={{
-              maxHeight: 80
-            }}
-            multiline
-            textAlignVertical="top"
-            inputStyle={{
-              minHeight: 80,
-              paddingVertical: DefaultAppStyles.GAP_VERTICAL
-            }}
-            height={80}
-            wrapperStyle={{
-              marginBottom: DefaultAppStyles.GAP_VERTICAL
-            }}
-          />
-
-          <ScrollView
-            style={{
-              flexDirection: "row",
-              marginBottom: DefaultAppStyles.GAP_VERTICAL
-            }}
-            horizontal
-          >
-            {Object.keys(ReminderModes).map((mode) => (
-              <Button
-                key={mode}
-                title={strings.reminderModes(
-                  ReminderModes[mode as keyof typeof ReminderModes] as string
-                )}
-                style={{
-                  paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL,
-                  marginRight: DefaultAppStyles.GAP_SMALL
-                }}
-                proTag={mode === "Repeat"}
-                height={35}
-                type={
-                  reminderMode ===
-                  ReminderModes[mode as keyof typeof ReminderModes]
-                    ? "selected"
-                    : "plain"
-                }
-                onPress={() => {
-                  if (mode === "Repeat" && !PremiumService.get()) return;
-                  setReminderMode(
-                    ReminderModes[
-                      mode as keyof typeof ReminderModes
-                    ] as Reminder["mode"]
-                  );
-                  if (mode === "Repeat") {
-                    setSelectedDays((days) => {
-                      if (days.length > 0) return days;
-                      if (days.indexOf(date.getDay()) > -1) {
-                        return days;
-                      }
-                      days.push(date.getDay());
-                      return [...days];
-                    });
-                  }
-                }}
-              />
-            ))}
-          </ScrollView>
-
-          {reminderMode === ReminderModes.Repeat ? (
-            <View
-              style={{
-                backgroundColor: colors.secondary.background,
-                padding: DefaultAppStyles.GAP,
-                borderRadius: defaultBorderRadius,
-                marginBottom: DefaultAppStyles.GAP_VERTICAL
-              }}
-            >
-              <View
-                style={{
-                  flexDirection: "row",
-                  marginBottom:
-                    recurringMode === "day" || recurringMode === "year"
-                      ? 0
-                      : 12,
-                  alignItems: "center"
-                }}
-              >
-                {Object.keys(RecurringModes).map((mode) => (
-                  <Button
-                    key={mode}
-                    title={strings.recurringModes(
-                      RecurringModes[mode as keyof typeof RecurringModes]
-                    )}
-                    style={{
-                      marginRight: 6,
-                      borderRadius: 100,
-                      paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL
-                    }}
-                    type={
-                      recurringMode ===
-                      RecurringModes[mode as keyof typeof RecurringModes]
-                        ? "selected"
-                        : "plain"
-                    }
-                    onPress={() => {
-                      setRecurringMode(
-                        RecurringModes[
-                          mode as keyof typeof RecurringModes
-                        ] as Reminder["recurringMode"]
-                      );
-                      setSelectedDays([]);
-                      setRepeatFrequency(1);
-                    }}
-                  />
-                ))}
-              </View>
-
-              <ScrollView showsHorizontalScrollIndicator={false} horizontal>
-                {recurringMode === RecurringModes.Daily ||
-                recurringMode === RecurringModes.Year
-                  ? null
-                  : recurringMode === RecurringModes.Week
-                  ? WeekDays.map((item, index) => (
-                      <Button
-                        key={strings.weekDayNamesShort[
-                          index as keyof typeof strings.weekDayNamesShort
-                        ]()}
-                        title={strings.weekDayNamesShort[
-                          index as keyof typeof strings.weekDayNamesShort
-                        ]()}
-                        type={
-                          selectedDays.indexOf(index) > -1
-                            ? "selected"
-                            : "plain"
-                        }
-                        fontSize={AppFontSize.xs}
-                        style={{
-                          height: 40,
-                          borderRadius: 100,
-                          marginRight: 10
-                        }}
-                        onPress={() => {
-                          setSelectedDays((days) => {
-                            if (days.indexOf(index) > -1) {
-                              days.splice(days.indexOf(index), 1);
-                              return [...days];
-                            }
-                            days.push(index);
-                            return [...days];
-                          });
-                        }}
-                      />
-                    ))
-                  : MonthDays.map((item, index) => (
-                      <Button
-                        key={index + "monthday"}
-                        title={index + 1 + ""}
-                        type={
-                          selectedDays.indexOf(index + 1) > -1
-                            ? "selected"
-                            : "plain"
-                        }
-                        fontSize={AppFontSize.xs}
-                        style={{
-                          height: 40,
-                          borderRadius: 100,
-                          marginRight: 10
-                        }}
-                        onPress={() => {
-                          setSelectedDays((days) => {
-                            if (days.indexOf(index + 1) > -1) {
-                              days.splice(days.indexOf(index + 1), 1);
-                              return [...days];
-                            }
-                            days.push(index + 1);
-                            return [...days];
-                          });
-                        }}
-                      />
-                    ))}
-              </ScrollView>
-            </View>
-          ) : null}
-
-          {reminderMode === ReminderModes.Permanent ? null : (
-            <View
-              style={{
-                width: "100%",
-                flexDirection: "column",
-                justifyContent: "center",
-                marginBottom: DefaultAppStyles.GAP_VERTICAL,
-                alignItems: "center"
-              }}
-            >
-              <DateTimePickerModal
-                isVisible={isDatePickerVisible}
-                mode="date"
-                onConfirm={handleConfirm}
-                onCancel={hideDatePicker}
-                is24Hour={db.settings.getTimeFormat() === "24-hour"}
-                date={date || new Date(Date.now())}
-              />
-
-              <DatePicker
-                date={date}
-                maximumDate={dayjs(date).add(3, "months").toDate()}
-                onDateChange={handleConfirm}
-                textColor={isDark ? colors.static.white : colors.static.black}
-                fadeToColor={colors.primary.background}
-                theme={isDark ? "dark" : "light"}
-                androidVariant="nativeAndroid"
-                is24hourSource="locale"
-                locale={
-                  db.settings?.getTimeFormat() === "24-hour" ? "en_GB" : "en_US"
-                }
-                mode={
-                  reminderMode === ReminderModes.Repeat &&
-                  recurringMode !== "year"
-                    ? "time"
-                    : "datetime"
-                }
-              />
-
-              {reminderMode === ReminderModes.Repeat ? null : (
-                <Button
-                  style={{
-                    width: "100%"
-                  }}
-                  title={
-                    date ? date.toLocaleDateString() : strings.selectDate()
-                  }
-                  type={date ? "secondaryAccented" : "secondary"}
-                  icon="calendar"
-                  fontSize={AppFontSize.sm}
-                  onPress={() => {
-                    showDatePicker();
-                  }}
-                />
-              )}
-            </View>
-          )}
-
-          {reminderMode === ReminderModes.Once ||
-          reminderMode === ReminderModes.Permanent ? null : (
-            <View
-              style={{
-                borderRadius: defaultBorderRadius,
-                flexDirection: "row",
-                paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL,
-                alignItems: "center",
-                justifyContent: "flex-start",
-                marginBottom: DefaultAppStyles.GAP_VERTICAL
-              }}
-            >
-              <>
-                <Paragraph
-                  size={AppFontSize.xxs}
-                  color={colors.secondary.paragraph}
-                >
-                  {recurringMode === RecurringModes.Daily
-                    ? strings.reminderRepeatStrings.day(
-                        dayjs(date).format("hh:mm A")
-                      )
-                    : recurringMode === RecurringModes.Year
-                    ? strings.reminderRepeatStrings.year(
-                        dayjs(date).format("dddd, MMMM D, h:mm A")
-                      )
-                    : selectedDays.length === 7 &&
-                      recurringMode === RecurringModes.Week
-                    ? strings.reminderRepeatStrings.week.daily(
-                        dayjs(date).format("hh:mm A")
-                      )
-                    : selectedDays.length === 0
-                    ? strings.reminderRepeatStrings[
-                        recurringMode as "week" | "month"
-                      ].selectDays()
-                    : strings.reminderRepeatStrings.repeats(
-                        repeatFrequency,
-                        recurringMode as string,
-                        getSelectedDaysText(selectedDays),
-                        dayjs(date).format("hh:mm A")
-                      )}
-                </Paragraph>
-              </>
-            </View>
-          )}
-
-          <ReminderTime
-            reminder={reminder}
-            style={{
-              width: "100%",
-              justifyContent: "flex-start",
-              borderWidth: 0,
-              paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL,
-              alignSelf: "flex-start"
-            }}
-          />
-
-          {reminderMode === ReminderModes.Permanent ? null : (
-            <ScrollView
-              style={{
-                flexDirection: "row",
-                marginTop: DefaultAppStyles.GAP_VERTICAL,
-                height: 50
-              }}
-              horizontal
-            >
-              {Object.keys(ReminderNotificationModes).map((mode) => (
-                <Button
-                  key={mode}
-                  title={strings.reminderNotificationModes(
-                    mode as keyof typeof ReminderNotificationModes
-                  )}
-                  style={{
-                    marginRight: 12,
-                    paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL
-                  }}
-                  icon={
-                    mode === "Silent"
-                      ? "minus-circle"
-                      : mode === "Vibrate"
-                      ? "vibrate"
-                      : "volume-high"
-                  }
-                  fontSize={AppFontSize.xs}
-                  height={35}
-                  type={
-                    reminderNotificationMode ===
-                    ReminderNotificationModes[
-                      mode as keyof typeof ReminderNotificationModes
-                    ]
-                      ? "selected"
-                      : "plain"
-                  }
-                  onPress={() => {
-                    const _mode = ReminderNotificationModes[
-                      mode as keyof typeof ReminderNotificationModes
-                    ] as Reminder["priority"];
-                    SettingsService.set({
-                      reminderNotificationMode: _mode
-                    });
-                    setReminderNotificatioMode(_mode);
-                  }}
-                />
-              ))}
-            </ScrollView>
-          )}
-        </ScrollView>
-      </KeyboardViewIOS>
-    </SafeAreaView>
-  );
-}
-
-AddReminder.present = (reminder?: Reminder, reference?: Note) => {
-  Navigation.navigate("AddReminder", {
-    reminder,
-    reference
-  });
-};

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

@@ -38,11 +38,12 @@ import { WebViewMessageEvent } from "react-native-webview";
 import { DatabaseLogger, db } from "../../../common/database";
 import downloadAttachment from "../../../common/filesystem/download-attachment";
 import { AuthMode } from "../../../components/auth/common";
-import { Properties } from "../../../components/properties";
 import EditorTabs from "../../../components/sheets/editor-tabs";
 import { Issue } from "../../../components/sheets/github/issue";
 import LinkNote from "../../../components/sheets/link-note";
+import ManageTagsSheet from "../../../components/sheets/manage-tags";
 import { RelationsList } from "../../../components/sheets/relations-list";
+import ReminderSheet from "../../../components/sheets/reminder";
 import TableOfContents from "../../../components/sheets/toc";
 import { DDS } from "../../../services/device-detection";
 import {
@@ -73,13 +74,12 @@ import {
 } from "../../../utils/events";
 import { openLinkInBrowser } from "../../../utils/functions";
 import { fluidTabsRef } from "../../../utils/global-refs";
-import { sleep } from "../../../utils/time";
-import ManageTags from "../../manage-tags";
 import { useDragState } from "../../settings/editor/state";
 import { EditorMessage, EditorProps, useEditorType } from "./types";
 import { useTabStore } from "./use-tab-store";
 import { editorState, openInternalLink } from "./utils";
-import AddReminder from "../../add-reminder";
+import { Properties } from "../../../components/properties";
+import { sleep } from "../../../utils/time";
 
 const publishNote = async () => {
   const user = useUserStore.getState().user;
@@ -438,7 +438,7 @@ export const useEditorEvents = (
             referenceType: "reminder",
             relationType: "from",
             title: strings.dataTypesPluralCamelCase.reminder(),
-            onAdd: () => AddReminder.present(undefined, note)
+            onAdd: () => ReminderSheet.present(undefined, note, true)
           });
           break;
         case EditorEvents.newtag:
@@ -449,7 +449,7 @@ export const useEditorEvents = (
             });
             return;
           }
-          ManageTags.present([noteId]);
+          ManageTagsSheet.present([noteId]);
           break;
         case EditorEvents.tag:
           if (editorMessage.value) {

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

@@ -365,24 +365,14 @@ export const useEditor = (
               }
             });
 
-            if (!state.current.onNoteCreated) {
-              const defaultNotebook = db.settings.getDefaultNotebook();
-              if (defaultNotebook) {
-                onNoteCreated(id, {
-                  type: "notebook",
-                  id: defaultNotebook
-                });
-              }
-
-              const defaultTag = db.settings.getDefaultTag();
-              if (defaultTag) {
-                onNoteCreated(id, {
-                  type: "tag",
-                  id: defaultTag
-                });
-              }
+            const defaultNotebook = db.settings.getDefaultNotebook();
+            if (!state.current.onNoteCreated && defaultNotebook) {
+              onNoteCreated(id, {
+                type: "notebook",
+                id: defaultNotebook
+              });
             } else {
-              state.current.onNoteCreated(id);
+              state.current?.onNoteCreated && state.current.onNoteCreated(id);
             }
           }
 
@@ -755,8 +745,6 @@ export const useEditor = (
             ? (data as ContentItem).noteId
             : data.id;
 
-        if (!useTabStore.getState().hasTabForNote(noteId)) return;
-
         const note = data.type === "note" ? data : await db.notes?.note(noteId);
         lock.current = true;
         // Handle this case where note was locked on another device and synced.

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

@@ -98,7 +98,7 @@ class TabSessionStorage {
 
   static get(id: string): TabSessionItem | null {
     if (!id) return null;
-    return TabSessionStorage.storage.getMap(id) || null;
+    return TabSessionStorage.storage.getMap(id);
   }
 
   static set(id: string, session: TabSessionItem): void {

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

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

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

@@ -300,8 +300,6 @@ 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
     );
@@ -373,7 +371,6 @@ const NotebookItemWrapper = React.memo(
           selectionEnabled={selectionEnabled}
           selectionStore={useNotebookSelectionStore}
           onItemUpdate={onItemUpdate}
-          disableExpand={disableExpand}
           focused={false}
           onPress={onPress}
           onAddNotebook={() => {

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

@@ -328,8 +328,6 @@ 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
     );
@@ -380,7 +378,6 @@ const NotebookItemWrapper = React.memo(
               useNotebookTreeStore.getState().removeChildren(item.notebook.id);
             }
           }}
-          disableExpand={disableExpand}
           selected={selected}
           selectionEnabled={selectionEnabled}
           selectionStore={useNotebookSelectionStore}

apps/mobile/app/screens/note-preview-configure/index.tsx

@@ -29,7 +29,6 @@ import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
 import { useSettingStore } from "../../stores/use-setting-store";
 import { NotesnookModule } from "../../utils/notesnook-module";
 import { DefaultAppStyles } from "../../utils/styles";
-import { SafeAreaView } from "react-native-safe-area-context";
 
 const NoteItem = (props: {
   id: string | number;
@@ -112,7 +111,7 @@ export const NotePreviewConfigure = () => {
   );
 
   return (
-    <SafeAreaView
+    <View
       style={{
         backgroundColor: colors.primary.background,
         flex: 1
@@ -166,6 +165,6 @@ export const NotePreviewConfigure = () => {
           ListFooterComponent={<View style={{ height: 200 }} />}
         />
       </View>
-    </SafeAreaView>
+    </View>
   );
 };

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

@@ -17,19 +17,19 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { strings } from "@notesnook/intl";
 import React from "react";
 import { FloatingButton } from "../../components/container/floating-button";
 import DelayLayout from "../../components/delay-layout";
 import { Header } from "../../components/header";
 import List from "../../components/list";
 import SelectionHeader from "../../components/selection-header";
+import ReminderSheet from "../../components/sheets/reminder";
 import { useNavigationFocus } from "../../hooks/use-navigation-focus";
 import Navigation, { NavigationProps } from "../../services/navigation";
 import SettingsService from "../../services/settings";
 import useNavigationStore from "../../stores/use-navigation-store";
 import { useReminders } from "../../stores/use-reminder-store";
-import AddReminder from "../add-reminder";
+import { strings } from "@notesnook/intl";
 
 export const Reminders = ({
   navigation,
@@ -68,7 +68,7 @@ export const Reminders = ({
         }}
         id={route.name}
         onPressDefaultRightButton={() => {
-          AddReminder.present();
+          ReminderSheet.present();
         }}
       />
 
@@ -84,7 +84,7 @@ export const Reminders = ({
             paragraph: strings.remindersEmpty(),
             button: strings.setReminder(),
             action: () => {
-              AddReminder.present();
+              ReminderSheet.present();
             },
             loading: strings.loadingReminders()
           }}
@@ -92,7 +92,7 @@ export const Reminders = ({
 
         <FloatingButton
           onPress={() => {
-            AddReminder.present();
+            ReminderSheet.present();
           }}
           alwaysVisible
         />

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

@@ -67,8 +67,8 @@ export const Search = ({ route, navigation }: NavigationProps<"Search">) => {
           case "note":
             results = await db.lookup.notesWithHighlighting(
               query,
-              route.params.items as FilteredSelector<Note>,
-              groupOptions
+              groupOptions,
+              route.params.items as FilteredSelector<Note>
             );
 
             break;

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

@@ -43,8 +43,6 @@ import ThemeSelector from "./theme-selector";
 import { TitleFormat } from "./title-format";
 import { View } from "react-native";
 import { DefaultAppStyles } from "../../utils/styles";
-import { ChangePassword } from "../../components/auth/change-password";
-import { ChangeEmail } from "./change-email";
 
 export const components: { [name: string]: ReactElement } = {
   colorpicker: <AccentColorPicker />,
@@ -71,7 +69,5 @@ export const components: { [name: string]: ReactElement } = {
       <AttachmentGroupProgress groupId="offline-mode" />
     </View>
   ),
-  "sidebar-tab-selector": <SidebarTabPicker />,
-  "change-password": <ChangePassword />,
-  "change-email": <ChangeEmail />
+  "sidebar-tab-selector": <SidebarTabPicker />
 };

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

@@ -32,9 +32,11 @@ import { enabled } from "react-native-privacy-snapshot";
 import ScreenGuardModule from "react-native-screenguard";
 import { db } from "../../common/database";
 import filesystem from "../../common/filesystem";
+import { ChangePassword } from "../../components/auth/change-password";
 import { presentDialog } from "../../components/dialog/functions";
 import { AppLockPassword } from "../../components/dialogs/applock-password";
 import { endProgress, startProgress } from "../../components/dialogs/progress";
+import { ChangeEmail } from "../../components/sheets/change-email";
 import ExportNotesSheet from "../../components/sheets/export-notes";
 import { Issue } from "../../components/sheets/github/issue";
 import { Progress } from "../../components/sheets/progress";
@@ -241,15 +243,17 @@ export const settingsGroups: SettingSection[] = [
           {
             id: "change-password",
             name: strings.changePassword(),
-            type: "screen",
-            description: strings.changePasswordDesc(),
-            component: "change-password"
+            modifer: async () => {
+              ChangePassword.present();
+            },
+            description: strings.changePasswordDesc()
           },
           {
             id: "change-email",
             name: strings.changeEmail(),
-            type: "screen",
-            component: "change-email",
+            modifer: async () => {
+              ChangeEmail.present();
+            },
             description: strings.changeEmailDesc()
           },
           {

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

@@ -113,10 +113,7 @@ async function onBackgroundSyncStarted() {
       useUserStore.getState().setSyncing(false);
     }
     await Notifications.setupReminders();
-    if (SettingsService.get().notifNotes) {
-      Notifications.pinQuickNote(false);
-    }
-    Notifications.restorePinnedNotes();
+
     NotePreviewWidget.updateNotes();
     deleteDCacheFiles();
     DatabaseLogger.info("BACKGROUND SYNC COMPLETE");
@@ -145,7 +142,6 @@ const onBoot = async () => {
       Notifications.pinQuickNote(false);
     }
     Notifications.restorePinnedNotes();
-    NotePreviewWidget.updateNotes();
     DatabaseLogger.info("BOOT TASK COMPLETE");
   } catch (e) {
     DatabaseLogger.error(e as Error);

apps/mobile/app/services/intent.ts

@@ -18,12 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 import { Platform } from "react-native";
 import { db } from "../common/database";
+import ReminderSheet from "../components/sheets/reminder";
 import { setAppState } from "../screens/editor/tiptap/utils";
 import { eOnLoadNote } from "../utils/events";
 import { NotesnookModule } from "../utils/notesnook-module";
 import { eSendEvent } from "./event-manager";
 import { fluidTabsRef } from "../utils/global-refs";
-import AddReminder from "../screens/add-reminder";
 
 const launchIntent = Platform.OS === "ios" ? {} : NotesnookModule.getIntent();
 let used = false;
@@ -65,9 +65,9 @@ export const IntentService = {
         const reminder = await db.reminders.reminder(
           intent["com.streetwriters.notesnook.OpenReminderId"]
         );
-        if (reminder) AddReminder.present(reminder);
+        if (reminder) ReminderSheet.present(reminder);
       } else if (intent["com.streetwriters.notesnook.NewReminder"]) {
-        AddReminder.present();
+        ReminderSheet.present();
       }
     } catch (e) {
       /* empty */

apps/mobile/app/services/navigation.ts

@@ -68,9 +68,7 @@ const routeNames = {
   MoveNotebook: "MoveNotebook",
   LinkNotebooks: "LinkNotebooks",
   MoveNotes: "MoveNotes",
-  Archive: "Archive",
-  ManageTags: "ManageTags",
-  AddReminder: "AddReminder"
+  Archive: "Archive"
 };
 
 export type NavigationProps<T extends RouteName> = NativeStackScreenProps<
@@ -166,20 +164,6 @@ function closeDrawer() {
   fluidTabsRef.current?.closeDrawer();
 }
 
-function resetRootState() {
-  const state = rootNavigatorRef.getState();
-  const focusedRouteKey = state.routes[state.index].key;
-  const routes = state.routes.filter(
-    (route) => route.name !== "Auth" && route.name !== "Welcome"
-  );
-  const newIndex = routes.findIndex((route) => route.key === focusedRouteKey);
-  rootNavigatorRef.reset({
-    ...state,
-    routes: routes,
-    index: newIndex
-  });
-}
-
 const Navigation = {
   navigate,
   goBack,
@@ -191,8 +175,7 @@ const Navigation = {
   queueRoutesForUpdate,
   routeNeedsUpdate,
   routeNames,
-  routeUpdateFunctions,
-  resetRootState
+  routeUpdateFunctions
 };
 
 export default Navigation;

apps/mobile/app/services/notifications.ts

@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { getFormattedReminderTime } from "@notesnook/common";
 import { isReminderActive, Reminder } from "@notesnook/core";
 import { strings } from "@notesnook/intl";
 import notifee, {
@@ -37,7 +36,6 @@ 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";
@@ -54,6 +52,8 @@ 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[] = [];
 
@@ -348,7 +348,7 @@ async function scheduleNotification(
           title: title,
           message: description || "",
           ongoing: true,
-          // subtitle: description || "",
+          subtitle: description || "",
           actions: [strings.unpin()]
         });
       }
@@ -396,7 +396,7 @@ async function scheduleNotification(
             payload: payload || "",
             dateModified: reminder.dateModified + ""
           },
-          // subtitle: !description ? undefined : description,
+          subtitle: !description ? undefined : description,
           android: {
             channelId: await getChannelId(priority),
             smallIcon: "ic_stat_name",
@@ -454,7 +454,7 @@ async function loadNote(id: string, jump: boolean) {
   const tab = useTabStore.getState().getTabForNote(id);
   if (useTabStore.getState().currentTab !== tab) {
     eSendEvent(eOnLoadNote, {
-      item: note
+      note: note
     });
   }
 }
@@ -916,21 +916,8 @@ 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") {
@@ -940,22 +927,20 @@ 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;
 
-    if (!notificationsCancelled) {
-      const pending = triggers.filter((t) =>
-        t.notification.id?.startsWith(reminder.id)
-      );
+    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;
-      }
-
-      if (!needsReschedule && checkNeedsScheduling) continue;
+    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;
+
     await scheduleNotification(reminder);
   }
   // Check for any triggers whose notifications

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

@@ -49,7 +49,6 @@ export function createNotebookTreeStores(
 ) {
   const useNotebookTreeStore = create<{
     tree: TreeItem[];
-    isSearching?: boolean;
     setTree: (tree: TreeItem[]) => void;
     removeItem: (id: string) => void;
     addNotebooks: (
@@ -114,32 +113,16 @@ export function createNotebookTreeStores(
         }
       }
 
-      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
-          );
-        });
-      }
+      const newTreeItems = notebooks.map((notebook) => {
+        return {
+          parentId,
+          notebook,
+          depth: depth,
+          hasChildren: items.some((item) => {
+            return item.fromId === notebook.id;
+          })
+        };
+      });
 
       newTree.splice(parentIndex + 1, 0, ...newTreeItems);
 
@@ -147,7 +130,7 @@ export function createNotebookTreeStores(
         const expanded =
           useNotebookExpandedStore.getState().expanded[item.notebook.id] &&
           item.hasChildren;
-        if (expanded && !get().isSearching) {
+        if (expanded) {
           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-navigation-store.ts

@@ -91,13 +91,6 @@ export interface RouteParams extends ParamListBase {
   MoveNotes: {
     notebook: Notebook;
   };
-  ManageTags: {
-    ids?: string[];
-  };
-  AddReminder: {
-    reminder?: Reminder;
-    reference?: Note;
-  };
 }
 
 export type RouteName = keyof RouteParams;

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

apps/mobile/native/Gemfile

@@ -1,10 +1,7 @@
 source 'https://rubygems.org'
-
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
-
-# Exclude problematic versions of cocoapods and activesupport that causes build failures.
-gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
-gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
-gem 'xcodeproj', '< 1.26.0'
-gem 'concurrent-ruby', '< 1.3.4'
+# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
+# bound in the template on Cocoapods with next React Native release.
+gem 'cocoapods', '>= 1.13', '< 1.15'
+gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'

apps/mobile/native/Gemfile.lock

@@ -1,41 +1,30 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.7)
-      base64
-      nkf
+    CFPropertyList (3.0.5)
       rexml
-    activesupport (7.2.2.1)
-      base64
-      benchmark (>= 0.3)
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
-      connection_pool (>= 2.2.5)
-      drb
+    activesupport (6.1.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
       minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
-    base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.2.1)
     claide (1.1.0)
-    cocoapods (1.15.2)
+    cocoapods (1.11.3)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.15.2)
+      cocoapods-core (= 1.11.3)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 2.1, < 3.0)
+      cocoapods-downloader (>= 1.4.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.6.0, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
@@ -43,10 +32,10 @@ GEM
       gh_inspector (~> 1.0)
       molinillo (~> 0.8.0)
       nap (~> 1.0)
-      ruby-macho (>= 2.3.0, < 3.0)
-      xcodeproj (>= 1.23.0, < 2.0)
-    cocoapods-core (1.15.2)
-      activesupport (>= 5.0, < 8)
+      ruby-macho (>= 1.0, < 3.0)
+      xcodeproj (>= 1.21.0, < 2.0)
+    cocoapods-core (1.11.3)
+      activesupport (>= 5.0, < 7)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
@@ -56,7 +45,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (2.1)
+    cocoapods-downloader (1.6.3)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -65,56 +54,47 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.3.3)
-    connection_pool (2.5.3)
-    drb (2.2.3)
+    concurrent-ruby (1.1.10)
     escape (0.0.4)
-    ethon (0.16.0)
+    ethon (0.15.0)
       ffi (>= 1.15.0)
-    ffi (1.17.2)
+    ffi (1.15.5)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    httpclient (2.9.0)
-      mutex_m
-    i18n (1.14.7)
+    httpclient (2.8.3)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    json (2.12.2)
-    logger (1.7.0)
-    minitest (5.25.5)
+    json (2.6.1)
+    minitest (5.15.0)
     molinillo (0.8.0)
-    mutex_m (0.3.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
-    nkf (0.2.0)
     public_suffix (4.0.7)
-    rexml (3.4.1)
+    rexml (3.2.5)
     ruby-macho (2.5.1)
-    securerandom (0.4.1)
-    typhoeus (1.4.1)
+    typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (2.0.6)
+    tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    xcodeproj (1.25.1)
+    xcodeproj (1.21.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
-      rexml (>= 3.3.6, < 4.0)
+      rexml (~> 3.2.4)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 6.1.7.5, != 7.1.0)
-  cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
-  concurrent-ruby (< 1.3.4)
-  xcodeproj (< 1.26.0)
+  cocoapods (~> 1.11, >= 1.11.2)
 
 RUBY VERSION
-   ruby 3.4.1p0
+   ruby 2.7.4p191
 
 BUNDLED WITH
-   2.6.2
+   2.2.27

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

@@ -48,9 +48,6 @@ react {
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     hermesFlags = ["-O", "-output-source-map"]
-
-    /* Autolinking */
-    autolinkLibrariesWithApp()
 }
 
 /**
@@ -124,7 +121,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode 3066
+        versionCode 3053
         versionName getNpmVersion()
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -261,3 +258,7 @@ copyFontFiles.dependsOn(copyEditorBundle);
 copyPlainEditorBundle.dependsOn(copyFontFiles);
 preBuild.dependsOn(copyPlainEditorBundle)
 
+apply from: file("../../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+
+
+

apps/mobile/native/android/app/src/main/AndroidManifest.xml

@@ -11,69 +11,67 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        tools:node="remove" />
-    <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE"
-        tools:node="remove" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission
-        android:name="android.permission.USE_FULL_SCREEN_INTENT"
-        tools:node="remove" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:node="remove"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" tools:node="remove"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" tools:node="remove" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
 
-    <uses-feature
-        android:name="android.hardware.camera"
-        android:required="false" />
 
     <queries>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
-            <data android:mimeType="application/pdf" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
-            <data android:mimeType="text/*" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
-            <data android:mimeType="image/*" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
+            <intent>
+                <action android:name="android.intent.action.VIEW" />
+                <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
+                <data android:mimeType="application/pdf" />
+            </intent>
+            <intent>
+                <action android:name="android.intent.action.VIEW" />
+                <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
+                <data android:mimeType="text/*" />
+            </intent>
+            <intent>
+                <action android:name="android.intent.action.VIEW" />
+                <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
+                <data android:mimeType="image/*" />
+            </intent>
+            <intent>
+                <action android:name="android.intent.action.VIEW" />
+                <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
 
-            <data android:mimeType="video/*" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
-            <data android:mimeType="audio/*" />
-        </intent>
-    </queries>
+                <data android:mimeType="video/*" />
+            </intent>
+            <intent>
+                <action android:name="android.intent.action.VIEW" />
+                <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
+                <data android:mimeType="audio/*" />
+            </intent>
+        </queries>
 
     <application
         android:name=".MainApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:largeHeap="true"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"
-        android:supportsRtl="true"
-        android:theme="@style/BootTheme">
+        android:theme="@style/BootTheme"
+        android:largeHeap="true"
+        android:supportsRtl="false"
+        android:networkSecurityConfig="@xml/network_security_config"
+        tools:replace="android:supportsRtl">
 
-        <receiver
-            android:name=".NoteWidget"
-            android:exported="false"
-            android:label="@string/quick_note">
+        <receiver android:exported="false" android:label="@string/reminders_title" android:name=".ReminderWidgetProvider">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_reminders_info" />
+        </receiver>
+    
+        <receiver android:exported="false" android:label="@string/quick_note" android:name=".NoteWidget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -83,10 +81,7 @@
                 android:resource="@xml/new_note_widget_info" />
         </receiver>
 
-        <receiver
-            android:name=".NotePreviewWidget"
-            android:exported="false"
-            android:label="@string/note">
+        <receiver android:exported="false" android:label="@string/note" android:name=".NotePreviewWidget">
             <intent-filter>"
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -96,49 +91,33 @@
                 android:resource="@xml/note_widget_info" />
         </receiver>
 
-        <receiver
-            android:name=".ReminderWidgetProvider"
-            android:exported="false"
-            android:label="@string/reminders_title">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/widget_reminders_info" />
-        </receiver>
-
-        <activity
-            android:name=".NotePreviewConfigureActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
-            android:exported="true"
+        <activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
             android:label="NotePreviewConfigure"
             android:launchMode="singleTask"
+            android:exported="true"
             android:theme="@style/AppTheme"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize" android:name=".NotePreviewConfigureActivity">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
             </intent-filter>
         </activity>
 
         <activity
             android:name=".MainActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
-            android:exported="true"
             android:label="@string/app_name"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
-
+                <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
             <intent-filter android:label="Notesnook">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
@@ -149,7 +128,6 @@
 
             <intent-filter android:label="Notesnook">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
@@ -157,25 +135,22 @@
             </intent-filter>
 
         </activity>
-        <activity
-            android:name="com.facebook.react.devsupport.DevSettingsActivity"
-            android:exported="false" />
+        <activity android:exported="false" android:name="com.facebook.react.devsupport.DevSettingsActivity" />
         <activity
             android:name=".ShareActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
-            android:excludeFromRecents="true"
-            android:exported="true"
             android:label="@string/title_activity_share"
             android:noHistory="true"
             android:screenOrientation="unspecified"
+            android:exported="true"
             android:taskAffinity=""
-            android:theme="@style/AppThemeB"
-            android:windowSoftInputMode="adjustResize">
+            android:excludeFromRecents="true"
+            android:windowSoftInputMode="adjustResize"
+            android:theme="@style/AppThemeB">
 
             <intent-filter android:label="Make Note">
                 <action android:name="android.intent.action.SEND" />
                 <category android:name="android.intent.category.DEFAULT" />
-
                 <data android:mimeType="text/*" />
                 <data android:mimeType="image/*" />
                 <data android:mimeType="video/*" />
@@ -186,7 +161,6 @@
             <intent-filter android:label="Make Note">
                 <action android:name="android.intent.action.SEND_MULTIPLE" />
                 <category android:name="android.intent.category.DEFAULT" />
-
                 <data android:mimeType="text/*" />
                 <data android:mimeType="image/*" />
                 <data android:mimeType="video/*" />
@@ -206,41 +180,35 @@
             android:enabled="true"
             android:exported="true"
             android:stopWithTask="false" />
-        <service android:name="com.asterinet.react.bgactions.RNBackgroundActionsTask" />
+        <service android:name="com.asterinet.react.bgactions.RNBackgroundActionsTask" />   
 
-        <service
-            android:name="com.streetwriters.notesnook.BootTaskService"
-            android:foregroundServiceType="specialUse">
-            <property
-                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                android:value="The service is required by the app to restore notifications of pinned notes, restore notification with reply input for creating notes and restore data in note preview widgets on device reboot." />
-        </service>
+        <service android:name="com.streetwriters.notesnook.BootTaskService" android:foregroundServiceType="dataSync" />
 
         <service
             android:name=".NotesnookTileService"
-            android:exported="true"
             android:icon="@drawable/add_note"
             android:label="New note"
+            android:exported="true"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE" />
+                <action android:name="android.service.quicksettings.action.QS_TILE"/>
             </intent-filter>
         </service>
 
-        <service
-            android:name=".ReminderViewsService"
-            android:exported="true"
-            android:permission="android.permission.BIND_REMOTEVIEWS" />
+        <service 
+        android:name=".ReminderViewsService"
+        android:exported="true"
+        android:permission="android.permission.BIND_REMOTEVIEWS" />
 
         <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_viewer_provider_paths" />
-        </provider>
+        android:name="androidx.core.content.FileProvider"
+        android:authorities="${applicationId}.provider"
+        android:grantUriPermissions="true"
+        android:exported="false">
+        <meta-data
+            android:name="android.support.FILE_PROVIDER_PATHS"
+            android:resource="@xml/file_viewer_provider_paths" />
+    </provider> 
 
         <provider
             android:name="com.vinzscam.reactnativefileviewer.FileProvider"
@@ -252,14 +220,12 @@
                 android:resource="@xml/file_viewer_provider_paths" />
         </provider>
 
-        <receiver
-            android:name=".BootRecieverService"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
-            </intent-filter>
-        </receiver>
+       <receiver android:exported="true" android:name=".BootRecieverService">
+           <intent-filter>
+               <action android:name="android.intent.action.BOOT_COMPLETED" />
+               <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+           </intent-filter>
+      </receiver>
 
     </application>
 

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

@@ -39,6 +39,7 @@ public class BootTaskService extends HeadlessJsTaskService {
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
             NotificationChannel channel = new NotificationChannel("com.streetwriters.notesnook",
                     "Default",
@@ -54,7 +55,7 @@ public class BootTaskService extends HeadlessJsTaskService {
                 this.startForeground(
                         1,
                         notification,
-                        ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE);
+                        ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC);
             } else {
                 this.startForeground(
                         1,

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

@@ -3,16 +3,8 @@ package com.streetwriters.notesnook;
 import com.facebook.react.ReactActivity;
 import android.content.Intent;
 import android.content.res.Configuration;
-import androidx.core.graphics.Insets;
-import android.os.Build;
 import android.os.Bundle;
-import android.view.View;
 import android.webkit.WebView;
-
-import androidx.core.view.OnApplyWindowInsetsListener;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
-
 import com.facebook.react.ReactActivityDelegate;
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
 import com.facebook.react.defaults.DefaultReactActivityDelegate;
@@ -30,20 +22,6 @@ public class MainActivity extends ReactActivity {
     try {
       startService(new Intent(getBaseContext(), OnClearFromRecentService.class));
     } catch (Exception ignored) {}
-
-    if (Build.VERSION.SDK_INT >= 35) {
-      final View rootView = findViewById(android.R.id.content);
-      ViewCompat.setOnApplyWindowInsetsListener(rootView, (v, insets) -> {
-        Insets innerPadding = insets.getInsets(WindowInsetsCompat.Type.ime());
-        rootView.setPadding(
-                innerPadding.left,
-                innerPadding.top,
-                innerPadding.right,
-                innerPadding.bottom
-        );
-        return insets;
-      });
-    }
   }
 
   /**

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

@@ -10,7 +10,6 @@ import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
 import com.facebook.soloader.SoLoader
-import com.facebook.react.soloader.OpenSourceMergedSoMapping
  
 class MainApplication : Application(), ReactApplication {
  
@@ -37,7 +36,7 @@ class MainApplication : Application(), ReactApplication {
  
   override fun onCreate() {
     super.onCreate()
-    SoLoader.init(this, OpenSourceMergedSoMapping)
+    SoLoader.init(this, false)
     if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
       // If you opted-in for the New Architecture, we load the native entry point for this app.
       load()

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

@@ -48,8 +48,7 @@ public class NotePreviewWidget extends AppWidgetProvider {
     private static Bundle getActivityOptionsBundle() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             ActivityOptions activityOptions = ActivityOptions.makeBasic();
-            activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(
-                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
+            activityOptions.setPendingIntentBackgroundActivityStartMode(ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
             return activityOptions.toBundle();
         } else
             return null;

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

@@ -31,8 +31,7 @@ public class NoteWidget extends AppWidgetProvider {
     private static Bundle getActivityOptionsBundle() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             ActivityOptions activityOptions = ActivityOptions.makeBasic();
-            activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(
-                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
+            activityOptions.setPendingIntentBackgroundActivityStartMode(ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
             return activityOptions.toBundle();
         } else
             return null;

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

@@ -7,9 +7,7 @@ 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;
@@ -219,24 +217,4 @@ 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/app/src/main/java/com/streetwriters/notesnook/ReminderWidgetProvider.java

@@ -26,8 +26,7 @@ public class ReminderWidgetProvider extends AppWidgetProvider {
     private static Bundle getActivityOptionsBundle() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             ActivityOptions activityOptions = ActivityOptions.makeBasic();
-            activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(
-                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
+            activityOptions.setPendingIntentBackgroundActivityStartMode(ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
             return activityOptions.toBundle();
         } else
             return null;

apps/mobile/native/android/build.gradle

@@ -3,16 +3,16 @@ import org.apache.tools.ant.taskdefs.condition.Os
 
 buildscript {
     ext {
-        buildToolsVersion = "35.0.0"
-        minSdkVersion = 24
-        compileSdkVersion = 35
-        targetSdkVersion = 35
-        kotlinVersion = '2.0.21'
+        buildToolsVersion = "34.0.0"
+        minSdkVersion = 23
+        compileSdkVersion = 34
+        targetSdkVersion = 34
+        kotlinVersion = '1.9.22'
         androidXAnnotation = "1.1.0"
         androidXCoreVersion = "1.7.0"
         androidXCore = "1.7.0"
         androidXBrowser = "1.0.0"
-        ndkVersion = "27.1.12297006"
+        ndkVersion = "23.2.8568313"
     }
     
     repositories {

apps/mobile/native/android/gradle.properties

@@ -23,7 +23,7 @@ org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-# android.enableJetifier=true
+android.enableJetifier=true
 
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using

apps/mobile/native/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME