global: replace npm and npx with bun

.githooks/commit-msg

@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+node scripts/lint-commit.mjs "$1"

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

@@ -1,29 +1,9 @@
-name: "Setup node with cache action"
-description: "Setups node with cache"
+name: "Setup bun"
+description: "Setups bun"
 
 runs:
   using: "composite"
   steps:
-    - name: Setup Node
-      uses: actions/setup-node@v4
+    - uses: oven-sh/setup-bun@v2
       with:
-        node-version: 22.x
-        cache: "npm"
-        cache-dependency-path: |
-          package-lock.json
-          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
-          packages/sodium/package-lock.json
-          packages/clipper/package-lock.json
-          packages/editor-mobile/package-lock.json
-          packages/editor/package-lock.json
-          packages/logger/package-lock.json
-          packages/streamable-fs/package-lock.json
-          packages/theme/package-lock.json
-          packages/intl/package-lock.json
+        bun-version: latest

.github/workflows/android.e2e.yml

@@ -29,8 +29,8 @@ jobs:
 
       - name: Install node modules
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=mobile
+          bun ci
+          bun run bootstrap -- --scope=mobile
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
@@ -47,11 +47,6 @@ jobs:
       - name: Install Detox CLI
         run: npm install detox-cli --global
 
-      - name: Check for typescript errors
-        run: |
-          cd apps/mobile
-          npx tsc --noEmit
-
       - name: Detox build
         run: |
           yarn build:android

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

@@ -27,8 +27,8 @@ jobs:
 
       - name: Install node modules
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=mobile
+          bun ci
+          bun run bootstrap -- --scope=mobile
 
       - name: Make Gradlew Executable
         run: cd apps/mobile/native/android && chmod +x ./gradlew
@@ -73,12 +73,6 @@ jobs:
       - name: CCache Stats Before Build
         run: ccache -sv
 
-      - name: Check for typescript errors
-        run: |
-          npm run tx mobile:build
-          cd apps/mobile
-          npx tsc --noEmit
-
       - name: Build unsigned app bundle
         run: yarn release:android:bundle
 

.github/workflows/android.publish.yml

@@ -27,8 +27,8 @@ jobs:
 
       - name: Install node modules
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=mobile
+          bun ci
+          bun run bootstrap -- --scope=mobile
 
       - name: Make Gradlew Executable
         run: cd apps/mobile/native/android && chmod +x ./gradlew
@@ -73,12 +73,6 @@ jobs:
       - name: CCache Stats Before Build
         run: ccache -sv
 
-      - name: Check for typescript errors
-        run: |
-          npm run tx mobile:build
-          cd apps/mobile
-          npx tsc --noEmit
-
       - name: Build unsigned app bundle
         run: yarn release:android:bundle
 

.github/workflows/core.tests.yml

@@ -44,8 +44,8 @@ jobs:
 
       - name: Prepare environment
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=core
+          bun ci
+          bun run bootstrap -- --scope=core
       - name: Add environment variables
         run: |
           echo "USER_EMAIL=${{ secrets.USER_EMAIL }}" >> $GITHUB_ENV
@@ -54,4 +54,4 @@ jobs:
           echo "USER_HASHED_PASSWORD=${{ secrets.USER_HASHED_PASSWORD }}" >> $GITHUB_ENV
 
       - name: Run all @notesnook/core tests
-        run: npm run tx @notesnook/core:test:e2e
+        run: bun tx @notesnook/core:test:e2e

.github/workflows/desktop.publish.yml

@@ -55,27 +55,27 @@ jobs:
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=web
-          npm run bootstrap -- --scope=desktop
+          bun ci
+          bun run bootstrap -- --scope=web
+          bun 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
+          bun i --cpu arm64 sqlite-better-trigram
+          bun i --cpu x64 sqlite-better-trigram
         working-directory: ./apps/desktop
 
       - name: Generate desktop build (stable)
         if: ${{ inputs.release-track == 'stable' }}
-        run: npm run tx @notesnook/web:build:desktop
+        run: bun tx @notesnook/web:build:desktop
 
       - name: Generate desktop build (beta)
         if: ${{ inputs.release-track == 'beta' }}
-        run: BETA=true npm run tx @notesnook/web:build:desktop
+        run: BETA=true bun tx @notesnook/web:build:desktop
 
       - name: Build desktop bundle
         working-directory: ./apps/desktop
-        run: npm run bundle
+        run: bun run bundle
 
       - name: Archive build artifact
         uses: actions/upload-artifact@v4
@@ -115,7 +115,7 @@ jobs:
           cd /tmp/flatpak-builder-tools/node
           pipx install .
           cd -
-          node scripts/generate-sources.mjs
+          bun run scripts/generate-sources.mjs
 
       - name: Upload flatpak sources
         uses: softprops/action-gh-release@v1
@@ -176,13 +176,13 @@ jobs:
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
+          bun ci
+          bun 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
+          bun i --cpu arm64 sqlite-better-trigram
+          bun i --cpu x64 sqlite-better-trigram
         working-directory: ./apps/desktop
 
       - name: Install provisioning profile
@@ -195,7 +195,7 @@ jobs:
           CSC_LINK: ${{ secrets.mac_certs }}
           CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }}
         run: |
-          npm run tx @notesnook/desktop:release -- --variant=mas
+          bun tx @notesnook/desktop:release -- --variant=mas
           cd apps/desktop
           yarn electron-builder --config=electron-builder.config.js --mac mas --universal -p never
 
@@ -208,7 +208,7 @@ jobs:
           APPLE_API_KEY_ID: ${{ secrets.api_key_id }}
           APPLE_API_ISSUER: ${{ secrets.api_key_issuer_id }}
         run: |
-          npm run tx @notesnook/desktop:release
+          bun tx @notesnook/desktop:release
           cd apps/desktop
           if [ ${{ inputs.publish-github }} == true ]; then
             yarn electron-builder --config=electron-builder.config.js --mac zip dmg --arm64 --x64 -p always
@@ -258,16 +258,16 @@ jobs:
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
+          bun ci
+          bun run bootstrap -- --scope=desktop
 
       - name: Install sqlite-better-trigram for all arch
         run: |
-          npm i --cpu x64 sqlite-better-trigram
+          bun i --cpu x64 sqlite-better-trigram
         working-directory: ./apps/desktop
 
       - name: Build Electron wrapper
-        run: npm run tx @notesnook/desktop:release
+        run: bun tx @notesnook/desktop:release
 
       - name: Build snap
         if: inputs.publish-snap
@@ -325,16 +325,16 @@ jobs:
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
+          bun ci
+          bun run bootstrap -- --scope=desktop
 
       - name: Install sqlite-better-trigram for all arch
         run: |
-          npm i --cpu arm64 sqlite-better-trigram
+          bun i --cpu arm64 sqlite-better-trigram
         working-directory: ./apps/desktop
 
       - name: Build Electron wrapper
-        run: npm run tx @notesnook/desktop:release
+        run: bun tx @notesnook/desktop:release
 
       # - name: Build snap
       #   if: inputs.publish-snap
@@ -389,20 +389,20 @@ jobs:
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
+          bun ci
+          bun 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
+          bun i --cpu arm64 sqlite-better-trigram
+          bun i --cpu x64 sqlite-better-trigram
 
-          npm i --cpu arm64 sqlite3-fts5-html
-          npm i --cpu x64 sqlite3-fts5-html
+          bun i --cpu arm64 sqlite3-fts5-html
+          bun i --cpu x64 sqlite3-fts5-html
         working-directory: ./apps/desktop
 
       - name: Build
-        run: node scripts/execute.mjs @notesnook/desktop:release
+        run: bun tx @notesnook/desktop:release
 
       - name: Publish
         env:

.github/workflows/desktop.tests.yml

@@ -30,11 +30,11 @@ jobs:
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=web
+          bun ci
+          bun run bootstrap -- --scope=web
 
       - name: Generate desktop build
-        run: npm run tx @notesnook/web:build:desktop
+        run: bun tx @notesnook/web:build:desktop
 
       - name: Archive build artifact
         uses: actions/upload-artifact@v4
@@ -62,19 +62,19 @@ jobs:
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
+          bun ci
+          bun run bootstrap -- --scope=desktop
 
       - name: Build Electron wrapper
-        run: npm run tx @notesnook/desktop:release
+        run: bun tx @notesnook/desktop:release
 
       - name: Build app
         run: |
-          yarn electron-builder --config=electron-builder.config.js --mac --dir --x64
+          bun electron-builder --config=electron-builder.config.js --mac --dir --x64
         working-directory: ./apps/desktop
 
       - name: Run tests x64
-        run: npm run test
+        run: bun run test
         working-directory: ./apps/desktop
 
       - name: Upload test results
@@ -105,19 +105,19 @@ jobs:
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
+          bun ci
+          bun run bootstrap -- --scope=desktop
 
       - name: Build Electron wrapper
-        run: npm run tx @notesnook/desktop:release
+        run: bun tx @notesnook/desktop:release
 
       - name: Build app
         run: |
-          yarn electron-builder --config=electron-builder.config.js --mac --dir --arm64
+          bun electron-builder --config=electron-builder.config.js --mac --dir --arm64
         working-directory: ./apps/desktop
 
       - name: Run tests arm64
-        run: npm run test
+        run: bun run test
         working-directory: ./apps/desktop
 
       - name: Upload test results
@@ -148,25 +148,25 @@ jobs:
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
+          bun ci
+          bun 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
+          bun i --cpu arm64 sqlite-better-trigram
+          bun i --cpu x64 sqlite-better-trigram
         working-directory: ./apps/desktop
 
       - name: Build Electron wrapper
-        run: npm run tx @notesnook/desktop:release
+        run: bun tx @notesnook/desktop:release
 
       - name: Build app
         run: |
-          yarn electron-builder --config=electron-builder.config.js --linux --dir --arm64 --x64
+          bun 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
+        run: xvfb-run --auto-servernum --server-args="-screen 0 1920x1080x24" -- bun run test
         working-directory: ./apps/desktop
 
       - name: Upload test results
@@ -197,16 +197,16 @@ jobs:
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
+          bun ci
+          bun 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
+          bun i --cpu arm64 sqlite-better-trigram
+          bun i --cpu x64 sqlite-better-trigram
 
-          npm i --cpu arm64 sqlite3-fts5-html
-          npm i --cpu x64 sqlite3-fts5-html
+          bun i --cpu arm64 sqlite3-fts5-html
+          bun i --cpu x64 sqlite3-fts5-html
         working-directory: ./apps/desktop
 
       - name: Build Electron wrapper
@@ -214,11 +214,11 @@ jobs:
 
       - name: Build app
         run: |
-          npx cross-env NOTESNOOK_STAGING=true yarn electron-builder --config=electron-builder.config.js --win --dir --arm64 --x64
+          bun exec "NOTESNOOK_STAGING=true bunx electron-builder --config=electron-builder.config.js --win --dir --arm64 --x64"
         working-directory: ./apps/desktop
 
       - name: Run tests
-        run: npm run test
+        run: bun run test
         working-directory: ./apps/desktop
 
       - name: Upload test results

.github/workflows/editor.tests.yml

@@ -35,11 +35,11 @@ jobs:
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=editor
+          bun ci
+          bun run bootstrap -- --scope=editor
 
       - name: Build editor
-        run: npm run tx @notesnook/editor:build
+        run: bun tx @notesnook/editor:build
 
       - name: Run all @notesnook/editor tests
-        run: npm run tx @notesnook/editor:test
+        run: bun tx @notesnook/editor:test

.github/workflows/help.publish.yml

@@ -19,6 +19,9 @@ jobs:
         with:
           toolchain: stable
 
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
       - name: Install docgen
         run: cargo install --git https://github.com/thecodrr/docgen
 
@@ -32,4 +35,4 @@ jobs:
           echo "CLOUDFLARE_API_TOKEN=${{ secrets.CLOUDFLARE_API_TOKEN }}" >> $GITHUB_ENV
 
       - name: Publish on Cloudflare Pages
-        run: npx --yes wrangler pages deploy --project-name notesnook-help ./docs/help/site/ --branch main
+        run: bun --silent wrangler pages deploy --project-name notesnook-help ./docs/help/site/ --branch main

.github/workflows/ios.publish.yml

@@ -21,11 +21,11 @@ jobs:
 
       - name: Install node modules
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=mobile
+          bun ci
+          bun run bootstrap -- --scope=mobile
 
       - name: Build packages
-        run: npm run tx @notesnook/mobile:build
+        run: bun tx @notesnook/mobile:build
 
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2.11
@@ -64,12 +64,6 @@ jobs:
           bundle install
           RCT_NEW_ARCH_ENABLED=0 bundle exec pod install
 
-      - name: Check for typescript errors
-        run: |
-          npm run tx mobile:build
-          cd apps/mobile
-          npx tsc --noEmit
-
       - name: CCache Stats Before Build
         run: ccache -sv
 

.github/workflows/monograph.publish.yml

@@ -29,8 +29,8 @@ jobs:
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=monograph
+          bun ci
+          bun run bootstrap -- --scope=monograph
 
       - name: Collect package metadata
         id: package_metadata
@@ -39,7 +39,7 @@ jobs:
           echo ::set-output name=app_version::$(cat package.json | jq -r .version)
 
       - name: Generate build
-        run: npm run tx @notesnook/monograph:build
+        run: bun tx @notesnook/monograph:build
 
       # Setup Buildx
       - name: Docker Setup Buildx

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

@@ -15,8 +15,8 @@ jobs:
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=themebuilder
+          bun ci
+          bun run bootstrap -- --scope=themebuilder
 
       - name: Setup environment
         run: |
@@ -24,7 +24,7 @@ jobs:
           echo "CLOUDFLARE_API_TOKEN=${{ secrets.CLOUDFLARE_API_TOKEN }}" >> $GITHUB_ENV
 
       - name: Generate build
-        run: npm run build:theme-builder
+        run: bun run build:theme-builder
 
       - name: Publish to Cloudflare Pages
-        run: npx --yes wrangler pages deploy --project-name=notesnook-theme-builder ./apps/theme-builder/build/
+        run: bunx --silent wrangler pages deploy --project-name=notesnook-theme-builder ./apps/theme-builder/build/

.github/workflows/vericrypt.publish.yml

@@ -15,8 +15,8 @@ jobs:
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=vericrypt
+          bun ci
+          bun run bootstrap -- --scope=vericrypt
 
       - name: Setup environment
         run: |
@@ -24,7 +24,7 @@ jobs:
           echo "CLOUDFLARE_API_TOKEN=${{ secrets.CLOUDFLARE_API_TOKEN }}" >> $GITHUB_ENV
 
       - name: Generate build
-        run: npm run build:vericrypt
+        run: bun run build:vericrypt
 
       - name: Publish on Cloudflare Pages
-        run: npx --yes wrangler pages deploy --project-name=vericrypt ./apps/vericrypt/build/
+        run: bunx --silent wrangler pages deploy --project-name=vericrypt ./apps/vericrypt/build/

.github/workflows/web.benchmarks.yml

@@ -24,17 +24,17 @@ jobs:
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=web
+          bun ci
+          bun run bootstrap -- --scope=web
 
       - name: Build
-        run: npm run build:web
+        run: bun run build:web
 
       - name: Install Playwright Browsers
-        run: npx playwright install chromium --with-deps
+        run: bunx playwright install chromium --with-deps
         working-directory: apps/web
 
       - name: Run benchmarks
         id: benchmark
-        run: node __bench__/app.bench.mjs
+        run: bun run __bench__/app.bench.mjs
         working-directory: apps/web

.github/workflows/web.publish.yml

@@ -25,8 +25,8 @@ jobs:
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=web
+          bun ci
+          bun run bootstrap -- --scope=web
 
       - name: Setup environment
         run: |
@@ -35,18 +35,18 @@ jobs:
 
       - name: Generate build (stable)
         if: ${{ inputs.release-track == 'stable' }}
-        run: npm run build:web
+        run: bun 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/
+        run: bunx --silent wrangler pages deploy --project-name=notesnook-app ./build/
 
       - name: Generate build (beta)
         if: ${{ inputs.release-track == 'beta' }}
-        run: npm run build:beta:web
+        run: bun 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/
+        run: bunx --silent wrangler pages deploy --branch=beta --project-name=notesnook-app-beta ./build/

.github/workflows/web.tests.yml

@@ -46,11 +46,11 @@ jobs:
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=web
+          bun ci
+          bun run bootstrap -- --scope=web
 
       - name: Generate test build
-        run: npm run build:test:web
+        run: bun run build:test:web
 
       - name: Archive build artifact
         uses: actions/upload-artifact@v4
@@ -81,14 +81,14 @@ jobs:
 
       - name: Install packages
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm install -D @playwright/test otplib dayjs @zip.js/zip.js
+          bun ci
+          bun add -D @playwright/test otplib dayjs @zip.js/zip.js
 
       - name: Validate build extraction
         run: ls -ld ./apps/web/build/index.html
 
       - name: Install Playwright Browsers
-        run: npx playwright install chromium --with-deps
+        run: bun playwright install chromium --with-deps
         working-directory: apps/web
 
       - name: Add environment variables
@@ -99,7 +99,7 @@ jobs:
           echo "USER_KEY=${{ secrets.USER_KEY }}" >> $GITHUB_ENV
 
       - name: Run tests
-        run: npx playwright test --shard=${{ matrix.shard }}/${{ strategy.job-total }}
+        run: bun playwright test --shard=${{ matrix.shard }}/${{ strategy.job-total }}
         working-directory: apps/web
 
       - name: Upload test results

.husky/commit-msg

@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npx commitlint --edit "$1"

apps/desktop/__tests__/utils.ts

@@ -139,7 +139,7 @@ export async function buildApp(version?: string) {
     ];
     if (version) args.push(`--c.extraMetadata.version=${version}`);
     try {
-      execSync(`npx ${args.join(" ")}`, {
+      execSync(`bun ${args.join(" ")}`, {
         stdio: IS_DEBUG ? "inherit" : "ignore",
         env: {
           ...process.env,

apps/desktop/package.json

@@ -2,7 +2,7 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "3.3.3",
+  "version": "3.3.1",
   "appAppleId": "1544027013",
   "private": true,
   "main": "./dist/cjs/index.js",
@@ -28,8 +28,8 @@
   "license": "GPL-3.0-or-later",
   "dependencies": {
     "@lingui/core": "5.1.2",
-    "@notesnook/intl": "file:../../packages/intl",
-    "@notesnook/ui": "file:../../packages/ui",
+    "@notesnook/intl": "link:@notesnook/intl",
+    "@notesnook/ui": "link:@notesnook/ui",
     "@trpc/client": "10.45.2",
     "@trpc/server": "10.45.2",
     "better-sqlite3-multiple-ciphers": "^12.4.1",
@@ -47,7 +47,7 @@
     "@types/node": "22.15.3",
     "@types/yargs": "^17.0.33",
     "chokidar": "^4.0.3",
-    "electron": "^37.0.0",
+    "electron": "^36.0.0",
     "electron-builder": "^26.0.12",
     "esbuild": "0.21.5",
     "node-abi": "^4.5.0",
@@ -66,13 +66,13 @@
     "@electron/node-gyp": "^10.2.0-electron.2"
   },
   "scripts": {
-    "start": "node scripts/dev.mjs",
-    "staging": "node scripts/build.mjs --run",
-    "release": "node scripts/build.mjs",
-    "build": "node ../../scripts/build.mjs",
+    "start": "bun scripts/dev.mjs",
+    "staging": "bun scripts/build.mjs --run",
+    "release": "bun scripts/build.mjs",
+    "build": "bun ../../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",
     "bundle:mas": "esbuild electron=./src/main.ts ./src/preload.ts --minify --external:electron --external:fsevents --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=true --define:RELEASE=true",
-    "postinstall": "patch-package",
+    "postinstall": "patch-package && bun run scripts/patch-better-sqlite3.mjs",
     "test": "vitest run"
   },
   "author": {

apps/desktop/scripts/build.mjs

@@ -51,7 +51,7 @@ console.log("removed build folder");
 if (args.rebuild || !existsSync(path.join(webAppPath, "build"))) {
   console.log("rebuilding...");
   await exec(
-    "node scripts/execute.mjs @notesnook/web:build:desktop",
+    "bun tx @notesnook/web:build:desktop",
     path.join(__dirname, "..", "..", "..")
   );
 }
@@ -64,18 +64,18 @@ await fs.cp(path.join(webAppPath, "build"), path.join(root, "build"), {
 });
 
 if (args.variant === "mas") {
-  await exec(`yarn run bundle:mas --outdir=${path.join(root, "build")}`);
+  await exec(`bun run bundle:mas --outdir=${path.join(root, "build")}`);
 } else {
-  await exec(`yarn run bundle --outdir=${path.join(root, "build")}`);
+  await exec(`bun run bundle --outdir=${path.join(root, "build")}`);
 }
 
 if (!skipTscBuild) {
-  await exec(`yarn run build`);
+  await exec(`bun run build`);
 }
 
 if (args.run) {
   await exec(
-    `yarn electron-builder --dir --${process.arch} --config=electron-builder.config.js`
+    `bun electron-builder --dir --${process.arch} --config=electron-builder.config.js`
   );
   if (process.platform === "win32") {
     await exec(`.\\output\\win-unpacked\\Notesnook.exe`);

apps/desktop/scripts/dev.mjs

@@ -55,13 +55,13 @@ async function onChange(first) {
   if (first) {
     await fs.rm("./build/", { force: true, recursive: true });
 
-    await exec("npm rebuild electron --verbose --foreground-scripts");
+    await exec("npm rebuild electron --foreground-scripts --verbose");
 
-    await exec("yarn electron-builder install-app-deps");
+    await exec("bun electron-builder install-app-deps");
   }
 
-  await exec(`yarn run bundle`);
-  await exec(`yarn run build`);
+  await exec(`bun run bundle`);
+  await exec(`bun run build`);
 
   if (await isBundleSame()) {
     console.log("Bundle is same. Doing nothing.");
@@ -70,9 +70,9 @@ async function onChange(first) {
 
   if (first) {
     await spawnAndWaitUntil(
-      ["npm", "run", "start:desktop"],
+      ["yarn", "run", "start:desktop"],
       path.join(__dirname, "..", "..", "web"),
-      (data) => data.includes("Network: use --host to expose")
+      (data) => data.includes("built in")
     );
   }
 
@@ -82,7 +82,7 @@ async function onChange(first) {
   }
 
   execAsync(
-    "yarn",
+    "bun",
     ["electron", path.join("build", "electron.js")],
     true,
     cleanup

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

@@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+import { execSync } from "child_process";
 import { readFile, rm, writeFile } from "fs/promises";
 import path from "path";
 import { fileURLToPath } from "url";

apps/desktop/src/main.ts

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import "./overrides";
-import { app, BrowserWindow, nativeTheme, shell, dialog } from "electron";
+import { app, BrowserWindow, nativeTheme, shell } from "electron";
 import { isDevelopment } from "./utils";
 import { registerProtocol, PROTOCOL_URL } from "./utils/protocol";
 import { configureAutoUpdater } from "./utils/autoupdater";
@@ -182,17 +182,6 @@ async function createWindow() {
 app.once("ready", async () => {
   console.info("App ready. Opening window.");
 
-  if (app.runningUnderARM64Translation) {
-    console.log("App is running under ARM64 translation");
-    dialog.showMessageBoxSync({
-      message:
-        "Notesnook detected that it is running under ARM64 translation. For the best performance, please download the ARM64 build of Notesnook from our website.",
-      type: "warning",
-      buttons: ["Okay"],
-      title: "Degraded Performance Warning"
-    });
-  }
-
   if (config.customDns) enableCustomDns();
   else disableCustomDns();
 

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

@@ -94,9 +94,7 @@ export async function encryptDatabaseKeyWithPassword(appLockPassword: string) {
 }
 
 export async function restoreDatabaseKeyToKeyChain(appLockPassword: string) {
-  const databaseKeyCipher: Cipher = CipherStorage.getMap(
-    DB_KEY_CIPHER
-  ) as Cipher;
+  const databaseKeyCipher: Cipher = CipherStorage.getMap(DB_KEY_CIPHER);
   const databaseKey = (await decrypt(
     {
       password: appLockPassword
@@ -137,9 +135,7 @@ export async function clearAppLockVerificationCipher() {
 
 export async function validateAppLockPassword(appLockPassword: string) {
   try {
-    const appLockCipher: Cipher = CipherStorage.getMap(
-      APPLOCK_CIPHER
-    ) as Cipher;
+    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);
@@ -163,9 +159,7 @@ export function clearDatabaseKey() {
 export async function getDatabaseKey(appLockPassword?: string) {
   if (DB_KEY) return DB_KEY;
   if (appLockPassword) {
-    const databaseKeyCipher: Cipher = CipherStorage.getMap(
-      "databaseKeyCipher"
-    ) as Cipher;
+    const databaseKeyCipher: Cipher = CipherStorage.getMap("databaseKeyCipher");
     const databaseKey = await decrypt(
       {
         password: appLockPassword
@@ -299,7 +293,7 @@ export async function deriveCryptoKey(data: SerializedKey) {
 
 export async function getCryptoKey() {
   try {
-    const keyCipher: Cipher = MMKV.getMap(USER_KEY_CIPHER) as Cipher;
+    const keyCipher: Cipher = MMKV.getMap(USER_KEY_CIPHER);
     if (!keyCipher) {
       DatabaseLogger.info("User key cipher is null");
       return undefined;

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

@@ -39,7 +39,7 @@ export async function setupDatabase(password?: string) {
   const key = await getDatabaseKey(password);
   if (!key) throw new Error(strings.databaseSetupFailed());
 
-  // const base = `http://192.168.100.92`;
+  // const base = `http://192.168.100.88`;
 
   // database.host({
   //   API_HOST: `${base}:5264`,

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

@@ -136,12 +136,6 @@ export const Storage: IStorage = {
   clear(): Promise<void> {
     return DefaultStorage.clear();
   },
-  generateCryptoKeyPair() {
-    throw new Error("Not implemented");
-  },
-  decryptAsymmetric() {
-    throw new Error("Not implemented");
-  },
   getAllKeys(): Promise<string[]> {
     return DefaultStorage.getAllKeys();
   },

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

@@ -38,6 +38,9 @@ export function hideAuth(context) {
     context === "intro"
   ) {
     Navigation.replace("FluidPanelsView");
+    setTimeout(() => {
+      Navigation.resetRootState();
+    }, 1000);
   } else {
     Navigation.goBack();
   }

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

@@ -39,7 +39,6 @@ import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { AuthHeader } from "./header";
 import { SignupContext } from "./signup-context";
-import SettingsService from "../../services/settings";
 
 const SignupSteps = {
   signup: 0,

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

@@ -99,7 +99,7 @@ export const useLogin = (
                   callback && callback(false);
                 } catch (e) {
                   callback && callback(false);
-                  if ((e as Error).message === "invalid_grant") {
+                  if (e.message === "invalid_grant") {
                     eSendEvent(eCloseSimpleDialog, "two_factor_verify");
                     setLoading(false);
                     setStep(LoginSteps.emailAuth);

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

@@ -35,35 +35,29 @@ import SheetProvider from "../sheet-provider";
 import RateAppSheet from "../sheets/rate-app";
 import RecoveryKeySheet from "../sheets/recovery-key";
 import Progress from "../dialogs/progress";
-import { useSettingStore } from "../../stores/use-setting-store";
 
 const DialogProvider = () => {
   const { colors } = useThemeColors();
-  const isAppLoading = useSettingStore((state) => state.isAppLoading);
 
   return (
     <>
       <AppLockPassword />
       <LoadingDialog />
+      <Dialog context="global" />
+      <AuthModal colors={colors} />
+      <MergeConflicts />
+      <RecoveryKeySheet colors={colors} />
       <SheetProvider />
       <SheetProvider context="sync_progress" />
-      <Dialog context="global" />
+      <ResultDialog />
+      <VaultDialog colors={colors} />
+      <RateAppSheet />
+      <ImagePreview />
+      <AnnouncementDialog />
+      <SessionExpired />
+      <PDFPreview />
+      <JumpToSectionDialog />
       <Progress />
-
-      {isAppLoading ? null : (
-        <>
-          <MergeConflicts />
-          <RecoveryKeySheet colors={colors} />
-          <ResultDialog />
-          <VaultDialog colors={colors} />
-          <RateAppSheet />
-          <ImagePreview />
-          <AnnouncementDialog />
-          <SessionExpired />
-          <PDFPreview />
-          <JumpToSectionDialog />
-        </>
-      )}
     </>
   );
 };

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

@@ -244,7 +244,7 @@ const PDFPreview = () => {
                       textAlign: "center",
                       marginRight: 4,
                       borderRadius: 3,
-                      fontFamily: "Inter-Regular"
+                      fontFamily: "OpenSans-Regular"
                     }}
                     selectTextOnFocus
                     keyboardType="decimal-pad"

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

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

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

@@ -117,8 +117,7 @@ export default function NotePreview({ session, content, note }) {
       {!session?.locked && !locked ? (
         <View
           style={{
-            flex: 1,
-            backgroundColor: colors.primary.background
+            flex: 1
           }}
         >
           <ReadonlyEditor

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

@@ -44,7 +44,6 @@ import Config from "react-native-config";
 import * as RNIap from "react-native-iap";
 import { SafeAreaView } from "react-native-safe-area-context";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
-//@ts-ignore
 import ToggleSwitch from "toggle-switch-react-native";
 import {
   ANDROID_POLICE_SVG,
@@ -920,6 +919,7 @@ const ReviewItem = (props: {
     </View>
   );
 };
+
 const PricingPlanCard = ({
   plan,
   pricingPlans,
@@ -932,6 +932,7 @@ const PricingPlanCard = ({
   setStep: (step: number) => void;
 }) => {
   const { colors } = useThemeColors();
+  const isFreePlan = plan.id === "free";
   const [regionalDiscount, setRegionaDiscount] = useState<SKUResponse>();
   const { width } = useWindowDimensions();
   const isTablet = width > 600;
@@ -941,22 +942,19 @@ const PricingPlanCard = ({
       regionalDiscount?.sku ||
         `notesnook.${plan.id}.${annualBilling ? "yearly" : "monthly"}`
     ];
+  const price = pricingPlans?.getPrice(
+    product as RNIap.Subscription,
+    pricingPlans.hasTrialOffer(plan.id, product?.productId) ? 1 : 0,
+    annualBilling
+  );
 
   const WebPlan = pricingPlans?.getWebPlan(
     plan.id,
     annualBilling ? "yearly" : "monthly"
   );
 
-  const price = pricingPlans?.getPrice(
-    pricingPlans.isGithubRelease && WebPlan
-      ? WebPlan
-      : (product as RNIap.Subscription),
-    pricingPlans.hasTrialOffer(plan.id, product?.productId) ? 1 : 0,
-    annualBilling
-  );
-
   useEffect(() => {
-    if (pricingPlans?.isGithubRelease || !annualBilling) return;
+    if (pricingPlans?.isGithubRelease) return;
     pricingPlans
       ?.getRegionalDiscount(
         plan.id,
@@ -967,13 +965,7 @@ const PricingPlanCard = ({
       .then((value) => {
         setRegionaDiscount(value);
       });
-  }, [annualBilling]);
-
-  useEffect(() => {
-    if (!annualBilling) {
-      setRegionaDiscount(undefined);
-    }
-  }, [annualBilling]);
+  }, []);
 
   const isSubscribed =
     product?.productId &&
@@ -1118,21 +1110,24 @@ const PricingPlanCard = ({
       ) : (
         <View>
           <Paragraph size={AppFontSize.lg}>
-            {price || `${WebPlan?.price?.currency} ${WebPlan?.price?.gross}`}{" "}
+            {isFreePlan
+              ? "0.00"
+              : price ||
+                `${WebPlan?.price?.currency} ${WebPlan?.price?.gross}`}{" "}
             <Paragraph>/{strings.month()}</Paragraph>
           </Paragraph>
 
-          {!product && !WebPlan ? null : (
+          {isFreePlan || !product ? null : (
             <Paragraph color={colors.secondary.paragraph} size={AppFontSize.xs}>
               {annualBilling
                 ? strings.billedAnnually(
                     pricingPlans?.getStandardPrice(
-                      (product || WebPlan) as any
+                      product as RNIap.Subscription
                     ) as string
                   )
                 : strings.billedMonthly(
                     pricingPlans?.getStandardPrice(
-                      (product || WebPlan) as any
+                      product as RNIap.Subscription
                     ) as string
                   )}
             </Paragraph>

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

@@ -21,13 +21,7 @@ import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import dayjs from "dayjs";
 import React, { useEffect, useState } from "react";
-import {
-  Linking,
-  ScrollView,
-  Text,
-  TouchableOpacity,
-  View
-} from "react-native";
+import { ScrollView, Text, TouchableOpacity, View } from "react-native";
 import Config from "react-native-config";
 import * as RNIap from "react-native-iap";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
@@ -66,24 +60,27 @@ export const BuyPlan = (props: {
   return checkoutUrl ? (
     <View
       style={{
-        flex: 1,
-        justifyContent: "center",
-        alignItems: "center",
-        gap: DefaultAppStyles.GAP_VERTICAL
+        flex: 1
       }}
     >
-      <Paragraph>{strings.finishPurchaseInBrowser()}</Paragraph>
-      <Button
-        title={strings.next()}
-        type="accent"
-        onPress={() => {
-          pricingPlans.finish();
+      <WebView
+        source={{
+          uri: checkoutUrl
         }}
-      />
-      <Button
-        title={strings.goBack()}
-        onPress={() => {
-          setCheckoutUrl(undefined);
+        onMessage={(message) => {
+          try {
+            const data = JSON.parse(message.nativeEvent.data);
+            if (data.success) {
+              pricingPlans.finish();
+            }
+          } catch (e) {}
+        }}
+        domStorageEnabled
+        javaScriptEnabled
+        cacheEnabled
+        enabled
+        style={{
+          flex: 1
         }}
       />
     </View>
@@ -248,14 +245,12 @@ export const BuyPlan = (props: {
           }
           onPress={async () => {
             if (isGithubRelease) {
-              const url = await db.subscriptions.checkoutUrl(
-                (pricingPlans.selectedProduct as Plan).plan,
-                (pricingPlans.selectedProduct as Plan).period
+              setCheckoutUrl(
+                await db.subscriptions.checkoutUrl(
+                  (pricingPlans.selectedProduct as Plan).plan,
+                  (pricingPlans.selectedProduct as Plan).period
+                )
               );
-              if (url) {
-                setCheckoutUrl(url);
-                Linking.openURL(url);
-              }
               return;
             }
 

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

@@ -39,7 +39,9 @@ import {
   presentSheet
 } from "../../../services/event-manager";
 import Exporter from "../../../services/exporter";
+import PremiumService from "../../../services/premium";
 import { useSettingStore } from "../../../stores/use-setting-store";
+import { useUserStore } from "../../../stores/use-user-store";
 import { getElevationStyle } from "../../../utils/elevation";
 import { AppFontSize, defaultBorderRadius } from "../../../utils/size";
 import { DefaultAppStyles } from "../../../utils/styles";
@@ -81,6 +83,7 @@ const ExportNotesSheet = ({
     type: "pdf" | "txt" | "md" | "html" | "md-frontmatter"
   ) => {
     if (exporting) return;
+    if (!PremiumService.get() && type !== "txt") return;
     setExporting(true);
     update?.({ disableClosing: true } as PresentSheetOptions);
     setComplete(false);
@@ -142,7 +145,8 @@ const ExportNotesSheet = ({
         await exportNoteAs("txt");
       },
       icon: "card-text",
-      id: notesnook.ids.dialogs.export.text
+      id: notesnook.ids.dialogs.export.text,
+      pro: true
     },
     {
       title: "HTML",
@@ -190,7 +194,8 @@ const ExportNotesSheet = ({
                   paddingVertical: DefaultAppStyles.GAP_VERTICAL,
                   justifyContent: "flex-start",
                   borderRadius: 0,
-                  paddingHorizontal: DefaultAppStyles.GAP
+                  paddingHorizontal: DefaultAppStyles.GAP,
+                  opacity: item.pro ? 1 : 0.5
                 }}
               >
                 <View

apps/mobile/app/components/sheets/github/issue.js

@@ -36,7 +36,6 @@ import Heading from "../../ui/typography/heading";
 import Paragraph from "../../ui/typography/paragraph";
 import { strings } from "@notesnook/intl";
 import { DefaultAppStyles } from "../../../utils/styles";
-import Config from "react-native-config";
 
 export const Issue = ({ defaultTitle, defaultBody, issueTitle }) => {
   const { colors } = useThemeColors();
@@ -68,8 +67,7 @@ App version: ${getVersion()}
 Platform: ${Platform.OS}
 Device: ${getBrand() || ""}-${getModel() || ""}-${getSystemVersion() || ""}
 Pro: ${PremiumService.get()}
-Logged in: ${user ? "yes" : "no"}
-Github Release: ${Config.GITHUB_RELEASE === "true" ? "Yes" : "No"}`,
+Logged in: ${user ? "yes" : "no"}`,
         userId: user?.id
       });
       if (!issueUrl.current) {
@@ -161,7 +159,7 @@ Github Release: ${Config.GITHUB_RELEASE === "true" ? "Yes" : "No"}`,
               borderColor: colors.primary.border,
               borderRadius: defaultBorderRadius,
               padding: DefaultAppStyles.GAP,
-              fontFamily: "Inter-Regular",
+              fontFamily: "OpenSans-Regular",
               marginBottom: DefaultAppStyles.GAP_VERTICAL,
               fontSize: AppFontSize.md,
               color: colors.primary.heading
@@ -194,7 +192,7 @@ Github Release: ${Config.GITHUB_RELEASE === "true" ? "Yes" : "No"}`,
               borderColor: colors.primary.border,
               borderRadius: defaultBorderRadius,
               padding: DefaultAppStyles.GAP,
-              fontFamily: "Inter-Regular",
+              fontFamily: "OpenSans-Regular",
               maxHeight: 200,
               fontSize: AppFontSize.sm,
               marginBottom: 2.5,

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

@@ -29,7 +29,6 @@ import {
   View
 } from "react-native";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
-//@ts-ignore
 import ToggleSwitch from "toggle-switch-react-native";
 import { db } from "../../../common/database";
 import { requestInAppReview } from "../../../services/app-review";

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

@@ -239,7 +239,7 @@ const Input = ({
     flexShrink: 1,
     paddingBottom: DefaultAppStyles.GAP_VERTICAL - 4,
     paddingTop: DefaultAppStyles.GAP_VERTICAL - 4,
-    fontFamily: "Inter-Regular",
+    fontFamily: "OpenSans-Regular",
     ...(inputStyle as ViewStyle)
   };
 

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

@@ -132,10 +132,7 @@ const SheetWrapper = ({
           width: 100,
           backgroundColor: colors.secondary.background
         }}
-        safeAreaInsets={{
-          ...insets,
-          bottom: Platform.OS === "android" ? 0 : insets.bottom
-        }}
+        safeAreaInsets={insets}
         statusBarTranslucent
         drawUnderStatusBar={true}
         containerStyle={style}

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

@@ -171,7 +171,7 @@ const onAppOpenedFromURL = async (event: { url: string }) => {
       eSendEvent(eOnLoadNote, { newNote: true });
       fluidTabsRef.current?.goToPage("editor", false);
       return;
-    } else if (url.startsWith("https://app.notesnook.com/open_note")) {
+    } else if (url.startsWith("https://notesnook.com/open_note")) {
       const id = new URL(url).searchParams.get("id");
       if (id) {
         const note = await db.notes.note(id);
@@ -182,13 +182,13 @@ const onAppOpenedFromURL = async (event: { url: string }) => {
           fluidTabsRef.current?.goToPage("editor", false);
         }
       }
-    } else if (url.startsWith("https://app.notesnook.com/open_reminder")) {
+    } else if (url.startsWith("https://notesnook.com/open_reminder")) {
       const id = new URL(url).searchParams.get("id");
       if (id) {
         const reminder = await db.reminders.reminder(id);
         if (reminder) AddReminder.present(reminder);
       }
-    } else if (url.startsWith("https://app.notesnook.com/new_reminder")) {
+    } else if (url.startsWith("https://notesnook.com/new_reminder")) {
       const reminderFeature = await isFeatureAvailable("activeReminders");
       if (!reminderFeature.isAllowed) {
         ToastManager.show({
@@ -780,11 +780,13 @@ export const useAppEvents = () => {
     if (!isAppLoading && !appLocked) {
       setTimeout(() => {
         sub = AppState.addEventListener("change", onAppStateChanged);
-        if (refValues.current.initialUrl) {
+        if (
+          refValues.current.initialUrl &&
+          !refValues.current.initialUrl?.includes("open_note")
+        ) {
           onAppOpenedFromURL({
             url: refValues.current.initialUrl!
           });
-          refValues.current.initialUrl = undefined;
         }
       }, 1000);
 

apps/mobile/app/hooks/use-feature-manager.ts

@@ -69,6 +69,36 @@ export default function useFeatureManager() {
         db.settings.setDefaultTag(undefined);
       }
     }
+    const isAppLocked = useUserStore.getState().appLocked;
+    let unsub: () => void;
+
+    if (isAppLocked) {
+      unsub = useUserStore.subscribe((state) => {
+        if (!state.appLocked && !features?.appLock?.isAllowed) {
+          unsub();
+          SettingsService.setProperty("appLockEnabled", false);
+          setTimeout(() => {
+            presentDialog({
+              title: "App Lock Disabled",
+              paragraph: features?.appLock?.error,
+              positiveText: strings.upgrade(),
+              negativeText: strings.cancel(),
+              positivePress: async () => {
+                eSendEvent(eCloseSimpleDialog);
+                if (SettingsService.getProperty("serverUrls")) return;
+                Navigation.navigate("PayWall", {
+                  context: "logged-in"
+                });
+              }
+            });
+          }, 1000);
+        }
+      });
+    }
+
+    return () => {
+      unsub?.();
+    };
   }, [features, plan]);
 
   return true;

apps/mobile/app/hooks/use-pricing-plans.ts

@@ -270,13 +270,11 @@ const usePricingPlans = (options?: PricingPlansOptions) => {
     if (Platform.OS === "android") {
       if (isGithubRelease) {
         if (!(product as Plan)?.price) return null;
-        return `${
-          (product as Plan).currencySymbol || (product as Plan).currency
-        } ${
+        return `${(product as Plan).price.currency} ${
           (product as Plan).period === "yearly"
-            ? (product as Plan).price.gross
+            ? ((product as Plan).price.gross / 12).toFixed(2)
             : (product as Plan).period === "5-year"
-            ? (product as Plan).price.gross
+            ? ((product as Plan).price.gross / (12 * 5)).toFixed(2)
             : (product as Plan).price.gross
         }`;
       }
@@ -601,9 +599,7 @@ const usePricingPlans = (options?: PricingPlansOptions) => {
 
     if (isGithubRelease) {
       if (!(product as Plan)?.price) return null;
-      return `${
-        (product as Plan).currencySymbol || (product as Plan).currency
-      } ${
+      return `${(product as Plan).price.currency} ${
         (product as Plan).period === "yearly"
           ? ((product as Plan).price.gross / 12).toFixed(2)
           : (product as Plan).period === "5-year"

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

@@ -0,0 +1,67 @@
+/*
+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 { useEffect, useState } from "react";
+import { Platform } from "react-native";
+import { Subscription } from "react-native-iap";
+import PremiumService from "../services/premium";
+import { db } from "../common/database";
+import { Product } from "@notesnook/core";
+
+const skuInfos: { [name: string]: Product | undefined } = {};
+
+export const usePricing = (period: "monthly" | "yearly") => {
+  const [current, setCurrent] = useState<{
+    period: string;
+    info?: Product;
+    product?: Subscription;
+  }>();
+
+  const getDefaultSku = (period: "monthly" | "yearly") => {
+    return period === "monthly"
+      ? "com.streetwriters.notesnook.sub.mo"
+      : "com.streetwriters.notesnook.sub.yr";
+  };
+
+  useEffect(() => {
+    (async () => {
+      const skuInfo =
+        skuInfos[period] ||
+        (await db.pricing?.sku(
+          Platform.OS === "android" ? "android" : "ios",
+          period
+        ));
+      skuInfos[period] = skuInfo;
+
+      const products = (await (
+        await PremiumService.loadProductsAndSubs()
+      ).subs) as Subscription[];
+      let product = products.find((p) => p.productId === skuInfo?.sku);
+      if (!product)
+        product = products.find((p) => p.productId === getDefaultSku(period));
+      setCurrent({
+        info: skuInfo,
+        period,
+        product
+      });
+    })();
+  }, [period]);
+
+  return current;
+};

apps/mobile/app/hooks/use-vault-status.ts

@@ -21,7 +21,6 @@ import React, { useCallback, useEffect } from "react";
 import { db } from "../common/database";
 import BiometricService from "../services/biometrics";
 import { eSubscribeEvent, eUnSubscribeEvent } from "../services/event-manager";
-import { useSettingStore } from "../stores/use-setting-store";
 
 const VaultStatusDefaults = {
   exists: false,
@@ -37,7 +36,6 @@ export type VaultStatusType = {
 
 export const useVaultStatus = () => {
   const [vaultStatus, setVaultStatus] = React.useState(VaultStatusDefaults);
-  const isAppLoading = useSettingStore((state) => state.isAppLoading);
 
   const checkVaultStatus = useCallback(() => {
     db.vault?.exists().then(async (exists) => {
@@ -52,13 +50,12 @@ export const useVaultStatus = () => {
   }, []);
 
   useEffect(() => {
-    if (isAppLoading) return;
     checkVaultStatus();
     eSubscribeEvent("vaultUpdated", () => checkVaultStatus());
     return () => {
       eUnSubscribeEvent("vaultUpdated", () => checkVaultStatus());
     };
-  }, [checkVaultStatus, isAppLoading]);
+  }, [checkVaultStatus]);
 
   return vaultStatus;
 };

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

@@ -258,14 +258,12 @@ export const RootNavigation = () => {
     (state) => state.settings.introCompleted
   );
   const clearSelection = useSelectionStore((state) => state.clearSelection);
-  const resetTimer = React.useRef<NodeJS.Timeout>(undefined);
   const onStateChange = React.useCallback(
     (state: any) => {
       if (useSelectionStore.getState().selectionMode) {
         clearSelection();
       }
-      clearTimeout(resetTimer.current);
-      resetTimer.current = setTimeout(() => {
+      setTimeout(() => {
         Navigation.resetRootState(state);
       }, 1000);
       hideAllTooltips();

apps/mobile/app/package.json

@@ -44,8 +44,7 @@
     "@trpc/react-query": "^10.45.2",
     "@trpc/server": "^10.45.2",
     "@tanstack/react-query": "^4.36.1",
-    "async-mutex": "0.5.0",
-    "react-async-hook": "^4.0.0"
+    "async-mutex": "0.5.0"
   },
   "sideEffects": false
 }

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

@@ -49,7 +49,6 @@ import { AppFontSize, defaultBorderRadius } from "../../utils/size";
 import { DefaultAppStyles } from "../../utils/styles";
 import { getFormattedDate, useIsFeatureAvailable } from "@notesnook/common";
 import PaywallSheet from "../../components/sheets/paywall";
-import { useNavigationFocus } from "../../hooks/use-navigation-focus";
 
 const ReminderModes =
   Platform.OS === "ios"
@@ -90,7 +89,6 @@ const ReminderNotificationModes = {
 
 export default function AddReminder(props: NavigationProps<"AddReminder">) {
   const { reminder, reference } = props.route.params;
-  useNavigationFocus(props.navigation, { focusOnInit: true });
   const { colors, isDark } = useThemeColors();
   const [reminderMode, setReminderMode] = useState<Reminder["mode"]>(
     reminder?.mode || "once"

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

@@ -61,7 +61,6 @@ import {
 import { fluidTabsRef } from "../../utils/global-refs";
 import { strings } from "@notesnook/intl";
 import { i18n } from "@lingui/core";
-import { useVaultStatus } from "../../hooks/use-vault-status";
 
 const style: ViewStyle = {
   height: "100%",
@@ -198,7 +197,6 @@ const Editor = React.memo(
 export default Editor;
 
 const useLockedNoteHandler = () => {
-  const vaultStatus = useVaultStatus();
   const tab = useTabStore((state) => state.getTab(state.currentTab));
   const tabRef = useRef(tab);
   tabRef.current = tab;
@@ -219,13 +217,15 @@ const useLockedNoteHandler = () => {
 
   useEffect(() => {
     (async () => {
+      const biometry = await BiometricService.isBiometryAvailable();
+      const fingerprint = await BiometricService.hasInternetCredentials();
       useTabStore.setState({
-        biometryAvailable: !!vaultStatus.isBiometryAvailable,
-        biometryEnrolled: !!vaultStatus.biometryEnrolled
+        biometryAvailable: !!biometry,
+        biometryEnrolled: !!fingerprint
       });
       syncTabs("biometry");
     })();
-  }, [tab?.id, vaultStatus.biometryEnrolled, vaultStatus.isBiometryAvailable]);
+  }, [tab?.id]);
 
   useEffect(() => {
     const unlockWithBiometrics = async () => {

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

@@ -59,7 +59,6 @@ export type Settings = {
   fontScale: number;
   markdownShortcuts: boolean;
   features: Record<any, any>;
-  loggedIn: boolean;
 };
 
 export type EditorProps = {

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

@@ -82,7 +82,6 @@ import { editorState, openInternalLink } from "./utils";
 import AddReminder from "../../add-reminder";
 import { isFeatureAvailable, useAreFeaturesAvailable } from "@notesnook/common";
 import PaywallSheet from "../../../components/sheets/paywall";
-import useNavigationStore from "../../../stores/use-navigation-store";
 
 const publishNote = async () => {
   const user = useUserStore.getState().user;
@@ -165,7 +164,6 @@ export const useEditorEvents = (
     state.timeFormat
   ]);
   const handleBack = useRef<NativeEventSubscription>();
-  const loggedIn = useUserStore((state) => !!state.user);
   const { fontScale } = useWindowDimensions();
 
   const doubleSpacedLines = useSettingStore(
@@ -225,8 +223,7 @@ export const useEditorEvents = (
       timeFormat: db.settings?.getTimeFormat(),
       fontScale,
       markdownShortcuts,
-      features,
-      loggedIn
+      features
     });
   }, [
     fullscreen,
@@ -244,8 +241,7 @@ export const useEditorEvents = (
     timeFormat,
     loading,
     fontScale,
-    markdownShortcuts,
-    loggedIn
+    markdownShortcuts
   ]);
 
   const onBackPress = useCallback(async () => {
@@ -278,15 +274,7 @@ export const useEditorEvents = (
 
   const onHardwareBackPress = useCallback(() => {
     if (fluidTabsRef.current?.page() === "editor") {
-      if (
-        useNavigationStore.getState().currentRoute === "ManageTags" ||
-        useNavigationStore.getState().currentRoute === "LinkNotebooks" ||
-        useNavigationStore.getState().currentRoute === "AddReminder"
-      ) {
-        Navigation.goBack();
-      } else {
-        onBackPress();
-      }
+      onBackPress();
       return true;
     }
   }, [onBackPress]);
@@ -559,17 +547,9 @@ export const useEditorEvents = (
           if (editor.state.current?.isFocused) {
             editor.state.current.isFocused = true;
           }
-          if (editorMessage.value.feature === "insertAttachment") {
-            ToastManager.show({
-              type: "info",
-              message: strings.loginRequired()
-            });
-          } else {
-            PaywallSheet.present(
-              await isFeatureAvailable(editorMessage.value.feature)
-            );
-          }
-
+          PaywallSheet.present(
+            await isFeatureAvailable(editorMessage.value.feature)
+          );
           break;
         case EditorEvents.monograph:
           publishNote();

apps/mobile/app/screens/search/search-bar.tsx

@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
-import React, { useRef, useState } from "react";
+import React, { useRef } from "react";
 import { View } from "react-native";
 import { TextInput } from "react-native-gesture-handler";
 import { IconButton } from "../../components/ui/icon-button";
@@ -36,7 +36,6 @@ export const SearchBar = ({
   onChangeText: (value: string) => void;
   loading?: boolean;
 }) => {
-  const [clearButton, setClearButton] = useState(false);
   const selectionMode = useSelectionStore((state) => state.selectionMode);
   const isFocused = useNavigationStore(
     (state) => state.focusedRouteId === "Search"
@@ -46,7 +45,6 @@ export const SearchBar = ({
   const inputRef = useRef<TextInput>(null);
   const _onChangeText = (value: string) => {
     onChangeText(value);
-    setClearButton(!!value);
   };
 
   return selectionMode && isFocused ? null : (
@@ -86,7 +84,7 @@ export const SearchBar = ({
           testID="search-input"
           style={{
             fontSize: AppFontSize.sm,
-            fontFamily: "Inter-Regular",
+            fontFamily: "OpenSans-Regular",
             flexGrow: 1,
             color: colors.primary.paragraph,
             paddingTop: 0,
@@ -102,23 +100,6 @@ export const SearchBar = ({
           autoCorrect={false}
           placeholderTextColor={colors.primary.placeholder}
         />
-
-        {clearButton ? (
-          <IconButton
-            name="close"
-            size={AppFontSize.xxl}
-            top={10}
-            testID="clear-search"
-            bottom={10}
-            onPress={() => {
-              inputRef.current?.clear();
-              onChangeText("");
-              setClearButton(false);
-            }}
-            color={colors.primary.paragraph}
-            type="plain"
-          />
-        ) : null}
       </View>
     </View>
   );

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

@@ -43,7 +43,6 @@ import { ServersConfiguration } from "./server-config";
 import SoundPicker from "./sound-picker";
 import ThemeSelector from "./theme-selector";
 import { TitleFormat } from "./title-format";
-import { NotesnookCircle } from "./notesnook-circle";
 
 export const components: { [name: string]: ReactElement } = {
   homeselector: <HomePicker />,
@@ -70,6 +69,5 @@ export const components: { [name: string]: ReactElement } = {
   ),
   "sidebar-tab-selector": <SidebarTabPicker />,
   "change-password": <ChangePassword />,
-  "change-email": <ChangeEmail />,
-  "notesnook-circle": <NotesnookCircle />
+  "change-email": <ChangeEmail />
 };

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

@@ -185,7 +185,7 @@ export default function DebugLogs() {
       paragraph: strings.clearLogsConfirmation(currentLog.key),
       negativeText: strings.cancel(),
       positiveText: strings.clear(),
-      positivePress: async () => {
+      positivePress: () => {
         const index = logs.findIndex((l) => (l.key = currentLog.key));
         logManager?.delete(currentLog.key);
         if (logs.length > 1) {

apps/mobile/app/screens/settings/notesnook-circle.tsx

@@ -1,213 +0,0 @@
-import { CirclePartner, SubscriptionStatus } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
-import { useThemeColors } from "@notesnook/theme";
-import Clipboard from "@react-native-clipboard/clipboard";
-import { useState } from "react";
-import { useAsync } from "react-async-hook";
-import {
-  ActivityIndicator,
-  Image,
-  ScrollView,
-  TouchableOpacity,
-  View
-} from "react-native";
-import { db } from "../../common/database";
-import AppIcon from "../../components/ui/AppIcon";
-import { Button } from "../../components/ui/button";
-import { Notice } from "../../components/ui/notice";
-import Heading from "../../components/ui/typography/heading";
-import Paragraph from "../../components/ui/typography/paragraph";
-import { ToastManager } from "../../services/event-manager";
-import Navigation from "../../services/navigation";
-import PremiumService from "../../services/premium";
-import { useUserStore } from "../../stores/use-user-store";
-import { AppFontSize, defaultBorderRadius } from "../../utils/size";
-import { DefaultAppStyles } from "../../utils/styles";
-import { openLinkInBrowser } from "../../utils/functions";
-import { Pressable } from "../../components/ui/pressable";
-
-export const NotesnookCircle = () => {
-  const user = useUserStore((state) => state.user);
-  const isOnTrial =
-    PremiumService.get() &&
-    user?.subscription?.status === SubscriptionStatus.TRIAL;
-  const isFree = !PremiumService.get();
-  const partners = useAsync(db.circle.partners, []);
-
-  return (
-    <ScrollView
-      contentContainerStyle={{
-        gap: DefaultAppStyles.GAP_VERTICAL,
-        paddingHorizontal: DefaultAppStyles.GAP,
-        paddingTop: DefaultAppStyles.GAP_VERTICAL
-      }}
-    >
-      {!isFree && !isOnTrial ? null : (
-        <View>
-          <Paragraph>
-            {isFree
-              ? strings.freeUserCircleNotice()
-              : strings.trialUserCircleNotice()}
-          </Paragraph>
-
-          {!isOnTrial ? null : (
-            <Button
-              title={strings.upgradePlan()}
-              onPress={() => {
-                Navigation.navigate("PayWall", {
-                  canGoBack: true,
-                  context: useUserStore.getState().user
-                    ? "logged-in"
-                    : "logged-out"
-                });
-              }}
-              style={{
-                alignSelf: "flex-start",
-                paddingHorizontal: 0
-              }}
-            />
-          )}
-        </View>
-      )}
-
-      {partners.loading ? <ActivityIndicator /> : null}
-
-      {partners.error ? (
-        <Notice type="alert" text={partners.error.message} />
-      ) : null}
-
-      {partners.result?.map((item) => (
-        <Partner item={item} available={!isFree && !isOnTrial} />
-      ))}
-    </ScrollView>
-  );
-};
-
-const Partner = ({
-  item,
-  available
-}: {
-  item: CirclePartner;
-  available: boolean;
-}) => {
-  const { colors } = useThemeColors();
-  const [code, setCode] = useState<string>();
-
-  return (
-    <View
-      style={{
-        borderRadius: defaultBorderRadius,
-        borderWidth: 1,
-        borderColor: colors.primary.border,
-        padding: DefaultAppStyles.GAP,
-        gap: DefaultAppStyles.GAP_VERTICAL
-      }}
-    >
-      <View
-        style={{
-          flexDirection: "row",
-          justifyContent: "space-between",
-          alignItems: "center"
-        }}
-      >
-        <Heading>{item.name}</Heading>
-        <Image
-          src={item.logoBase64}
-          style={{
-            width: 40,
-            height: 40
-          }}
-        />
-      </View>
-
-      <Paragraph style={{ textAlign: "justify" }}>
-        {item.longDescription.trim()}
-      </Paragraph>
-
-      <Paragraph
-        style={{
-          alignSelf: "center"
-        }}
-        color={colors.primary.accent}
-      >
-        {item.offerDescription}
-      </Paragraph>
-
-      {available ? (
-        <>
-          {!code ? (
-            <Button
-              type="accent"
-              title={strings.redeemCode()}
-              width="100%"
-              onPress={() => {
-                if (!PremiumService.get()) {
-                  Navigation.navigate("PayWall", {
-                    canGoBack: true,
-                    context: useUserStore.getState().user
-                      ? "logged-in"
-                      : "logged-out"
-                  });
-                  return;
-                }
-
-                db.circle
-                  .redeem(item.id)
-                  .then((result) => setCode(result?.code))
-                  .catch((e) => ToastManager.error(e));
-              }}
-            />
-          ) : (
-            <>
-              <TouchableOpacity
-                style={{
-                  backgroundColor: colors.secondary.background,
-                  borderRadius: defaultBorderRadius,
-                  alignItems: "center",
-                  justifyContent: "center",
-                  padding: DefaultAppStyles.GAP_SMALL,
-                  borderWidth: 0.5,
-                  borderColor: colors.secondary.border,
-                  flexDirection: "row",
-                  gap: DefaultAppStyles.GAP_SMALL
-                }}
-                activeOpacity={0.9}
-                onPress={() => {
-                  Clipboard.setString(code);
-                }}
-              >
-                <Paragraph
-                  size={AppFontSize.lg}
-                  color={colors.secondary.paragraph}
-                >
-                  {code}
-                </Paragraph>
-
-                <AppIcon name="content-copy" />
-              </TouchableOpacity>
-
-              {item.codeRedeemUrl ? (
-                <Pressable
-                  onPress={() => {
-                    if (item.codeRedeemUrl) {
-                      openLinkInBrowser(
-                        item.codeRedeemUrl.replace("{{code}}", code)
-                      );
-                    }
-                  }}
-                >
-                  <Paragraph
-                    color={colors.secondary.paragraph}
-                    size={AppFontSize.xxs}
-                  >
-                    {strings.clickToDirectlyClaimPromo()}
-                  </Paragraph>
-                </Pressable>
-              ) : null}
-            </>
-          )}
-        </>
-      ) : null}
-    </View>
-  );
-};

apps/mobile/app/screens/settings/section-item.tsx

@@ -26,17 +26,18 @@ import {
 import React, { useEffect, useRef, useState } from "react";
 import { ActivityIndicator, TextInput, View } from "react-native";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
-import { FeatureResult, useIsFeatureAvailable } from "@notesnook/common";
 //@ts-ignore
+import { FeatureResult, useIsFeatureAvailable } from "@notesnook/common";
+import { strings } from "@notesnook/intl";
 import ToggleSwitch from "toggle-switch-react-native";
 import PaywallSheet from "../../components/sheets/paywall";
-import AppIcon from "../../components/ui/AppIcon";
 import { IconButton } from "../../components/ui/icon-button";
 import Input from "../../components/ui/input";
 import { Pressable } from "../../components/ui/pressable";
 import Seperator from "../../components/ui/seperator";
 import Heading from "../../components/ui/typography/heading";
 import Paragraph from "../../components/ui/typography/paragraph";
+import { ToastManager } from "../../services/event-manager";
 import SettingsService from "../../services/settings";
 import useNavigationStore from "../../stores/use-navigation-store";
 import { SettingStore, useSettingStore } from "../../stores/use-setting-store";
@@ -44,6 +45,7 @@ import { AppFontSize } from "../../utils/size";
 import { DefaultAppStyles } from "../../utils/styles";
 import { components } from "./components";
 import { RouteParams, SettingSection } from "./types";
+import AppIcon from "../../components/ui/AppIcon";
 
 const _SectionItem = ({ item }: { item: SettingSection }) => {
   const { colors } = useThemeColors();

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

@@ -32,7 +32,6 @@ import React from "react";
 import { Appearance, Linking, Platform } from "react-native";
 import { getVersion } from "react-native-device-info";
 import * as RNIap from "react-native-iap";
-//@ts-ignore
 import { enabled } from "react-native-privacy-snapshot";
 import ScreenGuardModule from "react-native-screenguard";
 import { DatabaseLogger, db } from "../../common/database";
@@ -82,22 +81,15 @@ export const settingsGroups: SettingSection[] = [
       {
         id: "subscription-status",
         useHook: () => useUserStore((state) => state.user),
-        hidden: (current) => {
-          const user = current as User;
-          return (
-            !user ||
-            !user.subscription ||
-            user.subscription.provider === undefined ||
-            !strings.subscriptionProviderInfo[user?.subscription?.provider] ||
-            user.subscription?.plan === SubscriptionPlan.FREE
-          );
-        },
+        hidden: (current) =>
+          !current ||
+          (current as User).subscription?.plan === SubscriptionPlan.FREE,
         name: (current) => {
           const user = (current as User) || useUserStore.getState().user;
           return (
             strings.subscriptionProviderInfo[
               user?.subscription?.provider
-            ]?.title() || `Unknown provider id: ${user?.subscription?.provider}`
+            ].title() || "Unknown provider"
           );
         },
         icon: "credit-card",
@@ -107,8 +99,6 @@ export const settingsGroups: SettingSection[] = [
           const subscriptionProviderInfo =
             strings.subscriptionProviderInfo[user?.subscription?.provider];
 
-          if (!subscriptionProviderInfo) return;
-
           const isCurrentPlatform =
             (user.subscription?.provider === SubscriptionProvider.APPLE &&
               Platform.OS === "ios") ||
@@ -625,14 +615,6 @@ export const settingsGroups: SettingSection[] = [
             }
           }
         ]
-      },
-      {
-        id: "notesnook-circle",
-        name: strings.notesnookCircle(),
-        icon: "circle-outline",
-        type: "screen",
-        description: strings.notesnookCircleDesc(),
-        component: "notesnook-circle"
       }
     ]
   },

apps/mobile/app/services/notifications.ts

@@ -580,7 +580,7 @@ function openSettingsDialog(context: string) {
       positivePress:
         Platform.OS === "ios"
           ? undefined
-          : async () => {
+          : () => {
               resolve(true);
             },
       onClose: () => {

apps/mobile/app/services/premium.ts

@@ -58,7 +58,6 @@ async function setPremiumStatus() {
 
 async function loadProductsAndSubs() {
   try {
-    if (Config.GITHUB_RELEASE === "true") throw new Error("Github release");
     if (!subs || subs.length === 0) {
       subs = await RNIap.getSubscriptions({
         skus: itemSkus

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

@@ -17,15 +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 { isFeatureAvailable } from "@notesnook/common";
 import { Profile, User } from "@notesnook/core";
 import create, { State } from "zustand";
-import SettingsService from "../services/settings";
-import { presentDialog } from "../components/dialog/functions";
-import { strings } from "@notesnook/intl";
-import { eSendEvent } from "../services/event-manager";
-import { eCloseSimpleDialog } from "../utils/events";
-import Navigation from "../services/navigation";
 
 export enum SyncStatus {
   Passed,
@@ -64,28 +57,6 @@ export const useUserStore = create<UserStore>((set) => ({
   setLastSynced: (lastSynced) => set({ lastSynced: lastSynced }),
   lockApp: (appLocked) => {
     set({ appLocked });
-    if (!appLocked) {
-      isFeatureAvailable("appLock").then((feature) => {
-        if (!feature.isAllowed) {
-          SettingsService.setProperty("appLockEnabled", false);
-          setTimeout(() => {
-            presentDialog({
-              title: "App Lock Disabled",
-              paragraph: feature?.error,
-              positiveText: strings.upgrade(),
-              negativeText: strings.cancel(),
-              positivePress: async () => {
-                eSendEvent(eCloseSimpleDialog);
-                if (SettingsService.getProperty("serverUrls")) return;
-                Navigation.navigate("PayWall", {
-                  context: "logged-in"
-                });
-              }
-            });
-          }, 1000);
-        }
-      });
-    }
   },
   lastSyncStatus: SyncStatus.Never,
   disableAppLockRequests: false,

apps/mobile/app/utils/functions.ts

@@ -33,7 +33,6 @@ import { useNotebookStore } from "../stores/use-notebook-store";
 import { useRelationStore } from "../stores/use-relation-store";
 import { useTagStore } from "../stores/use-tag-store";
 import { eUpdateNoteInEditor } from "./events";
-import { unlockVault } from "./unlock-vault";
 
 export function getObfuscatedEmail(email: string) {
   if (!email) return "";
@@ -57,7 +56,7 @@ function confirmDeleteAllNotes(
       title: strings.doActions.delete.notebook(items.length),
       positiveText: strings.delete(),
       negativeText: strings.cancel(),
-      positivePress: async (_inputValue, value) => {
+      positivePress: (_inputValue, value) => {
         setTimeout(() => {
           resolve({ delete: true, deleteNotes: value });
         });
@@ -99,30 +98,6 @@ export const deleteItems = async (
     await db.reminders.remove(...itemIds);
     useRelationStore.getState().update();
   } else if (type === "note") {
-    let someNotesLocked = false;
-
-    for (const id of itemIds) {
-      if (
-        await db.vaults.itemExists({
-          id: id,
-          type: "note"
-        })
-      ) {
-        someNotesLocked = true;
-        break;
-      }
-    }
-
-    if (someNotesLocked) {
-      const unlocked = await unlockVault({
-        title: strings.unlockVault(),
-        paragraph: strings.unlockVaultDesc(),
-        context: "global",
-        requirePassword: true
-      });
-      if (!unlocked) return;
-    }
-
     for (const id of itemIds) {
       if (db.monographs.isPublished(id)) {
         ToastManager.show({
@@ -133,7 +108,6 @@ export const deleteItems = async (
         });
         continue;
       }
-
       await db.notes.moveToTrash(id);
 
       eSendEvent(
@@ -183,7 +157,7 @@ export const deleteItems = async (
       heading: message,
       type: "success",
       func: async () => {
-        await db.trash.restore(...deletedIds);
+        if ((await db.trash.restore(...deletedIds)) === false) return;
         Navigation.queueRoutesForUpdate();
         useMenuStore.getState().setMenuPins();
         useMenuStore.getState().setColorNotes();

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

@@ -27,20 +27,18 @@ let unlockPromise: Promise<any> | undefined = undefined;
 export async function unlockVault({
   context,
   title,
-  paragraph,
-  requirePassword
+  paragraph
 }: {
   context?: string;
   title: string;
   paragraph: string;
-  requirePassword?: boolean;
 }) {
   if (unlockPromise) {
     return unlockPromise;
   }
   unlockPromise = new Promise(async (resolve) => {
     const result = await (async () => {
-      if (db.vault.unlocked && !requirePassword) return true;
+      if (db.vault.unlocked) return true;
       const biometry = await BiometricService.isBiometryAvailable();
       const fingerprint = await BiometricService.hasInternetCredentials();
       if (biometry && fingerprint) {

apps/mobile/e2e/globalSetup.ts

@@ -1,5 +1,5 @@
 import { execSync } from "child_process";
-//@ts-ignore
+
 import { pathExists, ensureDir } from "fs-extra";
 
 import { resolveConfig } from "detox/internals";

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

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

apps/mobile/e2e/tests/search.e2e.ts

@@ -28,9 +28,6 @@ describe("Search", () => {
       .typeTextById("search-input", "Test")
       .wait(1000)
       .isVisibleByText("1")
-      .waitAndTapById("clear-search")
-      .wait(2000)
-      .isNotVisibleByText("1")
       .run();
   });
 });

apps/mobile/e2e/tests/utils.ts

@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { expect as jestExpect } from "@jest/globals";
 import { device as _device, expect } from "detox";
 import { readFileSync } from "fs";
-//@ts-ignore
 import { toMatchImageSnapshot } from "jest-image-snapshot";
 import type { RouteName } from "../../app/stores/use-navigation-store";
 import { notesnook } from "../test.ids";

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

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

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

@@ -152,7 +152,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="notesnook" />
+                <data android:scheme="com.streetwriters.notesnook" />
             </intent-filter>
 
         </activity>

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

@@ -33,7 +33,7 @@ public class NotePreviewWidget extends AppWidgetProvider {
         intent.putExtra(OpenNoteId, note.getId());
         intent.setAction(Intent.ACTION_VIEW);
         intent.putExtra(RCTNNativeModule.IntentType, "OpenNote");
-        intent.setData(Uri.parse("https://app.notesnook.com/open_note?id=" + note.getId()));
+        intent.setData(Uri.parse("https://notesnook.com/open_note?id=" + note.getId()));
         PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE, getActivityOptionsBundle());
         views.setOnClickPendingIntent(R.id.open_note, pendingIntent);
 

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

@@ -75,7 +75,7 @@ class ReminderRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactor
         final Intent fillInIntent = new Intent();
         final Bundle extras = new Bundle();
         extras.putString(ReminderViewsService.OpenReminderId, reminder.getId());
-        fillInIntent.setData(Uri.parse("https://app.notesnook.com/open_reminder?id=" + reminder.getId()));
+        fillInIntent.setData(Uri.parse("https://notesnook.com/open_reminder?id=" + reminder.getId()));
         fillInIntent.putExtra(RCTNNativeModule.IntentType, "OpenReminder");
         fillInIntent.putExtras(extras);
         views.setOnClickFillInIntent(R.id.reminder_item_btn, fillInIntent);

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

@@ -43,7 +43,7 @@ public class ReminderWidgetProvider extends AppWidgetProvider {
         new_reminder_intent.putExtra(NewReminder, NewReminder);
         new_reminder_intent.setAction(Intent.ACTION_VIEW);
         new_reminder_intent.putExtra(RCTNNativeModule.IntentType, "NewReminder");
-        new_reminder_intent.setData(Uri.parse("https://app.notesnook.com/new_reminder"));
+        new_reminder_intent.setData(Uri.parse("https://notesnook.com/new_reminder"));
         PendingIntent pendingIntent2 = PendingIntent.getActivity(context, appWidgetId, new_reminder_intent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE, getActivityOptionsBundle());
         views.setOnClickPendingIntent(R.id.add_button, pendingIntent2);
 

apps/mobile/native/android/app/src/main/res/layout/widget_reminder_layout.xml

@@ -2,7 +2,6 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingVertical="10dp"
     android:id="@+id/reminder_item_btn">
 
     <TextView

apps/mobile/native/android/app/src/main/res/layout/widget_reminder_layout_small.xml

@@ -2,7 +2,6 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingVertical="10dp"
     android:id="@+id/reminder_item_btn">
 
     <TextView

apps/mobile/native/android/app/src/main/res/layout/widget_reminders.xml

@@ -25,9 +25,9 @@
             android:text="Upcoming Reminders"/>
 
         <ImageButton
-            android:layout_width="35dp"
+            android:layout_width="30dp"
             android:id="@+id/add_button"
-            android:layout_height="35dp"
+            android:layout_height="30dp"
             android:layout_alignParentRight="true"
             android:background="@drawable/ic_newnote" />
     </RelativeLayout>

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

@@ -1,3 +1,5 @@
-- Bug fixes and minor improvements
+- We have launches new pricing plans, Essential, Pro and Believer
+- Free users can now upload attachments and create private vault
+- Minor bug fixes and improvements
 
 Thank you for using Notesnook!

apps/mobile/native/ios/Make Note/Info.plist

@@ -56,10 +56,9 @@
 	<string>group.org.streetwriters.notesnook</string>
 	<key>UIAppFonts</key>
 	<array>
-		<string>Inter-Bold.ttf</string>
-		<string>Inter-SemiBold.ttf</string>
-		<string>Inter-Regular.ttf</string>
-		<string>Inter-Italic.ttf</string>
+		<string>OpenSans-Bold.ttf</string>
+		<string>OpenSans-SemiBold.ttf</string>
+		<string>OpenSans-Regular.ttf</string>
 		<string>MaterialCommunityIcons.ttf</string>
 	</array>
 	<key>UISupportedInterfaceOrientations</key>

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

@@ -17,15 +17,14 @@
 		2E4BF736C2EB268ED3FD9C29 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = B5216B66C0B4A91C0A69128B /* PrivacyInfo.xcprivacy */; };
 		6510E6D72877215700DACAA9 /* build.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 6510E6D62877215700DACAA9 /* build.bundle */; };
 		6515C42F2580AA3000E83E39 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6515C42E2580AA2F00E83E39 /* StoreKit.framework */; };
+		6517B7C12B6838EB0079FF37 /* OpenSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6517B7BE2B6838EB0079FF37 /* OpenSans-Regular.ttf */; };
+		6517B7C22B6838EB0079FF37 /* OpenSans-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6517B7BF2B6838EB0079FF37 /* OpenSans-SemiBold.ttf */; };
+		6517B7C32B6838EB0079FF37 /* OpenSans-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6517B7C02B6838EB0079FF37 /* OpenSans-Bold.ttf */; };
 		6529A13E279BC4C70048D4A8 /* BootSplash.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6529A13D279BC4C70048D4A8 /* BootSplash.storyboard */; };
-		653F4E082EA3887C009A42A2 /* Inter-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 653F4E042EA3887C009A42A2 /* Inter-Bold.ttf */; };
-		653F4E092EA3887C009A42A2 /* Inter-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 653F4E052EA3887C009A42A2 /* Inter-Italic.ttf */; };
-		653F4E0A2EA3887C009A42A2 /* Inter-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 653F4E072EA3887C009A42A2 /* Inter-SemiBold.ttf */; };
-		653F4E0B2EA3887C009A42A2 /* Inter-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 653F4E062EA3887C009A42A2 /* Inter-Regular.ttf */; };
-		653F4E0C2EA3887C009A42A2 /* Inter-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 653F4E042EA3887C009A42A2 /* Inter-Bold.ttf */; };
-		653F4E0D2EA3887C009A42A2 /* Inter-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 653F4E052EA3887C009A42A2 /* Inter-Italic.ttf */; };
-		653F4E0E2EA3887C009A42A2 /* Inter-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 653F4E072EA3887C009A42A2 /* Inter-SemiBold.ttf */; };
-		653F4E0F2EA3887C009A42A2 /* Inter-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 653F4E062EA3887C009A42A2 /* Inter-Regular.ttf */; };
+		656835812BB29A9800144BAB /* OpenSans-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 656835802BB29A8300144BAB /* OpenSans-Italic.ttf */; };
+		6569927F2C5754F10041CD41 /* OpenSans-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6517B7C02B6838EB0079FF37 /* OpenSans-Bold.ttf */; };
+		656992802C5754F10041CD41 /* OpenSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6517B7BE2B6838EB0079FF37 /* OpenSans-Regular.ttf */; };
+		656992812C5754F10041CD41 /* OpenSans-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6517B7BF2B6838EB0079FF37 /* OpenSans-SemiBold.ttf */; };
 		6593E4A3281C345400492C50 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6593E4A2281C345400492C50 /* AppDelegate.mm */; };
 		659BE46725E11A5100E05671 /* notesnook-text.png in Resources */ = {isa = PBXBuildFile; fileRef = 659BE46625E11A5100E05671 /* notesnook-text.png */; };
 		65AA857925E6DDEC00772A01 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65AA857825E6DDEC00772A01 /* WidgetKit.framework */; };
@@ -118,12 +117,12 @@
 		4C4AF691C324D95337F2FB0A /* libPods-Make Note.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Make Note.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		6510E6D62877215700DACAA9 /* build.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = build.bundle; path = "../../../../packages/editor-mobile/build.bundle"; sourceTree = "<group>"; };
 		6515C42E2580AA2F00E83E39 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
+		6517B7BE2B6838EB0079FF37 /* OpenSans-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-Regular.ttf"; path = "../../../../packages/editor-mobile/public/fonts/OpenSans-Regular.ttf"; sourceTree = "<group>"; };
+		6517B7BF2B6838EB0079FF37 /* OpenSans-SemiBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-SemiBold.ttf"; path = "../../../../packages/editor-mobile/public/fonts/OpenSans-SemiBold.ttf"; sourceTree = "<group>"; };
+		6517B7C02B6838EB0079FF37 /* OpenSans-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-Bold.ttf"; path = "../../../../packages/editor-mobile/public/fonts/OpenSans-Bold.ttf"; sourceTree = "<group>"; };
 		6529A13D279BC4C70048D4A8 /* BootSplash.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = BootSplash.storyboard; path = Notesnook/BootSplash.storyboard; sourceTree = "<group>"; };
 		6529D2B0257B4A2900B49BC3 /* NotesnookDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = NotesnookDebug.entitlements; path = Notesnook/NotesnookDebug.entitlements; sourceTree = "<group>"; };
-		653F4E042EA3887C009A42A2 /* Inter-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Inter-Bold.ttf"; path = "../../../../packages/editor-mobile/public/fonts/Inter-Bold.ttf"; sourceTree = SOURCE_ROOT; };
-		653F4E052EA3887C009A42A2 /* Inter-Italic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Inter-Italic.ttf"; path = "../../../../packages/editor-mobile/public/fonts/Inter-Italic.ttf"; sourceTree = SOURCE_ROOT; };
-		653F4E062EA3887C009A42A2 /* Inter-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Inter-Regular.ttf"; path = "../../../../packages/editor-mobile/public/fonts/Inter-Regular.ttf"; sourceTree = SOURCE_ROOT; };
-		653F4E072EA3887C009A42A2 /* Inter-SemiBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Inter-SemiBold.ttf"; path = "../../../../packages/editor-mobile/public/fonts/Inter-SemiBold.ttf"; sourceTree = SOURCE_ROOT; };
+		656835802BB29A8300144BAB /* OpenSans-Italic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-Italic.ttf"; path = "../../../../packages/editor-mobile/public/fonts/OpenSans-Italic.ttf"; sourceTree = "<group>"; };
 		6593E4A2281C345400492C50 /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = Notesnook/AppDelegate.mm; sourceTree = "<group>"; };
 		659BE46625E11A5100E05671 /* notesnook-text.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "notesnook-text.png"; path = "Notesnook/Images.xcassets/notesnook-text.png"; sourceTree = "<group>"; };
 		65A7F34F255689AD00699170 /* Notesnook.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = Notesnook.entitlements; path = Notesnook/Notesnook.entitlements; sourceTree = "<group>"; };
@@ -304,10 +303,10 @@
 		83CBB9F61A601CBA00E9B192 = {
 			isa = PBXGroup;
 			children = (
-				653F4E042EA3887C009A42A2 /* Inter-Bold.ttf */,
-				653F4E052EA3887C009A42A2 /* Inter-Italic.ttf */,
-				653F4E062EA3887C009A42A2 /* Inter-Regular.ttf */,
-				653F4E072EA3887C009A42A2 /* Inter-SemiBold.ttf */,
+				656835802BB29A8300144BAB /* OpenSans-Italic.ttf */,
+				6517B7C02B6838EB0079FF37 /* OpenSans-Bold.ttf */,
+				6517B7BE2B6838EB0079FF37 /* OpenSans-Regular.ttf */,
+				6517B7BF2B6838EB0079FF37 /* OpenSans-SemiBold.ttf */,
 				65C400DD2A80B68D00AA3DF5 /* MaterialCommunityIcons.ttf */,
 				65C149862A61151B005C40F1 /* extension.bundle */,
 				6510E6D62877215700DACAA9 /* build.bundle */,
@@ -556,15 +555,15 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				656835812BB29A9800144BAB /* OpenSans-Italic.ttf in Resources */,
 				65C400DE2A80B68D00AA3DF5 /* MaterialCommunityIcons.ttf in Resources */,
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
+				6517B7C32B6838EB0079FF37 /* OpenSans-Bold.ttf in Resources */,
+				6517B7C22B6838EB0079FF37 /* OpenSans-SemiBold.ttf in Resources */,
 				6529A13E279BC4C70048D4A8 /* BootSplash.storyboard in Resources */,
 				6510E6D72877215700DACAA9 /* build.bundle in Resources */,
+				6517B7C12B6838EB0079FF37 /* OpenSans-Regular.ttf in Resources */,
 				659BE46725E11A5100E05671 /* notesnook-text.png in Resources */,
-				653F4E0C2EA3887C009A42A2 /* Inter-Bold.ttf in Resources */,
-				653F4E0D2EA3887C009A42A2 /* Inter-Italic.ttf in Resources */,
-				653F4E0E2EA3887C009A42A2 /* Inter-SemiBold.ttf in Resources */,
-				653F4E0F2EA3887C009A42A2 /* Inter-Regular.ttf in Resources */,
 				E7F9D56665C2F19F4A97BF49 /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -597,11 +596,10 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6569927F2C5754F10041CD41 /* OpenSans-Bold.ttf in Resources */,
+				656992802C5754F10041CD41 /* OpenSans-Regular.ttf in Resources */,
+				656992812C5754F10041CD41 /* OpenSans-SemiBold.ttf in Resources */,
 				65C400DF2A80B6B600AA3DF5 /* MaterialCommunityIcons.ttf in Resources */,
-				653F4E082EA3887C009A42A2 /* Inter-Bold.ttf in Resources */,
-				653F4E092EA3887C009A42A2 /* Inter-Italic.ttf in Resources */,
-				653F4E0A2EA3887C009A42A2 /* Inter-SemiBold.ttf in Resources */,
-				653F4E0B2EA3887C009A42A2 /* Inter-Regular.ttf in Resources */,
 				65C149872A61151B005C40F1 /* extension.bundle in Resources */,
 				65B5014725A672B200E2D264 /* MainInterface.storyboard in Resources */,
 			);
@@ -654,7 +652,6 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Notesnook/Pods-Notesnook-resources.sh",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly/RCT-Folly_privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNSVG/RNSVGFilters.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
@@ -666,7 +663,6 @@
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCT-Folly_privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNSVGFilters.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
@@ -823,7 +819,6 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Notesnook-NotesnookTests/Pods-Notesnook-NotesnookTests-resources.sh",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly/RCT-Folly_privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNSVG/RNSVGFilters.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
@@ -835,7 +830,6 @@
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCT-Folly_privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNSVGFilters.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
@@ -1095,7 +1089,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2155;
+				CURRENT_PROJECT_VERSION = 2150;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1169,7 +1163,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.7;
+				MARKETING_VERSION = 3.3.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1200,7 +1194,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2155;
+				CURRENT_PROJECT_VERSION = 2150;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1274,7 +1268,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.7;
+				MARKETING_VERSION = 3.3.2;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1433,7 +1427,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2155;
+				CURRENT_PROJECT_VERSION = 2150;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1445,7 +1439,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.3.7;
+				MARKETING_VERSION = 3.3.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
@@ -1476,7 +1470,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2155;
+				CURRENT_PROJECT_VERSION = 2150;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1489,7 +1483,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.3.7;
+				MARKETING_VERSION = 3.3.2;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1519,7 +1513,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Make Note/Make Note.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2155;
+				CURRENT_PROJECT_VERSION = 2150;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1593,14 +1587,14 @@
 					"\"$(PODS_ROOT)/Headers/Private/React-Core\"",
 				);
 				INFOPLIST_FILE = "Make Note/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
-				MARKETING_VERSION = 3.3.7;
+				MARKETING_VERSION = 3.3.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
@@ -1631,7 +1625,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2155;
+				CURRENT_PROJECT_VERSION = 2150;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1706,14 +1700,14 @@
 					"\"$(PODS_ROOT)/Headers/Private/React-Core\"",
 				);
 				INFOPLIST_FILE = "Make Note/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
-				MARKETING_VERSION = 3.3.7;
+				MARKETING_VERSION = 3.3.2;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
 				PRODUCT_NAME = "$(TARGET_NAME)";

apps/mobile/native/ios/Notesnook.xcodeproj/xcshareddata/xcschemes/Make Note.xcscheme

@@ -74,7 +74,7 @@
       <RemoteRunnable
          runnableDebuggingMode = "1"
          BundleIdentifier = "com.apple.mobilesafari"
-         RemotePath = "/Library/Developer/CoreSimulator/Volumes/iOS_22G86/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 18.6.simruntime/Contents/Resources/RuntimeRoot/Applications/MobileSafari.app">
+         RemotePath = "/Applications/MobileSafari.app">
       </RemoteRunnable>
       <MacroExpansion>
          <BuildableReference
@@ -92,7 +92,6 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES"
-      askForAppToLaunch = "Yes"
       launchAutomaticallySubstyle = "2">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

apps/mobile/native/ios/Notesnook/Info.plist

@@ -71,6 +71,7 @@
 	<true/>
 	<key>NSAppTransportSecurity</key>
 	<dict>
+		 <!-- Do not change NSAllowsArbitraryLoads to true, or you will risk app rejection! -->
 		<key>NSAllowsArbitraryLoads</key>
 		<false/>
 		<key>NSAllowsLocalNetworking</key>
@@ -88,10 +89,9 @@
 	<string>group.org.streetwriters.notesnook</string>
 	<key>UIAppFonts</key>
 	<array>
-		<string>Inter-Italic.ttf</string>
-		<string>Inter-SemiBold.ttf</string>
-		<string>Inter-Regular.ttf</string>
-		<string>Inter-Bold.ttf</string>
+		<string>OpenSans-Italic.ttf</string>
+		<string>OpenSans-SemiBold.ttf</string>
+		<string>OpenSans-Regular.ttf</string>
 		<string>MaterialCommunityIcons.ttf</string>
 	</array>
 	<key>UIApplicationSceneManifest</key>

apps/mobile/native/ios/Notesnook/PrivacyInfo.xcprivacy

@@ -9,7 +9,6 @@
 			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
 			<key>NSPrivacyAccessedAPITypeReasons</key>
 			<array>
-				<string>3B52.1</string>
 				<string>C617.1</string>
 			</array>
 		</dict>

apps/mobile/native/ios/Podfile.lock

@@ -1273,11 +1273,11 @@ PODS:
     - React-Core
   - react-native-keep-awake (1.3.1):
     - React-Core
-  - react-native-mmkv-storage (12.0.0):
+  - react-native-mmkv-storage (0.11.2):
     - DoubleConversion
     - glog
     - hermes-engine
-    - MMKV (~> 1.3.14)
+    - MMKV (~> 1.3.9)
     - RCT-Folly (= 2024.11.18.00)
     - RCTRequired
     - RCTTypeSafety
@@ -1372,7 +1372,7 @@ PODS:
   - react-native-screenguard (1.0.0):
     - React-Core
     - SDWebImage (~> 5.11.1)
-  - react-native-share-extension (2.9.5):
+  - react-native-share-extension (2.9.0):
     - React
   - react-native-sodium (1.6.5):
     - React
@@ -1770,53 +1770,15 @@ PODS:
     - Yoga
   - RNIap (12.16.2):
     - React-Core
-  - RNImageCropPicker (0.51.1):
-    - DoubleConversion
-    - glog
-    - hermes-engine
-    - RCT-Folly (= 2024.11.18.00)
-    - RCTRequired
-    - RCTTypeSafety
+  - RNImageCropPicker (0.40.2):
     - React-Core
-    - React-debug
-    - React-Fabric
-    - React-featureflags
-    - React-graphics
-    - React-ImageManager
-    - React-NativeModulesApple
-    - React-RCTFabric
     - React-RCTImage
-    - React-rendererdebug
-    - React-utils
-    - ReactCodegen
-    - ReactCommon/turbomodule/bridging
-    - ReactCommon/turbomodule/core
-    - RNImageCropPicker/QBImagePickerController (= 0.51.1)
-    - TOCropViewController (~> 2.8.0)
-    - Yoga
-  - RNImageCropPicker/QBImagePickerController (0.51.1):
-    - DoubleConversion
-    - glog
-    - hermes-engine
-    - RCT-Folly (= 2024.11.18.00)
-    - RCTRequired
-    - RCTTypeSafety
+    - RNImageCropPicker/QBImagePickerController (= 0.40.2)
+    - TOCropViewController
+  - RNImageCropPicker/QBImagePickerController (0.40.2):
     - React-Core
-    - React-debug
-    - React-Fabric
-    - React-featureflags
-    - React-graphics
-    - React-ImageManager
-    - React-NativeModulesApple
-    - React-RCTFabric
     - React-RCTImage
-    - React-rendererdebug
-    - React-utils
-    - ReactCodegen
-    - ReactCommon/turbomodule/bridging
-    - ReactCommon/turbomodule/core
-    - TOCropViewController (~> 2.8.0)
-    - Yoga
+    - TOCropViewController
   - RNKeychain (4.0.5):
     - React
   - RNNotifee (7.4.9):
@@ -2013,7 +1975,7 @@ PODS:
   - SwiftyRSA (1.7.0):
     - SwiftyRSA/ObjC (= 1.7.0)
   - SwiftyRSA/ObjC (1.7.0)
-  - TOCropViewController (2.8.0)
+  - TOCropViewController (2.7.4)
   - toolbar-android (0.2.1):
     - React
   - Yoga (0.0.0)
@@ -2463,7 +2425,7 @@ SPEC CHECKSUMS:
   react-native-image-resizer: 24c5d06fae2176dc0caed4b6396e02befb44064a
   react-native-in-app-review: b3d1eed3d1596ebf6539804778272c4c65e4a400
   react-native-keep-awake: 03b74eebe4f2bb5e8478fc8f420651a92463b6f8
-  react-native-mmkv-storage: 935d661dc3913a41be70d041aa3ff860d6aa4873
+  react-native-mmkv-storage: 51c33c6f6678d67061059cce8189a57c3e47192e
   react-native-netinfo: 66c9ac0d0ae92a57a9ed99ab8a75429740700c73
   react-native-notification-sounds: ce106d58df0dd384bccbd2e84fb53accab7cc068
   react-native-orientation-locker: cc6f357b289a2e0dd2210fea0c52cb8e0727fdaa
@@ -2472,7 +2434,7 @@ SPEC CHECKSUMS:
   react-native-quick-sqlite: 1bfc7f1e9acbe9a5aa5c4cc81712e9bde3ab7672
   react-native-safe-area-context: 9d72abf6d8473da73033b597090a80b709c0b2f1
   react-native-screenguard: 82437eeb0086a90b5e5d7e54130bb04fb406373e
-  react-native-share-extension: fdc6aaab51591a2d445df239c446aaa3a99658ec
+  react-native-share-extension: bcb7e466390a9e50c742f4b1019d6f181aedd7ad
   react-native-sodium: 285eec063e4232cb67347ef6a434b85e588d38cb
   react-native-theme-switch-animation: d90fe2de0d9e87a63cd6235d98cba6e7054e9a10
   react-native-webview: 079eca50edf657503318b66687dadfb903731aa8
@@ -2517,7 +2479,7 @@ SPEC CHECKSUMS:
   RNFlashList: ff5a0b3113c4cda0eaf4b94df8572ccad3c40fd5
   RNGestureHandler: 92e89a04cd0d1c77f383a55d14c15e7f423f4c00
   RNIap: f94647b3a3dbd5fa08ad7ed847eb588aa5fe95fe
-  RNImageCropPicker: aa81bda9f887e20542b569938cde5ce50a4ec404
+  RNImageCropPicker: 30d770b383d84e1067d82ea7b5ed4fff851bbbb2
   RNKeychain: ffd0513e676445c637410b47249460cbf56bc9cb
   RNNotifee: dabf3cdd7bfd9340bb84358cc78f635af4bc80e2
   RNPrivacySnapshot: ccad3a548338c2f526bb7b1789af3fb0618b7d1d
@@ -2533,7 +2495,7 @@ SPEC CHECKSUMS:
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
   SwiftyRSA: 8c6dd1ea7db1b8dc4fb517a202f88bb1354bc2c6
-  TOCropViewController: 797deaf39c90e6e9ddd848d88817f6b9a8a09888
+  TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654
   toolbar-android: c426ed5bd3dcccfed20fd79533efc0d1ae0ef018
   Yoga: 31a098f74c16780569aebd614a0f37a907de0189
 

apps/mobile/native/package.json

@@ -21,7 +21,6 @@
     "@react-navigation/native": "^6.0.10",
     "@react-navigation/native-stack": "6.6.2",
     "@sayem314/react-native-keep-awake": "^1.3.1",
-    "react-native-image-crop-picker": "^0.51.1",
     "react": "18.2.0",
     "react-native": "0.77.2",
     "react-native-actions-shortcuts": "^1.0.1",
@@ -49,7 +48,7 @@
     "react-native-navigation-bar-color": "2.0.2",
     "react-native-notification-sounds": "0.5.5",
     "@shopify/flash-list": "^1.8.0",
-    "react-native-mmkv-storage": "^12.0.0",
+    "react-native-mmkv-storage": "^0.11.2",
     "react-native-quick-sqlite": "^8.2.7",
     "react-native-svg": "^15.12.0",
     "react-native-webview": "^13.13.5",
@@ -62,6 +61,7 @@
     "react-native-zip-archive": "6.0.9",
     "react-native-theme-switch-animation": "^0.6.0",
     "@ammarahmed/react-native-background-fetch": "^4.2.2",
+    "react-native-image-crop-picker": "^0.40.2",
     "react-native-url-polyfill": "^2.0.0",
     "react-native-screenguard": "^1.0.0",
     "@formatjs/intl-locale": "4.0.0",
@@ -72,10 +72,10 @@
     "react-native-begin-background-task": "github:blockfirm/react-native-begin-background-task",
     "react-native-privacy-snapshot": "github:standardnotes/react-native-privacy-snapshot",
     "@ammarahmed/react-native-fingerprint-scanner": "^5.0.0",
+    "@ammarahmed/react-native-share-extension": "^2.9.0",
     "react-native-pager-view": "^6.5.1",
     "react-native-tab-view": "^4.0.2",
-    "react-native-orientation-locker": "^1.7.0",
-    "@ammarahmed/react-native-share-extension": "^2.9.5"
+    "react-native-orientation-locker": "^1.7.0"
   },
   "devDependencies": {
     "@babel/core": "^7.27.1",

apps/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notesnook/mobile",
-  "version": "3.3.7",
+  "version": "3.3.2",
   "private": true,
   "license": "GPL-3.0-or-later",
   "workspaces": [
@@ -38,15 +38,15 @@
     "react": "18.2.0"
   },
   "dependencies": {
-    "@notesnook/common": "file:../../packages/common",
-    "@notesnook/core": "file:../../packages/core",
-    "@notesnook/crypto": "file:../../packages/crypto",
-    "@notesnook/editor": "file:../../packages/editor",
-    "@notesnook/editor-mobile": "file:../../packages/editor-mobile",
-    "@notesnook/intl": "file:../../packages/intl",
-    "@notesnook/logger": "file:../../packages/logger",
-    "@notesnook/theme": "file:../../packages/theme",
-    "@notesnook/themes-server": "file:../../servers/themes",
+    "@notesnook/common": "link:@notesnook/common",
+    "@notesnook/core": "link:@notesnook/core",
+    "@notesnook/crypto": "link:@notesnook/crypto",
+    "@notesnook/editor": "link:@notesnook/editor",
+    "@notesnook/editor-mobile": "link:@notesnook/editor-mobile",
+    "@notesnook/intl": "link:@notesnook/intl",
+    "@notesnook/logger": "link:@notesnook/logger",
+    "@notesnook/theme": "link:@notesnook/theme",
+    "@notesnook/themes-server": "link:@notesnook/themes-server",
     "@tanstack/react-query": "^4.36.1",
     "@trpc/client": "^10.45.2",
     "@trpc/react-query": "^10.45.2",

apps/mobile/patches/react-native-image-crop-picker+0.40.2.patch

@@ -1,27 +1,27 @@
-diff --git a/node_modules/react-native-image-crop-picker/android/src/main/java/com/reactnative/ivpusic/imagepicker/ImageCropPicker.java b/node_modules/react-native-image-crop-picker/android/src/main/java/com/reactnative/ivpusic/imagepicker/ImageCropPicker.java
-index b9c494e..34ef800 100644
---- a/node_modules/react-native-image-crop-picker/android/src/main/java/com/reactnative/ivpusic/imagepicker/ImageCropPicker.java
-+++ b/node_modules/react-native-image-crop-picker/android/src/main/java/com/reactnative/ivpusic/imagepicker/ImageCropPicker.java
-@@ -679,6 +679,7 @@ class ImageCropPicker implements ActivityEventListener {
+diff --git a/node_modules/react-native-image-crop-picker/android/src/main/java/com/reactnative/ivpusic/imagepicker/PickerModule.java b/node_modules/react-native-image-crop-picker/android/src/main/java/com/reactnative/ivpusic/imagepicker/PickerModule.java
+index 5de0845..1b158d8 100644
+--- a/node_modules/react-native-image-crop-picker/android/src/main/java/com/reactnative/ivpusic/imagepicker/PickerModule.java
++++ b/node_modules/react-native-image-crop-picker/android/src/main/java/com/reactnative/ivpusic/imagepicker/PickerModule.java
+@@ -692,6 +692,7 @@ class PickerModule extends ReactContextBaseJavaModule implements ActivityEventLi
+         image.putString("mime", options.outMimeType);
          image.putInt("size", (int) new File(compressedImagePath).length());
          image.putString("modificationDate", String.valueOf(modificationDate));
-         image.putString("filename", new File(path).getName());
 +        image.putString("sourceURL", path);
  
          if (includeBase64) {
              image.putString("data", getBase64StringFromFile(compressedImagePath));
-diff --git a/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.mm b/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.mm
-index 354ad09..622f779 100644
---- a/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.mm
-+++ b/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.mm
-@@ -603,7 +603,10 @@ - (void)qb_imagePickerController:(QBImagePickerController *)imagePickerControlle
+diff --git a/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m b/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
+index 9f20973..5e14da8 100644
+--- a/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
++++ b/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
+@@ -595,8 +595,10 @@ - (void)qb_imagePickerController:
+                                     NSString *mimeType = [self determineMimeTypeFromImageData:imageData];
                                      Boolean isKnownMimeType = [mimeType length] > 0;
                                      
++                                    Boolean isHeicOrHeif = [mimeType isEqualToString:@"image/heic"] || [mimeType isEqualToString:@"image/heif"];
++                                    
                                      ImageResult *imageResult = [[ImageResult alloc] init];
 -                                    if (isLossless && useOriginalWidth && useOriginalHeight && isKnownMimeType && !forceJpg) {
-+
-+                                    Boolean isHeicOrHeif = [mimeType isEqualToString:@"image/heic"] || [mimeType isEqualToString:@"image/heif"];
-+
 +                                    if (isLossless && useOriginalWidth && useOriginalHeight && isKnownMimeType && !forceJpg && !isHeicOrHeif) {
                                          // Use original, unmodified image
                                          imageResult.data = imageData;

apps/mobile/patches/react-native-keychain+4.0.5.patch

@@ -1,169 +0,0 @@
-diff --git a/node_modules/react-native-keychain/android/build.gradle b/node_modules/react-native-keychain/android/build.gradle
-index bd2fe04..53ce4b1 100755
---- a/node_modules/react-native-keychain/android/build.gradle
-+++ b/node_modules/react-native-keychain/android/build.gradle
-@@ -51,5 +51,4 @@ dependencies {
-     //noinspection GradleDynamicVersion
-     implementation 'com.facebook.react:react-native:+'  // From node_modules
-     implementation 'androidx.annotation:annotation:1.1.0'
--    implementation 'com.facebook.conceal:conceal:1.1.3@aar'
- }
-diff --git a/node_modules/react-native-keychain/android/src/main/java/com/oblador/keychain/KeychainModule.java b/node_modules/react-native-keychain/android/src/main/java/com/oblador/keychain/KeychainModule.java
-index 61d061e..be49f8a 100644
---- a/node_modules/react-native-keychain/android/src/main/java/com/oblador/keychain/KeychainModule.java
-+++ b/node_modules/react-native-keychain/android/src/main/java/com/oblador/keychain/KeychainModule.java
-@@ -15,7 +15,6 @@ import com.oblador.keychain.PrefsStorage.ResultSet;
- import com.oblador.keychain.cipherStorage.CipherStorage;
- import com.oblador.keychain.cipherStorage.CipherStorage.DecryptionResult;
- import com.oblador.keychain.cipherStorage.CipherStorage.EncryptionResult;
--import com.oblador.keychain.cipherStorage.CipherStorageFacebookConceal;
- import com.oblador.keychain.cipherStorage.CipherStorageKeystoreAESCBC;
- import com.oblador.keychain.exceptions.CryptoFailedException;
- import com.oblador.keychain.exceptions.EmptyParameterException;
-@@ -48,7 +47,6 @@ public class KeychainModule extends ReactContextBaseJavaModule {
-         super(reactContext);
-         prefsStorage = new PrefsStorage(reactContext);
- 
--        addCipherStorageToMap(new CipherStorageFacebookConceal(reactContext));
-         addCipherStorageToMap(new CipherStorageKeystoreAESCBC());
-     }
- 
-diff --git a/node_modules/react-native-keychain/android/src/main/java/com/oblador/keychain/PrefsStorage.java b/node_modules/react-native-keychain/android/src/main/java/com/oblador/keychain/PrefsStorage.java
-index 99448b1..792c24c 100644
---- a/node_modules/react-native-keychain/android/src/main/java/com/oblador/keychain/PrefsStorage.java
-+++ b/node_modules/react-native-keychain/android/src/main/java/com/oblador/keychain/PrefsStorage.java
-@@ -7,7 +7,6 @@ import android.util.Base64;
- 
- import com.facebook.react.bridge.ReactApplicationContext;
- import com.oblador.keychain.cipherStorage.CipherStorage.EncryptionResult;
--import com.oblador.keychain.cipherStorage.CipherStorageFacebookConceal;
- 
- public class PrefsStorage {
-     public static final String KEYCHAIN_DATA = "RN_KEYCHAIN";
-@@ -35,10 +34,6 @@ public class PrefsStorage {
-         byte[] bytesForPassword = getBytesForPassword(service);
-         String cipherStorageName = getCipherStorageName(service);
-         if (bytesForUsername != null && bytesForPassword != null) {
--            if (cipherStorageName == null) {
--                // If the CipherStorage name is not found, we assume it is because the entry was written by an older version of this library. The older version used Facebook Conceal, so we default to that.
--                cipherStorageName = CipherStorageFacebookConceal.CIPHER_STORAGE_NAME;
--            }
-             return new ResultSet(cipherStorageName, bytesForUsername, bytesForPassword);
-         }
-         return null;
-diff --git a/node_modules/react-native-keychain/android/src/main/java/com/oblador/keychain/cipherStorage/CipherStorageFacebookConceal.java b/node_modules/react-native-keychain/android/src/main/java/com/oblador/keychain/cipherStorage/CipherStorageFacebookConceal.java
-deleted file mode 100644
-index 3162f99..0000000
---- a/node_modules/react-native-keychain/android/src/main/java/com/oblador/keychain/cipherStorage/CipherStorageFacebookConceal.java
-+++ /dev/null
-@@ -1,110 +0,0 @@
--package com.oblador.keychain.cipherStorage;
--
--import android.os.Build;
--import androidx.annotation.NonNull;
--
--import com.facebook.android.crypto.keychain.AndroidConceal;
--import com.facebook.android.crypto.keychain.SharedPrefsBackedKeyChain;
--import com.facebook.crypto.Crypto;
--import com.facebook.crypto.CryptoConfig;
--import com.facebook.crypto.Entity;
--import com.facebook.crypto.keychain.KeyChain;
--import com.facebook.react.bridge.ReactApplicationContext;
--import com.oblador.keychain.SecurityLevel;
--import com.oblador.keychain.exceptions.CryptoFailedException;
--
--import java.nio.charset.Charset;
--
--public class CipherStorageFacebookConceal implements CipherStorage {
--    public static final String CIPHER_STORAGE_NAME = "FacebookConceal";
--    public static final String KEYCHAIN_DATA = "RN_KEYCHAIN";
--    private final Crypto crypto;
--
--    public CipherStorageFacebookConceal(ReactApplicationContext reactContext) {
--        KeyChain keyChain = new SharedPrefsBackedKeyChain(reactContext, CryptoConfig.KEY_256);
--        this.crypto = AndroidConceal.get().createDefaultCrypto(keyChain);
--    }
--
--    @Override
--    public String getCipherStorageName() {
--        return CIPHER_STORAGE_NAME;
--    }
--
--    @Override
--    public int getMinSupportedApiLevel() {
--        return Build.VERSION_CODES.JELLY_BEAN;
--    }
--
--    @Override
--    public SecurityLevel securityLevel() {
--        return SecurityLevel.ANY;
--    }
--
--    @Override
--    public boolean supportsSecureHardware() {
--        return false;
--    }
--
--    @Override
--    public EncryptionResult encrypt(@NonNull String service, @NonNull String username, @NonNull String password, SecurityLevel level) throws CryptoFailedException {
--
--        if (!this.securityLevel().satisfiesSafetyThreshold(level)) {
--            throw new CryptoFailedException(String.format("Insufficient security level (wants %s; got %s)", level, this.securityLevel()));
--        }
--
--        if (!crypto.isAvailable()) {
--            throw new CryptoFailedException("Crypto is missing");
--        }
--        Entity usernameEntity = createUsernameEntity(service);
--        Entity passwordEntity = createPasswordEntity(service);
--
--        try {
--            byte[] encryptedUsername = crypto.encrypt(username.getBytes(Charset.forName("UTF-8")), usernameEntity);
--            byte[] encryptedPassword = crypto.encrypt(password.getBytes(Charset.forName("UTF-8")), passwordEntity);
--
--            return new EncryptionResult(encryptedUsername, encryptedPassword, this);
--        } catch (Exception e) {
--            throw new CryptoFailedException("Encryption failed for service " + service, e);
--        }
--    }
--
--    @Override
--    public DecryptionResult decrypt(@NonNull String service, @NonNull byte[] username, @NonNull byte[] password) throws CryptoFailedException {
--        if (!crypto.isAvailable()) {
--            throw new CryptoFailedException("Crypto is missing");
--        }
--        Entity usernameEntity = createUsernameEntity(service);
--        Entity passwordEntity = createPasswordEntity(service);
--
--        try {
--            byte[] decryptedUsername = crypto.decrypt(username, usernameEntity);
--            byte[] decryptedPassword = crypto.decrypt(password, passwordEntity);
--
--            return new DecryptionResult(
--                    new String(decryptedUsername, Charset.forName("UTF-8")),
--                    new String(decryptedPassword, Charset.forName("UTF-8")),
--                    SecurityLevel.ANY);
--        } catch (Exception e) {
--            throw new CryptoFailedException("Decryption failed for service " + service, e);
--        }
--    }
--
--    @Override
--    public void removeKey(@NonNull String service) {
--        // Facebook Conceal stores only one key across all services, so we cannot delete the key (otherwise decryption will fail for encrypted data of other services).
--    }
--
--    private Entity createUsernameEntity(String service) {
--        String prefix = getEntityPrefix(service);
--        return Entity.create(prefix + "user");
--    }
--
--    private Entity createPasswordEntity(String service) {
--        String prefix = getEntityPrefix(service);
--        return Entity.create(prefix + "pass");
--    }
--
--    private String getEntityPrefix(String service) {
--        return KEYCHAIN_DATA + ":" + service;
--    }
--}

apps/mobile/patches/react-native-mmkv-storage+0.11.2.patch

@@ -0,0 +1,14 @@
+diff --git a/node_modules/react-native-mmkv-storage/android/build.gradle b/node_modules/react-native-mmkv-storage/android/build.gradle
+index abb696e..ba35baa 100644
+--- a/node_modules/react-native-mmkv-storage/android/build.gradle
++++ b/node_modules/react-native-mmkv-storage/android/build.gradle
+@@ -98,7 +98,8 @@ android {
+       cmake {
+         cppFlags "-O3 -frtti -fexceptions -Wall -fstack-protector-all"
+         arguments "-DANDROID_STL=c++_shared",
+-                  "-DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION}"
++                  "-DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION}",
++                  "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
+         abiFilters (*reactNativeArchitectures())
+       }
+     }

apps/mobile/scripts/optimize-fonts.mjs

@@ -70,7 +70,6 @@ const EXTRA_ICON_NAMES = [
   "chevron-down",
   "calendar",
   "minus-circle-outline",
-  "circle-outline",
   "close-circle-outline",
   "qrcode",
   "text",

apps/mobile/share/fetch-webview.js

@@ -28,6 +28,7 @@ import RNFetchBlob from "react-native-blob-util";
 import WebView from "react-native-webview";
 import { Config } from "./store";
 import { db } from "../app/common/database";
+import { SUBSCRIPTION_STATUS } from "../app/utils/constants";
 
 export const fetchHandle = createRef();
 export const HtmlLoadingWebViewAgent = React.memo(
@@ -39,7 +40,6 @@ export const HtmlLoadingWebViewAgent = React.memo(
     const webview = useRef();
     const premium = useRef(false);
     const corsProxy = Config.corsProxy;
-    const [isLoggedIn, setIsLoggedIn] = useState();
 
     useImperativeHandle(
       fetchHandle,
@@ -72,8 +72,11 @@ export const HtmlLoadingWebViewAgent = React.memo(
     useEffect(() => {
       (async () => {
         const user = await db.user.getUser();
-        setIsLoggedIn(!!user);
-        console.log("USER", !!user);
+        const subscriptionStatus =
+          user?.subscription?.type || SUBSCRIPTION_STATUS.BASIC;
+        premium.current =
+          user && subscriptionStatus !== SUBSCRIPTION_STATUS.BASIC;
+
         const clipperPath =
           Platform.OS === "ios"
             ? RNFetchBlob.fs.dirs.MainBundleDir +
@@ -88,7 +91,6 @@ export const HtmlLoadingWebViewAgent = React.memo(
           .catch((e) => console.log(e));
       })();
     }, []);
-    console.log(isLoggedIn);
 
     return !source || !clipper ? null : (
       <WebView
@@ -101,8 +103,7 @@ export const HtmlLoadingWebViewAgent = React.memo(
           height: 100,
           position: "absolute",
           opacity: 0,
-          zIndex: -1,
-          pointerEvents: "none"
+          zIndex: -1
         }}
         useSharedProcessPool={false}
         pointerEvents="none"
@@ -122,11 +123,7 @@ export const HtmlLoadingWebViewAgent = React.memo(
             console.log("Error handling webview message", e);
           }
         }}
-        injectedJavaScriptBeforeContentLoaded={script(
-          clipper,
-          corsProxy,
-          isLoggedIn
-        )}
+        injectedJavaScriptBeforeContentLoaded={script(clipper, premium.current)}
         onError={() => {
           console.log("Error loading page");
           loadHandler.current?.();
@@ -140,11 +137,9 @@ export const HtmlLoadingWebViewAgent = React.memo(
   () => true
 );
 
-const script = (clipper, corsProxy, loggedIn) => `
-globalThis.module = {};
+const script = (clipper, pro) => `
 ${clipper}
 
-
 function postMessage(type, value) {
   if (window.ReactNativeWebView) {
     window.ReactNativeWebView.postMessage(
@@ -163,10 +158,10 @@ function postMessage(type, value) {
         postMessage("error", globalThis.Clipper.clipPage);
       } else {
         globalThis.Clipper.clipPage(document,false, {
-          images: ${loggedIn ? "true" : "false"},
+          images: ${pro},
           inlineImages: false,
           styles: false,
-          corsProxy: ${corsProxy ? `"${corsProxy}"` : "undefined"}
+          corsProxy: undefined
         }).then(result => {
           postMessage("html", result);
         }).catch(e => {

apps/mobile/share/share.js

@@ -19,11 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import ShareExtension from "@ammarahmed/react-native-share-extension";
 import { getPreviewData } from "@flyerhq/react-native-link-preview";
-import {
-  formatBytes,
-  isFeatureAvailable,
-  useIsFeatureAvailable
-} from "@notesnook/common";
+import { formatBytes } from "@notesnook/common";
 import { isImage } from "@notesnook/core";
 import { useThemeColors } from "@notesnook/theme";
 import React, { useCallback, useEffect, useRef, useState } from "react";
@@ -123,7 +119,6 @@ const ShareView = () => {
   const noteTitle = useRef("");
   const [loading, setLoading] = useState(false);
   const [loadingExtension, setLoadingExtension] = useState(true);
-  const fullQualityImages = useIsFeatureAvailable("fullQualityImages");
   const [rawData, setRawData] = useState({
     type: null,
     value: null
@@ -166,12 +161,6 @@ const ShareView = () => {
     };
   }, []);
 
-  useEffect(() => {
-    if (!fullQualityImages?.isAllowed) {
-      setCompress(true);
-    }
-  }, [fullQualityImages]);
-
   const showLinkPreview = async (note, link) => {
     let _note = note;
     _note.content.data = makeHtmlFromUrl(link);
@@ -234,14 +223,14 @@ const ShareView = () => {
             }
           } else {
             const user = await db.user.getUser();
-            if (user) {
-              const feature = await isFeatureAvailable(
-                "fileSize",
-                item.size || 0
-              );
-              if (!feature.isAllowed) {
+            if (user && user.subscription.type !== 0) {
+              if (
+                (isImage(item.type) && item.size > IMAGE_SIZE_LIMIT) ||
+                (!isImage(item.type) && item.size > FILE_SIZE_LIMIT)
+              ) {
                 continue;
               }
+
               setRawFiles((files) => {
                 const index = files.findIndex(
                   (file) => file.name === item.name
@@ -267,6 +256,7 @@ const ShareView = () => {
   );
 
   const onLoad = useCallback(() => {
+    console.log(noteContent.current, "current...");
     eSendEvent(eOnLoadNote + "shareEditor", {
       id: null,
       content: {
@@ -501,7 +491,7 @@ const ShareView = () => {
                       style={{
                         flexShrink: 1,
                         flexGrow: 1,
-                        fontFamily: "Inter-SemiBold",
+                        fontFamily: "OpenSans-SemiBold",
                         fontSize: AppFontSize.lg,
                         paddingBottom: 0,
                         paddingTop: 0
@@ -516,7 +506,7 @@ const ShareView = () => {
                       style={{
                         flexShrink: 1,
                         flexGrow: 1,
-                        fontFamily: "Inter-SemiBold",
+                        fontFamily: "OpenSans-SemiBold",
                         fontSize: AppFontSize.lg,
                         paddingBottom: 0,
                         paddingTop: 0,
@@ -642,9 +632,7 @@ const ShareView = () => {
                           marginTop: 6
                         }}
                         onPress={() => {
-                          if (fullQualityImages?.isAllowed) {
-                            setCompress(!compress);
-                          }
+                          setCompress(!compress);
                         }}
                       >
                         <Icon
@@ -655,7 +643,7 @@ const ShareView = () => {
                               : "checkbox-blank-outline"
                           }
                           color={
-                            compress && fullQualityImages?.isAllowed
+                            compress
                               ? colors.primary.accent
                               : colors.primary.icon
                           }
@@ -746,7 +734,7 @@ const ShareView = () => {
                   </Paragraph>
                   {rawData.value && isURL(rawData.value) ? (
                     <Button
-                      type={mode === 2 ? "inverted" : "plain"}
+                      type={mode === 2 ? "inverted" : "transparent"}
                       icon={mode === 2 ? "radiobox-marked" : "radiobox-blank"}
                       onPress={() => changeMode(2)}
                       title={modes[2].title}
@@ -757,9 +745,9 @@ const ShareView = () => {
                     />
                   ) : null}
                   <Button
-                    type={mode === 1 ? "inverted" : "plain"}
+                    type={mode === 1 ? "inverted" : "transparent"}
                     icon={mode === 1 ? "radiobox-marked" : "radiobox-blank"}
-                    onPress={() => changeMode(1)}
+                    onPress={() => changeMode(2)}
                     title={modes[1].title}
                     height={30}
                     style={{

apps/mobile/share/store.js

@@ -68,10 +68,11 @@ export const useShareStore = create((set) => ({
     let appendNote = MMKV.getString(StorageKeys.appendNote);
     let selectedNotebooks = MMKV.getString(StorageKeys.selectedNotebooks);
     let selectedTags = MMKV.getString(StorageKeys.selectedTag);
+    appendNote = JSON.parse(appendNote);
     set({
       appendNote: appendNote,
       selectedNotebooks: selectedNotebooks ? JSON.parse(selectedNotebooks) : [],
-      selectedTags: selectedTags ? JSON.parse(selectedTags) : []
+      selectedTag: selectedTags ? JSON.parse(selectedTags) : []
     });
   },
   selectedTags: [],

apps/mobile/tsconfig.json

@@ -15,7 +15,10 @@
       "@notesnook/theme": ["../../packages/theme"],
       "@types/react": ["./node_modules/@types/react"],
       "react": ["./node_modules/react"]
-    }
+    },
+    "incremental": true,
+    "maxNodeModuleJsDepth": 5,
+    "downlevelIteration": true
   },
   "exclude": ["native", "e2e"]
 }

apps/monograph/package.json

@@ -5,10 +5,10 @@
   "sideEffects": false,
   "type": "module",
   "scripts": {
-    "build": "npm run fonts && remix vite:build",
+    "build": "bun run fonts && remix vite:build",
     "dev": "remix vite:dev",
     "typecheck": "tsc",
-    "fonts": "node scripts/font-loader.mjs",
+    "fonts": "bun run scripts/font-loader.mjs",
     "start": "bun server.ts"
   },
   "dependencies": {
@@ -19,12 +19,12 @@
     "@lingui/react": "5.1.2",
     "@mdi/js": "^7.4.47",
     "@napi-rs/canvas": "0.1.59",
-    "@notesnook/core": "file:../../packages/core",
-    "@notesnook/crypto": "file:../../packages/crypto",
-    "@notesnook/editor": "file:../../packages/editor",
-    "@notesnook/intl": "file:../../packages/intl",
-    "@notesnook/theme": "file:../../packages/theme",
-    "@notesnook/ui": "file:../../packages/ui",
+    "@notesnook/core": "link:@notesnook/core",
+    "@notesnook/crypto": "link:@notesnook/crypto",
+    "@notesnook/editor": "link:@notesnook/editor",
+    "@notesnook/intl": "link:@notesnook/intl",
+    "@notesnook/theme": "link:@notesnook/theme",
+    "@notesnook/ui": "link:@notesnook/ui",
     "@remix-run/node": "^2.12.1",
     "@remix-run/react": "^2.12.1",
     "@sagi.io/workers-kv": "^0.0.14",