mobile: fix incorrect note loaded when

note is very large

.commitlintrc.js

@@ -20,7 +20,6 @@ const SCOPES = [
   "logger",
   "theme",
   "core",
-  "fs",
   "clipper",
   "config",
   "ci",
@@ -28,7 +27,6 @@ const SCOPES = [
   "docs",
   "refactor",
   "misc",
-  "common",
   "global"
 ];
 

.eslintignore

@@ -21,7 +21,4 @@ packages/editor/styles/
 packages/editor/languages/
 
 # editor mobile
-packages/editor-mobile/build.bundle
-
-# snapshots
-tap-snapshots
+packages/editor-mobile/build.bundle

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

@@ -1,27 +0,0 @@
-name: 'Setup node with cache action'
-description: 'Setups node with cache'
-
-runs:
-  using: "composite"
-  steps:
-    - name: Setup Node
-      uses: actions/setup-node@v3
-      with:
-        node-version: 16.x
-        cache: "npm"
-        cache-dependency-path: |
-          package-lock.json
-          apps/mobile/package-lock.json
-          apps/desktop/package-lock.json
-          apps/web/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/crypto-worker/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

.github/dco.yml

@@ -1,4 +0,0 @@
-allowRemediationCommits:
-  individual: true
-require:
-  members: false

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

@@ -1,51 +0,0 @@
-name: Publish @notesnook/android-internal
-
-on: workflow_dispatch
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    timeout-minutes: 40
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Use specific Java version for the builds
-        uses: joschi/setup-jdk@v2
-        with:
-          java-version: '11'
-          architecture: 'x64'
-
-      - name: Install node modules
-        run: |
-          npm ci
-      - name: Make Gradlew Executable
-        run: cd apps/mobile/native/android && chmod +x ./gradlew
-
-      - name: Build unsigned app bundle
-        run: yarn release:android:bundle
-
-      - name: Sign app bundle for Playstore release
-        id: sign_app
-        uses: r0adkll/sign-android-release@v1
-        with:
-          releaseDirectory: apps/mobile/native/android/app/build/outputs/bundle/release
-          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
-          alias: ${{ secrets.ALIAS }}
-          keyStorePassword: ${{ secrets.KEY_PASSWORD }}
-          keyPassword: ${{ secrets.KEY_PASSWORD }}   
-
-      - name: Publish to Playstore
-        id: deploy
-        uses: r0adkll/upload-google-play@v1
-        with:
-          serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
-          packageName: com.streetwriters.notesnook
-          releaseFile: ${{steps.sign_app.outputs.signedReleaseFile}}
-          track: internal
-          status: completed
-          whatsNewDirectory: apps/mobile/native/android/releasenotes/             

.github/workflows/android.publish.yml

@@ -11,8 +11,21 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
+      - uses: actions/setup-node@master
+        with:
+          node-version: '16'
+          cache: 'npm'
+          cache-dependency-path: |
+            apps/mobile/package-lock.json
+            apps/web/package-lock.json
+            packages/core/package-lock.json
+            packages/crypto/package-lock.json
+            packages/crypto-worker/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
 
       - name: Use specific Java version for the builds
         uses: joschi/setup-jdk@v2
@@ -37,18 +50,7 @@ jobs:
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEY_PASSWORD }}
-          keyPassword: ${{ secrets.KEY_PASSWORD }}  
-
-      - name: Publish to Playstore
-        id: deploy
-        uses: r0adkll/upload-google-play@v1.1.1
-        with:
-          serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
-          packageName: com.streetwriters.notesnook
-          releaseFiles: ${{steps.sign_app.outputs.signedReleaseFile}}
-          track: production
-          status: completed
-          whatsNewDirectory: apps/mobile/native/android/releasenotes/      
+          keyPassword: ${{ secrets.KEY_PASSWORD }}        
 
       - name: Build apks for Github release
         run: yarn release:android
@@ -89,4 +91,15 @@ jobs:
             apps/mobile/native/android/app/build/outputs/apk/release/notesnook-arm64-v8a.apk
             apps/mobile/native/android/app/build/outputs/apk/release/notesnook-armeabi-v7a.apk
             apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86.apk
-            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86_64.apk           
+            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86_64.apk
+
+      - name: Publish to Playstore
+        id: deploy
+        uses: r0adkll/upload-google-play@v1
+        with:
+          serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
+          packageName: com.streetwriters.notesnook
+          releaseFile: ${{steps.sign_app.outputs.signedReleaseFile}}
+          track: production
+          status: completed
+          whatsNewDirectory: apps/mobile/native/android/releasenotes/             

.github/workflows/core.tests.yml

@@ -24,7 +24,21 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+          cache: "npm"
+          cache-dependency-path: |
+            apps/mobile/package-lock.json
+            apps/web/package-lock.json
+            packages/core/package-lock.json
+            packages/crypto/package-lock.json
+            packages/crypto-worker/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
 
       - name: Prepare environment
         run: |

.github/workflows/desktop.publish.yml

@@ -28,7 +28,21 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+          cache: "npm"
+          cache-dependency-path: |
+            apps/mobile/package-lock.json
+            apps/web/package-lock.json
+            packages/core/package-lock.json
+            packages/crypto/package-lock.json
+            packages/crypto-worker/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
 
       - name: Install packages
         run: |
@@ -50,7 +64,7 @@ jobs:
 
       - name: Collect app metadata
         id: app_metadata
-        working-directory: ./apps/desktop
+        working-directory: ./apps/web/desktop
         run: |
           echo ::set-output name=app_version::$(cat package.json | jq -r .version)
 
@@ -77,9 +91,6 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v3
 
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
       - name: Setup notarization
         run: |
           mkdir -p ~/private_keys/
@@ -87,7 +98,7 @@ jobs:
 
       - name: Collect app metadata
         id: app_metadata
-        working-directory: ./apps/desktop
+        working-directory: ./apps/web/desktop
         run: |
           echo ::set-output name=apple_app_id::$(cat package.json | jq -r .appAppleId)
           echo ::set-output name=app_bundle_id::$(cat package.json | jq -r .build.appId)
@@ -104,20 +115,24 @@ jobs:
           private-key-raw: ${{ secrets.api_key }}
           platform: "MAC_OS"
 
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+
       - name: Download build
         uses: actions/download-artifact@v3
         with:
           name: build
-          path: ./apps/desktop/build
+          path: ./apps/web/desktop/build
 
       - name: Install packages
-        run: |
-          npm i --ignore-scripts --prefer-offline --no-audit
-          npx lerna bootstrap --ignore=@notesnook/mobile -- --prefer-offline --no-audit
+        run: npm i
+        working-directory: ./apps/web/desktop
       
       - name: Install provisioning profile
         run: echo "${{ secrets.MAC_PROVISIONING_PROFILE }}" | base64 --decode > embedded.provisionprofile
-        working-directory: ./apps/desktop
+        working-directory: ./apps/web/desktop
 
       - name: Build app for Mac App Store
         if: inputs.publish-apple && steps.appstore.outputs.app-version-latest != steps.app_metadata.outputs.app_version
@@ -125,9 +140,9 @@ jobs:
           CSC_LINK: ${{ secrets.mac_certs }}
           CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }}
         run: |
-          npx nx run release --project @notesnook/desktop -- --variant=mas
-          npm run builder -- --mac mas --universal -p never
-        working-directory: ./apps/desktop
+          npm run build:mas
+          npx electron-builder --mac mas --universal -p never
+        working-directory: ./apps/web/desktop
 
       - name: Build zip and dmg
         env:
@@ -138,13 +153,13 @@ jobs:
           APPLE_API_KEY_ID: ${{ secrets.api_key_id }}
           APPLE_API_KEY_ISSUER: ${{ secrets.api_key_issuer_id }}
         run: |
-          npx nx run release --project @notesnook/desktop
+          npm run build
           if [ ${{ inputs.publish-github }} == true ]; then
-            npm run builder -- --mac zip dmg --arm64 --x64 -p always
+            npx electron-builder --mac zip dmg --arm64 --x64 -p always
           else
-            npm run builder -- --mac zip dmg --arm64 --x64 -p never
+            npx electron-builder --mac zip dmg --arm64 --x64 -p never
           fi
-        working-directory: ./apps/desktop
+        working-directory: ./apps/web/desktop
 
       - name: Deploy to Testflight
         if: inputs.publish-apple && steps.appstore.outputs.app-version-latest != steps.app_metadata.outputs.app_version
@@ -152,12 +167,12 @@ jobs:
           API_KEY_ID: ${{ secrets.api_key_id }}
           API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }}
         run: |       
-          package=$(find ./output/mas-universal/notesnook*.pkg)
+          package=$(find ./dist/mas-universal/notesnook*.pkg)
 
           echo "Uploading ${package} using altool..."
 
           xcrun altool --upload-package $package -t osx --apiKey $API_KEY_ID --apiIssuer $API_KEY_ISSUER_ID --apple-id ${{ steps.app_metadata.outputs.apple_app_id }} --bundle-id ${{ steps.app_metadata.outputs.app_bundle_id }} --bundle-short-version-string ${{ steps.app_metadata.outputs.app_version }} --bundle-version ${{ steps.app_metadata.outputs.bundle_version }}
-        working-directory: ./apps/desktop
+        working-directory: ./apps/web/desktop
 
   build-linux:
     name: Build for Linux
@@ -168,9 +183,6 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v3
 
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
       - name: Setup Snapcraft Auth
         if: inputs.publish-snap
         run: echo "SNAPCRAFT_STORE_CREDENTIALS=${{ secrets.snapcraft_token }}" >> $GITHUB_ENV
@@ -178,44 +190,48 @@ jobs:
       - name: Install Snapcraft
         uses: samuelmeuli/action-snapcraft@v1
         if: inputs.publish-snap
+        
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
 
       - name: Download build
         uses: actions/download-artifact@v3
         with:
           name: build
-          path: ./apps/desktop/build
+          path: ./apps/web/desktop/build
 
       - name: Install packages
-        run: |
-          npm i --ignore-scripts --prefer-offline --no-audit
-          npx lerna bootstrap --ignore=@notesnook/mobile -- --prefer-offline --no-audit
+        run: npm i
+        working-directory: ./apps/web/desktop
 
       - name: Build Electron wrapper
-        run: npx nx run release --project @notesnook/desktop
-        working-directory: ./apps/desktop
+        run: npm run build
+        working-directory: ./apps/web/desktop
 
       - name: Build snap
         if: inputs.publish-snap
         run: |
-          npm run builder -- --linux snap:x64 -p never
-        working-directory: ./apps/desktop
+          npx electron-builder --linux snap -p never
+        working-directory: ./apps/web/desktop
 
-      - name: Build AppImage
+      - name: Build AppImage deb and rpm
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           if [ ${{ inputs.publish-github }} == true ]; then
-            npm run builder -- --linux AppImage:x64 AppImage:arm64 -p always
+            npx electron-builder --linux AppImage deb rpm -p always
           else
-            npm run builder -- --linux AppImage:x64 AppImage:arm64 -p never
+            npx electron-builder --linux AppImage deb rpm -p never
           fi
-        working-directory: ./apps/desktop
+        working-directory: ./apps/web/desktop
 
       - name: Publish on Snapcraft
         if: inputs.publish-snap
         run: |
-          snapcraft upload --release=stable ./output/notesnook_linux_amd64.snap
-        working-directory: ./apps/desktop
+          snapcraft upload --release=stable ./dist/notesnook_linux_amd64.snap
+        working-directory: ./apps/web/desktop
 
   build-windows:
     name: Build for Windows
@@ -227,30 +243,31 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
 
       - name: Download build
         uses: actions/download-artifact@v3
         with:
           name: build
-          path: ./apps/desktop/build
+          path: ./apps/web/desktop/build
 
       - name: Install packages
-        run: |
-          npm i --ignore-scripts --prefer-offline --no-audit
-          npx lerna bootstrap --ignore=@notesnook/mobile -- --prefer-offline --no-audit
+        run: npm i
+        working-directory: ./apps/web/desktop
 
       - name: Build Electron wrapper
-        run: npx nx run release --project @notesnook/desktop
-        working-directory: ./apps/desktop
+        run: npm run build
+        working-directory: ./apps/web/desktop
 
       - name: Build app
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           if ($${{ inputs.publish-github }} -eq $true) {
-            yarn electron-builder --win --publish always
+            npx electron-builder --win --publish always
           } else {
-            yarn electron-builder --win --publish never
+            npx electron-builder --win --publish never
           }
-        working-directory: ./apps/desktop
+        working-directory: ./apps/web/desktop

.github/workflows/editor.tests.yml

@@ -1,43 +0,0 @@
-name: Test @notesnook/editor
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - "master"
-    paths:
-      - "packages/editor/**"
-      # re-run workflow if workflow file changes
-      - ".github/workflows/editor.tests.yml"
-  pull_request:
-    types:
-      - "ready_for_review"
-      - "opened"
-      - "synchronize"
-      - "reopened"
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Install packages
-        run: |
-          npm i --ignore-scripts --prefer-offline --no-audit
-          npx lerna bootstrap --ignore=@notesnook/mobile -- --prefer-offline --no-audit
-
-      - name: Setup environment
-        run: |
-          echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
-
-      - name: Build editor
-        run: npx nx build @notesnook/editor
-
-      - name: Run all @notesnook/editor tests
-        run: npx nx test @notesnook/editor

.github/workflows/web.publish.yml

@@ -11,7 +11,21 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+          cache: "npm"
+          cache-dependency-path: |
+            apps/mobile/package-lock.json
+            apps/web/package-lock.json
+            packages/core/package-lock.json
+            packages/crypto/package-lock.json
+            packages/crypto-worker/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
 
       - name: Install packages
         run: |

.github/workflows/web.tests.yml

@@ -25,7 +25,21 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+          cache: "npm"
+          cache-dependency-path: |
+            apps/mobile/package-lock.json
+            apps/web/package-lock.json
+            packages/core/package-lock.json
+            packages/crypto/package-lock.json
+            packages/crypto-worker/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
 
       - name: Install packages
         run: |
@@ -62,7 +76,21 @@ jobs:
           path: ./apps/web/build
 
       - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+          cache: "npm"
+          cache-dependency-path: |
+            apps/mobile/package-lock.json
+            apps/web/package-lock.json
+            packages/core/package-lock.json
+            packages/crypto/package-lock.json
+            packages/crypto-worker/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
 
       - name: Install packages
         run: |

.gitignore

@@ -6,5 +6,4 @@ dist
 nx-cloud.env
 .idea
 .eslintcache
-.env.local
-.nyc_output
+.env.local

.vscode/extensions.json

@@ -1,11 +0,0 @@
-{
-  // See https://go.microsoft.com/fwlink/?LinkId=827846
-  // for the documentation about the extensions.json format
-  "recommendations": [
-    "dbaeumer.vscode-eslint",
-    "esbenp.prettier-vscode",
-    "ms-playwright.playwright",
-    "firefox-devtools.vscode-firefox-debug",
-    "msjsdiag.vscode-react-native"
-  ]
-}

.vscode/notesnook.code-workspace

@@ -1,72 +0,0 @@
-{
-  "folders": [
-    {
-      "name": "✨ notesnook",
-      "path": ".."
-    },
-    {
-      "name": "🚀 @notesnook/mobile",
-      "path": "../apps/mobile"
-    },
-    {
-      "name": "🚀 @notesnook/web",
-      "path": "../apps/web"
-    },
-    {
-      "name": "🚀 @notesnook/desktop",
-      "path": "../apps/web/desktop"
-    },
-    {
-      "name": "🚀 @notesnook/web-clipper",
-      "path": "../extensions/web-clipper"
-    },
-    {
-      "name": "📦 @notesnook/clipper",
-      "path": "../packages/clipper"
-    },
-    {
-      "name": "📦 @notesnook/core",
-      "path": "../packages/core"
-    },
-    {
-      "name": "📦 @notesnook/crypto",
-      "path": "../packages/crypto"
-    },
-    {
-      "name": "📦 @notesnook/crypto-worker",
-      "path": "../packages/crypto-worker"
-    },
-    {
-      "name": "📦 @notesnook/editor",
-      "path": "../packages/editor"
-    },
-    {
-      "name": "📦 @notesnook/editor-mobile",
-      "path": "../packages/editor-mobile"
-    },
-    {
-      "name": "📦 @notesnook/logger",
-      "path": "../packages/logger"
-    },
-    {
-      "name": "📦 @notesnook/streamable-fs",
-      "path": "../packages/streamable-fs"
-    },
-    {
-      "name": "📦 @notesnook/theme",
-      "path": "../packages/theme"
-    }
-  ],
-  "settings": {
-    "typescript.tsdk": "node_modules/typescript/lib",
-    "javascript.format.enable": true,
-    "editor.formatOnSave": true,
-    "editor.formatOnSaveMode": "modificationsIfAvailable",
-    "eslint.packageManager": "npm",
-    "eslint.run": "onSave",
-    "[javascript]": {
-      "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "eslint.execArgv": ["--cache"]
-  }
-}

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "typescript.tsdk": "node_modules/typescript/lib"
+}

CONTRIBUTING.md

@@ -8,9 +8,9 @@ Thank you so much for considering to contribute to Notesnook! If you have no ide
 
 Ugh! Bugs!
 
-> A bug is when software behaves in a way you didn't expect, which the developer didn't intend.
+> A bug is when software behaves in a way that you didn't expect, and the developer didn't intend.
 
-To help us understand what's happening, we first want to **make sure you're using the latest version of Notesnook**.
+To help us understand what's going on, we first want to **make sure you're using the latest version of Notesnook**.
 
 Once you've **confirmed that the bug still exists in the latest version**, you'll want to check to make sure it's not something we already know about in the [opened GitHub issues](https://github.com/streetwriters/notesnook/issues).
 
@@ -28,9 +28,15 @@ If you've thought of a way that Notesnook could be better, we want to hear about
 
 Before you open a new feature request, please make sure it's not a duplicate. **Duplicate feature requests & bug reports are closed immediately.**
 
+### Improving documentation
+
+All app related documentation can be found in the `docs/` directory. All the files in this directory are simple markdown files which you can edit either directly on GitHub, or in your favorite text editor.
+
+If you find a mistake in the documentation or would like to contribute something new to the documentation, feel free to open a pull request; creating an issue for this is not required.
+
 ### Helping out in the issue tracker
 
-New issues are always opened that need to be triaged, sorted & organized, so the developers can easily find the most critical and/or relevant bugs to fix. Any help in this regard is appreciated.
+There are always new issues getting opened that need to be triaged, sorted & organized, so the developers can easily find the most critical and/or relevant bugs to fix. Any help in this regard is appreciated.
 
 In addition to this, you can help out in the following ways:
 
@@ -62,7 +68,7 @@ Once you are done, [open a new pull request](https://docs.github.com/en/pull-req
 
 1. Fork [the repository](https://github.com/streetwriters/notesnook) and create your branch from `master` (you can name your branch anything).
 2. Run `npm run bootstrap` in the repository root.
-3. If you've fixed a bug or added code that should be tested, add tests!
+3. If you’ve fixed a bug or added code that should be tested, add tests!
 4. Ensure the test suite passes (`npm run test`).
 5. Format your code with prettier (`npm run prettier`).
 6. Make sure your code lints (`npm run lint`). Tip: `npm run linc` to only check changed files.
@@ -85,11 +91,7 @@ The DCO is a declaration attached to every contribution made by every developer
 Signed-off-by: Jane Smith <jane.smith@email.com>
 ```
 
-On VSCode, it looks like this:
-
-![](resources/vscode-signed-off-commit.png)
-
-You may type this line on your own when writing your commit messages. However, if your [user.name](http://user.name) and [user.email](http://user.email) are set in your git configs, you can use `-s` or `--signoff` to add the `Signed-off-by` line to the end of the commit message automatically.
+You may type this line on your own when writing your commit messages. However, if your [user.name](http://user.name) and [user.email](http://user.email) are set in your git configs, you can use `-s` or `--signoff` to add the `Signed-off-by` line to the end of the commit message.
 
 #### Include `<scope>:` in your commit message
 
@@ -131,11 +133,11 @@ We use an automatic code formatter called [Prettier](https://prettier.io/). Run
 
 Then, our linter will catch most issues that may exist in your code. You can check the status of your code styling by simply running `npm run lint`.
 
-However, there are still some styles that the linter cannot pick up. If you are unsure about something, looking at [Airbnb's Style Guide](https://github.com/airbnb/javascript) will guide you in the right direction.
+However, there are still some styles that the linter cannot pick up. If you are unsure about something, looking at [Airbnb’s Style Guide](https://github.com/airbnb/javascript) will guide you in the right direction.
 
 ## Git Branch Organization
 
-Submit all changes directly to the [`master branch`](https://github.com/streetwriters/notesnook). We don't use separate branches for development or for upcoming releases. This requires us to always keep the `master` branch in a deployable state which means:
+Submit all changes directly to the [`master branch`](https://github.com/streetwriters/notesnook). We don’t use separate branches for development or for upcoming releases. This requires us to always keep the `master` branch in a deployable state which means:
 
 1. All tests must be passing at all times
 2. There should be as few breaking changes as possible

README.md

@@ -10,11 +10,11 @@
 
 ## Overview
 
-Notesnook is a free (as in speech) & open-source note-taking app focused on user privacy & ease of use. To ensure zero knowledge principles, Notesnook encrypts everything on your device using `XChaCha20-Poly1305` & `Argon2`.
+Notesnook is a free (as in speech) & open source note taking app focused on user privacy & ease of use. To ensure zero knowledge principles, Notesnook encrypts everything on your device using `XChaCha20-Poly1305` & `Argon2`.
 
-Notesnook is our **proof** that privacy does _not_ (always) have to come at the cost of convenience. We aim to provide users peace of mind & 100% confidence that their notes are safe and secure. The decision to go fully open source is one of the most crucial steps towards that.
+Notesnook is our **proof** that privacy does _not_ (always) have to come at the cost of convenience. Our goal is to provide users peace of mind & 100% confidence that their notes are safe and secure. The decision to go fully open source is one of the most crucial steps towards that.
 
-This repository contains all the code required to build & use the Notesnook web, desktop & mobile clients. If you are looking for a full feature list or screenshots, please check the [website](https://notesnook.com/).
+This repository contains all the code required to build & use the Notesnook web, desktop & mobile clients. If you are looking for a full features list or screenshots, please check the [website](https://notesnook.com/).
 
 ## Developer guide
 
@@ -25,30 +25,25 @@ Notesnook is built using the following technologies:
 1. JavaScript/Typescript — this repo is in a hybrid state. A lot of the newer code is being written in Typescript & the old code is slowly being ported over.
 2. React — the whole front-end across all platforms is built using React.
 3. React Native — For mobile apps we are using React Native
-4. Electron — For desktop app
-5. NPM — listed here because we **don't** use Yarn or PNPM or XYZ across any of our projects.
-6. Lerna & Nx — maintaining monorepos is hard but Nx makes it easier.
+4. NPM — listed here because we **don't** use Yarn or PNPM or XYZ across any of our projects.
+5. Lerna & Nx — maintaining monorepos is hard but Nx makes it easier.
 
 > **Note: Each project in the monorepo contains its own architecture details which you can refer to.**
 
 ### Monorepo structure
 
-| Name                       | Path                                               | Description                                                          |
-| -------------------------- | -------------------------------------------------- | -------------------------------------------------------------------- |
-| `@notesnook/web`           | [/apps/web](/apps/web)                             | Web client                                                           |
-| `@notesnook/desktop`       | [/apps/desktop](/apps/desktop)                     | Desktop client                                                       |
-| `@notesnook/mobile`        | [/apps/mobile](/apps/mobile)                       | Android/iOS clients                                                  |
-| `@notesnook/web-clipper`   | [/extensions/web-clipper](/extensions/web-clipper) | Web clipper                                                          |
-| `@notesnook/core`          | [/packages/core](/packages/core)                   | Shared core between all platforms                                    |
-| `@notesnook/crypto`        | [/packages/crypto](/packages/crypto)               | Cryptography library wrapper around libsodium                        |
-| `@notesnook/clipper`       | [/packages/clipper](/packages/clipper)             | Web clipper core handling everything related to actual page clipping |
-| `@notesnook/editor`        | [/packages/editor](/packages/editor)               | Notesnook editor + all extensions                                    |
-| `@notesnook/editor-mobile` | [/packages/editor-mobile](/packages/editor-mobile) | A very thin wrapper around `@notesnook/editor` for mobile clients    |
-| `@notesnook/logger`        | [/packages/logger](/packages/logger)               | Simple & pluggable logger                                            |
-| `@notesnook/sodium`        | [/packages/sodium](/packages/sodium)               | Wrapper around libsodium to support Node.js & Browser                |
-| `@notesnook/crypto-worker` | [/packages/crypto-worker](/packages/crypto-worker) | Helpers to use `@notesnook/crypto` from a Worker                     |
-| `@notesnook/streamable-fs` | [/packages/streamable-fs](/packages/streamable-fs) | Streaming interface around an IndexedDB based file system            |
-| `@notesnook/theme`         | [/packages/theme](/packages/theme)                 | The core theme used in web & desktop clients                         |
+| Name                       | Path                                               | Description                                                       |
+| -------------------------- | -------------------------------------------------- | ----------------------------------------------------------------- |
+| `@notesnook/web`           | [/apps/web](/apps/web)                             | Web/Desktop clients                                               |
+| `@notesnook/mobile`        | [/apps/mobile](/apps/mobile)                       | Android/iOS clients                                               |
+| `@notesnook/core`          | [/packages/core](/packages/core)                   | Shared core between all platforms                                 |
+| `@notesnook/crypto`        | [/packages/crypto](/packages/crypto)               | Cryptography library wrapper around libsodium                     |
+| `@notesnook/editor`        | [/packages/editor](/packages/editor)               | Notesnook editor + all extensions                                 |
+| `@notesnook/editor-mobile` | [/packages/editor-mobile](/packages/editor-mobile) | A very thin wrapper around `@notesnook/editor` for mobile clients |
+| `@notesnook/logger`        | [/packages/logger](/packages/logger)               | Simple & pluggable logger                                         |
+| `@notesnook/crypto-worker` | [/packages/crypto-worker](/packages/crypto-worker) | Helpers to use `@notesnook/crypto` from a Worker                  |
+| `@notesnook/streamable-fs` | [/packages/streamable-fs](/packages/streamable-fs) | Streaming interface around an IndexedDB based file system         |
+| `@notesnook/theme`         | [/packages/theme](/packages/theme)                 | The core theme used in web & desktop clients                      |
 
 ### Contributing guidelines
 

apps/desktop/.gitignore

@@ -1,4 +0,0 @@
-node_modules
-build
-output
-dist

apps/desktop/README.md

@@ -1,58 +0,0 @@
-<p align="center">
-<img style="align:center;" src="/resources/screenshots/web.jpg" alt="Notesnook desktop screenshot" width="600" />
-</p>
-
-<h1 align="center">Notesnook Desktop</h1>
-<h3 align="center">The desktop app is built using Electron & Typescript.</h3>
-<p align="center">
-<a href="https://notesnook.com/downloads">Downloads</a> | <a href="#developer-guide">Developer guide</a> | <a href="#build-instructions">How to build?</a>
-</p>
-
-## Getting started
-
-## Build instructions
-
-> **Before you start, it is recommended that you read [the contributing guidelines](/CONTRIBUTING.md).**
-
-### Setting up the development environment
-
-Requirements:
-
-1. [Node.js](https://nodejs.org/en/download/)
-2. [git](https://git-scm.com/downloads)
-3. NPM (not yarn or pnpm)
-
-Before you can do anything, you'll need to [install Node.js](https://nodejs.org/en/download/) v16 or later on your system.
-
-Once you have completed the setup, the first step is to `clone` the monorepo:
-
-```bash
-git clone https://github.com/streetwriters/notesnook.git
-
-# change directory
-cd notesnook
-```
-
-Once you are inside the `./notesnook` directory, run the preparation step:
-
-```bash
-# this might take a while to complete
-npm install
-```
-
-Now you can finally start the desktop app:
-
-```bash
-npm run start:desktop
-```
-
-## Developer guide
-
-### The tech stack
-
-We try to keep the stack as lean as possible:
-
-1. Electron
-2. tRPC: for cross-communication between the web & desktop parts
-3. zod: for runtime typechecking
-4. yargs: for CLI argument parsing

apps/desktop/global.d.ts

@@ -1,52 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/* eslint-disable no-var */
-
-import { BrowserWindow } from "electron";
-import * as undici_types from "undici";
-
-declare global {
-  export const {
-    fetch,
-    FormData,
-    Headers,
-    Request,
-    Response
-  }: typeof import("undici");
-
-  type FormData = undici_types.FormData;
-  type Headers = undici_types.Headers;
-  type HeadersInit = undici_types.HeadersInit;
-  type BodyInit = undici_types.BodyInit;
-  type Request = undici_types.Request;
-  type RequestInit = undici_types.RequestInit;
-  type RequestInfo = undici_types.RequestInfo;
-  type RequestMode = undici_types.RequestMode;
-  type RequestRedirect = undici_types.RequestRedirect;
-  type RequestCredentials = undici_types.RequestCredentials;
-  type RequestDestination = undici_types.RequestDestination;
-  type ReferrerPolicy = undici_types.ReferrerPolicy;
-  type Response = undici_types.Response;
-  type ResponseInit = undici_types.ResponseInit;
-  type ResponseType = undici_types.ResponseType;
-
-  var window: BrowserWindow | null;
-  var RELEASE: boolean;
-  var MAC_APP_STORE: boolean;
-}

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

@@ -1,36 +0,0 @@
-diff --git a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
-index ffcc8bd..7e57c9e 100644
---- a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
-+++ b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
-@@ -105,6 +105,7 @@ class LinuxTargetHelper {
-             StartupWMClass: appInfo.productName,
-             ...extra,
-             ...targetSpecificOptions.desktop,
-+            actions: undefined
-         };
-         const description = this.getDescription(targetSpecificOptions);
-         if (!builder_util_1.isEmptyOrSpaces(description)) {
-@@ -148,6 +149,23 @@ class LinuxTargetHelper {
-             data += `\n${name}=${desktopMeta[name]}`;
-         }
-         data += "\n";
-+       
-+        if (targetSpecificOptions.desktop.actions) {
-+            let actionsData = "";
-+            const validActions = [];
-+            for (const action of targetSpecificOptions.desktop.actions) {
-+                if (!action.id || !action.name || !action.args) continue;
-+                actionsData += "\n";
-+                actionsData += `[Desktop Action ${action.id}]
-+Name=${action.name}
-+Exec=${desktopMeta.Exec} ${action.args}`;
-+                actionsData += "\n";
-+
-+                validActions.push(action.id);
-+            }
-+
-+            data += `Actions=${validActions.join(";")};\n${actionsData}`
-+        }
-         return Promise.resolve(data);
-     }
- }

apps/desktop/scripts/build.mjs

@@ -1,72 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import path from "path";
-import fs from "fs/promises";
-import { $, argv, os } from "zx";
-
-$.env = process.env;
-
-const sodiumNativePrebuildPath = path.join(
-  `node_modules`,
-  `@notesnook`,
-  `crypto`,
-  `node_modules`,
-  `@notesnook`,
-  `sodium`,
-  `node_modules`,
-  `sodium-native`,
-  `prebuilds`,
-  `${os.platform()}-x64`
-);
-
-if (argv.rebuild) {
-  await fs.rm("./build/", { force: true, recursive: true });
-
-  await $`cd ../web/ && npm run build:desktop`;
-
-  await fs.cp(path.join("..", "web", "build"), "build", {
-    recursive: true,
-    force: true
-  });
-}
-
-if (argv.variant === "mas") {
-  await $`npm run bundle:mas`;
-} else {
-  await $`npm run bundle`;
-}
-
-await $`tsc`;
-await $`npm rebuild`;
-
-await fs.cp(
-  sodiumNativePrebuildPath,
-  path.join("build", "prebuilds", `${process.platform}-x64`),
-  {
-    recursive: true,
-    force: true
-  }
-);
-
-if (argv.run) {
-  await $`npm run builder -- --linux AppImage:x64`;
-
-  await $`./output/notesnook_linux_x86_64.AppImage`;
-}

apps/desktop/scripts/dev.ts

@@ -1,116 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import path from "path";
-import fs from "fs/promises";
-import { watch } from "turbowatch";
-import { $, within } from "zx";
-
-const sodiumNativePrebuildPath = path.join(
-  `node_modules`,
-  `@notesnook`,
-  `crypto`,
-  `node_modules`,
-  `@notesnook`,
-  `sodium`,
-  `node_modules`,
-  `sodium-native`,
-  `prebuilds`
-);
-let isServerRunning = false;
-
-async function main() {
-  const { shutdown } = await watch({
-    project: path.join(__dirname, ".."),
-    cwd: path.join(__dirname, ".."),
-    triggers: [
-      {
-        expression: [
-          "allof",
-          ["not", ["dirname", "node_modules"]],
-          ["match", "*.ts", "basename"]
-        ],
-        name: "dev",
-        // retry: { retries: 0 },
-        onTeardown: async () => {
-          await fs.rm("./build/", { force: true, recursive: true });
-        },
-        onChange: async ({ spawn: $, first, log }) => {
-          if (first) {
-            await fs.rm("./build/", { force: true, recursive: true });
-          }
-
-          await $`npm run bundle`;
-          await $`tsc`;
-
-          if (first) {
-            await fs.cp(sodiumNativePrebuildPath, "build/prebuilds", {
-              recursive: true,
-              force: true
-            });
-          }
-
-          if (!isServerRunning) {
-            await spawnAndWaitUntil(
-              path.join(__dirname, "..", "..", "web"),
-              "npm run start:desktop",
-              (data) => data.includes("Network: use --host to expose")
-            );
-            isServerRunning = true;
-          }
-
-          await $`npx electron ${path.join("build", "electron.js")}`;
-        }
-      }
-    ]
-  });
-
-  // SIGINT is the signal sent when we press Ctrl+C
-  process.once("SIGINT", () => {
-    void shutdown();
-  });
-}
-
-main();
-
-function spawnAndWaitUntil(
-  cwd: string,
-  cmd: string,
-  predicate: (data: string) => boolean
-) {
-  return new Promise((resolve) => {
-    within(async () => {
-      $.env = process.env;
-      $.env.NO_COLOR = "true";
-      $.quote = (c) => c;
-
-      try {
-        const s = $`cd ${cwd} && ${cmd}`;
-        s.stdout.on("data", (data) => {
-          if (predicate(data)) resolve(undefined); //
-        });
-        await s;
-      } catch (e) {
-        //ignore
-      } finally {
-        isServerRunning = false;
-      }
-    });
-  });
-}

apps/desktop/src/api/bridge.ts

@@ -1,58 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { initTRPC } from "@trpc/server";
-import { observable } from "@trpc/server/observable";
-import { EventEmitter } from "events";
-import TypedEventEmitter from "typed-emitter";
-
-export type AppEvents = {
-  onCreateItem(name: "note" | "notebook" | "reminder"): void;
-};
-
-const emitter = new EventEmitter();
-const typedEmitter = emitter as TypedEventEmitter<AppEvents>;
-const t = initTRPC.create();
-
-export const bridgeRouter = t.router({
-  onCreateItem: createSubscription("onCreateItem")
-});
-
-export const bridge: AppEvents = new Proxy({} as AppEvents, {
-  get(_t, name) {
-    if (typeof name === "symbol") return;
-    return (...args: unknown[]) => {
-      emitter.emit(name, ...args);
-    };
-  }
-});
-
-function createSubscription<TName extends keyof AppEvents>(eventName: TName) {
-  return t.procedure.subscription(() => {
-    return observable<Parameters<AppEvents[TName]>[0]>((emit) => {
-      const listener: AppEvents[TName] = (...args: any[]) => {
-        emit.next(args[0]);
-      };
-      typedEmitter.addListener(eventName, listener);
-      return () => {
-        typedEmitter.removeListener(eventName, listener);
-      };
-    });
-  });
-}

apps/desktop/src/api/compression.ts

@@ -1,39 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-import zlib from "node:zlib";
-import utils from "node:util";
-import { initTRPC } from "@trpc/server";
-import { z } from "zod";
-
-const t = initTRPC.create();
-
-const gzipAsync = utils.promisify(zlib.gzip);
-const gunzipAsync = utils.promisify(zlib.gunzip);
-
-export const compressionRouter = t.router({
-  gzip: t.procedure
-    .input(z.object({ data: z.string(), level: z.number() }))
-    .query(async ({ input }) => {
-      const { data, level } = input;
-      return (await gzipAsync(data, { level })).toString("base64");
-    }),
-  gunzip: t.procedure.input(z.string()).query(async ({ input }) => {
-    return (await gunzipAsync(Buffer.from(input, "base64"))).toString("utf-8");
-  })
-});

apps/desktop/src/api/index.ts

@@ -1,41 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { initTRPC } from "@trpc/server";
-import { compressionRouter } from "./compression";
-import { osIntegrationRouter } from "./os-integration";
-import { spellCheckerRouter } from "./spell-checker";
-import { updaterRouter } from "./updater";
-import { bridgeRouter } from "./bridge";
-
-const t = initTRPC.create();
-
-export const router = t.router({
-  compress: compressionRouter,
-  integration: osIntegrationRouter,
-  spellChecker: spellCheckerRouter,
-  updater: updaterRouter,
-  bridge: bridgeRouter
-});
-
-export const api = router.createCaller({});
-
-// Export type router type signature,
-// NOT the router itself.
-export type AppRouter = typeof router;

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

@@ -1,160 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { initTRPC } from "@trpc/server";
-import { z } from "zod";
-import { dialog, nativeTheme, Notification, shell } from "electron";
-import { AutoLaunch } from "../utils/autolaunch";
-import { config, DesktopIntegration } from "../utils/config";
-import { bringToFront } from "../utils/bring-to-front";
-import { getTheme, setTheme, Theme } from "../utils/theme";
-import { mkdirSync, writeFileSync } from "fs";
-import { dirname, join } from "path";
-import { platform } from "os";
-import { resolvePath } from "../utils/resolve-path";
-import { observable } from "@trpc/server/observable";
-
-const t = initTRPC.create();
-
-const NotificationOptions = z.object({
-  title: z.string().optional(),
-  body: z.string().optional(),
-  silent: z.boolean().optional(),
-  timeoutType: z.union([z.literal("default"), z.literal("never")]).optional(),
-  urgency: z
-    .union([z.literal("normal"), z.literal("critical"), z.literal("low")])
-    .optional(),
-  tag: z.string()
-});
-
-export const osIntegrationRouter = t.router({
-  zoomFactor: t.procedure.query(() => config.zoomFactor),
-  setZoomFactor: t.procedure.input(z.number()).mutation(({ input: factor }) => {
-    globalThis.window?.webContents.setZoomFactor(factor);
-    config.zoomFactor = factor;
-  }),
-
-  privacyMode: t.procedure.query(() => config.privacyMode),
-  setPrivacyMode: t.procedure
-    .input(z.boolean())
-    .mutation(({ input: privacyMode }) => {
-      if (!globalThis.window || !["win32", "darwin"].includes(process.platform))
-        return;
-
-      globalThis.window.setContentProtection(privacyMode);
-
-      if (process.platform === "win32") {
-        globalThis.window.setThumbnailClip(
-          privacyMode
-            ? { x: 0, y: 0, width: 1, height: 1 }
-            : { x: 0, y: 0, width: 0, height: 0 }
-        );
-      }
-      config.privacyMode = privacyMode;
-    }),
-
-  desktopIntegration: t.procedure.query(() => config.desktopSettings),
-  setDesktopIntegration: t.procedure
-    .input(DesktopIntegration)
-    .mutation(({ input: settings }) => {
-      if (settings.autoStart) {
-        AutoLaunch.enable(settings.startMinimized);
-      } else {
-        AutoLaunch.disable();
-      }
-      config.desktopSettings = settings;
-    }),
-
-  selectDirectory: t.procedure
-    .input(
-      z.object({
-        title: z.string().optional(),
-        buttonLabel: z.string().optional(),
-        defaultPath: z.string().optional()
-      })
-    )
-    .query(async ({ input }) => {
-      if (!globalThis.window) return undefined;
-
-      const { title, buttonLabel, defaultPath } = input;
-
-      const result = await dialog.showOpenDialog(globalThis.window, {
-        title,
-        buttonLabel,
-        properties: ["openDirectory"],
-        defaultPath: defaultPath && resolvePath(defaultPath)
-      });
-      if (result.canceled) return undefined;
-
-      return result.filePaths[0];
-    }),
-
-  saveFile: t.procedure
-    .input(z.object({ data: z.string(), filePath: z.string() }))
-    .query(({ input }) => {
-      const { data, filePath } = input;
-      if (!data || !filePath) return;
-
-      const resolvedPath = resolvePath(filePath);
-
-      mkdirSync(dirname(resolvedPath), { recursive: true });
-      writeFileSync(resolvedPath, data);
-    }),
-
-  showNotification: t.procedure
-    .input(NotificationOptions)
-    .query(({ input }) => {
-      const notification = new Notification({
-        ...input,
-        icon: join(
-          __dirname,
-          platform() === "win32" ? "app.ico" : "favicon-72x72.png"
-        )
-      });
-      notification.show();
-      if (input.urgency === "critical") {
-        shell.beep();
-      }
-
-      return new Promise((resolve) => {
-        notification.once("close", () => resolve(undefined));
-        notification.once("click", () => resolve(input.tag));
-      });
-    }),
-  openPath: t.procedure
-    .input(z.object({ type: z.literal("path"), link: z.string() }))
-    .query(({ input }) => {
-      const { type, link } = input;
-      if (type === "path") return shell.openPath(resolvePath(link));
-    }),
-  bringToFront: t.procedure.query(() => bringToFront()),
-  changeTheme: t.procedure
-    .input(Theme)
-    .mutation(({ input }) => setTheme(input)),
-
-  onThemeChanged: t.procedure.subscription(() =>
-    observable<"dark" | "light">((emit) => {
-      nativeTheme.on("updated", () => {
-        if (getTheme() === "system") {
-          emit.next(nativeTheme.shouldUseDarkColors ? "dark" : "light");
-        }
-      });
-    })
-  )
-});

apps/desktop/src/api/spell-checker.ts

@@ -1,122 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { initTRPC } from "@trpc/server";
-import { z } from "zod";
-import { config } from "../utils/config";
-
-const t = initTRPC.create();
-
-const LANGUAGES: Record<string, string> = {
-  af: "Afrikaans",
-  bg: "Bulgarian",
-  ca: "Catalan",
-  cs: "Czech",
-  cy: "Welsh",
-  da: "Danish",
-  de: "German",
-  "de-DE": "German (Germany)",
-  el: "Greek",
-  en: "English",
-  "en-AU": "English (Australia)",
-  "en-CA": "English (Canada)",
-  "en-GB": "English (UK)",
-  "en-GB-oxendict": "English (UK Oxford)",
-  "en-US": "English (US)",
-  es: "Spanish",
-  "es-419": "Spanish (Latin America)",
-  "es-AR": "Spanish (Argentina)",
-  "es-ES": "Spanish (Spain)",
-  "es-MX": "Spanish (Mexico)",
-  "es-US": "Spanish (US)",
-  et: "Estonian",
-  fa: "Persian",
-  fo: "Faroese",
-  fr: "French",
-  "fr-FR": "French (France)",
-  he: "Hebrew",
-  hi: "Hindi",
-  hr: "Croatian",
-  hu: "Hungarian",
-  hy: "Armenian",
-  id: "Indonesian",
-  it: "Italian",
-  "it-IT": "Italian (Italy)",
-  ko: "Korean",
-  lt: "Lithuanian",
-  lv: "Latvian",
-  nb: "Norwegian Bokmål",
-  nl: "Dutch",
-  pl: "Polish",
-  pt: "Portuguese",
-  "pt-BR": "Portuguese (Brazil)",
-  "pt-PT": "Portuguese (Portugal)",
-  ro: "Romanian",
-  ru: "Russian",
-  sh: "Serbo-Croatian",
-  sk: "Slovak",
-  sl: "Slovenian",
-  sq: "Albanian",
-  sr: "Serbian",
-  sv: "Swedish",
-  ta: "Tamil",
-  tg: "Tajik",
-  tr: "Turkish",
-  uk: "Ukrainian",
-  vi: "Vietnamese"
-};
-
-type Language = { code: string; name: string };
-
-export const spellCheckerRouter = t.router({
-  isEnabled: t.procedure.query(() => config.isSpellCheckerEnabled),
-  languages: t.procedure.query(
-    () =>
-      <Language[]>(
-        globalThis.window?.webContents.session.availableSpellCheckerLanguages.map(
-          (code) => ({
-            code,
-            name: LANGUAGES[code]
-          })
-        )
-      )
-  ),
-  enabledLanguages: t.procedure.query(
-    () =>
-      <Language[]>(
-        globalThis.window?.webContents.session
-          .getSpellCheckerLanguages()
-          .map((code) => ({
-            code,
-            name: LANGUAGES[code]
-          }))
-      )
-  ),
-  setLanguages: t.procedure
-    .input(z.array(z.string()))
-    .mutation(({ input: languages }) =>
-      globalThis.window?.webContents.session.setSpellCheckerLanguages(languages)
-    ),
-  toggle: t.procedure
-    .input(z.boolean().optional())
-    .mutation(({ input: enabled }) => {
-      globalThis.window?.webContents.session.setSpellCheckerEnabled(!!enabled);
-      config.isSpellCheckerEnabled = !!enabled;
-    })
-});

apps/desktop/src/api/updater.ts

@@ -1,71 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { initTRPC } from "@trpc/server";
-import { observable } from "@trpc/server/observable";
-import { CancellationToken, autoUpdater } from "electron-updater";
-import type { AppUpdaterEvents } from "electron-updater/out/AppUpdater";
-
-type UpdateInfo = { version: string };
-type Progress = { percent: number };
-
-const t = initTRPC.create();
-
-export const updaterRouter = t.router({
-  install: t.procedure.query(() => autoUpdater.quitAndInstall()),
-  download: t.procedure.query(async () => {
-    const cancellationToken = new CancellationToken();
-    await autoUpdater.downloadUpdate(cancellationToken);
-  }),
-  check: t.procedure.query(async () => {
-    await autoUpdater.checkForUpdates();
-  }),
-
-  onChecking: createSubscription("checking-for-update"),
-  onDownloaded: createSubscription<"update-downloaded", UpdateInfo>(
-    "update-downloaded"
-  ),
-  onDownloadProgress: createSubscription<"download-progress", Progress>(
-    "download-progress"
-  ),
-  onNotAvailable: createSubscription<"update-not-available", UpdateInfo>(
-    "update-not-available"
-  ),
-  onAvailable: createSubscription<"update-available", UpdateInfo>(
-    "update-available"
-  ),
-  onError: createSubscription("error")
-});
-
-function createSubscription<
-  TName extends keyof AppUpdaterEvents,
-  TReturnType = Parameters<AppUpdaterEvents[TName]>[0]
->(eventName: TName) {
-  return t.procedure.subscription(() => {
-    return observable<TReturnType>((emit) => {
-      const listener: AppUpdaterEvents[TName] = (...args: any[]) => {
-        emit.next(args[0]);
-      };
-      autoUpdater.addListener(eventName, listener);
-      return () => {
-        autoUpdater.removeListener(eventName, listener);
-      };
-    });
-  });
-}

apps/desktop/src/cli.ts

@@ -1,84 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import yargs from "yargs";
-import { hideBin } from "yargs/helpers";
-
-export type CLIOptions = {
-  note: boolean | string;
-  notebook: boolean | string;
-  reminder: boolean | string;
-  hidden: boolean;
-};
-
-export async function parseArguments(): Promise<CLIOptions> {
-  const result: CLIOptions = {
-    note: false,
-    notebook: false,
-    reminder: false,
-    hidden: false
-  };
-  const { hidden } = await yargs(hideBin(process.argv))
-    .boolean("hidden")
-    .command("new", "Create a new item", (yargs) => {
-      return yargs
-        .command("note", "Create a new note", {}, () => {
-          result.note = true;
-        })
-        .command("notebook", "Create a new notebook", {}, () => {
-          result.notebook = true;
-        })
-        .command("reminder", "Add a new reminder", {}, () => {
-          result.reminder = true;
-        });
-    })
-    .command("open", "Open a specific item", (yargs) => {
-      return yargs
-        .command(
-          "note",
-          "Open a note",
-          { id: { string: true, description: "Id of the note" } },
-          (args) => {
-            result.note = args.id || false;
-          }
-        )
-        .command(
-          "notebook",
-          "Open a notebook",
-          { id: { string: true, description: "Id of the notebook" } },
-          (args) => {
-            result.notebook = args.id || false;
-          }
-        )
-        .command(
-          "topic",
-          "Open a topic",
-          {
-            id: { string: true, description: "Id of the topic" },
-            notebookId: { string: true, description: "Id of the notebook" }
-          },
-          (args) => {
-            result.notebook = `${args.notebookId}/${args.id}`;
-          }
-        );
-    })
-    .parse();
-  result.hidden = hidden || false;
-  return result;
-}

apps/desktop/src/index.ts

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

apps/desktop/src/main.ts

@@ -1,213 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/* global MAC_APP_STORE, RELEASE */
-
-import { app, BrowserWindow, nativeTheme, shell } from "electron";
-import { isDevelopment } from "./utils";
-import { registerProtocol, PROTOCOL_URL } from "./utils/protocol";
-import { configureAutoUpdater } from "./utils/autoupdater";
-import { getBackgroundColor, getTheme, setTheme } from "./utils/theme";
-import { setupMenu } from "./utils/menu";
-import { WindowState } from "./utils/window-state";
-import { AutoLaunch } from "./utils/autolaunch";
-import { setupJumplist } from "./utils/jumplist";
-import { setupTray } from "./utils/tray";
-import { CLIOptions, parseArguments } from "./cli";
-import { AssetManager } from "./utils/asset-manager";
-import { createIPCHandler } from "electron-trpc/main";
-import { router, api } from "./api";
-import { config } from "./utils/config";
-
-if (!RELEASE) {
-  require("electron-reloader")(module);
-}
-
-// only run a single instance
-
-if (!MAC_APP_STORE && !app.requestSingleInstanceLock()) {
-  app.exit();
-}
-
-if (process.platform === "win32") {
-  app.setAppUserModelId(app.name);
-}
-
-async function createWindow() {
-  await AssetManager.loadIcons();
-  const cliOptions = await parseArguments();
-
-  const mainWindowState = new WindowState({});
-  setTheme(getTheme());
-
-  const mainWindow = new BrowserWindow({
-    show: false,
-    x: mainWindowState.x,
-    y: mainWindowState.y,
-    width: mainWindowState.width,
-    height: mainWindowState.height,
-    darkTheme: getTheme() === "dark",
-    backgroundColor: getBackgroundColor(),
-
-    autoHideMenuBar: true,
-    icon: AssetManager.appIcon({
-      size: 512,
-      format: process.platform === "win32" ? "ico" : "png"
-    }),
-    webPreferences: {
-      zoomFactor: config.zoomFactor,
-      devTools: true, // isDev,
-      nodeIntegration: true, //true,
-      contextIsolation: false,
-      spellcheck: config.isSpellCheckerEnabled,
-      preload: __dirname + "/preload.js"
-    }
-  });
-
-  mainWindow.on("show", async () => {
-    if (config.privacyMode) {
-      await api.integration.setPrivacyMode(config.privacyMode);
-    }
-  });
-
-  mainWindowState.manage(mainWindow);
-  globalThis.window = mainWindow;
-  setupMenu();
-  setupJumplist();
-  setupDesktopIntegration(cliOptions.hidden);
-  createIPCHandler({ router, windows: [mainWindow] });
-
-  mainWindow.webContents.session.setSpellCheckerDictionaryDownloadURL(
-    "http://dictionaries.notesnook.com/"
-  );
-
-  if (isDevelopment())
-    mainWindow.webContents.openDevTools({ mode: "right", activate: true });
-
-  try {
-    await mainWindow.loadURL(`${createURL(cliOptions)}`);
-  } catch (e) {
-    if (e instanceof Error) console.error(e);
-  }
-
-  mainWindow.on("closed", () => {
-    globalThis.window = null;
-  });
-
-  mainWindow.webContents.setWindowOpenHandler((details) => {
-    shell.openExternal(details.url);
-    return { action: "deny" };
-  });
-
-  nativeTheme.on("updated", () => {
-    setupTray();
-    setupJumplist();
-  });
-}
-
-app.commandLine.appendSwitch("lang", "en-US");
-app.on("ready", async () => {
-  console.info("App ready. Opening window.");
-
-  if (!isDevelopment()) registerProtocol();
-  await createWindow();
-  configureAutoUpdater();
-});
-
-app.on("window-all-closed", () => {
-  if (process.platform !== "darwin" || MAC_APP_STORE) {
-    app.quit();
-  }
-});
-
-app.on("activate", () => {
-  if (globalThis.window === null) {
-    createWindow();
-  }
-});
-
-function createURL(options: CLIOptions) {
-  const url = new URL(isDevelopment() ? "http://localhost:3000" : PROTOCOL_URL);
-
-  if (options.note === true) url.hash = "/notes/create/1";
-  else if (options.notebook === true) url.hash = "/notebooks/create";
-  else if (options.reminder === true) url.hash = "/reminders/create";
-  else if (typeof options.note === "string")
-    url.hash = `/notes/${options.note}/edit`;
-  else if (typeof options.notebook === "string")
-    url.hash = `/notebooks/${options.notebook}`;
-
-  return url;
-}
-
-function setupDesktopIntegration(hidden: boolean) {
-  const desktopIntegration = config.desktopSettings;
-
-  if (
-    desktopIntegration.closeToSystemTray ||
-    desktopIntegration.minimizeToSystemTray
-  ) {
-    setupTray();
-  }
-
-  globalThis.window?.on("ready-to-show", () => {
-    if (!hidden) {
-      globalThis.window?.show();
-    }
-
-    if (hidden && !desktopIntegration.minimizeToSystemTray) {
-      globalThis.window?.show();
-      globalThis.window?.minimize();
-    }
-  });
-
-  // when close to system tray is enabled, it becomes nigh impossible
-  // to "quit" the app. This is necessary in order to fix that.
-  if (desktopIntegration.closeToSystemTray) {
-    app.on("before-quit", () => app.exit(0));
-  }
-
-  globalThis.window?.on("close", (e) => {
-    if (config.desktopSettings.closeToSystemTray) {
-      e.preventDefault();
-      if (process.platform == "darwin") {
-        // on macOS window cannot be minimized/hidden if it is already fullscreen
-        // so we just close it.
-        if (globalThis.window?.isFullScreen()) app.exit(0);
-        else app.hide();
-      } else {
-        globalThis.window?.minimize();
-        globalThis.window?.hide();
-      }
-    }
-  });
-
-  globalThis.window?.on("minimize", () => {
-    if (config.desktopSettings.minimizeToSystemTray) {
-      if (process.platform == "darwin") {
-        app.hide();
-      } else {
-        globalThis.window?.hide();
-      }
-    }
-  });
-
-  if (desktopIntegration.autoStart) {
-    AutoLaunch.enable(desktopIntegration.startMinimized);
-  }
-}

apps/desktop/src/preload.ts

@@ -1,44 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/* eslint-disable no-var */
-
-import { ELECTRON_TRPC_CHANNEL } from "electron-trpc/main";
-import { type RendererGlobalElectronTRPC } from "electron-trpc/src/types";
-import { NNCrypto } from "@notesnook/crypto";
-import { ipcRenderer } from "electron";
-
-declare global {
-  var os: string;
-  var electronTRPC: RendererGlobalElectronTRPC;
-  var NativeNNCrypto: new () => NNCrypto;
-}
-console.log("HELLO", process);
-process.once("loaded", async () => {
-  console.log("HELLO!");
-  const electronTRPC: RendererGlobalElectronTRPC = {
-    sendMessage: (operation) =>
-      ipcRenderer.send(ELECTRON_TRPC_CHANNEL, operation),
-    onMessage: (callback) =>
-      ipcRenderer.on(ELECTRON_TRPC_CHANNEL, (_event, args) => callback(args))
-  };
-  globalThis.electronTRPC = electronTRPC;
-});
-
-globalThis.NativeNNCrypto = NNCrypto;
-globalThis.os = MAC_APP_STORE ? "mas" : process.platform;

apps/desktop/src/utils/asset-manager.ts

@@ -1,117 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { NativeImage, nativeImage } from "electron";
-import path from "path";
-import { isDevelopment } from "./index";
-import { parse, ParsedImage } from "icojs";
-import { readFileSync } from "fs";
-import { getSystemTheme } from "./theme";
-
-type Formats = "ico" | "png" | "icns";
-type IconOptions<TFormat extends Formats> = {
-  size?: 16 | 22 | 24 | 32 | 48 | 64 | 128 | 256 | 512 | 1024;
-  format?: TFormat;
-};
-
-type IconNames = (typeof icons)[number];
-type Prefixes = (typeof prefixes)[number];
-
-type FlexibleIcon<TFormat extends Formats> = TFormat extends "ico"
-  ? string
-  : NativeImage;
-
-const RESOURCES_DIR = isDevelopment()
-  ? process.cwd()
-  : process.platform === "darwin"
-  ? path.normalize(path.join(path.dirname(process.execPath), "..", "Resources"))
-  : path.join(path.dirname(process.execPath), "resources");
-
-const prefixes = ["", ".dark"];
-const icons = [
-  "note-add",
-  "notebook-add",
-  "reminder-add",
-  "quit",
-  "tray-icon"
-] as const;
-
-const ALL_ICONS: {
-  id: IconNames;
-  prefix: Prefixes;
-  images: ParsedImage[];
-}[] = [];
-
-export class AssetManager {
-  static async loadIcons() {
-    if (ALL_ICONS.length) return;
-
-    for (const prefix of prefixes) {
-      for (const icon of icons) {
-        const icoPath = path.join(
-          RESOURCES_DIR,
-          "assets",
-          "icons",
-          `${icon}${prefix}.ico`
-        );
-        const icoBuffer = readFileSync(icoPath);
-        const images = await parse(icoBuffer, "image/png");
-        ALL_ICONS.push({ id: icon, images, prefix });
-      }
-    }
-  }
-
-  static appIcon(options: IconOptions<Formats>) {
-    const { size = 32, format = "png" } = options;
-
-    if (format === "ico") return path.join("assets", "icons", "app.ico");
-    if (format === "icns") return path.join("assets", "icons", "app.icns");
-
-    return path.join("assets", "icons", `${size}x${size}.png`);
-  }
-
-  static icon<TFormat extends Formats>(
-    name: IconNames,
-    options: IconOptions<TFormat>
-  ): FlexibleIcon<TFormat> {
-    const { size = 16, format = "png" } = options;
-
-    const prefix: Prefixes = getSystemTheme() === "dark" ? ".dark" : "";
-
-    const icoPath = path.join(
-      RESOURCES_DIR,
-      "assets",
-      "icons",
-      `${name}${prefix}.ico`
-    );
-    if (format === "ico") return icoPath as FlexibleIcon<TFormat>;
-
-    const icon = ALL_ICONS.find((a) => a.id === name && a.prefix === prefix);
-    if (!icon)
-      return nativeImage.createFromPath(
-        AssetManager.appIcon(options)
-      ) as FlexibleIcon<TFormat>;
-
-    return nativeImage.createFromBuffer(
-      Buffer.from(
-        (icon.images.find((i) => i.height === size) || icon.images[0]).buffer
-      )
-    ) as FlexibleIcon<TFormat>;
-  }
-}

apps/desktop/src/utils/autolaunch.ts

@@ -1,70 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-import { app } from "electron";
-import { existsSync, mkdirSync, rmSync, writeFileSync } from "fs";
-import path from "path";
-
-const LINUX_DESKTOP_ENTRY = (hidden: boolean) => `[Desktop Entry]
-Type=Application
-Version=${app.getVersion()}
-Name=${app.getName()}
-Comment=${app.getName()} startup script
-Exec=${process.execPath}${hidden ? " --hidden" : ""}
-StartupNotify=false
-Terminal=false`;
-
-const LINUX_AUTOSTART_DIRECTORY_PATH = path.join(
-  app.getPath("home"),
-  ".config",
-  "autostart"
-);
-
-export class AutoLaunch {
-  static enable(hidden: boolean) {
-    if (process.platform === "linux") {
-      mkdirSync(LINUX_AUTOSTART_DIRECTORY_PATH, { recursive: true });
-      writeFileSync(
-        path.join(
-          LINUX_AUTOSTART_DIRECTORY_PATH,
-          `${app.getName().toLowerCase()}.desktop`
-        ),
-        LINUX_DESKTOP_ENTRY(hidden)
-      );
-    } else {
-      app.setLoginItemSettings({
-        openAtLogin: true,
-        openAsHidden: hidden,
-        args: ["--hidden"]
-      });
-    }
-  }
-
-  static disable() {
-    if (process.platform === "linux") {
-      const desktopFilePath = path.join(
-        LINUX_AUTOSTART_DIRECTORY_PATH,
-        `${app.getName().toLowerCase()}.desktop`
-      );
-      if (!existsSync(desktopFilePath)) return;
-      rmSync(desktopFilePath);
-    } else {
-      app.setLoginItemSettings({ openAtLogin: false, openAsHidden: false });
-    }
-  }
-}

apps/desktop/src/utils/config.ts

@@ -1,55 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { nativeTheme } from "electron";
-import { JSONStorage } from "./json-storage";
-import { z } from "zod";
-
-export const DesktopIntegration = z.object({
-  autoStart: z.boolean(),
-  startMinimized: z.boolean(),
-  minimizeToSystemTray: z.boolean(),
-  closeToSystemTray: z.boolean()
-});
-
-export type DesktopIntegration = z.infer<typeof DesktopIntegration>;
-
-export const config = {
-  desktopSettings: <DesktopIntegration>{
-    autoStart: false,
-    startMinimized: false,
-    minimizeToSystemTray: false,
-    closeToSystemTray: false
-  },
-  privacyMode: false,
-  isSpellCheckerEnabled: false,
-  zoomFactor: 0,
-  theme: nativeTheme.themeSource
-};
-
-type ConfigKey = keyof typeof config;
-for (const key in config) {
-  const defaultValue = config[<ConfigKey>key];
-  if (Object.hasOwn(config, key)) {
-    Object.defineProperty(config, key, {
-      get: () => JSONStorage.get(key, defaultValue),
-      set: (value) => JSONStorage.set(key, value)
-    });
-  }
-}

apps/desktop/src/utils/jumplist.ts

@@ -1,99 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { app, Menu } from "electron";
-import { AssetManager } from "./asset-manager";
-import { bringToFront } from "./bring-to-front";
-import { bridge } from "../api/bridge";
-
-export function setupJumplist() {
-  if (process.platform === "win32") {
-    setJumplistOnWindows();
-  } else if (process.platform === "darwin") {
-    setDockMenuOnMacOs();
-  }
-}
-
-function setJumplistOnWindows() {
-  app.setJumpList([
-    {
-      type: "custom",
-      name: "Quick actions",
-      items: [
-        {
-          program: process.execPath,
-          iconIndex: 0,
-          iconPath: AssetManager.icon("note-add", { format: "ico" }),
-          args: "new note",
-          description: "Create a new note",
-          title: "New note",
-          type: "task"
-        },
-        {
-          program: process.execPath,
-          iconIndex: 0,
-          iconPath: AssetManager.icon("notebook-add", { format: "ico" }),
-          args: "new notebook",
-          description: "Create a new notebook",
-          title: "New notebook",
-          type: "task"
-        },
-        {
-          program: process.execPath,
-          iconIndex: 0,
-          iconPath: AssetManager.icon("reminder-add", { format: "ico" }),
-          args: "new reminder",
-          description: "Add a new reminder",
-          title: "New reminder",
-          type: "task"
-        }
-      ]
-    }
-  ]);
-}
-
-function setDockMenuOnMacOs() {
-  const contextMenu = Menu.buildFromTemplate([
-    {
-      label: "New note",
-      type: "normal",
-      click: () => {
-        bringToFront();
-        bridge.onCreateItem("note");
-      }
-    },
-    {
-      label: "New notebook",
-      type: "normal",
-      click: () => {
-        bringToFront();
-        bridge.onCreateItem("notebook");
-      }
-    },
-    {
-      label: "New reminder",
-      type: "normal",
-      click: () => {
-        bringToFront();
-        bridge.onCreateItem("reminder");
-      }
-    }
-  ]);
-  app.dock.setMenu(contextMenu);
-}

apps/desktop/src/utils/theme.ts

@@ -1,75 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { nativeTheme } from "electron";
-import { config } from "./config";
-import { z } from "zod";
-
-export const Theme = z.union([
-  z.literal("system"),
-  z.literal("light"),
-  z.literal("dark")
-]);
-
-export type Theme = z.infer<typeof Theme>;
-
-function getTheme() {
-  return config.theme;
-}
-
-function setTheme(theme: Theme) {
-  changeTheme(theme);
-  if (globalThis.window)
-    globalThis.window.setBackgroundColor(getBackgroundColor());
-  config.theme = theme;
-}
-
-function getBackgroundColor() {
-  return nativeTheme.shouldUseDarkColors ? "#0f0f0f" : "#ffffff";
-}
-
-function getSystemTheme() {
-  const listeners = nativeTheme.rawListeners("updated");
-  nativeTheme.removeAllListeners("updated");
-
-  const oldThemeSource = nativeTheme.themeSource;
-  nativeTheme.themeSource = "system";
-  const currentTheme = nativeTheme.shouldUseDarkColors ? "dark" : "light";
-  nativeTheme.themeSource = oldThemeSource;
-
-  setTimeout(
-    () => listeners.forEach((a) => nativeTheme.addListener("updated", a)),
-    1000
-  );
-  return currentTheme;
-}
-
-export { getTheme, setTheme, getBackgroundColor, getSystemTheme };
-
-function changeTheme(theme: Theme) {
-  const listeners = nativeTheme.rawListeners("updated");
-  nativeTheme.removeAllListeners("updated");
-
-  nativeTheme.themeSource = theme;
-
-  setTimeout(
-    () => listeners.forEach((a) => nativeTheme.addListener("updated", a)),
-    1000
-  );
-}

apps/desktop/src/utils/tray.ts

@@ -1,91 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { app, Menu, Tray } from "electron";
-import { AssetManager } from "./asset-manager";
-import { isFlatpak } from "./index";
-import { bringToFront } from "./bring-to-front";
-import { bridge } from "../api/bridge";
-
-let tray: Tray | undefined = undefined;
-export function destroyTray() {
-  if (tray) tray.destroy();
-}
-
-export function setupTray() {
-  if (tray) tray.destroy();
-
-  const trayIconSize =
-    process.platform === "win32" || process.platform === "darwin" ? 16 : 32;
-
-  tray = new Tray(
-    AssetManager.icon("tray-icon", {
-      size: process.platform === "darwin" ? 22 : 32
-    })
-  );
-
-  const contextMenu = Menu.buildFromTemplate([
-    {
-      label: "Show app",
-      type: "normal",
-      icon: isFlatpak()
-        ? undefined
-        : AssetManager.icon("tray-icon", { size: trayIconSize }),
-      click: bringToFront
-    },
-    { type: "separator" },
-    {
-      label: "New note",
-      type: "normal",
-      icon: isFlatpak()
-        ? undefined
-        : AssetManager.icon("note-add", { size: trayIconSize }),
-      click: () => {
-        bringToFront();
-        bridge.onCreateItem("note");
-      }
-    },
-    {
-      label: "New notebook",
-      type: "normal",
-      icon: isFlatpak()
-        ? undefined
-        : AssetManager.icon("notebook-add", { size: trayIconSize }),
-      click: () => {
-        bringToFront();
-        bridge.onCreateItem("notebook");
-      }
-    },
-    { type: "separator" },
-    {
-      label: "Quit",
-      icon: isFlatpak()
-        ? undefined
-        : AssetManager.icon("quit", { size: trayIconSize }),
-      type: "normal",
-      click: () => {
-        app.exit(0);
-      }
-    }
-  ]);
-  tray.on("double-click", bringToFront);
-  if (process.platform !== "darwin") tray.on("click", bringToFront);
-  tray.setToolTip("Notesnook");
-  tray.setContextMenu(contextMenu);
-}

apps/desktop/tsconfig.json

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

apps/mobile/.github/workflows/android-public-release.yml

@@ -17,6 +17,15 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup npmrc
+        run: |
+          echo "registry=https://npm.pkg.github.com" > .npmrc
+          echo "@streetwriters:registry=https://npm.pkg.github.com" >> .npmrc
+          echo "//npm.pkg.github.com/:_authToken=${{secrets.PACKAGES_TOKEN}}" >> .npmrc
+
+      - name: Setup yarnrc
+        run: echo "\"@streetwriters:registry\" \"https://npm.pkg.github.com\"" > .yarnrc
+
       - uses: actions/setup-node@master
         with:
           node-version: "16"

apps/mobile/.github/workflows/android-release.yml

@@ -17,6 +17,15 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup npmrc
+        run: |
+          echo "registry=https://npm.pkg.github.com" > .npmrc
+          echo "@streetwriters:registry=https://npm.pkg.github.com" >> .npmrc
+          echo "//npm.pkg.github.com/:_authToken=${{secrets.PACKAGES_TOKEN}}" >> .npmrc
+
+      - name: Setup yarnrc
+        run: echo "\"@streetwriters:registry\" \"https://npm.pkg.github.com\"" > .yarnrc
+
       - uses: actions/setup-node@master
         with:
           node-version: "16"

apps/mobile/.vscode/launch.json

@@ -25,4 +25,4 @@
       "request": "attach"
     }
   ]
-}
+}

apps/mobile/.vscode/settings.json

@@ -0,0 +1 @@
+{}

apps/mobile/README.md

@@ -19,9 +19,9 @@
 
 ## Build instructions
 
-> **Before you start, it is recommended that you read [the contributing guidelines](/CONTRIBUTING.md).**
+> **Before you start it is recommended that you read [the contributing guidelines](/CONTRIBUTING.md).**
 
-### Setting up the development environment
+### Setting up development environment
 
 Requirements:
 
@@ -57,7 +57,7 @@ npm install
 
 ### Running the app on Android
 
-[Setup an Android emulator from Android Studio](https://developer.android.com/studio/run/managing-avds) if you haven't already, and then run the following command to start the app in the Emulator:
+[Setup an Android emulator from Android Studio](https://developer.android.com/studio/run/managing-avds) if you haven't already and then run the following command to start the app in the Emulator:
 
 ```bash
 npm run start:android
@@ -78,11 +78,11 @@ npm run start:ios
 
 ## Developer guide
 
-> This project is in a transition state between Javascript & Typescript. We are gradually porting everything over to Typescript, so if you can help with that, it'd be great!
+> This project is in a transition state between Javascript & Typescript. We are gradually porting everything over to Typescript so if you can help with that, it'd be great!
 
 ### The tech stack
 
-We try to keep the stack as lean as possible:
+We try to keep the stack as lean as possible
 
 1. React Native
 2. Typescript/Javascript
@@ -95,17 +95,17 @@ We try to keep the stack as lean as possible:
 
 The app codebase is distributed over two primary directories. `native/` and `app/`.
 
-- `native/`: Includes `android/` and `ios/` folders and everything related to react native core functionality like bundling, development, and packaging. Any react-native dependency with native code, i.e., android & ios folders, is installed here.
+- `native/`: Includes `android/` and `ios/` folders and everything related to react native core functionality like bundling, development and packaging. Any react-native dependency that has native code i.e android & ios folders, is installed here.
 
-- `app/`: Includes all the app code other than the native part. All JS-only dependencies are installed here.
-  - `components/`: Each component serves a specific purpose in the app UI. For example, the `Paragraph` component is used to render paragraphs in the app, and a `Header` component is used to render a `header` on all screens.
-  - `common/`: Features that are integral to the app's functionality. For example, the notesnook core is initialized here.
+- `app/`: Includes all the app code other than the native part. All JS only dependencies are installed here.
+  - `components/`: Each component serves a specific purpose in the app UI, for example the `Paragraph` component is used to render paragraphs in the app and a `Header` component is used to render a `header` on all screens.
+  - `common/`: Features that have integral role in app functionality, for example, notesnook core is initialized here.
   - `hooks/`: Hooks for different app logic
-  - `navigation/`: Includes app navigation-specific code. Here the app navigation, editor & side menu are rendered side by side in fluid tabs.
+  - `navigation/`: Includes app navigation specific code. Here the app navigation, editor & side menu are rendered side by side in fluid tabs.
   - `screens`: Navigator screens.
-  - `services`: Parts of code that do a specific function. For example, the `sync` service runs Sync from anywhere in the app.
-  - `stores`: We use `zustand` for global state management in the app. Multiple stores provide the state for different parts of the app.
-  - `utils`: General purpose stuff such as constant values, utility functions, etc.
+  - `services`: Parts of code that do a specific function, for example, the `sync` service is responsibe for running Sync from anywhere in the app.
+  - `stores`: We use `zustand` for global state management in the app. There are multiple stores that provide the state for different parts of the app.
+  - `utils`: General purpose stuff such as constant values, utility functions etc.
 
 There are several other folders at the root:
 
@@ -115,11 +115,11 @@ There are several other folders at the root:
 
 ### Running the tests
 
-When you are done making the required changes, you must run the tests to ensure you didn't break anything. We use Detox as the testing framework & the tests can be started as follows:
+When you are done making the required changes, you will need to run the tests to make sure you didn't break anything. We use Detox as the testing framework & the tests can be started as follows:
 
 ### Android
 
-To run the tests on Android, you will need to create an emulator device on your system:
+To run the tests on android, you will need to create an emulator device on your system:
 
 ```
 $ANDROID_HOME/tools/bin/avdmanager create avd -n Pixel_5_API_31 -d pixel --package "system-images;android-31;default;x86_64"
@@ -127,13 +127,13 @@ $ANDROID_HOME/tools/bin/avdmanager create avd -n Pixel_5_API_31 -d pixel --packa
 
 If you face problems, follow the detailed guide in [Detox documentation](https://wix.github.io/Detox/docs/introduction/android-dev-env). Keep the emulator name set to `Pixel_5_API_31`.
 
-Once you have created an emulator device, build the Android apks:
+Once you have created an emulator device, build the android apks
 
 ```
 npm run build:android
 ```
 
-Finally, run the tests:
+Finally run the tests
 
 ```
 npm run test:android
@@ -141,9 +141,9 @@ npm run test:android
 
 ### iOS
 
-To run e2e tests on the iOS simulator, you must be on a Mac with XCode installed.
+To run e2e tests on iOS simulator, you must be on a Mac with XCode installed.
 
-First, install [AppleSimulatorUtils](https://github.com/wix/AppleSimulatorUtils):
+First install [AppleSimulatorUtils](https://github.com/wix/AppleSimulatorUtils)
 
 ```
 brew tap wix/brew
@@ -156,7 +156,7 @@ Now build the iOS app for testing:
 npm run build:ios
 ```
 
-Finally, run the tests:
+Finally run the tests:
 
 ```
 npm run test:ios

apps/mobile/app/app.js

@@ -16,31 +16,42 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+
 import React, { useEffect } from "react";
-import { View } from "react-native";
-import "react-native-gesture-handler";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import { SafeAreaProvider } from "react-native-safe-area-context";
-import AppLockedOverlay from "./components/app-lock-overlay";
 import { withErrorBoundry } from "./components/exception-handler";
 import GlobalSafeAreaProvider from "./components/globalsafearea";
+import Launcher from "./components/launcher";
 import { useAppEvents } from "./hooks/use-app-events";
 import { ApplicationHolder } from "./navigation";
 import Notifications from "./services/notifications";
 import SettingsService from "./services/settings";
 import { TipManager } from "./services/tip-manager";
 import { useUserStore } from "./stores/use-user-store";
+import { View } from "react-native";
+import { useState } from "react";
+import NetInfo from "@react-native-community/netinfo";
+
+NetInfo.configure({
+  reachabilityUrl: "https://notesnook.com",
+  reachabilityTest: (response) => {
+    if (!response) return false;
+    return response?.status >= 200 && response?.status < 300;
+  }
+});
 
 SettingsService.init();
 SettingsService.checkOrientation();
 const App = () => {
-  const init = useAppEvents();
+  useAppEvents();
+  const [init, setInit] = useState(false);
   useEffect(() => {
     let { appLockMode } = SettingsService.get();
     if (appLockMode && appLockMode !== "none") {
-      useUserStore.getState().lockApp(true);
+      useUserStore.getState().setVerifyUser(true);
     }
-    init();
+    setInit(true);
     setTimeout(async () => {
       SettingsService.onFirstLaunch();
       await Notifications.get();
@@ -49,10 +60,7 @@ const App = () => {
       }
       TipManager.init();
     }, 100);
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-
   return (
     <View
       style={{
@@ -81,8 +89,8 @@ const App = () => {
         }}
       >
         <ApplicationHolder />
+        {init && <Launcher />}
       </GestureHandlerRootView>
-      <AppLockedOverlay />
     </View>
   );
 };

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

@@ -22,17 +22,10 @@ import "react-native-get-random-values";
 import * as Keychain from "react-native-keychain";
 import { generateSecureRandom } from "react-native-securerandom";
 import Sodium from "@ammarahmed/react-native-sodium";
-import { MMKV } from "./mmkv";
-
-const IOS_KEYCHAIN_ACCESS_GROUP = "group.org.streetwriters.notesnook";
-const IOS_KEYCHAIN_SERVICE_NAME = "org.streetwriters.notesnook";
-const IOS_KEYCHAIN_UPGRAGE_KEY = "keychain-ios:upgraded";
 
 const KEYSTORE_CONFIG = Platform.select({
   ios: {
-    accessible: Keychain.ACCESSIBLE.WHEN_UNLOCKED_THIS_DEVICE_ONLY,
-    accessGroup: IOS_KEYCHAIN_ACCESS_GROUP,
-    service: IOS_KEYCHAIN_SERVICE_NAME
+    accessible: Keychain.ACCESSIBLE.WHEN_UNLOCKED_THIS_DEVICE_ONLY
   },
   android: {}
 });
@@ -46,27 +39,12 @@ export async function deriveCryptoKey(name, data) {
       credentials.key,
       KEYSTORE_CONFIG
     );
-    MMKV.setBool(IOS_KEYCHAIN_UPGRAGE_KEY, true);
     return credentials.key;
   } catch (e) {
     console.error(e);
   }
 }
 
-async function upgradeIOSKeychain(username, password) {
-  if (Platform.OS !== "ios") return;
-  if (!MMKV.getBool(IOS_KEYCHAIN_UPGRAGE_KEY)) {
-    await Keychain.setInternetCredentials(
-      "notesnook",
-      username,
-      password,
-      KEYSTORE_CONFIG
-    );
-    console.log("IOS KEYCHAIN MIGRATION COMPLETED!");
-    MMKV.setBool(IOS_KEYCHAIN_UPGRAGE_KEY, true);
-  }
-}
-
 export async function getCryptoKey(_name) {
   try {
     if (await Keychain.hasInternetCredentials("notesnook")) {
@@ -74,9 +52,6 @@ export async function getCryptoKey(_name) {
         "notesnook",
         KEYSTORE_CONFIG
       );
-      // upgrades ios keychain to use accessGroups
-      // so we have access to keychain in share extension.
-      await upgradeIOSKeychain(credentials.username, credentials.password);
       return credentials.password;
     } else {
       return null;

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

@@ -16,7 +16,8 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { database } from "@notesnook/common";
+
+import Database from "@notesnook/core/api/index";
 import { initalize, logger as dbLogger } from "@notesnook/core/logger";
 import { Platform } from "react-native";
 import { MMKVLoader } from "react-native-mmkv-storage";
@@ -29,8 +30,13 @@ import * as Gzip from "react-native-gzip";
 const LoggerStorage = new MMKVLoader()
   .withInstanceID("notesnook_logs")
   .initialize();
+initalize(new KV(LoggerStorage), true);
+export const DatabaseLogger = dbLogger;
 
-database.setup(
+/**
+ * @type {import("@notesnook/core/api/index").default}
+ */
+export var db = new Database(
   Storage,
   Platform.OS === "ios" ? EventSource : AndroidEventSource,
   filesystem,
@@ -40,7 +46,7 @@ database.setup(
   }
 );
 
-database.host(
+db.host(
   __DEV__
     ? {
         API_HOST: "https://api.notesnook.com",
@@ -63,7 +69,13 @@ database.host(
       }
 );
 
-initalize(new KV(LoggerStorage), true);
-
-export const db = database;
-export const DatabaseLogger = dbLogger;
+export async function loadDatabase() {
+  // if (!DB) {
+  //   let module = await import(/* webpackChunkName: "notes-core" */ 'notes-core/api/index');
+  //   DB = module.default;
+  // }
+  // db = new DB(Storage, Platform.OS === 'ios' ? EventSource : AndroidEventSource, filesystem);
+  // if (DOMParser) {
+  //   await DOMParser.prepare();
+  // }
+}

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

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { Platform } from "react-native";
-import RNFetchBlob from "react-native-blob-util";
+import RNFetchBlob from "rn-fetch-blob";
 import {
   decrypt,
   deriveCryptoKey,

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

@@ -1,50 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-import { Dimensions, Platform } from "react-native";
-import ImageResizer from "@bam.tech/react-native-image-resizer";
-import RNFetchBlob from "react-native-blob-util";
-/**
- * Scale down & compress images to screen width
- * for loading in editor.
- * @returns
- */
-export async function compressToBase64(path, type) {
-  const { width, scale } = Dimensions.get("window");
-  const response = await ImageResizer.createResizedImage(
-    path,
-    width * scale,
-    9999,
-    type,
-    80,
-    0,
-    undefined,
-    true,
-    {
-      mode: "contain",
-      onlyScaleDown: true
-    }
-  );
-  const base64 = await RNFetchBlob.fs.readFile(
-    Platform.OS === "ios" ? response.uri?.replace("file://", "") : response.uri,
-    "base64"
-  );
-  RNFetchBlob.fs.unlink(path.replace("file://", "")).catch(console.log);
-  RNFetchBlob.fs.unlink(response.uri.replace("file://", "")).catch(console.log);
-  return base64;
-}

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

@@ -17,171 +17,19 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import Sodium from "@ammarahmed/react-native-sodium";
-import {
-  getFileNameWithExtension,
-  isImage,
-  isDocument
-} from "@notesnook/core/utils/filename";
 import React from "react";
 import { Platform } from "react-native";
 import * as ScopedStorage from "react-native-scoped-storage";
-import { subscribe, zip } from "react-native-zip-archive";
-import RNFetchBlob from "react-native-blob-util";
+import Sodium from "@ammarahmed/react-native-sodium";
+import RNFetchBlob from "rn-fetch-blob";
 import { ShareComponent } from "../../components/sheets/export-notes/share";
-import { ToastEvent, presentSheet } from "../../services/event-manager";
+import { presentSheet, ToastEvent } from "../../services/event-manager";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
 import { db } from "../database";
 import Storage from "../database/storage";
-import { cacheDir, copyFileAsync, releasePermissions } from "./utils";
+import { cacheDir } from "./utils";
 
-export const FileDownloadStatus = {
-  Success: 1,
-  Fail: 0
-};
-
-/**
- * Download all user's attachments
- * @returns
- */
-export function downloadAllAttachments() {
-  const attachments = db.attachments.all;
-  return downloadAttachments(attachments);
-}
-
-/**
- * Downloads provided attachments to a .zip file
- * on user's device.
- * @param attachments
- * @param onProgress
- * @returns
- */
-export async function downloadAttachments(
-  attachments,
-  onProgress,
-  canceled,
-  groupId
-) {
-  if (!attachments || !attachments.length) return;
-  const result = new Map();
-
-  let outputFolder;
-  if (Platform.OS === "android") {
-    // Ask the user to select a directory to store the file
-    let file = await ScopedStorage.openDocumentTree(true);
-    outputFolder = file.uri;
-    if (!outputFolder) return;
-  } else {
-    outputFolder = await Storage.checkAndCreateDir("/downloads/");
-  }
-
-  // Create the folder to zip;
-  const zipSourceFolder = `${cacheDir}/notesnook-attachments`;
-  const zipOutputFile =
-    Platform.OS === "ios"
-      ? `${outputFolder}/notesnook-attachments-${Date.now()}.zip`
-      : `${cacheDir}/notesnook-attachments.zip`;
-  if (await RNFetchBlob.fs.exists(zipSourceFolder))
-    await RNFetchBlob.fs.unlink(zipSourceFolder);
-  await RNFetchBlob.fs.mkdir(zipSourceFolder);
-
-  for (let i = 0; i < attachments.length; i++) {
-    let attachment = attachments[i];
-    const hash = attachment.metadata.hash;
-    try {
-      if (canceled.current) {
-        RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
-        return;
-      }
-      onProgress?.(
-        i + 1 / attachments.length,
-        `Downloading attachments (${i + 1}/${
-          attachments.length
-        })... Please wait`
-      );
-      // Download to cache
-      let uri = await downloadAttachment(hash, false, {
-        silent: true,
-        cache: true,
-        groupId: groupId
-      });
-      if (canceled.current) {
-        RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
-        return;
-      }
-      if (!uri) throw new Error("Failed to download file");
-      // Move file to the source folder we will zip eventually and rename the file to it's actual name.
-      const filePath = `${zipSourceFolder}/${attachment.metadata.filename}`;
-      await RNFetchBlob.fs.mv(`${cacheDir}/${uri}`, filePath);
-      result.set(hash, {
-        filename: attachment.metadata.filename,
-        status: FileDownloadStatus.Success
-      });
-    } catch (e) {
-      result.set(hash, {
-        filename: attachment.metadata.filename,
-        status: FileDownloadStatus.Fail,
-        reason: e
-      });
-      console.log("Error downloading attachment", e);
-    }
-  }
-  if (canceled.current) {
-    RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
-    return;
-  }
-  if (result?.size) {
-    let sub;
-    try {
-      onProgress?.(0, `Zipping... Please wait`);
-      // If all goes well, zip the notesnook-attachments folder in cache.
-
-      sub = subscribe(({ progress }) => {
-        onProgress(
-          progress,
-          `Saving zip file (${(progress * 100).toFixed(1)}%)... Please wait`
-        );
-      });
-      await zip(zipSourceFolder, zipOutputFile);
-      sub?.remove();
-      onProgress(1, `Saving zip file... Please wait`);
-      if (Platform.OS === "android") {
-        // Move the zip to user selected directory.
-        const file = await ScopedStorage.createFile(
-          outputFolder,
-          `notesnook-attachments-${Date.now()}.zip`,
-          "application/zip"
-        );
-        await copyFileAsync(`file://${zipOutputFile}`, file.uri);
-      }
-
-      onProgress?.(1, `Done`);
-      releasePermissions(outputFolder);
-    } catch (e) {
-      releasePermissions(outputFolder);
-      sub?.remove();
-      console.log("Error zipping attachments", e);
-    }
-    // Remove source & zip file from cache.
-    RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
-    if (Platform.OS === "android") {
-      RNFetchBlob.fs.unlink(zipOutputFile).catch(console.log);
-    }
-  }
-
-  return result;
-}
-
-export default async function downloadAttachment(
-  hash,
-  global = true,
-  options = {
-    silent: false,
-    cache: false,
-    throwError: false,
-    groupId: undefined
-  }
-) {
+export default async function downloadAttachment(hash, global = true) {
   let attachment = db.attachments.attachment(hash);
   if (!attachment) {
     console.log("attachment not found");
@@ -189,23 +37,16 @@ export default async function downloadAttachment(
   }
 
   let folder = {};
-  if (!options.cache) {
-    if (Platform.OS === "android") {
-      folder = await ScopedStorage.openDocumentTree();
-      if (!folder) return;
-    } else {
-      folder.uri = await Storage.checkAndCreateDir("/downloads/");
-    }
+  if (Platform.OS === "android") {
+    folder = await ScopedStorage.openDocumentTree();
+    if (!folder) return;
+  } else {
+    folder.uri = await Storage.checkAndCreateDir("/downloads/");
   }
 
   try {
-    console.log(
-      "starting download attachment",
-      attachment.metadata.hash,
-      options.groupId
-    );
     await db.fs.downloadFile(
-      options.groupId || attachment.metadata.hash,
+      attachment.metadata.hash,
       attachment.metadata.hash
     );
     if (
@@ -213,11 +54,6 @@ export default async function downloadAttachment(
     )
       return;
 
-    let filename = getFileNameWithExtension(
-      attachment.metadata.filename,
-      attachment.metadata.type
-    );
-
     let key = await db.attachments.decryptKey(attachment.key);
     let info = {
       iv: attachment.iv,
@@ -227,51 +63,46 @@ export default async function downloadAttachment(
       hash: attachment.metadata.hash,
       hashType: attachment.metadata.hashType,
       mime: attachment.metadata.type,
-      fileName: options.cache ? undefined : filename,
-      uri: options.cache ? undefined : folder.uri,
+      fileName: attachment.metadata.filename,
+      uri: folder.uri,
       chunkSize: attachment.chunkSize
     };
 
-    let fileUri = await Sodium.decryptFile(
-      key,
-      info,
-      options.cache ? "cache" : "file"
-    );
+    let fileUri = await Sodium.decryptFile(key, info, "file");
+    ToastEvent.show({
+      heading: "Download successful",
+      message: attachment.metadata.filename + " downloaded",
+      type: "success"
+    });
 
-    if (!options.silent) {
-      ToastEvent.show({
-        heading: "Download successful",
-        message: filename + " downloaded",
-        type: "success"
-      });
-    }
-
-    if (
-      attachment.dateUploaded &&
-      !isImage(attachment.metadata?.type) &&
-      !isDocument(attachment.metadata?.type)
-    ) {
+    if (attachment.dateUploaded) {
       RNFetchBlob.fs
         .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.metadata.hash}`)
         .catch(console.log);
     }
-    if (Platform.OS === "ios" && !options.cache) {
-      fileUri = folder.uri + `/${filename}`;
-    }
-    if (!options.silent) {
-      presentSheet({
-        title: "File downloaded",
-        paragraph: `${filename} saved to ${
-          Platform.OS === "android"
-            ? "selected path"
-            : "File Manager/Notesnook/downloads"
-        }`,
-        icon: "download",
-        context: global ? null : attachment.metadata.hash,
-        component: <ShareComponent uri={fileUri} name={filename} padding={12} />
-      });
-    }
 
+    if (Platform.OS === "ios") {
+      fileUri = folder.uri + `/${attachment.metadata.filename}`;
+    }
+    console.log("saved file uri: ", fileUri);
+
+    presentSheet({
+      title: "File downloaded",
+      paragraph: `${attachment.metadata.filename} saved to ${
+        Platform.OS === "android"
+          ? "selected path"
+          : "File Manager/Notesnook/downloads"
+      }`,
+      icon: "download",
+      context: global ? null : attachment.metadata.hash,
+      component: (
+        <ShareComponent
+          uri={fileUri}
+          name={attachment.metadata.filename}
+          padding={12}
+        />
+      )
+    });
     return fileUri;
   } catch (e) {
     console.log("download attachment error: ", e);
@@ -281,8 +112,5 @@ export default async function downloadAttachment(
         .catch(console.log);
     }
     useAttachmentStore.getState().remove(attachment.metadata.hash);
-    if (options.throwError) {
-      throw e;
-    }
   }
 }

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

@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import hosts from "@notesnook/core/utils/constants";
 import NetInfo from "@react-native-community/netinfo";
-import RNFetchBlob from "react-native-blob-util";
+import RNFetchBlob from "rn-fetch-blob";
 import { ToastEvent } from "../../services/event-manager";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
 import { db } from "../database";

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

@@ -23,16 +23,14 @@ import {
   deleteFile,
   exists,
   readEncrypted,
-  writeEncryptedBase64,
-  hashBase64
+  writeEncrypted
 } from "./io";
 import { uploadFile } from "./upload";
 import { cancelable } from "./utils";
 
 export default {
   readEncrypted,
-  writeEncryptedBase64,
-  hashBase64,
+  writeEncrypted,
   uploadFile: cancelable(uploadFile),
   downloadFile: cancelable(downloadFile),
   deleteFile,

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

@@ -19,54 +19,25 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { Platform } from "react-native";
 import Sodium from "@ammarahmed/react-native-sodium";
-import RNFetchBlob from "react-native-blob-util";
+import RNFetchBlob from "rn-fetch-blob";
 import { cacheDir, getRandomId } from "./utils";
-import { db } from "../database";
-import { compressToBase64 } from "./compress";
-import { IOS_APPGROUPID } from "../../utils/constants";
 
 export async function readEncrypted(filename, key, cipherData) {
   let path = `${cacheDir}/${filename}`;
   try {
-    const iosAppGroup =
-      Platform.OS === "ios"
-        ? await RNFetchBlob.fs.pathForAppGroup(IOS_APPGROUPID)
-        : null;
-
-    const appGroupPath = `${iosAppGroup}/${filename}`;
-    let exists =
-      (await RNFetchBlob.fs.exists(path)) ||
-      (Platform.OS === "ios" && (await RNFetchBlob.fs.exists(appGroupPath)));
-
+    let exists = await RNFetchBlob.fs.exists(path);
     if (!exists) {
       return false;
     }
 
-    const attachment = db.attachments.attachment(filename);
-    const isPng = /(png)/g.test(attachment?.metadata.type);
-    const isJpeg = /(jpeg|jpg)/g.test(attachment?.metadata.type);
-
     let output = await Sodium.decryptFile(
       key,
       {
         ...cipherData,
-        hash: filename,
-        appGroupId: IOS_APPGROUPID
+        hash: filename
       },
-      cipherData.outputType === "base64"
-        ? isPng || isJpeg
-          ? "cache"
-          : "base64"
-        : "text"
+      cipherData.outputType === "base64" ? "base64" : "text"
     );
-    if (cipherData.outputType === "base64" && (isPng || isJpeg)) {
-      const dCachePath = `${cacheDir}/${output}`;
-      output = await compressToBase64(
-        `file://${dCachePath}`,
-        isPng ? "PNG" : "JPEG"
-      );
-    }
-
     return output;
   } catch (e) {
     RNFetchBlob.fs.unlink(path).catch(console.log);
@@ -75,26 +46,17 @@ export async function readEncrypted(filename, key, cipherData) {
   }
 }
 
-export async function hashBase64(data) {
-  const hash = await Sodium.hashFile({
-    type: "base64",
-    data,
-    uri: ""
-  });
-  return {
-    hash: hash,
-    type: "xxh64"
-  };
-}
-
-export async function writeEncryptedBase64({ data, key }) {
+export async function writeEncrypted(filename, { data, type, key }) {
+  console.log("file input: ", { type, key });
   let filepath = cacheDir + `/${getRandomId("imagecache_")}`;
+  console.log(filepath);
   await RNFetchBlob.fs.writeFile(filepath, data, "base64");
   let output = await Sodium.encryptFile(key, {
     uri: Platform.OS === "ios" ? filepath : "file://" + filepath,
     type: "url"
   });
   RNFetchBlob.fs.unlink(filepath).catch(console.log);
+
   console.log("encrypted file output: ", output);
   return {
     ...output,

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

@@ -17,13 +17,10 @@ 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 RNFetchBlob from "react-native-blob-util";
+import RNFetchBlob from "rn-fetch-blob";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
 import { db } from "../database";
 import { cacheDir } from "./utils";
-import { isImage, isDocument } from "@notesnook/core/utils/filename";
-import { Platform } from "react-native";
-import { IOS_APPGROUPID } from "../../utils/constants";
 
 export async function uploadFile(filename, data, cancelToken) {
   if (!data) return false;
@@ -38,19 +35,9 @@ export async function uploadFile(filename, data, cancelToken) {
     if (!res.ok) throw new Error(`${res.status}: Unable to resolve upload url`);
     const uploadUrl = await res.text();
     if (!uploadUrl) throw new Error("Unable to resolve upload url");
-    let uploadFilePath = `${cacheDir}/${filename}`;
 
-    const iosAppGroup =
-      Platform.OS === "ios"
-        ? await RNFetchBlob.fs.pathForAppGroup(IOS_APPGROUPID)
-        : null;
-    const appGroupPath = `${iosAppGroup}/${filename}`;
-    let exists = await RNFetchBlob.fs.exists(uploadFilePath);
-    if (!exists && Platform.OS === "ios") {
-      uploadFilePath = appGroupPath;
-    }
     let request = RNFetchBlob.config({
-      IOSBackgroundTask: !globalThis["IS_SHARE_EXTENSION"]
+      IOSBackgroundTask: true
     })
       .fetch(
         "PUT",
@@ -58,7 +45,7 @@ export async function uploadFile(filename, data, cancelToken) {
         {
           "content-type": ""
         },
-        RNFetchBlob.wrap(uploadFilePath)
+        RNFetchBlob.wrap(`${cacheDir}/${filename}`)
       )
       .uploadProgress((sent, total) => {
         useAttachmentStore
@@ -76,10 +63,7 @@ export async function uploadFile(filename, data, cancelToken) {
     if (result) {
       let attachment = db.attachments.attachment(filename);
       if (!attachment) return result;
-      if (
-        !isImage(attachment.metadata.type) &&
-        !isDocument(attachment.metadata?.type)
-      ) {
+      if (!attachment.metadata.type.startsWith("image/")) {
         RNFetchBlob.fs.unlink(`${cacheDir}/${filename}`).catch(console.log);
       }
     }

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

@@ -17,9 +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 * as ScopedStorage from "react-native-scoped-storage";
-import { Platform } from "react-native";
-import RNFetchBlob from "react-native-blob-util";
+import RNFetchBlob from "rn-fetch-blob";
 
 export const cacheDir = RNFetchBlob.fs.dirs.CacheDir;
 
@@ -64,22 +62,3 @@ export function cancelable(operation) {
     };
   };
 }
-
-export function copyFileAsync(source, dest) {
-  return new Promise((resolve) => {
-    ScopedStorage.copyFile(source, dest, (e, r) => {
-      console.log(e, r);
-      resolve();
-    });
-  });
-}
-
-export async function releasePermissions(path) {
-  if (Platform.OS === "ios") return;
-  const uris = await ScopedStorage.getPersistedUriPermissions();
-  for (let uri of uris) {
-    if (path.startsWith(uri)) {
-      await ScopedStorage.releasePersistableUriPermission(uri);
-    }
-  }
-}

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

@@ -148,7 +148,7 @@ export const Cta = ({ actions, style = {}, color, inline }) => {
               <Button
                 key={item.title}
                 title={item.title}
-                fontSize={SIZE.xs}
+                fontSize={SIZE.xs + 1}
                 type="gray"
                 onPress={() => onPress(item)}
                 width={null}

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

@@ -67,7 +67,7 @@ export const Title = ({ text, style = {}, inline }) => {
           right: 0
         }}
         iconSize={24}
-        fontSize={SIZE.xs}
+        fontSize={SIZE.xs + 1}
         style={{
           borderRadius: 100,
           paddingVertical: 0,

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

@@ -1,215 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import React, { useCallback, useEffect, useRef } from "react";
-import { Platform, View } from "react-native";
-import { enabled } from "react-native-privacy-snapshot";
-import { db } from "../../common/database";
-import { useAppState } from "../../hooks/use-app-state";
-import BiometricService from "../../services/biometrics";
-import { useSettingStore } from "../../stores/use-setting-store";
-import { useThemeStore } from "../../stores/use-theme-store";
-import { useUserStore } from "../../stores/use-user-store";
-import { NotesnookModule } from "../../utils/notesnook-module";
-import { SIZE } from "../../utils/size";
-import { Button } from "../ui/button";
-import { IconButton } from "../ui/icon-button";
-import Input from "../ui/input";
-import Seperator from "../ui/seperator";
-import Heading from "../ui/typography/heading";
-import Paragraph from "../ui/typography/paragraph";
-
-const AppLockedOverlay = () => {
-  const colors = useThemeStore((state) => state.colors);
-  const user = useUserStore((state) => state.user);
-  const appLocked = useUserStore((state) => state.appLocked);
-  const lockApp = useUserStore((state) => state.lockApp);
-  const deviceMode = useSettingStore((state) => state.deviceMode);
-  const passwordInputRef = useRef();
-  const password = useRef();
-  const appState = useAppState();
-
-  const biometricUnlockAwaitingUserInput = useRef(false);
-
-  const onUnlockAppRequested = useCallback(async () => {
-    if (!(await BiometricService.isBiometryAvailable())) return;
-    if (Platform.OS === "android") {
-      const activityName = await NotesnookModule.getActivityName();
-      if (activityName !== "MainActivity") return;
-    }
-    useSettingStore.getState().setRequestBiometrics(true);
-
-    let unlocked = await BiometricService.validateUser(
-      "Unlock to access your notes",
-      ""
-    );
-    if (unlocked) {
-      lockApp(false);
-      enabled(false);
-      password.current = null;
-    }
-    setTimeout(() => {
-      biometricUnlockAwaitingUserInput.current = false;
-      useSettingStore.getState().setRequestBiometrics(false);
-    }, 1);
-  }, [lockApp]);
-
-  const onSubmit = async () => {
-    if (!password.current) return;
-    try {
-      let unlocked = await db.user.verifyPassword(password.current);
-      if (unlocked) {
-        lockApp(false);
-        enabled(false);
-        password.current = null;
-      }
-    } catch (e) {
-      console.error(e);
-    }
-  };
-
-  useEffect(() => {
-    if (
-      biometricUnlockAwaitingUserInput.current ||
-      useUserStore.getState().disableAppLockRequests
-    )
-      return;
-    if (appLocked && appState === "active") {
-      biometricUnlockAwaitingUserInput.current = true;
-      onUnlockAppRequested();
-    }
-  }, [appState, onUnlockAppRequested, appLocked]);
-
-  return (
-    appLocked && (
-      <View
-        style={{
-          backgroundColor: colors.bg,
-          width: "100%",
-          height: "100%",
-          position: "absolute",
-          zIndex: 999,
-          justifyContent: "center"
-        }}
-      >
-        <View
-          style={{
-            flex: 1,
-            justifyContent: "center",
-            width:
-              deviceMode !== "mobile"
-                ? "50%"
-                : Platform.OS == "ios"
-                ? "95%"
-                : "100%",
-            paddingHorizontal: 12,
-            marginBottom: 30,
-            marginTop: 15,
-            alignSelf: "center"
-          }}
-        >
-          <IconButton
-            name="fingerprint"
-            size={100}
-            customStyle={{
-              width: 100,
-              height: 100,
-              marginBottom: 20,
-              marginTop: user ? 0 : 50
-            }}
-            onPress={onUnlockAppRequested}
-            color={colors.border}
-          />
-          <Heading
-            color={colors.heading}
-            style={{
-              alignSelf: "center",
-              textAlign: "center"
-            }}
-          >
-            Unlock your notes
-          </Heading>
-
-          <Paragraph
-            style={{
-              alignSelf: "center",
-              textAlign: "center",
-              maxWidth: "90%"
-            }}
-          >
-            {"Please verify it's you"}
-          </Paragraph>
-          <Seperator />
-          <View
-            style={{
-              width: "100%",
-              padding: 12,
-              backgroundColor: colors.bg
-            }}
-          >
-            {user ? (
-              <>
-                <Input
-                  fwdRef={passwordInputRef}
-                  secureTextEntry
-                  placeholder="Enter account password"
-                  onChangeText={(v) => (password.current = v)}
-                  onSubmit={onSubmit}
-                />
-              </>
-            ) : null}
-
-            <View
-              style={{
-                marginTop: user ? 25 : 25
-              }}
-            >
-              {user ? (
-                <>
-                  <Button
-                    title="Continue"
-                    type="accent"
-                    onPress={onSubmit}
-                    width={250}
-                    height={45}
-                    style={{
-                      borderRadius: 150,
-                      marginBottom: 10
-                    }}
-                    fontSize={SIZE.md}
-                  />
-                </>
-              ) : null}
-
-              <Button
-                title="Unlock with Biometrics"
-                width={250}
-                onPress={onUnlockAppRequested}
-                icon={"fingerprint"}
-                type={user ? "grayAccent" : "accent"}
-              />
-            </View>
-          </View>
-        </View>
-      </View>
-    )
-  );
-};
-
-export default AppLockedOverlay;

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

@@ -34,6 +34,7 @@ import {
 import PremiumService from "../../services/premium";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
 import { useThemeStore } from "../../stores/use-theme-store";
+import { formatBytes } from "../../utils";
 import { eCloseAttachmentDialog, eCloseSheet } from "../../utils/events";
 import { SIZE } from "../../utils/size";
 import { sleep } from "../../utils/time";
@@ -46,7 +47,6 @@ import { Notice } from "../ui/notice";
 import { PressableButton } from "../ui/pressable";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
-import { formatBytes } from "@notesnook/common";
 
 const Actions = ({ attachment, setAttachments, fwdRef }) => {
   const colors = useThemeStore((state) => state.colors);
@@ -102,21 +102,15 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
         if (res.failed) {
           db.attachments.markAsFailed(attachment.id, res.failed);
           setFailed(res.failed);
-          ToastEvent.show({
-            heading: "File check failed with error: " + res.failed,
-            type: "error",
-            context: "local"
-          });
         } else {
           setFailed(null);
           db.attachments.markAsFailed(attachment.id, null);
-          ToastEvent.show({
-            heading: "File check passed",
-            type: "success",
-            context: "local"
-          });
         }
-
+        ToastEvent.show({
+          heading: "File check passed",
+          type: "success",
+          context: "local"
+        });
         setAttachments([...db.attachments.all]);
         setLoading({
           name: null
@@ -215,7 +209,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
           }}
         >
           <Paragraph
-            size={SIZE.xs}
+            size={SIZE.xs + 1}
             style={{
               marginRight: 10
             }}
@@ -227,7 +221,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
             style={{
               marginRight: 10
             }}
-            size={SIZE.xs}
+            size={SIZE.xs + 1}
             color={colors.icon}
           >
             {formatBytes(attachment.length)}
@@ -238,7 +232,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
               style={{
                 marginRight: 10
               }}
-              size={SIZE.xs}
+              size={SIZE.xs + 1}
               color={colors.icon}
             >
               {attachment.noteIds.length} note
@@ -254,7 +248,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
                 context: "local"
               });
             }}
-            size={SIZE.xs}
+            size={SIZE.xs + 1}
             color={colors.icon}
           >
             {attachment.metadata.hash}
@@ -310,7 +304,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
                 }}
                 key={item.id}
               >
-                <Paragraph size={SIZE.xs}>{item.title}</Paragraph>
+                <Paragraph size={SIZE.xs + 1}>{item.title}</Paragraph>
               </PressableButton>
             ))}
           </>

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

@@ -22,8 +22,9 @@ import { TouchableOpacity, View } from "react-native";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { db } from "../../common/database";
 import { useAttachmentProgress } from "../../hooks/use-attachment-progress";
+import { useAttachmentStore } from "../../stores/use-attachment-store";
 import { useThemeStore } from "../../stores/use-theme-store";
-import { formatBytes } from "@notesnook/common";
+import { formatBytes } from "../../utils";
 import { SIZE } from "../../utils/size";
 import SheetProvider from "../sheet-provider";
 import { IconButton } from "../ui/icon-button";
@@ -36,26 +37,20 @@ function getFileExtension(filename) {
   return ext == null ? "" : ext[1];
 }
 
-export const AttachmentItem = ({
-  attachment,
-  encryption,
-  setAttachments,
-  pressable = true,
-  hideWhenNotDownloading
-}) => {
+export const AttachmentItem = ({ attachment, encryption, setAttachments }) => {
   const colors = useThemeStore((state) => state.colors);
   const [currentProgress, setCurrentProgress] = useAttachmentProgress(
     attachment,
     encryption
   );
+  const encryptionProgress = useAttachmentStore(
+    (state) => state.encryptionProgress
+  );
 
   const onPress = () => {
-    if (!pressable) return;
     Actions.present(attachment, setAttachments, attachment.metadata.hash);
   };
-
-  return hideWhenNotDownloading &&
-    (!currentProgress || !currentProgress.value) ? null : (
+  return (
     <TouchableOpacity
       activeOpacity={0.9}
       onPress={onPress}
@@ -118,22 +113,20 @@ export const AttachmentItem = ({
             {attachment.metadata.filename}
           </Paragraph>
 
-          {!hideWhenNotDownloading ? (
-            <Paragraph color={colors.icon} size={SIZE.xs}>
-              {formatBytes(attachment.length)}{" "}
-              {currentProgress?.type
-                ? "(" + currentProgress.type + "ing - tap to cancel)"
-                : ""}
-            </Paragraph>
-          ) : null}
+          <Paragraph color={colors.icon} size={SIZE.xs}>
+            {formatBytes(attachment.length)}{" "}
+            {currentProgress?.type
+              ? "(" + currentProgress.type + "ing - tap to cancel)"
+              : ""}
+          </Paragraph>
         </View>
       </View>
 
-      {currentProgress ? (
+      {currentProgress || encryptionProgress || encryption ? (
         <TouchableOpacity
           activeOpacity={0.9}
           onPress={() => {
-            if (encryption || !pressable) return;
+            if (encryption) return;
             db.fs.cancel(attachment.metadata.hash);
             setCurrentProgress(null);
           }}
@@ -146,7 +139,13 @@ export const AttachmentItem = ({
         >
           <ProgressCircleComponent
             size={SIZE.xxl}
-            progress={currentProgress?.value ? currentProgress?.value / 100 : 0}
+            progress={
+              encryptionProgress
+                ? encryptionProgress
+                : currentProgress?.value
+                ? currentProgress?.value / 100
+                : 0
+            }
             showsText
             textStyle={{
               fontSize: 10

apps/mobile/app/components/attachments/download-attachments.js

@@ -1,273 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import React, { useRef, useState } from "react";
-import { Platform, View } from "react-native";
-import { db } from "../../common/database";
-import { downloadAttachments } from "../../common/filesystem/download-attachment";
-import { presentSheet } from "../../services/event-manager";
-import { Button } from "../ui/button";
-import Heading from "../ui/typography/heading";
-import Paragraph from "../ui/typography/paragraph";
-import { ProgressBarComponent } from "../ui/svg/lazy";
-import { useThemeStore } from "../../stores/use-theme-store";
-import { FlatList } from "react-native-actions-sheet";
-import { AttachmentItem } from "./attachment-item";
-
-const DownloadAttachments = ({ close, attachments, isNote, update }) => {
-  const colors = useThemeStore((state) => state.colors);
-  const [downloading, setDownloading] = useState(false);
-  const [progress, setProgress] = useState({
-    value: 0,
-    statusText: "Download started... Please wait"
-  });
-  const [result, setResult] = useState(new Map());
-  const canceled = useRef(false);
-  const groupId = useRef();
-
-  const onDownload = async () => {
-    update({
-      disableClosing: true
-    });
-    setDownloading(true);
-    canceled.current = false;
-    groupId.current = Date.now().toString();
-    const result = await downloadAttachments(
-      attachments,
-      (progress, statusText) => setProgress({ value: progress, statusText }),
-      canceled,
-      groupId.current
-    );
-    if (canceled.current) return;
-    setResult(result || new Map());
-    setDownloading(false);
-    update({
-      disableClosing: false
-    });
-  };
-
-  const cancel = async () => {
-    update({
-      disableClosing: false
-    });
-    canceled.current = true;
-    console.log(groupId.current, "canceling groupId downloads");
-    await db.fs.cancel(groupId.current);
-    setDownloading(false);
-    groupId.current = null;
-  };
-
-  const successResults = () => {
-    const results = [];
-    for (let [key, value] of result.entries()) {
-      if (value.status === 1) results.push(db.attachments.attachment(key));
-    }
-    return results;
-  };
-
-  const failedResults = () => {
-    const results = [];
-    for (let [key, value] of result.entries()) {
-      if (value.status === 0) results.push(db.attachments.attachment(key));
-    }
-    return results;
-  };
-
-  function getResultText() {
-    const downloadedAttachmentsCount =
-      attachments.length - failedResults().length;
-    if (downloadedAttachmentsCount === 0)
-      return "Failed to download all attachments";
-    return `Successfully downloaded ${downloadedAttachmentsCount}/${
-      attachments.length
-    } attachments as a zip file at ${
-      Platform.OS === "android" ? "the selected folder" : "Notesnook/downloads"
-    }`;
-  }
-
-  return (
-    <View
-      style={{
-        alignItems: "center",
-        width: "100%",
-        paddingVertical: 12,
-        paddingHorizontal: 12
-      }}
-    >
-      <Heading>
-        {downloading
-          ? "Downloading attachments"
-          : result?.size
-          ? "Downloaded attachments"
-          : "Download attachments"}
-      </Heading>
-
-      {downloading ? (
-        <Paragraph
-          style={{
-            textAlign: "center"
-          }}
-        >
-          {progress.statusText}
-        </Paragraph>
-      ) : result?.size ? (
-        <Paragraph
-          style={{
-            textAlign: "center"
-          }}
-        >
-          {getResultText()}
-        </Paragraph>
-      ) : (
-        <Paragraph
-          style={{
-            textAlign: "center"
-          }}
-        >
-          Are you sure you want to download all attachments
-          {isNote ? " of this note?" : "?"}
-        </Paragraph>
-      )}
-
-      {downloading ? (
-        <View
-          style={{
-            width: 200,
-            marginTop: 10
-          }}
-        >
-          <ProgressBarComponent
-            height={5}
-            width={null}
-            animated={true}
-            useNativeDriver
-            progress={progress.value ? progress.value / attachments.length : 0}
-            unfilledColor={colors.nav}
-            color={colors.accent}
-            borderWidth={0}
-          />
-        </View>
-      ) : null}
-
-      <FlatList
-        style={{
-          maxHeight: 300,
-          width: "100%",
-          minHeight: 60,
-          backgroundColor: colors.nav,
-          borderRadius: 5,
-          marginVertical: 12
-        }}
-        data={downloading ? attachments : []}
-        ListEmptyComponent={
-          <View
-            style={{
-              width: "100%",
-              justifyContent: "center",
-              alignItems: "center",
-              height: 60
-            }}
-          >
-            <Paragraph color={colors.icon}>No downloads in progress.</Paragraph>
-          </View>
-        }
-        keyExtractor={(item) => item.id}
-        renderItem={({ item }) => {
-          return (
-            <AttachmentItem
-              attachment={item}
-              setAttachments={() => {}}
-              pressable={false}
-              hideWhenNotDownloading={true}
-            />
-          );
-        }}
-      />
-
-      {result?.size ? (
-        <Button
-          style={{
-            width: 250,
-            borderRadius: 100,
-            marginTop: 20
-          }}
-          onPress={close}
-          type="accent"
-          title="Done"
-        />
-      ) : !downloading ? (
-        <View
-          style={{
-            flexDirection: "row",
-            width: "100%",
-            marginTop: 20
-          }}
-        >
-          <Button
-            style={{
-              flex: 1,
-              borderRadius: 100,
-              marginRight: 5
-            }}
-            onPress={close}
-            type="grayBg"
-            title="No"
-          />
-          <Button
-            style={{
-              flex: 1,
-              borderRadius: 100,
-              marginLeft: 5
-            }}
-            onPress={onDownload}
-            type="accent"
-            title="Yes"
-          />
-        </View>
-      ) : (
-        <Button
-          style={{
-            width: 250,
-            borderRadius: 100,
-            marginTop: 20
-          }}
-          onPress={cancel}
-          type="error"
-          title="Cancel"
-        />
-      )}
-    </View>
-  );
-};
-
-DownloadAttachments.present = (context, attachments, isNote) => {
-  presentSheet({
-    context: context,
-    component: (ref, close, update) => (
-      <DownloadAttachments
-        close={close}
-        attachments={attachments}
-        isNote={isNote}
-        update={update}
-      />
-    )
-  });
-};
-
-export default DownloadAttachments;

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

@@ -17,61 +17,82 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import React, { useRef, useState } from "react";
-import { ActivityIndicator, ScrollView, View } from "react-native";
-import { FlatList } from "react-native-actions-sheet";
+import React, { useEffect, useRef, useState } from "react";
+import { View } from "react-native";
+import { FlatList } from "react-native-gesture-handler";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { db } from "../../common/database";
 import filesystem from "../../common/filesystem";
-import { presentSheet } from "../../services/event-manager";
+import {
+  eSubscribeEvent,
+  eUnSubscribeEvent
+} from "../../services/event-manager";
 import { useThemeStore } from "../../stores/use-theme-store";
+import {
+  eCloseAttachmentDialog,
+  eOpenAttachmentsDialog
+} from "../../utils/events";
 import { SIZE } from "../../utils/size";
-import SheetProvider from "../sheet-provider";
-import { IconButton } from "../ui/icon-button";
+import DialogHeader from "../dialog/dialog-header";
+import { Toast } from "../toast";
 import Input from "../ui/input";
 import Seperator from "../ui/seperator";
-import Heading from "../ui/typography/heading";
+import SheetWrapper from "../ui/sheet";
 import Paragraph from "../ui/typography/paragraph";
 import { AttachmentItem } from "./attachment-item";
-import DownloadAttachments from "./download-attachments";
-import { Button } from "../ui/button";
-import {
-  isAudio,
-  isDocument,
-  isImage,
-  isVideo
-} from "@notesnook/core/utils/filename";
-
-export const AttachmentDialog = ({ note }) => {
+export const AttachmentDialog = () => {
   const colors = useThemeStore((state) => state.colors);
-
-  const [attachments, setAttachments] = useState(
-    note
-      ? db.attachments.ofNote(note.id, "all")
-      : [...(db.attachments.all || [])]
-  );
-
+  const [visible, setVisible] = useState(false);
+  const [note, setNote] = useState(null);
+  const actionSheetRef = useRef();
+  const [attachments, setAttachments] = useState([]);
   const attachmentSearchValue = useRef();
   const searchTimer = useRef();
   const [loading, setLoading] = useState(false);
-  const [currentFilter, setCurrentFilter] = useState("all");
+
+  useEffect(() => {
+    eSubscribeEvent(eOpenAttachmentsDialog, open);
+    eSubscribeEvent(eCloseAttachmentDialog, close);
+    return () => {
+      eUnSubscribeEvent(eOpenAttachmentsDialog, open);
+      eUnSubscribeEvent(eCloseAttachmentDialog, close);
+    };
+  }, [visible]);
+
+  const open = (data) => {
+    if (data?.id) {
+      setNote(data);
+      let _attachments = db.attachments.ofNote(data.id, "all");
+      setAttachments(_attachments);
+    } else {
+      setAttachments([...db.attachments.all]);
+    }
+    setVisible(true);
+  };
+
+  useEffect(() => {
+    if (visible) {
+      actionSheetRef.current?.show();
+    }
+  }, [visible]);
+
+  const close = () => {
+    actionSheetRef.current?.hide();
+    setVisible(false);
+  };
 
   const onChangeText = (text) => {
-    const attachments = note
-      ? db.attachments.ofNote(note.id, "all")
-      : [...(db.attachments.all || [])];
-
     attachmentSearchValue.current = text;
     if (
       !attachmentSearchValue.current ||
       attachmentSearchValue.current === ""
     ) {
-      setAttachments([...attachments]);
+      setAttachments([...db.attachments.all]);
     }
     clearTimeout(searchTimer.current);
     searchTimer.current = setTimeout(() => {
       let results = db.lookup.attachments(
-        attachments,
+        db.attachments.all,
         attachmentSearchValue.current
       );
       if (results.length === 0) return;
@@ -83,239 +104,107 @@ export const AttachmentDialog = ({ note }) => {
     <AttachmentItem setAttachments={setAttachments} attachment={item} />
   );
 
-  const onCheck = async () => {
-    setLoading(true);
-    const checkedAttachments = [];
-    for (let attachment of attachments) {
-      let result = await filesystem.checkAttachment(attachment.metadata.hash);
-      if (result.failed) {
-        await db.attachments.markAsFailed(
-          attachment.metadata.hash,
-          result.failed
-        );
-      } else {
-        await db.attachments.markAsFailed(attachment.id, null);
-      }
-      checkedAttachments.push(
-        db.attachments.attachment(attachment.metadata.hash)
-      );
-      setAttachments([...checkedAttachments]);
-    }
-    setLoading(false);
-  };
-
-  const attachmentTypes = [
-    {
-      title: "All",
-      filterBy: "all"
-    },
-    {
-      title: "Images",
-      filterBy: "images"
-    },
-    {
-      title: "Documents",
-      filterBy: "documents"
-    },
-    {
-      title: "Video",
-      filterBy: "video"
-    },
-    {
-      title: "Audio",
-      filterBy: "audio"
-    }
-  ];
-
-  const filterAttachments = (type) => {
-    const attachments = note
-      ? db.attachments.ofNote(note.id, "all")
-      : [...(db.attachments.all || [])];
-    isDocument;
-    switch (type) {
-      case "all":
-        return attachments;
-      case "images":
-        return attachments.filter((attachment) =>
-          isImage(attachment.metadata.type)
-        );
-      case "video":
-        return attachments.filter((attachment) =>
-          isVideo(attachment.metadata.type)
-        );
-      case "audio":
-        return attachments.filter((attachment) =>
-          isAudio(attachment.metadata.type)
-        );
-      case "documents":
-        return attachments.filter((attachment) =>
-          isDocument(attachment.metadata.type)
-        );
-    }
-  };
-
-  return (
-    <View
-      style={{
-        width: "100%",
-        alignSelf: "center",
-        paddingHorizontal: 12
+  return !visible ? null : (
+    <SheetWrapper
+      centered={false}
+      fwdRef={actionSheetRef}
+      onClose={async () => {
+        setVisible(false);
       }}
     >
-      <SheetProvider context="attachments-list" />
+      <Toast context="local" />
       <View
         style={{
-          flexDirection: "row",
-          justifyContent: "space-between",
-          alignItems: "center"
+          width: "100%",
+          alignSelf: "center",
+          paddingHorizontal: 12
         }}
       >
-        <Heading>Attachments</Heading>
+        <DialogHeader
+          title={note ? "Attachments" : "Manage attachments"}
+          paragraph="Tap on an attachment to view properties"
+          button={{
+            title: "Check all",
+            type: "grayAccent",
+            loading: loading,
+            onPress: async () => {
+              setLoading(true);
+              for (let attachment of attachments) {
+                let result = await filesystem.checkAttachment(
+                  attachment.metadata.hash
+                );
+                if (result.failed) {
+                  db.attachments.markAsFailed(
+                    attachment.metadata.hash,
+                    result.failed
+                  );
+                } else {
+                  db.attachments.markAsFailed(attachment.id, null);
+                }
+                setAttachments([...db.attachments.all]);
+              }
+              setLoading(false);
+            }
+          }}
+        />
+        <Seperator />
+        {!note ? (
+          <Input
+            placeholder="Filter attachments by filename, type or hash"
+            onChangeText={onChangeText}
+            onSubmit={() => {
+              onChangeText(attachmentSearchValue.current);
+            }}
+          />
+        ) : null}
 
-        <View
+        <FlatList
+          nestedScrollEnabled
+          overScrollMode="never"
+          scrollToOverflowEnabled={false}
+          keyboardDismissMode="none"
+          keyboardShouldPersistTaps="always"
+          onMomentumScrollEnd={() => {
+            actionSheetRef.current?.handleChildScrollEnd();
+          }}
+          ListEmptyComponent={
+            <View
+              style={{
+                height: 150,
+                justifyContent: "center",
+                alignItems: "center"
+              }}
+            >
+              <Icon name="attachment" size={60} color={colors.icon} />
+              <Paragraph>
+                {note ? "No attachments on this note" : "No attachments"}
+              </Paragraph>
+            </View>
+          }
+          ListFooterComponent={
+            <View
+              style={{
+                height: 350
+              }}
+            />
+          }
+          data={attachments}
+          keyExtractor={(item) => item.id}
+          renderItem={renderItem}
+        />
+
+        <Paragraph
+          color={colors.icon}
+          size={SIZE.xs}
           style={{
-            flexDirection: "row"
+            textAlign: "center",
+            marginTop: 10
           }}
         >
-          {loading ? (
-            <ActivityIndicator
-              style={{
-                height: 40,
-                width: 40,
-                marginRight: 10
-              }}
-              size={SIZE.lg}
-            />
-          ) : (
-            <IconButton
-              name="check-all"
-              customStyle={{
-                height: 40,
-                width: 40,
-                marginRight: 10
-              }}
-              color={colors.pri}
-              size={SIZE.lg}
-              onPress={onCheck}
-            />
-          )}
-
-          <IconButton
-            name="download"
-            customStyle={{
-              height: 40,
-              width: 40
-            }}
-            color={colors.pri}
-            onPress={() => {
-              DownloadAttachments.present(
-                "attachments-list",
-                attachments,
-                !!note
-              );
-            }}
-            size={SIZE.lg}
-          />
-        </View>
+          <Icon name="shield-key-outline" size={SIZE.xs} color={colors.icon} />
+          {"  "}All attachments are end-to-end encrypted.
+        </Paragraph>
       </View>
-
-      <Seperator />
-      <Input
-        placeholder="Filter attachments by filename, type or hash"
-        onChangeText={onChangeText}
-        onSubmit={() => {
-          onChangeText(attachmentSearchValue.current);
-        }}
-      />
-
-      <FlatList
-        keyboardDismissMode="none"
-        keyboardShouldPersistTaps="always"
-        maxToRenderPerBatch={10}
-        initialNumToRender={10}
-        windowSize={5}
-        stickyHeaderIndices={[0]}
-        ListHeaderComponent={
-          <ScrollView
-            style={{
-              width: "100%",
-              height: 50,
-              flexDirection: "row",
-              backgroundColor: colors.bg
-            }}
-            contentContainerStyle={{
-              minWidth: "100%"
-            }}
-            horizontal
-          >
-            {attachmentTypes.map((item) => (
-              <Button
-                type={currentFilter === item.filterBy ? "grayAccent" : "gray"}
-                key={item.title}
-                title={
-                  item.title +
-                  ` (${filterAttachments(item.filterBy)?.length || 0})`
-                }
-                style={{
-                  borderRadius: 0,
-                  borderBottomWidth: 1,
-                  flexGrow: 1,
-                  borderBottomColor:
-                    currentFilter !== item.filterBy
-                      ? "transparent"
-                      : colors.accent
-                }}
-                onPress={() => {
-                  setCurrentFilter(item.filterBy);
-                  setAttachments(filterAttachments(item.filterBy));
-                }}
-              />
-            ))}
-          </ScrollView>
-        }
-        ListEmptyComponent={
-          <View
-            style={{
-              height: 150,
-              justifyContent: "center",
-              alignItems: "center"
-            }}
-          >
-            <Icon name="attachment" size={60} color={colors.icon} />
-            <Paragraph>
-              {note ? "No attachments on this note" : "No attachments"}
-            </Paragraph>
-          </View>
-        }
-        ListFooterComponent={
-          <View
-            style={{
-              height: 350
-            }}
-          />
-        }
-        data={attachments}
-        keyExtractor={(item) => item.id}
-        renderItem={renderItem}
-      />
-
-      <Paragraph
-        color={colors.icon}
-        size={SIZE.xs}
-        style={{
-          textAlign: "center",
-          marginTop: 10
-        }}
-      >
-        <Icon name="shield-key-outline" size={SIZE.xs} color={colors.icon} />
-        {"  "}All attachments are end-to-end encrypted.
-      </Paragraph>
-    </View>
+    </SheetWrapper>
   );
 };
-
-AttachmentDialog.present = (note) => {
-  presentSheet({
-    component: () => <AttachmentDialog note={note} />
-  });
-};

apps/mobile/app/components/auth/auth-modal.js

@@ -34,7 +34,6 @@ import { IconButton } from "../ui/icon-button";
 import { hideAuth, initialAuthMode } from "./common";
 import { Login } from "./login";
 import { Signup } from "./signup";
-import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
 
 export const AuthMode = {
   login: 0,
@@ -86,82 +85,64 @@ const AuthModal = () => {
       transparent={false}
       animated={false}
     >
-      <KeyboardAwareScrollView
-        style={{
-          width: "100%"
-        }}
-        contentContainerStyle={{
-          height: Platform.OS === "android" ? "100%" : "100%"
-        }}
-        bounces={false}
-      >
-        {currentAuthMode !== AuthMode.login ? (
-          <Signup
-            changeMode={(mode) => setCurrentAuthMode(mode)}
-            trial={AuthMode.trialSignup === currentAuthMode}
-            welcome={initialAuthMode.current === AuthMode.welcomeSignup}
-          />
-        ) : (
-          <Login
-            welcome={initialAuthMode.current === AuthMode.welcomeSignup}
-            changeMode={(mode) => setCurrentAuthMode(mode)}
-          />
-        )}
-      </KeyboardAwareScrollView>
+      {currentAuthMode !== AuthMode.login ? (
+        <Signup
+          changeMode={(mode) => setCurrentAuthMode(mode)}
+          trial={AuthMode.trialSignup === currentAuthMode}
+          welcome={initialAuthMode.current === AuthMode.welcomeSignup}
+        />
+      ) : (
+        <Login
+          welcome={initialAuthMode.current === AuthMode.welcomeSignup}
+          changeMode={(mode) => setCurrentAuthMode(mode)}
+        />
+      )}
 
       <View
         style={{
           position: "absolute",
-          paddingTop: Platform.OS === "android" ? 0 : insets.top,
-          top: 0,
+          top: Platform.OS === "ios" ? insets.top : 0,
           zIndex: 999,
-          backgroundColor: colors.nav,
-          width: "100%"
+          flexDirection: "row",
+          alignItems: "center",
+          paddingHorizontal: 12,
+          width: "100%",
+          height: 50,
+          justifyContent:
+            initialAuthMode.current !== AuthMode.welcomeSignup
+              ? "space-between"
+              : "flex-end"
         }}
       >
-        <View
-          style={{
-            flexDirection: "row",
-            alignItems: "center",
-            paddingHorizontal: 12,
-            width: "100%",
-            height: 50,
-            justifyContent:
-              initialAuthMode.current !== AuthMode.welcomeSignup
-                ? "space-between"
-                : "flex-end"
-          }}
-        >
-          {initialAuthMode.current === AuthMode.welcomeSignup ? null : (
-            <IconButton
-              name="arrow-left"
-              onPress={() => {
-                hideAuth();
-              }}
-              color={colors.pri}
-            />
-          )}
+        {initialAuthMode.current === AuthMode.welcomeSignup ? null : (
+          <IconButton
+            name="arrow-left"
+            onPress={() => {
+              hideAuth();
+            }}
+            color={colors.pri}
+          />
+        )}
 
-          {initialAuthMode.current !== AuthMode.welcomeSignup ? null : (
-            <Button
-              title="Skip"
-              onPress={() => {
-                hideAuth();
-              }}
-              iconSize={16}
-              type="gray"
-              iconPosition="right"
-              icon="chevron-right"
-              height={25}
-              iconStyle={{
-                marginTop: 2
-              }}
-              style={{
-                paddingHorizontal: 6
-              }}
-            />
-          )}
-        </View>
+        {initialAuthMode.current !== AuthMode.welcomeSignup ? null : (
+          <Button
+            title="Skip for now"
+            onPress={() => {
+              hideAuth();
+            }}
+            iconSize={20}
+            type="gray"
+            iconPosition="right"
+            icon="chevron-right"
+            height={25}
+            iconStyle={{
+              marginTop: 2
+            }}
+            style={{
+              paddingHorizontal: 6
+            }}
+          />
+        )}
       </View>
 
       <Toast context="local" />

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

@@ -18,26 +18,26 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import React, { useEffect, useState } from "react";
-import { TouchableOpacity, View } from "react-native";
+import { View } from "react-native";
 import { SheetManager } from "react-native-actions-sheet";
+import Animated, { FadeInDown, FadeOutUp } from "react-native-reanimated";
 import { DDS } from "../../services/device-detection";
 import { eSendEvent } from "../../services/event-manager";
 import { useThemeStore } from "../../stores/use-theme-store";
 import { SIZE } from "../../utils/size";
 import { sleep } from "../../utils/time";
+import BaseDialog from "../dialog/base-dialog";
 import SheetProvider from "../sheet-provider";
 import { Progress } from "../sheets/progress";
 import { Button } from "../ui/button";
 import Input from "../ui/input";
+import { SvgView } from "../ui/svg";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
+import { SVG } from "./background";
 import { hideAuth } from "./common";
 import { ForgotPassword } from "./forgot-password";
 import { useLogin } from "./use-login";
-import { useSettingStore } from "../../stores/use-setting-store";
-import { eUserLoggedIn } from "../../utils/events";
-import { useUserStore } from "../../stores/use-user-store";
-import Sync from "../../services/sync";
 
 const LoginSteps = {
   emailAuth: 1,
@@ -61,16 +61,10 @@ export const Login = ({ changeMode }) => {
     login
   } = useLogin(async () => {
     hideAuth();
-    eSendEvent(eUserLoggedIn, true);
+    eSendEvent("userLoggedIn", true);
     await sleep(500);
     Progress.present();
-    setTimeout(() => {
-      if (!useUserStore.getState().syncing) {
-        Sync.run("global", false, true);
-      }
-    }, 5000);
   });
-  const deviceMode = useSettingStore((state) => state.deviceMode);
 
   useEffect(() => {
     async () => {
@@ -89,70 +83,64 @@ export const Login = ({ changeMode }) => {
     <>
       <ForgotPassword />
       <SheetProvider context="two_factor_verify" />
-      <View
+      {loading ? (
+        <BaseDialog transparent={true} visible={true} animation="fade" />
+      ) : null}
+      <Animated.View
+        entering={FadeInDown}
+        exiting={FadeOutUp}
         style={{
           borderRadius: DDS.isTab ? 5 : 0,
           backgroundColor: colors.bg,
           zIndex: 10,
           width: "100%",
-          alignSelf: "center",
-          height: "100%",
           minHeight: "100%"
         }}
       >
         <View
           style={{
-            flexGrow: 0.8,
-            justifyContent: "flex-end",
-            paddingHorizontal: 20,
-            backgroundColor: colors.nav,
-            borderBottomWidth: 1,
-            marginBottom: 12,
-            borderBottomColor: colors.border,
-            alignSelf: deviceMode !== "mobile" ? "center" : undefined,
-            borderWidth: deviceMode !== "mobile" ? 1 : null,
-            borderColor: deviceMode !== "mobile" ? colors.border : null,
-            borderRadius: deviceMode !== "mobile" ? 20 : null,
-            marginTop: deviceMode !== "mobile" ? 50 : null,
-            width: deviceMode === "mobile" ? null : "50%"
+            height: 250,
+            overflow: "hidden"
+          }}
+        >
+          <SvgView
+            src={SVG(colors.night ? colors.icon : "black")}
+            height={700}
+          />
+        </View>
+        <View
+          style={{
+            width: "100%",
+            justifyContent: "center",
+            alignSelf: "center",
+            paddingHorizontal: 12,
+            marginBottom: 30,
+            marginTop: 15
           }}
         >
-          <View
-            style={{
-              flexDirection: "row"
-            }}
-          >
-            <View
-              style={{
-                width: 100,
-                height: 5,
-                backgroundColor: colors.accent,
-                borderRadius: 2,
-                marginRight: 7
-              }}
-            />
-
-            <View
-              style={{
-                width: 20,
-                height: 5,
-                backgroundColor: colors.nav,
-                borderRadius: 2
-              }}
-            />
-          </View>
           <Heading
             style={{
-              marginBottom: 25,
-              marginTop: 10
+              textAlign: "center"
             }}
-            extraBold
-            size={SIZE.xxl}
+            size={30}
+            color={colors.heading}
           >
-            Login to your {"\n"}account
+            Welcome back!
           </Heading>
+          <Paragraph
+            style={{
+              textDecorationLine: "underline",
+              textAlign: "center",
+              marginTop: 5
+            }}
+            onPress={() => {
+              changeMode(1);
+            }}
+            size={SIZE.md}
+          >
+            {"Don't have an account? Sign up"}
+          </Paragraph>
         </View>
-
         <View
           style={{
             width: DDS.isTab
@@ -162,10 +150,10 @@ export const Login = ({ changeMode }) => {
               : focused
               ? "100%"
               : "99.9%",
+            padding: 12,
             backgroundColor: colors.bg,
-            alignSelf: "center",
-            paddingHorizontal: 20,
-            flexGrow: 1
+            flexGrow: 1,
+            alignSelf: "center"
           }}
         >
           <Input
@@ -184,7 +172,7 @@ export const Login = ({ changeMode }) => {
             errorMessage="Email is invalid"
             placeholder="Enter your email"
             defaultValue={email.current}
-            editable={step === LoginSteps.emailAuth && !loading}
+            editable={step === LoginSteps.emailAuth}
             onSubmit={() => {
               passwordInputRef.current?.focus();
             }}
@@ -206,7 +194,6 @@ export const Login = ({ changeMode }) => {
                 autoCorrect={false}
                 placeholder="Password"
                 marginBottom={0}
-                editable={!loading}
                 defaultValue={password.current}
                 onSubmit={() => login()}
               />
@@ -218,7 +205,6 @@ export const Login = ({ changeMode }) => {
                   paddingHorizontal: 0
                 }}
                 onPress={() => {
-                  if (loading) return;
                   SheetManager.show("forgotpassword_sheet", email.current);
                 }}
                 textStyle={{
@@ -232,22 +218,25 @@ export const Login = ({ changeMode }) => {
 
           <View
             style={{
-              marginTop: 25
+              marginTop: 25,
+              alignSelf: "center"
             }}
           >
             <Button
-              loading={loading}
-              onPress={() => {
-                if (loading) return;
-                login();
-              }}
               style={{
                 width: 250,
                 borderRadius: 100
               }}
-              fontSize={SIZE.md}
+              loading={loading}
+              onPress={login}
               type="accent"
-              title={!loading ? "Continue" : null}
+              title={
+                loading
+                  ? null
+                  : step === LoginSteps.emailAuth
+                  ? "Login"
+                  : "Continue"
+              }
             />
 
             {step === LoginSteps.passwordAuth && (
@@ -259,7 +248,6 @@ export const Login = ({ changeMode }) => {
                   marginTop: 10
                 }}
                 onPress={() => {
-                  if (loading) return;
                   setStep(LoginSteps.emailAuth);
                   setLoading(false);
                 }}
@@ -270,34 +258,9 @@ export const Login = ({ changeMode }) => {
                 type="errorShade"
               />
             )}
-
-            {!loading ? (
-              <TouchableOpacity
-                onPress={() => {
-                  if (loading) return;
-                  changeMode(1);
-                }}
-                activeOpacity={0.8}
-                style={{
-                  alignSelf: "center",
-                  marginTop: 12,
-                  paddingVertical: 12
-                }}
-              >
-                <Paragraph size={SIZE.xs + 1} color={colors.icon}>
-                  Don't have an account?{" "}
-                  <Paragraph
-                    size={SIZE.xs + 1}
-                    style={{ color: colors.accent }}
-                  >
-                    Sign up
-                  </Paragraph>
-                </Paragraph>
-              </TouchableOpacity>
-            ) : null}
           </View>
         </View>
-      </View>
+      </Animated.View>
     </>
   );
 };

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

@@ -22,14 +22,14 @@ import { Modal, View } from "react-native";
 import { db } from "../../common/database";
 import BiometricService from "../../services/biometrics";
 import {
-  ToastEvent,
   eSendEvent,
-  eSubscribeEvent
+  eSubscribeEvent,
+  eUnSubscribeEvent,
+  ToastEvent
 } from "../../services/event-manager";
 import SettingsService from "../../services/settings";
 import Sync from "../../services/sync";
 import { useThemeStore } from "../../stores/use-theme-store";
-import { eLoginSessionExpired, eUserLoggedIn } from "../../utils/events";
 import { SIZE } from "../../utils/size";
 import { sleep } from "../../utils/time";
 import { Dialog } from "../dialog";
@@ -44,10 +44,8 @@ import Paragraph from "../ui/typography/paragraph";
 import { LoginSteps, useLogin } from "./use-login";
 
 function getObfuscatedEmail(email) {
-  if (!email) return "";
-  const [username, provider] = email.split("@");
-  if (username.length === 1) return `****@${provider}`;
-  return email.replace(/(.{1})(.*)(?=@)/, function (gp1, gp2, gp3) {
+  if (!email) return null;
+  return email.replace(/(.{2})(.*)(?=@)/, function (gp1, gp2, gp3) {
     for (let i = 0; i < gp3.length; i++) {
       gp2 += "*";
     }
@@ -61,7 +59,7 @@ export const SessionExpired = () => {
   const [focused, setFocused] = useState(false);
   const { step, password, email, passwordInputRef, loading, login } = useLogin(
     () => {
-      eSendEvent(eUserLoggedIn, true);
+      eSendEvent("userLoggedIn", true);
       setVisible(false);
     }
   );
@@ -84,9 +82,9 @@ export const SessionExpired = () => {
   };
 
   useEffect(() => {
-    const sub = eSubscribeEvent(eLoginSessionExpired, open);
+    eSubscribeEvent("session_expired", open);
     return () => {
-      sub.unsubscribe?.();
+      eUnSubscribeEvent("session_expired", open);
       setFocused(false);
     };
   }, [visible, open]);

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

@@ -18,7 +18,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import React, { useRef, useState } from "react";
-import { TouchableOpacity, View } from "react-native";
+import { Dimensions, View } from "react-native";
+import Animated, { FadeInDown, FadeOutUp } from "react-native-reanimated";
+import umami from "../../common/analytics";
 import { db } from "../../common/database";
 import { DDS } from "../../services/device-detection";
 import { ToastEvent } from "../../services/event-manager";
@@ -29,12 +31,14 @@ import { useUserStore } from "../../stores/use-user-store";
 import { openLinkInBrowser } from "../../utils/functions";
 import { SIZE } from "../../utils/size";
 import { sleep } from "../../utils/time";
+import BaseDialog from "../dialog/base-dialog";
 import { Button } from "../ui/button";
 import Input from "../ui/input";
+import { SvgView } from "../ui/svg";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
+import { SVG } from "./background";
 import { hideAuth } from "./common";
-import { useSettingStore } from "../../stores/use-setting-store";
 
 export const Signup = ({ changeMode, trial }) => {
   const colors = useThemeStore((state) => state.colors);
@@ -48,7 +52,6 @@ export const Signup = ({ changeMode, trial }) => {
   const [loading, setLoading] = useState(false);
   const setUser = useUserStore((state) => state.setUser);
   const setLastSynced = useUserStore((state) => state.setLastSynced);
-  const deviceMode = useSettingStore((state) => state.deviceMode);
 
   const validateInfo = () => {
     if (!password.current || !email.current || !confirmPassword.current) {
@@ -76,6 +79,7 @@ export const Signup = ({ changeMode, trial }) => {
       clearMessage();
       setEmailVerifyMessage();
       hideAuth();
+      umami.pageView("/account-created", "/welcome/signup");
       await sleep(300);
       if (trial) {
         PremiumService.sheet(null, null, true);
@@ -95,76 +99,71 @@ export const Signup = ({ changeMode, trial }) => {
 
   return (
     <>
-      <View
+      {loading ? (
+        <BaseDialog transparent={true} visible={true} animation="fade" />
+      ) : null}
+      <Animated.View
+        entering={FadeInDown}
+        exiting={FadeOutUp}
         style={{
           borderRadius: DDS.isTab ? 5 : 0,
           backgroundColor: colors.bg,
           zIndex: 10,
           width: "100%",
-          alignSelf: "center",
-          height: "100%"
+          minHeight: "100%"
         }}
       >
         <View
           style={{
-            flexGrow: 1,
-            justifyContent: "flex-end",
-            paddingHorizontal: 20,
-            backgroundColor: colors.nav,
-            marginBottom: 20,
-            borderBottomWidth: 1,
-            borderBottomColor: colors.border,
-            alignSelf: deviceMode !== "mobile" ? "center" : undefined,
-            borderWidth: deviceMode !== "mobile" ? 1 : null,
-            borderColor: deviceMode !== "mobile" ? colors.border : null,
-            borderRadius: deviceMode !== "mobile" ? 20 : null,
-            marginTop: deviceMode !== "mobile" ? 50 : null,
-            width: deviceMode === "mobile" ? null : "50%"
+            height: 250,
+            overflow: "hidden"
           }}
         >
-          <View
-            style={{
-              flexDirection: "row"
-            }}
-          >
-            <View
-              style={{
-                width: 100,
-                height: 5,
-                backgroundColor: colors.accent,
-                borderRadius: 2,
-                marginRight: 7
-              }}
-            />
-
-            <View
-              style={{
-                width: 20,
-                height: 5,
-                backgroundColor: colors.nav,
-                borderRadius: 2
-              }}
-            />
-          </View>
-          <Heading
-            extraBold
-            style={{
-              marginBottom: 25,
-              marginTop: 10
-            }}
-            size={SIZE.xxl}
-          >
-            Create your {"\n"}account
-          </Heading>
+          <SvgView
+            src={SVG(colors.night ? colors.icon : "black")}
+            height={700}
+          />
         </View>
 
         <View
           style={{
-            width: DDS.isTab ? "50%" : "100%",
-            paddingHorizontal: 20,
-            backgroundColor: colors.bg,
+            width: "100%",
+            justifyContent: "center",
             alignSelf: "center",
-            flexGrow: 0.5
+            paddingHorizontal: 12,
+            marginBottom: 30,
+            marginTop: Dimensions.get("window").height < 700 ? -75 : 15
+          }}
+        >
+          <Heading
+            style={{
+              textAlign: "center"
+            }}
+            size={30}
+            color={colors.heading}
+          >
+            Create your account
+          </Heading>
+          <Paragraph
+            style={{
+              textDecorationLine: "underline",
+              textAlign: "center"
+            }}
+            onPress={() => {
+              changeMode(0);
+            }}
+            size={SIZE.md}
+          >
+            Already have an account? Log in
+          </Paragraph>
+        </View>
+        <View
+          style={{
+            width: DDS.isTab ? "50%" : "100%",
+            padding: 12,
+            backgroundColor: colors.bg,
+            flexGrow: 1,
+            alignSelf: "center"
           }}
         >
           <Input
@@ -223,13 +222,34 @@ export const Signup = ({ changeMode, trial }) => {
             validationType="confirmPassword"
             customValidator={() => password.current}
             placeholder="Confirm password"
-            marginBottom={12}
+            marginBottom={5}
             onSubmit={signup}
           />
+          <View
+            style={{
+              marginTop: 25,
+              alignSelf: "center"
+            }}
+          >
+            <Button
+              style={{
+                width: 250,
+                borderRadius: 100
+              }}
+              loading={loading}
+              onPress={signup}
+              type="accent"
+              title={loading ? null : "Agree and continue"}
+            />
+          </View>
 
           <Paragraph
             style={{
-              marginBottom: 25
+              textAlign: "center",
+              position: "absolute",
+              bottom: 0,
+              alignSelf: "center",
+              marginBottom: 20
             }}
             size={SIZE.xs}
             color={colors.icon}
@@ -245,7 +265,7 @@ export const Signup = ({ changeMode, trial }) => {
               }}
               color={colors.accent}
             >
-              Terms of Service{" "}
+              terms of service{" "}
             </Paragraph>
             and{" "}
             <Paragraph
@@ -258,46 +278,11 @@ export const Signup = ({ changeMode, trial }) => {
               }}
               color={colors.accent}
             >
-              Privacy Policy.
-            </Paragraph>{" "}
-            You also agree to recieve marketing emails from us which you can
-            opt-out of from app settings.
-          </Paragraph>
-
-          <Button
-            title={!loading ? "Continue" : null}
-            type="accent"
-            loading={loading}
-            onPress={signup}
-            fontSize={SIZE.md}
-            style={{
-              marginRight: 12,
-              width: 250,
-              borderRadius: 100
-            }}
-          />
-
-          <TouchableOpacity
-            onPress={() => {
-              if (loading) return;
-              changeMode(0);
-            }}
-            activeOpacity={0.8}
-            style={{
-              alignSelf: "center",
-              marginTop: 12,
-              paddingVertical: 12
-            }}
-          >
-            <Paragraph size={SIZE.xs + 1} color={colors.icon}>
-              Already have an account?{" "}
-              <Paragraph size={SIZE.xs + 1} style={{ color: colors.accent }}>
-                Login
-              </Paragraph>
+              privacy policy.
             </Paragraph>
-          </TouchableOpacity>
+          </Paragraph>
         </View>
-      </View>
+      </Animated.View>
     </>
   );
 };

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

@@ -54,7 +54,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
     app: "Enter the 6 digit code from your authenticator app to continue logging in",
     sms: "Enter the 6 digit code sent to your phone number to continue logging in",
     email: "Enter the 6 digit code sent to your email to continue logging in",
-    recoveryCode: "Enter the recovery code to continue logging in"
+    recoveryCode: "Enter the 8 digit recovery code to continue logging in"
   };
 
   const secondaryMethodsText = {
@@ -65,7 +65,9 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
   };
 
   const onNext = async () => {
-    if (!code.current || code.current.length < 6) return;
+    const length = currentMethod.method === "recoveryCode" ? 8 : 6;
+
+    if (!code.current || code.current.length !== length) return;
     setLoading(true);
     inputRef.current?.blur();
     await onMfaLogin(
@@ -200,26 +202,22 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
           <>
             <Input
               placeholder={
-                currentMethod.method === "recoveryCode"
-                  ? "xxxxx-xxxxx"
-                  : "xxxxxx"
+                currentMethod.method === "recoveryCode" ? "xxxxxxxx" : "xxxxxx"
               }
               testID={"input.totp"}
-              maxLength={
-                currentMethod.method === "recoveryCode" ? undefined : 6
-              }
+              maxLength={currentMethod.method === "recoveryCode" ? 8 : 6}
               fwdRef={inputRef}
               textAlign="center"
               onChangeText={(value) => {
                 code.current = value;
-                //onNext();
+                onNext();
               }}
               inputStyle={{
                 fontSize: SIZE.lg,
                 height: 60,
                 textAlign: "center",
                 letterSpacing: 10,
-                width: 250
+                width: null
               }}
               keyboardType={
                 currentMethod.method === "recoveryCode" ? "default" : "numeric"
@@ -302,9 +300,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
 
 TwoFactorVerification.present = (onMfaLogin, data, context) => {
   presentSheet({
-    component: () => (
-      <TwoFactorVerification onMfaLogin={onMfaLogin} mfaInfo={data} />
-    ),
+    component: <TwoFactorVerification onMfaLogin={onMfaLogin} mfaInfo={data} />,
     context: context || "two_factor_verify",
     onClose: () => {
       onMfaLogin();

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

@@ -75,7 +75,6 @@ export const useLogin = (onFinishLogin) => {
                   mfa.code,
                   mfa.method
                 );
-
                 if (success) {
                   setStep(LoginSteps.passwordAuth);
                   setLoading(false);
@@ -94,8 +93,6 @@ export const useLogin = (onFinishLogin) => {
                 }
               }
             }, mfaInfo);
-          } else {
-            finishWithError(new Error("Unable to send 2FA code"));
           }
           break;
         }

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

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import React, { useCallback, useEffect } from "react";
+import React, { useEffect } from "react";
 import { Keyboard, Platform, View } from "react-native";
 import Animated, {
   Easing,
@@ -30,10 +30,10 @@ import { notesnook } from "../../../e2e/test.ids";
 import { editorState } from "../../screens/editor/tiptap/utils";
 import { useSelectionStore } from "../../stores/use-selection-store";
 import { useSettingStore } from "../../stores/use-setting-store";
-import { getElevationStyle } from "../../utils/elevation";
-import { SIZE, normalize } from "../../utils/size";
-import NativeTooltip from "../../utils/tooltip";
+import { getElevation, showTooltip, TOOLTIP_POSITIONS } from "../../utils";
+import { normalize, SIZE } from "../../utils/size";
 import { PressableButton } from "../ui/pressable";
+import { useCallback } from "react";
 
 export const FloatingButton = ({
   title,
@@ -116,11 +116,11 @@ export const FloatingButton = ({
         accentColor={color || "accent"}
         accentText="light"
         customStyle={{
-          ...getElevationStyle(5),
+          ...getElevation(5),
           borderRadius: 100
         }}
         onLongPress={(event) => {
-          NativeTooltip.show(event, title, NativeTooltip.POSITIONS.LEFT);
+          showTooltip(event, title, TOOLTIP_POSITIONS.LEFT);
         }}
         onPress={onPress}
       >

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

@@ -18,8 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import React from "react";
-import { KeyboardAvoidingView, Platform, View } from "react-native";
-import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
+import { KeyboardAvoidingView, Platform, SafeAreaView } from "react-native";
 import useIsFloatingKeyboard from "../../hooks/use-is-floating-keyboard";
 import { useSettingStore } from "../../stores/use-setting-store";
 import { Header } from "../header";
@@ -29,7 +28,6 @@ export const Container = ({ children }) => {
   const introCompleted = useSettingStore(
     (state) => state.settings.introCompleted
   );
-  const insets = useGlobalSafeAreaInsets();
   return (
     <KeyboardAvoidingView
       behavior="padding"
@@ -38,12 +36,10 @@ export const Container = ({ children }) => {
         flex: 1
       }}
     >
-      <View
+      <SafeAreaView
         style={{
           flex: 1,
-          overflow: "hidden",
-          paddingTop: Platform.OS === "android" ? 0 : insets.top,
-          paddingBottom: Platform.OS === "android" ? 0 : insets.bottom
+          overflow: "hidden"
         }}
       >
         {!introCompleted ? null : (
@@ -54,7 +50,7 @@ export const Container = ({ children }) => {
         )}
 
         {children}
-      </View>
+      </SafeAreaView>
     </KeyboardAvoidingView>
   );
 };

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

@@ -21,6 +21,7 @@ import React from "react";
 import { useNoteStore } from "../../stores/use-notes-store";
 import { useThemeStore } from "../../stores/use-theme-store";
 import { AnnouncementDialog } from "../announcements";
+import { AttachmentDialog } from "../attachments";
 import AuthModal from "../auth/auth-modal";
 import { SessionExpired } from "../auth/session-expired";
 import { Dialog } from "../dialog";
@@ -33,10 +34,13 @@ import MergeConflicts from "../merge-conflicts";
 import PremiumDialog from "../premium";
 import { Expiring } from "../premium/expiring";
 import SheetProvider from "../sheet-provider";
+import { AddNotebookSheet } from "../sheets/add-notebook";
+import AddToNotebookSheet from "../sheets/add-to";
+import ManageTagsSheet from "../sheets/manage-tags";
+import PublishNoteSheet from "../sheets/publish-note";
 import RateAppSheet from "../sheets/rate-app";
 import RecoveryKeySheet from "../sheets/recovery-key";
 import RestoreDataSheet from "../sheets/restore-data";
-import PDFPreview from "../dialogs/pdf-preview";
 
 const DialogProvider = () => {
   const colors = useThemeStore((state) => state.colors);
@@ -47,6 +51,7 @@ const DialogProvider = () => {
       <LoadingDialog />
       <Dialog context="global" />
       <AddTopicDialog colors={colors} />
+      <AddNotebookSheet colors={colors} />
       <PremiumDialog colors={colors} />
       <AuthModal colors={colors} />
       <MergeConflicts />
@@ -56,12 +61,15 @@ const DialogProvider = () => {
       <RestoreDataSheet />
       <ResultDialog />
       <VaultDialog colors={colors} />
+      <AddToNotebookSheet colors={colors} />
       <RateAppSheet />
       <ImagePreview />
+      <PublishNoteSheet />
+      <ManageTagsSheet />
+      <AttachmentDialog />
       {loading ? null : <Expiring />}
       <AnnouncementDialog />
       <SessionExpired />
-      <PDFPreview />
     </>
   );
 };

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

@@ -46,8 +46,7 @@ const BaseDialog = ({
   animated = true,
   bounce = true,
   closeOnTouch = true,
-  useSafeArea = true,
-  avoidKeyboardResize = false
+  useSafeArea = true
 }) => {
   const floating = useIsFloatingKeyboard();
 
@@ -95,7 +94,7 @@ const BaseDialog = ({
         }}
       >
         <KeyboardAvoidingView
-          enabled={!floating && Platform.OS === "ios" && !avoidKeyboardResize}
+          enabled={!floating && Platform.OS === "ios"}
           behavior="padding"
         >
           <BouncingView

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

@@ -21,7 +21,7 @@ import React from "react";
 import { View } from "react-native";
 import { DDS } from "../../services/device-detection";
 import { useThemeStore } from "../../stores/use-theme-store";
-import { getElevationStyle } from "../../utils/elevation";
+import { getElevation } from "../../utils";
 
 const DialogContainer = ({ width, height, ...restProps }) => {
   const colors = useThemeStore((state) => state.colors);
@@ -30,7 +30,7 @@ const DialogContainer = ({ width, height, ...restProps }) => {
     <View
       {...restProps}
       style={{
-        ...getElevationStyle(5),
+        ...getElevation(5),
         width: width || DDS.isTab ? 500 : "85%",
         maxHeight: height || 450,
         borderRadius: 10,

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

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import React from "react";
-import { Text, View, ViewStyle } from "react-native";
+import { Text, View } from "react-native";
 import { useThemeStore } from "../../stores/use-theme-store";
 import { SIZE } from "../../utils/size";
 import { Button } from "../ui/button";
@@ -41,7 +41,6 @@ type DialogHeaderProps = {
   padding?: number;
   centered?: boolean;
   titlePart?: string;
-  style?: ViewStyle;
 };
 
 const DialogHeader = ({
@@ -51,8 +50,7 @@ const DialogHeader = ({
   paragraphColor,
   padding,
   centered,
-  titlePart,
-  style
+  titlePart
 }: DialogHeaderProps) => {
   const colors = useThemeStore((state) => state.colors);
 
@@ -64,8 +62,7 @@ const DialogHeader = ({
           alignItems: "center",
           justifyContent: "space-between",
           minHeight: 50,
-          paddingHorizontal: padding,
-          ...style
+          paddingHorizontal: padding
         }}
       >
         <View

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

@@ -25,7 +25,7 @@ import {
   eUnSubscribeEvent
 } from "../../services/event-manager";
 import { useThemeStore } from "../../stores/use-theme-store";
-import { getElevationStyle } from "../../utils/elevation";
+import { getElevation } from "../../utils";
 import { eCloseSimpleDialog, eOpenSimpleDialog } from "../../utils/events";
 import { sleep } from "../../utils/time";
 import { Toast } from "../toast";
@@ -35,7 +35,6 @@ import BaseDialog from "./base-dialog";
 import DialogButtons from "./dialog-buttons";
 import DialogHeader from "./dialog-header";
 import { useCallback } from "react";
-import { Button } from "../ui/button";
 
 export const Dialog = ({ context = "global" }) => {
   const colors = useThemeStore((state) => state.colors);
@@ -55,11 +54,7 @@ export const Dialog = ({ context = "global" }) => {
     input: false,
     inputPlaceholder: "Enter some text",
     defaultValue: "",
-    disableBackdropClosing: false,
-    check: {
-      info: "Check",
-      type: "transparent"
-    }
+    disableBackdropClosing: false
   });
 
   useEffect(() => {
@@ -92,7 +87,6 @@ export const Dialog = ({ context = "global" }) => {
       if (data.context !== context) return;
       setDialogInfo(data);
       setVisible(true);
-      setInputValue(data.defaultValue);
     },
     [context]
   );
@@ -111,7 +105,7 @@ export const Dialog = ({ context = "global" }) => {
   };
 
   const style = {
-    ...getElevationStyle(5),
+    ...getElevation(5),
     width: DDS.isTab ? 400 : "85%",
     maxHeight: 450,
     borderRadius: 5,
@@ -143,9 +137,6 @@ export const Dialog = ({ context = "global" }) => {
           paragraph={dialogInfo.paragraph}
           paragraphColor={dialogInfo.paragraphColor}
           padding={12}
-          style={{
-            minHeight: 0
-          }}
         />
         <Seperator half />
 
@@ -172,28 +163,6 @@ export const Dialog = ({ context = "global" }) => {
           </View>
         ) : null}
 
-        {dialogInfo.check ? (
-          <>
-            <Button
-              onPress={() => {
-                setInputValue(!inputValue);
-              }}
-              icon={
-                inputValue
-                  ? "check-circle-outline"
-                  : "checkbox-blank-circle-outline"
-              }
-              style={{
-                justifyContent: "flex-start"
-              }}
-              height={35}
-              width="100%"
-              title={dialogInfo.check.info}
-              type={inputValue ? dialogInfo.check.type : "gray"}
-            />
-          </>
-        ) : null}
-
         <DialogButtons
           onPressNegative={onNegativePress}
           onPressPositive={dialogInfo.positivePress && onPressPositive}

apps/mobile/app/components/dialogs/add-topic/index.js

@@ -22,7 +22,6 @@ import { View } from "react-native";
 
 import { useMenuStore } from "../../../stores/use-menu-store";
 import {
-  eSendEvent,
   eSubscribeEvent,
   eUnSubscribeEvent,
   ToastEvent
@@ -31,7 +30,6 @@ import Navigation from "../../../services/navigation";
 import { db } from "../../../common/database";
 import {
   eCloseAddTopicDialog,
-  eOnTopicSheetUpdate,
   eOpenAddTopicDialog
 } from "../../../utils/events";
 import { sleep } from "../../../utils/time";
@@ -42,7 +40,6 @@ import DialogHeader from "../../dialog/dialog-header";
 import Input from "../../ui/input";
 import Seperator from "../../ui/seperator";
 import { Toast } from "../../toast";
-import { useRelationStore } from "../../../stores/use-relation-store";
 
 export class AddTopicDialog extends React.Component {
   constructor(props) {
@@ -62,12 +59,14 @@ export class AddTopicDialog extends React.Component {
 
   addNewTopic = async () => {
     try {
+      this.setState({ loading: true });
       if (!this.title || this.title?.trim() === "") {
         ToastEvent.show({
           heading: "Topic title is required",
           type: "error",
           context: "local"
         });
+        this.setState({ loading: false });
         return;
       }
 
@@ -79,13 +78,10 @@ export class AddTopicDialog extends React.Component {
 
         await db.notebooks.notebook(topic.notebookId).topics.add(topic);
       }
+      this.setState({ loading: false });
       this.close();
-      setTimeout(() => {
-        Navigation.queueRoutesForUpdate();
-        useMenuStore.getState().setMenuPins();
-      });
-      eSendEvent(eOnTopicSheetUpdate);
-      useRelationStore.getState().update();
+      Navigation.queueRoutesForUpdate("Notebooks", "Notebook", "TopicNotes");
+      useMenuStore.getState().setMenuPins();
     } catch (e) {
       console.error(e);
     }
@@ -181,6 +177,7 @@ export class AddTopicDialog extends React.Component {
             positiveTitle={this.toEdit ? "Save" : "Add"}
             onPressNegative={() => this.close()}
             onPressPositive={() => this.addNewTopic()}
+            loading={this.state.loading}
           />
         </DialogContainer>
         <Toast context="local" />

apps/mobile/app/components/dialogs/jump-to-section/index.js

@@ -26,7 +26,7 @@ import {
 } from "../../../services/event-manager";
 import { useMessageStore } from "../../../stores/use-message-store";
 import { useThemeStore } from "../../../stores/use-theme-store";
-import { getElevationStyle } from "../../../utils/elevation";
+import { getElevation } from "../../../utils";
 import {
   eCloseJumpToDialog,
   eOpenJumpToDialog,
@@ -124,7 +124,7 @@ const JumpToSectionDialog = ({ scrollRef, data, type }) => {
     >
       <View
         style={{
-          ...getElevationStyle(5),
+          ...getElevation(5),
           width: DDS.isTab ? 500 : "85%",
           backgroundColor: colors.bg,
           zIndex: 100,

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

@@ -1,324 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import React, { useEffect, useRef, useState } from "react";
-import { Dimensions, TextInput, View } from "react-native";
-import {
-  addOrientationListener,
-  removeOrientationListener
-} from "react-native-orientation";
-import Pdf from "react-native-pdf";
-import Animated, { FadeIn, FadeOut } from "react-native-reanimated";
-import downloadAttachment from "../../../common/filesystem/download-attachment";
-import { cacheDir } from "../../../common/filesystem/utils";
-import { useAttachmentProgress } from "../../../hooks/use-attachment-progress";
-import useGlobalSafeAreaInsets from "../../../hooks/use-global-safe-area-insets";
-import {
-  eSubscribeEvent,
-  eUnSubscribeEvent
-} from "../../../services/event-manager";
-import { useThemeStore } from "../../../stores/use-theme-store";
-import { SIZE } from "../../../utils/size";
-import { Dialog } from "../../dialog";
-import BaseDialog from "../../dialog/base-dialog";
-import { presentDialog } from "../../dialog/functions";
-import SheetProvider from "../../sheet-provider";
-import { IconButton } from "../../ui/icon-button";
-import { ProgressBarComponent } from "../../ui/svg/lazy";
-import Paragraph from "../../ui/typography/paragraph";
-import { sleep } from "../../../utils/time";
-import { MMKV } from "../../../common/database/mmkv";
-
-const WIN_WIDTH = Dimensions.get("window").width;
-const WIN_HEIGHT = Dimensions.get("window").height;
-
-const attachmentSnapshotsKey = "___attachmentsnapshots";
-const usePDFSnapshot = (attachment) => {
-  const snapshots = useRef(MMKV.getMap(attachmentSnapshotsKey) || {});
-  const snapshot = useRef(snapshots[attachment?.id]);
-
-  function saveSnapshot(ss) {
-    if (!attachment) return;
-    snapshots.current[attachment.id] = ss;
-    MMKV.setMap(attachmentSnapshotsKey, snapshots.current);
-    snapshot.current = snapshots.current[attachment.id];
-  }
-
-  return [snapshot, saveSnapshot];
-};
-
-const PDFPreview = () => {
-  const colors = useThemeStore((state) => state.colors);
-  const [visible, setVisible] = useState(false);
-  const [pdfSource, setPDFSource] = useState();
-  const [loading, setLoading] = useState(false);
-  const [width, setWidth] = useState(WIN_WIDTH);
-  const insets = useGlobalSafeAreaInsets();
-  const [numPages, setNumPages] = useState(0);
-  const [currentPage, setCurrentPage] = useState(1);
-  const inputRef = useRef();
-  const pdfRef = useRef();
-  const [attachment, setAttachment] = useState(null);
-  const [password, setPassword] = useState("");
-  const [progress] = useAttachmentProgress(attachment);
-  const [snapshot, saveSnapshot] = usePDFSnapshot(attachment);
-  const snapshotValue = useRef(snapshot.current);
-
-  useEffect(() => {
-    eSubscribeEvent("PDFPreview", open);
-    return () => {
-      eUnSubscribeEvent("PDFPreview", open);
-    };
-  }, []);
-
-  const onOrientationChange = (o) => {
-    if (o.includes("LANDSCAPE")) {
-      setWidth(WIN_HEIGHT);
-    } else {
-      setWidth(WIN_WIDTH);
-    }
-  };
-
-  useEffect(() => {
-    addOrientationListener(onOrientationChange);
-    return () => {
-      removeOrientationListener(onOrientationChange);
-    };
-  }, []);
-
-  const open = async (attachment) => {
-    setVisible(true);
-    setLoading(true);
-    setTimeout(async () => {
-      setAttachment(attachment);
-      let hash = attachment.metadata.hash;
-      if (!hash) return;
-      const uri = await downloadAttachment(hash, false, {
-        silent: true,
-        cache: true
-      });
-      const path = `${cacheDir}/${uri}`;
-      snapshotValue.current = snapshot.current;
-      setPDFSource("file://" + path);
-      setLoading(false);
-    }, 100);
-  };
-
-  const close = () => {
-    setPDFSource(null);
-    setVisible(false);
-    setPassword("");
-  };
-
-  const onError = async (error) => {
-    if (error?.message === "Password required or incorrect password.") {
-      await sleep(300);
-      presentDialog({
-        context: attachment?.metadata?.hash,
-        input: true,
-        inputPlaceholder: "Enter password",
-        positiveText: "Unlock",
-        title: "Decrypt",
-        paragraph: "Please input password to view pdf.",
-        positivePress: (value) => {
-          setTimeout(() => {
-            setPassword(value);
-          });
-        },
-        onClose: () => {
-          close();
-        }
-      });
-    }
-  };
-
-  return (
-    visible && (
-      <BaseDialog animation="fade" visible={true} onRequestClose={close}>
-        <SheetProvider context={attachment?.metadata?.hash} />
-        <Dialog context={attachment?.metadata?.hash} />
-
-        <View
-          style={{
-            width: "100%",
-            height: "100%",
-            backgroundColor: "black"
-          }}
-        >
-          {loading ? (
-            <Animated.View
-              exiting={FadeOut}
-              style={{
-                flex: 1,
-                justifyContent: "center",
-                alignItems: "center"
-              }}
-            >
-              <ProgressBarComponent
-                indeterminate={!progress}
-                color={colors.accent}
-                borderColor="transparent"
-                progress={parseInt(progress?.value || "100") / 100}
-              />
-              <Paragraph
-                style={{
-                  marginTop: 10
-                }}
-                color={colors.light}
-              >
-                Loading {`${progress?.percent ? `(${progress?.percent})` : ""}`}
-                ... Please wait
-              </Paragraph>
-            </Animated.View>
-          ) : (
-            <>
-              <View
-                style={{
-                  width: "100%",
-                  height: 50,
-                  marginTop: insets.top,
-                  flexDirection: "row",
-                  justifyContent: "space-between",
-                  paddingHorizontal: 12,
-                  paddingLeft: 6
-                }}
-              >
-                <View
-                  style={{
-                    flexDirection: "row"
-                  }}
-                >
-                  <IconButton
-                    color={colors.light}
-                    name="arrow-left"
-                    onPress={close}
-                    customStyle={{
-                      marginRight: 12
-                    }}
-                    size={SIZE.xxl}
-                  />
-                </View>
-
-                <View
-                  style={{
-                    flexDirection: "row",
-                    alignItems: "center",
-                    marginRight: 12
-                  }}
-                >
-                  <TextInput
-                    ref={inputRef}
-                    defaultValue={currentPage + ""}
-                    style={{
-                      color: colors.pri,
-                      padding: 0,
-                      paddingTop: 0,
-                      paddingBottom: 0,
-                      marginTop: 0,
-                      marginBottom: 0,
-                      paddingVertical: 0,
-                      height: 25,
-                      backgroundColor: colors.nav,
-                      width: 40,
-                      textAlign: "center",
-                      marginRight: 4,
-                      borderRadius: 3,
-                      fontFamily: "OpenSans-Regular"
-                    }}
-                    selectTextOnFocus
-                    keyboardType="decimal-pad"
-                    onSubmitEditing={(event) => {
-                      setCurrentPage(event.nativeEvent.text);
-                      pdfRef.current?.setPage(parseInt(event.nativeEvent.text));
-                    }}
-                    blurOnSubmit
-                  />
-                  <Paragraph color={colors.light}>/{numPages}</Paragraph>
-                </View>
-
-                <View
-                  style={{
-                    flexDirection: "row"
-                  }}
-                >
-                  <IconButton
-                    color={colors.light}
-                    name="download"
-                    onPress={() => {
-                      downloadAttachment(attachment.metadata.hash, false);
-                    }}
-                  />
-                </View>
-              </View>
-              {pdfSource ? (
-                <Animated.View
-                  style={{
-                    flex: 1
-                  }}
-                  entering={FadeIn}
-                >
-                  <Pdf
-                    source={{
-                      uri: pdfSource
-                    }}
-                    ref={pdfRef}
-                    onLoadComplete={(numberOfPages) => {
-                      setNumPages(numberOfPages);
-                    }}
-                    onPageChanged={(page) => {
-                      setCurrentPage(page);
-                      inputRef.current?.setNativeProps({
-                        text: page + ""
-                      });
-                      saveSnapshot({
-                        currentPage: page,
-                        scale: snapshot?.current?.scale
-                      });
-                    }}
-                    // scale={snapshotValue.current?.scale}
-                    // onScaleChanged={(scale) => {
-                    //   saveSnapshot({
-                    //     currentPage: snapshot?.current?.currentPage,
-                    //     scale: scale
-                    //   });
-                    // }}
-                    page={snapshotValue?.current?.currentPage}
-                    password={password}
-                    maxScale={6}
-                    onError={onError}
-                    onPressLink={(uri) => {
-                      console.log(`Link pressed: ${uri}`);
-                    }}
-                    style={{
-                      flex: 1,
-                      width: width,
-                      height: Dimensions.get("window").height
-                    }}
-                  />
-                </Animated.View>
-              ) : null}
-            </>
-          )}
-        </View>
-      </BaseDialog>
-    )
-  );
-};
-
-export default PDFPreview;

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

@@ -25,7 +25,7 @@ import {
   eUnSubscribeEvent
 } from "../../../services/event-manager";
 import { useThemeStore } from "../../../stores/use-theme-store";
-import { getElevationStyle } from "../../../utils/elevation";
+import { getElevation } from "../../../utils";
 import { eCloseResultDialog, eOpenResultDialog } from "../../../utils/events";
 import { SIZE } from "../../../utils/size";
 import BaseDialog from "../../dialog/base-dialog";
@@ -68,7 +68,7 @@ const ResultDialog = () => {
     <BaseDialog visible={true} onRequestClose={close}>
       <View
         style={{
-          ...getElevationStyle(5),
+          ...getElevation(5),
           width: DDS.isTab ? 350 : "85%",
           maxHeight: 500,
           borderRadius: 10,
@@ -135,6 +135,7 @@ const ResultDialog = () => {
               paddingHorizontal: 12
             }}
             onPress={close}
+            height={50}
             fontSize={SIZE.md + 2}
           />
         </View>

apps/mobile/app/components/dialogs/result/pro-features.js

@@ -86,7 +86,7 @@ export const ProFeatures = ({ count = 6 }) => {
           await sleep(300);
           eSendEvent(eOpenPremiumDialog);
         }}
-        size={SIZE.xs}
+        size={SIZE.xs + 1}
         style={{
           textDecorationLine: "underline",
           color: colors.icon

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

@@ -34,8 +34,7 @@ import {
 } from "../../../services/event-manager";
 import Navigation from "../../../services/navigation";
 import SearchService from "../../../services/search";
-import { convertNoteToText } from "../../../utils/note-to-text";
-import { getElevationStyle } from "../../../utils/elevation";
+import { getElevation, toTXT } from "../../../utils";
 import {
   eClearEditor,
   eCloseActionSheet,
@@ -208,7 +207,13 @@ export class VaultDialog extends Component {
       return;
     }
 
-    Navigation.queueRoutesForUpdate();
+    Navigation.queueRoutesForUpdate(
+      "Notes",
+      "Favorites",
+      "TopicNotes",
+      "TaggedNotes",
+      "ColoredNotes"
+    );
 
     this.password = null;
     this.confirmPassword = null;
@@ -565,7 +570,7 @@ export class VaultDialog extends Component {
   }
 
   async _copyNote(note) {
-    Clipboard.setString(await convertNoteToText(note));
+    Clipboard.setString(await toTXT(note));
     ToastEvent.show({
       heading: "Note copied",
       type: "success",
@@ -581,7 +586,7 @@ export class VaultDialog extends Component {
       await Share.open({
         heading: "Share note",
         failOnCancel: false,
-        message: await convertNoteToText(note)
+        message: await toTXT(note)
       });
     } catch (e) {
       console.error(e);
@@ -679,7 +684,7 @@ export class VaultDialog extends Component {
       >
         <View
           style={{
-            ...getElevationStyle(5),
+            ...getElevation(5),
             width: DDS.isTab ? 350 : "85%",
             borderRadius: 10,
             backgroundColor: colors.bg,

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

@@ -92,7 +92,7 @@ export const RightMenus = () => {
           onRequestClose={() => {
             menuRef.current?.hide();
           }}
-          button={
+          anchor={
             <IconButton
               onPress={() => {
                 menuRef.current?.show();

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

@@ -30,6 +30,7 @@ import { useThemeStore } from "../../stores/use-theme-store";
 import { eScrollEvent } from "../../utils/events";
 import { SIZE } from "../../utils/size";
 import Heading from "../ui/typography/heading";
+import Paragraph from "../ui/typography/paragraph";
 import { useCallback } from "react";
 import Tag from "../ui/tag";
 
@@ -63,15 +64,13 @@ export const Title = () => {
       }
       if (data.y > 150) {
         if (!hide) return;
-        titleState[currentScreen.id] = false;
         setHide(false);
       } else {
         if (hide) return;
-        titleState[currentScreen.id] = true;
         setHide(true);
       }
     },
-    [currentScreen.id, currentScreen.name, hide]
+    [currentScreen.name, hide]
   );
 
   useEffect(() => {
@@ -86,6 +85,10 @@ export const Title = () => {
     }
   }, [currentScreen.id, currentScreen.name]);
 
+  useEffect(() => {
+    titleState[currentScreen.id] = hide;
+  }, [currentScreen.id, hide]);
+
   useEffect(() => {
     eSubscribeEvent(eScrollEvent, onScroll);
     return () => {
@@ -109,16 +112,25 @@ export const Title = () => {
       {!hide && !isHidden ? (
         <Heading
           onPress={navigateToNotebook}
-          numberOfLines={1}
-          size={SIZE.xl}
+          numberOfLines={isTopic ? 2 : 1}
+          size={isTopic ? SIZE.md + 2 : SIZE.xl}
           style={{
             flexWrap: "wrap",
             marginTop: Platform.OS === "ios" ? -1 : 0
           }}
           color={currentScreen.color || colors.heading}
         >
+          {isTopic ? (
+            <Paragraph numberOfLines={1} size={SIZE.xs + 1}>
+              {notebook?.title}
+              {"\n"}
+            </Paragraph>
+          ) : null}
           {isTag ? (
-            <Heading size={SIZE.xl} color={colors.accent}>
+            <Heading
+              size={isTopic ? SIZE.md + 2 : SIZE.xl}
+              color={colors.accent}
+            >
               #
             </Heading>
           ) : null}

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

@@ -18,26 +18,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import React, { useEffect, useState } from "react";
-import { Platform, View } from "react-native";
+import { View } from "react-native";
 import ImageViewer from "react-native-image-zoom-viewer";
-import downloadAttachment from "../../common/filesystem/download-attachment";
-import { cacheDir } from "../../common/filesystem/utils";
 import {
   eSubscribeEvent,
   eUnSubscribeEvent
 } from "../../services/event-manager";
-import { useThemeStore } from "../../stores/use-theme-store";
 import BaseDialog from "../dialog/base-dialog";
 import { IconButton } from "../ui/icon-button";
-import { ProgressBarComponent } from "../ui/svg/lazy";
-import Sodium from "@ammarahmed/react-native-sodium";
-import dataurl from "@notesnook/core/utils/dataurl";
 
 const ImagePreview = () => {
-  const colors = useThemeStore((state) => state.colors);
   const [visible, setVisible] = useState(false);
   const [image, setImage] = useState("");
-  const [loading, setLoading] = useState(false);
 
   useEffect(() => {
     eSubscribeEvent("ImagePreview", open);
@@ -47,29 +39,9 @@ const ImagePreview = () => {
     };
   }, []);
 
-  const open = async (image) => {
+  const open = (image) => {
+    setImage(image);
     setVisible(true);
-    setLoading(true);
-    setTimeout(async () => {
-      let hash = image.hash;
-      if (!hash && dataurl.toObject(image.src)) {
-        const data = dataurl.toObject(image.src);
-        if (!data) return;
-        hash = await Sodium.hashFile({
-          data: data.data,
-          type: "base64",
-          uri: ""
-        });
-      }
-      if (!hash) return;
-      const uri = await downloadAttachment(hash, false, {
-        silent: true,
-        cache: true
-      });
-      const path = `${cacheDir}/${uri}`;
-      setImage("file://" + path);
-      setLoading(false);
-    }, 100);
   };
 
   const close = () => {
@@ -87,60 +59,44 @@ const ImagePreview = () => {
             backgroundColor: "black"
           }}
         >
-          {loading ? (
-            <View
-              style={{
-                flex: 1,
-                justifyContent: "center",
-                alignItems: "center"
-              }}
-            >
-              <ProgressBarComponent
-                indeterminate
-                color={colors.accent}
-                borderColor="transparent"
-              />
-            </View>
-          ) : (
-            <ImageViewer
-              enableImageZoom={true}
-              renderIndicator={() => <></>}
-              enableSwipeDown
-              useNativeDriver
-              onSwipeDown={close}
-              saveToLocalByLongPress={false}
-              renderHeader={() => (
-                <View
-                  style={{
-                    flexDirection: "row",
-                    width: "100%",
-                    justifyContent: "flex-end",
-                    alignItems: "center",
-                    height: 80,
-                    marginTop: 0,
-                    paddingHorizontal: 12,
-                    position: "absolute",
-                    zIndex: 999,
-                    backgroundColor: "rgba(0,0,0,0.3)",
-                    paddingTop: Platform.OS === "android" ? 30 : 0
+          <ImageViewer
+            enableImageZoom={true}
+            renderIndicator={() => <></>}
+            enableSwipeDown
+            useNativeDriver
+            onSwipeDown={close}
+            saveToLocalByLongPress={false}
+            renderHeader={() => (
+              <View
+                style={{
+                  flexDirection: "row",
+                  width: "100%",
+                  justifyContent: "flex-end",
+                  alignItems: "center",
+                  height: 80,
+                  marginTop: 0,
+                  paddingHorizontal: 12,
+                  position: "absolute",
+                  zIndex: 999,
+                  backgroundColor: "rgba(0,0,0,0.3)",
+                  paddingTop: 30
+                }}
+              >
+                <IconButton
+                  name="close"
+                  color="white"
+                  onPress={() => {
+                    close();
                   }}
-                >
-                  <IconButton
-                    name="close"
-                    color="white"
-                    onPress={() => {
-                      close();
-                    }}
-                  />
-                </View>
-              )}
-              imageUrls={[
-                {
-                  url: image
-                }
-              ]}
-            />
-          )}
+                />
+              </View>
+            )}
+            imageUrls={[
+              {
+                url: image
+              }
+            ]}
+          />
         </View>
       </BaseDialog>
     )