mobile: set sticky state if not set already

.commitlintrc.js

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

.github/actions/setup-node-with-cache/action.yml

@@ -14,8 +14,6 @@ runs:
           apps/mobile/package-lock.json
           apps/desktop/package-lock.json
           apps/web/package-lock.json
-          apps/monograph/package-lock.json
-          apps/theme-builder/package-lock.json
           extensions/web-clipper/package-lock.json
           packages/core/package-lock.json
           packages/crypto/package-lock.json
@@ -26,4 +24,3 @@ runs:
           packages/logger/package-lock.json
           packages/streamable-fs/package-lock.json
           packages/theme/package-lock.json
-          packages/intl/package-lock.json

.github/workflows/android.e2e.yml

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

.github/workflows/android.publish.yml

@@ -4,7 +4,7 @@ on: workflow_dispatch
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     timeout-minutes: 40
     env:
       CMAKE_C_COMPILER_LAUNCHER: ccache

.github/workflows/core.tests.yml

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

.github/workflows/desktop.publish.yml

@@ -33,22 +33,14 @@ on:
         required: true
         default: true
         description: "Build for macOS?"
-      release-track:
-        type: choice
-        required: true
-        default: stable
-        description: "Select the release track"
-        options:
-          - stable
-          - beta
 
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -57,30 +49,14 @@ jobs:
         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: Setup environment
         run: |
           echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
 
-      - name: Generate desktop build (stable)
-        if: ${{ inputs.release-track == 'stable' }}
+      - name: Generate desktop build
         run: npx nx build:desktop @notesnook/web
 
-      - name: Generate desktop build (beta)
-        if: ${{ inputs.release-track == 'beta' }}
-        run: BETA=true npx nx build:desktop @notesnook/web
-
-      - name: Build desktop bundle
-        working-directory: ./apps/desktop
-        run: npm run bundle
-
       - name: Archive build artifact
         uses: actions/upload-artifact@v4
         with:
@@ -95,8 +71,7 @@ jobs:
 
       - name: Package desktop build
         run: |
-          cp -r ./apps/web/build ./apps/desktop/
-          zip -r ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip ./apps/desktop/build/
+          zip -r ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip ./apps/web/build/
           echo "Build folder archived to ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip"
 
       - name: Upload desktop build
@@ -109,27 +84,6 @@ jobs:
           files: ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip
           prerelease: ${{ endsWith(steps.app_metadata.outputs.app_version, '-beta') }}
 
-      - name: Generate flatpak sources
-        if: inputs.publish-github && inputs.build-linux
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y --quiet flatpak flatpak-builder pipx
-          git clone https://github.com/flatpak/flatpak-builder-tools.git /tmp/flatpak-builder-tools
-          cd /tmp/flatpak-builder-tools/node
-          pipx install .
-          cd -
-          node scripts/generate-sources.mjs
-
-      - name: Upload flatpak sources
-        uses: softprops/action-gh-release@v1
-        if: inputs.publish-github && inputs.build-linux
-        with:
-          draft: true
-          name: Notesnook Desktop v${{ steps.app_metadata.outputs.app_version }}
-          tag_name: v${{ steps.app_metadata.outputs.app_version }}
-          files: ./generated-sources.json
-          prerelease: ${{ endsWith(steps.app_metadata.outputs.app_version, '-beta') }}
-
   build-macos:
     name: Build for macOS
     needs: build
@@ -138,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -182,12 +136,6 @@ jobs:
           npm ci --ignore-scripts --prefer-offline --no-audit
           npm run bootstrap -- --scope=desktop
 
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/desktop
-
       - name: Install provisioning profile
         run: echo "${{ secrets.MAC_PROVISIONING_PROFILE }}" | base64 --decode > embedded.provisionprofile
         working-directory: ./apps/desktop
@@ -199,7 +147,7 @@ jobs:
           CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }}
         run: |
           npx nx run release --project @notesnook/desktop -- --variant=mas
-          yarn electron-builder --config=electron-builder.config.js --mac mas --universal -p never
+          yarn electron-builder --mac mas --universal -p never
         working-directory: ./apps/desktop
 
       - name: Build zip and dmg
@@ -213,9 +161,9 @@ jobs:
         run: |
           npx nx run release --project @notesnook/desktop
           if [ ${{ inputs.publish-github }} == true ]; then
-            yarn electron-builder --config=electron-builder.config.js --mac zip dmg --arm64 --x64 -p always
+            yarn electron-builder --mac zip dmg --arm64 --x64 -p always
           else
-            yarn electron-builder --config=electron-builder.config.js --mac zip dmg --arm64 --x64 -p never
+            yarn electron-builder --mac zip dmg --arm64 --x64 -p never
           fi
         working-directory: ./apps/desktop
 
@@ -240,7 +188,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -264,12 +212,6 @@ jobs:
           npm ci --ignore-scripts --prefer-offline --no-audit
           npm run bootstrap -- --scope=desktop
 
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/desktop
-
       - name: Build Electron wrapper
         run: npx nx run release --project @notesnook/desktop
         working-directory: ./apps/desktop
@@ -277,7 +219,7 @@ jobs:
       - name: Build snap
         if: inputs.publish-snap
         run: |
-          yarn electron-builder --config=electron-builder.config.js --linux snap:x64 -p never
+          yarn electron-builder --linux snap:x64 -p never
         working-directory: ./apps/desktop
 
       - name: Build AppImage
@@ -285,9 +227,9 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           if [ ${{ inputs.publish-github }} == true ]; then
-            yarn electron-builder --config=electron-builder.config.js --linux AppImage:x64 AppImage:arm64 -p always
+            yarn electron-builder --linux AppImage:x64 AppImage:arm64 -p always
           else
-            yarn electron-builder --config=electron-builder.config.js --linux AppImage:x64 AppImage:arm64 -p never
+            yarn electron-builder --linux AppImage:x64 AppImage:arm64 -p never
           fi
         working-directory: ./apps/desktop
 
@@ -305,7 +247,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup .NET Core SDK
         uses: actions/setup-dotnet@v2
@@ -330,12 +272,6 @@ jobs:
           npm ci --ignore-scripts --prefer-offline --no-audit
           npm run bootstrap -- --scope=desktop
 
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/desktop
-
       - name: Build
         run: npx nx run release --project @notesnook/desktop
 
@@ -347,8 +283,8 @@ jobs:
           AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
         run: |
           if ($${{ inputs.publish-github }} -eq $true) {
-            yarn electron-builder --config=electron-builder.config.js --win --publish always
+            yarn electron-builder --win --publish always
           } else {
-            yarn electron-builder --config=electron-builder.config.js --win --publish never
+            yarn electron-builder --win --publish never
           }
         working-directory: ./apps/desktop

.github/workflows/desktop.tests.yml

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

.github/workflows/editor.tests.yml

@@ -19,10 +19,10 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/help.publish.yml

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

.github/workflows/ios.publish.yml

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

.github/workflows/monograph.publish.yml

@@ -14,7 +14,7 @@ on: workflow_dispatch
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       packages: write
       contents: read

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

@@ -5,10 +5,10 @@ on: workflow_dispatch
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/vericrypt.publish.yml

@@ -5,10 +5,10 @@ on: workflow_dispatch
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/web.benchmarks.yml

@@ -1,44 +0,0 @@
-name: Benchmark @notesnook/web
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - "master"
-    paths:
-      - "apps/web/**"
-      # re-run workflow if workflow file changes
-      - ".github/workflows/web.benchmarks.yml"
-  pull_request:
-
-jobs:
-  bench:
-    name: Bench
-    runs-on: ubuntu-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: Setup environment
-        run: |
-          echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
-
-      - name: Build
-        run: npm run build:web
-
-      - name: Install Playwright Browsers
-        run: npx playwright install chromium --with-deps
-        working-directory: apps/web
-
-      - name: Run benchmarks
-        id: benchmark
-        run: node __bench__/app.bench.mjs
-        working-directory: apps/web

.github/workflows/web.publish.yml

@@ -1,24 +1,14 @@
 name: Publish @notesnook/web
 
-on:
-  workflow_dispatch:
-    inputs:
-      release-track:
-        type: choice
-        required: true
-        default: stable
-        description: "Select the release track"
-        options:
-          - stable
-          - beta
+on: workflow_dispatch
 
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -34,20 +24,8 @@ jobs:
           echo "CLOUDFLARE_ACCOUNT_ID=${{ secrets.CLOUDFLARE_ACCOUNT_ID }}" >> $GITHUB_ENV
           echo "CLOUDFLARE_API_TOKEN=${{ secrets.CLOUDFLARE_API_TOKEN }}" >> $GITHUB_ENV
 
-      - name: Generate build (stable)
-        if: ${{ inputs.release-track == 'stable' }}
+      - name: Generate build
         run: npm run build:web
 
-      - name: Publish to Cloudflare Pages (stable)
-        if: ${{ inputs.release-track == 'stable' }}
-        working-directory: ./apps/web
-        run: npx --yes wrangler pages deploy --project-name=notesnook-app ./build/
-
-      - name: Generate build (beta)
-        if: ${{ inputs.release-track == 'beta' }}
-        run: npm run build:beta:web
-
-      - name: Publish to Cloudflare Pages (beta)
-        if: ${{ inputs.release-track == 'beta' }}
-        working-directory: ./apps/web
-        run: npx --yes wrangler pages deploy --branch=beta --project-name=notesnook-app-beta ./build/
+      - name: Publish to Cloudflare Pages
+        run: npx --yes wrangler pages deploy --project-name=notesnook-app ./apps/web/build/

.github/workflows/web.tests.yml

@@ -19,10 +19,10 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -49,11 +49,11 @@ jobs:
     name: 🧪 Test (${{ matrix.shard }}/${{ strategy.job-total }})
     strategy:
       matrix:
-        shard: [1, 2, 3, 4, 5]
+        shard: [1, 2, 3, 4]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Download build
         uses: actions/download-artifact@v4

.gitignore

@@ -11,4 +11,3 @@ nx-cloud.env
 site
 node_modules.backup
 .nx
-*.patch

apps/desktop/.gitignore

@@ -2,6 +2,4 @@ node_modules
 build
 output
 dist
-_catalog
-test-results
-test-artifacts
+_catalog

apps/desktop/README.md

@@ -58,13 +58,13 @@ This will compile and run the app in production mode but it won't generate any p
 npm run release -- --rebuild
 
 # For macOS
-npx electron-builder --config=electron-builder.config.js --mac dmg --arm64 --x64 -publish never
+npx electron-builder --mac dmg --arm64 --x64 -publish never
 
 # For Linux (AppImage)
-npx electron-builder --config=electron-builder.config.js --linux AppImage:x64 AppImage:arm64 -publish never
+npx electron-builder --linux AppImage:x64 AppImage:arm64 -publish never
 
 # For Windows
-npx electron-builder --config=electron-builder.config.js --win --publish never
+npx electron-builder --win --publish never
 ```
 
 Feel free to play around with the `electron-builder` command to get the packages you need. `npx electron-builder --help` is a great resource to learn different commands & platforms supported by `electron-builder`.

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

@@ -1,246 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { test } from "vitest";
-import { harness } from "./utils.js";
-import { writeFile } from "fs/promises";
-import { Page } from "playwright";
-import { gt, lt } from "semver";
-
-test("update starts downloading if version is outdated", async (t) => {
-  await harness(
-    t,
-    async ({ page }) => {
-      await page.waitForSelector("#authForm");
-
-      t.expect(
-        await page.getByRole("button", { name: "Create account" }).isVisible()
-      ).toBe(true);
-
-      await page
-        .getByRole("button", { name: "Skip & go directly to the app" })
-        .click();
-
-      await skipDialog(page);
-
-      await page.waitForSelector(".ProseMirror");
-
-      await page
-        .locator(".theme-scope-statusBar")
-        .getByRole("button", { name: /updating/i })
-        .waitFor({ state: "attached" });
-    },
-    { version: "3.0.0" }
-  );
-});
-
-test("update is only shown if version is outdated and auto updates are disabled", async (t) => {
-  await harness(
-    t,
-    async (ctx) => {
-      await ctx.app.close();
-      await writeFile(
-        ctx.configPath,
-        JSON.stringify({
-          automaticUpdates: false
-        })
-      );
-
-      await ctx.relaunch();
-
-      const { page } = ctx;
-
-      await page.waitForSelector("#authForm");
-
-      t.expect(
-        await page.getByRole("button", { name: "Create account" }).isVisible()
-      ).toBe(true);
-
-      await page
-        .getByRole("button", { name: "Skip & go directly to the app" })
-        .click();
-
-      await skipDialog(page);
-
-      await page.waitForSelector(".ProseMirror");
-
-      await page
-        .locator(".theme-scope-statusBar")
-        .getByRole("button", { name: /available/i })
-        .waitFor({ state: "attached" });
-    },
-    { version: "3.0.0" }
-  );
-});
-
-test("update to stable if it is newer", async (t) => {
-  await harness(
-    t,
-    async (ctx) => {
-      await ctx.app.close();
-      await writeFile(
-        ctx.configPath,
-        JSON.stringify({
-          automaticUpdates: false,
-          releaseTrack: "beta"
-        })
-      );
-
-      await ctx.relaunch();
-
-      const { page } = ctx;
-
-      await page.waitForSelector("#authForm");
-
-      t.expect(
-        await page.getByRole("button", { name: "Create account" }).isVisible()
-      ).toBe(true);
-
-      await page
-        .getByRole("button", { name: "Skip & go directly to the app" })
-        .click();
-
-      await skipDialog(page);
-
-      await page.waitForSelector(".ProseMirror");
-
-      const updateButton = page
-        .locator(".theme-scope-statusBar")
-        .getByRole("button", { name: /available/i });
-      await updateButton.waitFor({ state: "visible" });
-      const content = await updateButton.textContent();
-      const version = content?.split(" ")?.[0] || "";
-      t.expect(gt(version, "3.0.0-beta.0")).toBe(true);
-    },
-    { version: "3.0.0-beta.0" }
-  );
-});
-
-test("update is not available if it latest stable version is older", async (t) => {
-  await harness(
-    t,
-    async (ctx) => {
-      await ctx.app.close();
-      await writeFile(
-        ctx.configPath,
-        JSON.stringify({
-          automaticUpdates: false,
-          releaseTrack: "beta"
-        })
-      );
-
-      await ctx.relaunch();
-
-      const { page } = ctx;
-
-      await page.waitForSelector("#authForm");
-
-      t.expect(
-        await page.getByRole("button", { name: "Create account" }).isVisible()
-      ).toBe(true);
-
-      await page
-        .getByRole("button", { name: "Skip & go directly to the app" })
-        .click();
-
-      await skipDialog(page);
-
-      await page.waitForSelector(".ProseMirror");
-
-      await page
-        .locator(".theme-scope-statusBar")
-        .getByRole("button", { name: /checking for updates/i })
-        .waitFor({ state: "hidden" });
-
-      t.expect(
-        await page
-          .locator(".theme-scope-statusBar")
-          .getByRole("button", { name: /available/i })
-          .isHidden()
-      ).toBe(true);
-    },
-    { version: "99.0.0-beta.0" }
-  );
-});
-
-test("downgrade to stable on switching to stable release track", async (t) => {
-  await harness(
-    t,
-    async (ctx) => {
-      await ctx.app.close();
-      await writeFile(
-        ctx.configPath,
-        JSON.stringify({
-          automaticUpdates: false,
-          releaseTrack: "stable"
-        })
-      );
-
-      await ctx.relaunch();
-
-      const { page } = ctx;
-
-      await page.waitForSelector("#authForm");
-
-      t.expect(
-        await page.getByRole("button", { name: "Create account" }).isVisible()
-      ).toBe(true);
-
-      await page
-        .getByRole("button", { name: "Skip & go directly to the app" })
-        .click();
-
-      await skipDialog(page);
-
-      await page.waitForSelector(".ProseMirror");
-
-      await page
-        .locator(".theme-scope-statusBar")
-        .getByRole("button", { name: /checking for updates/i })
-        .waitFor({ state: "hidden" });
-
-      const updateButton = page
-        .locator(".theme-scope-statusBar")
-        .getByRole("button", { name: /available/i });
-      await updateButton.waitFor({ state: "visible" });
-      const content = await updateButton.textContent();
-      const version = content?.split(" ")?.[0] || "";
-      t.expect(lt(version, "99.0.0-beta.0")).toBe(true);
-    },
-    { version: "99.0.0-beta.0" }
-  );
-});
-
-async function skipDialog(page: Page) {
-  await page
-    .waitForSelector(".ReactModal__Content", {
-      timeout: 1000
-    })
-    .catch(() => {})
-    .then(async () => {
-      const positiveButton = page.locator(
-        "button[data-role='positive-button']"
-      );
-      const negativeButton = page.locator(
-        "button[data-role='negative-button']"
-      );
-      if (await positiveButton.isVisible()) await positiveButton.click();
-      else if (await negativeButton.isVisible()) await negativeButton.click();
-    });
-}

apps/desktop/__tests__/launch.test.ts

@@ -1,38 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { test } from "vitest";
-import { harness } from "./utils.js";
-import assert from "assert";
-
-test("make sure app loads", async (t) => {
-  await harness(t, async ({ page }) => {
-    await page.waitForSelector("#authForm");
-
-    assert.ok(
-      await page.getByRole("button", { name: "Create account" }).isVisible()
-    );
-
-    await page
-      .getByRole("button", { name: "Skip & go directly to the app" })
-      .click();
-
-    await page.waitForSelector(".ProseMirror");
-  });
-});

apps/desktop/__tests__/utils.ts

@@ -1,172 +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 { execSync } from "child_process";
-import { mkdir } from "fs/promises";
-import { fileURLToPath } from "node:url";
-import path from "path";
-import { _electron as electron } from "playwright";
-import slugify from "slugify";
-import { TaskContext } from "vitest";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-const IS_DEBUG = process.env.NN_DEBUG === "true" || process.env.CI === "true";
-
-interface AppContext {
-  app: import("playwright").ElectronApplication;
-  page: import("playwright").Page;
-  configPath: string;
-  relaunch: () => Promise<void>;
-}
-
-interface TestOptions {
-  version: string;
-}
-
-export async function harness(
-  t: TaskContext,
-  cb: (ctx: AppContext) => Promise<void>,
-  options?: TestOptions
-) {
-  const ctx = await buildAndLaunchApp(options);
-
-  t.onTestFinished(async (result) => {
-    if (result.state === "fail") {
-      await mkdir("test-results", { recursive: true });
-      await ctx.page.screenshot({
-        path: path.join(
-          "test-results",
-          `${slugify(t.task.name)}-${process.platform}-${
-            process.arch
-          }-error.png`
-        )
-      });
-    }
-    await ctx.app.close();
-  });
-
-  await cb(ctx);
-}
-
-async function buildAndLaunchApp(options?: TestOptions): Promise<AppContext> {
-  const productName = makeid(10);
-  const executablePath = await buildApp({ ...options, productName });
-  const { app, page, configPath } = await launchApp(executablePath);
-  const ctx: AppContext = {
-    app,
-    page,
-    configPath,
-    relaunch: async () => {
-      const { app, page, configPath } = await launchApp(executablePath);
-      ctx.app = app;
-      ctx.page = page;
-      ctx.configPath = configPath;
-    }
-  };
-  return ctx;
-}
-
-async function launchApp(executablePath: string) {
-  const app = await electron.launch({
-    executablePath,
-    args: IS_DEBUG ? [] : ["--hidden"],
-    env:
-      process.platform === "linux"
-        ? {
-            ...(process.env as Record<string, string>),
-            APPIMAGE: "true"
-          }
-        : (process.env as Record<string, string>)
-  });
-
-  const page = await app.firstWindow();
-
-  const userDataDirectory = await app.evaluate((a) => {
-    return a.app.getPath("userData");
-  });
-  const configPath = path.join(userDataDirectory, "config.json");
-  return {
-    app,
-    page,
-    configPath
-  };
-}
-
-async function buildApp({
-  version,
-  productName
-}: {
-  version?: string;
-  productName: string;
-}) {
-  const buildRoot = path.join("test-artifacts", `${productName}-build`);
-  const output = path.join("test-artifacts", `${productName}-output`);
-  execSync(`npm run release -- --root ${buildRoot} --skip-tsc-build`, {
-    stdio: IS_DEBUG ? "inherit" : "ignore"
-  });
-
-  const args = [
-    `--config electron-builder.config.js`,
-    `--c.extraMetadata.productName=${productName}`,
-    "--publish=never"
-  ];
-  if (version) args.push(`--c.extraMetadata.version=${version}`);
-
-  execSync(`npx electron-builder --dir --${process.arch} ${args.join(" ")}`, {
-    stdio: IS_DEBUG ? "inherit" : "ignore",
-    env: {
-      ...process.env,
-      NOTESNOOK_STAGING: "true",
-      NN_BUILD_ROOT: buildRoot,
-      NN_PRODUCT_NAME: productName,
-      NN_APP_ID: `com.notesnook.test.${productName}`,
-      NN_OUTPUT_DIR: output
-    }
-  });
-
-  return path.join(
-    __dirname,
-    "..",
-    output,
-    process.platform === "linux"
-      ? process.arch === "arm64"
-        ? "linux-arm64-unpacked"
-        : "linux-unpacked"
-      : process.platform === "darwin"
-      ? process.arch === "arm64"
-        ? `mac-arm64/${productName}.app/Contents/MacOS/`
-        : `mac/${productName}.app/Contents/MacOS/`
-      : "win-unpacked",
-    process.platform === "win32" ? `${productName}.exe` : productName
-  );
-}
-
-function makeid(length: number) {
-  let result = "";
-  const characters =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-  const charactersLength = characters.length;
-  let counter = 0;
-  while (counter < length) {
-    result += characters.charAt(Math.floor(Math.random() * charactersLength));
-    counter += 1;
-  }
-  return result.toLowerCase();
-}

apps/desktop/electron-builder.config.js

@@ -1,203 +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/>.
-*/
-
-const path = require("path");
-const pkg = require("./package.json");
-
-const buildRoot = process.env.NN_BUILD_ROOT || ".";
-const buildFiles = [
-  `${buildRoot}/build/`,
-  `!${buildRoot}/build/screenshots\${/*}`,
-  `!${buildRoot}/build/banner.jpg`,
-  `!${buildRoot}/build/*.ico`,
-  `!${buildRoot}/build/*.png`
-];
-
-const productName = process.env.NN_PRODUCT_NAME || "Notesnook";
-const appId = process.env.NN_APP_ID || "org.streetwriters.notesnook";
-const outputDir = process.env.NN_OUTPUT_DIR || "output";
-const linuxExecutableName = process.env.NN_PRODUCT_NAME
-  ? process.env.NN_PRODUCT_NAME.toLowerCase().replace(/\s+/g, "-")
-  : "notesnook";
-const year = new Date().getFullYear();
-const isBeta = pkg.version.includes("-beta");
-
-module.exports = {
-  appId: appId,
-  productName: productName,
-  copyright: `Copyright © ${year} Streetwriters (Private) Limited`,
-  artifactName: "notesnook_${os}_${arch}.${ext}",
-  generateUpdatesFilesForAllChannels: true,
-  asar: false,
-  files: [
-    "!*.chunk.js.map",
-    "!*.chunk.js.LICENSE.txt",
-    ...buildFiles,
-    "!node_modules${/*}",
-    "node_modules/better-sqlite3-multiple-ciphers/build/Release/better_sqlite3.node",
-    "node_modules/better-sqlite3-multiple-ciphers/lib",
-    "node_modules/better-sqlite3-multiple-ciphers/package.json",
-    "node_modules/file-uri-to-path",
-    "node_modules/bindings",
-    "node_modules/node-gyp-build",
-    "node_modules/sqlite-better-trigram",
-    "node_modules/sodium-native/prebuilds/${platform}-${arch}",
-    {
-      from: "node_modules/sqlite-better-trigram-linux-${arch}",
-      to: "node_modules/sqlite-better-trigram-linux-${arch}"
-    },
-    {
-      from: "node_modules/sqlite-better-trigram-darwin-${arch}",
-      to: "node_modules/sqlite-better-trigram-darwin-${arch}"
-    },
-    {
-      from: "node_modules/sqlite-better-trigram-windows-${arch}",
-      to: "node_modules/sqlite-better-trigram-windows-${arch}"
-    },
-    "node_modules/sodium-native/index.js",
-    "node_modules/sodium-native/package.json"
-  ],
-  afterPack: "./scripts/removeLocales.js",
-  mac: {
-    bundleVersion: "240",
-    minimumSystemVersion: "10.12.0",
-    target: [
-      {
-        target: "dmg",
-        arch: ["arm64", "x64"]
-      },
-      {
-        target: "zip",
-        arch: ["arm64", "x64"]
-      }
-    ],
-    category: "public.app-category.productivity",
-    darkModeSupport: true,
-    type: "distribution",
-    hardenedRuntime: true,
-    entitlements: "assets/entitlements.mac.plist",
-    entitlementsInherit: "assets/entitlements.mac.plist",
-    gatekeeperAssess: false,
-    icon: "assets/icons/app.icns",
-    notarize: true
-  },
-  dmg: {
-    contents: [
-      {
-        x: 130,
-        y: 220
-      },
-      {
-        x: 410,
-        y: 220,
-        type: "link",
-        path: "/Applications"
-      }
-    ],
-    icon: "assets/icons/app.icns",
-    title: "Install Notesnook"
-  },
-  mas: {
-    entitlements: "assets/entitlements.mas.plist",
-    entitlementsInherit: "assets/entitlements.mas.inherit.plist",
-    entitlementsLoginHelper: "assets/entitlements.mas.loginhelper.plist",
-    hardenedRuntime: true
-  },
-  win: {
-    target: [
-      {
-        target: "nsis",
-        arch: ["x64", "arm64"]
-      },
-      {
-        target: "portable",
-        arch: ["x64", "arm64"]
-      }
-    ],
-    signtoolOptions: {
-      signingHashAlgorithms: ["sha256"],
-      sign: "./scripts/sign.js"
-    },
-    icon: "assets/icons/app.ico"
-  },
-  portable: {
-    artifactName: "notesnook_${os}_${arch}_portable.${ext}"
-  },
-  nsis: {
-    oneClick: true,
-    createDesktopShortcut: "always",
-    deleteAppDataOnUninstall: true
-  },
-  linux: {
-    target: [
-      {
-        target: "AppImage",
-        arch: ["x64", "arm64"]
-      },
-      {
-        target: "snap",
-        arch: ["x64", "arm64"]
-      }
-    ],
-    category: "Office",
-    icon: "assets/icons/app.icns",
-    description: "Your private note taking space",
-    executableName: linuxExecutableName,
-    desktop: {
-      actions: [
-        {
-          id: "new-note",
-          name: "New note",
-          args: "new note"
-        },
-        {
-          id: "new-notebook",
-          name: "New notebook",
-          args: "new notebook"
-        },
-        {
-          id: "new-reminder",
-          name: "New reminder",
-          args: "new reminder"
-        }
-      ]
-    }
-  },
-  snap: {
-    autoStart: false,
-    confinement: "strict",
-    allowNativeWayland: true
-  },
-  extraResources: ["app-update.yml", "./assets/**"],
-  extraMetadata: {
-    main: path.join(buildRoot, "build", "electron.js")
-  },
-  directories: {
-    buildResources: "assets",
-    output: outputDir
-  },
-  publish: [
-    {
-      provider: "github",
-      repo: "notesnook",
-      owner: "streetwriters",
-      channel: isBeta ? "beta" : "latest"
-    }
-  ]
-};

apps/desktop/package.json

@@ -2,58 +2,40 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "3.1.0-beta.1",
+  "version": "3.0.18",
   "appAppleId": "1544027013",
   "private": true,
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
-  "types": "./dist/types/index.d.ts",
-  "sideEffects": false,
-  "exports": {
-    ".": {
-      "require": {
-        "types": "./dist/types/index.d.ts",
-        "default": "./dist/cjs/index.js"
-      },
-      "import": {
-        "types": "./dist/types/index.d.ts",
-        "default": "./dist/esm/index.js"
-      }
-    }
-  },
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "homepage": "https://notesnook.com/",
   "repository": "https://github.com/streetwriters/notesnook",
   "license": "GPL-3.0-or-later",
   "dependencies": {
-    "@lingui/core": "5.1.2",
+    "@lingui/core": "4.11.4",
     "@notesnook/intl": "file:../../packages/intl",
     "@trpc/client": "10.45.2",
     "@trpc/server": "10.45.2",
-    "better-sqlite3-multiple-ciphers": "11.5.0",
-    "electron-trpc": "0.7.1",
+    "better-sqlite3-multiple-ciphers": "11.2.1",
+    "electron-trpc": "0.6.1",
     "electron-updater": "^6.3.4",
     "icojs": "^0.19.4",
-    "sqlite-better-trigram": "0.0.2",
     "typed-emitter": "^2.1.0",
     "yargs": "^17.7.2",
-    "zod": "3.23.8"
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@streetwriters/kysely": "^0.27.4",
     "@types/node": "22.7.0",
     "@types/yargs": "^17.0.33",
     "chokidar": "^4.0.1",
-    "electron": "^31.7.4",
-    "electron-builder": "^25.1.8",
-    "esbuild": "0.21.5",
+    "electron": "^30.5.1",
+    "electron-builder": "^25.1.7",
+    "esbuild": "^0.24.0",
     "node-abi": "^3.68.0",
     "node-gyp-build": "^4.8.2",
-    "playwright": "^1.48.2",
     "prebuildify": "^6.0.1",
-    "slugify": "1.6.6",
     "tree-kill": "^1.2.2",
-    "undici": "^6.19.8",
-    "vitest": "^2.1.8"
+    "undici": "^6.19.8"
   },
   "optionalDependencies": {
     "dmg-license": "^1.0.11"
@@ -62,15 +44,188 @@
     "start": "node scripts/dev.mjs",
     "staging": "node scripts/build.mjs --run",
     "release": "node scripts/build.mjs",
-    "build": "node ../../scripts/build.mjs",
-    "bundle": "esbuild electron=./src/main.ts ./src/preload.ts --external:electron --external:fsevents --external:better-sqlite3-multiple-ciphers --external:sodium-native --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=false --define:RELEASE=true",
+    "build": "tsc",
+    "bundle": "esbuild electron=./src/main.ts ./src/preload.ts --external:electron --external:fsevents --external:better-sqlite3-multiple-ciphers --external:sodium-native --minify --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=false --define:RELEASE=true",
     "bundle:mas": "esbuild electron=./src/main.ts ./src/preload.ts --minify --external:electron --external:fsevents --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=true --define:RELEASE=true",
-    "postinstall": "patch-package",
-    "test": "vitest run"
+    "postinstall": "patch-package"
   },
   "author": {
     "name": "Streetwriters (Private) Limited",
     "email": "support@streetwriters.co",
     "url": "https://streetwriters.co"
+  },
+  "build": {
+    "appId": "org.streetwriters.notesnook",
+    "productName": "Notesnook",
+    "copyright": "Copyright © 2023 Streetwriters (Private) Limited",
+    "artifactName": "notesnook_${os}_${arch}.${ext}",
+    "generateUpdatesFilesForAllChannels": true,
+    "asar": false,
+    "files": [
+      "!*.chunk.js.map",
+      "!*.chunk.js.LICENSE.txt",
+      "build/",
+      "!build/screenshots${/*}",
+      "!build/banner.jpg",
+      "!build/*.ico",
+      "!build/*.png",
+      "!node_modules${/*}",
+      "node_modules/better-sqlite3-multiple-ciphers/build/Release/better_sqlite3.node",
+      "node_modules/better-sqlite3-multiple-ciphers/lib",
+      "node_modules/better-sqlite3-multiple-ciphers/package.json",
+      "node_modules/file-uri-to-path",
+      "node_modules/bindings",
+      "node_modules/node-gyp-build",
+      "node_modules/sodium-native/prebuilds/${platform}-${arch}",
+      "node_modules/sodium-native/index.js",
+      "node_modules/sodium-native/package.json"
+    ],
+    "afterPack": "./scripts/removeLocales.js",
+    "mac": {
+      "bundleVersion": "240",
+      "minimumSystemVersion": "10.12.0",
+      "target": [
+        {
+          "target": "dmg",
+          "arch": [
+            "arm64",
+            "x64"
+          ]
+        },
+        {
+          "target": "zip",
+          "arch": [
+            "arm64",
+            "x64"
+          ]
+        }
+      ],
+      "category": "public.app-category.productivity",
+      "darkModeSupport": true,
+      "type": "distribution",
+      "hardenedRuntime": true,
+      "entitlements": "assets/entitlements.mac.plist",
+      "entitlementsInherit": "assets/entitlements.mac.plist",
+      "gatekeeperAssess": false,
+      "icon": "assets/icons/app.icns",
+      "notarize": true
+    },
+    "dmg": {
+      "contents": [
+        {
+          "x": 130,
+          "y": 220
+        },
+        {
+          "x": 410,
+          "y": 220,
+          "type": "link",
+          "path": "/Applications"
+        }
+      ],
+      "icon": "assets/icons/app.icns",
+      "title": "Install Notesnook"
+    },
+    "mas": {
+      "entitlements": "assets/entitlements.mas.plist",
+      "entitlementsInherit": "assets/entitlements.mas.inherit.plist",
+      "entitlementsLoginHelper": "assets/entitlements.mas.loginhelper.plist",
+      "hardenedRuntime": true
+    },
+    "win": {
+      "target": [
+        {
+          "target": "nsis",
+          "arch": [
+            "x64",
+            "arm64"
+          ]
+        },
+        {
+          "target": "portable",
+          "arch": [
+            "x64",
+            "arm64"
+          ]
+        }
+      ],
+      "signingHashAlgorithms": [
+        "sha256"
+      ],
+      "sign": "./scripts/sign.js",
+      "icon": "assets/icons/app.ico"
+    },
+    "portable": {
+      "artifactName": "notesnook_${os}_${arch}_portable.${ext}"
+    },
+    "nsis": {
+      "oneClick": true,
+      "createDesktopShortcut": "always",
+      "deleteAppDataOnUninstall": true
+    },
+    "linux": {
+      "target": [
+        {
+          "target": "AppImage",
+          "arch": [
+            "x64",
+            "arm64"
+          ]
+        },
+        {
+          "target": "snap",
+          "arch": [
+            "x64",
+            "arm64"
+          ]
+        }
+      ],
+      "category": "Office",
+      "icon": "assets/icons/app.icns",
+      "description": "Your private note taking space",
+      "executableName": "notesnook",
+      "desktop": {
+        "actions": [
+          {
+            "id": "new-note",
+            "name": "New note",
+            "args": "new note"
+          },
+          {
+            "id": "new-notebook",
+            "name": "New notebook",
+            "args": "new notebook"
+          },
+          {
+            "id": "new-reminder",
+            "name": "New reminder",
+            "args": "new reminder"
+          }
+        ]
+      }
+    },
+    "snap": {
+      "autoStart": false,
+      "confinement": "strict",
+      "allowNativeWayland": true
+    },
+    "extraResources": [
+      "app-update.yml",
+      "./assets/**"
+    ],
+    "extraMetadata": {
+      "main": "./build/electron.js"
+    },
+    "directories": {
+      "buildResources": "assets",
+      "output": "./output/"
+    },
+    "publish": [
+      {
+        "provider": "github",
+        "repo": "notesnook",
+        "owner": "streetwriters"
+      }
+    ]
   }
 }

apps/desktop/scripts/build.mjs

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

apps/desktop/scripts/dev.mjs

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

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

@@ -1,48 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { readFile, writeFile } from "fs/promises";
-import path from "path";
-import { fileURLToPath } from "url";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-export async function patchBetterSQLite3() {
-  const jsonPath = path.join(
-    __dirname,
-    "..",
-    "node_modules",
-    "better-sqlite3-multiple-ciphers",
-    "package.json"
-  );
-  const json = JSON.parse(await readFile(jsonPath, "utf-8"));
-
-  json.version = "11.5.1";
-  json.homepage = "https://github.com/thecodrr/better-sqlite3-multiple-ciphers";
-  json.repository.url =
-    "git://github.com/thecodrr/better-sqlite3-multiple-ciphers.git";
-
-  await writeFile(jsonPath, JSON.stringify(json));
-}
-
-if (process.argv[1] === __filename) {
-  console.log("Patching better-sqlite3");
-  patchBetterSQLite3();
-}

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

@@ -29,7 +29,7 @@ import { dirname } from "path";
 import { resolvePath } from "../utils/resolve-path";
 import { observable } from "@trpc/server/observable";
 import { AssetManager } from "../utils/asset-manager";
-import { isFlatpak, isSnap } from "../utils";
+import { isFlatpak } from "../utils";
 import { setupDesktopIntegration } from "../utils/desktop-integration";
 import { rm } from "fs/promises";
 import { disableCustomDns, enableCustomDns } from "../utils/custom-dns";
@@ -49,7 +49,6 @@ const NotificationOptions = z.object({
 
 export const osIntegrationRouter = t.router({
   isFlatpak: t.procedure.query(() => isFlatpak()),
-  isSnap: t.procedure.query(() => isSnap()),
 
   zoomFactor: t.procedure.query(() => config.zoomFactor),
   setZoomFactor: t.procedure.input(z.number()).mutation(({ input: factor }) => {

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

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

apps/desktop/src/api/updater.ts

@@ -23,7 +23,6 @@ import { CancellationToken, autoUpdater } from "electron-updater";
 import type { AppUpdaterEvents } from "electron-updater/out/AppUpdater";
 import { z } from "zod";
 import { config } from "../utils/config";
-import { app } from "electron";
 
 type UpdateInfo = { version: string };
 type Progress = { percent: number };
@@ -34,7 +33,6 @@ let downloadTimeout: NodeJS.Timeout | undefined = undefined;
 
 export const updaterRouter = t.router({
   autoUpdates: t.procedure.query(() => config.automaticUpdates),
-  releaseTrack: t.procedure.query(() => config.releaseTrack),
   install: t.procedure.query(() => autoUpdater.quitAndInstall()),
   download: t.procedure.query(async () => {
     if (cancellationToken) return;
@@ -69,13 +67,7 @@ export const updaterRouter = t.router({
     .mutation(({ input: { enabled } }) => {
       config.automaticUpdates = enabled;
     }),
-  changeReleaseTrack: t.procedure
-    .input(z.object({ track: z.string() }))
-    .mutation(({ input: { track } }) => {
-      config.releaseTrack = track;
-      app.relaunch();
-      app.exit();
-    }),
+
   onChecking: createSubscription("checking-for-update"),
   onDownloaded: createSubscription<"update-downloaded", UpdateInfo>(
     "update-downloaded"

apps/desktop/src/index.ts

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

apps/desktop/src/main.ts

@@ -85,8 +85,6 @@ async function createWindow() {
   const mainWindowState = new WindowState({});
   const mainWindow = new BrowserWindow({
     show: !cliOptions.hidden,
-    paintWhenInitiallyHidden: cliOptions.hidden,
-    skipTaskbar: cliOptions.hidden,
     x: mainWindowState.x,
     y: mainWindowState.y,
     width: mainWindowState.width,
@@ -103,10 +101,7 @@ async function createWindow() {
     ...(config.desktopSettings.nativeTitlebar
       ? {}
       : {
-          titleBarStyle:
-            process.platform === "win32" || process.platform === "darwin"
-              ? "hidden"
-              : "default",
+          titleBarStyle: "hidden",
           frame: process.platform === "win32" || process.platform === "darwin",
           titleBarOverlay: {
             height: 37,
@@ -147,11 +142,6 @@ async function createWindow() {
   await AssetManager.loadIcons();
   setupDesktopIntegration(config.desktopSettings);
 
-  mainWindow.webContents.session.setPermissionRequestHandler(
-    (webContents, permission, callback) => {
-      callback(permission === "geolocation" ? false : true);
-    }
-  );
   mainWindow.webContents.session.setSpellCheckerDictionaryDownloadURL(
     "http://dictionaries.notesnook.com/"
   );

apps/desktop/src/preload.ts

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

apps/desktop/src/utils/autoupdater.ts

@@ -20,22 +20,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { autoUpdater } from "electron-updater";
 import { config } from "./config";
 
+const CHANNEL = autoUpdater.currentVersion.raw.endsWith("-beta")
+  ? "beta"
+  : "latest";
 async function configureAutoUpdater() {
-  const releaseTrack =
-    config.releaseTrack === "stable" ? "latest" : config.releaseTrack;
   autoUpdater.setFeedURL({
     provider: "generic",
-    url: `https://notesnook.com/api/v1/releases/${process.platform}/${releaseTrack}`,
+    url: `https://notesnook.com/api/v1/releases/${process.platform}/${CHANNEL}`,
     useMultipleRangeRequest: false,
-    channel: releaseTrack
+    channel: CHANNEL
   });
 
   autoUpdater.autoDownload = config.automaticUpdates;
-  autoUpdater.allowDowngrade =
-    // only allow downgrade if the current version is a prerelease
-    // and the user has changed the release track to stable
-    config.releaseTrack === "stable" &&
-    autoUpdater.currentVersion.prerelease.length > 0;
+  autoUpdater.allowDowngrade = false;
   autoUpdater.allowPrerelease = false;
   autoUpdater.autoInstallOnAppQuit = true;
   autoUpdater.disableWebInstaller = true;

apps/desktop/src/utils/config.ts

@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { nativeTheme } from "electron";
 import { JSONStorage } from "./json-storage";
 import { z } from "zod";
-import { autoUpdater } from "electron-updater";
 
 export const DesktopIntegration = z.object({
   autoStart: z.boolean().optional(),
@@ -47,9 +46,6 @@ export const config = {
   automaticUpdates: true,
   proxyRules: "",
   customDns: true,
-  releaseTrack: autoUpdater.currentVersion.raw.includes("-beta")
-    ? "beta"
-    : "stable",
 
   backgroundColor: nativeTheme.themeSource === "dark" ? "#0f0f0f" : "#ffffff",
   windowControlsIconColor:

apps/desktop/src/utils/index.ts

@@ -29,7 +29,3 @@ export function isDevelopment() {
 export function isFlatpak() {
   return existsSync("/.flatpak-info");
 }
-
-export function isSnap() {
-  return process.env.SNAP !== undefined;
-}

apps/desktop/src/utils/theme.ts

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

apps/desktop/tsconfig.json

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

apps/mobile/.gitignore

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

apps/mobile/app/app.tsx

@@ -32,7 +32,6 @@ import { withErrorBoundry } from "./components/exception-handler";
 import GlobalSafeAreaProvider from "./components/globalsafearea";
 import { useAppEvents } from "./hooks/use-app-events";
 import { ApplicationHolder } from "./navigation";
-import { NotePreviewConfigure } from "./screens/note-preview-configure";
 import { themeTrpcClient } from "./screens/settings/theme-selector";
 import Notifications from "./services/notifications";
 import SettingsService from "./services/settings";
@@ -48,7 +47,7 @@ if (appLockEnabled || appLockMode !== "none") {
   useUserStore.getState().lockApp(true);
 }
 
-const App = (props: { configureMode: "note-preview" }) => {
+const App = () => {
   useAppEvents();
   //@ts-ignore
   globalThis["IS_MAIN_APP_RUNNING"] = true;
@@ -62,7 +61,6 @@ const App = (props: { configureMode: "note-preview" }) => {
       TipManager.init();
     }, 100);
   }, []);
-
   return (
     <View
       style={{
@@ -92,11 +90,7 @@ const App = (props: { configureMode: "note-preview" }) => {
           width: "100%"
         }}
       >
-        {props.configureMode === "note-preview" ? (
-          <NotePreviewConfigure />
-        ) : (
-          <ApplicationHolder />
-        )}
+        <ApplicationHolder />
       </GestureHandlerRootView>
       <AppLockedOverlay />
     </View>
@@ -109,8 +103,8 @@ let currTheme =
     : SettingsService.getProperty("lighTheme");
 useThemeEngineStore.getState().setTheme(currTheme);
 
-export const withTheme = (Element: (props: any) => JSX.Element) => {
-  return function AppWithThemeProvider(props: any) {
+export const withTheme = (Element: () => JSX.Element) => {
+  return function AppWithThemeProvider() {
     const [colorScheme, darkTheme, lightTheme] = useThemeStore((state) => [
       state.colorScheme,
       state.darkTheme,
@@ -129,14 +123,13 @@ export const withTheme = (Element: (props: any) => JSX.Element) => {
           })
           .then((theme) => {
             if (theme) {
+              console.log(theme.version, "theme updated");
               theme.colorScheme === "dark"
                 ? useThemeStore.getState().setDarkTheme(theme)
                 : useThemeStore.getState().setLightTheme(theme);
             }
           })
-          .catch(() => {
-            /* empty */
-          });
+          .catch(console.log);
       }, 1000);
       // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
@@ -151,7 +144,7 @@ export const withTheme = (Element: (props: any) => JSX.Element) => {
 
     return (
       <I18nProvider i18n={i18n}>
-        <Element {...props} />
+        <Element />
       </I18nProvider>
     );
   };

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

@@ -0,0 +1,385 @@
+/*
+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 Sodium from "@ammarahmed/react-native-sodium";
+import { Platform } from "react-native";
+import "react-native-get-random-values";
+import * as Keychain from "react-native-keychain";
+import { MMKVLoader, ProcessingModes } from "react-native-mmkv-storage";
+import { generateSecureRandom } from "react-native-securerandom";
+import { DatabaseLogger } from ".";
+import { MMKV } from "./mmkv";
+import { ToastManager } from "../../services/event-manager";
+
+// Database key cipher is persisted across different user sessions hence it has
+// it's independent storage which we will never clear. This is only used when application has
+// app lock with password enabled.
+export const CipherStorage = new MMKVLoader()
+  .withInstanceID("cipher_storage")
+  .setProcessingMode(
+    Platform.OS === "ios"
+      ? ProcessingModes.MULTI_PROCESS
+      : ProcessingModes.SINGLE_PROCESS
+  )
+  .disableIndexing()
+  .initialize();
+
+const IOS_KEYCHAIN_ACCESS_GROUP = "group.org.streetwriters.notesnook";
+const IOS_KEYCHAIN_SERVICE_NAME = "org.streetwriters.notesnook";
+const KEYCHAIN_SERVER_DBKEY = "notesnook:db";
+
+const NOTESNOOK_APPLOCK_KEY_SALT = "kBwr1Kre86ebOZ8ThLu2OA";
+const NOTESNOOK_DB_KEY_SALT = "SNuzOcEK3amoqL0WvPeKqw";
+
+const DB_KEY_CIPHER = "databaseKeyCipher";
+const USER_KEY_CIPHER = "userKeyCipher";
+const APPLOCK_CIPHER = "applockCipher";
+
+const KEYSTORE_CONFIG = Platform.select({
+  ios: {
+    accessible: Keychain.ACCESSIBLE.WHEN_UNLOCKED_THIS_DEVICE_ONLY,
+    accessGroup: IOS_KEYCHAIN_ACCESS_GROUP,
+    service: IOS_KEYCHAIN_SERVICE_NAME
+  },
+  android: {}
+});
+
+function generatePassword() {
+  const length = 80;
+  const crypto = window.crypto || window.msCrypto;
+  if (typeof crypto === "undefined") {
+    throw new Error(
+      "Crypto API is not supported. Please upgrade your web browser"
+    );
+  }
+  const charset =
+    "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!@#$%^&+_{}[]():<>/?;";
+  const indexes = crypto.getRandomValues(new Uint32Array(length));
+  let secret = "";
+  for (const index of indexes) {
+    secret += charset[index % charset.length];
+  }
+  return secret;
+}
+
+export async function encryptDatabaseKeyWithPassword(appLockPassword) {
+  const key = getDatabaseKey();
+  const appLockCredentials = await Sodium.deriveKey(
+    appLockPassword,
+    NOTESNOOK_APPLOCK_KEY_SALT
+  );
+  const databaseKeyCipher = await encrypt(appLockCredentials, key);
+  MMKV.setMap(DB_KEY_CIPHER, databaseKeyCipher);
+  // We reset the database key from keychain once app lock password is set.
+  await Keychain.resetInternetCredentials(KEYCHAIN_SERVER_DBKEY);
+  return true;
+}
+
+export async function restoreDatabaseKeyToKeyChain(appLockPassword) {
+  const databaseKeyCipher = CipherStorage.getMap(DB_KEY_CIPHER);
+  const databaseKey = await decrypt(
+    {
+      password: appLockPassword
+    },
+    databaseKeyCipher
+  );
+
+  await Keychain.setInternetCredentials(
+    KEYCHAIN_SERVER_DBKEY,
+    "notesnook",
+    databaseKey,
+    KEYSTORE_CONFIG
+  );
+  MMKV.removeItem(DB_KEY_CIPHER);
+  return true;
+}
+
+export async function setAppLockVerificationCipher(appLockPassword) {
+  try {
+    const appLockCredentials = await Sodium.deriveKey(
+      appLockPassword,
+      NOTESNOOK_APPLOCK_KEY_SALT
+    );
+    const encrypted = await encrypt(appLockCredentials, generatePassword());
+    CipherStorage.setMap(APPLOCK_CIPHER, encrypted);
+    DatabaseLogger.info("setAppLockVerificationCipher");
+  } catch (e) {
+    DatabaseLogger.error(e);
+    console.log(e);
+  }
+}
+
+export async function clearAppLockVerificationCipher() {
+  CipherStorage.removeItem(APPLOCK_CIPHER);
+}
+
+export async function validateAppLockPassword(appLockPassword) {
+  try {
+    const appLockCipher = CipherStorage.getMap(APPLOCK_CIPHER);
+    if (!appLockCipher) return true;
+    const key = await Sodium.deriveKey(appLockPassword, appLockCipher.salt);
+    const decrypted = await decrypt(key, appLockCipher);
+
+    DatabaseLogger.info(
+      `validateAppLockPassword: ${typeof decrypted === "string"}`
+    );
+    return typeof decrypted === "string";
+  } catch (e) {
+    DatabaseLogger.error(e);
+    return false;
+  }
+}
+
+let DB_KEY;
+export function clearDatabaseKey() {
+  DB_KEY = undefined;
+  DatabaseLogger.info("Cleared database key");
+}
+
+export async function getDatabaseKey(appLockPassword) {
+  if (DB_KEY) return DB_KEY;
+  try {
+    if (appLockPassword) {
+      const databaseKeyCipher = CipherStorage.getMap("databaseKeyCipher");
+      const databaseKey = await decrypt(
+        {
+          password: appLockPassword
+        },
+        databaseKeyCipher
+      );
+      DatabaseLogger.info("Getting database key from cipher");
+      DB_KEY = databaseKey;
+    }
+
+    if (!DB_KEY) {
+      const hasKey = await Keychain.hasInternetCredentials(
+        KEYCHAIN_SERVER_DBKEY
+      );
+      if (hasKey) {
+        let credentials = await Keychain.getInternetCredentials(
+          KEYCHAIN_SERVER_DBKEY,
+          KEYSTORE_CONFIG
+        );
+
+        DatabaseLogger.info("Getting database key from Keychain");
+        DB_KEY = credentials.password;
+      }
+    }
+
+    if (!DB_KEY) {
+      DatabaseLogger.info("Generating new database key");
+      const password = generatePassword();
+      const derivedDatabaseKey = await Sodium.deriveKey(
+        password,
+        NOTESNOOK_DB_KEY_SALT
+      );
+
+      DB_KEY = derivedDatabaseKey.key;
+
+      await Keychain.setInternetCredentials(
+        KEYCHAIN_SERVER_DBKEY,
+        "notesnook",
+        DB_KEY,
+        KEYSTORE_CONFIG
+      );
+    }
+
+    if (await Keychain.hasInternetCredentials("notesnook")) {
+      const userKeyCredentials = await Keychain.getInternetCredentials(
+        "notesnook",
+        KEYSTORE_CONFIG
+      );
+
+      if (userKeyCredentials) {
+        const userKeyCipher = await encrypt(
+          {
+            key: DB_KEY,
+            salt: NOTESNOOK_DB_KEY_SALT
+          },
+          userKeyCredentials.password
+        );
+        // Store encrypted user key in MMKV
+        MMKV.setMap(USER_KEY_CIPHER, userKeyCipher);
+        await Keychain.resetInternetCredentials("notesnook");
+      }
+      DatabaseLogger.info("Migrated user credentials to cipher storage");
+    }
+
+    return DB_KEY;
+  } catch (e) {
+    ToastManager.error(e, "Error getting database key");
+    console.log(e, "error");
+    DatabaseLogger.error(e);
+    return null;
+  }
+}
+
+export async function deriveCryptoKey(data) {
+  try {
+    let credentials = await Sodium.deriveKey(data.password, data.salt);
+    const userKeyCipher = await encrypt(
+      {
+        key: await getDatabaseKey(),
+        salt: NOTESNOOK_DB_KEY_SALT
+      },
+      credentials.key
+    );
+    DatabaseLogger.info("User key stored: ", !!userKeyCipher);
+
+    // Store encrypted user key in MMKV
+    MMKV.setMap(USER_KEY_CIPHER, userKeyCipher);
+    return credentials.key;
+  } catch (e) {
+    DatabaseLogger.error(e);
+  }
+}
+
+export async function getCryptoKey(_name) {
+  try {
+    const keyCipher = MMKV.getMap(USER_KEY_CIPHER);
+
+    if (!keyCipher) {
+      DatabaseLogger.info("User key cipher is null");
+      return null;
+    }
+
+    const key = await decrypt(
+      {
+        key: await getDatabaseKey(),
+        salt: keyCipher.salt
+      },
+      keyCipher
+    );
+
+    return key;
+  } catch (e) {
+    console.log("getCryptoKey", e);
+    DatabaseLogger.error(e);
+  }
+}
+
+export async function removeCryptoKey(_name) {
+  try {
+    MMKV.removeItem(USER_KEY_CIPHER);
+    await Keychain.resetInternetCredentials("notesnook");
+    return true;
+  } catch (e) {
+    DatabaseLogger.error(e);
+  }
+}
+
+export async function getRandomBytes(length) {
+  return await generateSecureRandom(length);
+}
+
+export async function hash(password, email) {
+  let result = await Sodium.hashPassword(password, email);
+  return result;
+}
+
+export async function generateCryptoKey(password, salt) {
+  try {
+    let credentials = await Sodium.deriveKey(password, salt || null);
+    return credentials;
+  } catch (e) {
+    DatabaseLogger.error(e);
+  }
+}
+
+export function getAlgorithm(base64Variant) {
+  return `xcha-argon2i13-${base64Variant}`;
+}
+
+export async function decrypt(password, data) {
+  if (!password.password && !password.key) return undefined;
+  if (password.password && password.password === "" && !password.key)
+    return undefined;
+  let _data = { ...data };
+  _data.output = "plain";
+
+  if (!password.salt) password.salt = data.salt;
+  return await Sodium.decrypt(password, _data);
+}
+
+export async function decryptMulti(password, data) {
+  if (!password.password && !password.key) return undefined;
+  if (password.password && password.password === "" && !password.key)
+    return undefined;
+
+  data = data.map((d) => {
+    d.output = "plain";
+    return d;
+  });
+
+  if (data.length && !password.salt) {
+    password.salt = data[0].salt;
+  }
+
+  return await Sodium.decryptMulti(password, data);
+}
+
+export function parseAlgorithm(alg) {
+  if (!alg) return {};
+  const [enc, kdf, compressed, compressionAlg, base64variant] = alg.split("-");
+  return {
+    encryptionAlgorithm: enc,
+    kdfAlgorithm: kdf,
+    compressionAlgorithm: compressionAlg,
+    isCompress: compressed === "1",
+    base64_variant: base64variant
+  };
+}
+
+export async function encrypt(password, data) {
+  if (!password.password && !password.key) return undefined;
+  if (password.password && password.password === "" && !password.key)
+    return undefined;
+
+  let message = {
+    type: "plain",
+    data: data
+  };
+  let result = await Sodium.encrypt(password, message);
+
+  return {
+    ...result,
+    alg: getAlgorithm(7)
+  };
+}
+
+export async function encryptMulti(password, data) {
+  if (!password.password && !password.key) return undefined;
+  if (password.password && password.password === "" && !password.key)
+    return undefined;
+
+  let results = await Sodium.encryptMulti(
+    password,
+    data.map((item) => ({
+      type: "plain",
+      data: item
+    }))
+  );
+
+  return !results
+    ? []
+    : results.map((result) => ({
+        ...result,
+        alg: getAlgorithm(7)
+      }));
+}

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

@@ -1,473 +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 Sodium, { Cipher, Password } from "@ammarahmed/react-native-sodium";
-import { SerializedKey } from "@notesnook/crypto";
-import { Platform } from "react-native";
-import "react-native-get-random-values";
-import * as Keychain from "react-native-keychain";
-import { MMKVLoader, ProcessingModes } from "react-native-mmkv-storage";
-import { generateSecureRandom } from "react-native-securerandom";
-import { DatabaseLogger } from ".";
-import { ToastManager } from "../../services/event-manager";
-import { MMKV } from "./mmkv";
-
-// Database key cipher is persisted across different user sessions hence it has
-// it's independent storage which we will never clear. This is only used when application has
-// app lock with password enabled.
-export const CipherStorage = new MMKVLoader()
-  .withInstanceID("cipher_storage")
-  .setProcessingMode(
-    Platform.OS === "ios"
-      ? ProcessingModes.MULTI_PROCESS
-      : ProcessingModes.SINGLE_PROCESS
-  )
-  .disableIndexing()
-  .initialize();
-
-const IOS_KEYCHAIN_ACCESS_GROUP = "group.org.streetwriters.notesnook";
-const IOS_KEYCHAIN_SERVICE_NAME = "org.streetwriters.notesnook";
-const KEYCHAIN_SERVER_DBKEY = "notesnook:db";
-
-const NOTESNOOK_APPLOCK_KEY_SALT = "kBwr1Kre86ebOZ8ThLu2OA";
-const NOTESNOOK_DB_KEY_SALT = "SNuzOcEK3amoqL0WvPeKqw";
-
-const DB_KEY_CIPHER = "databaseKeyCipher";
-const USER_KEY_CIPHER = "userKeyCipher";
-const APPLOCK_CIPHER = "applockCipher";
-
-const KEYSTORE_CONFIG = Platform.select({
-  ios: {
-    accessible: Keychain.ACCESSIBLE.WHEN_UNLOCKED_THIS_DEVICE_ONLY,
-    accessGroup: IOS_KEYCHAIN_ACCESS_GROUP,
-    service: IOS_KEYCHAIN_SERVICE_NAME
-  },
-  android: {}
-});
-
-function generatePassword() {
-  const length = 80;
-  //@ts-ignore
-  const crypto = window.crypto || window.msCrypto;
-  if (typeof crypto === "undefined") {
-    throw new Error(
-      "Crypto API is not supported. Please upgrade your web browser"
-    );
-  }
-  const charset =
-    "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!@#$%^&+_{}[]():<>/?;";
-  const indexes = crypto.getRandomValues(new Uint32Array(length));
-  let secret = "";
-  for (const index of indexes) {
-    secret += charset[index % charset.length];
-  }
-  return secret;
-}
-
-export async function encryptDatabaseKeyWithPassword(appLockPassword: string) {
-  const key = (await getDatabaseKey()) as string;
-  const appLockCredentials = await Sodium.deriveKey(
-    appLockPassword,
-    NOTESNOOK_APPLOCK_KEY_SALT
-  );
-  const databaseKeyCipher = (await encrypt(appLockCredentials, key)) as Cipher;
-  MMKV.setMap(DB_KEY_CIPHER, databaseKeyCipher);
-  // We reset the database key from keychain once app lock password is set.
-  await Keychain.resetInternetCredentials(KEYCHAIN_SERVER_DBKEY);
-  return true;
-}
-
-export async function restoreDatabaseKeyToKeyChain(appLockPassword: string) {
-  const databaseKeyCipher: Cipher = CipherStorage.getMap(DB_KEY_CIPHER);
-  const databaseKey = (await decrypt(
-    {
-      password: appLockPassword
-    },
-    databaseKeyCipher
-  )) as string;
-
-  await Keychain.setInternetCredentials(
-    KEYCHAIN_SERVER_DBKEY,
-    "notesnook",
-    databaseKey,
-    KEYSTORE_CONFIG
-  );
-  MMKV.removeItem(DB_KEY_CIPHER);
-  return true;
-}
-
-export async function setAppLockVerificationCipher(appLockPassword: string) {
-  try {
-    const appLockCredentials = await Sodium.deriveKey(
-      appLockPassword,
-      NOTESNOOK_APPLOCK_KEY_SALT
-    );
-    const encrypted = (await encrypt(
-      appLockCredentials,
-      generatePassword()
-    )) as Cipher;
-    CipherStorage.setMap(APPLOCK_CIPHER, encrypted);
-    DatabaseLogger.info("setAppLockVerificationCipher");
-  } catch (e) {
-    DatabaseLogger.error(e);
-  }
-}
-
-export async function clearAppLockVerificationCipher() {
-  CipherStorage.removeItem(APPLOCK_CIPHER);
-}
-
-export async function validateAppLockPassword(appLockPassword: string) {
-  try {
-    const appLockCipher: Cipher = CipherStorage.getMap(APPLOCK_CIPHER);
-    if (!appLockCipher) return true;
-    const key = await Sodium.deriveKey(appLockPassword, appLockCipher.salt);
-    const decrypted = await decrypt(key, appLockCipher);
-
-    DatabaseLogger.info(
-      `validateAppLockPassword: ${typeof decrypted === "string"}`
-    );
-    return typeof decrypted === "string";
-  } catch (e) {
-    DatabaseLogger.error(e);
-    return false;
-  }
-}
-
-let DB_KEY: string | undefined;
-export function clearDatabaseKey() {
-  DB_KEY = undefined;
-  DatabaseLogger.info("Cleared database key");
-}
-
-export async function getDatabaseKey(appLockPassword?: string) {
-  if (DB_KEY) return DB_KEY;
-  if (appLockPassword) {
-    const databaseKeyCipher: Cipher = CipherStorage.getMap("databaseKeyCipher");
-    const databaseKey = await decrypt(
-      {
-        password: appLockPassword
-      },
-      databaseKeyCipher
-    );
-    DatabaseLogger.info("Getting database key from cipher");
-    DB_KEY = databaseKey;
-  }
-
-  if (!DB_KEY) {
-    const hasKey = await Keychain.hasInternetCredentials(KEYCHAIN_SERVER_DBKEY);
-    if (hasKey) {
-      const credentials = await Keychain.getInternetCredentials(
-        KEYCHAIN_SERVER_DBKEY
-      );
-
-      DatabaseLogger.info("Getting database key from Keychain");
-      DB_KEY = (credentials as Keychain.UserCredentials).password;
-    }
-  }
-
-  if (!DB_KEY) {
-    DatabaseLogger.info("Generating new database key");
-    const password = generatePassword();
-    const derivedDatabaseKey = await Sodium.deriveKey(
-      password,
-      NOTESNOOK_DB_KEY_SALT
-    );
-
-    DB_KEY = derivedDatabaseKey.key as string;
-
-    await Keychain.setInternetCredentials(
-      KEYCHAIN_SERVER_DBKEY,
-      "notesnook",
-      DB_KEY,
-      KEYSTORE_CONFIG
-    );
-  }
-
-  if (await Keychain.hasInternetCredentials("notesnook")) {
-    const userKeyCredentials = await Keychain.getInternetCredentials(
-      "notesnook"
-    );
-
-    if (userKeyCredentials) {
-      const userKeyCipher: Cipher = (await encrypt(
-        {
-          key: DB_KEY,
-          salt: NOTESNOOK_DB_KEY_SALT
-        },
-        userKeyCredentials.password
-      )) as Cipher;
-      // Store encrypted user key in MMKV
-      MMKV.setMap(USER_KEY_CIPHER, userKeyCipher);
-      await Keychain.resetInternetCredentials("notesnook");
-    }
-    DatabaseLogger.info("Migrated user credentials to cipher storage");
-  }
-
-  if (!DB_KEY) {
-    throw new Error(
-      `Failed to get database key, ${await Keychain.hasInternetCredentials(
-        KEYCHAIN_SERVER_DBKEY
-      )}`
-    );
-  }
-
-  return DB_KEY;
-}
-
-export async function deriveCryptoKeyFallback(data: SerializedKey) {
-  if (Platform.OS !== "ios") return;
-  try {
-    if (!data.password || !data.salt)
-      throw new Error(
-        "Invalid password and salt provided to deriveCryptoKeyFallback"
-      );
-
-    const credentials = await Sodium.deriveKeyFallback?.(
-      data.password,
-      data.salt
-    );
-
-    if (!credentials) return;
-
-    const userKeyCipher = (await encrypt(
-      {
-        key: (await getDatabaseKey()) as string,
-        salt: NOTESNOOK_DB_KEY_SALT
-      },
-      credentials.key as string
-    )) as Cipher<"base64">;
-    DatabaseLogger.info("User key fallback stored: ", {
-      userKeyCipher: !!userKeyCipher
-    });
-
-    // Store encrypted user key in MMKV
-    MMKV.setMap(USER_KEY_CIPHER, userKeyCipher);
-  } catch (e) {
-    DatabaseLogger.error(e);
-  }
-}
-
-export async function deriveCryptoKey(data: SerializedKey) {
-  try {
-    if (!data.password || !data.salt)
-      throw new Error("Invalid password and salt provided to deriveCryptoKey");
-
-    const credentials = (await Sodium.deriveKey(
-      data.password,
-      data.salt
-    )) as Password;
-    const userKeyCipher = (await encrypt(
-      {
-        key: (await getDatabaseKey()) as string,
-        salt: NOTESNOOK_DB_KEY_SALT
-      },
-      credentials.key as string
-    )) as Cipher<"base64">;
-    DatabaseLogger.info("User key stored: ", {
-      userKeyCipher: !!userKeyCipher
-    });
-
-    // Store encrypted user key in MMKV
-    MMKV.setMap(USER_KEY_CIPHER, userKeyCipher);
-  } catch (e) {
-    DatabaseLogger.error(e);
-  }
-}
-
-export async function getCryptoKey() {
-  try {
-    const keyCipher: Cipher = MMKV.getMap(USER_KEY_CIPHER);
-    if (!keyCipher) {
-      DatabaseLogger.info("User key cipher is null");
-      return undefined;
-    }
-
-    const key = await decrypt(
-      {
-        key: (await getDatabaseKey()) as string,
-        salt: keyCipher.salt
-      },
-      keyCipher
-    );
-
-    return key;
-  } catch (e) {
-    DatabaseLogger.error(e);
-  }
-}
-
-export async function removeCryptoKey() {
-  try {
-    MMKV.removeItem(USER_KEY_CIPHER);
-    await Keychain.resetInternetCredentials("notesnook");
-    return true;
-  } catch (e) {
-    DatabaseLogger.error(e);
-  }
-}
-
-export async function getRandomBytes(length: number) {
-  return await generateSecureRandom(length);
-}
-
-export async function hash(
-  password: string,
-  email: string,
-  options?: { usesFallback?: boolean }
-) {
-  DatabaseLogger.log(`Hashing password: fallback: ${options?.usesFallback}`);
-
-  if (options?.usesFallback && Platform.OS !== "ios") {
-    return "";
-  }
-
-  return (
-    options?.usesFallback
-      ? await Sodium.hashPasswordFallback?.(password, email)
-      : await Sodium.hashPassword(password, email)
-  ) as string;
-}
-
-export async function generateCryptoKey(password: string, salt?: string) {
-  return Sodium.deriveKey(password, salt) as Promise<SerializedKey>;
-}
-
-export async function generateCryptoKeyFallback(
-  password: string,
-  salt?: string
-): Promise<SerializedKey> {
-  return Sodium.deriveKeyFallback?.(
-    password,
-    salt as string
-  ) as Promise<SerializedKey>;
-}
-
-export function getAlgorithm(base64Variant: number) {
-  return `xcha-argon2i13-${base64Variant}`;
-}
-
-export async function decrypt(password: SerializedKey, data: Cipher<"base64">) {
-  const _data = { ...data };
-  _data.output = "plain";
-
-  if (!password.salt) password.salt = data.salt;
-
-  if (Platform.OS === "ios" && !password.key && password.password) {
-    const key = await Sodium.deriveKey(password.password, password.salt);
-    try {
-      return await Sodium.decrypt(key, _data);
-    } catch (e) {
-      const fallbackKey = await Sodium.deriveKeyFallback?.(
-        password.password,
-        password.salt
-      );
-      if (Platform.OS === "ios" && fallbackKey) {
-        DatabaseLogger.info("Using fallback key for decryption");
-      }
-      if (fallbackKey) {
-        return await Sodium.decrypt(fallbackKey, _data);
-      } else {
-        throw e;
-      }
-    }
-  }
-
-  return await Sodium.decrypt(password, _data);
-}
-
-export async function decryptMulti(
-  password: Password,
-  data: Cipher<"base64">[]
-) {
-  data = data.map((d) => {
-    d.output = "plain";
-    return d;
-  });
-
-  if (data.length && !password.salt) {
-    password.salt = data[0].salt;
-  }
-
-  if (Platform.OS === "ios" && !password.key && password.password) {
-    const key = await Sodium.deriveKey(password.password, password.salt);
-    try {
-      return await Sodium.decryptMulti(key, data);
-    } catch (e) {
-      const fallbackKey = await Sodium.deriveKeyFallback?.(
-        password.password,
-        password.salt as string
-      );
-      if (Platform.OS === "ios" && fallbackKey) {
-        DatabaseLogger.info("Using fallback key for decryption");
-      }
-      if (fallbackKey) {
-        return await Sodium.decryptMulti(fallbackKey, data);
-      } else {
-        throw e;
-      }
-    }
-  }
-
-  return await Sodium.decryptMulti(password, data);
-}
-
-export function parseAlgorithm(alg: string) {
-  if (!alg) return {};
-  const [enc, kdf, compressed, compressionAlg, base64variant] = alg.split("-");
-  return {
-    encryptionAlgorithm: enc,
-    kdfAlgorithm: kdf,
-    compressionAlgorithm: compressionAlg,
-    isCompress: compressed === "1",
-    base64_variant: base64variant
-  };
-}
-
-export async function encrypt(password: SerializedKey, plainText: string) {
-  const result = await Sodium.encrypt<"base64">(password, {
-    type: "plain",
-    data: plainText
-  });
-
-  return {
-    ...result,
-    alg: getAlgorithm(7)
-  };
-}
-
-export async function encryptMulti(
-  password: SerializedKey,
-  plainText: string[]
-) {
-  const results = await Sodium.encryptMulti<"base64">(
-    password,
-    plainText.map((item) => ({
-      type: "plain",
-      data: item
-    }))
-  );
-
-  return !results
-    ? []
-    : results.map((result) => ({
-        ...result,
-        alg: getAlgorithm(7)
-      }));
-}

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

@@ -16,50 +16,48 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+import "./logger";
 import { database } from "@notesnook/common";
-import { logger as dbLogger, ICompressor } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
+import { logger as dbLogger } from "@notesnook/core";
+import { Platform } from "react-native";
+import * as Gzip from "react-native-gzip";
+import EventSource from "../../utils/sse/even-source-ios";
+import AndroidEventSource from "../../utils/sse/event-source";
 import {
   SqliteAdapter,
   SqliteIntrospector,
   SqliteQueryCompiler
 } from "@streetwriters/kysely";
-import { Platform } from "react-native";
-import * as Gzip from "react-native-gzip";
-import SettingsService from "../../services/settings";
-import EventSource from "../../utils/sse/even-source-ios";
-import AndroidEventSource from "../../utils/sse/event-source";
-import { FileStorage } from "../filesystem";
-import { getDatabaseKey } from "./encryption";
-import "./logger";
+import filesystem from "../filesystem";
+import Storage from "./storage";
 import { RNSqliteDriver } from "./sqlite.kysely";
-import { Storage } from "./storage";
+import { getDatabaseKey } from "./encryption";
+import SettingsService from "../../services/settings";
+import { strings } from "@notesnook/intl";
 
-export async function setupDatabase(password?: string) {
+export async function setupDatabase(password) {
   const key = await getDatabaseKey(password);
   if (!key) throw new Error(strings.databaseSetupFailed());
 
+  console.log("Opening database with key:", !!key);
+
   database.host({
     API_HOST: "https://api.notesnook.com",
     AUTH_HOST: "https://auth.streetwriters.co",
     SSE_HOST: "https://events.streetwriters.co",
     SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",
     ISSUES_HOST: "https://issues.streetwriters.co",
-    MONOGRAPH_HOST: "https://monogr.ph",
     ...(SettingsService.getProperty("serverUrls") || {})
   });
 
   database.setup({
     storage: Storage,
-    eventsource: (Platform.OS === "ios"
-      ? EventSource
-      : AndroidEventSource) as any,
-    fs: FileStorage,
-    compressor: async () =>
-      ({
-        compress: Gzip.deflate,
-        decompress: Gzip.inflate
-      } as ICompressor),
+    eventsource: Platform.OS === "ios" ? EventSource : AndroidEventSource,
+    fs: filesystem,
+    compressor: {
+      compress: Gzip.deflate,
+      decompress: Gzip.inflate
+    },
     batchSize: 100,
     sqliteOptions: {
       dialect: (name) => ({

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

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

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

@@ -16,52 +16,58 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { IStorage } from "@notesnook/core";
-import { MMKVInstance } from "react-native-mmkv-storage";
+
+import { Platform } from "react-native";
+import RNFetchBlob from "react-native-blob-util";
 import {
   decrypt,
   decryptMulti,
   deriveCryptoKey,
-  deriveCryptoKeyFallback,
   encrypt,
   encryptMulti,
   generateCryptoKey,
   getCryptoKey,
+  getRandomBytes,
   hash,
-  generateCryptoKeyFallback
+  removeCryptoKey
 } from "./encryption";
 import { MMKV } from "./mmkv";
 
 export class KV {
-  storage: MMKVInstance;
-  constructor(storage: MMKVInstance) {
+  /**
+   * @type {typeof MMKV}
+   */
+  storage = null;
+  constructor(storage) {
     this.storage = storage;
   }
-
-  async read<T>(key: string, isArray?: boolean) {
-    if (!key) return undefined;
-    const data = this.storage.getString(key);
-    if (!data) return undefined;
+  async read(key) {
+    if (!key) return null;
+    let data = this.storage.getString(key);
+    if (!data) return null;
     try {
-      return JSON.parse(data) as T;
+      let parse = JSON.parse(data);
+      return parse;
     } catch (e) {
-      return data as T;
+      return data;
     }
   }
 
-  async write<T>(key: string, data: T) {
+  async write(key, data) {
     this.storage.setString(
       key,
       typeof data === "string" ? data : JSON.stringify(data)
     );
+
+    return true;
   }
 
-  async readMulti<T>(keys: string[]) {
+  async readMulti(keys) {
     if (keys.length <= 0) {
       return [];
     } else {
       try {
-        const data = await this.storage.getMultipleItemsAsync<any>(
+        let data = await this.storage.getMultipleItemsAsync(
           keys.slice(),
           "string"
         );
@@ -73,24 +79,24 @@ export class KV {
             obj = value;
           }
           return [key, obj];
-        }) as [string, T][];
+        });
       } catch (e) {
-        return [];
+        console.log(e);
       }
     }
   }
 
-  async remove(key: string) {
-    this.storage.removeItem(key);
+  async remove(key) {
+    return this.storage.removeItem(key);
   }
 
-  async removeMulti(keys: string[]) {
-    if (!keys) return;
-    this.storage.removeItems(keys);
+  async removeMulti(keys) {
+    if (!keys) return true;
+    return this.storage.removeItems(keys);
   }
 
   async clear() {
-    this.storage.clearStore();
+    return this.storage.clearStore();
   }
 
   async getAllKeys() {
@@ -107,46 +113,54 @@ export class KV {
     return keys;
   }
 
-  async writeMulti(items: [string, any][]) {
-    await this.storage.setMultipleItemsAsync(items, "object");
+  async writeMulti(items) {
+    return this.storage.setMultipleItemsAsync(items, "object");
   }
 }
 
 const DefaultStorage = new KV(MMKV);
 
-export const Storage: IStorage = {
-  write<T>(key: string, data: T): Promise<void> {
-    return DefaultStorage.write(key, data);
-  },
-  writeMulti<T>(entries: [string, T][]): Promise<void> {
-    return DefaultStorage.writeMulti(entries);
-  },
-  readMulti<T>(keys: string[]): Promise<[string, T][]> {
-    return DefaultStorage.readMulti(keys);
-  },
-  read<T>(key: string, isArray?: boolean): Promise<T | undefined> {
-    return DefaultStorage.read(key, isArray);
-  },
-  remove(key: string): Promise<void> {
-    return DefaultStorage.remove(key);
-  },
-  removeMulti(keys: string[]): Promise<void> {
-    return DefaultStorage.removeMulti(keys);
-  },
-  clear(): Promise<void> {
-    return DefaultStorage.clear();
-  },
-  getAllKeys(): Promise<string[]> {
-    return DefaultStorage.getAllKeys();
-  },
-  hash,
-  getCryptoKey,
+async function requestPermission() {
+  if (Platform.OS === "ios") return true;
+  return true;
+}
+async function checkAndCreateDir(path) {
+  let dir =
+    Platform.OS === "ios"
+      ? RNFetchBlob.fs.dirs.DocumentDir + path
+      : RNFetchBlob.fs.dirs.SDCardDir + "/Notesnook/" + path;
+
+  try {
+    let exists = await RNFetchBlob.fs.exists(dir);
+    let isDir = await RNFetchBlob.fs.isDir(dir);
+    if (!exists || !isDir) {
+      await RNFetchBlob.fs.mkdir(dir);
+    }
+  } catch (e) {
+    await RNFetchBlob.fs.mkdir(dir);
+  }
+  return dir;
+}
+
+export default {
+  read: (key) => DefaultStorage.read(key),
+  write: (key, value) => DefaultStorage.write(key, value),
+  readMulti: (keys) => DefaultStorage.readMulti(keys),
+  remove: (key) => DefaultStorage.remove(key),
+  clear: () => DefaultStorage.clear(),
+  getAllKeys: () => DefaultStorage.getAllKeys(),
+  writeMulti: (items) => DefaultStorage.writeMulti(items),
+  removeMulti: (keys) => DefaultStorage.removeMulti(keys),
   encrypt,
-  encryptMulti,
   decrypt,
   decryptMulti,
+  getRandomBytes,
+  checkAndCreateDir,
+  requestPermission,
   deriveCryptoKey,
+  getCryptoKey,
+  removeCryptoKey,
+  hash,
   generateCryptoKey,
-  generateCryptoKeyFallback,
-  deriveCryptoKeyFallback
+  encryptMulti
 };

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

@@ -27,9 +27,13 @@ import RNFetchBlob from "react-native-blob-util";
  */
 export async function compressToBase64(path, type) {
   const { width: screenWidth, scale } = Dimensions.get("window");
-
+  console.log("COMPRESSING TO BASE64...");
   return new Promise((resolve) => {
+    console.log(path, "image path...");
+
     Image.getSize(path, async (width) => {
+      console.log("image width", width);
+
       const response = await ImageResizer.createResizedImage(
         path,
         screenWidth * scale,
@@ -51,12 +55,10 @@ export async function compressToBase64(path, type) {
           : response.uri,
         "base64"
       );
-      RNFetchBlob.fs.unlink(path.replace("file://", "")).catch(() => {
-        /* empty */
-      });
-      RNFetchBlob.fs.unlink(response.uri.replace("file://", "")).catch(() => {
-        /* empty */
-      });
+      RNFetchBlob.fs.unlink(path.replace("file://", "")).catch(console.log);
+      RNFetchBlob.fs
+        .unlink(response.uri.replace("file://", ""))
+        .catch(console.log);
 
       resolve(base64);
     });
@@ -78,8 +80,6 @@ export async function compressToFile(path, type) {
       onlyScaleDown: true
     }
   );
-  RNFetchBlob.fs.unlink(path.replace("file://", "")).catch(() => {
-    /* empty */
-  });
+  RNFetchBlob.fs.unlink(path.replace("file://", "")).catch(console.log);
   return response.uri;
 }

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

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

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

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

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

@@ -17,41 +17,24 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { IFileStorage } from "@notesnook/core";
 import { checkAttachment, downloadFile } from "./download";
 import {
-  bulkExists,
-  clearCache,
   clearFileStorage,
-  deleteCacheFileByName,
-  deleteCacheFileByPath,
   deleteFile,
   exists,
-  getCacheSize,
-  hashBase64,
   readEncrypted,
-  writeEncryptedBase64
-} from "./io";
-import { uploadFile } from "./upload";
-import {
-  cancelable,
-  checkAndCreateDir,
-  getUploadedFileSize,
-  requestPermission
-} from "./utils";
-
-export default {
-  checkAttachment,
+  writeEncryptedBase64,
+  hashBase64,
   clearCache,
   deleteCacheFileByName,
   deleteCacheFileByPath,
-  getCacheSize,
-  requestPermission,
-  checkAndCreateDir,
-  getUploadedFileSize
-};
+  bulkExists,
+  getCacheSize
+} from "./io";
+import { uploadFile } from "./upload";
+import { cancelable, getUploadedFileSize } from "./utils";
 
-export const FileStorage: IFileStorage = {
+export default {
   readEncrypted,
   writeEncryptedBase64,
   hashBase64,
@@ -61,5 +44,10 @@ export const FileStorage: IFileStorage = {
   exists,
   clearFileStorage,
   getUploadedFileSize,
-  bulkExists
+  checkAttachment,
+  clearCache,
+  deleteCacheFileByName,
+  deleteCacheFileByPath,
+  bulkExists,
+  getCacheSize
 };

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

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

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

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

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

@@ -17,11 +17,11 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { hosts, RequestOptions } from "@notesnook/core";
 import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
 import * as ScopedStorage from "react-native-scoped-storage";
 import { DatabaseLogger, db } from "../database";
+import { hosts } from "@notesnook/core";
 
 export const ABYTES = 17;
 export const cacheDirOld = RNFetchBlob.fs.dirs.CacheDir;
@@ -31,13 +31,18 @@ export const cacheDir =
     ? RNFetchBlob.fs.dirs.LibraryDir + "/.cache"
     : RNFetchBlob.fs.dirs.DocumentDir + "/.cache";
 
-export function getRandomId(prefix: string) {
+export function getRandomId(prefix) {
   return Math.random()
     .toString(36)
     .replace("0.", prefix || "");
 }
 
-export function parseS3Error(data?: string) {
+/**
+ *
+ * @param {string | undefined} data
+ * @returns
+ */
+export function parseS3Error(data) {
   const xml = typeof data === "string" ? data : null;
 
   const error = {
@@ -65,19 +70,11 @@ export function parseS3Error(data?: string) {
   }
 }
 
-export function cancelable(
-  operation: (
-    filename: string,
-    requestOptions: RequestOptions,
-    cancelToken: {
-      cancel: (reason?: string) => Promise<void>;
-    }
-  ) => Promise<boolean>
-) {
+export function cancelable(operation) {
   const cancelToken = {
-    cancel: async (reason?: string) => {}
+    cancel: () => {}
   };
-  return (filename: string, requestOptions: RequestOptions) => {
+  return (filename, requestOptions) => {
     return {
       execute: () => operation(filename, requestOptions, cancelToken),
       cancel: async () => {
@@ -87,35 +84,29 @@ export function cancelable(
   };
 }
 
-export function copyFileAsync(source: string, dest: string) {
+export function copyFileAsync(source, dest) {
   return new Promise((resolve, reject) => {
-    //@ts-ignore
-    ScopedStorage.copyFile(source, dest, (e: any, r: any) => {
+    ScopedStorage.copyFile(source, dest, (e, r) => {
       if (e) {
         reject(e);
         return;
       }
-      resolve(true);
+      resolve();
     });
   });
 }
 
-export async function releasePermissions(path: string) {
+export async function releasePermissions(path) {
   if (Platform.OS === "ios") return;
   const uris = await ScopedStorage.getPersistedUriPermissions();
-  for (const uri of uris) {
+  for (let uri of uris) {
     if (path.startsWith(uri)) {
       await ScopedStorage.releasePersistableUriPermission(uri);
     }
   }
 }
 
-export const FileSizeResult = {
-  Empty: 0,
-  Error: -1
-};
-
-export async function getUploadedFileSize(hash: string, retry = 0) {
+export async function getUploadedFileSize(hash) {
   try {
     const url = `${hosts.API_HOST}/s3?name=${hash}`;
     const token = await db.tokenManager.getAccessToken();
@@ -123,37 +114,17 @@ export async function getUploadedFileSize(hash: string, retry = 0) {
       method: "HEAD",
       headers: { Authorization: `Bearer ${token}` }
     });
-
-    if (
-      !attachmentInfo.ok ||
-      attachmentInfo.headers?.get("content-length") === null
-    ) {
-      if (retry < 3) {
-        DatabaseLogger.log(`Retrying file size check: ${hash}, ${retry}`);
-        return getUploadedFileSize(hash, retry + 1);
-      }
-      throw new Error(
-        `File size check failed: ${hash}, ${
-          attachmentInfo.status
-        }, ${attachmentInfo.headers?.get("content-length")}`
-      );
-    }
-
     const contentLength = parseInt(
-      attachmentInfo.headers?.get("content-length") as string
+      attachmentInfo.headers?.get("content-length")
     );
-    return isNaN(contentLength) ? FileSizeResult.Empty : contentLength;
+    return isNaN(contentLength) ? 0 : contentLength;
   } catch (e) {
     DatabaseLogger.error(e);
-    return FileSizeResult.Error;
+    return -1;
   }
 }
 
-export async function checkUpload(
-  filename: string,
-  chunkSize: number,
-  expectedSize: number
-) {
+export async function checkUpload(filename, chunkSize, expectedSize) {
   const size = await getUploadedFileSize(filename);
   const totalChunks = Math.ceil(size / chunkSize);
   const decryptedLength = size - totalChunks * ABYTES;
@@ -167,25 +138,3 @@ export async function checkUpload(
       : undefined;
   if (error) throw new Error(error);
 }
-
-export async function requestPermission() {
-  if (Platform.OS === "ios") return true;
-  return true;
-}
-export async function checkAndCreateDir(path: string) {
-  const dir =
-    Platform.OS === "ios"
-      ? RNFetchBlob.fs.dirs.DocumentDir + path
-      : RNFetchBlob.fs.dirs.SDCardDir + "/Notesnook/" + path;
-
-  try {
-    const exists = await RNFetchBlob.fs.exists(dir);
-    const isDir = await RNFetchBlob.fs.isDir(dir);
-    if (!exists || !isDir) {
-      await RNFetchBlob.fs.mkdir(dir);
-    }
-  } catch (e) {
-    await RNFetchBlob.fs.mkdir(dir);
-  }
-  return dir;
-}

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

@@ -17,7 +17,9 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-function info(context: string, ...logs: unknown[]) {}
+function info(context: string, ...logs: unknown[]) {
+  console.log(`${new Date().toLocaleDateString()}::info::${context}:`, ...logs);
+}
 
 function error(context: string, ...logs: unknown[]) {
   console.log(

apps/mobile/app/components/announcements/cta.js

@@ -41,9 +41,7 @@ export const Cta = ({ actions, style = {}, color, inline }) => {
       await sleep(500);
     }
     if (item.type === "link") {
-      Linking.openURL(item.data).catch(() => {
-        /* empty */
-      });
+      Linking.openURL(item.data).catch(console.log);
     } else if (item.type === "promo") {
       presentSheet({
         component: (

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

@@ -112,19 +112,14 @@ const AppLockedOverlay = () => {
     if (
       !biometricsAuthEnabled ||
       !(await BiometricService.isBiometryAvailable())
-    ) {
+    )
       return;
-    }
 
     biometricUnlockAwaitingUserInput.current = true;
 
     if (Platform.OS === "android") {
       const activityName = await NotesnookModule.getActivityName();
-      if (
-        activityName !== "MainActivity" &&
-        activityName !== "NotePreviewConfigureActivity"
-      )
-        return;
+      if (activityName !== "MainActivity") return;
     }
     useSettingStore.getState().setRequestBiometrics(true);
 
@@ -185,6 +180,7 @@ const AppLockedOverlay = () => {
         DatabaseLogger.info("Locking app on entering foreground");
         useUserStore.getState().lockApp(true);
       }
+
       if (
         !(
           biometricUnlockAwaitingUserInput.current ||

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

@@ -63,11 +63,9 @@ const Actions = ({
   attachment,
   close,
   setAttachments,
-  fwdRef,
-  context
+  fwdRef
 }: {
   attachment: Attachment;
-  context: string;
   setAttachments: (attachments?: VirtualizedGrouping<Attachment>) => void;
   close?: () => void;
   fwdRef: RefObject<ActionSheetRef>;
@@ -81,6 +79,7 @@ const Actions = ({
   const [loading, setLoading] = useState<{
     name?: string;
   }>({});
+
   const actions = [
     {
       name: strings.network.download(),
@@ -89,7 +88,7 @@ const Actions = ({
           await db.fs().cancel(attachment.hash);
           useAttachmentStore.getState().remove(attachment.hash);
         }
-        downloadAttachment(attachment.hash, context === "global");
+        downloadAttachment(attachment.hash, false);
         fwdRef.current?.hide();
       },
       icon: "download"
@@ -182,17 +181,18 @@ const Actions = ({
         relations
           .map((relation) => relation.fromId)
           .forEach(async (id) => {
-            useTabStore.getState().forEachNoteTab(id, async (tab) => {
-              const isFocused = useTabStore.getState().currentTab === tab.id;
+            const tab = useTabStore.getState().getTabForNote(id);
+            if (tab !== undefined) {
+              const isFocused = useTabStore.getState().currentTab === tab;
               if (isFocused) {
                 eSendEvent(eOnLoadNote, {
                   item: await db.notes.note(id),
                   forced: true
                 });
               } else {
-                editorController.current.commands.setLoading(true, tab.id);
+                editorController.current.commands.setLoading(true, tab);
               }
-            });
+            }
           });
         close?.();
       },
@@ -375,7 +375,6 @@ Actions.present = (
         setAttachments={set}
         close={close}
         attachment={attachment}
-        context={context || "global"}
       />
     )
   });

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

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

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

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

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

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

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

@@ -17,11 +17,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { strings } from "@notesnook/intl";
-import { useThemeColors } from "@notesnook/theme";
-import React, { useCallback, useEffect, useRef, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { View } from "react-native";
-import { ScrollView } from "react-native-actions-sheet";
 import { db } from "../../common/database/index";
 import useTimer from "../../hooks/use-timer";
 import {
@@ -29,14 +26,19 @@ import {
   presentSheet,
   ToastManager
 } from "../../services/event-manager";
+import { useThemeColors } from "@notesnook/theme";
 import { eCloseSheet } from "../../utils/events";
 import { SIZE } from "../../utils/size";
 import { Button } from "../ui/button";
 import { IconButton } from "../ui/icon-button";
 import Input from "../ui/input";
 import { Pressable } from "../ui/pressable";
+import Seperator from "../ui/seperator";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
+import { useCallback } from "react";
+import { ScrollView } from "react-native-actions-sheet";
+import { strings } from "@notesnook/intl";
 
 const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
   const { colors } = useThemeColors();
@@ -162,7 +164,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
             textAlign: "center"
           }}
         >
-          {strings["2faCodeHelpText"][currentMethod.method]?.() ||
+          {strings["2faCodeHelpText"][currentMethod.method]() ||
             strings.select2faCodeHelpText()}
         </Paragraph>
 

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

@@ -70,7 +70,7 @@ export const useLogin = (onFinishLogin, sessionExpired = false) => {
       switch (step) {
         case LoginSteps.emailAuth: {
           const mfaInfo = await db.user.authenticateEmail(email.current);
-
+          console.log("email auth", mfaInfo);
           if (mfaInfo) {
             TwoFactorVerification.present(
               async (mfa, callback) => {

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

@@ -38,7 +38,7 @@ import { useAppState } from "../../hooks/use-app-state";
 
 export interface BaseDialogProps extends PropsWithChildren {
   animation?: "fade" | "none" | "slide" | undefined;
-  visible?: boolean;
+  visible: boolean;
   onRequestClose?: () => void;
   onShow?: () => void;
   premium?: boolean;
@@ -75,9 +75,9 @@ const BaseDialog = ({
   background
 }: BaseDialogProps) => {
   const floating = useIsFloatingKeyboard();
+  const appState = useAppState();
   const lockEvents = useRef(false);
   const [internalVisible, setIntervalVisible] = useState(true);
-  const locked = useUserStore((state) => state.appLocked);
 
   useEffect(() => {
     return () => {
@@ -86,20 +86,26 @@ const BaseDialog = ({
   }, []);
 
   useEffect(() => {
-    if (locked) {
-      setIntervalVisible(false);
-      lockEvents.current = true;
-      const unsub = useUserStore.subscribe((state) => {
-        if (!state.appLocked) {
-          setIntervalVisible(true);
-          unsub();
-          setTimeout(() => {
-            lockEvents.current = false;
+    if (useUserStore.getState().disableAppLockRequests) return;
+
+    if (SettingsService.canLockAppInBackground()) {
+      if (appState === "background") {
+        setIntervalVisible(false);
+        if (useUserStore.getState().appLocked) {
+          lockEvents.current = true;
+          const unsub = useUserStore.subscribe((state) => {
+            if (!state.appLocked) {
+              setIntervalVisible(true);
+              unsub();
+              setTimeout(() => {
+                lockEvents.current = false;
+              });
+            }
           });
         }
-      });
+      }
     }
-  }, [locked]);
+  }, [appState]);
 
   const Wrapper = useSafeArea ? SafeAreaView : View;
 

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

@@ -80,9 +80,8 @@ export const Dialog = ({ context = "global" }) => {
         return;
       }
     }
-    setChecked(false);
-    values.current.inputValue = undefined;
-    setVisible(false);
+
+    hide();
   };
 
   const show = useCallback(
@@ -105,14 +104,13 @@ export const Dialog = ({ context = "global" }) => {
       eUnSubscribeEvent(eOpenSimpleDialog, show);
       eUnSubscribeEvent(eCloseSimpleDialog, hide);
     };
-  }, [hide, show]);
+  }, [show]);
 
-  const hide = React.useCallback(() => {
+  const hide = () => {
     setChecked(false);
     values.current.inputValue = undefined;
     setVisible(false);
-    dialogInfo.onClose?.();
-  }, [dialogInfo]);
+  };
 
   const onNegativePress = async () => {
     if (dialogInfo.onClose) {

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

@@ -25,7 +25,7 @@ import {
   View
 } from "react-native";
 import { Image as ImageType } from "react-native-image-crop-picker";
-import { useThemeColors } from "@notesnook/theme";
+import { useThemeColors } from "../../../../../../packages/theme/dist";
 import { presentSheet } from "../../../services/event-manager";
 import { SIZE } from "../../../utils/size";
 import { Button } from "../../ui/button";
@@ -180,7 +180,7 @@ AttachImage.present = (response: ImageType[], context?: string) => {
           close={close}
           onAttach={(result) => {
             resolved = true;
-
+            console.log("closing");
             resolve(result);
             close?.();
           }}

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

@@ -179,7 +179,6 @@ const ColorPicker = ({
                   title: title.current,
                   colorCode: selectedColor
                 });
-                if (!id) return;
                 useRelationStore.getState().update();
                 useMenuStore.getState().setColorNotes();
                 setVisible(false);

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

@@ -188,7 +188,7 @@ const PDFPreview = () => {
                 }}
                 color={colors.static.white}
               >
-                {strings.loadingWithProgress(progress?.percent)}
+                {strings.loadingWithProgress(progress.percent)}
               </Paragraph>
             </Animated.View>
           ) : (
@@ -307,7 +307,9 @@ const PDFPreview = () => {
                     password={password}
                     maxScale={6}
                     onError={onError}
-                    onPressLink={(uri) => {}}
+                    onPressLink={(uri) => {
+                      console.log(`Link pressed: ${uri}`);
+                    }}
                     style={{
                       flex: 1,
                       width: width,

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

@@ -62,7 +62,7 @@ export default function Progress() {
       eSubscribeEvent(PROGRESS_EVENTS.start, (options: ProgressOptions) => {
         setProgress(options.progress);
         cancelCallback.current = options.cancelCallback;
-
+        console.log("options", options.fillBackground);
         setData({
           title: options.title,
           paragraph: options.paragraph,
@@ -164,7 +164,7 @@ export default function Progress() {
             />
           </View>
 
-          {!data?.canHideProgress ? null : (
+          {data?.canHideProgress ? null : (
             <Button
               title={cancelCallback.current ? "Cancel" : "Hide"}
               type="secondaryAccented"

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

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

apps/mobile/app/components/exception-handler/index.tsx

@@ -78,10 +78,10 @@ class ExceptionHandler extends React.Component<{
 }
 
 export const withErrorBoundry = (Element: React.ElementType, name: string) => {
-  return function ErrorBoundary(props: any) {
+  return function ErrorBoundary() {
     return (
       <ExceptionHandler component={name}>
-        <Element {...props} />
+        <Element />
       </ExceptionHandler>
     );
   };

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

@@ -33,6 +33,7 @@ import { eScrollEvent } from "../../utils/events";
 import { LeftMenus } from "./left-menus";
 import { RightMenus } from "./right-menus";
 import { Title } from "./title";
+import { useNavigation } from "@react-navigation/native";
 
 type HeaderRightButton = {
   title: string;
@@ -54,7 +55,7 @@ export const Header = ({
   onSearch
 }: {
   onLeftMenuButtonPress?: () => void;
-  renderedInRoute?: RouteName;
+  renderedInRoute: RouteName;
   id?: string;
   title: string;
   headerRightButtons?: HeaderRightButton[];

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

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

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

@@ -41,7 +41,7 @@ export const Title = ({
   isHiddenOnRender?: boolean;
   accentColor?: string;
   isBeta?: boolean;
-  renderedInRoute?: string;
+  renderedInRoute: string;
   id?: string;
 }) => {
   const { colors } = useThemeColors();

apps/mobile/app/components/image-preview/index.tsx

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import Sodium from "@ammarahmed/react-native-sodium";
-import { DataURL, getFileNameWithExtension } from "@notesnook/core";
+import { DataURL } from "@notesnook/core";
 import type { ImageAttributes } from "@notesnook/editor";
 import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect, useRef, useState } from "react";
@@ -34,11 +34,6 @@ import {
 import BaseDialog from "../dialog/base-dialog";
 import { IconButton } from "../ui/icon-button";
 import { ProgressBarComponent } from "../ui/svg/lazy";
-import RNFetchBlob from "react-native-blob-util";
-import Share from "react-native-share";
-import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
-import { useSettingStore } from "../../stores/use-setting-store";
-
 const ImagePreview = () => {
   const { colors } = useThemeColors("dialog");
 
@@ -46,8 +41,6 @@ const ImagePreview = () => {
   const [image, setImage] = useState<string>();
   const [loading, setLoading] = useState(false);
   const imageRef = useRef<ImageAttributes>();
-  const insets = useGlobalSafeAreaInsets();
-  const [showHeader, setShowHeader] = useState(true);
 
   useEffect(() => {
     eSubscribeEvent("ImagePreview", open);
@@ -80,86 +73,16 @@ const ImagePreview = () => {
         silent: true,
         cache: true
       });
-
-      if (!uri) {
-        setLoading(false);
-        return;
-      }
-      const attachment = await db.attachments.attachment(hash);
-      const path = `${cacheDir}/${
-        "NN_" + (await getFileNameWithExtension(hash, attachment?.mimeType))
-      }`;
-      await RNFetchBlob.fs.mv(`${cacheDir}/${uri}`, path).catch(() => {
-        /* empty */
-      });
+      const path = `${cacheDir}/${uri}`;
       setImage("file://" + path);
       setLoading(false);
     }, 100);
   };
 
-  const close = React.useCallback(() => {
-    image &&
-      RNFetchBlob.fs.unlink(image.replace("file://", "")).catch(() => {
-        /* empty */
-      });
+  const close = () => {
     setImage(undefined);
     setVisible(false);
-  }, [image]);
-
-  const renderHeader = React.useCallback(
-    () => (
-      <View
-        style={{
-          paddingTop: insets.top,
-          backgroundColor: "rgba(0,0,0,0.3)",
-          position: "absolute",
-          zIndex: 999,
-          display: showHeader ? "flex" : "none"
-        }}
-      >
-        <View
-          style={{
-            flexDirection: "row",
-            width: "100%",
-            justifyContent: "flex-end",
-            alignItems: "center",
-            height: 50,
-            paddingHorizontal: 12,
-            gap: 10
-          }}
-        >
-          <IconButton
-            name="share"
-            color="white"
-            style={{
-              borderWidth: 0
-            }}
-            onPress={async () => {
-              useSettingStore
-                .getState()
-                .setAppDidEnterBackgroundForAction(true);
-              await Share.open({
-                url: image
-              }).catch(() => {
-                /* empty */
-              });
-              useSettingStore
-                .getState()
-                .setAppDidEnterBackgroundForAction(false);
-            }}
-          />
-          <IconButton
-            name="close"
-            color="white"
-            onPress={() => {
-              close();
-            }}
-          />
-        </View>
-      </View>
-    ),
-    [close, image, insets.top, showHeader]
-  );
+  };
 
   return (
     visible && (
@@ -167,7 +90,6 @@ const ImagePreview = () => {
         background="black"
         animation="slide"
         visible={true}
-        useSafeArea={false}
         onRequestClose={close}
         transparent
       >
@@ -208,25 +130,43 @@ const ImagePreview = () => {
               />
             </View>
           ) : (
-            <>
-              <ImageViewer
-                enableImageZoom={true}
-                renderIndicator={() => <></>}
-                enableSwipeDown
-                useNativeDriver
-                onSwipeDown={close}
-                saveToLocalByLongPress={false}
-                onClick={() => {
-                  setShowHeader(!showHeader);
-                }}
-                renderHeader={renderHeader}
-                imageUrls={[
-                  {
-                    url: image as string
-                  }
-                ]}
-              />
-            </>
+            <ImageViewer
+              enableImageZoom={true}
+              renderIndicator={() => <></>}
+              enableSwipeDown
+              useNativeDriver
+              onSwipeDown={close}
+              saveToLocalByLongPress={false}
+              renderHeader={() => (
+                <View
+                  style={{
+                    flexDirection: "row",
+                    width: "100%",
+                    justifyContent: "flex-end",
+                    alignItems: "center",
+                    height: 50,
+                    paddingHorizontal: 24,
+                    position: "absolute",
+                    zIndex: 999,
+                    backgroundColor: "rgba(0,0,0,0.3)",
+                    marginTop: Platform.OS === "android" ? 30 : 0
+                  }}
+                >
+                  <IconButton
+                    name="close"
+                    color="white"
+                    onPress={() => {
+                      close();
+                    }}
+                  />
+                </View>
+              )}
+              imageUrls={[
+                {
+                  url: image as string
+                }
+              ]}
+            />
           )}
         </View>
       </BaseDialog>

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

@@ -17,23 +17,30 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React from "react";
-import { Linking, ScrollView, useWindowDimensions, View } from "react-native";
+import {
+  Linking,
+  ScrollView,
+  TouchableOpacity,
+  useWindowDimensions,
+  View
+} from "react-native";
 import { SwiperFlatList } from "react-native-swiper-flatlist";
+import Icon from "react-native-vector-icons/MaterialCommunityIcons";
+import { getElevationStyle } from "../../utils/elevation";
 import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
-import { eSendEvent } from "../../services/event-manager";
-import Navigation from "../../services/navigation";
 import SettingsService from "../../services/settings";
 import { useSettingStore } from "../../stores/use-setting-store";
-import { getElevationStyle } from "../../utils/elevation";
-import { eOpenLoginDialog } from "../../utils/events";
 import { SIZE } from "../../utils/size";
-import { AuthMode } from "../auth";
 import { Button } from "../ui/button";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
+import Navigation from "../../services/navigation";
+import { eOpenLoginDialog } from "../../utils/events";
+import { AuthMode } from "../auth";
+import { eSendEvent } from "../../services/event-manager";
+import { strings } from "@notesnook/intl";
 
 const Intro = ({ navigation }) => {
   const { colors } = useThemeColors();
@@ -83,7 +90,7 @@ const Intro = ({ navigation }) => {
         >
           {item.headings?.map((heading) => (
             <Heading
-              key={heading()}
+              key={heading}
               style={{
                 marginBottom: 5
               }}
@@ -128,6 +135,7 @@ const Intro = ({ navigation }) => {
         style={{
           width: deviceMode !== "mobile" ? width / 2 : "100%",
           backgroundColor: colors.secondary.background,
+          marginBottom: 20,
           borderBottomWidth: 1,
           borderBottomColor: colors.primary.border,
           alignSelf: deviceMode !== "mobile" ? "center" : undefined,
@@ -137,7 +145,7 @@ const Intro = ({ navigation }) => {
           marginTop: deviceMode !== "mobile" ? 50 : null,
           paddingTop: insets.top + 10,
           paddingBottom: insets.top + 10,
-          minHeight: height * 0.7 - (insets.top + insets.bottom)
+          minHeight: height * 0.7
         }}
       >
         <SwiperFlatList

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

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

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

@@ -76,8 +76,7 @@ const NoteItem = ({
 }: NoteItemProps) => {
   const isEditingNote = useTabStore(
     (state) =>
-      state.tabs.find((t) => t.id === state.currentTab)?.session?.noteId ===
-      item.id
+      state.tabs.find((t) => t.id === state.currentTab)?.noteId === item.id
   );
   const { colors } = useThemeColors();
   const compactMode = useIsCompactModeEnabled(

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

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

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

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

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

@@ -28,8 +28,7 @@ export const Filler = ({ item, color }: { item: Item; color?: string }) => {
   const { colors } = useThemeColors();
   const isEditingNote = useTabStore(
     (state) =>
-      state.tabs.find((t) => t.id === state.currentTab)?.session?.noteId ===
-      item.id
+      state.tabs.find((t) => t.id === state.currentTab)?.noteId === item.id
   );
 
   const [selected] = useIsSelected(item);

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

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

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

@@ -34,13 +34,12 @@ import {
   Reminder,
   Tag,
   TrashItem,
-  VirtualizedGrouping,
-  getSortValue
+  VirtualizedGrouping
 } from "@notesnook/core";
+import { getSortValue } from "@notesnook/core";
 import React, { useCallback, useEffect, useRef, useState } from "react";
 import { View } from "react-native";
 import { db } from "../../common/database";
-import { useIsCompactModeEnabled } from "../../hooks/use-is-compact-mode-enabled";
 import { eSendEvent } from "../../services/event-manager";
 import { RouteName } from "../../stores/use-navigation-store";
 import { eOpenJumpToDialog } from "../../utils/events";
@@ -49,6 +48,7 @@ import { NoteWrapper } from "../list-items/note/wrapper";
 import { NotebookWrapper } from "../list-items/notebook/wrapper";
 import ReminderItem from "../list-items/reminder";
 import TagItem from "../list-items/tag";
+import { useIsCompactModeEnabled } from "../../hooks/use-is-compact-mode-enabled";
 
 type ListItemWrapperProps<TItem = Item> = {
   group?: GroupingKey;
@@ -153,7 +153,9 @@ export function ListItemWrapper(props: ListItemWrapperProps) {
           },
           items?.cacheItem(index) ? 100 : 0
         );
-      } catch (e) {}
+      } catch (e) {
+        console.log("Error", e);
+      }
     })();
   }, [index, items, refreshItem]);
 
@@ -295,6 +297,7 @@ function getDate(item: Item, groupType?: GroupingKey): number {
       groupType
         ? db.settings.getGroupOptions(groupType)
         : {
+            groupBy: "default",
             sortBy: "dateEdited",
             sortDirection: "desc"
           },

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

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

apps/mobile/app/components/premium/pricing-plans.tsx

@@ -119,6 +119,7 @@ export const PricingPlans = ({
       setLoading(false);
     } catch (e) {
       setLoading(false);
+      console.log("error getting sku", e);
     }
   }, [promo?.promoCode]);
 
@@ -128,10 +129,7 @@ export const PricingPlans = ({
       if (code.startsWith("com.streetwriters.notesnook")) {
         skuId = code;
       } else {
-        skuId = await db.offers?.getCode(
-          code.split(":")[0],
-          Platform.OS as "ios" | "android"
-        );
+        skuId = await db.offers?.getCode(code.split(":")[0], Platform.OS);
       }
 
       const products = await PremiumService.getProducts();
@@ -170,6 +168,7 @@ export const PricingPlans = ({
       });
       return true;
     } catch (e) {
+      console.log("PROMOCODE ERROR:", code, e);
       return false;
     }
   };
@@ -229,6 +228,7 @@ export const PricingPlans = ({
       });
     } catch (e) {
       setBuying(false);
+      console.log(e);
     }
   };
 

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

@@ -141,7 +141,7 @@ export const Properties = ({ close = () => {}, item, buttons = [] }) => {
                     close();
                     eSendEvent(eOnLoadNote, {
                       item: item,
-                      newTab: true
+                      presistTab: true
                     });
                     if (!DDS.isTab) {
                       tabBarRef.current?.goToPage(1);

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

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

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

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

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

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

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

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

apps/mobile/app/components/sheets/add-to/notebook-item.tsx

@@ -90,12 +90,13 @@ export const NotebookItem = ({
       for (const key in keys) {
         nextState[key] = !state.initialState[key] ? undefined : "deselected";
       }
-
+      console.log("Single item selection");
       state.setSelection({
         [item.id]: "selected",
         ...nextState
       });
     } else {
+      console.log("Multi item selection");
       state.markAs(item, "selected");
     }
   };

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

@@ -134,10 +134,8 @@ export const ChangeEmail = ({ close }: ChangeEmailProps) => {
         ) : (
           <>
             <Input
-              key="code-input"
               fwdRef={codeInputRef}
-              placeholder={strings.code()}
-              defaultValue=""
+              placeholder={strings.verifyNewEmail()}
               onChangeText={(code) => {
                 emailChangeData.current.code = code;
               }}

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

@@ -16,8 +16,8 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { EVENTS, Note } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
+import { Note } from "@notesnook/core";
+import { EVENTS } from "@notesnook/core";
 import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect } from "react";
 import { View } from "react-native";
@@ -25,18 +25,27 @@ import { FlatList } from "react-native-actions-sheet";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { db } from "../../../common/database";
 import { useDBItem } from "../../../hooks/use-db-item";
-import {
-  TabItem,
-  useTabStore
-} from "../../../screens/editor/tiptap/use-tab-store";
+import { useTabStore } from "../../../screens/editor/tiptap/use-tab-store";
 import { editorController } from "../../../screens/editor/tiptap/utils";
 import { eSendEvent, presentSheet } from "../../../services/event-manager";
 import { eUnlockNote } from "../../../utils/events";
 import { SIZE } from "../../../utils/size";
+import { Button } from "../../ui/button";
 import { IconButton } from "../../ui/icon-button";
 import { Pressable } from "../../ui/pressable";
 import Heading from "../../ui/typography/heading";
 import Paragraph from "../../ui/typography/paragraph";
+import { strings } from "@notesnook/intl";
+
+type TabItem = {
+  id: number;
+  noteId?: string;
+  previewTab?: boolean;
+  locked?: boolean;
+  noteLocked?: boolean;
+  readonly?: boolean;
+  pinned?: boolean;
+};
 
 const TabItemComponent = (props: {
   tab: TabItem;
@@ -44,7 +53,7 @@ const TabItemComponent = (props: {
   close?: (ctx?: string | undefined) => void;
 }) => {
   const { colors } = useThemeColors();
-  const [item, update] = useDBItem(props.tab.session?.noteId, "note");
+  const [item, update] = useDBItem(props.tab.noteId, "note");
 
   useEffect(() => {
     const syncCompletedSubscription = db.eventManager?.subscribe(
@@ -76,11 +85,11 @@ const TabItemComponent = (props: {
       onPress={() => {
         if (!props.isFocused) {
           useTabStore.getState().focusTab(props.tab.id);
-          if (props.tab.session?.locked) {
+          if (props.tab.locked) {
             eSendEvent(eUnlockNote);
           }
 
-          if (!props.tab.session?.noteId) {
+          if (!props.tab.noteId) {
             setTimeout(() => {
               editorController?.current?.commands?.focus(props.tab.id);
             }, 300);
@@ -88,6 +97,11 @@ const TabItemComponent = (props: {
         }
         props.close?.();
       }}
+      onLongPress={() => {
+        useTabStore.getState().updateTab(props.tab.id, {
+          previewTab: false
+        });
+      }}
     >
       <View
         style={{
@@ -98,9 +112,9 @@ const TabItemComponent = (props: {
           flexShrink: 1
         }}
       >
-        {props.tab.session?.noteLocked ? (
+        {props.tab.noteLocked ? (
           <>
-            {props.tab.session?.locked ? (
+            {props.tab.locked ? (
               <Icon size={SIZE.md} name="lock" />
             ) : (
               <Icon size={SIZE.md} name="lock-open-outline" />
@@ -108,9 +122,7 @@ const TabItemComponent = (props: {
           </>
         ) : null}
 
-        {props.tab.session?.readonly ? (
-          <Icon size={SIZE.md} name="pencil-lock" />
-        ) : null}
+        {props.tab.readonly ? <Icon size={SIZE.md} name="pencil-lock" /> : null}
 
         <Paragraph
           color={
@@ -118,10 +130,15 @@ const TabItemComponent = (props: {
               ? colors.selected.paragraph
               : colors.primary.paragraph
           }
+          style={{
+            fontFamily: props.tab.previewTab
+              ? "OpenSans-Italic"
+              : "OpenSans-Regular"
+          }}
           numberOfLines={1}
           size={SIZE.md}
         >
-          {props.tab.session?.noteId
+          {props.tab.noteId
             ? item?.title || strings.untitledNote()
             : strings.newNote()}
         </Paragraph>
@@ -140,7 +157,8 @@ const TabItemComponent = (props: {
           color={props.tab.pinned ? colors.primary.accent : colors.primary.icon}
           onPress={() => {
             useTabStore.getState().updateTab(props.tab.id, {
-              pinned: !props.tab.pinned
+              pinned: !props.tab.pinned,
+              previewTab: false
             });
           }}
           top={0}
@@ -179,7 +197,6 @@ export default function EditorTabs({
 }: {
   close?: (ctx?: string | undefined) => void;
 }) {
-  const { colors } = useThemeColors();
   const [tabs, currentTab] = useTabStore((state) => [
     state.tabs,
     state.currentTab
@@ -216,13 +233,25 @@ export default function EditorTabs({
         }}
       >
         <Heading size={SIZE.lg}>{strings.tabs()}</Heading>
-        <IconButton
+        <Button
           onPress={() => {
             useTabStore.getState().newTab();
+            setTimeout(() => {
+              editorController?.current?.commands?.focus(
+                useTabStore.getState().currentTab
+              );
+            }, 500);
             close?.();
           }}
-          name="plus"
-          color={colors.primary.accent}
+          title={strings.newTab()}
+          icon="plus"
+          style={{
+            flexDirection: "row",
+            justifyContent: "flex-start",
+            borderRadius: 100,
+            height: 35
+          }}
+          iconSize={SIZE.lg}
         />
       </View>
 

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

@@ -171,7 +171,7 @@ const ExportNotesSheet = ({
           >
             <DialogHeader
               icon="export"
-              title={strings.exportNotes(ids.length)}
+              title={`${strings.export()} ${strings.notes(ids.length)}`}
             />
           </View>
 
@@ -333,17 +333,13 @@ const ExportNotesSheet = ({
                     if (Platform.OS === "ios") {
                       Share.open({
                         url: result?.fileDir + result.fileName
-                      }).catch(() => {
-                        /* empty */
-                      });
+                      }).catch(console.log);
                     } else {
                       FileViewer.open(result.filePath, {
                         showOpenWithDialog: true,
                         showAppsSuggestions: true,
                         shareFile: true
-                      } as any).catch(() => {
-                        /* empty */
-                      });
+                      } as any).catch(console.log);
                     }
                   }}
                 />

apps/mobile/app/components/sheets/export-notes/share.js

@@ -62,9 +62,7 @@ export const ShareComponent = ({ uri, name, padding }) => {
             showOpenWithDialog: true,
             showAppsSuggestions: true,
             shareFile: true
-          }).catch(() => {
-            /* empty */
-          });
+          }).catch(console.log);
         }}
       />
     </View>

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

@@ -22,22 +22,24 @@ import {
   VirtualizedGrouping,
   createInternalLink
 } from "@notesnook/core";
-import type { LinkAttributes } from "@notesnook/editor";
-import { NativeEvents } from "@notesnook/editor-mobile/src/utils/native-events";
-import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect, useRef, useState } from "react";
 import { TextInput, View } from "react-native";
 import { FlatList } from "react-native-actions-sheet";
 import { db } from "../../../common/database";
 import { useDBItem } from "../../../hooks/use-db-item";
-import { editorController } from "../../../screens/editor/tiptap/utils";
 import { presentSheet } from "../../../services/event-manager";
 import { SIZE } from "../../../utils/size";
 import { Button } from "../../ui/button";
 import Input from "../../ui/input";
 import { Pressable } from "../../ui/pressable";
 import Paragraph from "../../ui/typography/paragraph";
+import type { LinkAttributes } from "@notesnook/editor";
+import {
+  EditorEvents,
+  editorController
+} from "../../../screens/editor/tiptap/utils";
+import { strings } from "@notesnook/intl";
 
 const ListNoteItem = ({
   id,
@@ -192,7 +194,7 @@ export default function LinkNote(props: {
           }
         : undefined
     );
-    editorController.current?.postMessage(NativeEvents.resolve, {
+    editorController.current?.postMessage(EditorEvents.resolve, {
       data: {
         href: link,
         title: selectedNote.title

apps/mobile/app/components/sheets/manage-tags/index.tsx

@@ -113,9 +113,11 @@ const ManageTagsSheet = (props: {
         .sorted()
         .then((items) => {
           setTags(items);
+          console.log("searched tags");
         });
     } else {
       db.tags.all.sorted(db.settings.getGroupOptions("tags")).then((items) => {
+        console.log("items loaded tags", items.placeholders.length);
         setTags(items);
       });
     }

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

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