editor: remove table view

* fix tables not hiding under collapsed headings in readonly view
* allow column resizing in readonly view
* fix scrollbar not showing in readonly view

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

.github/pull_request_template.md

@@ -1,30 +0,0 @@
-## Description
-<!-- Add a detailed summary of what this feature/bugfix does -->
-
-## Type of Change
-- [ ] Bug fix
-- [ ] Feature
-
-## Visuals
-- [ ] Attached relevant screenshots / screen recording / GIF
-- [ ] N/A (not a feature or no UI changes)
-
-## Testing
-- [ ] Ran all E2E tests
-- [ ] Ran all integration tests
-- [ ] Added/updated tests for this change (if needed)
-- [ ] N/A (tests not needed — explanation provided below)
-
-### If tests were not added, explain why
-<!-- explanation -->
-
-## Platform
-<!-- Describe which platforms this PR is related to -->
-
-- [ ] Web
-- [ ] Mobile
-- [ ] Desktop
-
-## Sign-off
-- [ ] QA passed
-- [ ] UI/UX passed

.github/workflows/android.e2e.yml

@@ -55,13 +55,13 @@ jobs:
       - name: Detox build
         run: |
           yarn build:android
-          ls apps/mobile/android/app/build/outputs/apk
-          ls apps/mobile/android/app/build/outputs/apk/release
+          ls apps/mobile/native/android/app/build/outputs/apk
+          ls apps/mobile/native/android/app/build/outputs/apk/release
 
       - name: Get device name
         id: device
         run: |
-          AVD_NAME=$(node -p "require('./apps/mobile/.detoxrc.js').devices.emulator.device.avdName")
+          AVD_NAME=$(node -p "require('./apps/mobile/native/.detoxrc.js').devices.emulator.device.avdName")
           echo "AVD_NAME=$AVD_NAME" >> $GITHUB_OUTPUT
 
       - name: AVD cache

.github/workflows/android.preview.firebase.yml

@@ -1,135 +0,0 @@
-name: Notesnook Android Preview
-
-on:
-  pull_request_target:
-    types: [opened, reopened, synchronize]
-    branches: [master, beta]
-    paths:
-      - "apps/mobile/**"
-      - "packages/**"
-      - ".github/workflows/android.preview.firebase.yml"
-
-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
-    runs-on: ubuntu-22.04
-    env:
-      STAGING_BUILD: true
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.ref }}
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Use specific Java version for the builds
-        uses: joschi/setup-jdk@v2
-        with:
-          java-version: "17"
-          architecture: "x64"
-
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          # this might remove tools that are actually needed,
-          # if set to "true" but frees about 6 GB
-          tool-cache: false
-
-          # all of these default to true, but feel free to set to
-          # "false" if necessary for your workflow
-          android: false
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
-
-      - name: Install node modules
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=mobile
-
-      - name: Make Gradlew Executable
-        run: cd apps/mobile/android && chmod +x ./gradlew
-
-      - name: Get build number
-        id: build-number
-        run: echo "timestamp=$(($(date +%s) - 1774851180 ))" >> $GITHUB_OUTPUT
-
-      - name: Check for typescript errors
-        run: |
-          npm run tx mobile:build
-          cd apps/mobile
-          npx tsc --noEmit
-
-      - name: Build arm64-v8a apk
-        run: |
-          cd apps/mobile/android
-          ./gradlew assembleRelease -PreactNativeArchitectures=arm64-v8a -PstagingReleaseBuild=true -PprBuildNumber=${{ steps.build-number.outputs.timestamp }}
-
-      - name: Get app version
-        id: package-version
-        uses: saionaro/extract-package-version@master
-        with:
-          path: apps/mobile
-
-      - name: Publish to firebase CLI
-        id: firebase-output
-        uses: wzieba/Firebase-Distribution-Github-Action@v1
-        with:
-          appId: ${{secrets.FIREBASE_APP_ID}}
-          serviceCredentialsFileContent: ${{ secrets.QA_SERVICE_ACCOUNT }}
-          groups: testers
-          file: apps/mobile/android/app/build/outputs/apk/release/app-arm64-v8a-release.apk
-          releaseNotes: Preview for https://github.com/streetwriters/notesnook/pull/${{github.event.number}}
-
-      - name: Post or update PR comment
-        uses: actions/github-script@v6
-        env:
-          preview_url: ${{ steps.firebase-output.outputs.TESTING_URI }}
-        with:
-          script: |
-            const marker = '<!-- android-preview-comment -->';
-            const prNumber = context.issue.number;
-            const previewUrl = process.env.preview_url || '';
-            const body = `${marker}\n**Android App Preview**\n\n${previewUrl || 'Preview URL unavailable — check workflow logs.'}\n\nCommit: ${process.env.GITHUB_SHA}\n`;
-            const { data: comments } = await github.rest.issues.listComments({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: prNumber,
-            });
-            const existing = comments.find(c => c.body && c.body.includes(marker));
-            if (existing) {
-              await github.rest.issues.updateComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: existing.id,
-                body,
-              });
-            } else {
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: prNumber,
-                body,
-              });
-            }
-
-      - name: Upload sourcemaps
-        uses: actions/upload-artifact@v4
-        with:
-          name: sourcemaps
-          path: |
-            apps/mobile/android/app/build/generated/sourcemaps/**/*.map

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

@@ -113,7 +113,7 @@ jobs:
           keyStorePassword: ${{ secrets.KEY_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
         env:
-          BUILD_TOOLS_VERSION: "36.0.0"
+          BUILD_TOOLS_VERSION: "33.0.0"
 
       - name: Build apks for Github release
         run: yarn release:android
@@ -128,7 +128,7 @@ jobs:
           keyStorePassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}
           keyPassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}
         env:
-          BUILD_TOOLS_VERSION: "36.0.0"
+          BUILD_TOOLS_VERSION: "33.0.0"
 
       - name: Rename apk files
         run: |

.github/workflows/android.publish.yml

@@ -24,22 +24,6 @@ jobs:
           java-version: "17"
           architecture: "x64"
 
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          # this might remove tools that are actually needed,
-          # if set to "true" but frees about 6 GB
-          tool-cache: false
-
-          # all of these default to true, but feel free to set to
-          # "false" if necessary for your workflow
-          android: false
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
-
       - name: Install node modules
         run: |
           npm ci --ignore-scripts --prefer-offline --no-audit
@@ -113,7 +97,7 @@ jobs:
           keyStorePassword: ${{ secrets.KEY_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
         env:
-          BUILD_TOOLS_VERSION: "36.0.0"
+          BUILD_TOOLS_VERSION: "33.0.0"
 
       - name: Build apks for Github release
         run: yarn release:android
@@ -128,7 +112,7 @@ jobs:
           keyStorePassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}
           keyPassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}
         env:
-          BUILD_TOOLS_VERSION: "36.0.0"
+          BUILD_TOOLS_VERSION: "33.0.0"
 
       - name: Rename apk files
         run: |
@@ -140,7 +124,7 @@ jobs:
 
       - name: Get app version
         id: package-version
-        uses: saionaro/extract-package-version@master
+        uses: martinbeentjes/npm-get-version-action@master
         with:
           path: apps/mobile
 
@@ -159,8 +143,8 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           draft: true
-          tag_name: ${{ steps.package-version.outputs.version}}-android
-          name: Notesnook Android v${{ steps.package-version.outputs.version}}
+          tag_name: ${{ steps.package-version.outputs.current-version}}-android
+          name: Notesnook Android v${{ steps.package-version.outputs.current-version}}
           repository: streetwriters/notesnook
           token: ${{ secrets.GITHUB_TOKEN }}
           files: |

.github/workflows/desktop.preview.yml

@@ -1,257 +0,0 @@
-name: Preview @notesnook/desktop
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches: [master, beta]
-    paths:
-      - "apps/desktop/**"
-      - "apps/web/**"
-      - "packages/**"
-      # re-run workflow if workflow file changes
-      - ".github/workflows/desktop.preview.yml"
-
-jobs:
-  build:
-    if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
-    name: Build
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=web
-          npm run bootstrap -- --scope=desktop
-
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/desktop
-
-      - name: Generate desktop build (stable)
-        run: npm run tx @notesnook/web:build:desktop
-
-      - name: Build desktop bundle
-        working-directory: ./apps/desktop
-        run: npm run bundle
-
-      - name: Archive build artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: build
-          path: apps/web/build/**/*
-
-  build-macos:
-    name: Build for macOS
-    needs: build
-    runs-on: macos-14
-    outputs:
-      macos-artifact-url: ${{ steps.artifact-upload-step.outputs.artifact-url }}
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Install setuptools
-        run: brew install python-setuptools
-
-      - name: Setup notarization
-        run: |
-          mkdir -p ~/private_keys/
-          echo '${{ secrets.api_key }}' > ~/private_keys/AuthKey_${{ secrets.api_key_id }}.p8
-
-      - name: Collect app metadata
-        id: app_metadata
-        working-directory: ./apps/desktop
-        run: |
-          echo ::set-output name=apple_app_id::$(cat package.json | jq -r .appAppleId)
-          echo ::set-output name=app_bundle_id::$(cat package.json | jq -r .build.appId)
-          echo ::set-output name=app_version::$(cat package.json | jq -r .version)
-          echo ::set-output name=bundle_version::$(cat package.json | jq -r .build.mac.bundleVersion)
-
-      - name: Download build
-        uses: actions/download-artifact@v4
-        with:
-          name: build
-          path: ./apps/web/build
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
-
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/desktop
-
-      - name: Install provisioning profile
-        run: echo "${{ secrets.MAC_PROVISIONING_PROFILE }}" | base64 --decode > embedded.provisionprofile
-        working-directory: ./apps/desktop
-
-      - name: Build dmg
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CSC_LINK: ${{ secrets.mac_certs }}
-          CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }}
-          APPLE_API_KEY: ~/private_keys/AuthKey_${{ secrets.api_key_id }}.p8
-          APPLE_API_KEY_ID: ${{ secrets.api_key_id }}
-          APPLE_API_ISSUER: ${{ secrets.api_key_issuer_id }}
-        run: |
-          npm run tx @notesnook/desktop:release
-          cd apps/desktop
-          yarn electron-builder --config=electron-builder.config.js --mac dmg --arm64 -p never
-
-      - name: Upload dmg artifact
-        id: artifact-upload-step
-        uses: actions/upload-artifact@v4
-        with:
-          name: macos-build
-          path: apps/desktop/output/*.dmg
-
-  build-linux-x64:
-    name: Build for Linux x64
-    needs: build
-    runs-on: ubuntu-22.04
-    outputs:
-      linux-x64-artifact-url: ${{ steps.artifact-upload-step.outputs.artifact-url }}
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Download build
-        uses: actions/download-artifact@v4
-        with:
-          name: build
-          path: ./apps/web/build
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
-
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/desktop
-
-      - name: Build Electron wrapper
-        run: npm run tx @notesnook/desktop:release
-
-      - name: Build AppImage
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: yarn electron-builder --config=electron-builder.config.js --linux AppImage:x64 -p never
-        working-directory: ./apps/desktop
-
-      - name: Upload AppImage artifact
-        id: artifact-upload-step
-        uses: actions/upload-artifact@v4
-        with:
-          name: linux-x64-build
-          path: apps/desktop/output/*.AppImage
-
-  build-windows:
-    name: Build for Windows
-    needs: build
-    runs-on: windows-latest
-    outputs:
-      windows-artifact-url: ${{ steps.artifact-upload-step.outputs.artifact-url }}
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Download build
-        uses: actions/download-artifact@v4
-        with:
-          name: build
-          path: ./apps/web/build
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
-
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-
-          npm i --cpu arm64 sqlite3-fts5-html
-          npm i --cpu x64 sqlite3-fts5-html
-        working-directory: ./apps/desktop
-
-      - name: Build
-        run: node scripts/execute.mjs @notesnook/desktop:release
-
-      - name: Publish
-        env:
-          NOTESNOOK_STAGING: true
-        run: yarn electron-builder --config=electron-builder.config.js --win nsis:x64 --publish never
-        working-directory: ./apps/desktop
-
-      - name: Upload exe artifact
-        id: artifact-upload-step
-        uses: actions/upload-artifact@v4
-        with:
-          name: windows-build
-          path: apps/desktop/output/*.exe
-
-  post-pr-comment:
-    name: Post PR comment with preview URLs
-    needs: [build, build-macos, build-linux-x64, build-windows]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Post or update PR comment
-        uses: actions/github-script@v6
-        env:
-          macos_artifact_url: ${{ needs.build-macos.outputs.macos-artifact-url }}
-          linux_x64_artifact_url: ${{ needs.build-linux-x64.outputs.linux-x64-artifact-url }}
-          windows_artifact_url: ${{ needs.build-windows.outputs.windows-artifact-url }}
-        with:
-          script: |
-            const marker = '<!-- desktop-preview-comment -->';
-            const prNumber = context.issue.number;
-            const previewUrl = [
-              { platform: 'macOS', url: process.env.macos_artifact_url },
-              { platform: 'Linux x64', url: process.env.linux_x64_artifact_url },
-              { platform: 'Windows x64', url: process.env.windows_artifact_url },
-            ].filter(u => u.url).map(u => `- [${u.platform}](${u.url})`).join('\n');
-            const body = `${marker}\n**Desktop Previews**\n\n${previewUrl || 'Preview URL unavailable — check workflow logs.'}\n\nCommit: ${process.env.GITHUB_SHA}\n`;
-            const { data: comments } = await github.rest.issues.listComments({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: prNumber,
-            });
-            const existing = comments.find(c => c.body && c.body.includes(marker));
-            if (existing) {
-              await github.rest.issues.updateComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: existing.id,
-                body,
-              });
-            } else {
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: prNumber,
-                body,
-              });
-            }

.github/workflows/desktop.tests.yml

@@ -45,7 +45,7 @@ jobs:
   test-macos-x64:
     name: Test macOS x64
     needs: build
-    runs-on: macos-15-intel
+    runs-on: macos-13
 
     steps:
       - name: Check out Git repository

.github/workflows/ios.preview.firebase.yml

@@ -1,168 +0,0 @@
-name: Notesnook iOS Preview
-
-on:
-  pull_request_target:
-    types: [opened, reopened, synchronize]
-    branches: [master, beta]
-    paths:
-      - "apps/mobile/**"
-      - "packages/**"
-      - ".github/workflows/ios.preview.firebase.yml"
-
-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
-    runs-on: macos-26
-    timeout-minutes: 60
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.ref }}
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: "26.1.1"
-
-      - name: Install node modules
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=mobile
-
-      - name: Build packages
-        run: npm run tx @notesnook/mobile:build
-
-      - name: Cache Pods
-        uses: actions/cache@v3
-        id: pods-cache
-        with:
-          path: apps/mobile/ios/Pods
-          key: ${{ runner.os }}-pods-${{ hashFiles('apps/mobile/ios/Podfile.lock') }}
-
-      - name: Install Pods
-        run: |
-          cd apps/mobile/ios
-          pod install
-
-      - name: Check for typescript errors
-        run: |
-          npm run tx mobile:build
-          cd apps/mobile
-          npx tsc --noEmit
-
-      - name: Get marketing version
-        id: marketing-version
-        run: echo "version=$(grep "IOS_MARKETING_VERSION" apps/mobile/ios/build-configs/ios-build.staging.xcconfig | awk -F'=' '{print $2}' | xargs)" >> $GITHUB_OUTPUT
-
-      - name: Get build number
-        id: build-number
-        run: echo "timestamp=$(($(date +%s) - 1774851180 ))" >> $GITHUB_OUTPUT
-
-      - name: Make staging xcconfig active
-        run: |
-          cd apps/mobile/ios/build-configs
-          ./use-ios-build-config.sh staging --marketing-version ${{steps.marketing-version.outputs.version}} --build-number ${{steps.build-number.outputs.timestamp}}
-
-      - name: Build iOS App
-        uses: ammarahm-ed/ios-build-action@master
-        with:
-          bundle-identifier: org.streetwriters.notesnook
-          scheme: Notesnook
-          configuration: "Release"
-          export-options: apps/mobile/ios/ExportOptionsStaging.plist
-          export-method: "ad-hoc"
-          project-path: apps/mobile/ios/Notesnook.xcodeproj
-          workspace-path: apps/mobile/ios/Notesnook.xcworkspace
-          update-targets: |
-            Notesnook
-            Make Note
-            NotesWidgetExtension
-          disable-targets: Notesnook-tvOS,Notesnook-tvOSTests,NotesnookTests
-          code-signing-identity: Apple Distribution
-          team-id: ${{ secrets.APPLE_TEAM_ID }}
-          p12-base64: ${{ secrets.APPLE_CERTIFICATE_P12 }}
-          certificate-password: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }}
-          app-store-connect-api-key-issuer-id: ${{ secrets.API_KEY_ISSUER_ID }}
-          app-store-connect-api-key-id: ${{ secrets.APPSTORE_KEY_ID }}
-          app-store-connect-api-key-base64: ${{ secrets.APPSTORE_CONNECT_API_KEY_BASE64 }}
-          output-path: Notesnook.ipa
-          mobileprovision-base64: |
-            ${{ secrets.APPLE_MOBILE_PROVISION_ADHOC_APP }}
-            ${{ secrets.APPLE_MOBILE_PROVISION_ADHOC_SHARE }}
-            ${{ secrets.APPLE_MOBILE_PROVISION_ADHOC_WIDGET }}
-
-      - name: Upload IPA artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ios-preview-ipa
-          path: Notesnook.ipa
-          if-no-files-found: error
-          retention-days: 1
-
-  publish:
-    runs-on: ubuntu-latest
-    needs: build
-    timeout-minutes: 20
-
-    steps:
-      - name: Download IPA artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: ios-preview-ipa
-          path: .
-
-      - name: Publish to firebase CLI
-        id: firebase-output
-        uses: wzieba/Firebase-Distribution-Github-Action@v1
-        with:
-          appId: ${{secrets.FIREBASE_IOS_APP_ID}}
-          serviceCredentialsFileContent: ${{ secrets.QA_SERVICE_ACCOUNT }}
-          groups: testers
-          file: Notesnook.ipa
-          releaseNotes: Preview for https://github.com/streetwriters/notesnook/pull/${{github.event.number}}
-
-      - name: Post or update PR comment
-        uses: actions/github-script@v6
-        env:
-          preview_url: ${{ steps.firebase-output.outputs.TESTING_URI }}
-        with:
-          script: |
-            const marker = '<!-- ios-preview-comment -->';
-            const prNumber = context.issue.number;
-            const previewUrl = process.env.preview_url || '';
-            const body = `${marker}\n**iOS App Preview**\n\n${previewUrl || 'Preview URL unavailable — check workflow logs.'}\n\nCommit: ${process.env.GITHUB_SHA}\n`;
-            const { data: comments } = await github.rest.issues.listComments({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: prNumber,
-            });
-            const existing = comments.find(c => c.body && c.body.includes(marker));
-            if (existing) {
-              await github.rest.issues.updateComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: existing.id,
-                body,
-              });
-            } else {
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: prNumber,
-                body,
-              });
-            }

.github/workflows/ios.publish.yml

@@ -4,7 +4,7 @@ on: workflow_dispatch
 
 jobs:
   build:
-    runs-on: macos-26
+    runs-on: macos-14
     timeout-minutes: 60
 
     steps:
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "26.1.1"
+          xcode-version: "16.1"
 
       - name: Install node modules
         run: |
@@ -30,7 +30,7 @@ jobs:
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2.11
         with:
-          key: ${{ runner.os }}-ccache-${{ hashFiles(format('apps/mobile/ios/Podfile.lock')) }}
+          key: ${{ runner.os }}-ccache-${{ hashFiles(format('apps/mobile/native/ios/Podfile.lock')) }}
           max-size: 1500M
           restore-keys: |
             ${{ runner.os }}-ccache-
@@ -55,13 +55,14 @@ jobs:
         uses: actions/cache@v3
         id: pods-cache
         with:
-          path: apps/mobile/ios/Pods
-          key: ${{ runner.os }}-pods-${{ hashFiles('apps/mobile/ios/Podfile.lock') }}
+          path: apps/mobile/native/ios/Pods
+          key: ${{ runner.os }}-pods-${{ hashFiles('apps/mobile/native/ios/Podfile.lock') }}
 
       - name: Install Pods
         run: |
-          cd apps/mobile/ios
-          pod install
+          cd apps/mobile/native/ios
+          bundle install
+          RCT_NEW_ARCH_ENABLED=0 bundle exec pod install
 
       - name: Check for typescript errors
         run: |
@@ -78,9 +79,9 @@ jobs:
           bundle-identifier: org.streetwriters.notesnook
           scheme: Notesnook
           configuration: "Release"
-          export-options: apps/mobile/ios/ExportOptions.plist
-          project-path: apps/mobile/ios/Notesnook.xcodeproj
-          workspace-path: apps/mobile/ios/Notesnook.xcworkspace
+          export-options: apps/mobile/native/ios/ExportOptions.plist
+          project-path: apps/mobile/native/ios/Notesnook.xcodeproj
+          workspace-path: apps/mobile/native/ios/Notesnook.xcworkspace
           update-targets: |
             Notesnook
             Make Note
@@ -116,5 +117,5 @@ jobs:
           name: Notesnook.zip
           path: |
             Notesnook.ipa
-            apps/mobile/ios/**/*.map
+            apps/mobile/native/ios/**/*.map
             packages/editor-mobile/sourcemaps/*.map

.github/workflows/themes.publish.yml

@@ -1,78 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-# GitHub recommends pinning actions to a commit SHA.
-# To get a newer version, you will need to update the SHA.
-# You can also reference a tag or branch, but the action may change without warning.
-
-name: Publish @notesnook/themes-server
-
-on: workflow_dispatch
-
-jobs:
-  push_to_registry:
-    name: Push Docker image to Docker Hub
-    runs-on: ubuntu-22.04
-    permissions:
-      packages: write
-      contents: read
-      attestations: write
-      id-token: write
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
-
-      - name: Collect package metadata
-        id: package_metadata
-        working-directory: ./servers/themes
-        run: |
-          echo ::set-output name=app_version::$(cat package.json | jq -r .version)
-
-      # Setup Buildx
-      - name: Docker Setup Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          platforms: linux/amd64,linux/arm64
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          ecr: auto
-          logout: true
-
-      # Pull previous image from docker hub to use it as cache to improve the image build time.
-      - name: docker pull cache image
-        continue-on-error: true
-        run: docker pull streetwriters/themes-server:latest
-
-      # Setup QEMU
-      # - name: Set up QEMU
-      #   uses: docker/setup-qemu-action@v2
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: streetwriters/themes-server
-
-      - name: Build and push Docker image
-        id: push
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: servers/themes/Dockerfile
-          push: true
-          platforms: linux/amd64,linux/arm64
-          tags: streetwriters/themes-server:${{ steps.package_metadata.outputs.app_version }},streetwriters/themes-server:latest
-          cache-from: streetwriters/themes-server:latest
-
-      - name: Generate artifact attestation
-        uses: actions/attest-build-provenance@v1
-        with:
-          subject-name: index.docker.io/streetwriters/themes-server
-          subject-digest: ${{ steps.push.outputs.digest }}
-          push-to-registry: true

.github/workflows/web.benchmarks.yml

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

.github/workflows/web.preview.yml

@@ -1,80 +0,0 @@
-name: Notesnook Web PR Preview
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches: [master, beta]
-    paths:
-      - "apps/web/**"
-      - "packages/**"
-      # re-run workflow if workflow file changes
-      - ".github/workflows/web.preview.yml"
-
-jobs:
-  build-and-deploy:
-    if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
-    runs-on: ubuntu-latest
-    env:
-      CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-      CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Build web
-        run: npm run build:web
-
-      - name: Deploy to Cloudflare Pages
-        id: deploy
-        working-directory: ./apps/web
-        run: |
-          set -euo pipefail
-          BRANCH=pr-${{ github.event.number }}-$(echo "${{ github.sha }}" | cut -c1-7)
-          echo "Deploying branch: $BRANCH"
-          DEPLOY_OUT=$(npx --yes wrangler pages deploy --project-name=notesnook-app --branch="$BRANCH" ./build 2>&1) || { echo "$DEPLOY_OUT"; exit 1; }
-          echo "$DEPLOY_OUT"
-          PREVIEW_URL=$(printf "%s" "$DEPLOY_OUT" | grep -Eo 'https?://[^ ]+' | head -1 || true)
-          if [ -z "$PREVIEW_URL" ]; then
-            echo "WARNING: could not parse preview URL from wrangler output"
-          fi
-          echo "preview_url=$PREVIEW_URL" >> $GITHUB_ENV
-
-      - name: Post or update PR comment
-        uses: actions/github-script@v6
-        env:
-          preview_url: ${{ env.preview_url }}
-        with:
-          script: |
-            const marker = '<!-- pages-preview-comment -->';
-            const prNumber = context.issue.number;
-            const previewUrl = process.env.preview_url || '';
-            const body = `${marker}\n**Cloudflare Pages Preview**\n\n${previewUrl || 'Preview URL unavailable — check workflow logs.'}\n\nCommit: ${process.env.GITHUB_SHA}\n`;
-            const { data: comments } = await github.rest.issues.listComments({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: prNumber,
-            });
-            const existing = comments.find(c => c.body && c.body.includes(marker));
-            if (existing) {
-              await github.rest.issues.updateComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: existing.id,
-                body,
-              });
-            } else {
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: prNumber,
-                body,
-              });
-            }

.vscode/settings.json

@@ -11,5 +11,5 @@
     "cache": true,
     "cacheStrategy": "content"
   },
-  "git.rebaseWhenSync": false
+  "git.rebaseWhenSync": true
 }

apps/desktop/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/desktop",
-  "version": "3.3.13",
+  "version": "3.3.6-beta.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/desktop",
-      "version": "3.3.13",
+      "version": "3.3.6-beta.0",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {
@@ -19,8 +19,8 @@
         "electron-trpc": "0.7.1",
         "electron-updater": "^6.6.2",
         "icojs": "^0.19.5",
-        "sqlite-better-trigram": "0.0.5",
-        "sqlite3-fts5-html": "^0.0.6",
+        "sqlite-better-trigram": "0.0.3",
+        "sqlite3-fts5-html": "^0.0.4",
         "typed-emitter": "^2.1.0",
         "yargs": "^17.7.2",
         "zod": "3.24.3"
@@ -6316,23 +6316,23 @@
       "optional": true
     },
     "node_modules/sqlite-better-trigram": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/sqlite-better-trigram/-/sqlite-better-trigram-0.0.5.tgz",
-      "integrity": "sha512-LDAuMzU2u9rhJyNmSxZyJiL3lWb8FjUqX/JZ3dwmo16Cl0zmkzFvGS94yfjLhwEce1yg1UE851Mz5UplWNhhpg==",
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/sqlite-better-trigram/-/sqlite-better-trigram-0.0.3.tgz",
+      "integrity": "sha512-r+SDeNk+K1VotrUx/w0TMu4FdjoDDPCqxhtfU50dSeTzfCFtkMBq1/E3gvsaiHi3UYtOa6siA8CK/gYlj75eCA==",
       "license": "Public Domain",
       "optionalDependencies": {
-        "sqlite-better-trigram-darwin-arm64": "0.0.5",
-        "sqlite-better-trigram-darwin-x64": "0.0.5",
-        "sqlite-better-trigram-linux-arm64": "0.0.5",
-        "sqlite-better-trigram-linux-x64": "0.0.5",
-        "sqlite-better-trigram-windows-arm64": "0.0.5",
-        "sqlite-better-trigram-windows-x64": "0.0.5"
+        "sqlite-better-trigram-darwin-arm64": "0.0.3",
+        "sqlite-better-trigram-darwin-x64": "0.0.3",
+        "sqlite-better-trigram-linux-arm64": "0.0.3",
+        "sqlite-better-trigram-linux-x64": "0.0.3",
+        "sqlite-better-trigram-windows-arm64": "0.0.3",
+        "sqlite-better-trigram-windows-x64": "0.0.3"
       }
     },
     "node_modules/sqlite-better-trigram-darwin-arm64": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/sqlite-better-trigram-darwin-arm64/-/sqlite-better-trigram-darwin-arm64-0.0.5.tgz",
-      "integrity": "sha512-AVSfFHLDAuttkKtlXCMHbhtV6Dv8M48e4ucTfjMOpGenJTEWmXx3Goj/ZCHe3uLEW57qaely15AAl/xFOsGSLA==",
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/sqlite-better-trigram-darwin-arm64/-/sqlite-better-trigram-darwin-arm64-0.0.3.tgz",
+      "integrity": "sha512-ddL0K3v10bvqjuUgPSRfP1qFZAhO/43ruaWtWS5wu4DgikldGz1tBY+nQtdc+Xt0arrEMUyiEvOz7MuKHQNA0Q==",
       "cpu": [
         "arm64"
       ],
@@ -6343,9 +6343,9 @@
       ]
     },
     "node_modules/sqlite-better-trigram-darwin-x64": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/sqlite-better-trigram-darwin-x64/-/sqlite-better-trigram-darwin-x64-0.0.5.tgz",
-      "integrity": "sha512-SxrQxI8r42+WN8DZxKuTQtSPmY7TLwtk5VoKbRN6HuNkb4rx8ZmmKeVmVA8u+hLkO4bzh2GtydOrlTdIgg5g5Q==",
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/sqlite-better-trigram-darwin-x64/-/sqlite-better-trigram-darwin-x64-0.0.3.tgz",
+      "integrity": "sha512-IQzFzXt0ib1MZ/UQm71X7RKv8G0vwepNqcmncWbK1R7LAWwpS/qaJ1NyrMOhL2AnfeQ33x1IkQE0GlamxFVC9A==",
       "cpu": [
         "x64"
       ],
@@ -6356,9 +6356,9 @@
       ]
     },
     "node_modules/sqlite-better-trigram-linux-arm64": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/sqlite-better-trigram-linux-arm64/-/sqlite-better-trigram-linux-arm64-0.0.5.tgz",
-      "integrity": "sha512-jrm5jDUfozFEU3ErN2NosQHTi53XouXBrrhzoigAYWYhfk+oeMbN7MWdzv5y5eZNH5uUSRc8/Kj6XO8rx147mw==",
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/sqlite-better-trigram-linux-arm64/-/sqlite-better-trigram-linux-arm64-0.0.3.tgz",
+      "integrity": "sha512-NTykERCSxAutAtJ9ITwOQBitC9zDg61tTDoLOGdMoDO2iAQNLuGApNS8qFvnCNl1wZy8yowI24rHYMCWLDIEIA==",
       "cpu": [
         "arm64"
       ],
@@ -6369,9 +6369,9 @@
       ]
     },
     "node_modules/sqlite-better-trigram-linux-x64": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/sqlite-better-trigram-linux-x64/-/sqlite-better-trigram-linux-x64-0.0.5.tgz",
-      "integrity": "sha512-AqiEOF7fK8MPcJKxWkkrF9DWSs5Ma/AlJfuWDrdxKzlLPaV4OWucL2zm/ShdEMGZ+Uz5EgTShGxnvLRRMmZYsQ==",
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/sqlite-better-trigram-linux-x64/-/sqlite-better-trigram-linux-x64-0.0.3.tgz",
+      "integrity": "sha512-WoB2qMeFX6XGOWdTYCrF4imEBL5/a/UKqZpzWvPhtV92Ys47z4AIuwiWvekO8/5FRLYCyT9rJLXLSY2eUwOqLg==",
       "cpu": [
         "x64"
       ],
@@ -6382,9 +6382,9 @@
       ]
     },
     "node_modules/sqlite-better-trigram-windows-arm64": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/sqlite-better-trigram-windows-arm64/-/sqlite-better-trigram-windows-arm64-0.0.5.tgz",
-      "integrity": "sha512-HEY3GbhtINKyM2ztcBJ7GqpgHNDA0aBUFNnKsvAkorF08+0v0sRs3oZsoDBqDQY0tm90iUZVLoTqvtN3sLhaGw==",
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/sqlite-better-trigram-windows-arm64/-/sqlite-better-trigram-windows-arm64-0.0.3.tgz",
+      "integrity": "sha512-hXIT+PkkJQ3vJ0+E8Zh2/BoOCQ2dRj6LmchjP7T5afpbKXI/lcI77Cgk3tPwe8s/Ywci6OyeJwcaFuBtf1CLhw==",
       "cpu": [
         "arm64"
       ],
@@ -6395,9 +6395,9 @@
       ]
     },
     "node_modules/sqlite-better-trigram-windows-x64": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/sqlite-better-trigram-windows-x64/-/sqlite-better-trigram-windows-x64-0.0.5.tgz",
-      "integrity": "sha512-JeLPlGc5yL7KL/uqAgcRb9wwS51xN1aezP18k2dvuxpXWmfGDc8e8/bpKYVVzUbnMF63MdpSa9PBch2NhT6CPA==",
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/sqlite-better-trigram-windows-x64/-/sqlite-better-trigram-windows-x64-0.0.3.tgz",
+      "integrity": "sha512-dli7MaDld9k02Vx74Mrovxxy+SQ72GwaObvIOcbI7ATiKUvhRvjHZgmuIvgxF2DM8aRejFHgPIC4/GUJcjauEg==",
       "cpu": [
         "x64"
       ],
@@ -6408,23 +6408,23 @@
       ]
     },
     "node_modules/sqlite3-fts5-html": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/sqlite3-fts5-html/-/sqlite3-fts5-html-0.0.6.tgz",
-      "integrity": "sha512-+15ntK7L68G/yuM+vyKAFxzLM/TRwjNoWAkFr0q+jXcdwfTUOrU2painloOIWnqN/meT0N1kdOltaHgyGS9MaA==",
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/sqlite3-fts5-html/-/sqlite3-fts5-html-0.0.4.tgz",
+      "integrity": "sha512-2d7G3QAgNtndTYRFDXVzzsjlDkjXLo9YB4xxVFIxHIotKnVTNmd0/iSQMMjOMFY5XEpW8yemFkD0EyuN0wFuSQ==",
       "license": "Public Domain",
       "optionalDependencies": {
-        "sqlite3-fts5-html-darwin-arm64": "0.0.6",
-        "sqlite3-fts5-html-darwin-x64": "0.0.6",
-        "sqlite3-fts5-html-linux-arm64": "0.0.6",
-        "sqlite3-fts5-html-linux-x64": "0.0.6",
-        "sqlite3-fts5-html-windows-arm64": "0.0.6",
-        "sqlite3-fts5-html-windows-x64": "0.0.6"
+        "sqlite3-fts5-html-darwin-arm64": "0.0.4",
+        "sqlite3-fts5-html-darwin-x64": "0.0.4",
+        "sqlite3-fts5-html-linux-arm64": "0.0.4",
+        "sqlite3-fts5-html-linux-x64": "0.0.4",
+        "sqlite3-fts5-html-windows-arm64": "0.0.4",
+        "sqlite3-fts5-html-windows-x64": "0.0.4"
       }
     },
     "node_modules/sqlite3-fts5-html-darwin-arm64": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/sqlite3-fts5-html-darwin-arm64/-/sqlite3-fts5-html-darwin-arm64-0.0.6.tgz",
-      "integrity": "sha512-qMSUJs9py8X5VK96YuiRrORCSxINoIaK/lYOQt7dGwOGnfP8qpdvj5FoQMkNnb5s2kd2xqko1o5io3iJFq2sZA==",
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/sqlite3-fts5-html-darwin-arm64/-/sqlite3-fts5-html-darwin-arm64-0.0.4.tgz",
+      "integrity": "sha512-zkg+LxOtq7ONz82C4+1mxsmasOIt9tbUReEMlmu29pJosfgDsMftp9k1Jy46FEk3VDFODlg9uDX7f0O0rspayg==",
       "cpu": [
         "arm64"
       ],
@@ -6435,9 +6435,9 @@
       ]
     },
     "node_modules/sqlite3-fts5-html-darwin-x64": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/sqlite3-fts5-html-darwin-x64/-/sqlite3-fts5-html-darwin-x64-0.0.6.tgz",
-      "integrity": "sha512-T7ouo1HZffrfuVKy0GkPR6dJvGeiaaWlqCDrQdNvpL7F6DUyaZIGd9FJSwxBjTWaOTOW7glg+sedBGntokpZqw==",
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/sqlite3-fts5-html-darwin-x64/-/sqlite3-fts5-html-darwin-x64-0.0.4.tgz",
+      "integrity": "sha512-LtBRTVfB3eNkupKJEobZVOyf4TbmWw4XgdBGvi4wFHHcv96gqhVlHdUGlavul561AOpab+T7DOgaPgph1y5M5A==",
       "cpu": [
         "x64"
       ],
@@ -6448,9 +6448,9 @@
       ]
     },
     "node_modules/sqlite3-fts5-html-linux-arm64": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/sqlite3-fts5-html-linux-arm64/-/sqlite3-fts5-html-linux-arm64-0.0.6.tgz",
-      "integrity": "sha512-Xl4pokUU4OsyroHYAoCFh7R03s6V2ApcQZImmNsVpWlAviVhlAQ3NxSBhXtJ2HNyyVJjnkJZvQnXG0zRBLZDXw==",
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/sqlite3-fts5-html-linux-arm64/-/sqlite3-fts5-html-linux-arm64-0.0.4.tgz",
+      "integrity": "sha512-+xgRPpD7fdXNJPKaggHE5BkSF00aI8rlHHZ+pXZR2GmFyRr++jt34MA5avO4G6oI4mrZ82wUV+sWUqd8FErRBw==",
       "cpu": [
         "arm64"
       ],
@@ -6461,9 +6461,9 @@
       ]
     },
     "node_modules/sqlite3-fts5-html-linux-x64": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/sqlite3-fts5-html-linux-x64/-/sqlite3-fts5-html-linux-x64-0.0.6.tgz",
-      "integrity": "sha512-v+h7nP4BliFcqVfbWE7aCN9MUqyqzPNOzl/8eautN5dZCHEvQErhVgIzZfCFDnJf0Xp73eXJLu5mnyJYFf3x3A==",
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/sqlite3-fts5-html-linux-x64/-/sqlite3-fts5-html-linux-x64-0.0.4.tgz",
+      "integrity": "sha512-4ah7IiDUH9kpCPoqT4lW6FcWcNiVF0wtpywW82UVfkawbmgLFPGqSQFqHyChmp1b2dsrkO5X/bhq9E2BR0/xmQ==",
       "cpu": [
         "x64"
       ],
@@ -6474,9 +6474,9 @@
       ]
     },
     "node_modules/sqlite3-fts5-html-windows-arm64": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/sqlite3-fts5-html-windows-arm64/-/sqlite3-fts5-html-windows-arm64-0.0.6.tgz",
-      "integrity": "sha512-460bqs+vA4I0GTyviFPD53I4ivPjrhJNr3tDhWEmd2p+aNDfxvz1z0BAw4Su1sVxhCe/up1oMDCxC1z7dEyfmA==",
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/sqlite3-fts5-html-windows-arm64/-/sqlite3-fts5-html-windows-arm64-0.0.4.tgz",
+      "integrity": "sha512-rQKLrX90TKIMgD7zSrOk/U6q0KEBiTaB2nXDONcK4d/CYpnG9g/N/i6Ady98j5+v/PgqymchgtRwvgBHOZzCfw==",
       "cpu": [
         "arm64"
       ],
@@ -6487,9 +6487,9 @@
       ]
     },
     "node_modules/sqlite3-fts5-html-windows-x64": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/sqlite3-fts5-html-windows-x64/-/sqlite3-fts5-html-windows-x64-0.0.6.tgz",
-      "integrity": "sha512-rMjO3yNcqvfVeI5cDWcLYut43s9n4vHVvFL129AJIDarFz/r99VXC34kIdPupW6GIlh2v/c3Jj3TtuXlOyulrQ==",
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/sqlite3-fts5-html-windows-x64/-/sqlite3-fts5-html-windows-x64-0.0.4.tgz",
+      "integrity": "sha512-FxLloBxWtsIGUMxbvOLNY9+FXJYEcku1xVqJarLfGKcXX7zvS3yXMP0dYeld2lQ/evNiLgvLMNLhUFwhEln1vA==",
       "cpu": [
         "x64"
       ],

apps/desktop/package.json

@@ -2,7 +2,7 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "3.3.13",
+  "version": "3.3.6-beta.0",
   "appAppleId": "1544027013",
   "private": true,
   "main": "./dist/cjs/index.js",
@@ -36,8 +36,8 @@
     "electron-trpc": "0.7.1",
     "electron-updater": "^6.6.2",
     "icojs": "^0.19.5",
-    "sqlite-better-trigram": "0.0.5",
-    "sqlite3-fts5-html": "^0.0.6",
+    "sqlite-better-trigram": "0.0.3",
+    "sqlite3-fts5-html": "^0.0.4",
     "typed-emitter": "^2.1.0",
     "yargs": "^17.7.2",
     "zod": "3.24.3"

apps/desktop/src/api/os-integration.ts

@@ -252,7 +252,6 @@ export const osIntegrationRouter = t.router({
           if (menuItem) menu.append(menuItem);
         }
         if (menu.items.length > 0) menu.popup();
-        menu.on("menu-will-close", () => emit.next([]));
         return () => {
           menu.removeAllListeners();
           menu.closePopup();

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

@@ -113,8 +113,7 @@ export class SQLite {
         };
       }
     } catch (e) {
-      if (e instanceof Error)
-        throw rewriteError(e, `${e.message} (query: ${sql})`);
+      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
@@ -213,11 +212,3 @@ function getExtensionPath(extensionName: string, entryPoint: string) {
   }
   return loadablePath;
 }
-
-function rewriteError(e: Error, message: string) {
-  const error = new Error(message);
-  error.stack = e.stack;
-  error.name = e.name;
-  error.cause = e.cause;
-  return error;
-}

apps/desktop/src/api/window.ts

@@ -34,17 +34,6 @@ export const windowRouter = t.router({
   }),
   maximized: t.procedure.query(() => globalThis.window?.isMaximized()),
   fullscreen: t.procedure.query(() => globalThis.window?.isFullScreen()),
-  onClose: t.procedure.subscription(() => {
-    return observable<void>((emit) => {
-      function listener() {
-        emit.next();
-      }
-      globalThis.window?.addListener("close", listener);
-      return () => {
-        globalThis.window?.removeListener("close", listener);
-      };
-    });
-  }),
   onWindowStateChanged: t.procedure.subscription(() => {
     return observable<{ maximized: boolean; fullscreen: boolean }>((emit) => {
       function listener() {

apps/desktop/src/main.ts

@@ -52,9 +52,6 @@ locale.then(({ default: locale }) => {
 });
 setI18nGlobal(i18n);
 
-const appHostnames = isDevelopment()
-  ? ["localhost", "127.0.0.1"]
-  : ["app.notesnook.com"];
 // only run a single instance
 if (!MAC_APP_STORE && !app.requestSingleInstanceLock()) {
   console.log("Another instance is already running!");
@@ -176,19 +173,6 @@ async function createWindow() {
     return { action: "deny" };
   });
 
-  mainWindow.webContents.on("will-navigate", (event, url) => {
-    try {
-      const parsedUrl = new URL(url);
-      if (!appHostnames.includes(parsedUrl.hostname)) {
-        event.preventDefault();
-        shell.openExternal(url);
-      }
-    } catch (e) {
-      console.error("will-navigate: failed to parse URL", url, e);
-      event.preventDefault();
-    }
-  });
-
   nativeTheme.on("updated", () => {
     setupTray();
     setupJumplist();

apps/desktop/src/utils/autolaunch.ts

@@ -39,7 +39,7 @@ const LINUX_AUTOSTART_DIRECTORY_PATH = path.join(
   "autostart"
 );
 
-const HIDDEN_ARG = "--hidden";
+const STARTUP_ARGS = ["--hidden"];
 
 export class AutoLaunch {
   static enable(hidden: boolean) {
@@ -54,13 +54,13 @@ export class AutoLaunch {
       );
     } else {
       const loginItemSettings = app.getLoginItemSettings({
-        args: hidden ? [HIDDEN_ARG] : undefined
+        args: STARTUP_ARGS
       });
       if (loginItemSettings.openAtLogin) return;
       app.setLoginItemSettings({
         openAtLogin: true,
         openAsHidden: hidden,
-        args: hidden ? [HIDDEN_ARG] : undefined
+        args: STARTUP_ARGS
       });
     }
   }

apps/desktop/src/utils/protocol.ts

@@ -62,17 +62,7 @@ function registerProtocol() {
         headers: { "Content-Type": extensionToMimeType[fileExtension] }
       });
     } else {
-      const requestHeaders = new Headers(request.headers);
-      if (!requestHeaders.has("referer"))
-        requestHeaders.set("referer", PROTOCOL_URL);
-      return await net.fetch(
-        new Request(request, {
-          headers: requestHeaders
-        }),
-        {
-          bypassCustomProtocolHandlers: true
-        }
-      );
+      return net.fetch(request, { bypassCustomProtocolHandlers: true });
     }
   });
   console.info(`${SCHEME} protocol inteception "successful"`);

apps/mobile/.detoxrc.js

@@ -47,7 +47,7 @@ module.exports = {
     simulator: {
       type: "ios.simulator",
       device: {
-        type: "iPhone 17 Pro Max"
+        type: "iPhone 12"
       }
     },
     attached: {
@@ -59,7 +59,7 @@ module.exports = {
     emulator: {
       type: "android.emulator",
       device: {
-        avdName: "Pixel_5_API_36"
+        avdName: "Pixel_5_API_34"
       }
     }
   },

apps/mobile/README.md

@@ -3,8 +3,10 @@
 </p>
 
 <h1 align="center">Notesnook Mobile</h1>
-<h3 align="center">The mobile app is built with React Native for both iOS and Android.</h3>
-<p align="center"><a href="#build-instructions">Build instructions</a> | <a href="#developer-guide">Developer guide</a> | <a href="#running-e2e-tests-detox">E2E tests</a></p>
+<h3 align="center">The mobile app is built using React Native, Typescript & Javascript for both iOS & Android.</h3>
+<p align="center">
+<a href="#developer-guide">Developer guide</a> | <a href="#build-instructions">How to build?</a>
+</p>
 
 <p align="center">
     <a href="https://play.google.com/store/apps/details?id=com.streetwriters.notesnook">
@@ -23,21 +25,21 @@
 
 Requirements:
 
-1. [Node.js](https://nodejs.org/en/download/) 20+ (the repo is pinned to Node `22.20.0` via Volta)
+1. [Node.js](https://nodejs.org/en/download/)
 2. [git](https://git-scm.com/downloads)
-3. `npm`
-4. [React Native environment setup](https://reactnative.dev/docs/set-up-your-environment)
+3. NPM (not yarn or pnpm)
+4. [React Native](https://reactnative.dev/docs/environment-setup)
 
-To run the app locally, first complete React Native native tooling setup:
+To run the app locally, you will need to setup React Native on your system:
 
-1. Open [React Native environment setup](https://reactnative.dev/docs/set-up-your-environment)
+1. Open the official [environment setup guide here](https://reactnative.dev/docs/environment-setup)
 2. Select `React Native CLI Quickstart`
-3. Select your OS and target platform(s): iOS and/or Android
+3. Select your OS & the platform to run the app on (iOS or Android)
 4. Follow the steps listed.
 
-> Expo is not used in this project.
+> Please keep in mind that **Expo is not supported**.
 
-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
@@ -46,27 +48,26 @@ git clone https://github.com/streetwriters/notesnook.git
 cd notesnook
 ```
 
-Install dependencies and bootstrap the mobile workspace:
+Once you are inside the `./notesnook` directory, run the preparation step:
 
 ```bash
 # this might take a while to complete
 npm install
-npm run bootstrap -- --scope=mobile
 ```
 
 ### Running the app on Android
 
-[Set up an Android emulator from Android Studio](https://developer.android.com/studio/run/managing-avds) (or connect a physical device), then run:
+[Setup an Android emulator from Android Studio](https://developer.android.com/studio/run/managing-avds) if you haven't already, and then run the following command to start the app in the Emulator:
 
 ```bash
 npm run start:android
 ```
 
-If you are using a physical device, enable [USB debugging](https://developer.android.com/studio/debug/dev-options).
+If you want to run the app on your phone, make sure to [enable USB debugging](https://developer.android.com/studio/debug/dev-options).
 
 ### Running the app on iOS
 
-Install CocoaPods dependencies first, then run the iOS app:
+To run the app on iOS:
 
 ```bash
 # this might take a while to complete
@@ -75,87 +76,90 @@ npm run prepare:ios
 npm run start:ios
 ```
 
-### Useful development commands
-
-```bash
-# start Metro only
-npm run start:metro
-
-# start Re.Pack bundler
-npm run start:repack
-```
-
 ## Developer guide
 
-> The mobile app is a mixed TypeScript/JavaScript codebase.
+> This project is in a transition state between Javascript & Typescript. We are gradually porting everything over to Typescript, so if you can help with that, it'd be great!
 
 ### The tech stack
 
 We try to keep the stack as lean as possible:
 
-1. React Native `0.82`
-2. React `19`
-3. TypeScript + JavaScript
-4. Zustand (state management)
-5. Detox (end-to-end testing)
-6. libsodium (encryption)
+1. React Native
+2. Typescript/Javascript
+3. Zustand: State management
+4. Detox: Runs all our e2e tests
+5. React Native MMKV: Database & persistence
+6. libsodium: Encryption
 
 ### Project structure
 
-Top-level directories in `apps/mobile/`:
+The app codebase is distributed over two primary directories. `native/` and `app/`.
 
-- `app/`: Main React Native app source (`components`, `common`, `hooks`, `navigation`, `screens`, `services`, `stores`, `utils`, etc.)
-- `android/`: Android native project
-- `ios/`: iOS native project
-- `e2e/`: Detox test suite and config
-- `patches/`: `patch-package` patches
-- `scripts/`: Mobile-specific scripts
+- `native/`: Includes `android/` and `ios/` folders and everything related to react native core functionality like bundling, development, and packaging. Any react-native dependency with native code, i.e., android & ios folders, is installed here.
 
-## Running E2E tests (Detox)
+- `app/`: Includes all the app code other than the native part. All JS-only dependencies are installed here.
+  - `components/`: Each component serves a specific purpose in the app UI. For example, the `Paragraph` component is used to render paragraphs in the app, and a `Header` component is used to render a `header` on all screens.
+  - `common/`: Features that are integral to the app's functionality. For example, the notesnook core is initialized here.
+  - `hooks/`: Hooks for different app logic
+  - `navigation/`: Includes app navigation-specific code. Here the app navigation, editor & side menu are rendered side by side in fluid tabs.
+  - `screens`: Navigator screens.
+  - `services`: Parts of code that do a specific function. For example, the `sync` service runs Sync from anywhere in the app.
+  - `stores`: We use `zustand` for global state management in the app. Multiple stores provide the state for different parts of the app.
+  - `utils`: General purpose stuff such as constant values, utility functions, etc.
 
-Detox device defaults in this repo:
+There are several other folders at the root:
 
-- Android emulator: `Pixel_5_API_36`
-- iOS simulator: `iPhone 17 Pro Max`
+- `share/`: Code for the iOS Share Extension and Android widget.
+- `e2e/`: Detox End to end tests
+- `patches/`: Patches for various react native dependencies.
+
+### Running the tests
+
+When you are done making the required changes, you must run the tests to ensure you didn't break anything. We use Detox as the testing framework & the tests can be started as follows:
 
 ### Android
 
-Build and run Android Detox tests:
+To run the tests on Android, you will need to create an emulator device on your system:
 
-```bash
-npm run build:android
-npm run test:android
+```
+$ANDROID_HOME/tools/bin/avdmanager create avd -n Pixel_5_API_31 -d pixel --package "system-images;android-31;default;x86_64"
 ```
 
-For debug configuration:
+If you face problems, follow the detailed guide in [Detox documentation](https://wix.github.io/Detox/docs/introduction/android-dev-env). Keep the emulator name set to `Pixel_5_API_31`.
 
-```bash
-npm run build:android:debug
-npm run start:metro
-npm run test:android:debug
+Once you have created an emulator device, build the Android apks:
+
+```
+npm run build:android
+```
+
+Finally, run the tests:
+
+```
+npm run test:android
 ```
 
 ### iOS
 
-Build and run iOS Detox tests:
+To run e2e tests on the iOS simulator, you must be on a Mac with XCode installed.
+
+First, install [AppleSimulatorUtils](https://github.com/wix/AppleSimulatorUtils):
 
-```bash
-npm run build:ios
-npm run test:ios
 ```
-
-If simulator tooling is missing, install [AppleSimulatorUtils](https://github.com/wix/AppleSimulatorUtils):
-
-```bash
 brew tap wix/brew
 brew install applesimutils
 ```
 
-## Release commands
+Now build the iOS app for testing:
 
-Android release helpers:
-
-```bash
-npm run release:android
-npm run release:android:bundle
 ```
+npm run build:ios
+```
+
+Finally, run the tests:
+
+```
+npm run test:ios
+```
+
+All tests on iOS are configured to run on `iPhone 8` simulator.

apps/mobile/android/app/build.gradle

@@ -1,11 +1,9 @@
 apply plugin: "com.android.application"
 apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
-apply plugin: 'kotlin-parcelize'
 
 apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
 
-
 import com.android.build.OutputFile
 import groovy.json.JsonSlurper
 import org.apache.tools.ant.taskdefs.condition.Os
@@ -95,18 +93,6 @@ def fdroidBuild() {
     return project.hasProperty("fdroidBuild") && project.fdroidBuild == "true"
 }
 
-def prBuildNumber() {
-    def value = project.getProperties().get("prBuildNumber")
-    return value ? value : "1000"
-}
-
-def stagingReleaseBuild() {
-    // Enable with STAGING_BUILDtrue or -PstagingReleaseBuild=true
-    def fromEnv = System.getenv("STAGING_BUILD") == "true"
-    def fromProp = project.hasProperty("stagingReleaseBuild") && project.stagingReleaseBuild == "true"
-    return fromEnv || fromProp
-}
-
 def getNpmVersion() {
     def inputFile = file("$rootDir/../package.json")
     def jsonPackage = new JsonSlurper().parseText(inputFile.text)
@@ -131,17 +117,14 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    
     namespace "com.streetwriters.notesnook"
     defaultConfig {
         applicationId "com.streetwriters.notesnook"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        if (project.hasProperty("prBuildNumber")) {
-            versionCode Integer.parseInt(prBuildNumber())
-        } else {
-            versionCode 3099
-        }
+        versionCode 3079
         versionName getNpmVersion()
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -208,8 +191,6 @@ android {
                     output.versionCodeOverride =
                        defaultConfig.versionCode * 5 + versionCodes.get(abi)
                     println("Fdroid Version code: ${output.versionCodeOverride} for abi ${versionCodes.get(abi)}");
-                } else if (stagingReleaseBuild()) {
-                    output.versionCodeOverride = defaultConfig.versionCode + versionCodes.get(abi)
                 } else {
                     if (isBuildingAAB) {
                         output.versionCodeOverride = 4 * 1048576 + defaultConfig.versionCode
@@ -251,6 +232,7 @@ dependencies {
     } else {
         implementation jscFlavor
     }
+    
 
 }
 

apps/mobile/android/app/proguard-rules.pro

@@ -63,7 +63,4 @@
 -keepattributes Signature
 -keep class com.google.gson.reflect.TypeToken { *; }
 -keep class * extends com.google.gson.reflect.TypeToken
--keep class com.streetwriters.notesnook.datatypes.* { *; }
-
--keep class net.gotev.uploadservice.* { *; }
--keep class kotlinx.parcelize.* { *; }
+-keep class com.streetwriters.notesnook.datatypes.* { *; }

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

@@ -199,7 +199,11 @@
             </intent-filter>
         </activity>
 
-
+        <service
+            android:name=".OnClearFromRecentService"
+            android:enabled="true"
+            android:exported="true"
+            android:stopWithTask="false" />
         <service android:name="com.asterinet.react.bgactions.RNBackgroundActionsTask" />
 
         <service

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

@@ -39,32 +39,28 @@ public class BootTaskService extends HeadlessJsTaskService {
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        try {
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-                NotificationChannel channel = new NotificationChannel("com.streetwriters.notesnook",
-                        "Default",
-                        NotificationManager.IMPORTANCE_DEFAULT);
-
-                ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).createNotificationChannel(channel);
-                notification = new NotificationCompat.Builder(this, channel.getId())
-                        .setContentTitle("Sync on boot")
-                        .setContentText("")
-                        .setSmallIcon(R.drawable.ic_stat_name)
-                        .build();
-                if (android.os.Build.VERSION.SDK_INT >= 34) {
-                    this.startForeground(
-                            1,
-                            notification,
-                            ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE);
-                } else {
-                    this.startForeground(
-                            1,
-                            notification);
-                }
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+            NotificationChannel channel = new NotificationChannel("com.streetwriters.notesnook",
+                    "Default",
+                    NotificationManager.IMPORTANCE_DEFAULT);
 
+            ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).createNotificationChannel(channel);
+            notification = new NotificationCompat.Builder(this, channel.getId())
+                    .setContentTitle("Sync on boot")
+                    .setContentText("")
+                    .setSmallIcon(R.drawable.ic_stat_name)
+                    .build();
+            if (android.os.Build.VERSION.SDK_INT >= 34) {
+                this.startForeground(
+                        1,
+                        notification,
+                        ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE);
+            } else {
+                this.startForeground(
+                        1,
+                        notification);
             }
-        } catch (Exception ignored) {
-            stopSelf(startId);
+
         }
 
         return super.onStartCommand(intent, flags, startId);

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

@@ -20,7 +20,7 @@ import com.zoontek.rnbootsplash.RNBootSplash;
 
 public class MainActivity extends ReactActivity {
   @Override
-  protected void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
     RNBootSplash.init(this, R.style.BootTheme);
 
     super.onCreate(null);
@@ -28,6 +28,23 @@ public class MainActivity extends ReactActivity {
       WebView.setWebContentsDebuggingEnabled(true);
     }
 
+    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;
+      });
+    }
   }
 
   /**
@@ -43,20 +60,20 @@ public class MainActivity extends ReactActivity {
             DefaultNewArchitectureEntryPoint.getFabricEnabled());
   }
 
-  @Override
-  public void onNewIntent(Intent intent) {
-    super.onNewIntent(intent);
-    setIntent(intent);
-  }
+@Override
+public void onNewIntent(Intent intent) {
+  super.onNewIntent(intent);
+  setIntent(intent);
+}
 
-  @Override
-  public void onConfigurationChanged(Configuration newConfig) {
-    super.onConfigurationChanged(newConfig);
-    getReactHost().onConfigurationChanged(this);
-    Intent intent = new Intent("onConfigurationChanged");
-    intent.putExtra("newConfig", newConfig);
-    this.sendBroadcast(intent);
-  }
+@Override
+public void onConfigurationChanged(Configuration newConfig) {
+  super.onConfigurationChanged(newConfig);
+  getReactInstanceManager().onConfigurationChanged(this, newConfig);
+  Intent intent = new Intent("onConfigurationChanged");
+  intent.putExtra("newConfig", newConfig);
+  this.sendBroadcast(intent);
+}
 
   @Override
   protected String getMainComponentName() {

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

@@ -6,7 +6,7 @@ import com.facebook.react.ReactApplication
 import com.facebook.react.ReactHost
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
-import org.wonday.orientation.OrientationActivityLifecycle;
+ 
 class MainApplication : Application(), ReactApplication {
     override val reactHost: ReactHost by lazy {
     getDefaultReactHost(
@@ -22,7 +22,6 @@ class MainApplication : Application(), ReactApplication {
  
   override fun onCreate() {
     super.onCreate()
-      registerActivityLifecycleCallbacks(OrientationActivityLifecycle.getInstance());
     loadReactNative(this)
   }
 }

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

@@ -0,0 +1,36 @@
+package com.streetwriters.notesnook;
+import android.app.Service;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.IBinder;
+import android.util.Log;
+
+public class OnClearFromRecentService extends Service {
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        return START_NOT_STICKY;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+    }
+
+    @Override
+    public void onTaskRemoved(Intent rootIntent) {
+        try {
+            SharedPreferences appStateDetails = getApplicationContext().getSharedPreferences("appStateDetails", MODE_PRIVATE);
+            SharedPreferences.Editor edit = appStateDetails.edit();
+            edit.remove("appState");
+            edit.apply();
+            stopSelf();
+        } catch (UnsatisfiedLinkError | Exception e) {
+        }
+    }
+}

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

@@ -6,14 +6,7 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.pm.ShortcutInfo;
-import android.content.pm.ShortcutManager;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.RectF;
-import android.graphics.drawable.Icon;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -36,7 +29,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 
 
 public class RCTNNativeModule extends ReactContextBaseJavaModule {
@@ -93,6 +85,21 @@ public class RCTNNativeModule extends ReactContextBaseJavaModule {
         }
     }
 
+    @ReactMethod
+    public void setAppState(final String appState) {
+        SharedPreferences appStateDetails = getReactApplicationContext().getSharedPreferences("appStateDetails", Context.MODE_PRIVATE);
+        SharedPreferences.Editor edit = appStateDetails.edit();
+        edit.putString("appState", appState);
+        edit.apply();
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String getAppState() {
+        SharedPreferences appStateDetails = getReactApplicationContext().getSharedPreferences("appStateDetails", Context.MODE_PRIVATE);
+        String appStateValue = appStateDetails.getString("appState", "");
+        return appStateValue.isEmpty() ? null : appStateValue;
+    }
+
     @ReactMethod(isBlockingSynchronousMethod = true)
     public int getWidgetId() {
         return NotePreviewConfigureActivity.appWidgetId;
@@ -230,221 +237,6 @@ public class RCTNNativeModule extends ReactContextBaseJavaModule {
         }
     }
 
-    @ReactMethod
-    public void addShortcut(final String id, final String type, final String title, final String description, final String color, Promise promise) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            promise.reject("UNSUPPORTED", "Pinned launcher shortcuts require Android 8.0 or higher");
-            return;
-        }
 
-        try {
-            ShortcutManager shortcutManager = mContext.getSystemService(ShortcutManager.class);
-            if (shortcutManager == null) {
-                promise.reject("ERROR", "ShortcutManager not available");
-                return;
-            }
-
-            String uri = "https://app.notesnook.com/open_" + type + "?id=" + id;
-            Intent intent = new Intent(Intent.ACTION_VIEW, android.net.Uri.parse(uri));
-            intent.setPackage(mContext.getPackageName());
-
-            Icon icon = createLetterIcon(type, title, color);
-            ShortcutInfo shortcut = new ShortcutInfo.Builder(mContext, id)
-                    .setShortLabel(title)
-                    .setLongLabel(description != null && !description.isEmpty() ? description : title)
-                    .setIcon(icon)
-                    .setCategories(Set.of(type))
-                    .setIntent(intent)
-                    .build();
-
-            shortcutManager.requestPinShortcut(shortcut, null);
-            promise.resolve(true);
-        } catch (Exception e) {
-            promise.reject("ERROR", e.getMessage());
-        }
-    }
-
-    @ReactMethod
-    public void removeShortcut(final String id, Promise promise) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            promise.reject("UNSUPPORTED", "Pinned launcher shortcuts require Android 8.0 or higher");
-            return;
-        }
-
-        try {
-            ShortcutManager shortcutManager = mContext.getSystemService(ShortcutManager.class);
-            if (shortcutManager == null) {
-                promise.reject("ERROR", "ShortcutManager not available");
-                return;
-            }
-
-            shortcutManager.disableShortcuts(java.util.Collections.singletonList(id));
-            promise.resolve(true);
-        } catch (Exception e) {
-            promise.reject("ERROR", e.getMessage());
-        }
-    }
-
-    @ReactMethod
-    public void updateShortcut(final String id, final String type, final String title, final String description,final String color, Promise promise) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            promise.reject("UNSUPPORTED", "Pinned launcher shortcuts require Android 8.0 or higher");
-            return;
-        }
-
-        try {
-            ShortcutManager shortcutManager = mContext.getSystemService(ShortcutManager.class);
-            if (shortcutManager == null) {
-                promise.reject("ERROR", "ShortcutManager not available");
-                return;
-            }
-
-            // Get existing shortcut to preserve icon and intent
-            List<ShortcutInfo> shortcuts = shortcutManager.getPinnedShortcuts();
-            ShortcutInfo existingShortcut = null;
-            for (ShortcutInfo s : shortcuts) {
-                if (s.getId().equals(id)) {
-                    existingShortcut = s;
-                    break;
-                }
-            }
-
-            if (existingShortcut == null) {
-                return;
-            }
-            Icon icon = createLetterIcon(type, title, color);
-            ShortcutInfo updatedShortcut = new ShortcutInfo.Builder(mContext, id)
-                    .setShortLabel(title)
-                    .setIcon(icon)
-                    .setLongLabel(description != null && !description.isEmpty() ? description : title)
-                    .setIntent(existingShortcut.getIntent())
-                    .build();
-
-            shortcutManager.updateShortcuts(java.util.Collections.singletonList(updatedShortcut));
-            promise.resolve(true);
-        } catch (Exception e) {
-            promise.reject("ERROR", e.getMessage());
-        }
-    }
-
-    @ReactMethod
-    public void removeAllShortcuts(Promise promise) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            promise.reject("UNSUPPORTED", "Pinned launcher shortcuts require Android 8.0 or higher");
-            return;
-        }
-
-        try {
-            ShortcutManager shortcutManager = mContext.getSystemService(ShortcutManager.class);
-            if (shortcutManager == null) {
-                promise.reject("ERROR", "ShortcutManager not available");
-                return;
-            }
-
-            List<ShortcutInfo> pinnedShortcuts = shortcutManager.getPinnedShortcuts();
-            if (!pinnedShortcuts.isEmpty()) {
-                List<String> ids = new ArrayList<>();
-                for (ShortcutInfo shortcut : pinnedShortcuts) {
-                    ids.add(shortcut.getId());
-                }
-                shortcutManager.disableShortcuts(ids);
-            }
-            promise.resolve(true);
-        } catch (Exception e) {
-            promise.reject("ERROR", e.getMessage());
-        }
-    }
-
-    @ReactMethod
-    public void getAllShortcuts(Promise promise) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            return;
-        }
-        ShortcutManager shortcutManager = mContext.getSystemService(ShortcutManager.class);
-        WritableArray shortcuts = Arguments.createArray();
-        List<ShortcutInfo> infos = shortcutManager.getPinnedShortcuts();
-
-        for (ShortcutInfo info: infos) {
-            WritableMap data = Arguments.createMap();
-            data.putString("id", info.getId());
-            if (info.getShortLabel() != null) {
-                data.putString("title", info.getShortLabel().toString());
-            }
-
-            if (info.getLongLabel() != null) {
-                data.putString("description", info.getLongLabel().toString());
-            }
-
-
-            if (!Objects.requireNonNull(info.getCategories()).isEmpty()) {
-                if (info.getCategories().contains("note")) {
-                    data.putString("type", "note");
-                } else if (info.getCategories().contains("notebook")) {
-                    data.putString("type", "notebook");
-                } else if (info.getCategories().contains("tag")) {
-                    data.putString("type", "tag");
-                } else if (info.getCategories().contains("color")) {
-                    data.putString("type", "color");
-                }
-            }
-            shortcuts.pushMap(data);
-        }
-        promise.resolve(shortcuts);
-    }
-
-    private Icon createLetterIcon(String type, String title, String colorCode) {
-
-        String letter = type.contains("tag") ? "#" : title != null && !title.isEmpty()
-                ? title.substring(0, 1).toUpperCase()
-                : "?";
-        int color = type.equals("color") ? Color.parseColor(colorCode) : getColorForLetter(letter);
-        
-        if (type.equals("notebook")) return Icon.createWithResource(mContext, R.drawable.ic_notebook);
-        // Use a larger canvas and fill it completely to avoid white borders from launcher masking.
-        int iconSize = 256;
-        Bitmap bitmap = Bitmap.createBitmap(iconSize, iconSize, Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(bitmap);
-
-        if (type.equals("color")) {
-            Paint backgroundPaint = new Paint();
-            backgroundPaint.setColor(color);
-            backgroundPaint.setAntiAlias(true);
-            canvas.drawCircle(iconSize / 2, iconSize / 2, iconSize/2, backgroundPaint);
-        } else {
-            Paint textPaint = new Paint();
-            textPaint.setColor(color);
-            textPaint.setTextSize(130);
-            textPaint.setAntiAlias(true);
-            textPaint.setTextAlign(Paint.Align.CENTER);
-            textPaint.setTypeface(android.graphics.Typeface.create(android.graphics.Typeface.DEFAULT, android.graphics.Typeface.BOLD));
-
-            float x = iconSize / 2f;
-            float y = (iconSize / 2f) - ((textPaint.descent() + textPaint.ascent()) / 2f);
-
-            canvas.drawText(letter, x, y, textPaint);
-        }
-
-        return Icon.createWithBitmap(bitmap);
-    }
-
-    private int getColorForLetter(String letter) {
-        int[] colors = {
-            0xFF1976D2, // Blue
-            0xFFD32F2F, // Red
-            0xFF388E3C, // Green
-            0xFFF57C00, // Orange
-            0xFF7B1FA2, // Purple
-            0xFF0097A7, // Cyan
-            0xFFC2185B, // Pink
-            0xFF455A64, // Blue Grey
-            0xFF6A1B9A, // Deep Purple
-            0xFF00796B, // Teal
-            0xFF512DA8, // Indigo
-            0xFF1565C0  // Dark Blue
-        };
-        
-        int hash = Math.abs(letter.hashCode());
-        return colors[hash % colors.length];
-    }
 
 }

apps/mobile/android/app/src/main/res/drawable-anydpi/ic_notebook.xml

@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="#008837"
-    android:alpha="1">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M240,880Q207,880 183.5,856.5Q160,833 160,800L160,160Q160,127 183.5,103.5Q207,80 240,80L720,80Q753,80 776.5,103.5Q800,127 800,160L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM240,800L720,800Q720,800 720,800Q720,800 720,800L720,160Q720,160 720,160Q720,160 720,160L640,160L640,440L540,380L440,440L440,160L240,160Q240,160 240,160Q240,160 240,160L240,800Q240,800 240,800Q240,800 240,800ZM240,800Q240,800 240,800Q240,800 240,800L240,160Q240,160 240,160Q240,160 240,160L240,160Q240,160 240,160Q240,160 240,160L240,800Q240,800 240,800Q240,800 240,800ZM440,440L540,380L640,440L640,440L540,380L440,440Z"/>
-</vector>

apps/mobile/android/app/src/main/res/values-night/styles.xml

@@ -17,7 +17,7 @@
     </style>
 
       <!-- BootTheme should inherit from Theme.SplashScreen -->
-    <style name="BootTheme" parent="Theme.BootSplash.EdgeToEdge">
+    <style name="BootTheme" parent="Theme.SplashScreen">
         <item name="bootSplashBackground">@color/bootsplash_background</item>
         <item name="bootSplashLogo">@mipmap/bootsplash_logo_dark</item>
         <item name="android:navigationBarColor">@color/bootsplash_background</item>

apps/mobile/android/app/src/main/res/xml/network_security_config.xml

@@ -4,10 +4,4 @@
         <domain includeSubdomains="true">10.0.2.2</domain>
         <domain includeSubdomains="true">localhost</domain>
     </domain-config>
-    <base-config>
-        <trust-anchors>
-            <certificates src="system" />
-            <certificates src="user" />
-        </trust-anchors>
-    </base-config>
 </network-security-config>

apps/mobile/android/build.gradle

@@ -36,8 +36,6 @@ allprojects {
             url "$rootDir/../node_modules/detox/Detox-android"
         }
 
-        google()
-        mavenCentral()
         maven { url 'https://www.jitpack.io' }
     }
 }

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

@@ -1,8 +1,3 @@
-- Fix clearing note title adds generated title instead of staying empty
-- Improved table cell selection, table scrolling, and table cell editing on mobile
-- Fixed app on launch randomly focuses editor instead of notes list
-- Fixed file size check shows error but continues adding the file to editor
-- Note title headline format should get content from first paragraph
-- Minor bug fixes and performance improvements
+- Bug fixes and minor improvements
 
-Thank you for using Notesnook!
+Thank you for using Notesnook!

apps/mobile/app.json

@@ -1,4 +1,4 @@
 {
   "name": "Notesnook",
   "displayName": "Notesnook"
-}
+}

apps/mobile/app/app.tsx

@@ -24,7 +24,7 @@ import {
   useThemeEngineStore
 } from "@notesnook/theme";
 import React, { useEffect } from "react";
-import { Appearance, I18nManager, Linking, StatusBar } from "react-native";
+import { Appearance, I18nManager, StatusBar } from "react-native";
 import "react-native-gesture-handler";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import { SafeAreaProvider } from "react-native-safe-area-context";
@@ -43,7 +43,7 @@ import { changeSystemBarColors, useThemeStore } from "./stores/use-theme-store";
 import { useUserStore } from "./stores/use-user-store";
 import RNBootSplash from "react-native-bootsplash";
 import AppLocked from "./components/app-lock";
-import { useSettingStore } from "./stores/use-setting-store";
+
 I18nManager.allowRTL(false);
 I18nManager.forceRTL(false);
 I18nManager.swapLeftAndRightInRTL(false);
@@ -51,25 +51,19 @@ const { appLockEnabled, appLockMode } = SettingsService.get();
 if (appLockEnabled || appLockMode !== "none") {
   useUserStore.getState().lockApp(true);
 }
-RNBootSplash.hide({
-  fade: true
-});
-Linking.getInitialURL().then((url) => {
-  useSettingStore.setState({
-    initialUrl: url
-  });
-});
+
+RNBootSplash.hide();
 const App = (props: { configureMode: "note-preview" }) => {
   useAppEvents();
   //@ts-ignore
   globalThis["IS_MAIN_APP_RUNNING"] = true;
   useEffect(() => {
-    SettingsService.onFirstLaunch();
     changeSystemBarColors();
+    SettingsService.onFirstLaunch();
     setTimeout(async () => {
       await Notifications.get();
       if (SettingsService.get().notifNotes) {
-        Notifications.pinQuickNote();
+        Notifications.pinQuickNote(true);
       }
       TipManager.init();
     }, 100);
@@ -127,12 +121,8 @@ export const withTheme = (Element: (props: any) => JSX.Element) => {
           .then((theme) => {
             if (theme) {
               theme.colorScheme === "dark"
-                ? useThemeStore.setState({
-                    darkTheme: theme
-                  })
-                : useThemeStore.setState({
-                    lightTheme: theme
-                  });
+                ? useThemeStore.getState().setDarkTheme(theme)
+                : useThemeStore.getState().setLightTheme(theme);
             }
           })
           .catch(() => {
@@ -142,9 +132,9 @@ export const withTheme = (Element: (props: any) => JSX.Element) => {
 
       const listener = Appearance.addChangeListener(({ colorScheme }) => {
         if (colorScheme && SettingsService.getProperty("useSystemTheme")) {
-          useThemeStore.setState({
-            colorScheme: colorScheme as "light" | "dark"
-          });
+          useThemeStore
+            .getState()
+            .setColorScheme(colorScheme as "light" | "dark");
         }
       });
       return () => {

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

@@ -205,9 +205,8 @@ export async function getDatabaseKey(appLockPassword?: string) {
   }
 
   if (await Keychain.hasInternetCredentials("notesnook")) {
-    const userKeyCredentials = await Keychain.getInternetCredentials(
-      "notesnook"
-    );
+    const userKeyCredentials =
+      await Keychain.getInternetCredentials("notesnook");
 
     if (userKeyCredentials) {
       const userKeyCipher: Cipher = (await encrypt(

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

@@ -72,7 +72,7 @@ export async function setupDatabase(password?: string) {
       ({
         compress: Gzip.deflate,
         decompress: Gzip.inflate
-      } as ICompressor),
+      }) as ICompressor,
     batchSize: 50,
     sqliteOptions: {
       dialect: (name) => ({

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

@@ -70,7 +70,7 @@ export async function downloadFile(
       throw new Error(error);
     }
 
-    const totalChunks = Math.ceil(size / (chunkSize + ABYTES));
+    const totalChunks = Math.ceil(size / chunkSize);
     const decryptedLength = size - totalChunks * ABYTES;
 
     if (attachment && attachment.size !== decryptedLength) {

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

@@ -30,8 +30,7 @@ import {
   getCacheSize,
   hashBase64,
   readEncrypted,
-  writeEncryptedBase64,
-  bulkDeleteFiles
+  writeEncryptedBase64
 } from "./io";
 import { uploadFile } from "./upload";
 import {
@@ -62,6 +61,5 @@ export const FileStorage: IFileStorage = {
   exists,
   clearFileStorage,
   getUploadedFileSize,
-  bulkExists,
-  bulkDeleteFiles
+  bulkExists
 };

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

@@ -30,14 +30,7 @@ import RNFetchBlob from "react-native-blob-util";
 import { eSendEvent } from "../../services/event-manager";
 import { IOS_APPGROUPID } from "../../utils/constants";
 import { DatabaseLogger, db } from "../database";
-import {
-  ABYTES,
-  cacheDir,
-  cacheDirOld,
-  getRandomId,
-  isSuccessStatusCode,
-  parseS3Error
-} from "./utils";
+import { ABYTES, cacheDir, cacheDirOld, getRandomId } from "./utils";
 
 export async function readEncrypted<TOutputFormat extends DataFormat>(
   filename: string,
@@ -109,41 +102,16 @@ export async function writeEncryptedBase64(
   };
 }
 
-async function deleteLocalFile(filename: string) {
-  try {
-    await createCacheDir();
-    let path = cacheDir + `/${filename}`;
-    let exists = await RNFetchBlob.fs.exists(path);
-    if (Platform.OS === "ios" && !exists) {
-      const iosAppGroup =
-        Platform.OS === "ios"
-          ? await (RNFetchBlob.fs as any).pathForAppGroup(IOS_APPGROUPID)
-          : null;
-      const appGroupPath = `${iosAppGroup}/${filename}`;
-      if (await RNFetchBlob.fs.exists(appGroupPath)) {
-        RNFetchBlob.fs.unlink(appGroupPath).catch(() => {
-          /* empty */
-        });
-        return;
-      }
-    }
-    if (exists) {
-      RNFetchBlob.fs.unlink(path).catch(() => {
-        /* empty */
-      });
-    }
-  } catch (e) {
-    DatabaseLogger.error(e as Error, "deleteLocalFile");
-  }
-}
-
 export async function deleteFile(
   filename: string,
   requestOptions?: RequestOptions
 ): Promise<boolean> {
   await createCacheDir();
+  const localFilePath = cacheDir + `/${filename}`;
   if (!requestOptions) {
-    deleteLocalFile(filename);
+    RNFetchBlob.fs.unlink(localFilePath).catch(() => {
+      /* empty */
+    });
     return true;
   }
 
@@ -154,7 +122,9 @@ export async function deleteFile(
     const status = response.info().status;
     const ok = status >= 200 && status < 300;
     if (ok) {
-      deleteLocalFile(filename);
+      RNFetchBlob.fs.unlink(localFilePath).catch(() => {
+        /* empty */
+      });
     }
     return ok;
   } catch (e) {
@@ -165,49 +135,6 @@ export async function deleteFile(
   }
 }
 
-export async function bulkDeleteFiles(
-  filenames: string[],
-  requestOptions?: RequestOptions
-) {
-  await createCacheDir();
-  if (!requestOptions) {
-    filenames.forEach((filename) => {
-      deleteLocalFile(filename);
-    });
-    return true;
-  }
-
-  try {
-    const { url, headers } = requestOptions;
-    const response = await fetch(url, {
-      method: "POST",
-      headers: {
-        ...headers,
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({
-        names: filenames
-      })
-    });
-
-    const result = isSuccessStatusCode(response.status);
-    if (result) {
-      filenames.forEach((filename) => {
-        deleteLocalFile(filename);
-      });
-    } else {
-      throw await response.text();
-    }
-    return result;
-  } catch (e) {
-    DatabaseLogger.error(
-      typeof e === "string" ? parseS3Error(e as string) : (e as Error),
-      "Could not bulk delete files"
-    );
-    return false;
-  }
-}
-
 export async function clearFileStorage() {
   try {
     await createCacheDir();
@@ -295,21 +222,15 @@ export async function deleteCacheFileByName(name: string) {
 }
 
 export async function deleteDCacheFiles() {
-  try {
-    await createCacheDir();
-    const files = await RNFetchBlob.fs.ls(cacheDir);
-    for (const file of files) {
-      if (
-        file.includes("_dcache") ||
-        file.startsWith("NN_") ||
-        file.endsWith(".pdf")
-      ) {
-        await RNFetchBlob.fs.unlink(file).catch(() => {
-          /* empty */
-        });
-      }
+  await createCacheDir();
+  const files = await RNFetchBlob.fs.ls(cacheDir);
+  for (const file of files) {
+    if (file.includes("_dcache") || file.startsWith("NN_")) {
+      await RNFetchBlob.fs.unlink(file).catch(() => {
+        /* empty */
+      });
     }
-  } catch (e) {}
+  }
 }
 
 export async function getCachePathForFile(filename: string) {

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

@@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { isImage, RequestOptions, hosts } from "@notesnook/core";
-import { PermissionsAndroid, Platform } from "react-native";
+import { RequestOptions } from "@notesnook/core";
+import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
 import { ToastManager } from "../../services/event-manager";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
@@ -31,138 +31,6 @@ import {
   FileSizeResult,
   getUploadedFileSize
 } from "./utils";
-import Upload from "@ammarahmed/react-native-upload";
-import { CloudUploader } from "react-native-nitro-cloud-uploader";
-import { useUserStore } from "../../stores/use-user-store";
-import { sleep } from "../../utils/time";
-import { isFeatureAvailable } from "@notesnook/common";
-import { strings } from "@notesnook/intl";
-
-// Upload constants
-const CHUNK_SIZE = 10 * 1024 * 1024; // 10 MB
-const MINIMUM_MULTIPART_FILE_SIZE = 25 * 1024 * 1024; // 25MB
-
-interface InitiateMultipartResponse {
-  uploadId: string;
-  parts: string[];
-  error?: string;
-}
-
-async function initiateMultipartUpload(
-  filename: string,
-  fileSize: number,
-  headers: Record<string, string>
-): Promise<InitiateMultipartResponse> {
-  const totalParts = Math.ceil(fileSize / CHUNK_SIZE);
-
-  const url = `${hosts.API_HOST}/s3/multipart?name=${filename}&parts=${totalParts}&uploadId=`;
-  const response = await fetch(url, { headers });
-
-  if (!response.ok) {
-    throw new Error(
-      `Failed to initiate multipart upload: ${response.statusText}`
-    );
-  }
-
-  const data = await response.json();
-
-  if (data.error) {
-    throw new Error(data.error);
-  }
-
-  if (!data.uploadId || !data.parts) {
-    throw new Error("Failed to initiate multipart upload: invalid response.");
-  }
-
-  DatabaseLogger.info(
-    `Initiated multipart upload for ${filename} with upload ID: ${data.uploadId}`
-  );
-
-  return data;
-}
-
-async function multipartUploadFile(
-  filename: string,
-  filePath: string,
-  fileSize: number,
-  requestOptions: RequestOptions,
-  cancelToken: { cancel: (reason?: string) => Promise<void> }
-): Promise<Response> {
-  const { headers } = requestOptions;
-
-  try {
-    const uploadData = await initiateMultipartUpload(
-      filename,
-      fileSize,
-      headers
-    );
-    const { uploadId, parts } = uploadData;
-
-    DatabaseLogger.info(
-      `Starting upload for ${filename} with ${parts.length} parts`
-    );
-
-    cancelToken.cancel = async () => {
-      useAttachmentStore.getState().remove(filename);
-      await CloudUploader.cancelUpload(uploadId);
-    };
-
-    CloudUploader.addListener("upload-progress", (event) => {
-      useAttachmentStore
-        .getState()
-        .setProgress(
-          event.bytesUploaded || 0,
-          event.totalBytes || fileSize,
-          filename,
-          0,
-          "upload"
-        );
-      DatabaseLogger.info(
-        `File upload progress: ${filename}, ${event.bytesUploaded}/${
-          event.totalBytes || fileSize
-        }, chunk: ${event.chunkIndex}, progress: ${event.progress}`
-      );
-    });
-    // CloudUploader handles chunking and uploading all parts internally
-    const result = await CloudUploader.startUpload(
-      filename,
-      filePath,
-      parts,
-      3, // maxParallel
-      true // showNotification
-    );
-
-    CloudUploader.removeListener("upload-progress");
-
-    if (!result.success) {
-      throw new Error("Failed to upload multipart file");
-    }
-
-    DatabaseLogger.info(
-      `Multipart upload completed for ${filename} with upload ID: ${uploadId}`
-    );
-
-    const response = await fetch(`${hosts.API_HOST}/s3/multipart`, {
-      method: "POST",
-      body: JSON.stringify({
-        Key: filename,
-        UploadId: uploadId,
-        PartETags: result.etags.map((etag, index) => ({
-          partNumber: index + 1,
-          etag: etag
-        }))
-      }),
-      headers: { ...headers, "Content-Type": "application/json" }
-    });
-
-    return response;
-  } catch (error) {
-    DatabaseLogger.error(error, "Multipart upload failed", { filename });
-    CloudUploader.removeListener("upload-progress");
-    useAttachmentStore.getState().remove(filename);
-    throw error;
-  }
-}
 
 export async function uploadFile(
   filename: string,
@@ -196,163 +64,63 @@ export async function uploadFile(
       );
     }
 
-    const fileInfo = await RNFetchBlob.fs.stat(filePath);
+    const fileSize = (await RNFetchBlob.fs.stat(filePath)).size;
 
     const remoteFileSize = await getUploadedFileSize(filename);
     if (remoteFileSize === FileSizeResult.Error) return false;
 
-    const featureResult = await isFeatureAvailable(
-      "fileSize",
-      fileInfo.size || 0
-    );
-
-    if (!featureResult.isAllowed) {
-      ToastManager.show({
-        heading: strings.fileTooLarge(),
-        message: featureResult.error,
-        type: "error"
-      });
-      return false;
-    }
-
-    if (
-      remoteFileSize > FileSizeResult.Empty &&
-      remoteFileSize === fileInfo.size
-    ) {
+    if (remoteFileSize > FileSizeResult.Empty && remoteFileSize === fileSize) {
       DatabaseLogger.log(`File ${filename} is already uploaded.`);
       return true;
     }
 
-    let attachmentInfo = await db.attachments.attachment(filename);
+    DatabaseLogger.info(`Starting upload: ${filename}`);
 
-    DatabaseLogger.info(
-      `Starting upload of ${filename} at path: ${fileInfo.path} ${fileInfo.size}`
-    );
-
-    if (Platform.OS === "android") {
-      useUserStore.setState({
-        disableAppLockRequests: true
-      });
-      const status = await PermissionsAndroid.request(
-        "android.permission.POST_NOTIFICATIONS"
-      );
-      if (status !== "granted") {
-        ToastManager.show({
-          message: `The permission to show file upload notification was disallowed by the user.`,
-          type: "info"
-        });
-      }
-      await sleep(500);
-      useUserStore.setState({
-        disableAppLockRequests: false
-      });
-    }
-
-    let uploaded = false;
-
-    // Use multipart upload for files larger than MINIMUM_MULTIPART_FILE_SIZE
-    if (fileInfo.size >= MINIMUM_MULTIPART_FILE_SIZE) {
-      DatabaseLogger.info(
-        `Using multipart upload for large file: ${filename} (${fileInfo.size} bytes)`
-      );
-      const result = await multipartUploadFile(
-        filename,
-        filePath,
-        fileInfo.size,
-        requestOptions,
-        cancelToken
-      );
-      const status = result.status || 0;
-      uploaded = status >= 200 && status < 300;
-
-      if (!uploaded) {
-        const fileInfo = await RNFetchBlob.fs.stat(filePath);
-        throw new Error(
-          `${status}, name: ${fileInfo.filename}, length: ${
-            fileInfo.size
-          }, info: ${JSON.stringify(await result.text())}`
-        );
-      }
-    } else {
-      // Use single-part upload for smaller files
-      DatabaseLogger.info(
-        `Using single-part upload for file: ${filename} (${fileInfo.size} bytes)`
-      );
-      const upload = Upload.create({
-        customUploadId: filename,
-        path: Platform.OS === "ios" ? "file://" + fileInfo.path : fileInfo.path,
-        url: url,
-        method: "PUT",
-        headers: {
+    const uploadRequest = RNFetchBlob.config({
+      //@ts-ignore
+      IOSBackgroundTask: !globalThis["IS_SHARE_EXTENSION"]
+    })
+      .fetch(
+        "PUT",
+        url,
+        {
           ...headers,
-          "content-type": "application/octet-stream"
+          "content-type": ""
         },
-        appGroup: IOS_APPGROUPID,
-        notification: {
-          filename:
-            attachmentInfo && isImage(attachmentInfo?.mimeType)
-              ? "image"
-              : attachmentInfo?.filename || "file",
-          enabled: true,
-          enableRingTone: true,
-          autoClear: true
-        }
-      }).onChange((event) => {
-        switch (event.status) {
-          case "running":
-          case "pending":
-            useAttachmentStore
-              .getState()
-              .setProgress(
-                event.uploadedBytes || 0,
-                event.totalBytes || fileInfo.size,
-                filename,
-                0,
-                "upload"
-              );
-            DatabaseLogger.info(
-              `File upload progress: ${filename}, ${event.uploadedBytes}/${
-                event.totalBytes || fileInfo.size
-              }`
-            );
-            break;
-          case "completed":
-            DatabaseLogger.info("Upload completed");
-            break;
-        }
-      });
-      const result = await upload.start();
-      cancelToken.cancel = async () => {
-        useAttachmentStore.getState().remove(filename);
-        upload.cancel();
-      };
-
-      const status = result.responseCode || 0;
-      uploaded = status >= 200 && status < 300;
-
-      if (!uploaded) {
-        const fileInfo = await RNFetchBlob.fs.stat(filePath);
-        throw new Error(
-          `${status}, name: ${fileInfo.filename}, length: ${
-            fileInfo.size
-          }, info: ${JSON.stringify(result.error)}`
+        RNFetchBlob.wrap(filePath)
+      )
+      .uploadProgress((sent, total) => {
+        useAttachmentStore
+          .getState()
+          .setProgress(sent, total, filename, 0, "upload");
+        DatabaseLogger.info(
+          `File upload progress: ${filename}, ${sent}/${total}`
         );
-      }
-    }
+      });
+
+    cancelToken.cancel = async () => {
+      useAttachmentStore.getState().remove(filename);
+      uploadRequest.cancel();
+    };
+
+    const uploadResponse = await uploadRequest;
+    const status = uploadResponse.info().status;
+    const uploaded = status >= 200 && status < 300;
 
     useAttachmentStore.getState().remove(filename);
 
-    if (uploaded) {
-      attachmentInfo = await db.attachments.attachment(filename);
-      if (!attachmentInfo) return false;
-      await checkUpload(
-        filename,
-        requestOptions.chunkSize,
-        attachmentInfo.size
+    if (!uploaded) {
+      const fileInfo = await RNFetchBlob.fs.stat(filePath);
+      throw new Error(
+        `${status}, name: ${fileInfo.filename}, length: ${
+          fileInfo.size
+        }, info: ${JSON.stringify(uploadResponse.info())}`
       );
-      DatabaseLogger.info(`File upload status: ${filename}, success`);
     }
-
+    const attachment = await db.attachments.attachment(filename);
+    if (!attachment) return false;
+    await checkUpload(filename, requestOptions.chunkSize, attachment.size);
+    DatabaseLogger.info(`File upload status: ${filename}, ${status}`);
     return uploaded;
   } catch (e) {
     useAttachmentStore.getState().remove(filename);

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

@@ -155,7 +155,7 @@ export async function checkUpload(
   expectedSize: number
 ) {
   const size = await getUploadedFileSize(filename);
-  const totalChunks = Math.ceil(size / (chunkSize + ABYTES));
+  const totalChunks = Math.ceil(size / chunkSize);
   const decryptedLength = size - totalChunks * ABYTES;
   const error =
     size === 0
@@ -189,11 +189,3 @@ export async function checkAndCreateDir(path: string) {
   }
   return dir;
 }
-
-export const santizeUri = (uri: string) => {
-  return Platform.OS === "ios" ? decodeURI(uri).replace("file:///", "/") : uri;
-};
-
-export function isSuccessStatusCode(statusCode: number) {
-  return statusCode >= 200 && statusCode <= 299;
-}

apps/mobile/app/components/app-lock/index.tsx

@@ -239,8 +239,8 @@ const AppLocked = () => {
             deviceMode !== "mobile"
               ? "50%"
               : Platform.OS == "ios"
-              ? "95%"
-              : "100%",
+                ? "95%"
+                : "100%",
           paddingHorizontal: 12,
           marginBottom: 30,
           marginTop: 15,

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

@@ -59,7 +59,6 @@ import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { strings } from "@notesnook/intl";
 import { DefaultAppStyles } from "../../utils/styles";
-import Navigation from "../../services/navigation";
 
 const Actions = ({
   attachment,
@@ -305,9 +304,9 @@ const Actions = ({
               <Pressable
                 onPress={async () => {
                   eSendEvent(eCloseSheet, contextId);
-                  close?.();
+                  await sleep(150);
                   eSendEvent(eCloseAttachmentDialog);
-                  Navigation.navigate("FluidPanelsView");
+                  await sleep(300);
                   openNote(item, (item as any).type === "trash");
                 }}
                 style={{

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

@@ -28,7 +28,7 @@ import {
 import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect, useRef, useState } from "react";
-import { ActivityIndicator, FlatList, View } from "react-native";
+import { ActivityIndicator, View } from "react-native";
 import { ScrollView } from "react-native-actions-sheet";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import create from "zustand";
@@ -313,10 +313,6 @@ export const AttachmentDialog = ({
     });
   };
 
-  db.attachments.orphaned.items().then((r) => {
-    console.log(r);
-  });
-
   return (
     <>
       {isSheet ? (
@@ -513,7 +509,7 @@ export const AttachmentDialog = ({
           </ScrollView>
         </View>
 
-        <FlatList
+        <LegendList
           renderScrollComponent={(props) => <ScrollView {...props} />}
           keyboardDismissMode="none"
           keyboardShouldPersistTaps="always"
@@ -547,6 +543,7 @@ export const AttachmentDialog = ({
               }}
             />
           }
+          estimatedItemSize={50}
           data={loading ? [] : attachments?.placeholders || []}
           extraData={attachments}
           renderItem={renderItem}

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

@@ -73,15 +73,7 @@ export const ChangePassword = () => {
         throw new Error(strings.backupFailed() + `: ${result.error}`);
       }
 
-      const passwordChanged = await db.user.changePassword(
-        oldPassword.current,
-        password.current
-      );
-
-      if (!passwordChanged) {
-        throw new Error("Could not change user account password.");
-      }
-
+      await db.user.changePassword(oldPassword.current, password.current);
       ToastManager.show({
         heading: strings.passwordChangedSuccessfully(),
         type: "success",

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

@@ -39,7 +39,7 @@ export function hideAuth(context?: AuthParams["context"]) {
     initialAuthMode.current === AuthMode.welcomeLogin ||
     context === "intro"
   ) {
-    Navigation.navigate("FluidPanelsView", {});
+    Navigation.replace("FluidPanelsView", {});
   } else {
     Navigation.goBack();
   }

apps/mobile/app/components/auth/forgot-password.tsx

@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { useRef, useState } from "react";
 import { TextInput, View } from "react-native";
+import ActionSheet from "react-native-actions-sheet";
 import { db } from "../../common/database";
 import { DDS } from "../../services/device-detection";
 import { ToastManager } from "../../services/event-manager";
@@ -34,9 +35,9 @@ import Paragraph from "../ui/typography/paragraph";
 import { strings } from "@notesnook/intl";
 import { DefaultAppStyles } from "../../utils/styles";
 
-export const ForgotPassword = ({ userEmail }: { userEmail: string }) => {
+export const ForgotPassword = () => {
   const { colors } = useThemeColors("sheet");
-  const email = useRef<string>(userEmail);
+  const email = useRef<string>(undefined);
   const emailInputRef = useRef<TextInput>(null);
   const [error, setError] = useState(false);
   const [loading, setLoading] = useState(false);
@@ -86,76 +87,94 @@ export const ForgotPassword = ({ userEmail }: { userEmail: string }) => {
 
   return (
     <>
-      {sent ? (
-        <View
-          style={{
-            padding: DefaultAppStyles.GAP,
-            justifyContent: "center",
-            alignItems: "center",
-            paddingBottom: 50
-          }}
-        >
-          <IconButton
+      <ActionSheet
+        onBeforeShow={(data) => (email.current = data)}
+        onClose={() => {
+          setSent(false);
+          setLoading(false);
+        }}
+        onOpen={() => {
+          emailInputRef.current?.setNativeProps({
+            text: email.current
+          });
+        }}
+        indicatorStyle={{
+          width: 100
+        }}
+        gestureEnabled
+        id="forgotpassword_sheet"
+      >
+        {sent ? (
+          <View
             style={{
-              width: null,
-              height: null
-            }}
-            color={colors.primary.accent}
-            name="email"
-            size={50}
-          />
-          <Heading>{strings.recoveryEmailSent()}</Heading>
-          <Paragraph
-            style={{
-              textAlign: "center"
+              padding: DefaultAppStyles.GAP,
+              justifyContent: "center",
+              alignItems: "center",
+              paddingBottom: 50
             }}
           >
-            {strings.recoveryEmailSentDesc()}
-          </Paragraph>
-        </View>
-      ) : (
-        <View
-          style={{
-            borderRadius: DDS.isTab ? 5 : 0,
-            backgroundColor: colors.primary.background,
-            zIndex: 10,
-            width: "100%",
-            padding: DefaultAppStyles.GAP
-          }}
-        >
-          <DialogHeader title={strings.accountRecovery()} />
-          <Seperator />
-
-          <Input
-            fwdRef={emailInputRef}
-            onChangeText={(value) => {
-              email.current = value;
-            }}
-            defaultValue={email.current}
-            onErrorCheck={(e) => setError(e)}
-            returnKeyLabel={strings.next()}
-            returnKeyType="next"
-            autoComplete="email"
-            validationType="email"
-            autoCorrect={false}
-            autoCapitalize="none"
-            errorMessage={strings.emailInvalid()}
-            placeholder={strings.email()}
-            onSubmit={() => {}}
-          />
-
-          <Button
+            <IconButton
+              style={{
+                width: null,
+                height: null
+              }}
+              color={colors.primary.accent}
+              name="email"
+              size={50}
+            />
+            <Heading>{strings.recoveryEmailSent()}</Heading>
+            <Paragraph
+              style={{
+                textAlign: "center"
+              }}
+            >
+              {strings.recoveryEmailSentDesc()}
+            </Paragraph>
+          </View>
+        ) : (
+          <View
             style={{
-              marginTop: DefaultAppStyles.GAP_VERTICAL,
-              width: "100%"
+              borderRadius: DDS.isTab ? 5 : 0,
+              backgroundColor: colors.primary.background,
+              zIndex: 10,
+              width: "100%",
+              padding: DefaultAppStyles.GAP
             }}
-            loading={loading}
-            onPress={sendRecoveryEmail}
-            type="accent"
-            title={loading ? null : strings.next()}
-          />
-        </View>
-      )}
+          >
+            <DialogHeader title={strings.accountRecovery()} />
+            <Seperator />
+
+            <Input
+              fwdRef={emailInputRef}
+              onChangeText={(value) => {
+                email.current = value;
+              }}
+              defaultValue={email.current}
+              onErrorCheck={(e) => setError(e)}
+              returnKeyLabel={strings.next()}
+              returnKeyType="next"
+              autoComplete="email"
+              validationType="email"
+              autoCorrect={false}
+              autoCapitalize="none"
+              errorMessage={strings.emailInvalid()}
+              placeholder={strings.email()}
+              onSubmit={() => {}}
+            />
+
+            <Button
+              style={{
+                marginTop: DefaultAppStyles.GAP_VERTICAL,
+                width: "100%"
+              }}
+              loading={loading}
+              onPress={sendRecoveryEmail}
+              type="accent"
+              title={loading ? null : strings.next()}
+            />
+          </View>
+        )}
+      </ActionSheet>
     </>
   );
 };

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

@@ -25,11 +25,7 @@ import { TouchableOpacity, View, useWindowDimensions } from "react-native";
 import { SheetManager } from "react-native-actions-sheet";
 import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
 import { DDS } from "../../services/device-detection";
-import {
-  eSendEvent,
-  presentSheet,
-  ToastManager
-} from "../../services/event-manager";
+import { eSendEvent } from "../../services/event-manager";
 import Navigation from "../../services/navigation";
 import PremiumService from "../../services/premium";
 import SettingsService from "../../services/settings";
@@ -114,6 +110,7 @@ export const Login = ({
   return (
     <>
       <AuthHeader />
+      <ForgotPassword />
       <Dialog context="two_factor_verify" />
       <KeyboardAwareScrollView
         style={{
@@ -195,8 +192,8 @@ export const Login = ({
                   ? "50%"
                   : "49.99%"
                 : focused
-                ? "100%"
-                : "99.9%",
+                  ? "100%"
+                  : "99.9%",
               backgroundColor: colors.primary.background,
               alignSelf: "center",
               paddingHorizontal: DDS.isTab ? 0 : DefaultAppStyles.GAP,
@@ -261,9 +258,7 @@ export const Login = ({
                   }}
                   onPress={() => {
                     if (loading || !email.current) return;
-                    presentSheet({
-                      component: <ForgotPassword userEmail={email.current} />
-                    });
+                    SheetManager.show("forgotpassword_sheet");
                   }}
                   textStyle={{
                     textDecorationLine: "underline"

apps/mobile/app/components/auth/session-expired.tsx

@@ -97,7 +97,7 @@ export const SessionExpired = () => {
       if (db.tokenManager._isTokenExpired(res))
         throw new Error("token expired");
 
-      const key = await db.user.getDataEncryptionKeys();
+      const key = await db.user.getEncryptionKey();
       if (!key) throw new Error("No encryption key found.");
 
       Sync.run("global", false, "full", async (complete) => {

apps/mobile/app/components/auth/signup.tsx

@@ -324,9 +324,7 @@ export const Signup = ({
 
               <View
                 style={{
-                  paddingHorizontal: DefaultAppStyles.GAP,
-                  width: DDS.isTab ? "50%" : "100%",
-                  alignSelf: "center"
+                  paddingHorizontal: DefaultAppStyles.GAP
                 }}
               >
                 <Paragraph

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

@@ -161,10 +161,10 @@ const FloatingButton = ({
               icon
                 ? icon
                 : route.name === "Notebooks"
-                ? "notebook-plus"
-                : route.name === "Trash"
-                ? "delete"
-                : "plus"
+                  ? "notebook-plus"
+                  : route.name === "Trash"
+                    ? "delete"
+                    : "plus"
             }
             color={color || colors.primary.accent}
             size={size === "small" ? AppFontSize.xl : AppFontSize.xxxl}

apps/mobile/app/components/date-picker/index.tsx

@@ -1,66 +0,0 @@
-import { useThemeColors } from "@notesnook/theme";
-import { useRef } from "react";
-import { View } from "react-native";
-import { defaultBorderRadius } from "../../utils/size";
-import { DefaultAppStyles } from "../../utils/styles";
-import DatePicker from "react-native-date-picker";
-import dayjs from "dayjs";
-import { strings } from "@notesnook/intl";
-import { Button } from "../ui/button";
-
-export default function DatePickerComponent(props: {
-  onConfirm: (date: Date) => void;
-  onCancel: () => void;
-}) {
-  const { colors, isDark } = useThemeColors();
-  const dateRef = useRef<Date>(dayjs().add(1, "day").toDate());
-  return (
-    <View
-      style={{
-        backgroundColor: colors.primary.background,
-        borderRadius: defaultBorderRadius,
-        padding: DefaultAppStyles.GAP,
-        borderWidth: 0.5,
-        borderColor: colors.primary.border,
-        width: "80%",
-        gap: DefaultAppStyles.GAP_VERTICAL
-      }}
-    >
-      <DatePicker
-        theme={isDark ? "dark" : "light"}
-        mode="date"
-        minimumDate={dayjs().add(1, "day").toDate()}
-        onCancel={() => {
-          close?.();
-        }}
-        date={dateRef.current}
-        onDateChange={(date) => {
-          dateRef.current = date;
-        }}
-      />
-
-      <Button
-        title={strings.setExpiry()}
-        type="accent"
-        style={{
-          width: "100%"
-        }}
-        onPress={async () => {
-          if (!dateRef.current) return;
-          props.onConfirm(dateRef.current);
-        }}
-      />
-
-      <Button
-        title={strings.cancel()}
-        type="secondary"
-        style={{
-          width: "100%"
-        }}
-        onPress={async () => {
-          props.onCancel();
-        }}
-      />
-    </View>
-  );
-}

apps/mobile/app/components/delay-layout/index.tsx

@@ -42,7 +42,9 @@ export default function DelayLayout({
   ...props
 }: IDelayLayoutProps) {
   const { colors } = useThemeColors();
-  const loading = useDelayLayout(props.delay === undefined ? 200 : props.delay);
+  const loading = useDelayLayout(
+    !props.delay || props.delay < 300 ? 0 : props.delay
+  );
   const Placeholder = placeholder[props.type || "default"];
 
   return loading || props.wait ? (

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

@@ -141,7 +141,7 @@ const BaseDialog = ({
           }}
         >
           <KeyboardAvoidingView
-            enabled={!floating && !avoidKeyboardResize}
+            enabled={!floating && Platform.OS === "ios" && !avoidKeyboardResize}
             behavior="padding"
           >
             <BouncingView

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

@@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React, { useCallback, useEffect, useRef, useState } from "react";
 import { TextInput, View, ViewStyle } from "react-native";

apps/mobile/app/components/dialogs/applock-password/index.tsx

@@ -201,12 +201,14 @@ export const AppLockPassword = () => {
               accountPass
                 ? strings.enterAccountPassword()
                 : mode === "change"
-                ? keyboardType === "pin"
-                  ? strings.newPin()
-                  : strings.newPassword()
-                : `${
-                    keyboardType === "pin" ? strings.pin() : strings.password()
-                  }`
+                  ? keyboardType === "pin"
+                    ? strings.newPin()
+                    : strings.newPassword()
+                  : `${
+                      keyboardType === "pin"
+                        ? strings.pin()
+                        : strings.password()
+                    }`
             }
           />
 
@@ -383,8 +385,8 @@ export const AppLockPassword = () => {
             mode === "remove"
               ? strings.remove()
               : mode === "change"
-              ? strings.change()
-              : strings.save()
+                ? strings.change()
+                : strings.save()
           }
           negativeTitle={strings.cancel()}
           positiveType="transparent"

apps/mobile/app/components/dialogs/color-picker/index.tsx

@@ -167,16 +167,14 @@ const ColorPicker = ({
                   );
                 if (!title.current)
                   return ToastManager.error(
-                    new Error(strings.allFieldsRequired()),
-                    "color-picker"
+                    new Error(strings.allFieldsRequired())
                   );
                 const exists = await db.colors.all.find((v) =>
                   v.and([v(`colorCode`, "==", selectedColor)])
                 );
                 if (exists)
                   return ToastManager.error(
-                    new Error(strings.colorExists(selectedColor)),
-                    "color-picker"
+                    new Error(strings.colorExists(selectedColor))
                   );
                 const id = await db.colors.add({
                   title: title.current,

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

@@ -23,7 +23,6 @@ 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 FileViewer from "react-native-file-viewer";
 import { MMKV } from "../../../common/database/mmkv";
 import downloadAttachment from "../../../common/filesystem/download-attachment";
 import { deleteCacheFileByPath, exists } from "../../../common/filesystem/io";
@@ -44,7 +43,6 @@ import SheetProvider from "../../sheet-provider";
 import { IconButton } from "../../ui/icon-button";
 import { ProgressBarComponent } from "../../ui/svg/lazy";
 import Paragraph from "../../ui/typography/paragraph";
-import ReactNativeBlobUtil from "react-native-blob-util";
 
 const WIN_WIDTH = Dimensions.get("window").width;
 const WIN_HEIGHT = Dimensions.get("window").height;
@@ -119,11 +117,8 @@ const PDFPreview = () => {
           setVisible(false);
           return;
         }
-        let path = `${cacheDir}/${attachment.filename}`;
+        const path = `${cacheDir}/${uri}`;
         snapshotValue.current = snapshot.current;
-        await ReactNativeBlobUtil.fs
-          .mv(`${cacheDir}/${uri}`, path)
-          .catch(console.log);
         setPDFSource("file://" + path);
         setLoading(false);
       }, 100);
@@ -132,7 +127,7 @@ const PDFPreview = () => {
   );
 
   const close = () => {
-    deleteCacheFileByPath(pdfSource.replace("file://", ""));
+    deleteCacheFileByPath(pdfSource);
     setPDFSource(null);
     setVisible(false);
     setPassword("");
@@ -162,12 +157,7 @@ const PDFPreview = () => {
 
   return (
     visible && (
-      <BaseDialog
-        animation="fade"
-        visible={true}
-        onRequestClose={close}
-        useSafeArea={false}
-      >
+      <BaseDialog animation="fade" visible={true} onRequestClose={close}>
         <SheetProvider context={attachment?.hash} />
         <Dialog context={attachment?.hash} />
 
@@ -233,48 +223,45 @@ const PDFPreview = () => {
                 <View
                   style={{
                     flexDirection: "row",
-                    gap: DefaultAppStyles.GAP_SMALL
+                    alignItems: "center",
+                    marginRight: 12
                   }}
                 >
-                  <View
+                  <TextInput
+                    ref={inputRef}
+                    defaultValue={currentPage + ""}
                     style={{
-                      flexDirection: "row",
-                      alignItems: "center"
+                      color: colors.primary.paragraph,
+                      padding: 0,
+                      paddingTop: 0,
+                      paddingBottom: 0,
+                      marginTop: 0,
+                      marginBottom: 0,
+                      paddingVertical: 0,
+                      height: 25,
+                      backgroundColor: colors.secondary.background,
+                      width: 40,
+                      textAlign: "center",
+                      marginRight: 4,
+                      borderRadius: 3,
+                      fontFamily: "Inter-Regular"
                     }}
-                  >
-                    <TextInput
-                      ref={inputRef}
-                      defaultValue={currentPage + ""}
-                      style={{
-                        color: colors.primary.paragraph,
-                        padding: 0,
-                        paddingTop: 0,
-                        paddingBottom: 0,
-                        marginTop: 0,
-                        marginBottom: 0,
-                        paddingVertical: 0,
-                        height: 25,
-                        backgroundColor: colors.secondary.background,
-                        width: 40,
-                        textAlign: "center",
-                        marginRight: 4,
-                        borderRadius: 3,
-                        fontFamily: "Inter-Regular"
-                      }}
-                      selectTextOnFocus
-                      keyboardType="decimal-pad"
-                      onSubmitEditing={(event) => {
-                        setCurrentPage(event.nativeEvent.text);
-                        pdfRef.current?.setPage(
-                          parseInt(event.nativeEvent.text)
-                        );
-                      }}
-                      blurOnSubmit
-                    />
-                    <Paragraph color={colors.static.white}>
-                      /{numPages}
-                    </Paragraph>
-                  </View>
+                    selectTextOnFocus
+                    keyboardType="decimal-pad"
+                    onSubmitEditing={(event) => {
+                      setCurrentPage(event.nativeEvent.text);
+                      pdfRef.current?.setPage(parseInt(event.nativeEvent.text));
+                    }}
+                    blurOnSubmit
+                  />
+                  <Paragraph color={colors.static.white}>/{numPages}</Paragraph>
+                </View>
+
+                <View
+                  style={{
+                    flexDirection: "row"
+                  }}
+                >
                   <IconButton
                     color={colors.static.white}
                     name="download"
@@ -282,16 +269,6 @@ const PDFPreview = () => {
                       downloadAttachment(attachment.hash, false);
                     }}
                   />
-                  <IconButton
-                    color={colors.static.white}
-                    name="open-in-new"
-                    onPress={() => {
-                      FileViewer.open(pdfSource, {
-                        showOpenWithDialog: true,
-                        showAppsSuggestions: true
-                      });
-                    }}
-                  />
                 </View>
               </View>
               {pdfSource ? (

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

@@ -0,0 +1,902 @@
+/*
+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 Clipboard from "@react-native-clipboard/clipboard";
+import React, { Component, createRef } from "react";
+import { InteractionManager, View } from "react-native";
+import Share from "react-native-share";
+import { notesnook } from "../../../../e2e/test.ids";
+import { db } from "../../../common/database";
+import BiometricService from "../../../services/biometrics";
+import { DDS } from "../../../services/device-detection";
+import {
+  ToastManager,
+  eSendEvent,
+  eSubscribeEvent,
+  eUnSubscribeEvent
+} from "../../../services/event-manager";
+import Navigation from "../../../services/navigation";
+import { getElevationStyle } from "../../../utils/elevation";
+import {
+  eCloseActionSheet,
+  eCloseVaultDialog,
+  eOnLoadNote,
+  eOpenVaultDialog,
+  eUpdateNoteInEditor
+} from "../../../utils/events";
+import { deleteItems } from "../../../utils/functions";
+import { fluidTabsRef } from "../../../utils/global-refs";
+import { convertNoteToText } from "../../../utils/note-to-text";
+import { sleep } from "../../../utils/time";
+import BaseDialog from "../../dialog/base-dialog";
+import DialogButtons from "../../dialog/dialog-buttons";
+import DialogHeader from "../../dialog/dialog-header";
+import { Toast } from "../../toast";
+import { Button } from "../../ui/button";
+import Input from "../../ui/input";
+import Seperator from "../../ui/seperator";
+import Paragraph from "../../ui/typography/paragraph";
+import { strings } from "@notesnook/intl";
+import { DefaultAppStyles } from "../../../utils/styles";
+
+export class VaultDialog extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      visible: false,
+      wrongPassword: false,
+      loading: false,
+      note: {},
+      vault: false,
+      locked: true,
+      permanant: false,
+      goToEditor: false,
+      share: false,
+      passwordsDontMatch: false,
+      deleteNote: false,
+      focusIndex: null,
+      biometricUnlock: false,
+      isBiometryEnrolled: false,
+      isBiometryAvailable: false,
+      fingerprintAccess: false,
+      changePassword: false,
+      copyNote: false,
+      revokeFingerprintAccess: false,
+      title: strings.goToEditor(),
+      description: null,
+      clearVault: false,
+      deleteVault: false,
+      deleteAll: false,
+      noteLocked: false
+    };
+
+    this.passInputRef = createRef();
+    this.confirmPassRef = createRef();
+    this.changePassInputRef = createRef();
+
+    this.password = null;
+    this.confirmPassword = null;
+    this.newPassword = null;
+    this.title = !this.state.novault
+      ? strings.createVault()
+      : this.state.fingerprintAccess
+      ? strings.vaultFingerprintUnlock()
+      : this.state.revokeFingerprintAccess
+      ? strings.revokeVaultFingerprintUnlock()
+      : this.state.changePassword
+      ? strings.changeVaultPassword()
+      : this.state.noteLocked
+      ? this.state.deleteNote
+        ? strings.deleteNote()
+        : this.state.share
+        ? strings.shareNote()
+        : this.state.copyNote
+        ? strings.copyNote()
+        : this.state.goToEditor
+        ? strings.goToEditor()
+        : strings.goToEditor()
+      : strings.lockNote();
+  }
+
+  componentDidMount() {
+    eSubscribeEvent(eOpenVaultDialog, this.open);
+    eSubscribeEvent(eCloseVaultDialog, this.close);
+  }
+
+  componentWillUnmount() {
+    eUnSubscribeEvent(eOpenVaultDialog, this.open);
+    eUnSubscribeEvent(eCloseVaultDialog, this.close);
+  }
+
+  /**
+   *
+   * @param {import('../../../services/event-manager').vaultType} data
+   */
+  open = async (data) => {
+    let biometry = await BiometricService.isBiometryAvailable();
+    let available = false;
+    let fingerprint = await BiometricService.hasInternetCredentials("nn_vault");
+
+    if (biometry) {
+      available = true;
+    }
+
+    this.setState({
+      note: data.item,
+      novault: data.novault,
+      locked: data.locked,
+      permanant: data.permanant,
+      goToEditor: data.goToEditor,
+      share: data.share,
+      deleteNote: data.deleteNote,
+      copyNote: data.copyNote,
+      isBiometryAvailable: available,
+      biometricUnlock: fingerprint,
+      isBiometryEnrolled: fingerprint,
+      fingerprintAccess: data.fingerprintAccess,
+      changePassword: data.changePassword,
+      revokeFingerprintAccess: data.revokeFingerprintAccess,
+      title: data.title,
+      description: data.description,
+      clearVault: data.clearVault,
+      deleteVault: data.deleteVault,
+      noteLocked: data.item && (await db.vaults.itemExists(data.item))
+    });
+
+    if (
+      fingerprint &&
+      data.novault &&
+      !data.fingerprintAccess &&
+      !data.revokeFingerprintAccess &&
+      !data.changePassword &&
+      !data.clearVault &&
+      !data.deleteVault
+    ) {
+      await this._onPressFingerprintAuth(data.title, data.description);
+    } else {
+      this.setState({
+        visible: true
+      });
+    }
+  };
+
+  close = () => {
+    if (this.state.loading) {
+      ToastManager.show({
+        heading: this.state.title,
+        message: strings.pleaseWait() + "...",
+        type: "success",
+        context: "local"
+      });
+      return;
+    }
+
+    Navigation.queueRoutesForUpdate();
+
+    this.password = null;
+    this.confirmPassword = null;
+    this.setState({
+      visible: false,
+      note: {},
+      locked: false,
+      permanant: false,
+      goToEditor: false,
+      share: false,
+      novault: false,
+      deleteNote: false,
+      passwordsDontMatch: false
+    });
+  };
+
+  onPress = async () => {
+    if (this.state.revokeFingerprintAccess) {
+      await this._revokeFingerprintAccess();
+
+      this.close();
+      return;
+    }
+    if (this.state.loading) return;
+
+    if (!this.password) {
+      ToastManager.show({
+        heading: strings.passwordNotEntered(),
+        type: "error",
+        context: "local"
+      });
+      return;
+    }
+
+    if (!this.state.novault) {
+      if (this.password !== this.confirmPassword) {
+        ToastManager.show({
+          heading: strings.passwordNotMatched(),
+          type: "error",
+          context: "local"
+        });
+        this.setState({
+          passwordsDontMatch: true
+        });
+        return;
+      }
+
+      this._createVault();
+    } else if (this.state.changePassword) {
+      this.setState({
+        loading: true
+      });
+
+      db.vault
+        .changePassword(this.password, this.newPassword)
+        .then(() => {
+          this.setState({
+            loading: false
+          });
+          if (this.state.biometricUnlock) {
+            this._enrollFingerprint(this.newPassword);
+          }
+          ToastManager.show({
+            heading: strings.passwordUpdated(),
+            type: "success",
+            context: "global"
+          });
+          this.close();
+        })
+        .catch((e) => {
+          this.setState({
+            loading: false
+          });
+          if (e.message === db.vault.ERRORS.wrongPassword) {
+            ToastManager.show({
+              heading: strings.passwordIncorrect(),
+              type: "error",
+              context: "local"
+            });
+          } else {
+            ToastManager.error(e);
+          }
+        });
+    } else if (this.state.locked) {
+      if (!this.password || this.password.trim() === 0) {
+        ToastManager.show({
+          heading: strings.passwordIncorrect(),
+          type: "error",
+          context: "local"
+        });
+        this.setState({
+          wrongPassword: true
+        });
+        return;
+      }
+      if (this.state.noteLocked) {
+        await this._unlockNote();
+      } else {
+        db.vault
+          .unlock(this.password)
+          .then(async () => {
+            this.setState({
+              wrongPassword: false
+            });
+            await this._lockNote();
+          })
+          .catch((e) => {
+            this._takeErrorAction(e);
+          });
+      }
+    } else if (this.state.fingerprintAccess) {
+      this._enrollFingerprint(this.password);
+    } else if (this.state.clearVault) {
+      await this.clearVault();
+    } else if (this.state.deleteVault) {
+      await this.deleteVault();
+    }
+  };
+
+  deleteVault = async () => {
+    this.setState({
+      loading: true
+    });
+    try {
+      let verified = true;
+      if (await db.user.getUser()) {
+        verified = await db.user.verifyPassword(this.password);
+      }
+      if (verified) {
+        let noteIds = [];
+        if (this.state.deleteAll) {
+          const vault = await db.vaults.default();
+          const relations = await db.relations.from(vault, "note").get();
+          noteIds = relations.map((item) => item.toId);
+        }
+        await db.vault.delete(this.state.deleteAll);
+
+        if (this.state.deleteAll) {
+          noteIds.forEach((id) => {
+            eSendEvent(
+              eUpdateNoteInEditor,
+              {
+                id: id,
+                deleted: true
+              },
+              true
+            );
+          });
+        }
+
+        eSendEvent("vaultUpdated");
+        this.setState({
+          loading: false
+        });
+        this.close();
+      } else {
+        ToastManager.show({
+          heading: strings.passwordIncorrect(),
+          type: "error",
+          context: "local"
+        });
+      }
+    } catch (e) {
+      console.error(e);
+    }
+    this.setState({
+      loading: false
+    });
+  };
+
+  clearVault = async () => {
+    this.setState({
+      loading: true
+    });
+    try {
+      const vault = await db.vaults.default();
+      const relations = await db.relations.from(vault, "note").get();
+      const noteIds = relations.map((item) => item.toId);
+
+      await db.vault.clear(this.password);
+
+      noteIds.forEach((id) => {
+        eSendEvent(
+          eUpdateNoteInEditor,
+          {
+            id: id,
+            deleted: true
+          },
+          true
+        );
+      });
+      this.setState({
+        loading: false
+      });
+      this.close();
+      eSendEvent("vaultUpdated");
+    } catch (e) {
+      ToastManager.show({
+        heading: strings.passwordIncorrect(),
+        type: "error",
+        context: "local"
+      });
+    }
+    this.setState({
+      loading: false
+    });
+  };
+
+  async _lockNote() {
+    if (!this.password || this.password.trim() === 0) {
+      ToastManager.show({
+        heading: strings.passwordIncorrect(),
+        type: "error",
+        context: "local"
+      });
+      return;
+    } else {
+      await db.vault.add(this.state.note.id);
+
+      eSendEvent(eUpdateNoteInEditor, this.state.note, true);
+
+      this.close();
+      ToastManager.show({
+        message: strings.noteLocked(),
+        type: "error",
+        context: "local"
+      });
+      this.setState({
+        loading: false
+      });
+    }
+  }
+
+  async _unlockNote() {
+    if (!this.password || this.password.trim() === 0) {
+      ToastManager.show({
+        heading: strings.passwordIncorrect(),
+        type: "error",
+        context: "local"
+      });
+      return;
+    }
+    if (this.state.permanant) {
+      this._permanantUnlock();
+    } else {
+      await this._openNote();
+    }
+  }
+
+  _openNote = async () => {
+    try {
+      let note = await db.vault.open(this.state.note.id, this.password);
+      if (this.state.biometricUnlock && !this.state.isBiometryEnrolled) {
+        await this._enrollFingerprint(this.password);
+      }
+
+      if (this.state.goToEditor) {
+        this._openInEditor(note);
+      } else if (this.state.share) {
+        await this._shareNote(note);
+      } else if (this.state.deleteNote) {
+        await this._deleteNote();
+      } else if (this.state.copyNote) {
+        await this._copyNote(note);
+      }
+    } catch (e) {
+      this._takeErrorAction(e);
+    }
+  };
+  async _deleteNote() {
+    try {
+      await db.vault.remove(this.state.note.id, this.password);
+      await deleteItems("note", [this.state.note.id]);
+      this.close();
+    } catch (e) {
+      this._takeErrorAction(e);
+    }
+  }
+
+  async _enrollFingerprint(password) {
+    this.setState(
+      {
+        loading: true
+      },
+      async () => {
+        try {
+          await db.vault.unlock(password);
+          await BiometricService.storeCredentials(password);
+          this.setState({
+            loading: false
+          });
+          eSendEvent("vaultUpdated");
+          ToastManager.show({
+            heading: strings.biometricUnlockEnabled(),
+            type: "success",
+            context: "global"
+          });
+          this.close();
+        } catch (e) {
+          this.close();
+          ToastManager.show({
+            heading: strings.passwordIncorrect(),
+            type: "error",
+            context: "local"
+          });
+          this.setState({
+            loading: false
+          });
+        }
+      }
+    );
+  }
+
+  async _createVault() {
+    await db.vault.create(this.password);
+
+    if (this.state.biometricUnlock) {
+      await this._enrollFingerprint(this.password);
+    }
+    if (this.state.note?.id) {
+      await db.vault.add(this.state.note.id);
+      eSendEvent(eUpdateNoteInEditor, this.state.note, true);
+      this.setState({
+        loading: false
+      });
+      ToastManager.show({
+        heading: strings.noteLocked(),
+        type: "success",
+        context: "global"
+      });
+      this.close();
+    } else {
+      ToastManager.show({
+        heading: strings.vaultCreated(),
+        type: "success",
+        context: "global"
+      });
+      this.close();
+    }
+    eSendEvent("vaultUpdated");
+  }
+
+  _permanantUnlock() {
+    db.vault
+      .remove(this.state.note.id, this.password)
+      .then(() => {
+        ToastManager.show({
+          heading: strings.noteUnlocked(),
+          type: "success",
+          context: "global"
+        });
+        eSendEvent(eUpdateNoteInEditor, this.state.note, true);
+        this.close();
+      })
+      .catch((e) => {
+        this._takeErrorAction(e);
+      });
+  }
+
+  _openInEditor(note) {
+    this.close();
+    InteractionManager.runAfterInteractions(async () => {
+      eSendEvent(eOnLoadNote, {
+        item: note
+      });
+      if (!DDS.isTab) {
+        fluidTabsRef.current?.goToPage("editor");
+      }
+    });
+  }
+
+  async _copyNote(note) {
+    Clipboard.setString((await convertNoteToText(note, true)) || "");
+    ToastManager.show({
+      heading: strings.noteCopied(),
+      type: "success",
+      context: "global"
+    });
+    this.close();
+  }
+
+  async _shareNote(note) {
+    this.close();
+    try {
+      await Share.open({
+        heading: note.title,
+        failOnCancel: false,
+        message: (await convertNoteToText(note)) || ""
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  _takeErrorAction(e) {
+    this.setState({
+      wrongPassword: true,
+      visible: true
+    });
+    setTimeout(() => {
+      ToastManager.show({
+        heading: strings.passwordIncorrect(),
+        type: "error",
+        context: "local"
+      });
+    }, 500);
+  }
+
+  _revokeFingerprintAccess = async () => {
+    try {
+      await BiometricService.resetCredentials();
+      eSendEvent("vaultUpdated");
+      ToastManager.show({
+        heading: strings.biometricUnlockDisabled(),
+        type: "success",
+        context: "global"
+      });
+    } catch (e) {
+      ToastManager.show({
+        heading: e.message,
+        type: "success",
+        context: "global"
+      });
+    }
+  };
+
+  _onPressFingerprintAuth = async (title, description) => {
+    try {
+      let credentials = await BiometricService.getCredentials(
+        title || this.state.title,
+        description || this.state.description
+      );
+
+      if (credentials?.password) {
+        this.password = credentials.password;
+        this.onPress();
+      } else {
+        eSendEvent(eCloseActionSheet);
+        await sleep(300);
+        this.setState({
+          visible: true
+        });
+      }
+    } catch (e) {
+      console.error(e);
+    }
+  };
+
+  render() {
+    const { colors } = this.props;
+    const {
+      note,
+      visible,
+      novault,
+      deleteNote,
+      share,
+      goToEditor,
+      fingerprintAccess,
+      changePassword,
+      loading,
+      deleteVault,
+      clearVault
+    } = this.state;
+
+    if (!visible) return null;
+    return (
+      <BaseDialog
+        onShow={async () => {
+          await sleep(100);
+
+          this.passInputRef.current?.focus();
+        }}
+        statusBarTranslucent={false}
+        onRequestClose={this.close}
+        visible={true}
+      >
+        <View
+          style={{
+            ...getElevationStyle(5),
+            width: DDS.isTab ? 350 : "85%",
+            borderRadius: 10,
+            backgroundColor: colors.primary.background,
+            paddingTop: 12
+          }}
+        >
+          <DialogHeader title={this.state.title} icon="shield" padding={12} />
+          <Seperator half />
+
+          <View
+            style={{
+              paddingHorizontal: DefaultAppStyles.GAP
+            }}
+          >
+            {(novault ||
+              changePassword ||
+              this.state.clearVault ||
+              this.state.deleteVault) &&
+            !this.state.revokeFingerprintAccess ? (
+              <>
+                <Input
+                  fwdRef={this.passInputRef}
+                  editable={!loading}
+                  autoCapitalize="none"
+                  testID={notesnook.ids.dialogs.vault.pwd}
+                  onChangeText={(value) => {
+                    this.password = value;
+                  }}
+                  marginBottom={
+                    !this.state.biometricUnlock ||
+                    !this.state.isBiometryEnrolled ||
+                    !novault ||
+                    changePassword
+                      ? 0
+                      : 10
+                  }
+                  onSubmit={() => {
+                    changePassword
+                      ? this.confirmPassRef.current?.focus()
+                      : this.onPress;
+                  }}
+                  autoComplete="password"
+                  returnKeyLabel={
+                    changePassword ? strings.next() : this.state.title
+                  }
+                  returnKeyType={changePassword ? "next" : "done"}
+                  secureTextEntry
+                  placeholder={
+                    changePassword
+                      ? strings.currentPassword()
+                      : strings.password()
+                  }
+                />
+
+                {!this.state.biometricUnlock ||
+                !this.state.isBiometryEnrolled ||
+                !novault ||
+                changePassword ? null : (
+                  <Button
+                    onPress={() =>
+                      this._onPressFingerprintAuth(strings.unlockNote(), "")
+                    }
+                    icon="fingerprint"
+                    width="100%"
+                    title={strings.unlockWithBiometrics()}
+                    type="transparent"
+                  />
+                )}
+              </>
+            ) : null}
+
+            {this.state.deleteVault && (
+              <Button
+                onPress={() =>
+                  this.setState({
+                    deleteAll: !this.state.deleteAll
+                  })
+                }
+                icon={
+                  this.state.deleteAll
+                    ? "check-circle-outline"
+                    : "checkbox-blank-circle-outline"
+                }
+                style={{
+                  marginTop: DefaultAppStyles.GAP_VERTICAL
+                }}
+                width="100%"
+                title={strings.deleteAllNotes()}
+                type="errorShade"
+              />
+            )}
+
+            {changePassword ? (
+              <>
+                <Seperator half />
+                <Input
+                  ref={this.confirmPassRef}
+                  editable={!loading}
+                  testID={notesnook.ids.dialogs.vault.changePwd}
+                  autoCapitalize="none"
+                  onChangeText={(value) => {
+                    this.newPassword = value;
+                  }}
+                  autoComplete="password"
+                  onSubmit={this.onPress}
+                  returnKeyLabel="Change"
+                  returnKeyType="done"
+                  secureTextEntry
+                  placeholder={strings.newPassword()}
+                />
+              </>
+            ) : null}
+
+            {!novault ? (
+              <View>
+                <Input
+                  fwdRef={this.passInputRef}
+                  autoCapitalize="none"
+                  testID={notesnook.ids.dialogs.vault.pwd}
+                  onChangeText={(value) => {
+                    this.password = value;
+                  }}
+                  autoComplete="password"
+                  returnKeyLabel={strings.next()}
+                  returnKeyType="next"
+                  secureTextEntry
+                  onSubmit={() => {
+                    this.confirmPassRef.current?.focus();
+                  }}
+                  placeholder={strings.password()}
+                />
+
+                <Input
+                  fwdRef={this.confirmPassRef}
+                  autoCapitalize="none"
+                  testID={notesnook.ids.dialogs.vault.pwdAlt}
+                  secureTextEntry
+                  validationType="confirmPassword"
+                  customValidator={() => this.password}
+                  errorMessage="Passwords do not match."
+                  onErrorCheck={() => null}
+                  marginBottom={0}
+                  autoComplete="password"
+                  returnKeyLabel="Create"
+                  returnKeyType="done"
+                  onChangeText={(value) => {
+                    this.confirmPassword = value;
+                    if (value !== this.password) {
+                      this.setState({
+                        passwordsDontMatch: true
+                      });
+                    } else {
+                      this.setState({
+                        passwordsDontMatch: false
+                      });
+                    }
+                  }}
+                  onSubmit={this.onPress}
+                  placeholder={strings.confirmPassword()}
+                />
+              </View>
+            ) : null}
+
+            {this.state.biometricUnlock &&
+            !this.state.isBiometryEnrolled &&
+            novault ? (
+              <Paragraph>{strings.vaultEnableBiometrics()}</Paragraph>
+            ) : null}
+
+            {this.state.isBiometryAvailable &&
+            !this.state.fingerprintAccess &&
+            !this.state.clearVault &&
+            !this.state.deleteVault &&
+            ((!this.state.biometricUnlock && !changePassword) || !novault) ? (
+              <Button
+                onPress={() => {
+                  this.setState({
+                    biometricUnlock: !this.state.biometricUnlock
+                  });
+                }}
+                style={{
+                  marginTop: DefaultAppStyles.GAP_VERTICAL
+                }}
+                icon="fingerprint"
+                width="100%"
+                title={strings.unlockWithBiometrics()}
+                iconColor={
+                  this.state.biometricUnlock
+                    ? colors.selected.accent
+                    : colors.primary.icon
+                }
+                type={this.state.biometricUnlock ? "transparent" : "plain"}
+              />
+            ) : null}
+          </View>
+
+          <DialogButtons
+            onPressNegative={this.close}
+            onPressPositive={this.onPress}
+            loading={loading}
+            positiveType={
+              deleteVault || clearVault ? "errorShade" : "transparent"
+            }
+            positiveTitle={
+              deleteVault
+                ? strings.delete()
+                : clearVault
+                ? strings.clear()
+                : fingerprintAccess
+                ? strings.enable()
+                : this.state.revokeFingerprintAccess
+                ? strings.revoke()
+                : changePassword
+                ? strings.change()
+                : this.state.noteLocked
+                ? deleteNote
+                  ? strings.delete()
+                  : share
+                  ? strings.share()
+                  : goToEditor
+                  ? strings.open()
+                  : strings.unlock()
+                : !note.id
+                ? strings.create()
+                : strings.lock()
+            }
+          />
+        </View>
+        <Toast context="local" />
+      </BaseDialog>
+    );
+  }
+}

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

@@ -1,946 +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 Clipboard from "@react-native-clipboard/clipboard";
-import React, { useCallback, useEffect, useRef, useState } from "react";
-import { InteractionManager, View, TextInput } from "react-native";
-import Share from "react-native-share";
-import { notesnook } from "../../../../e2e/test.ids";
-import { db } from "../../../common/database";
-import BiometricService from "../../../services/biometrics";
-import { DDS } from "../../../services/device-detection";
-import {
-  ToastManager,
-  Vault,
-  VaultRequestType,
-  eSendEvent,
-  eSubscribeEvent,
-  eUnSubscribeEvent
-} from "../../../services/event-manager";
-import Navigation from "../../../services/navigation";
-import { getElevationStyle } from "../../../utils/elevation";
-import {
-  eCloseActionSheet,
-  eCloseVaultDialog,
-  eOnLoadNote,
-  eOpenVaultDialog,
-  eUpdateNoteInEditor
-} from "../../../utils/events";
-import { deleteItems } from "../../../utils/functions";
-import { fluidTabsRef } from "../../../utils/global-refs";
-import { convertNoteToText } from "../../../utils/note-to-text";
-import { sleep } from "../../../utils/time";
-import BaseDialog from "../../dialog/base-dialog";
-import DialogButtons from "../../dialog/dialog-buttons";
-import DialogHeader from "../../dialog/dialog-header";
-import { Toast } from "../../toast";
-import { Button } from "../../ui/button";
-import Input from "../../ui/input";
-import Seperator from "../../ui/seperator";
-import Paragraph from "../../ui/typography/paragraph";
-import { strings } from "@notesnook/intl";
-import { DefaultAppStyles } from "../../../utils/styles";
-import {
-  isEncryptedContent,
-  Note,
-  NoteContent,
-  VAULT_ERRORS
-} from "@notesnook/core";
-import { useThemeColors } from "@notesnook/theme";
-
-export const VaultDialog: React.FC = () => {
-  const { colors } = useThemeColors();
-
-  // UI State
-  const [visible, setVisible] = useState(false);
-  const [loading, setLoading] = useState(false);
-  const [wrongPassword, setWrongPassword] = useState(false);
-  const [passwordsDontMatch, setPasswordsDontMatch] = useState(false);
-  const [deleteAll, setDeleteAll] = useState(false);
-  const [biometricUnlock, setBiometricUnlock] = useState(false);
-  const [isBiometryAvailable, setIsBiometryAvailable] = useState(false);
-  const [isBiometryEnrolled, setIsBiometryEnrolled] = useState(false);
-
-  // Refs for non-UI state
-  const requestTypeRef = useRef<VaultRequestType | null>(null);
-  const noteRef = useRef<Note | undefined>(undefined);
-  const titleRef = useRef<string>(strings.goToEditor());
-  const descriptionRef = useRef<string | null>(null);
-  const paragraphRef = useRef<string | null>(null);
-  const buttonTitleRef = useRef<string | null>(null);
-  const positiveButtonTypeRef = useRef<"errorShade" | "transparent" | "accent">(
-    "transparent"
-  );
-  const customActionTitleRef = useRef<string | null>(null);
-  const customActionParagraphRef = useRef<string | null>(null);
-  const noteLockedRef = useRef(false);
-  const onUnlockRef = useRef<
-    | ((
-        item: Note & {
-          content?: NoteContent<false>;
-        },
-        password: string
-      ) => void)
-    | undefined
-  >(undefined);
-
-  // Input refs
-  const passInputRef = useRef<TextInput>(null);
-  const confirmPassRef = useRef<TextInput>(null);
-  const changePassInputRef = useRef<TextInput>(null);
-
-  // Password refs
-  const passwordRef = useRef<string | null>(null);
-  const confirmPasswordRef = useRef<string | null>(null);
-  const newPasswordRef = useRef<string | null>(null);
-
-  const open = useCallback(async (data: Vault) => {
-    const biometry = await BiometricService.isBiometryAvailable();
-    const available = !!biometry;
-    const fingerprint = await BiometricService.hasInternetCredentials();
-
-    if (data.item) {
-      const locked = await db.vaults.itemExists(data.item);
-      noteLockedRef.current = locked;
-      if (!locked) {
-        const content = await db.content.findByNoteId(data.item!.id);
-        if (content && isEncryptedContent(content)) {
-          noteLockedRef.current = true;
-        }
-      }
-    }
-
-    // Set refs
-    noteRef.current = data.item;
-    titleRef.current = data.title || strings.goToEditor();
-    descriptionRef.current = data.description || null;
-    paragraphRef.current = data.paragraph || null;
-    buttonTitleRef.current = data.buttonTitle || null;
-    positiveButtonTypeRef.current = data.positiveButtonType || "transparent";
-    customActionTitleRef.current = data.customActionTitle || null;
-    customActionParagraphRef.current = data.customActionParagraph || null;
-    onUnlockRef.current = data.onUnlock;
-    requestTypeRef.current = data.requestType;
-
-    // Set UI state
-    setIsBiometryAvailable(available);
-    setIsBiometryEnrolled(fingerprint);
-    setBiometricUnlock(fingerprint);
-    setWrongPassword(false);
-    setPasswordsDontMatch(false);
-    setDeleteAll(false);
-    setLoading(false);
-
-    // Auto-unlock with fingerprint if applicable
-    const canAutoUnlock =
-      fingerprint &&
-      data.requestType !== VaultRequestType.EnableFingerprint &&
-      data.requestType !== VaultRequestType.RevokeFingerprint &&
-      data.requestType !== VaultRequestType.ChangePassword &&
-      data.requestType !== VaultRequestType.ClearVault &&
-      data.requestType !== VaultRequestType.DeleteVault &&
-      data.requestType !== VaultRequestType.CustomAction &&
-      data.requestType !== VaultRequestType.PermanentUnlock;
-
-    if (canAutoUnlock) {
-      await onPressFingerprintAuth(data.title, data.description);
-    } else {
-      setVisible(true);
-    }
-  }, []);
-
-  const close = useCallback(() => {
-    if (loading) {
-      ToastManager.show({
-        heading: titleRef.current,
-        message: strings.pleaseWait() + "...",
-        type: "success",
-        context: "local"
-      });
-      return;
-    }
-
-    Navigation.queueRoutesForUpdate();
-
-    // Reset password refs
-    passwordRef.current = null;
-    confirmPasswordRef.current = null;
-    newPasswordRef.current = null;
-
-    // Reset refs
-    requestTypeRef.current = null;
-    noteRef.current = undefined;
-    titleRef.current = strings.goToEditor();
-    descriptionRef.current = null;
-    paragraphRef.current = null;
-    buttonTitleRef.current = null;
-    positiveButtonTypeRef.current = "transparent";
-    customActionTitleRef.current = null;
-    customActionParagraphRef.current = null;
-    noteLockedRef.current = false;
-    onUnlockRef.current = undefined;
-
-    // Reset UI state
-    setVisible(false);
-    setLoading(false);
-    setWrongPassword(false);
-    setPasswordsDontMatch(false);
-    setDeleteAll(false);
-    setBiometricUnlock(false);
-    setIsBiometryAvailable(false);
-    setIsBiometryEnrolled(false);
-  }, [loading]);
-
-  const deleteVault = useCallback(async () => {
-    setLoading(true);
-    try {
-      let verified = true;
-      if (await db.user.getUser()) {
-        verified = await db.user.verifyPassword(passwordRef.current || "");
-      }
-      if (verified) {
-        let noteIds: string[] = [];
-        if (deleteAll) {
-          const vault = await db.vaults.default();
-          const relations = await db.relations
-            .from(
-              {
-                type: "vault",
-                id: vault!.id
-              },
-              "note"
-            )
-            .get();
-          noteIds = relations.map((item) => item.toId);
-        }
-        await db.vault.delete(deleteAll);
-
-        if (deleteAll) {
-          noteIds.forEach((id) => {
-            eSendEvent(
-              eUpdateNoteInEditor,
-              {
-                id: id,
-                deleted: true
-              },
-              true
-            );
-          });
-        }
-        eSendEvent("vaultUpdated");
-        setLoading(false);
-        setTimeout(() => {
-          close();
-        }, 100);
-      } else {
-        ToastManager.show({
-          heading: strings.passwordIncorrect(),
-          type: "error",
-          context: "local"
-        });
-      }
-    } catch (e) {
-      console.error(e);
-    }
-  }, [deleteAll, close]);
-
-  const clearVault = useCallback(async () => {
-    setLoading(true);
-    try {
-      const vault = await db.vaults.default();
-      const relations = await db.relations.from(vault!, "note").get();
-      const noteIds = relations.map((item) => item.toId);
-
-      await db.vault.clear(passwordRef.current || "");
-
-      noteIds.forEach((id) => {
-        eSendEvent(
-          eUpdateNoteInEditor,
-          {
-            id: id,
-            deleted: true
-          },
-          true
-        );
-      });
-      setLoading(false);
-      close();
-      eSendEvent("vaultUpdated");
-    } catch (e) {
-      ToastManager.show({
-        heading: strings.passwordIncorrect(),
-        type: "error",
-        context: "local"
-      });
-    }
-    setLoading(false);
-  }, [close]);
-
-  const lockNote = useCallback(async () => {
-    if (!passwordRef.current || passwordRef.current.trim() === "") {
-      ToastManager.show({
-        heading: strings.passwordIncorrect(),
-        type: "error",
-        context: "local"
-      });
-      return;
-    } else {
-      await db.vault.add(noteRef.current!.id);
-
-      eSendEvent(eUpdateNoteInEditor, noteRef.current, true);
-
-      close();
-      ToastManager.show({
-        message: strings.noteLocked(),
-        type: "error",
-        context: "local"
-      });
-      setLoading(false);
-    }
-  }, [close]);
-
-  const permanantUnlock = useCallback(() => {
-    db.vault
-      .remove(noteRef.current!.id, passwordRef.current || "")
-      .then(async () => {
-        ToastManager.show({
-          heading: strings.noteUnlocked(),
-          type: "success",
-          context: "global"
-        });
-        eSendEvent(eUpdateNoteInEditor, noteRef.current, true);
-        if (biometricUnlock && !isBiometryEnrolled) {
-          await enrollFingerprint(passwordRef.current || "");
-        }
-        close();
-      })
-      .catch((e) => {
-        takeErrorAction();
-      });
-  }, [close, biometricUnlock, isBiometryEnrolled]);
-
-  const openInEditor = useCallback(
-    (note: Note & { content?: NoteContent<false> }) => {
-      close();
-      InteractionManager.runAfterInteractions(async () => {
-        eSendEvent(eOnLoadNote, {
-          item: note
-        });
-        if (!DDS.isTab) {
-          fluidTabsRef.current?.goToPage("editor");
-        }
-      });
-    },
-    [close]
-  );
-
-  const copyNote = useCallback(
-    async (note: Note & { content?: NoteContent<false> }) => {
-      Clipboard.setString((await convertNoteToText(note, true)) || "");
-      ToastManager.show({
-        heading: strings.noteCopied(),
-        type: "success",
-        context: "global"
-      });
-      close();
-    },
-    [close]
-  );
-
-  const shareNote = useCallback(
-    async (note: Note & { content?: NoteContent<false> }) => {
-      close();
-      try {
-        await Share.open({
-          title: note.title,
-          failOnCancel: false,
-          message: (await convertNoteToText(note)) || ""
-        });
-      } catch (e) {
-        console.error(e);
-      }
-    },
-    [close]
-  );
-
-  const deleteNote = useCallback(async () => {
-    try {
-      await db.vault.remove(noteRef.current!.id, passwordRef.current || "");
-      await deleteItems("note", [noteRef.current!.id]);
-      close();
-    } catch (e) {
-      takeErrorAction();
-    }
-  }, [close]);
-
-  const takeErrorAction = useCallback(() => {
-    setWrongPassword(true);
-    setVisible(true);
-    setTimeout(() => {
-      ToastManager.show({
-        heading: strings.passwordIncorrect(),
-        type: "error",
-        context: "local"
-      });
-    }, 500);
-  }, []);
-
-  const openNote = useCallback(async () => {
-    try {
-      if (!passwordRef.current) throw new Error("Invalid password");
-
-      const note = await db.vault.open(
-        noteRef.current!.id,
-        passwordRef.current
-      );
-      if (!note) throw new Error("Failed to unlock note.");
-      if (biometricUnlock && !isBiometryEnrolled) {
-        await enrollFingerprint(passwordRef.current || "");
-      }
-
-      const requestType = requestTypeRef.current;
-
-      if (requestType === VaultRequestType.GoToEditor) {
-        openInEditor(note);
-      } else if (requestType === VaultRequestType.ShareNote) {
-        await shareNote(note);
-      } else if (requestType === VaultRequestType.DeleteNote) {
-        await deleteNote();
-      } else if (requestType === VaultRequestType.CopyNote) {
-        await copyNote(note);
-      } else if (
-        requestType === VaultRequestType.CustomAction &&
-        onUnlockRef.current
-      ) {
-        const password = passwordRef.current;
-        const unlock = onUnlockRef.current;
-        close();
-        await sleep(500);
-        unlock(note, password);
-      }
-    } catch (e) {
-      takeErrorAction();
-    }
-  }, [
-    biometricUnlock,
-    isBiometryEnrolled,
-    openInEditor,
-    shareNote,
-    deleteNote,
-    copyNote,
-    close,
-    takeErrorAction
-  ]);
-
-  const unlockNote = useCallback(async () => {
-    if (!passwordRef.current || passwordRef.current.trim() === "") {
-      ToastManager.show({
-        heading: strings.passwordIncorrect(),
-        type: "error",
-        context: "local"
-      });
-      return;
-    }
-    if (requestTypeRef.current === VaultRequestType.PermanentUnlock) {
-      permanantUnlock();
-    } else {
-      await openNote();
-    }
-  }, [permanantUnlock, openNote]);
-
-  const enrollFingerprint = useCallback(
-    async (password: string) => {
-      setLoading(true);
-      try {
-        await db.vault.unlock(password);
-        await BiometricService.storeCredentials(password);
-        setLoading(false);
-        eSendEvent("vaultUpdated");
-        ToastManager.show({
-          heading: strings.biometricUnlockEnabled(),
-          type: "success",
-          context: "global"
-        });
-        close();
-      } catch (e) {
-        close();
-        ToastManager.show({
-          heading: strings.passwordIncorrect(),
-          type: "error",
-          context: "local"
-        });
-        setLoading(false);
-      }
-    },
-    [close]
-  );
-
-  const createVault = useCallback(async () => {
-    await db.vault.create(passwordRef.current || "");
-
-    if (biometricUnlock) {
-      await enrollFingerprint(passwordRef.current || "");
-    }
-    if (noteRef.current?.id) {
-      await db.vault.add(noteRef.current.id);
-      eSendEvent(eUpdateNoteInEditor, noteRef.current, true);
-      setLoading(false);
-      ToastManager.show({
-        heading: strings.noteLocked(),
-        type: "success",
-        context: "global"
-      });
-      close();
-    } else {
-      ToastManager.show({
-        heading: strings.vaultCreated(),
-        type: "success",
-        context: "global"
-      });
-      close();
-    }
-    eSendEvent("vaultUpdated");
-  }, [biometricUnlock, enrollFingerprint, close]);
-
-  const revokeFingerprintAccess = useCallback(async () => {
-    try {
-      await BiometricService.resetCredentials();
-      eSendEvent("vaultUpdated");
-      ToastManager.show({
-        heading: strings.biometricUnlockDisabled(),
-        type: "success",
-        context: "global"
-      });
-    } catch (e: any) {
-      ToastManager.show({
-        heading: e.message,
-        type: "success",
-        context: "global"
-      });
-    }
-  }, []);
-
-  const onPressFingerprintAuth = useCallback(
-    async (title?: string, description?: string) => {
-      try {
-        const credentials = await BiometricService.getCredentials(
-          title || titleRef.current,
-          description || descriptionRef.current || ""
-        );
-
-        if (!credentials) throw new Error("Failed to get user credentials");
-
-        if (credentials?.password) {
-          passwordRef.current = credentials.password;
-          onPress();
-        } else {
-          eSendEvent(eCloseActionSheet);
-          await sleep(300);
-          setVisible(true);
-        }
-      } catch (e) {
-        console.error(e);
-      }
-    },
-    []
-  );
-
-  const onPress = useCallback(async () => {
-    const requestType = requestTypeRef.current;
-
-    if (requestType === VaultRequestType.RevokeFingerprint) {
-      await revokeFingerprintAccess();
-      close();
-      return;
-    }
-
-    if (loading) return;
-
-    if (!passwordRef.current) {
-      ToastManager.show({
-        heading: strings.passwordNotEntered(),
-        type: "error",
-        context: "local"
-      });
-      return;
-    }
-
-    if (requestType === VaultRequestType.CreateVault) {
-      if (passwordRef.current !== confirmPasswordRef.current) {
-        ToastManager.show({
-          heading: strings.passwordNotMatched(),
-          type: "error",
-          context: "local"
-        });
-        setPasswordsDontMatch(true);
-        return;
-      }
-
-      createVault();
-    } else if (requestType === VaultRequestType.ChangePassword) {
-      setLoading(true);
-
-      db.vault
-        .changePassword(passwordRef.current, newPasswordRef.current || "")
-        .then(() => {
-          setLoading(false);
-          if (biometricUnlock) {
-            enrollFingerprint(newPasswordRef.current || "");
-          }
-          ToastManager.show({
-            heading: strings.passwordUpdated(),
-            type: "success",
-            context: "global"
-          });
-          close();
-        })
-        .catch((e) => {
-          setLoading(false);
-          if (e.message === VAULT_ERRORS.wrongPassword) {
-            ToastManager.show({
-              heading: strings.passwordIncorrect(),
-              type: "error",
-              context: "local"
-            });
-          } else {
-            ToastManager.error(e);
-          }
-        });
-    } else if (requestType === VaultRequestType.LockNote) {
-      if (!passwordRef.current || passwordRef.current.trim() === "") {
-        ToastManager.show({
-          heading: strings.passwordIncorrect(),
-          type: "error",
-          context: "local"
-        });
-        setWrongPassword(true);
-        return;
-      }
-      db.vault
-        .unlock(passwordRef.current)
-        .then(async (unlocked) => {
-          if (unlocked) {
-            setWrongPassword(false);
-            await lockNote();
-          } else {
-            takeErrorAction();
-          }
-        })
-        .catch((e) => {
-          takeErrorAction();
-        });
-    } else if (
-      requestType === VaultRequestType.UnlockNote ||
-      requestType === VaultRequestType.PermanentUnlock ||
-      requestType === VaultRequestType.GoToEditor ||
-      requestType === VaultRequestType.ShareNote ||
-      requestType === VaultRequestType.CopyNote ||
-      requestType === VaultRequestType.DeleteNote ||
-      requestType === VaultRequestType.CustomAction
-    ) {
-      if (!passwordRef.current || passwordRef.current.trim() === "") {
-        ToastManager.show({
-          heading: strings.passwordIncorrect(),
-          type: "error",
-          context: "local"
-        });
-        setWrongPassword(true);
-        return;
-      }
-      if (noteLockedRef.current) {
-        await unlockNote();
-      } else {
-        console.log("Error: Note should be locked for this operation");
-      }
-    } else if (requestType === VaultRequestType.EnableFingerprint) {
-      enrollFingerprint(passwordRef.current);
-    } else if (requestType === VaultRequestType.ClearVault) {
-      await clearVault();
-    } else if (requestType === VaultRequestType.DeleteVault) {
-      await deleteVault();
-    }
-  }, [
-    loading,
-    biometricUnlock,
-    revokeFingerprintAccess,
-    close,
-    createVault,
-    enrollFingerprint,
-    unlockNote,
-    lockNote,
-    takeErrorAction,
-    clearVault,
-    deleteVault
-  ]);
-
-  useEffect(() => {
-    eSubscribeEvent(eOpenVaultDialog, open);
-    eSubscribeEvent(eCloseVaultDialog, close);
-
-    return () => {
-      eUnSubscribeEvent(eOpenVaultDialog, open);
-      eUnSubscribeEvent(eCloseVaultDialog, close);
-    };
-  }, [open, close]);
-
-  if (!visible) return null;
-
-  const requestType = requestTypeRef.current;
-  const isCreateVault = requestType === VaultRequestType.CreateVault;
-  const isChangePassword = requestType === VaultRequestType.ChangePassword;
-  const isClearVault = requestType === VaultRequestType.ClearVault;
-  const isDeleteVault = requestType === VaultRequestType.DeleteVault;
-  const isRevokeFingerprint =
-    requestType === VaultRequestType.RevokeFingerprint;
-  const isEnableFingerprint =
-    requestType === VaultRequestType.EnableFingerprint;
-  const isCustomAction = requestType === VaultRequestType.CustomAction;
-  const isDeleteNote = requestType === VaultRequestType.DeleteNote;
-  const isShareNote = requestType === VaultRequestType.ShareNote;
-  const isGoToEditor = requestType === VaultRequestType.GoToEditor;
-
-  return (
-    <BaseDialog
-      onShow={async () => {
-        await sleep(100);
-        passInputRef.current?.focus();
-      }}
-      statusBarTranslucent={false}
-      onRequestClose={close}
-      visible={true}
-    >
-      <View
-        style={{
-          ...getElevationStyle(5),
-          width: DDS.isTab ? 350 : "85%",
-          borderRadius: 10,
-          backgroundColor: colors.primary.background,
-          paddingTop: 12
-        }}
-      >
-        <DialogHeader
-          title={titleRef.current}
-          paragraph={
-            paragraphRef.current || customActionParagraphRef.current || ""
-          }
-          icon="shield"
-          padding={12}
-        />
-        <Seperator half />
-
-        <View
-          style={{
-            paddingHorizontal: DefaultAppStyles.GAP
-          }}
-        >
-          {(isChangePassword ||
-            isClearVault ||
-            !isCreateVault ||
-            isDeleteVault ||
-            isCustomAction) &&
-          !isRevokeFingerprint ? (
-            <>
-              <Input
-                fwdRef={passInputRef}
-                editable={!loading}
-                autoCapitalize="none"
-                testID={notesnook.ids.dialogs.vault.pwd}
-                onChangeText={(value) => {
-                  passwordRef.current = value;
-                }}
-                marginBottom={
-                  !biometricUnlock ||
-                  !isBiometryEnrolled ||
-                  isCreateVault ||
-                  isChangePassword ||
-                  isCustomAction
-                    ? 0
-                    : 10
-                }
-                onSubmit={() => {
-                  if (isChangePassword) {
-                    confirmPassRef.current?.focus();
-                  } else {
-                    onPress();
-                  }
-                }}
-                autoComplete="password"
-                returnKeyLabel={
-                  isChangePassword ? strings.next() : titleRef.current
-                }
-                returnKeyType={isChangePassword ? "next" : "done"}
-                secureTextEntry
-                placeholder={
-                  isChangePassword
-                    ? strings.currentPassword()
-                    : strings.password()
-                }
-              />
-
-              {!biometricUnlock ||
-              !isBiometryEnrolled ||
-              !isBiometryAvailable ||
-              isCreateVault ||
-              isChangePassword ||
-              isCustomAction ? null : (
-                <Button
-                  onPress={() =>
-                    onPressFingerprintAuth(strings.unlockNote(), "")
-                  }
-                  icon="fingerprint"
-                  width="100%"
-                  title={strings.unlockWithBiometrics()}
-                  type="transparent"
-                />
-              )}
-            </>
-          ) : null}
-
-          {isDeleteVault && (
-            <Button
-              onPress={() => setDeleteAll(!deleteAll)}
-              icon={
-                deleteAll
-                  ? "check-circle-outline"
-                  : "checkbox-blank-circle-outline"
-              }
-              style={{
-                marginTop: DefaultAppStyles.GAP_VERTICAL
-              }}
-              width="100%"
-              title={strings.deleteAllNotes()}
-              type="errorShade"
-            />
-          )}
-
-          {isChangePassword ? (
-            <>
-              <Seperator half />
-              <Input
-                fwdRef={confirmPassRef}
-                editable={!loading}
-                testID={notesnook.ids.dialogs.vault.changePwd}
-                autoCapitalize="none"
-                onChangeText={(value) => {
-                  newPasswordRef.current = value;
-                }}
-                autoComplete="password"
-                onSubmit={() => {
-                  onPress();
-                }}
-                returnKeyLabel="Change"
-                returnKeyType="done"
-                secureTextEntry
-                placeholder={strings.newPassword()}
-              />
-            </>
-          ) : null}
-
-          {isCreateVault ? (
-            <View>
-              <Input
-                fwdRef={passInputRef}
-                autoCapitalize="none"
-                testID={notesnook.ids.dialogs.vault.pwd}
-                onChangeText={(value) => {
-                  passwordRef.current = value;
-                }}
-                autoComplete="password"
-                returnKeyLabel={strings.next()}
-                returnKeyType="next"
-                secureTextEntry
-                onSubmit={() => {
-                  confirmPassRef.current?.focus();
-                }}
-                placeholder={strings.password()}
-              />
-
-              <Input
-                fwdRef={confirmPassRef}
-                autoCapitalize="none"
-                testID={notesnook.ids.dialogs.vault.pwdAlt}
-                secureTextEntry
-                validationType="confirmPassword"
-                customValidator={() => passwordRef.current || ""}
-                errorMessage="Passwords do not match."
-                onErrorCheck={() => null}
-                marginBottom={0}
-                autoComplete="password"
-                returnKeyLabel="Create"
-                returnKeyType="done"
-                onChangeText={(value) => {
-                  confirmPasswordRef.current = value;
-                  if (value !== passwordRef.current) {
-                    setPasswordsDontMatch(true);
-                  } else {
-                    setPasswordsDontMatch(false);
-                  }
-                }}
-                onSubmit={() => {
-                  onPress();
-                }}
-                placeholder={strings.confirmPassword()}
-              />
-            </View>
-          ) : null}
-
-          {biometricUnlock && !isBiometryEnrolled && !isCreateVault ? (
-            <Paragraph>{strings.vaultEnableBiometrics()}</Paragraph>
-          ) : null}
-
-          {!biometricUnlock &&
-          !isBiometryEnrolled &&
-          isBiometryAvailable &&
-          (requestType === VaultRequestType.CopyNote ||
-            requestType === VaultRequestType.DeleteNote ||
-            requestType === VaultRequestType.ShareNote ||
-            requestType === VaultRequestType.CustomAction ||
-            requestType === VaultRequestType.GoToEditor ||
-            requestType === VaultRequestType.PermanentUnlock ||
-            requestType === VaultRequestType.LockNote) ? (
-            <Button
-              onPress={() => {
-                setBiometricUnlock(!biometricUnlock);
-              }}
-              style={{
-                marginTop: DefaultAppStyles.GAP_VERTICAL
-              }}
-              icon="fingerprint"
-              width="100%"
-              title={strings.unlockWithBiometrics()}
-              iconColor={
-                biometricUnlock ? colors.selected.accent : colors.primary.icon
-              }
-              type={biometricUnlock ? "transparent" : "plain"}
-            />
-          ) : null}
-        </View>
-
-        <DialogButtons
-          onPressNegative={close}
-          onPressPositive={onPress}
-          loading={loading}
-          positiveType={positiveButtonTypeRef.current}
-          positiveTitle={buttonTitleRef.current || strings.unlock()}
-        />
-      </View>
-      <Toast context="local" />
-    </BaseDialog>
-  );
-};

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

@@ -31,7 +31,6 @@ import { Gesture, GestureDetector } from "react-native-gesture-handler";
 import Animated, {
   runOnJS,
   SharedValue,
-  SnappySpringConfig,
   useAnimatedReaction,
   useAnimatedStyle,
   useSharedValue,
@@ -40,6 +39,7 @@ import Animated, {
   withTiming
 } from "react-native-reanimated";
 import { useTabStore } from "../../screens/editor/tiptap/use-tab-store";
+import { getAppState } from "../../screens/editor/tiptap/utils";
 import { eSendEvent } from "../../services/event-manager";
 import { useSettingStore } from "../../stores/use-setting-store";
 import { eClearEditor } from "../../utils/events";
@@ -83,9 +83,18 @@ export const FluidPanels = forwardRef<TabsRef, TabProps>(function FluidTabs(
   }: TabProps,
   ref
 ) {
+  const appState = useMemo(() => getAppState(), []);
   const deviceMode = useSettingStore((state) => state.deviceMode);
   const fullscreen = useSettingStore((state) => state.fullscreen);
-  const translateX = useSharedValue(widths ? widths.sidebar : 0);
+  const translateX = useSharedValue(
+    widths
+      ? appState &&
+        appState?.movedAway === false &&
+        useTabStore.getState().getCurrentNoteId()
+        ? widths.sidebar + widths.list
+        : widths.sidebar
+      : 0
+  );
   const startX = useSharedValue(0);
   const currentTab = useSharedValue(1);
   const previousTab = useSharedValue(1);
@@ -101,6 +110,7 @@ export const FluidPanels = forwardRef<TabsRef, TabProps>(function FluidTabs(
   const containerWidth = widths
     ? widths.sidebar + widths.list + widths.editor
     : dimensions.width;
+
   const drawerPosition = 0;
   const homePosition = widths.sidebar;
   const editorPosition = widths.sidebar + widths.list;
@@ -115,7 +125,10 @@ export const FluidPanels = forwardRef<TabsRef, TabProps>(function FluidTabs(
       translateX.value = 0;
     } else {
       if (prevWidths.current?.sidebar !== widths.sidebar) {
-        translateX.value = widths.sidebar;
+        translateX.value =
+          appState && appState?.movedAway === false
+            ? editorPosition
+            : widths.sidebar;
         if (translateX.value === editorPosition) {
           onChangeTab?.({ i: 2, from: 1 });
         }
@@ -123,7 +136,15 @@ export const FluidPanels = forwardRef<TabsRef, TabProps>(function FluidTabs(
     }
     isLoaded.current = true;
     prevWidths.current = widths;
-  }, [deviceMode, widths, fullscreen, translateX, editorPosition, onChangeTab]);
+  }, [
+    deviceMode,
+    widths,
+    fullscreen,
+    translateX,
+    editorPosition,
+    appState,
+    onChangeTab
+  ]);
 
   useEffect(() => {
     const sub = BackHandler.addEventListener("hardwareBackPress", () => {
@@ -333,10 +354,13 @@ export const FluidPanels = forwardRef<TabsRef, TabProps>(function FluidTabs(
       const finalValue = isSwipeLeft
         ? translateX.value - velocityX / 40.0
         : translateX.value + velocityX / 40.0;
-      const velocity = velocityX / 5000;
+
       const animationConfig: WithSpringConfig = {
-        velocity: velocity,
-        ...SnappySpringConfig
+        velocity: velocityX,
+        mass: 0.5,
+        overshootClamping: true,
+        damping: 800,
+        stiffness: 800
       };
 
       if (finalValue < homePosition) {
@@ -419,7 +443,15 @@ export const FluidPanels = forwardRef<TabsRef, TabProps>(function FluidTabs(
             width: containerWidth,
             flexDirection: "row"
           },
-          animatedStyles
+          deviceMode === "tablet"
+            ? {
+                transform: [
+                  {
+                    translateX: 0
+                  }
+                ]
+              }
+            : animatedStyles
         ]}
       >
         {children}

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

@@ -50,7 +50,7 @@ export const Header = ({
   onLeftMenuButtonPress?: () => void;
   renderedInRoute?: RouteName;
   id?: string;
-  title?: string;
+  title: string;
   canGoBack?: boolean;
   onPressDefaultRightButton?: () => void;
   hasSearch?: boolean;
@@ -114,16 +114,7 @@ export const Header = ({
           onLeftButtonPress={onLeftMenuButtonPress}
         />
 
-        {!title ? (
-          <View
-            style={{
-              width: 100,
-              backgroundColor: colors.primary.hover,
-              height: 10,
-              borderRadius: 100
-            }}
-          />
-        ) : hasSearch ? (
+        {hasSearch ? (
           <Paragraph>
             {selectionMode
               ? `${selectedItemsList.length} selected`

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

@@ -252,16 +252,14 @@ const NoteItem = ({
                 {reminder ? (
                   <ReminderTime
                     reminder={reminder}
+                    disabled
                     color={color?.colorCode}
                     textStyle={{
-                      fontSize: AppFontSize.xxs
+                      fontSize: AppFontSize.xxxs
                     }}
-                    short
-                    iconSize={AppFontSize.xxs}
+                    iconSize={AppFontSize.xxxs}
                     style={{
-                      justifyContent: "flex-start",
-                      paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL / 2,
-                      alignSelf: "flex-start"
+                      height: "auto"
                     }}
                   />
                 ) : null}

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

@@ -32,11 +32,9 @@ import { eOnLoadNote, eShowMergeDialog } from "../../../utils/events";
 import { fluidTabsRef } from "../../../utils/global-refs";
 
 import { NotebooksWithDateEdited, TagsWithDateEdited } from "@notesnook/common";
-import { useTabStore } from "../../../screens/editor/tiptap/use-tab-store";
-import { editorController } from "../../../screens/editor/tiptap/utils";
-import { RouteParams } from "../../../stores/use-navigation-store";
 import NotePreview from "../../note-history/preview";
 import SelectionWrapper, { selectItem } from "../selection-wrapper";
+import { RouteParams } from "../../../stores/use-navigation-store";
 
 export const openNote = async (
   item: Note,
@@ -65,19 +63,11 @@ export const openNote = async (
       component: <NotePreview note={item} content={content} />
     });
   } else {
-    if (!useTabStore.getState().hasTabForNote(note.id!)) {
-      editorController.current.commands.setLoading(
-        true,
-        useTabStore.getState().currentTab
-      );
-    }
     eSendEvent(eOnLoadNote, {
       item: note
     });
     if (!DDS.isTab) {
-      setTimeout(() => {
-        fluidTabsRef.current?.goToPage("editor");
-      }, 32);
+      fluidTabsRef.current?.goToPage("editor");
     }
   }
 };

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

@@ -77,10 +77,10 @@ export default function List(props: ListProps) {
     props.renderedInRoute === "Notes"
       ? "home"
       : props.renderedInRoute === "Favorites"
-      ? "favorites"
-      : props.renderedInRoute === "Trash" || props.dataType === "trash"
-      ? "trash"
-      : `${props.dataType}s`;
+        ? "favorites"
+        : props.renderedInRoute === "Trash" || props.dataType === "trash"
+          ? "trash"
+          : `${props.dataType}s`;
 
   const groupOptions = useGroupOptions(groupType);
 

apps/mobile/app/components/list/reorderable-list.tsx

@@ -131,7 +131,7 @@ function ReorderableList<T extends { id: string }>({
     ]
   );
 
-  const getOrderedItems = React.useCallback(() => {
+  function getOrderedItems() {
     if (!customizableSidebarFeature?.isAllowed) return data;
     const items: T[] = [];
     itemOrderState.forEach((id) => {
@@ -142,7 +142,7 @@ function ReorderableList<T extends { id: string }>({
 
     items.push(...data.filter((i) => !itemOrderState.includes(i.id)));
     return items;
-  }, [data, customizableSidebarFeature?.isAllowed]);
+  }
 
   return (
     <View style={styles.container}>

apps/mobile/app/components/merge-conflicts/index.jsx

@@ -18,16 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { getFormattedDate } from "@notesnook/common";
-import {
-  EncryptedContentItem,
-  isEncryptedContent,
-  Note,
-  UnencryptedContentItem
-} from "@notesnook/core";
-import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import KeepAwake from "@sayem314/react-native-keep-awake";
-import { diff } from "diffblazer";
 import React, { useEffect, useRef, useState } from "react";
 import { SafeAreaView, Text, View } from "react-native";
 import Animated from "react-native-reanimated";
@@ -40,17 +32,13 @@ import { DDS } from "../../services/device-detection";
 import {
   eSendEvent,
   eSubscribeEvent,
-  eUnSubscribeEvent,
-  openVault,
-  VaultRequestType
+  eUnSubscribeEvent
 } from "../../services/event-manager";
 import Navigation from "../../services/navigation";
 import Sync from "../../services/sync";
 import { useSettingStore } from "../../stores/use-setting-store";
 import { eOnLoadNote, eShowMergeDialog } from "../../utils/events";
 import { AppFontSize } from "../../utils/size";
-import { DefaultAppStyles } from "../../utils/styles";
-import { Dialog } from "../dialog";
 import BaseDialog from "../dialog/base-dialog";
 import DialogButtons from "../dialog/dialog-buttons";
 import DialogContainer from "../dialog/dialog-container";
@@ -59,65 +47,46 @@ import { Button } from "../ui/button";
 import { IconButton } from "../ui/icon-button";
 import Seperator from "../ui/seperator";
 import Paragraph from "../ui/typography/paragraph";
-import { presentDialog } from "../dialog/functions";
-import { Cipher } from "@notesnook/crypto";
+import { diff } from "diffblazer";
+import { strings } from "@notesnook/intl";
+import { DefaultAppStyles } from "../../utils/styles";
 
 const MergeConflicts = () => {
   const { colors } = useThemeColors();
   const [visible, setVisible] = useState(false);
-  const [selectedContent, setSelectedContent] =
-    useState<UnencryptedContentItem>();
-  const [copyOfDiscardedContent, setCopyOfDiscardedContent] =
-    useState<UnencryptedContentItem>();
+  const [keep, setKeep] = useState(null);
+  const [copy, setCopy] = useState(null);
   const [dialogVisible, setDialogVisible] = useState(false);
   const insets = useGlobalSafeAreaInsets();
-  const content = useRef<UnencryptedContentItem>(null);
+  const content = useRef(null);
+  const isKeepingConflicted = !keep?.conflicted;
+  const isKeeping = !!keep;
   const { height } = useSettingStore((state) => state.dimensions);
 
   const applyChanges = async () => {
-    let contentToSave = selectedContent;
-    if (!contentToSave) return;
-    let note = await db.notes.note(contentToSave.noteId);
-    if (!note) return;
+    let _content = keep;
+    let note = await db.notes.note(_content.noteId);
     await db.notes.add({
       id: note.id,
       conflicted: false,
-      dateEdited: contentToSave.dateEdited
+      dateEdited: _content.dateEdited
     });
 
-    const noteContent = await db.content.findByNoteId(note.id);
+    await db.content.add({
+      id: note.contentId,
+      data: _content.data,
+      type: _content.type,
+      dateResolved: content.current?.conflicted?.dateModified || Date.now(),
+      sessionId: Date.now(),
+      conflicted: false
+    });
 
-    if (noteContent?.locked) {
-      const selectedContent = contentToSave.conflicted
-        ? noteContent
-        : noteContent.conflicted;
-
-      await db.content.add({
-        id: note.contentId,
-        dateResolved: noteContent?.conflicted?.dateModified || Date.now(),
-        sessionId: `${Date.now()}`,
-        data: selectedContent?.data as Cipher<"base64">,
-        type: selectedContent?.type,
-        locked: true,
-        conflicted: undefined
-      });
-    } else {
-      await db.content.add({
-        id: note.contentId,
-        data: contentToSave.data,
-        type: contentToSave.type,
-        dateResolved: content.current?.conflicted?.dateModified || Date.now(),
-        sessionId: `${Date.now()}`,
-        conflicted: undefined
-      });
-    }
-
-    if (copyOfDiscardedContent) {
+    if (copy) {
       await db.notes.add({
         title: note.title + " (Copy)",
         content: {
-          data: copyOfDiscardedContent.data,
-          type: copyOfDiscardedContent.type
+          data: copy.data,
+          type: copy.type
         }
       });
     }
@@ -134,87 +103,15 @@ const MergeConflicts = () => {
     Sync.run();
   };
 
-  const show = async (item: Note) => {
-    const isLocked = await db.vaults.itemExists(item);
-    let noteContent: UnencryptedContentItem;
-    if (isLocked) {
-      openVault({
-        requestType: VaultRequestType.CustomAction,
-        item: item,
-        title: strings.unlockNote(),
-        customActionTitle: strings.unlockNote(),
-        customActionParagraph: strings.unlockNoteToMergeConflicts(),
-        buttonTitle: strings.unlock(),
-        onUnlock: async (item, password) => {
-          if (!item || !password) return;
-          const currentContent = await db.content.get(item.contentId!);
-          try {
-            noteContent = {
-              ...(await db.content.get(item.contentId!)),
-              ...item.content,
-              conflicted: currentContent?.conflicted
-                ? await db.vault.decryptContent(
-                    currentContent?.conflicted as EncryptedContentItem,
-                    password
-                  )
-                : undefined
-            } as UnencryptedContentItem;
-
-            content.current = noteContent;
-            if (__DEV__) {
-              if (!noteContent?.conflicted) {
-                content.current.conflicted = noteContent;
-              }
-            }
-            setVisible(true);
-          } catch (e) {
-            presentDialog({
-              input: true,
-              inputPlaceholder: strings.enterPassword(),
-              title: strings.unlockIncomingNote(),
-              paragraph: strings.unlockIncomingNoteDesc(),
-              positiveText: "Unlock",
-              positivePress: async (password) => {
-                try {
-                  noteContent = {
-                    ...(await db.content.get(item.contentId!)),
-                    ...item.content,
-                    conflicted: currentContent?.conflicted
-                      ? await db.vault.decryptContent(
-                          currentContent?.conflicted as EncryptedContentItem,
-                          password
-                        )
-                      : undefined
-                  } as UnencryptedContentItem;
-
-                  content.current = noteContent;
-                  if (__DEV__) {
-                    if (!noteContent?.conflicted) {
-                      content.current.conflicted = noteContent;
-                    }
-                  }
-                  setVisible(true);
-                  return true;
-                } catch (e) {
-                  return false;
-                }
-              }
-            });
-          }
-        }
-      });
-    } else {
-      noteContent = (await db.content.get(
-        item.contentId!
-      )) as UnencryptedContentItem;
-      content.current = noteContent;
-      if (__DEV__) {
-        if (!noteContent?.conflicted) {
-          content.current.conflicted = noteContent;
-        }
+  const show = async (item) => {
+    let noteContent = await db.content.get(item.contentId);
+    content.current = { ...noteContent };
+    if (__DEV__) {
+      if (!noteContent.conflicted) {
+        content.current.conflicted = { ...noteContent };
       }
-      setVisible(true);
     }
+    setVisible(true);
   };
 
   useEffect(() => {
@@ -226,8 +123,8 @@ const MergeConflicts = () => {
 
   const close = () => {
     setVisible(false);
-    setCopyOfDiscardedContent(undefined);
-    setSelectedContent(undefined);
+    setCopy(null);
+    setKeep(null);
     setDialogVisible(false);
   };
 
@@ -237,12 +134,6 @@ const MergeConflicts = () => {
     back,
     isCurrent,
     contentToKeep
-  }: {
-    isDiscarded: boolean;
-    keeping: boolean;
-    back: boolean;
-    isCurrent: boolean;
-    contentToKeep: UnencryptedContentItem;
   }) => {
     return (
       <View
@@ -303,7 +194,7 @@ const MergeConflicts = () => {
           {isDiscarded ? (
             <Button
               onPress={() => {
-                setCopyOfDiscardedContent(contentToKeep);
+                setCopy(contentToKeep);
                 setDialogVisible(true);
               }}
               title={strings.saveACopy()}
@@ -331,6 +222,7 @@ const MergeConflicts = () => {
                 paddingHorizontal: DefaultAppStyles.GAP
               }}
               fontSize={AppFontSize.xs}
+              color={colors.error.paragraph}
               onPress={() => {
                 setDialogVisible(true);
               }}
@@ -352,9 +244,7 @@ const MergeConflicts = () => {
                   keeping && !isDiscarded ? strings.undo() : strings.keep()
                 }
                 onPress={() => {
-                  setSelectedContent(
-                    keeping && !isDiscarded ? undefined : contentToKeep
-                  );
+                  setKeep(keeping && !isDiscarded ? null : contentToKeep);
                 }}
               />
             </>
@@ -368,6 +258,7 @@ const MergeConflicts = () => {
     <BaseDialog
       statusBarTranslucent
       transparent={false}
+      animationType="slide"
       animated={false}
       bounce={false}
       onRequestClose={() => {
@@ -375,9 +266,15 @@ const MergeConflicts = () => {
       }}
       centered={false}
       background={colors?.primary.background}
+      supportedOrientations={[
+        "portrait",
+        "portrait-upside-down",
+        "landscape",
+        "landscape-left",
+        "landscape-right"
+      ]}
       visible={true}
     >
-      <Dialog context="merge-conflicts" />
       <SafeAreaView
         style={{
           backgroundColor: colors.primary.background,
@@ -404,15 +301,15 @@ const MergeConflicts = () => {
           style={{
             height: "100%",
             width: "100%",
-            backgroundColor: DDS.isLargeTablet() ? "rgba(0,0,0,0.3)" : undefined
+            backgroundColor: DDS.isLargeTablet() ? "rgba(0,0,0,0.3)" : null
           }}
         >
           <ConfigBar
             back={true}
             isCurrent={true}
-            isDiscarded={!!selectedContent && !selectedContent.conflicted}
-            keeping={!!selectedContent}
-            contentToKeep={content.current!}
+            isDiscarded={isKeeping && isKeepingConflicted}
+            keeping={isKeeping}
+            contentToKeep={content.current}
           />
 
           <Animated.View
@@ -426,18 +323,15 @@ const MergeConflicts = () => {
             <ReadonlyEditor
               editorId="conflictPrimary"
               onLoad={async (loadContent) => {
-                const note = await db.notes.note(content.current!.noteId);
+                const note = await db.notes.note(content.current?.noteId);
                 if (!note) return;
-                if (content.current && content.current.conflicted) {
-                  loadContent({
-                    id: note.id,
-                    data: diff(
-                      (content.current.conflicted as UnencryptedContentItem)
-                        .data,
-                      content.current.data
-                    )
-                  });
-                }
+                loadContent({
+                  id: note.id,
+                  data: diff(
+                    content.current.conflicted.data,
+                    content.current.data
+                  )
+                });
               }}
             />
           </Animated.View>
@@ -445,11 +339,9 @@ const MergeConflicts = () => {
           <ConfigBar
             back={false}
             isCurrent={false}
-            isDiscarded={!!selectedContent && !!selectedContent.conflicted}
-            keeping={!!selectedContent}
-            contentToKeep={
-              content.current!.conflicted! as UnencryptedContentItem
-            }
+            isDiscarded={isKeeping && !isKeepingConflicted}
+            keeping={isKeeping}
+            contentToKeep={content.current.conflicted}
           />
 
           <Animated.View
@@ -462,12 +354,11 @@ const MergeConflicts = () => {
             <ReadonlyEditor
               editorId="conflictSecondary"
               onLoad={async (loadContent) => {
-                const note = await db.notes.note(content.current?.noteId!);
+                const note = await db.notes.note(content.current?.noteId);
                 if (!note) return;
                 loadContent({
                   id: note.id,
-                  data: (content.current!.conflicted as UnencryptedContentItem)
-                    .data
+                  data: content.current.conflicted.data
                 });
               }}
             />

apps/mobile/app/components/note-history/index.tsx

@@ -47,7 +47,7 @@ const HistoryItem = ({
 }: {
   index: number;
   items?: VirtualizedGrouping<HistorySession>;
-  note: Note;
+  note?: Note;
 }) => {
   const [item] = useDBItem(index, "noteHistory", items);
   const { colors } = useThemeColors();
@@ -73,7 +73,6 @@ const HistoryItem = ({
             session: getDate(item.dateCreated, item.dateModified)
           }}
           content={content}
-          note={note}
         />
       ),
       context: "note_history"
@@ -136,7 +135,7 @@ export default function NoteHistory({
 
   const renderItem = useCallback(
     ({ index }: { index: number }) => (
-      <HistoryItem index={index} items={history} note={note} />
+      <HistoryItem index={index} items={history} />
     ),
     [history]
   );

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

@@ -37,43 +37,21 @@ import Paragraph from "../ui/typography/paragraph";
 import { diff } from "diffblazer";
 import { strings } from "@notesnook/intl";
 import { DefaultAppStyles } from "../../utils/styles";
-import {
-  HistorySession,
-  isEncryptedContent,
-  Note,
-  NoteContent,
-  SessionContentItem,
-  TrashOrItem
-} from "@notesnook/core";
 
 /**
  *
  * @param {any} param0
  * @returns
  */
-export default function NotePreview({
-  session,
-  content,
-  note
-}: {
-  session?: HistorySession & { session: string };
-  content:
-    | Partial<
-        NoteContent<boolean> & {
-          title: string;
-        }
-      >
-    | undefined;
-  note: TrashOrItem<Note>;
-}) {
+export default function NotePreview({ session, content, note }) {
   const { colors } = useThemeColors();
   const [locked, setLocked] = useState(false);
 
   async function restore() {
     if (note && note.type === "trash") {
-      await db.trash.restore(note.id);
+      if ((await db.trash.restore(note.id)) === false) return;
       Navigation.queueRoutesForUpdate();
-      useSelectionStore.getState().setSelectionMode();
+      useSelectionStore.getState().setSelectionMode(false);
       ToastManager.show({
         heading: strings.noteRestored(),
         type: "success"
@@ -81,26 +59,24 @@ export default function NotePreview({
       eSendEvent(eCloseSheet);
       return;
     }
-    if (session) {
-      await db.noteHistory.restore(session.id);
-      if (useTabStore.getState().hasTabForNote(session?.noteId)) {
-        const note = editorController.current.note.current[session?.noteId];
-        if (note) {
-          eSendEvent(eOnLoadNote, {
-            item: note,
-            forced: true
-          });
-        }
+    await db.noteHistory.restore(session.id);
+    if (useTabStore.getState().hasTabForNote(session?.noteId)) {
+      const note = editorController.current.note.current[session?.noteId];
+      if (note) {
+        eSendEvent(eOnLoadNote, {
+          item: note,
+          forced: true
+        });
       }
-      eSendEvent(eCloseSheet, "note_history");
-      eSendEvent(eCloseSheet);
-      Navigation.queueRoutesForUpdate();
-
-      ToastManager.show({
-        heading: strings.noteRestoredFromHistory(),
-        type: "success"
-      });
     }
+    eSendEvent(eCloseSheet, "note_history");
+    eSendEvent(eCloseSheet);
+    Navigation.queueRoutesForUpdate();
+
+    ToastManager.show({
+      heading: strings.noteRestoredFromHistory(),
+      type: "success"
+    });
   }
 
   useEffect(() => {
@@ -115,17 +91,15 @@ export default function NotePreview({
       negativeText: strings.cancel(),
       context: "local",
       positivePress: async () => {
-        if (note) {
-          await db.trash.delete(note.id);
-          useTrashStore.getState().refresh();
-          useSelectionStore.getState().setSelectionMode();
-          ToastManager.show({
-            heading: strings.noteDeleted(),
-            type: "success",
-            context: "local"
-          });
-          eSendEvent(eCloseSheet);
-        }
+        await db.trash.delete(note.id);
+        useTrashStore.getState().refresh();
+        useSelectionStore.getState().setSelectionMode(false);
+        ToastManager.show({
+          heading: strings.noteDeleted(),
+          type: "success",
+          context: "local"
+        });
+        eSendEvent(eCloseSheet);
       },
       positiveType: "error"
     });
@@ -139,11 +113,8 @@ export default function NotePreview({
       }}
     >
       <Dialog context="local" />
-      <DialogHeader
-        padding={12}
-        title={content?.title || note.title || session?.session}
-      />
-      {!session?.locked && !locked && content?.data ? (
+      <DialogHeader padding={12} title={note?.title || session?.session} />
+      {!session?.locked && !locked ? (
         <View
           style={{
             flex: 1,
@@ -154,27 +125,17 @@ export default function NotePreview({
             editorId="historyPreview"
             onLoad={async (loadContent) => {
               try {
-                if (content?.data) {
-                  const currentContent = note?.contentId
-                    ? await db.content.get(note.contentId)
-                    : undefined;
-
-                  if (
-                    currentContent?.data &&
-                    !isEncryptedContent(currentContent)
-                  ) {
-                    loadContent({
-                      data: diff(
-                        currentContent?.data || "<p></p>",
-                        content.data as string
-                      ),
-                      id: session?.noteId || note.id
-                    });
-                  }
+                if (content.data) {
+                  const _note = note || (await db.notes.note(session?.noteId));
+                  const currentContent = await db.content.get(_note.contentId);
+                  loadContent({
+                    data: diff(currentContent.data, content.data),
+                    id: _note.id
+                  });
                 }
               } catch (e) {
                 ToastManager.error(
-                  e as Error,
+                  e,
                   "Failed to load history preview",
                   "local"
                 );
@@ -192,9 +153,7 @@ export default function NotePreview({
           }}
         >
           <Paragraph color={colors.secondary.paragraph}>
-            {!content?.data
-              ? strings.noContent()
-              : strings.encryptedNoteHistoryNotice()}
+            {strings.encryptedNoteHistoryNotice()}
           </Paragraph>
         </View>
       )}

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

@@ -76,7 +76,6 @@ import { IconButton } from "../ui/icon-button";
 import { SvgView } from "../ui/svg";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
-import { db } from "../../common/database";
 
 const Steps = {
   select: 1,
@@ -140,12 +139,12 @@ const PayWall = (props: NavigationProps<"PayWall">) => {
   }, [isFocused, step]);
 
   useEffect(() => {
-    const sub = db.eventManager.subscribe(
+    const sub = EV.subscribe(
       EVENTS.userSubscriptionUpdated,
       (sub: User["subscription"]) => {
         if (sub.plan === SubscriptionPlan.FREE) return;
         if (routeParams.context === "signup") {
-          Navigation.navigate("FluidPanelsView", {});
+          Navigation.replace("FluidPanelsView", {});
         } else {
           Navigation.goBack();
         }
@@ -183,9 +182,8 @@ const PayWall = (props: NavigationProps<"PayWall">) => {
         >
           <IconButton
             name="close"
-            color={colors.primary.icon}
             onPress={() => {
-              Navigation.navigate("FluidPanelsView", {});
+              Navigation.replace("FluidPanelsView", {});
             }}
           />
         </View>
@@ -198,7 +196,7 @@ const PayWall = (props: NavigationProps<"PayWall">) => {
               return;
             }
             if (routeParams.context === "signup") {
-              Navigation.navigate("FluidPanelsView", {});
+              Navigation.replace("FluidPanelsView", {});
             } else {
               Navigation.goBack();
             }
@@ -656,7 +654,7 @@ After trying all the privacy security oriented note taking apps, for the price a
             type="accent"
             onPress={() => {
               if (routeParams.context === "signup") {
-                Navigation.navigate("FluidPanelsView", {});
+                Navigation.replace("FluidPanelsView", {});
               } else {
                 Navigation.goBack();
               }
@@ -996,7 +994,7 @@ const PricingPlanCard = ({
           PremiumService.get() &&
           (pricingPlans?.user?.subscription?.productId ===
             (product as RNIap.Subscription)?.productId ||
-            pricingPlans?.user?.subscription?.productId?.startsWith(
+            pricingPlans?.user?.subscription?.productId.startsWith(
               (product as RNIap.Subscription)?.productId
             ));
         pricingPlans?.selectPlan(
@@ -1008,8 +1006,8 @@ const PricingPlanCard = ({
                   : "monthly"
               }`
             : pricingPlans.isGithubRelease
-            ? (WebPlan?.period as string)
-            : (product?.productId as string)
+              ? (WebPlan?.period as string)
+              : (product?.productId as string)
         );
         setStep(Steps.buy);
       }}

apps/mobile/app/components/properties/date-meta.jsx

@@ -0,0 +1,72 @@
+/*
+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 React from "react";
+import { View } from "react-native";
+import { useThemeColors } from "@notesnook/theme";
+import { AppFontSize } from "../../utils/size";
+import Paragraph from "../ui/typography/paragraph";
+import { getFormattedDate } from "@notesnook/common";
+import { strings } from "@notesnook/intl";
+import { DefaultAppStyles } from "../../utils/styles";
+export const DateMeta = ({ item }) => {
+  const { colors } = useThemeColors();
+
+  function getDateMeta() {
+    let keys = Object.keys(item);
+    if (keys.includes("dateEdited"))
+      keys.splice(
+        keys.findIndex((k) => k === "dateModified"),
+        1
+      );
+    return keys.filter((key) => key.startsWith("date") && key !== "date");
+  }
+
+  const renderItem = (key) =>
+    !item[key] ? null : (
+      <View
+        key={key}
+        style={{
+          flexDirection: "row",
+          justifyContent: "space-between",
+          paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL / 2
+        }}
+      >
+        <Paragraph size={AppFontSize.xs} color={colors.secondary.paragraph}>
+          {strings.dateDescFromKey(key)}
+        </Paragraph>
+        <Paragraph size={AppFontSize.xs} color={colors.secondary.paragraph}>
+          {getFormattedDate(item[key], "date-time")}
+        </Paragraph>
+      </View>
+    );
+
+  return (
+    <View
+      style={{
+        borderTopWidth: 1,
+        borderTopColor: colors.primary.border,
+        paddingHorizontal: DefaultAppStyles.GAP,
+        paddingTop: DefaultAppStyles.GAP_VERTICAL_SMALL
+      }}
+    >
+      {getDateMeta().map(renderItem)}
+    </View>
+  );
+};

apps/mobile/app/components/properties/date-meta.tsx

@@ -1,130 +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 React, { useState } from "react";
-import { View } from "react-native";
-import { useThemeColors } from "@notesnook/theme";
-import { AppFontSize } from "../../utils/size";
-import Paragraph from "../ui/typography/paragraph";
-import { getFormattedDate } from "@notesnook/common";
-import { strings } from "@notesnook/intl";
-import { DefaultAppStyles } from "../../utils/styles";
-import DateTimePickerModal from "react-native-modal-datetime-picker";
-import { db } from "../../common/database";
-import { Item, Note } from "@notesnook/core";
-import AppIcon from "../ui/AppIcon";
-export const DateMeta = ({ item }: { item: Item }) => {
-  const { colors, isDark } = useThemeColors();
-  const [isDatePickerVisible, setIsDatePickerVisible] = useState(false);
-  const [dateCreated, setDateCreated] = useState(item.dateCreated);
-
-  function getDateMeta() {
-    let keys = Object.keys(item);
-    if (keys.includes("dateEdited"))
-      keys.splice(
-        keys.findIndex((k) => k === "dateModified"),
-        1
-      );
-    return keys.filter((key) => key.startsWith("date") && key !== "date");
-  }
-
-  const renderItem = (key: string) =>
-    !item[key as keyof Item] ? null : (
-      <View
-        key={key}
-        style={{
-          flexDirection: "row",
-          justifyContent: "space-between",
-          paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL / 2
-        }}
-      >
-        <Paragraph size={AppFontSize.xs} color={colors.secondary.paragraph}>
-          {strings.dateDescFromKey(
-            key as
-              | "dateDeleted"
-              | "dateEdited"
-              | "dateModified"
-              | "dateCreated"
-              | "dateUploaded"
-          )}
-        </Paragraph>
-        <Paragraph
-          size={AppFontSize.xs}
-          color={colors.secondary.paragraph}
-          onPress={
-            item.type !== "note"
-              ? undefined
-              : () => {
-                  setIsDatePickerVisible(true);
-                }
-          }
-        >
-          {getFormattedDate(
-            key === "dateCreated"
-              ? dateCreated
-              : (item[key as keyof Item] as string),
-            "date-time"
-          )}
-          {key === "dateCreated" && item.type === "note" ? (
-            <>
-              {" "}
-              <AppIcon name="pencil" size={AppFontSize.md} />
-            </>
-          ) : null}
-        </Paragraph>
-      </View>
-    );
-
-  return (
-    <>
-      {item.type === "note" ? (
-        <DateTimePickerModal
-          isVisible={isDatePickerVisible}
-          mode="datetime"
-          onConfirm={async (date: Date) => {
-            await db.notes.add({
-              id: item.id,
-              dateCreated: date.getTime()
-            });
-            setDateCreated(date.getTime());
-            setIsDatePickerVisible(false);
-          }}
-          onCancel={() => {
-            setIsDatePickerVisible(false);
-          }}
-          maximumDate={new Date((item as Note).dateEdited)}
-          isDarkModeEnabled={isDark}
-          is24Hour={db.settings.getTimeFormat() === "24-hour"}
-          date={new Date(dateCreated)}
-        />
-      ) : null}
-
-      <View
-        style={{
-          borderTopWidth: 1,
-          borderTopColor: colors.primary.border,
-          paddingHorizontal: DefaultAppStyles.GAP,
-          paddingTop: DefaultAppStyles.GAP_VERTICAL_SMALL
-        }}
-      >
-        {getDateMeta().map(renderItem)}
-      </View>
-    </>
-  );
-};

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

@@ -39,7 +39,6 @@ import { DateMeta } from "./date-meta";
 import { Items } from "./items";
 import Notebooks from "./notebooks";
 import { TagStrip, Tags } from "./tags";
-import { Dialog } from "../dialog";
 
 const Line = ({ top = 6, bottom = 6 }) => {
   const { colors } = useThemeColors();
@@ -204,7 +203,6 @@ export const Properties = ({ close = () => {}, item, buttons = [] }) => {
             />
           ) : null}
           <SheetProvider context="properties" />
-          <Dialog context="properties" />
         </View>
       )}
     />

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

@@ -57,8 +57,6 @@ const BOTTOM_BAR_ITEMS: ActionId[] = [
   "export",
   "copy-link",
   "duplicate",
-  "launcher-shortcut",
-  "expiry-date",
   "trash"
 ];
 
@@ -78,7 +76,6 @@ const COLUMN_BAR_ITEMS: ActionId[] = [
   "reorder",
   "rename-color",
   "rename-tag",
-  "launcher-shortcut",
   "restore",
   "trash",
   "delete"
@@ -326,9 +323,8 @@ export const Items = ({
 
   const getTopBarItemChunksOfFour = () => {
     const chunks = [];
-    const itemCount = shouldShrink ? 4 : 5;
-    for (let i = 0; i < topBarItems.length; i += itemCount) {
-      chunks.push(topBarItems.slice(i, i + itemCount));
+    for (let i = 0; i < topBarItems.length; i += 5) {
+      chunks.push(topBarItems.slice(i, i + 5));
     }
     return chunks;
   };
@@ -375,8 +371,7 @@ export const Items = ({
                   style={{
                     flexDirection: "row",
                     paddingHorizontal: DefaultAppStyles.GAP,
-                    gap: 5,
-                    width: width
+                    gap: 5
                   }}
                 >
                   {item.map(renderTopBarItem)}

apps/mobile/app/components/sheets/buy-plan/index.tsx

@@ -352,11 +352,11 @@ const ProductItem = (props: {
     props.pricingPlans.isSubscribed() &&
     (props.pricingPlans.user?.subscription?.productId ===
       (product as RNIap.Subscription)?.productId ||
-      props.pricingPlans.user?.subscription?.productId?.startsWith(
+      props.pricingPlans.user?.subscription?.productId.startsWith(
         (product as RNIap.Subscription)?.productId
       ) ||
       props.pricingPlans.user?.subscription?.productId ===
-        (product as Plan)?.id);
+        (product as Plan).id);
 
   useEffect(() => {
     props.pricingPlans

apps/mobile/app/components/sheets/editor-tabs/index.tsx

@@ -102,17 +102,9 @@ const TabItemComponent = (props: {
         {props.tab.session?.noteLocked ? (
           <>
             {props.tab.session?.locked ? (
-              <Icon
-                size={AppFontSize.md}
-                name="lock"
-                color={colors.primary.icon}
-              />
+              <Icon size={AppFontSize.md} name="lock" />
             ) : (
-              <Icon
-                size={AppFontSize.md}
-                name="lock-open-outline"
-                color={colors.primary.icon}
-              />
+              <Icon size={AppFontSize.md} name="lock-open-outline" />
             )}
           </>
         ) : null}

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

@@ -118,8 +118,8 @@ const ListBlockItem = ({
           {item?.content.length > 200
             ? item?.content.slice(0, 200) + "..."
             : !item.content || item.content.trim() === ""
-            ? strings.linkNoteEmptyBlock()
-            : item.content}
+              ? strings.linkNoteEmptyBlock()
+              : item.content}
         </Paragraph>
 
         <View

apps/mobile/app/components/sheets/plan-limits/index.tsx

@@ -103,7 +103,7 @@ export function PlanLimits() {
 
             if (
               user?.subscription.plan !== SubscriptionPlan.FREE &&
-              user?.subscription.productId?.includes("5year")
+              user?.subscription.productId.includes("5year")
             ) {
               ToastManager.show({
                 message:

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

@@ -53,9 +53,15 @@ async function fetchMonographData(noteId: string) {
   const monograph = monographId
     ? await db.monographs.get(monographId)
     : undefined;
+  const analyticsFeature = await isFeatureAvailable("monographAnalytics");
+  const analytics =
+    monographId && analyticsFeature
+      ? await db.monographs.analytics(monographId)
+      : undefined;
   return {
     monograph,
     monographId,
+    analytics
   };
 }
 
@@ -72,15 +78,12 @@ const PublishNoteSheet = ({
   const isFeatureAvailable = useIsFeatureAvailable("monographAnalytics");
   const [isLocked, setIsLocked] = useState(false);
   const [publishing, setPublishing] = useState(false);
-  const customTitle = useRef<string>("");
   const pwdInput = useRef<TextInput>(null);
-  const titleInput = useRef<TextInput>(null);
   const passwordValue = useRef<string>(undefined);
   const monographData = useAsync(async () => {
     return fetchMonographData(note?.id);
   }, []);
   const monograph = monographData.result?.monograph;
-  customTitle.current = monograph?.title || note.title || "";
   const publishUrl = monograph && `${hosts.MONOGRAPH_HOST}/${monograph?.id}`;
   const isPublished = db.monographs.monograph(note?.id);
 
@@ -105,7 +108,7 @@ const PublishNoteSheet = ({
     try {
       if (note?.id) {
         if (isLocked && !passwordValue.current) return;
-        await db.monographs.publish(note.id, customTitle.current, {
+        await db.monographs.publish(note.id, {
           selfDestruct: selfDestruct,
           password: isLocked ? passwordValue.current : undefined
         });
@@ -126,6 +129,7 @@ const PublishNoteSheet = ({
 
     setPublishLoading(false);
   };
+
   const setPublishLoading = (value: boolean) => {
     setPublishing(value);
   };
@@ -241,13 +245,6 @@ const PublishNoteSheet = ({
             </TouchableOpacity>
           ) : null}
 
-          <Input
-            fwdRef={titleInput}
-            onChangeText={(value) => (customTitle.current = value)}
-            defaultValue={customTitle.current}
-            placeholder={strings.noteTitle()}
-          />
-
           <TouchableOpacity
             onPress={() => {
               if (publishing) return;
@@ -375,6 +372,9 @@ const PublishNoteSheet = ({
                   }}
                 >
                   <Paragraph size={AppFontSize.sm}>{strings.views()}</Paragraph>
+                  <Paragraph>
+                    {monographData?.result?.analytics?.totalViews || 0}
+                  </Paragraph>
                 </View>
               </View>
             </View>

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

@@ -169,7 +169,7 @@ class RecoveryKeySheet extends React.Component {
   };
 
   onOpen = async () => {
-    let k = await db.user.getMasterKey();
+    let k = await db.user.getEncryptionKey();
     this.user = await db.user.getUser();
     if (k) {
       this.setState({

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

@@ -104,8 +104,8 @@ const ListBlockItem = ({
           {item?.content.length > 200
             ? item?.content.slice(0, 200) + "..."
             : !item.content || item.content.trim() === ""
-            ? strings.linkNoteEmptyBlock()
-            : item.content}
+              ? strings.linkNoteEmptyBlock()
+              : item.content}
         </Paragraph>
 
         <View

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

@@ -114,8 +114,8 @@ export const UserSheet = () => {
                           progress ? `(${progress.current})` : ""
                         }`
                       : lastSyncStatus === SyncStatus.Failed
-                      ? strings.syncFailed()
-                      : strings.synced()}{" "}
+                        ? strings.syncFailed()
+                        : strings.synced()}{" "}
                     {!syncing ? (
                       <TimeSince
                         style={{
@@ -139,8 +139,8 @@ export const UserSheet = () => {
                     !user || lastSyncStatus === SyncStatus.Failed
                       ? colors.error.icon
                       : isOffline
-                      ? colors.static.orange
-                      : colors.success.icon
+                        ? colors.static.orange
+                        : colors.success.icon
                   }
                 />
               </Paragraph>

apps/mobile/app/components/side-menu/color-section.tsx

@@ -30,7 +30,6 @@ import ReorderableList from "../list/reorderable-list";
 import { Properties } from "../properties";
 import { useSideBarDraggingStore } from "./dragging-store";
 import { MenuItem } from "./menu-item";
-import { Default_Drag_Action } from "../../hooks/use-actions";
 
 export const ColorSection = React.memo(
   function ColorSection() {
@@ -60,7 +59,7 @@ export const ColorSection = React.memo(
 
     const onLongPress = React.useCallback((item: SideMenuItem) => {
       if (useSideBarDraggingStore.getState().dragging) return;
-      Properties.present(item.data as Color, false, [Default_Drag_Action]);
+      Properties.present(item.data as Color);
     }, []);
 
     const renderIcon = React.useCallback((item: SideMenuItem, size: number) => {

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

@@ -21,6 +21,15 @@ import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React from "react";
 import { View } from "react-native";
+import { SafeAreaView } from "react-native-safe-area-context";
+import {
+  NavigationState,
+  Route,
+  SceneMap,
+  SceneRendererProps,
+  TabDescriptor,
+  TabView
+} from "react-native-tab-view";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { db } from "../../common/database";
 import { useGroupOptions } from "../../hooks/use-group-options";
@@ -49,105 +58,7 @@ import { Button } from "../ui/button";
 import SettingsService from "../../services/settings";
 import { isFeatureAvailable } from "@notesnook/common";
 import PaywallSheet from "../sheets/paywall";
-import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
-
-/**
- * Simple Tab View Implementation for the Side bar
- */
-type SimpleRoute = {
-  key: string;
-  title?: string;
-};
-
-type SimpleNavigationState = {
-  index: number;
-  routes: SimpleRoute[];
-};
-
-type SimpleTabBarProps = {
-  navigationState: SimpleNavigationState;
-  jumpTo: (key: string) => void;
-};
-
-type SimpleTabViewProps = {
-  navigationState: SimpleNavigationState;
-  renderScene: ({ route }: { route: SimpleRoute }) => React.ReactNode;
-  renderTabBar?: (props: SimpleTabBarProps) => React.ReactNode;
-  onIndexChange?: (index: number) => void;
-};
-
-const createSceneMap = (
-  scenes: Record<string, React.ComponentType<any>>
-): ((props: { route: SimpleRoute }) => React.ReactNode) => {
-  return ({ route }: { route: SimpleRoute }) => {
-    const SceneComponent = scenes[route.key];
-    if (!SceneComponent) return null;
-    return <SceneComponent />;
-  };
-};
-
-const SimpleTabView = ({
-  navigationState,
-  renderScene,
-  renderTabBar,
-  onIndexChange
-}: SimpleTabViewProps) => {
-  const loadedKeysRef = React.useRef(new Set<string>());
-  const scenesRef = React.useRef(new Map<string, React.ReactNode>());
-  const jumpTo = React.useCallback(
-    (key: string) => {
-      const nextIndex = navigationState.routes.findIndex(
-        (route) => route.key === key
-      );
-      if (nextIndex !== -1 && nextIndex !== navigationState.index) {
-        onIndexChange?.(nextIndex);
-      }
-    },
-    [navigationState.index, navigationState.routes, onIndexChange]
-  );
-
-  const activeKey = navigationState.routes[navigationState.index]?.key;
-  if (activeKey && !loadedKeysRef.current.has(activeKey)) {
-    loadedKeysRef.current.add(activeKey);
-  }
-
-  const getSceneForRoute = React.useCallback(
-    (route: SimpleRoute) => {
-      const cached = scenesRef.current.get(route.key);
-      if (cached) return cached;
-      const created = renderScene({ route });
-      scenesRef.current.set(route.key, created);
-      return created;
-    },
-    [renderScene]
-  );
-
-  return (
-    <View style={{ flex: 1 }}>
-      <View style={{ flex: 1 }}>
-        {navigationState.routes.map((route, routeIndex) => (
-          <View
-            key={route.key}
-            style={{
-              flex: 1,
-              display: navigationState.index === routeIndex ? "flex" : "none"
-            }}
-          >
-            {loadedKeysRef.current.has(route.key)
-              ? getSceneForRoute(route)
-              : navigationState.index === routeIndex
-              ? getSceneForRoute(route)
-              : null}
-          </View>
-        ))}
-      </View>
-
-      {renderTabBar ? renderTabBar({ navigationState, jumpTo }) : null}
-    </View>
-  );
-};
-
-const renderScene = createSceneMap({
+const renderScene = SceneMap({
   home: SideMenuHome,
   notebooks: SideMenuNotebooks,
   tags: SideMenuTags,
@@ -157,11 +68,10 @@ const renderScene = createSceneMap({
 export const SideMenu = React.memo(
   function SideMenu() {
     const { colors } = useThemeColors();
-    const insets = useGlobalSafeAreaInsets();
     const [index, setIndex] = React.useState(
       SettingsService.getProperty("defaultSidebarTab")
     );
-    const [routes] = React.useState<SimpleRoute[]>([
+    const [routes] = React.useState<Route[]>([
       {
         key: "home",
         title: "Home"
@@ -177,28 +87,34 @@ export const SideMenu = React.memo(
     ]);
 
     return (
-      <View
+      <SafeAreaView
         style={{
           flex: 1,
-          backgroundColor: colors.primary.background,
-          paddingTop: insets.top,
-          paddingBottom: insets.bottom,
-          paddingLeft: insets.left
+          backgroundColor: colors.primary.background
         }}
       >
-        <SimpleTabView
+        <TabView
           navigationState={{ index, routes }}
           renderTabBar={(props) => <TabBar {...props} />}
+          tabBarPosition="bottom"
           renderScene={renderScene}
           onIndexChange={setIndex}
+          swipeEnabled={false}
+          animationEnabled={false}
+          lazy
         />
-      </View>
+      </SafeAreaView>
     );
   },
   () => true
 );
 
-const TabBar = (props: SimpleTabBarProps) => {
+const TabBar = (
+  props: SceneRendererProps & {
+    navigationState: NavigationState<Route>;
+    options: Record<string, TabDescriptor<Route>> | undefined;
+  }
+) => {
   const dragging = useSideBarDraggingStore((state) => state.dragging);
   const { colors, isDark } = useThemeColors();
   const groupOptions = useGroupOptions(
@@ -432,7 +348,6 @@ const TabBar = (props: SimpleTabBarProps) => {
                       name="plus"
                       testID="sidebar-add-button"
                       size={AppFontSize.lg - 2}
-                       top={10}
                       color={colors.primary.icon}
                       onPress={async () => {
                         if (props.navigationState.index === 1) {
@@ -486,7 +401,6 @@ const TabBar = (props: SimpleTabBarProps) => {
                           ? "sort-ascending"
                           : "sort-descending"
                       }
-                      top={10}
                       testID="sidebar-sort-button"
                       color={colors.primary.icon}
                       onPress={() => {
@@ -522,7 +436,6 @@ const TabBar = (props: SimpleTabBarProps) => {
                         width: 28,
                         height: 28
                       }}
-                      top={10}
                       testID="sidebar-theme-button"
                       color={colors.primary.icon}
                       name={isDark ? "weather-night" : "weather-sunny"}

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

@@ -37,7 +37,7 @@ import { Pressable } from "../ui/pressable";
 import Paragraph from "../ui/typography/paragraph";
 import { useSideBarDraggingStore } from "./dragging-store";
 
-export function MenuItem({
+function _MenuItem({
   item,
   index,
   testID,
@@ -104,12 +104,15 @@ export function MenuItem({
   const _onPress = () => {
     if (useSideBarDraggingStore.getState().dragging) return;
     if (item.onPress) return item.onPress(item);
-    Navigation.closeDrawer();
+
     if (useNavigationStore.getState().currentRoute !== item.id) {
       Navigation.navigate(item.id as keyof RouteParams, {
         canGoBack: false
       });
     }
+    setImmediate(() => {
+      Navigation.closeDrawer();
+    });
   };
 
   return (
@@ -179,3 +182,12 @@ export function MenuItem({
     </Pressable>
   );
 }
+
+export const MenuItem = React.memo(_MenuItem, (prev, next) => {
+  if (
+    prev.item.id !== next.item.id &&
+    prev.item.data?.dateModified !== next.item.data?.dateModified
+  )
+    return false;
+  return true;
+});

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

@@ -24,8 +24,7 @@ import { StoreApi, UseBoundStore } from "zustand";
 import { useTotalNotes } from "../../hooks/use-db-item";
 import {
   eSubscribeEvent,
-  eUnSubscribeEvent,
-  ToastManager
+  eUnSubscribeEvent
 } from "../../services/event-manager";
 import { TreeItem } from "../../stores/create-notebook-tree-stores";
 import { SelectionStore } from "../../stores/item-selection-store";
@@ -99,11 +98,10 @@ export const NotebookItem = ({
           item.depth === 0
             ? undefined
             : item.depth < 6
-            ? 15 * item.depth
-            : 15 * 5,
+              ? 15 * item.depth
+              : 15 * 5,
         width: "100%",
-        marginTop: 2,
-        opacity: item.disabled ? 0.5 : 1
+        marginTop: 2
       }}
     >
       <Pressable
@@ -189,8 +187,8 @@ export const NotebookItem = ({
               !item.hasChildren || disableExpand
                 ? "book-outline"
                 : expanded
-                ? "chevron-down"
-                : "chevron-right"
+                  ? "chevron-down"
+                  : "chevron-right"
             }
           />
 
@@ -243,7 +241,6 @@ export const NotebookItem = ({
               name="plus"
               size={AppFontSize.md}
               testID={`add-notebook-${index}`}
-              color={colors.primary.icon}
               top={0}
               left={0}
               bottom={0}

apps/mobile/app/components/side-menu/pinned-section.tsx

@@ -31,9 +31,6 @@ import ReorderableList from "../list/reorderable-list";
 import { MenuItem } from "./menu-item";
 import { useThemeColors } from "@notesnook/theme";
 import { DefaultAppStyles } from "../../utils/styles";
-import { useSideBarDraggingStore } from "./dragging-store";
-import { Properties } from "../properties";
-import { Default_Drag_Action } from "../../hooks/use-actions";
 
 export const PinnedSection = React.memo(
   function PinnedSection() {
@@ -60,11 +57,6 @@ export const PinnedSection = React.memo(
       });
     }, []);
 
-    const onLongPress = React.useCallback((item: SideMenuItem) => {
-      if (useSideBarDraggingStore.getState().dragging) return;
-      Properties.present(item.data as Notebook, false, [Default_Drag_Action]);
-    }, []);
-
     const menuItems = useMemo(
       () =>
         menuPins.map((item) => ({
@@ -73,8 +65,7 @@ export const PinnedSection = React.memo(
           icon: item.type === "notebook" ? "notebook-outline" : "pound",
           dataType: item.type,
           data: item,
-          onPress: onPress,
-          onLongPress: onLongPress
+          onPress: onPress
         })) as SideMenuItem[],
       [menuPins, onPress]
     );
@@ -107,7 +98,6 @@ export const PinnedSection = React.memo(
             flexGrow: 1,
             width: "100%"
           }}
-          disableDefaultDrag
           contentContainerStyle={{
             flexGrow: 1
           }}

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

@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { SubscriptionPlan } from "@notesnook/core";
 import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
-import dayjs from "dayjs";
 import React from "react";
 import { FlatList, View } from "react-native";
 import { DraxProvider, DraxScrollView } from "react-native-drax";
@@ -85,7 +84,6 @@ export function SideMenuHome() {
             keyboardDismissMode="interactive"
             keyboardShouldPersistTaps="handled"
             keyExtractor={() => "scroll-items"}
-            bounces={false}
             renderItem={() => (
               <>
                 <ReorderableList
@@ -142,35 +140,19 @@ export function SideMenuHome() {
           paddingVertical: DefaultAppStyles.GAP_VERTICAL
         }}
       >
-        {dayjs().month() !== 11 ? (
-          <>
-            {(subscriptionType === SubscriptionPlan.FREE ||
-              !subscriptionType ||
-              !user) &&
-            !SettingsService.getProperty("serverUrls") ? (
-              <Button
-                title={pro.title}
-                style={{
-                  width: "100%"
-                }}
-                type="accent"
-                onPress={pro.onPress}
-              />
-            ) : null}
-          </>
-        ) : (
+        {(subscriptionType === SubscriptionPlan.FREE ||
+          !subscriptionType ||
+          !user) &&
+        !SettingsService.getProperty("serverUrls") ? (
           <Button
-            title={`Wrapped ${dayjs().year()} 🎉`}
+            title={pro.title}
             style={{
               width: "100%"
             }}
-            bold
-            type="secondaryAccented"
-            onPress={() => {
-              Navigation.navigate("Wrapped");
-            }}
+            type="accent"
+            onPress={pro.onPress}
           />
-        )}
+        ) : null}
       </View>
     </View>
   );

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

@@ -303,7 +303,7 @@ export const SideMenuTags = () => {
                   } catch (e) {
                     DatabaseLogger.error(e);
                   }
-                }, 100);
+                }, 500);
               }}
               placeholderTextColor={colors.primary.placeholder}
             />

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

@@ -120,9 +120,10 @@ export const Toast = ({ context = "global" }) => {
         alignItems: "center",
         alignSelf: "center",
         bottom:
-          insets.bottom +
-          15 +
-          (keyboard.keyboardShown ? Math.max(0, keyboard.keyboardHeight) : 0),
+          Platform.OS === "android"
+            ? Math.max(insets.bottom, 40)
+            : Math.max(insets.bottom, 40) +
+              (keyboard.keyboardShown ? keyboard.keyboardHeight : 0),
         position: "absolute",
         zIndex: 999,
         elevation: 15

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

@@ -20,7 +20,6 @@ import { useThemeColors } from "@notesnook/theme";
 import React from "react";
 import { ColorValue, TextProps } from "react-native";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
-import EvilIcon from "react-native-vector-icons/EvilIcons";
 import { AppFontSize } from "../../../utils/size";
 
 export interface IconProps extends TextProps {
@@ -44,22 +43,11 @@ export interface IconProps extends TextProps {
    *
    */
   color?: ColorValue | number | undefined;
-
-  iconFamily?: "evilicons" | "material";
 }
 
-export default function AppIcon({
-  iconFamily = "material",
-  ...props
-}: IconProps) {
+export default function AppIcon(props: IconProps) {
   const { colors } = useThemeColors();
-  return iconFamily === "evilicons" ? (
-    <EvilIcon
-      size={AppFontSize.md}
-      color={colors.primary.icon}
-      {...(props as any)}
-    />
-  ) : (
+  return (
     <Icon
       size={AppFontSize.md}
       color={colors.primary.icon}