Update android.publish.yml

Signed-off-by: Ammar Ahmed <40239442+ammarahm-ed@users.noreply.github.com>

.github/workflows/android.publish.yml

@@ -1,4 +1,4 @@
-name: Publish @notesnook/mobile
+name: Publish @notesnook/android
 
 on: workflow_dispatch
 
@@ -28,30 +28,6 @@ jobs:
       - 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.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/
-
       - name: Build apks for Github release
         run: yarn release:android
 
@@ -64,6 +40,8 @@ jobs:
           alias: ${{ secrets.PUBLIC_ALIAS }}
           keyStorePassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}
           keyPassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}
+        env:
+          BUILD_TOOLS_VERSION: "33.0.0"
 
       - name: Rename apk files
         run: |

.github/workflows/desktop.publish.yml

@@ -18,6 +18,21 @@ on:
         required: true
         default: true
         description: "Publish on GitHub releases?"
+      build-windows:
+        type: boolean
+        required: true
+        default: true
+        description: "Build for Windows?"
+      build-linux:
+        type: boolean
+        required: true
+        default: true
+        description: "Build for Linux?"
+      build-mac:
+        type: boolean
+        required: true
+        default: true
+        description: "Build for macOS?"
 
 jobs:
   build:
@@ -71,6 +86,7 @@ jobs:
   build-macos:
     name: Build for macOS
     needs: build
+    if: inputs.build-mac
     runs-on: macos-12
 
     steps:
@@ -163,6 +179,7 @@ jobs:
   build-linux:
     name: Build for Linux
     needs: build
+    if: inputs.build-linux
     runs-on: ubuntu-22.04
 
     steps:
@@ -221,12 +238,22 @@ jobs:
   build-windows:
     name: Build for Windows
     needs: build
+    if: inputs.build-windows
     runs-on: windows-latest
 
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v3
 
+      - name: Setup .NET Core SDK
+        uses: actions/setup-dotnet@v2
+        with:
+          dotnet-version: 6.0.x
+
+      - name: Install AzureCodeSigning
+        run: Install-Module -Name AzureCodeSigning -RequiredVersion 0.3.0 -Force -Repository PSGallery
+        shell: pwsh
+
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
 
@@ -247,6 +274,9 @@ jobs:
       - name: Publish
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+          AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+          AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
         run: |
           if ($${{ inputs.publish-github }} -eq $true) {
             yarn electron-builder --win --publish always

.github/workflows/ios.publish.yml

@@ -0,0 +1,67 @@
+name: Publish @notesnook/ios
+
+on: workflow_dispatch
+
+jobs:
+  build:
+    runs-on: macos-13
+    timeout-minutes: 60
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
+      - name: Install node modules
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=mobile
+
+      - name: Build packages
+        run: npx nx run @notesnook/mobile:build
+
+      - name: Install Pods
+        run: npm run prepare:ios
+
+      - name: Build iOS App
+        uses: yukiarrr/ios-build-action@v1.11.2
+        with:
+          bundle-identifier: org.streetwriters.notesnook
+          scheme: Notesnook
+          configuration: "Release"
+          export-options: apps/mobile/native/ios/ExportOptions.plist
+          project-path: apps/mobile/native/ios/Notesnook.xcodeproj
+          workspace-path: apps/mobile/native/ios/Notesnook.xcworkspace
+          update-targets: |
+            Notesnook
+            Make Note
+            NotesWidgetExtension
+          disable-targets: Notesnook-tvOS,Notesnook-tvOSTests,NotesnookTests
+          code-signing-identity: Apple Distribution
+          team-id: ${{ secrets.APPLE_TEAM_ID }}
+          p12-base64: ${{ secrets.APPLE_CERTIFICATE_P12 }}
+          certificate-password: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }}
+          app-store-connect-api-key-issuer-id: ${{ secrets.API_KEY_ISSUER_ID }}
+          app-store-connect-api-key-id: ${{ secrets.APPSTORE_KEY_ID }}
+          app-store-connect-api-key-base64: ${{ secrets.APPSTORE_CONNECT_API_KEY_BASE64 }}
+          output-path: Notesnook.ipa
+          mobileprovision-base64: |
+            ${{ secrets.APPLE_MOBILE_PROVISION_APP }}
+            ${{ secrets.APPLE_MOBILE_PROVISION_SHARE }}
+            ${{ secrets.APPLE_MOBILE_PROVISION_WIDGET }}
+
+      - name: 'Upload app to TestFlight'
+        uses: apple-actions/upload-testflight-build@v1
+        with: 
+          app-path: Notesnook.ipa
+          issuer-id: ${{ secrets.API_KEY_ISSUER_ID }}
+          api-key-id: ${{ secrets.API_KEY_ID }}
+          api-private-key: ${{ secrets.API_KEY }}
+
+      - name: Upload to Github
+        uses: actions/upload-artifact@v2
+        with:
+          name: Notesnook.ipa
+          path: Notesnook.ipa

.github/workflows/web.beta.publish.yml

@@ -1,10 +1,11 @@
 name: Publish @notesnook/web Beta
 
-on: 
+on:
   workflow_dispatch:
   push:
     branches:
       - master
+      - '!v3-beta'
     paths-ignore:
       - "apps/mobile/**"
       - "packages/editor-mobile/**"
@@ -22,6 +23,7 @@ on:
       - synchronize
     branches:
       - master
+      - '!v3-beta'
     paths-ignore:
       - "apps/mobile/**"
       - "packages/editor-mobile/**"

.github/workflows/web.v3-beta.publish.yml

@@ -0,0 +1,40 @@
+name: Publish @notesnook/web v3 Beta
+
+on:
+  workflow_dispatch:
+
+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 ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=web
+
+      - name: Setup environment
+        run: |
+          echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
+          echo "CLOUDFLARE_ACCOUNT_ID=${{ secrets.CLOUDFLARE_ACCOUNT_ID }}" >> $GITHUB_ENV
+          echo "CLOUDFLARE_API_TOKEN=${{ secrets.CLOUDFLARE_API_TOKEN }}" >> $GITHUB_ENV
+
+      - name: Generate beta build
+        run: npm run build:beta:web
+
+      - name: Publish to Cloudflare Pages
+        uses: unlike-ltd/github-actions-cloudflare-pages@v0.1.1
+        id: pages
+        with:
+          cloudflare-api-token: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          cloudflare-account-id: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          cloudflare-project-name: notesnook-v3-app
+          directory: ./apps/web/build
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          github-environment: ${{ (github.ref == 'refs/heads/master' && 'beta') || 'preview' }}

.gitignore

@@ -9,4 +9,5 @@ nx-cloud.env
 .env.local
 .nyc_output
 site
-node_modules.backup
+node_modules.backup
+.nx

apps/desktop/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/desktop",
-  "version": "2.6.10",
+  "version": "2.6.15",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/desktop",
-      "version": "2.6.10",
+      "version": "2.6.15",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {
@@ -24,8 +24,8 @@
         "@types/node": "18.16.1",
         "@types/yargs": "^17.0.24",
         "chokidar": "^3.5.3",
-        "electron": "25.9.3",
-        "electron-builder": "^24.6.4",
+        "electron": "25.9.8",
+        "electron-builder": "^24.9.1",
         "electron-builder-notarize": "^1.5.1",
         "esbuild": "^0.17.19",
         "tree-kill": "^1.2.2",
@@ -173,12 +173,11 @@
       }
     },
     "node_modules/@electron/asar": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.4.tgz",
-      "integrity": "sha512-lykfY3TJRRWFeTxccEKdf1I6BLl2Plw81H0bbp4Fc5iEc67foDCa5pjJQULVgo0wF+Dli75f3xVcdb/67FFZ/g==",
+      "version": "3.2.8",
+      "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.8.tgz",
+      "integrity": "sha512-cmskk5M06ewHMZAplSiF4AlME3IrnnZhKnWbtwKVLRkdJkKyUVjMLhDIiPIx/+6zQWVlKX/LtmK9xDme7540Sg==",
       "dev": true,
       "dependencies": {
-        "chromium-pickle-js": "^0.2.0",
         "commander": "^5.0.0",
         "glob": "^7.1.6",
         "minimatch": "^3.0.4"
@@ -869,9 +868,9 @@
       }
     },
     "node_modules/@types/debug": {
-      "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.8.tgz",
-      "integrity": "sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ==",
+      "version": "4.1.12",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
+      "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==",
       "dev": true,
       "dependencies": {
         "@types/ms": "*"
@@ -902,9 +901,9 @@
       }
     },
     "node_modules/@types/ms": {
-      "version": "0.7.31",
-      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz",
-      "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==",
+      "version": "0.7.34",
+      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz",
+      "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==",
       "dev": true
     },
     "node_modules/@types/node": {
@@ -970,9 +969,9 @@
       }
     },
     "node_modules/7zip-bin": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.1.1.tgz",
-      "integrity": "sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz",
+      "integrity": "sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A==",
       "dev": true
     },
     "node_modules/agent-base": {
@@ -1054,9 +1053,9 @@
       "dev": true
     },
     "node_modules/app-builder-lib": {
-      "version": "24.6.4",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.6.4.tgz",
-      "integrity": "sha512-m9931WXb83teb32N0rKg+ulbn6+Hl8NV5SUpVDOVz9MWOXfhV6AQtTdftf51zJJvCQnQugGtSqoLvgw6mdF/Rg==",
+      "version": "24.9.1",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.9.1.tgz",
+      "integrity": "sha512-Q1nYxZcio4r+W72cnIRVYofEAyjBd3mG47o+zms8HlD51zWtA/YxJb01Jei5F+jkWhge/PTQK+uldsPh6d0/4g==",
       "dev": true,
       "dependencies": {
         "@develar/schema-utils": "~2.6.5",
@@ -1065,15 +1064,15 @@
         "@electron/universal": "1.4.1",
         "@malept/flatpak-bundler": "^0.4.0",
         "@types/fs-extra": "9.0.13",
-        "7zip-bin": "~5.1.1",
+        "7zip-bin": "~5.2.0",
         "async-exit-hook": "^2.0.1",
         "bluebird-lst": "^1.0.9",
-        "builder-util": "24.5.0",
-        "builder-util-runtime": "9.2.1",
+        "builder-util": "24.8.1",
+        "builder-util-runtime": "9.2.3",
         "chromium-pickle-js": "^0.2.0",
         "debug": "^4.3.4",
         "ejs": "^3.1.8",
-        "electron-publish": "24.5.0",
+        "electron-publish": "24.8.1",
         "form-data": "^4.0.0",
         "fs-extra": "^10.1.0",
         "hosted-git-info": "^4.1.0",
@@ -1092,6 +1091,19 @@
         "node": ">=14.0.0"
       }
     },
+    "node_modules/app-builder-lib/node_modules/builder-util-runtime": {
+      "version": "9.2.3",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
+      "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4",
+        "sax": "^1.2.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -1116,9 +1128,9 @@
       }
     },
     "node_modules/async": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
-      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
+      "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
       "dev": true
     },
     "node_modules/async-exit-hook": {
@@ -1280,16 +1292,16 @@
       "dev": true
     },
     "node_modules/builder-util": {
-      "version": "24.5.0",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-24.5.0.tgz",
-      "integrity": "sha512-STnBmZN/M5vGcv01u/K8l+H+kplTaq4PAIn3yeuufUKSpcdro0DhJWxPI81k5XcNfC//bjM3+n9nr8F9uV4uAQ==",
+      "version": "24.8.1",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-24.8.1.tgz",
+      "integrity": "sha512-ibmQ4BnnqCnJTNrdmdNlnhF48kfqhNzSeqFMXHLIl+o9/yhn6QfOaVrloZ9YUu3m0k3rexvlT5wcki6LWpjTZw==",
       "dev": true,
       "dependencies": {
         "@types/debug": "^4.1.6",
-        "7zip-bin": "~5.1.1",
+        "7zip-bin": "~5.2.0",
         "app-builder-bin": "4.0.0",
         "bluebird-lst": "^1.0.9",
-        "builder-util-runtime": "9.2.1",
+        "builder-util-runtime": "9.2.3",
         "chalk": "^4.1.2",
         "cross-spawn": "^7.0.3",
         "debug": "^4.3.4",
@@ -1315,6 +1327,19 @@
         "node": ">=12.0.0"
       }
     },
+    "node_modules/builder-util/node_modules/builder-util-runtime": {
+      "version": "9.2.3",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
+      "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4",
+        "sax": "^1.2.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/busboy": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz",
@@ -1413,9 +1438,9 @@
       "dev": true
     },
     "node_modules/ci-info": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
-      "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
       "dev": true,
       "funding": [
         {
@@ -1702,14 +1727,14 @@
       }
     },
     "node_modules/dmg-builder": {
-      "version": "24.6.4",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.6.4.tgz",
-      "integrity": "sha512-BNcHRc9CWEuI9qt0E655bUBU/j/3wUCYBVKGu1kVpbN5lcUdEJJJeiO0NHK3dgKmra6LUUZlo+mWqc+OCbi0zw==",
+      "version": "24.9.1",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.9.1.tgz",
+      "integrity": "sha512-huC+O6hvHd24Ubj3cy2GMiGLe2xGFKN3klqVMLAdcbB6SWMd1yPSdZvV8W1O01ICzCCRlZDHiv4VrNUgnPUfbQ==",
       "dev": true,
       "dependencies": {
-        "app-builder-lib": "24.6.4",
-        "builder-util": "24.5.0",
-        "builder-util-runtime": "9.2.1",
+        "app-builder-lib": "24.9.1",
+        "builder-util": "24.8.1",
+        "builder-util-runtime": "9.2.3",
         "fs-extra": "^10.1.0",
         "iconv-lite": "^0.6.2",
         "js-yaml": "^4.1.0"
@@ -1718,6 +1743,19 @@
         "dmg-license": "^1.0.11"
       }
     },
+    "node_modules/dmg-builder/node_modules/builder-util-runtime": {
+      "version": "9.2.3",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
+      "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4",
+        "sax": "^1.2.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/dmg-license": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz",
@@ -1774,9 +1812,9 @@
       }
     },
     "node_modules/electron": {
-      "version": "25.9.3",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.3.tgz",
-      "integrity": "sha512-dacaHg/PuwVcFRgPDCM5j7UDzqGJWOsbBRdS5wPKLNS/ejPeccIjuNUT1cqcrpvCJKAFW8swHWg9kdizNSEDHQ==",
+      "version": "25.9.8",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.8.tgz",
+      "integrity": "sha512-PGgp6PH46QVENHuAHc2NT1Su8Q1qov7qIl2jI5tsDpTibwV2zD8539AeWBQySeBU4dhbj9onIl7+1bXQ0wefBg==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -1792,16 +1830,16 @@
       }
     },
     "node_modules/electron-builder": {
-      "version": "24.6.4",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.6.4.tgz",
-      "integrity": "sha512-uNWQoU7pE7qOaIQ6CJHpBi44RJFVG8OHRBIadUxrsDJVwLLo8Nma3K/EEtx5/UyWAQYdcK4nVPYKoRqBb20hbA==",
+      "version": "24.9.1",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.9.1.tgz",
+      "integrity": "sha512-v7BuakDuY6sKMUYM8mfQGrwyjBpZ/ObaqnenU0H+igEL10nc6ht049rsCw2HghRBdEwJxGIBuzs3jbEhNaMDmg==",
       "dev": true,
       "dependencies": {
-        "app-builder-lib": "24.6.4",
-        "builder-util": "24.5.0",
-        "builder-util-runtime": "9.2.1",
+        "app-builder-lib": "24.9.1",
+        "builder-util": "24.8.1",
+        "builder-util-runtime": "9.2.3",
         "chalk": "^4.1.2",
-        "dmg-builder": "24.6.4",
+        "dmg-builder": "24.9.1",
         "fs-extra": "^10.1.0",
         "is-ci": "^3.0.0",
         "lazy-val": "^1.0.5",
@@ -1863,6 +1901,19 @@
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
       "dev": true
     },
+    "node_modules/electron-builder/node_modules/builder-util-runtime": {
+      "version": "9.2.3",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
+      "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4",
+        "sax": "^1.2.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/electron-notarize": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.2.2.tgz",
@@ -1893,20 +1944,33 @@
       }
     },
     "node_modules/electron-publish": {
-      "version": "24.5.0",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.5.0.tgz",
-      "integrity": "sha512-zwo70suH15L15B4ZWNDoEg27HIYoPsGJUF7xevLJLSI7JUPC8l2yLBdLGwqueJ5XkDL7ucYyRZzxJVR8ElV9BA==",
+      "version": "24.8.1",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.8.1.tgz",
+      "integrity": "sha512-IFNXkdxMVzUdweoLJNXSupXkqnvgbrn3J4vognuOY06LaS/m0xvfFYIf+o1CM8if6DuWYWoQFKPcWZt/FUjZPw==",
       "dev": true,
       "dependencies": {
         "@types/fs-extra": "^9.0.11",
-        "builder-util": "24.5.0",
-        "builder-util-runtime": "9.2.1",
+        "builder-util": "24.8.1",
+        "builder-util-runtime": "9.2.3",
         "chalk": "^4.1.2",
         "fs-extra": "^10.1.0",
         "lazy-val": "^1.0.5",
         "mime": "^2.5.2"
       }
     },
+    "node_modules/electron-publish/node_modules/builder-util-runtime": {
+      "version": "9.2.3",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
+      "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4",
+        "sax": "^1.2.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/electron-trpc": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/electron-trpc/-/electron-trpc-0.5.2.tgz",

apps/desktop/package.json

@@ -2,7 +2,7 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "2.6.10",
+  "version": "2.6.15",
   "appAppleId": "1544027013",
   "private": true,
   "main": "./dist/index.js",
@@ -25,8 +25,8 @@
     "@types/node": "18.16.1",
     "@types/yargs": "^17.0.24",
     "chokidar": "^3.5.3",
-    "electron": "25.9.3",
-    "electron-builder": "^24.6.4",
+    "electron": "25.9.8",
+    "electron-builder": "^24.9.1",
     "electron-builder-notarize": "^1.5.1",
     "esbuild": "^0.17.19",
     "tree-kill": "^1.2.2",
@@ -135,6 +135,10 @@
           ]
         }
       ],
+      "signingHashAlgorithms": [
+        "sha256"
+      ],
+      "sign": "./sign.js",
       "icon": "assets/icons/app.ico"
     },
     "portable": {

apps/desktop/sign.js

@@ -0,0 +1,60 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+const { writeFileSync, rmSync, readFileSync } = require("fs");
+const { execSync } = require("child_process");
+const { relative, join } = require("path");
+
+module.exports = async function (configuration) {
+  const Endpoint = "https://weu.codesigning.azure.net";
+  const CodeSigningAccountName = "Notesnook";
+  const CertificateProfileName = "Notesnook";
+  const FileDigest = configuration.hash.toUpperCase();
+  const TimestampRfc3161 = "http://timestamp.acs.microsoft.com";
+  const TimestampDigest = configuration.hash.toUpperCase();
+  const Description = "The Notesnook app";
+  const DescriptionUrl = "https://notesnook.com/";
+  const FilesCatalog = createCatalog(configuration.path);
+
+  const command = `Invoke-AzureCodeSigning -Endpoint "${Endpoint}" -CodeSigningAccountName "${CodeSigningAccountName}" -CertificateProfileName "${CertificateProfileName}" -FileDigest "${FileDigest}" -TimestampRfc3161 "${TimestampRfc3161}" -TimestampDigest "${TimestampDigest}" -Description "${Description}" -DescriptionUrl "${DescriptionUrl}" -FilesCatalog "${FilesCatalog}"`;
+
+  console.debug("Signing", configuration.path, "using command", command);
+
+  psexec(command);
+
+  console.debug("Signed", configuration.path);
+
+  deleteCatalog();
+};
+
+function createCatalog(path) {
+  writeFileSync("_catalog", relative(__dirname, path));
+  return join(__dirname, "_catalog");
+}
+
+function deleteCatalog() {
+  rmSync("_catalog");
+}
+
+function psexec(cmd) {
+  return execSync(cmd, {
+    env: process.env,
+    stdio: "inherit",
+    shell: "pwsh"
+  });
+}

apps/desktop/src/utils/protocol.ts

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { protocol, net } from "electron";
+import { protocol } from "electron";
 import { isDevelopment } from "./index";
 import { createReadStream } from "fs";
 import { extname, normalize } from "path";
@@ -62,8 +62,25 @@ function registerProtocol() {
         headers: { "Content-Type": extensionToMimeType[fileExtension] }
       });
     } else {
-      return net.fetch(request, {
-        bypassCustomProtocolHandlers: true
+      if (request.headers.has("X-Content-Length")) {
+        request.headers.set(
+          "Content-Length",
+          request.headers.get("X-Content-Length") || "0"
+        );
+        request.headers.delete("X-Content-Length");
+      }
+      const headers = Object.fromEntries(request.headers.entries());
+
+      return await fetch(request.url, {
+        signal: request.signal,
+        mode: request.mode,
+        headers,
+        method: request.method,
+        body: request.body,
+        credentials: request.credentials,
+        referrer: (request as any).referrer,
+        duplex: "half",
+        redirect: "manual"
       });
     }
   });

apps/mobile/app/app.js

@@ -17,13 +17,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 import "@azure/core-asynciterator-polyfill";
-import SettingsService from "./services/settings";
 import {
   THEME_COMPATIBILITY_VERSION,
   useThemeEngineStore
 } from "@notesnook/theme";
 import React, { useEffect } from "react";
-import { View } from "react-native";
+import { I18nManager, View } from "react-native";
 import "react-native-gesture-handler";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import { SafeAreaProvider } from "react-native-safe-area-context";
@@ -32,11 +31,16 @@ import { withErrorBoundry } from "./components/exception-handler";
 import GlobalSafeAreaProvider from "./components/globalsafearea";
 import { useAppEvents } from "./hooks/use-app-events";
 import { ApplicationHolder } from "./navigation";
+import { themeTrpcClient } from "./screens/settings/theme-selector";
 import Notifications from "./services/notifications";
+import SettingsService from "./services/settings";
 import { TipManager } from "./services/tip-manager";
 import { useThemeStore } from "./stores/use-theme-store";
 import { useUserStore } from "./stores/use-user-store";
-import { themeTrpcClient } from "./screens/settings/theme-selector";
+
+I18nManager.allowRTL(false);
+I18nManager.forceRTL(false);
+I18nManager.swapLeftAndRightInRTL(false);
 
 SettingsService.checkOrientation();
 const App = () => {

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

@@ -16,8 +16,8 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { MMKVLoader } from "react-native-mmkv-storage";
 import { initalize } from "@notesnook/core/dist/logger";
+import { MMKVLoader } from "react-native-mmkv-storage";
 import { KV } from "./storage";
 
 const LoggerStorage = new MMKVLoader()
@@ -26,4 +26,4 @@ const LoggerStorage = new MMKVLoader()
 
 initalize(new KV(LoggerStorage));
 
-export {};
+export { LoggerStorage };

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

@@ -90,6 +90,10 @@ export class KV {
     return this.storage.removeItem(key);
   }
 
+  async removeMulti(keys) {
+    return this.storage.removeItems(...keys);
+  }
+
   async clear() {
     return this.storage.clearStore();
   }
@@ -145,6 +149,7 @@ export default {
   clear: () => DefaultStorage.clear(),
   getAllKeys: () => DefaultStorage.getAllKeys(),
   writeMulti: (items) => DefaultStorage.writeMulti(items),
+  removeMulti: (keys) => DefaultStorage.removeMulti(keys),
   encrypt,
   decrypt,
   decryptMulti,

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

@@ -34,7 +34,8 @@ import { useAttachmentStore } from "../../stores/use-attachment-store";
 import { db } from "../database";
 import Storage from "../database/storage";
 import { cacheDir, copyFileAsync, releasePermissions } from "./utils";
-import { createCacheDir } from "./io";
+import { createCacheDir, exists } from "./io";
+import { IOS_APPGROUPID } from "../../utils/constants";
 
 export const FileDownloadStatus = {
   Success: 1,
@@ -181,7 +182,9 @@ export default async function downloadAttachment(
     silent: false,
     cache: false,
     throwError: false,
-    groupId: undefined
+    groupId: undefined,
+    base64: false,
+    text: false
   }
 ) {
   await createCacheDir();
@@ -212,10 +215,17 @@ export default async function downloadAttachment(
       options.groupId || attachment.metadata.hash,
       attachment.metadata.hash
     );
-    if (
-      !(await RNFetchBlob.fs.exists(`${cacheDir}/${attachment.metadata.hash}`))
-    )
+
+    if (!(await exists(attachment.metadata.hash))) {
       return;
+    }
+
+    if (options.base64 || options.text) {
+      return await db.attachments.read(
+        attachment.metadata.hash,
+        options.base64 ? "base64" : "text"
+      );
+    }
 
     let filename = getFileNameWithExtension(
       attachment.metadata.filename,
@@ -233,7 +243,8 @@ export default async function downloadAttachment(
       mime: attachment.metadata.type,
       fileName: options.cache ? undefined : filename,
       uri: options.cache ? undefined : folder.uri,
-      chunkSize: attachment.chunkSize
+      chunkSize: attachment.chunkSize,
+      appGroupId: IOS_APPGROUPID
     };
 
     let fileUri = await Sodium.decryptFile(

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

@@ -36,9 +36,13 @@ export async function readEncrypted(filename, key, cipherData) {
     }
 
     const attachment = db.attachments.attachment(filename);
-    const isPng = /(png)/g.test(attachment?.metadata.type);
-    const isJpeg = /(jpeg|jpg)/g.test(attachment?.metadata.type);
-    console.log("decrypting....");
+    const isPng = !attachment.metadata.type
+      ? false
+      : /(png)/g.test(attachment?.metadata.type);
+    const isJpeg = !attachment.metadata.type
+      ? false
+      : /(jpeg|jpg)/g.test(attachment?.metadata.type);
+
     let output = await Sodium.decryptFile(
       key,
       {

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

@@ -34,10 +34,69 @@ import BaseDialog from "../dialog/base-dialog";
 import { allowedOnPlatform, renderItem } from "./functions";
 import { useCallback } from "react";
 
+/**
+ * Test announcement
+ * {
+    id: "some-announcement",
+    type: "dialog",
+    body: [
+      {
+        type: "title",
+        text: "This is a title",
+        platforms: ["all"]
+      },
+      {
+        type: "description",
+        text: "Most of you are too busy to keep up to date with what's happening in Notesnook. That is unfortunate because Notesnook has come a looooong way.",
+        style: {
+          marginBottom: 1
+        },
+        platforms: ["all"]
+      },
+      {
+        type: "description",
+        text: "To solve this, we are launching the Notesnook Digest — a newsletter to help you stay updated about Notesnook development. And to keep things interesting I'll also sprinkle this newsletter with other interesting stuff like privacy tips & news, interesting books, things I am looking forward to etc.",
+        style: {
+          marginBottom: 1
+        },
+        platforms: ["all"]
+      },
+      {
+        type: "description",
+        text: "So be sure to subscribe. There won't be a proper schedule to this (yet) maybe once or twice a month. I promise no spam — only more awesomeness.",
+        style: {
+          marginBottom: 1
+        },
+        platforms: ["all"]
+      },
+      {
+        type: "description",
+        text: "— May privacy reign.",
+        style: {
+          marginBottom: 1
+        },
+        platforms: ["all"]
+      },
+      {
+        type: "callToActions",
+        actions: [
+          {
+            type: "promo",
+            title: "15% Off",
+            platforms: ["android"],
+            data: "com.streetwriters.notesnook.sub.yr.15"
+          }
+        ],
+        platforms: ["all"]
+      }
+    ]
+  }
+ */
+
 export const AnnouncementDialog = () => {
   const { colors } = useThemeColors();
   const [visible, setVisible] = useState(false);
-  const [info, setInfo] = useState(null);
+  const [info, setInfo] = useState();
   const remove = useMessageStore((state) => state.remove);
 
   useEffect(() => {
@@ -51,7 +110,9 @@ export const AnnouncementDialog = () => {
 
   const open = (data) => {
     setInfo(data);
-    setVisible(true);
+    setImmediate(() => {
+      setVisible(true);
+    });
   };
 
   const close = useCallback(() => {

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

@@ -48,7 +48,7 @@ import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { formatBytes } from "@notesnook/common";
 
-const Actions = ({ attachment, setAttachments, fwdRef }) => {
+const Actions = ({ attachment, setAttachments, fwdRef, close }) => {
   const { colors } = useThemeColors();
   const contextId = attachment.metadata.hash;
   const [filename, setFilename] = useState(attachment.metadata.filename);
@@ -64,7 +64,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
       name: "Download",
       onPress: async () => {
         if (currentProgress) {
-          await db.fs.cancel(attachment.metadata.hash, "download");
+          await db.fs.cancel(attachment.metadata.hash);
           useAttachmentStore.getState().remove(attachment.metadata.hash);
         }
         downloadAttachment(attachment.metadata.hash, false);
@@ -117,7 +117,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
           });
         }
 
-        setAttachments([...db.attachments.all]);
+        setAttachments();
         setLoading({
           name: null
         });
@@ -140,7 +140,7 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
                 filename: value
               });
               setFilename(value);
-              setAttachments([...db.attachments.all]);
+              setAttachments();
             }
           },
           positiveText: "Rename"
@@ -152,8 +152,8 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
       name: "Delete",
       onPress: async () => {
         await db.attachments.remove(attachment.metadata.hash, false);
-        setAttachments([...db.attachments.all]);
-        eSendEvent(eCloseSheet, contextId);
+        setAttachments();
+        close();
       },
       icon: "delete-outline"
     }
@@ -362,8 +362,13 @@ const Actions = ({ attachment, setAttachments, fwdRef }) => {
 Actions.present = (attachment, set, context) => {
   presentSheet({
     context: context,
-    component: (ref) => (
-      <Actions fwdRef={ref} setAttachments={set} attachment={attachment} />
+    component: (ref, close) => (
+      <Actions
+        fwdRef={ref}
+        setAttachments={set}
+        close={close}
+        attachment={attachment}
+      />
     )
   });
 };

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

@@ -132,7 +132,7 @@ export const AttachmentItem = ({
           activeOpacity={0.9}
           onPress={() => {
             if (encryption || !pressable) return;
-            db.fs.cancel(attachment.metadata.hash, currentProgress.type);
+            db.fs.cancel(attachment.metadata.hash);
             setCurrentProgress(null);
           }}
           style={{

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

@@ -68,7 +68,7 @@ export const AttachmentDialog = ({ note }) => {
       !attachmentSearchValue.current ||
       attachmentSearchValue.current === ""
     ) {
-      setAttachments([...attachments]);
+      setAttachments(filterAttachments(currentFilter));
     }
     clearTimeout(searchTimer.current);
     searchTimer.current = setTimeout(() => {
@@ -77,13 +77,16 @@ export const AttachmentDialog = ({ note }) => {
         attachmentSearchValue.current
       );
       if (results.length === 0) return;
-      setAttachments(results);
+
+      setAttachments(filterAttachments(currentFilter, results));
     }, 300);
   };
 
   const renderItem = ({ item }) => (
     <AttachmentItem
-      setAttachments={setAttachments}
+      setAttachments={() => {
+        setAttachments(filterAttachments(currentFilter));
+      }}
       attachment={item}
       context="attachments-list"
     />
@@ -133,11 +136,12 @@ export const AttachmentDialog = ({ note }) => {
     }
   ];
 
-  const filterAttachments = (type) => {
-    const attachments = note
-      ? db.attachments.ofNote(note.id, "all")
-      : [...(db.attachments.all || [])];
-    isDocument;
+  const filterAttachments = (type, _attachments) => {
+    const attachments =
+      _attachments || note
+        ? db.attachments.ofNote(note.id, "all")
+        : [...(db.attachments.all || [])];
+
     switch (type) {
       case "all":
         return attachments;

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

@@ -17,14 +17,16 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect, useRef, useState } from "react";
 import { Platform, View } from "react-native";
+import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
 import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
 import {
   eSubscribeEvent,
   eUnSubscribeEvent
 } from "../../services/event-manager";
-import { useThemeColors } from "@notesnook/theme";
+import { useUserStore } from "../../stores/use-user-store";
 import { eCloseLoginDialog, eOpenLoginDialog } from "../../utils/events";
 import { sleep } from "../../utils/time";
 import BaseDialog from "../dialog/base-dialog";
@@ -34,7 +36,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,
@@ -68,6 +69,9 @@ const AuthModal = () => {
   }
 
   const close = () => {
+    useUserStore.setState({
+      disableAppLockRequests: false
+    });
     actionSheetRef.current?.hide();
     setCurrentAuthMode(AuthMode.login);
     setVisible(false);
@@ -77,6 +81,11 @@ const AuthModal = () => {
     <BaseDialog
       overlayOpacity={0}
       statusBarTranslucent={false}
+      onShow={() => {
+        useUserStore.setState({
+          disableAppLockRequests: true
+        });
+      }}
       onRequestClose={currentAuthMode !== AuthMode.welcomeSignup && close}
       visible={true}
       onClose={close}
@@ -86,6 +95,7 @@ const AuthModal = () => {
       transparent={false}
       animated={false}
       centered={false}
+      enableSheetKeyboardHandler
     >
       <KeyboardAwareScrollView
         style={{

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

@@ -66,6 +66,7 @@ const BaseDialog = ({
   }, []);
 
   useEffect(() => {
+    if (useUserStore.getState().disableAppLockRequests) return;
     if (SettingsService.get().appLockMode === "background") {
       if (appState === "background") {
         setIntervalVisible(false);

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

@@ -99,8 +99,8 @@ const NoteItem = ({
   dateBy = "dateCreated",
   noOpen = false
 }) => {
-  const currentEditingNote = useEditorStore(
-    (state) => state.currentEditingNote
+  const isEditingNote = useEditorStore(
+    (state) => state.currentEditingNote === item.id
   );
   const { colors } = useThemeColors();
   const compactMode = useIsCompactModeEnabled(item);
@@ -112,8 +112,7 @@ const NoteItem = ({
   const reminder = getUpcomingReminder(reminders);
   const noteColor = ColorValues[item.color?.toLowerCase()];
   const tags = getTags(item);
-  const primaryColors =
-    currentEditingNote === item.id ? colors.selected : colors.primary;
+  const primaryColors = isEditingNote ? colors.selected : colors.primary;
 
   return (
     <>

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

@@ -25,13 +25,13 @@ import { useEditorStore } from "../../../stores/use-editor-store";
 
 export const Filler = ({ item }) => {
   const { colors } = useThemeColors();
-  const currentEditingNote = useEditorStore(
-    (state) => state.currentEditingNote
+  const isEditingNote = useEditorStore(
+    (state) => state.currentEditingNote === item.id
   );
 
   const [selected] = useIsSelected(item);
 
-  return currentEditingNote === item.id || selected ? (
+  return isEditingNote || selected ? (
     <View
       style={{
         position: "absolute",
@@ -39,12 +39,11 @@ export const Filler = ({ item }) => {
         height: "150%",
         backgroundColor: colors.selected.background,
         borderLeftWidth: 5,
-        borderLeftColor:
-          currentEditingNote === item.id
-            ? item.color
-              ? colors.static[item.color]
-              : colors.selected.accent
-            : "transparent"
+        borderLeftColor: isEditingNote
+          ? item.color
+            ? colors.static[item.color]
+            : colors.selected.accent
+          : "transparent"
       }}
       collapsable={false}
     />

apps/mobile/app/components/premium/expiring.js

@@ -48,23 +48,23 @@ export const Expiring = () => {
   const [visible, setVisible] = useState(false);
   const [status, setStatus] = useState({
     title: "Your trial is ending soon",
-    offer: null,
+    offer: "Get 30% off",
     extend: true
   });
   const pricing = usePricing("yearly");
-
-  const promo = status.offer
-    ? {
-        promoCode:
-          pricing?.info?.discount > 30
-            ? pricing.info.sku
-            : "com.streetwriters.notesnook.sub.yr.trialoffer",
-        text: `GET ${
-          pricing?.info?.discount > 30 ? pricing?.info?.discount : 30
-        }% OFF on yearly`,
-        discount: pricing?.info?.discount > 30 ? pricing?.info?.discount : 30
-      }
-    : null;
+  const promo =
+    status.offer && pricing?.info
+      ? {
+          promoCode:
+            pricing?.info?.discount > 30
+              ? pricing.info.sku
+              : "com.streetwriters.notesnook.sub.yr.trialoffer",
+          text: `GET ${
+            pricing?.info?.discount > 30 ? pricing?.info?.discount : 30
+          }% OFF on yearly`,
+          discount: pricing?.info?.discount > 30 ? pricing?.info?.discount : 30
+        }
+      : null;
 
   useEffect(() => {
     eSubscribeEvent(eOpenTrialEndingDialog, open);

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

@@ -28,7 +28,8 @@ import RNIap from "react-native-iap";
 export const PricingItem = ({
   product,
   onPress,
-  compact
+  compact,
+  strikethrough
 }: {
   product: {
     type: "yearly" | "monthly";
@@ -36,6 +37,7 @@ export const PricingItem = ({
     info: string;
     offerType?: "yearly" | "monthly";
   };
+  strikethrough?: boolean;
   onPress?: () => void;
   compact?: boolean;
 }) => {
@@ -50,8 +52,10 @@ export const PricingItem = ({
         paddingHorizontal: 12,
         paddingVertical: compact ? 15 : 10,
         width: compact ? null : "100%",
-        minWidth: 150
+        minWidth: 150,
+        opacity: strikethrough ? 0.7 : 1
       }}
+      disabled={strikethrough}
     >
       {!compact && (
         <View>
@@ -67,8 +71,18 @@ export const PricingItem = ({
       )}
 
       <View>
-        <Paragraph size={SIZE.sm}>
-          <Heading size={SIZE.lg - 2}>
+        <Paragraph
+          style={{
+            textDecorationLine: strikethrough ? "line-through" : undefined
+          }}
+          size={SIZE.sm}
+        >
+          <Heading
+            style={{
+              textDecorationLine: strikethrough ? "line-through" : undefined
+            }}
+            size={SIZE.lg - 2}
+          >
             {Platform.OS === "android"
               ? (product.data as RNIap.SubscriptionAndroid | undefined)
                   ?.subscriptionOfferDetails[0].pricingPhases

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

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import React, { useCallback, useEffect, useState } from "react";
 import { ActivityIndicator, Platform, Text, View } from "react-native";
 import * as RNIap from "react-native-iap";
-import { db } from "../../common/database";
+import { DatabaseLogger, db } from "../../common/database";
 import { usePricing } from "../../hooks/use-pricing";
 import {
   eSendEvent,
@@ -49,6 +49,20 @@ import { Walkthrough } from "../walkthroughs";
 import { PricingItem } from "./pricing-item";
 import { useSettingStore } from "../../stores/use-setting-store";
 
+const UUID_PREFIX = "0bdaea";
+const UUID_VERSION = "4";
+const UUID_VARIANT = "a";
+
+function toUUID(str: string) {
+  return [
+    UUID_PREFIX + str.substring(0, 2), // 6 digit prefix + first 2 oid digits
+    str.substring(2, 6), // # next 4 oid digits
+    UUID_VERSION + str.substring(6, 9), // # 1 digit version(0x4) + next 3 oid digits
+    UUID_VARIANT + str.substring(9, 12), // # 1 digit variant(0b101) + 1 zero bit + next 3 oid digits
+    str.substring(12)
+  ].join("-");
+}
+
 const promoCyclesMonthly = {
   1: "first month",
   2: "first 2 months",
@@ -177,11 +191,15 @@ export const PricingPlans = ({
               .offerToken
           : null;
 
+      DatabaseLogger.info(
+        `Subscription Requested initiated for user ${toUUID(user.id)}`
+      );
+
       await RNIap.requestSubscription({
         sku: product?.productId,
         obfuscatedAccountIdAndroid: user.id,
         obfuscatedProfileIdAndroid: user.id,
-        appAccountToken: user.id,
+        appAccountToken: toUUID(user.id),
         andDangerouslyFinishTransactionAutomaticallyIOS: false,
         subscriptionOffers: androidOfferToken
           ? [
@@ -213,6 +231,35 @@ export const PricingPlans = ({
     }
   };
 
+  function getStandardPrice() {
+    if (!product) return;
+    const productType = product.offerType;
+
+    if (Platform.OS === "android") {
+      const pricingPhaseListItem = (product.data as RNIap.SubscriptionAndroid)
+        ?.subscriptionOfferDetails[0]?.pricingPhases.pricingPhaseList?.[1];
+
+      if (!pricingPhaseListItem) {
+        const product =
+          productType === "monthly"
+            ? monthlyPlan?.product
+            : yearlyPlan?.product;
+        return (product as RNIap.SubscriptionAndroid)
+          ?.subscriptionOfferDetails[0]?.pricingPhases.pricingPhaseList?.[0]
+          ?.formattedPrice;
+      }
+
+      return pricingPhaseListItem?.formattedPrice;
+    } else {
+      const productDefault =
+        productType === "monthly" ? monthlyPlan?.product : yearlyPlan?.product;
+      return (
+        (product.data as RNIap.SubscriptionIOS)?.localizedPrice ||
+        (productDefault as RNIap.SubscriptionIOS)?.localizedPrice
+      );
+    }
+  }
+
   return loading ? (
     <View
       style={{
@@ -292,34 +339,84 @@ export const PricingPlans = ({
       ) : (
         <>
           {product?.type === "promo" ? (
-            <Heading
+            <View
               style={{
                 paddingVertical: 15,
-                alignSelf: "center",
-                textAlign: "center"
+                alignItems: "center"
               }}
-              size={SIZE.lg - 4}
             >
-              {Platform.OS === "android"
-                ? (product.data as RNIap.SubscriptionAndroid)
-                    ?.subscriptionOfferDetails[0].pricingPhases
-                    .pricingPhaseList?.[0].formattedPrice
-                : (product.data as RNIap.SubscriptionIOS)?.introductoryPrice}
-              <Paragraph
+              {product?.offerType === "monthly" ? (
+                <PricingItem
+                  product={{
+                    type: "monthly",
+                    data: monthlyPlan?.product,
+                    info: "Pay once a month, cancel anytime."
+                  }}
+                  strikethrough={true}
+                />
+              ) : (
+                <PricingItem
+                  onPress={() => {
+                    if (!monthlyPlan?.product) return;
+                    buySubscription(monthlyPlan?.product);
+                  }}
+                  product={{
+                    type: "yearly",
+                    data: yearlyPlan?.product,
+                    info: "Pay once a year, cancel anytime."
+                  }}
+                  strikethrough={true}
+                />
+              )}
+
+              <Heading
                 style={{
-                  textDecorationLine: "line-through",
-                  color: colors.secondary.paragraph
+                  paddingTop: 15,
+                  fontSize: SIZE.lg
                 }}
-                size={SIZE.sm}
               >
-                {Platform.OS === "android"
-                  ? (product.data as RNIap.SubscriptionAndroid)
-                      ?.subscriptionOfferDetails[1]?.pricingPhases
-                      .pricingPhaseList?.[1]?.formattedPrice
-                  : (product.data as RNIap.SubscriptionIOS)?.localizedPrice}
-              </Paragraph>{" "}
-              for {product.cycleText}
-            </Heading>
+                Special offer for you
+              </Heading>
+
+              <View
+                style={{
+                  paddingVertical: 20,
+                  paddingBottom: 10
+                }}
+              >
+                <Heading
+                  style={{
+                    alignSelf: "center",
+                    textAlign: "center"
+                  }}
+                  size={SIZE.xxl}
+                >
+                  {Platform.OS === "android"
+                    ? (product.data as RNIap.SubscriptionAndroid)
+                        ?.subscriptionOfferDetails[0].pricingPhases
+                        .pricingPhaseList?.[0]?.formattedPrice
+                    : (product.data as RNIap.SubscriptionIOS)
+                        ?.introductoryPrice ||
+                      (product.data as RNIap.SubscriptionIOS)
+                        ?.localizedPrice}{" "}
+                  {product?.cycleText
+                    ? `for ${product.cycleText}`
+                    : product?.offerType}
+                </Heading>
+                {product?.cycleText ? (
+                  <Paragraph
+                    style={{
+                      color: colors.secondary.paragraph,
+                      alignSelf: "center",
+                      textAlign: "center"
+                    }}
+                    size={SIZE.md}
+                  >
+                    then {getStandardPrice()} {product?.offerType}.
+                  </Paragraph>
+                ) : null}
+              </View>
+            </View>
           ) : null}
 
           {user && !product ? (
@@ -334,7 +431,12 @@ export const PricingPlans = ({
                         marginBottom: 20
                       }}
                     >
-                      <Heading color={colors.primary.accent}>
+                      <Heading
+                        style={{
+                          textAlign: "center"
+                        }}
+                        color={colors.primary.accent}
+                      >
                         Get {monthlyPlan?.info?.discount}% off in{" "}
                         {monthlyPlan?.info?.country}
                       </Heading>
@@ -369,7 +471,7 @@ export const PricingPlans = ({
                   product={{
                     type: "monthly",
                     data: monthlyPlan?.product,
-                    info: "Pay monthly, cancel anytime."
+                    info: "Pay once a month, cancel anytime."
                   }}
                 />
 
@@ -391,7 +493,7 @@ export const PricingPlans = ({
                   product={{
                     type: "yearly",
                     data: yearlyPlan?.product,
-                    info: "Pay yearly"
+                    info: "Pay once a year, cancel anytime."
                   }}
                 />
               </View>
@@ -463,7 +565,7 @@ export const PricingPlans = ({
                     width={250}
                     style={{
                       paddingHorizontal: 12,
-                      marginTop: 30,
+                      marginTop: product?.type === "promo" ? 0 : 30,
                       marginBottom: 10
                     }}
                   />

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

@@ -101,6 +101,7 @@ const SheetProvider = ({ context = "global" }) => {
         setVisible(false);
         setData(null);
       }}
+      keyboardHandlerDisabled={data?.keyboardHandlerDisabled}
       bottomPadding={!data.noBottomPadding}
       enableGesturesInScrollView={
         typeof data.enableGesturesInScrollView === "undefined"

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

@@ -43,6 +43,7 @@ import Paragraph from "../../ui/typography/paragraph";
 import { eSendEvent } from "../../../services/event-manager";
 import { eCloseSheet } from "../../../utils/events";
 import { requestInAppReview } from "../../../services/app-review";
+import { Dialog } from "../../dialog";
 
 const ExportNotesSheet = ({ notes, update }) => {
   const { colors } = useThemeColors();
@@ -97,6 +98,16 @@ const ExportNotesSheet = ({ notes, update }) => {
       id: notesnook.ids.dialogs.export.md,
       pro: premium
     },
+    {
+      title: "Markdown + Frontmatter",
+      func: async () => {
+        await save("md-frontmatter");
+      },
+      icon: "language-markdown",
+      desc: "View in any text or markdown editor",
+      id: notesnook.ids.dialogs.export.md,
+      pro: premium
+    },
     {
       title: "Plain Text",
       func: async () => {
@@ -147,6 +158,8 @@ const ExportNotesSheet = ({ notes, update }) => {
         </>
       ) : null}
 
+      <Dialog context="export-notes" />
+
       <View style={styles.buttonContainer}>
         {!exporting && !complete ? (
           actions.map((item) => (
@@ -178,7 +191,9 @@ const ExportNotesSheet = ({ notes, update }) => {
                 >
                   <Icon
                     name={item.icon}
-                    color={item.pro ? colors.primary.accent : colors.primary.icon}
+                    color={
+                      item.pro ? colors.primary.accent : colors.primary.icon
+                    }
                     size={SIZE.xxxl + 10}
                   />
                 </View>
@@ -334,7 +349,8 @@ ExportNotesSheet.present = (notes, allNotes) => {
         notes={allNotes ? db.notes.all : notes}
         update={update}
       />
-    )
+    ),
+    keyboardHandlerDisabled: true
   });
 };
 

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

@@ -37,7 +37,7 @@ import Heading from "../../ui/typography/heading";
 import Paragraph from "../../ui/typography/paragraph";
 import { requestInAppReview } from "../../../services/app-review";
 
-const PublishNoteSheet = ({ note: item, update }) => {
+const PublishNoteSheet = ({ note: item }) => {
   const { colors } = useThemeColors();
   const actionSheetRef = useRef();
 
@@ -48,8 +48,7 @@ const PublishNoteSheet = ({ note: item, update }) => {
   const [note, setNote] = useState(item);
   const [publishing, setPublishing] = useState(false);
   const publishUrl =
-    note &&
-    `https://monograph.notesnook.com/${db?.monographs.monograph(note?.id)}`;
+    note && `https://monogr.ph/${db?.monographs.monograph(note?.id)}`;
   const isPublished = note && db?.monographs.isPublished(note?.id);
   const pwdInput = useRef();
   const passwordValue = useRef();

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

@@ -37,11 +37,11 @@ const SheetWrapper = ({
   onOpen,
   closeOnTouchBackdrop = true,
   onHasReachedTop,
-  keyboardMode,
   overlay,
   overlayOpacity = 0.3,
   enableGesturesInScrollView = false,
-  bottomPadding = true
+  bottomPadding = true,
+  keyboardHandlerDisabled
 }) => {
   const localRef = useRef(null);
   const { colors } = useThemeColors("sheet");
@@ -85,6 +85,7 @@ const SheetWrapper = ({
   };
 
   useEffect(() => {
+    if (useUserStore.getState().disableAppLockRequests) return;
     if (SettingsService.get().appLockMode === "background") {
       if (appState === "background") {
         const ref = fwdRef || localRef;
@@ -120,8 +121,9 @@ const SheetWrapper = ({
         initialOffsetFromBottom={1}
         onPositionChanged={onHasReachedTop}
         closeOnTouchBackdrop={closeOnTouchBackdrop}
-        keyboardMode={keyboardMode}
-        keyboardHandlerEnabled={sheetKeyboardHandler}
+        keyboardHandlerEnabled={
+          keyboardHandlerDisabled ? false : sheetKeyboardHandler
+        }
         closeOnPressBack={closeOnTouchBackdrop}
         indicatorColor={colors.secondary.background}
         onOpen={_onOpen}

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

@@ -550,15 +550,6 @@ export const useActions = ({ close = () => null, item }) => {
   }
 
   async function exportNote() {
-    if (item.locked) {
-      ToastEvent.show({
-        heading: "Note is locked",
-        type: "error",
-        message: "Locked notes cannot be exported",
-        context: "local"
-      });
-      return;
-    }
     ExportNotesSheet.present([item]);
   }
 

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

@@ -460,7 +460,6 @@ export const useAppEvents = () => {
         }
 
         clearMessage();
-        subscribeToIAPListeners();
         if (!login) {
           user = await db.user.fetchUser();
           setUser(user);
@@ -479,7 +478,11 @@ export const useAppEvents = () => {
             userEmailConfirmed: true
           });
         }
+
+        subscribeToIAPListeners();
       } catch (e) {
+        DatabaseLogger.error(e);
+
         ToastEvent.error(e, "An error occurred", "global");
       }
 
@@ -503,14 +506,15 @@ export const useAppEvents = () => {
   );
 
   const subscribeToIAPListeners = useCallback(async () => {
-    RNIap.flushFailedPurchasesCachedAsPendingAndroid()
-      .catch(() => {})
-      .then(() => {
-        refValues.current.subsriptionSuccessListener =
-          RNIap.purchaseUpdatedListener(onSuccessfulSubscription);
-        refValues.current.subsriptionErrorListener =
-          RNIap.purchaseErrorListener(onSubscriptionError);
-      });
+    if (Platform.OS === "android") {
+      try {
+        await RNIap.flushFailedPurchasesCachedAsPendingAndroid();
+      } catch (e) {}
+    }
+    refValues.current.subsriptionSuccessListener =
+      RNIap.purchaseUpdatedListener(onSuccessfulSubscription);
+    refValues.current.subsriptionErrorListener =
+      RNIap.purchaseErrorListener(onSubscriptionError);
   }, []);
 
   const unSubscribeFromIAPListeners = () => {
@@ -619,15 +623,20 @@ export const useAppEvents = () => {
   }, [loading, onUserUpdated]);
 
   const initializeDatabase = useCallback(async () => {
-    if (!db.isInitialized) {
-      RNBootSplash.hide({ fade: true });
-      DatabaseLogger.info("Initializing database");
-      await db.init();
+    try {
+      if (!db.isInitialized) {
+        RNBootSplash.hide({ fade: true });
+        DatabaseLogger.info("Initializing database");
+        await db.init();
+      }
+      if (IsDatabaseMigrationRequired()) return;
+      initialize();
+      setLoading(false);
+      Walkthrough.init();
+    } catch (e) {
+      DatabaseLogger.error(e);
+      ToastEvent.error(e, "Error initializing database", "global");
     }
-    if (IsDatabaseMigrationRequired()) return;
-    initialize();
-    setLoading(false);
-    Walkthrough.init();
   }, [IsDatabaseMigrationRequired]);
 
   useEffect(() => {

apps/mobile/app/hooks/use-editor-tags.ts

@@ -1,82 +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 { useEffect, useState } from "react";
-import { eSubscribeEvent, eUnSubscribeEvent } from "../services/event-manager";
-import { useEditorStore } from "../stores/use-editor-store";
-import { useTagStore } from "../stores/use-tag-store";
-import { db } from "../common/database";
-import { NoteType } from "app/utils/types";
-import { useCallback } from "react";
-
-/**
- * A hook that injects/removes tags from tags bar in editor
- */
-const useEditorTags = () => {
-  const currentEditingNote = useEditorStore(
-    (state) => state.currentEditingNote
-  );
-  const tags = useTagStore((state) => state.tags);
-  const [note, setNote] = useState<NoteType | null>(null);
-  const [noteTags, setNoteTags] = useState<string[]>([]);
-
-  const refreshNote = useCallback(() => {
-    const current = useEditorStore.getState().currentEditingNote;
-    if (!current) {
-      setNote(null);
-      setNoteTags([]);
-      return;
-    }
-    const note = db.notes?.note(current)?.data as NoteType;
-    setNote(note ? { ...note } : null);
-    getTags(note);
-  }, []);
-
-  useEffect(() => {
-    refreshNote();
-  }, [currentEditingNote, refreshNote, tags]);
-
-  const load = useCallback(() => {
-    if (!note) return;
-    //  tiny.call(EditorWebView, renderTags(noteTags));
-  }, [note]);
-
-  useEffect(() => {
-    eSubscribeEvent("updateTags", load);
-    return () => {
-      eUnSubscribeEvent("updateTags", load);
-    };
-  }, [load, noteTags]);
-
-  function getTags(note: NoteType) {
-    if (!note || !note.tags) return [];
-    const tags = note.tags
-      .map((t) => (db.tags?.tag(t) ? { ...db.tags.tag(t) } : null))
-      .filter((t) => t !== null);
-    setNoteTags(tags);
-  }
-
-  useEffect(() => {
-    load();
-  }, [load, noteTags]);
-
-  return [];
-};
-
-export default useEditorTags;

apps/mobile/app/package.json

@@ -31,7 +31,8 @@
     "url": "^0.11.0",
     "validator": "^13.5.2",
     "zustand": "^3.6.0",
-    "katex": "0.16.2"
+    "katex": "0.16.2",
+    "@readme/data-urls": "3.0.0"
   },
   "sideEffects": false
 }

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

@@ -45,6 +45,7 @@ import { EditorProps, useEditorType } from "./tiptap/types";
 import { useEditor } from "./tiptap/use-editor";
 import { useEditorEvents } from "./tiptap/use-editor-events";
 import { editorController } from "./tiptap/utils";
+import { useThemeColors } from "@notesnook/theme";
 
 const style: ViewStyle = {
   height: "100%",
@@ -93,35 +94,6 @@ const Editor = React.memo(
         get: () => editor
       }));
 
-      const onMediaDownloaded = useCallback(
-        ({
-          hash,
-          groupId,
-          src,
-          attachmentType
-        }: {
-          hash: string;
-          groupId: string;
-          src: string;
-          attachmentType: string;
-        }) => {
-          if (groupId !== editor.note.current?.id) return;
-          editorController.current.markImageLoaded(hash);
-          if (attachmentType === "webclip") {
-            editor.commands.updateWebclip({
-              hash: hash,
-              src: src
-            });
-          } else {
-            editor.commands.updateImage({
-              hash: hash,
-              dataurl: src
-            });
-          }
-        },
-        [editor.commands, editor.note]
-      );
-
       const onError = useCallback(() => {
         renderKey.current =
           renderKey.current === `editor-0` ? `editor-1` : `editor-0`;
@@ -130,16 +102,11 @@ const Editor = React.memo(
       }, [editor]);
 
       useEffect(() => {
-        const sub = [
-          eSubscribeEvent("webview_reset", onError),
-          EV.subscribe(EVENTS.mediaAttachmentDownloaded, onMediaDownloaded)
-        ];
-
+        const sub = [eSubscribeEvent("webview_reset", onError)];
         return () => {
           sub.forEach((s) => s.unsubscribe());
-          EV.unsubscribe(EVENTS.mediaAttachmentDownloaded, onMediaDownloaded);
         };
-      }, [onError, onMediaDownloaded]);
+      }, [onError]);
 
       useLayoutEffect(() => {
         setImmediate(() => {
@@ -210,6 +177,7 @@ export default Editor;
 const ReadonlyButton = ({ editor }: { editor: useEditorType }) => {
   const readonly = useEditorStore((state) => state.readonly);
   const keyboard = useKeyboard();
+  const { colors } = useThemeColors();
 
   const onPress = async () => {
     if (editor.note.current) {
@@ -225,7 +193,7 @@ const ReadonlyButton = ({ editor }: { editor: useEditorType }) => {
       name="pencil-lock"
       type="grayBg"
       onPress={onPress}
-      color="accent"
+      color={colors.primary.accent}
       customStyle={{
         position: "absolute",
         bottom: 60,

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

@@ -17,10 +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 type {
-  Attachment,
-  AttachmentProgress
-} from "@notesnook/editor/dist/extensions/attachment/index";
+import type { Attachment } from "@notesnook/editor/dist/extensions/attachment/index";
 import type { ImageAttributes } from "@notesnook/editor/dist/extensions/image/index";
 import { createRef, RefObject } from "react";
 import { Platform } from "react-native";
@@ -203,11 +200,16 @@ typeof globalThis.statusBar !== "undefined" && statusBar.current.set({date:"",sa
     );
   };
 
-  setAttachmentProgress = async (attachmentProgress: AttachmentProgress) => {
+  setAttachmentProgress = async (attachmentProgress: Partial<Attachment>) => {
     await this.doAsync(
-      `editor && editor.commands.setAttachmentProgress(${JSON.stringify(
+      `editor && editor.commands.updateAttachment(${JSON.stringify(
         attachmentProgress
-      )})`
+      )}, {
+        preventUpdate: true,
+        query: (attachment) => {
+          return attachment.hash === "${attachmentProgress.hash}";
+        }
+      })`
     );
   };
 

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

@@ -36,5 +36,6 @@ export const EventTypes = {
   contentchange: "editor-event:content-change",
   reminders: "editor-event:reminders",
   previewAttachment: "editor-event:preview-attachment",
-  copyToClipboard: "editor-events:copy-to-clipboard"
+  copyToClipboard: "editor-events:copy-to-clipboard",
+  getAttachmentData: "editor-events:get-attachment-data"
 };

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

@@ -97,6 +97,7 @@ export type SavePayload = {
   type?: Content["type"];
   sessionId?: string | null;
   sessionHistoryId?: number;
+  ignoreEdit: boolean;
 };
 
 export type AppState = {

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

@@ -66,6 +66,7 @@ import { EditorMessage, EditorProps, useEditorType } from "./types";
 import { EditorEvents, editorState } from "./utils";
 import { useNoteStore } from "../../../stores/use-notes-store";
 import SettingsService from "../../../services/settings";
+import downloadAttachment from "../../../common/filesystem/download-attachment";
 
 const publishNote = async (editor: useEditorType) => {
   const user = useUserStore.getState().user;
@@ -127,6 +128,8 @@ const showActionsheet = async (editor: useEditorType) => {
   }
 };
 
+type ContentMessage = { html: string; ignoreEdit: boolean };
+
 export const useEditorEvents = (
   editor: useEditorType,
   { readonly: editorPropReadonly, noHeader, noToolbar }: Partial<EditorProps>
@@ -189,7 +192,7 @@ export const useEditorEvents = (
       readonly: readonly || editorPropReadonly,
       tools: tools || getDefaultPresets().default,
       noHeader: noHeader,
-      noToolbar: readonly || editorPropReadonly || noToolbar,
+      noToolbar: noToolbar,
       doubleSpacedLines: doubleSpacedLines,
       corsProxy: corsProxy,
       fontSize:
@@ -330,14 +333,16 @@ export const useEditorEvents = (
       if (editorMessage.type === EventTypes.content) {
         editor.saveContent({
           type: editorMessage.type,
-          content: editorMessage.value as string,
+          content: (editorMessage.value as ContentMessage).html,
+          ignoreEdit: (editorMessage.value as ContentMessage).ignoreEdit,
           forSessionId: editorMessage.sessionId
         });
       } else if (editorMessage.type === EventTypes.title) {
         editor.saveContent({
           type: editorMessage.type,
           title: editorMessage.value as string,
-          forSessionId: editorMessage.sessionId
+          forSessionId: editorMessage.sessionId,
+          ignoreEdit: false
         });
       }
 
@@ -416,6 +421,44 @@ export const useEditorEvents = (
           break;
         }
 
+        case EventTypes.getAttachmentData: {
+          const attachment = (editorMessage.value as any)
+            .attachment as Attachment;
+
+          console.log(
+            "Getting attachment data:",
+            attachment.hash,
+            attachment.type
+          );
+          downloadAttachment(attachment.hash, true, {
+            base64: attachment.type === "image",
+            text: attachment.type === "web-clip",
+            silent: true,
+            groupId: editor.note.current?.id,
+            cache: true
+          } as any)
+            .then((data: any) => {
+              console.log(
+                "Got attachment data:",
+                !!data,
+                (editorMessage.value as any).resolverId
+              );
+              editor.postMessage(EditorEvents.attachmentData, {
+                resolverId: (editorMessage.value as any).resolverId,
+                data
+              });
+            })
+            .catch(() => {
+              console.log("Error downloading attachment data");
+              editor.postMessage(EditorEvents.attachmentData, {
+                resolverId: (editorMessage.value as any).resolverId,
+                data: undefined
+              });
+            });
+
+          break;
+        }
+
         case EventTypes.pro:
           if (editor.state.current?.isFocused) {
             editor.state.current.isFocused = true;

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

@@ -78,7 +78,6 @@ export const useEditor = (
   const saveCount = useRef(0);
   const lastContentChangeTime = useRef<number>(0);
   const lock = useRef(false);
-  const loadedImages = useRef<{ [name: string]: boolean }>({});
   const lockedSessionId = useRef<string>();
   const loadingState = useRef<string>();
 
@@ -129,12 +128,9 @@ export const useEditor = (
 
   const reset = useCallback(
     async (resetState = true, resetContent = true) => {
-      currentNote.current?.id &&
-        db.fs?.cancel(currentNote.current.id, "download");
+      currentNote.current?.id && db.fs?.cancel(currentNote.current.id);
       currentNote.current = null;
-      loadedImages.current = {};
       currentContent.current = null;
-      clearTimeout(timers.current["loading-images"]);
       sessionHistoryId.current = undefined;
       saveCount.current = 0;
       loadingState.current = undefined;
@@ -166,7 +162,8 @@ export const useEditor = (
       data,
       type,
       sessionId: currentSessionId,
-      sessionHistoryId: currentSessionHistoryId
+      sessionHistoryId: currentSessionHistoryId,
+      ignoreEdit
     }: SavePayload) => {
       if (
         readonly ||
@@ -198,6 +195,12 @@ export const useEditor = (
         };
 
         noteData.title = title;
+
+        if (ignoreEdit) {
+          console.log("Ignoring edits...");
+          noteData.dateEdited = note?.dateEdited;
+        }
+
         if (data) {
           noteData.content = {
             data: data,
@@ -287,58 +290,6 @@ export const useEditor = (
     }
   }, []);
 
-  const getMediaToLoad = (previousContent?: string) => {
-    if (!currentNote.current?.id) return [];
-
-    const previousAttachments =
-      previousContent?.matchAll(/data-hash="(.+?)"/gm) || [];
-    const attachments =
-      currentContent.current?.data?.matchAll(/data-hash="(.+?)"/gm) || [];
-
-    const media: string[] = [];
-
-    const oldMatches = Array.from(previousAttachments).map((match) => match[1]);
-    const matches = Array.from(attachments).map((match) => match[1]);
-
-    for (let i = 0; i < matches.length; i++) {
-      const currentHash = matches[i];
-      const oldHash = oldMatches[i];
-      if (currentHash !== oldHash) {
-        media.push(currentHash);
-        loadedImages.current[currentHash] = false;
-      }
-    }
-    return media;
-  };
-
-  const markImageLoaded = (hash: string) => {
-    const attachment = loadedImages.current[hash];
-    if (typeof attachment === "boolean") {
-      loadedImages.current[hash] = true;
-    }
-  };
-
-  const loadImages = useCallback((previousContent?: string) => {
-    if (!currentNote.current?.id) return;
-    const timerId = "loading-images";
-    clearTimeout(timers.current[timerId]);
-    timers.current[timerId] = setTimeout(() => {
-      if (!currentNote.current?.id) return;
-      if (currentNote.current?.content?.isPreview) {
-        db.content?.downloadMedia(
-          currentNote.current?.id,
-          currentNote.current.content,
-          true
-        );
-      } else {
-        const media = getMediaToLoad(previousContent);
-        if (media.length > 0) {
-          db.attachments?.downloadMedia(currentNote.current?.id, media);
-        }
-      }
-    }, 1000);
-  }, []);
-
   const loadNote = useCallback(
     async (
       item: Omit<NoteType, "type"> & {
@@ -408,13 +359,13 @@ export const useEditor = (
         await commands.setStatus(getFormattedDate(item.dateEdited), "Saved");
         await postMessage(EditorEvents.title, item.title);
         loadingState.current = currentContent.current?.data;
-        if (currentContent.current?.data) {
-          await postMessage(
-            EditorEvents.html,
-            currentContent.current?.data,
-            10000
-          );
-        }
+
+        await postMessage(
+          EditorEvents.html,
+          currentContent.current?.data || "",
+          10000
+        );
+
         loadingState.current = undefined;
         useEditorStore.getState().setReadonly(item.readonly);
         await commands.setTags(currentNote.current);
@@ -425,18 +376,9 @@ export const useEditor = (
           }
         }, 300);
         overlay(false);
-        loadImages();
       }
     },
-    [
-      commands,
-      isDefaultEditor,
-      loadContent,
-      loadImages,
-      overlay,
-      postMessage,
-      reset
-    ]
+    [commands, isDefaultEditor, loadContent, overlay, postMessage, reset]
   );
 
   const lockNoteWithVault = useCallback((note: NoteType) => {
@@ -466,8 +408,6 @@ export const useEditor = (
 
       lock.current = true;
 
-      const previousContent = currentContent.current?.data;
-
       if (data.type === "tiptap") {
         if (!currentNote.current.locked && isContentEncrypted) {
           lockNoteWithVault(note);
@@ -500,18 +440,8 @@ export const useEditor = (
       }
 
       lock.current = false;
-      if (data.type === "tiptap") {
-        loadImages(previousContent);
-        db.eventManager.subscribe(
-          EVENTS.syncCompleted,
-          () => {
-            loadImages(previousContent);
-          },
-          true
-        );
-      }
     },
-    [loadImages, lockNoteWithVault, postMessage, commands]
+    [lockNoteWithVault, postMessage, commands]
   );
 
   useEffect(() => {
@@ -531,12 +461,14 @@ export const useEditor = (
       title,
       content,
       type,
-      forSessionId
+      forSessionId,
+      ignoreEdit
     }: {
       title?: string;
       content?: string;
       type: string;
       forSessionId: string;
+      ignoreEdit: boolean;
     }) => {
       if (lock.current || lockedSessionId.current === forSessionId) return;
       lastContentChangeTime.current = Date.now();
@@ -567,7 +499,8 @@ export const useEditor = (
         type: "tiptap",
         sessionId: forSessionId,
         id: noteId,
-        sessionHistoryId: sessionHistoryId.current
+        sessionHistoryId: sessionHistoryId.current,
+        ignoreEdit
       };
       withTimer(
         noteId || "newnote",
@@ -585,7 +518,7 @@ export const useEditor = (
           }
           saveNote(params);
         },
-        150
+        ignoreEdit ? 0 : 150
       );
     },
     [withTimer, onChange, saveNote]
@@ -689,7 +622,6 @@ export const useEditor = (
     saveContent,
     onContentChanged,
     editorId: editorId,
-    markImageLoaded,
     overlay,
     postMessage
   };

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

@@ -50,7 +50,8 @@ export const EditorEvents: { [name: string]: string } = {
   titleplaceholder: "native:titleplaceholder",
   logger: "native:logger",
   status: "native:status",
-  keyboardShown: "native:keyboardShown"
+  keyboardShown: "native:keyboardShown",
+  attachmentData: "native:attachment-data"
 };
 
 export function randId(prefix: string) {

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

@@ -115,7 +115,7 @@ export const EditorWrapper = ({ width }) => {
             style={{ height: 1, padding: 0, width: 1, position: "absolute" }}
             blurOnSubmit={false}
           />
-          <ProgressBar />
+          {/* <ProgressBar /> */}
           <Editor key="editor" withController={true} />
         </KeyboardAvoidingViewIOS>
       )}

apps/mobile/app/screens/settings/picker/pickers.jsx

@@ -69,10 +69,10 @@ export const TrashIntervalPicker = createSettingsPicker({
     db.settings.setTrashCleanupInterval(item);
   },
   formatValue: (item) => {
-    return item === -1 ? "Never" : item + " days";
+    return item === -1 ? "Never" : item === 1 ? "Daily" : item + " days";
   },
   getItemKey: (item) => item.toString(),
-  options: [-1, 7, 30, 365],
+  options: [-1, 1, 7, 30, 365],
   compareValue: (current, item) => current === item,
   premium: true
 });

apps/mobile/app/screens/settings/subscription.js

@@ -42,6 +42,9 @@ export const Subscription = () => {
     user?.subscription?.type !== SUBSCRIPTION_STATUS.PREMIUM &&
     user?.subscription?.type !== SUBSCRIPTION_STATUS.BETA;
 
+  const hasCancelledPremium =
+    SUBSCRIPTION_STATUS.PREMIUM_CANCELLED === user?.subscription?.type;
+
   const subscriptionProviderInfo =
     SUBSCRIPTION_PROVIDER[user?.subscription?.provider];
 
@@ -63,10 +66,7 @@ export const Subscription = () => {
       return;
     }
 
-    if (
-      user?.subscription?.type === SUBSCRIPTION_STATUS.PREMIUM_CANCELLED &&
-      Platform.OS === "android"
-    ) {
+    if (hasCancelledPremium && Platform.OS === "android") {
       if (user.subscription?.provider === 3) {
         ToastEvent.show({
           heading: "Subscribed on web",
@@ -111,16 +111,14 @@ export const Subscription = () => {
           title={
             !user?.isEmailConfirmed
               ? "Confirm your email"
-              : user.subscription?.provider === 3 &&
-                user.subscription?.type ===
-                  SUBSCRIPTION_STATUS.PREMIUM_CANCELLED
+              : user.subscription?.provider === 3 && hasCancelledPremium
               ? "Manage subscription from desktop app"
-              : user.subscription?.type ===
-                  SUBSCRIPTION_STATUS.PREMIUM_CANCELLED &&
+              : hasCancelledPremium &&
                 Platform.OS === "android" &&
                 Config.GITHUB_RELEASE !== "true"
               ? "Resubscribe from Google Playstore"
-              : user.subscription?.type === SUBSCRIPTION_STATUS.PREMIUM_EXPIRED
+              : user.subscription?.type ===
+                  SUBSCRIPTION_STATUS.PREMIUM_EXPIRED || hasCancelledPremium
               ? `Resubscribe to Pro (${getPrice() || "$4.49"} / mo)`
               : `Get Pro (${getPrice() || "$4.49"} / mo)`
           }

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

@@ -65,7 +65,11 @@ const PLACEHOLDER_DATA = (trashCleanupInterval = 7) => ({
   paragraph:
     trashCleanupInterval === -1
       ? "Set automatic trash cleanup interval from Settings > Behaviour > Clean trash interval."
-      : `Items in the trash will be permanently deleted after after ${trashCleanupInterval} days.`,
+      : `Trash gets automatically cleaned up ${
+          trashCleanupInterval === 1
+            ? "daily."
+            : `after ${trashCleanupInterval} days.`
+        }`,
   button: null,
   loading: "Loading trash items"
 });

apps/mobile/app/services/exporter.js

@@ -18,17 +18,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { decode, EntityLevel } from "entities";
-import { zipSync } from "fflate";
 import { Platform } from "react-native";
+import RNFetchBlob from "react-native-blob-util";
 import RNHTMLtoPDF from "react-native-html-to-pdf-lite";
 import * as ScopedStorage from "react-native-scoped-storage";
-import RNFetchBlob from "react-native-blob-util";
+import { zip } from "react-native-zip-archive";
 import { DatabaseLogger, db } from "../common/database/index";
 import Storage from "../common/database/storage";
-import { convertNoteToText } from "../utils/note-to-text";
 
-import { sleep } from "../utils/time";
 import { sanitizeFilename } from "@notesnook/common";
+import { presentDialog } from "../components/dialog/functions";
+import { useSettingStore } from "../stores/use-setting-store";
+import BiometicService from "./biometrics";
+import { ToastEvent } from "./event-manager";
 
 const MIMETypes = {
   txt: "text/plain",
@@ -99,8 +101,8 @@ async function save(path, data, fileName, extension) {
   return uri || path;
 }
 
-async function makeHtml(note) {
-  let html = await db.notes.note(note.id).export("html");
+async function makeHtml(note, content) {
+  let html = await db.notes.note(note.id).export("html", content);
   html = decode(html, {
     level: EntityLevel.HTML
   });
@@ -109,22 +111,27 @@ async function makeHtml(note) {
 
 /**
  *
- * @param {"txt" | "pdf" | "md" | "html"} type
+ * @param {"txt" | "pdf" | "md" | "html" | "md-frontmatter"} type
  */
-async function exportAs(type, note, bulk) {
+async function exportAs(type, note, bulk, content) {
   let data;
   switch (type) {
     case "html":
       {
-        data = await makeHtml(note);
+        data = await makeHtml(note, content);
       }
       break;
     case "md":
-      data = await db.notes.note(note.id).export("md");
+      data = await db.notes.note(note.id).export("md", content);
+      break;
+    case "md-frontmatter":
+      data = await db.notes
+        .note(note.id)
+        .export("md-frontmatter", content?.data);
       break;
     case "pdf":
       {
-        let html = await makeHtml(note);
+        let html = await makeHtml(note, content);
         let fileName = sanitizeFilename(note.title + Date.now(), {
           replacement: "_"
         });
@@ -150,21 +157,84 @@ async function exportAs(type, note, bulk) {
       }
       break;
     case "txt":
-      data = await convertNoteToText(note);
+      {
+        data = await db.notes?.note(note.id).export("txt", content);
+      }
       break;
   }
 
   return data;
 }
 
+async function unlockVault() {
+  let biometry = await BiometicService.isBiometryAvailable();
+  let fingerprint = await BiometicService.hasInternetCredentials("nn_vault");
+  if (biometry && fingerprint) {
+    let credentials = await BiometicService.getCredentials(
+      "Unlock vault",
+      "Unlock vault to export locked notes"
+    );
+    if (credentials) {
+      return db.vault.unlock(credentials.password);
+    }
+  }
+  useSettingStore.getState().setSheetKeyboardHandler(false);
+  return new Promise((resolve) => {
+    setImmediate(() => {
+      presentDialog({
+        context: "export-notes",
+        input: true,
+        secureTextEntry: true,
+        positiveText: "Unlock",
+        title: "Unlock vault",
+        paragraph: "Some exported notes are locked, Unlock to export them",
+        inputPlaceholder: "Enter password",
+        positivePress: async (value) => {
+          const unlocked = await db.vault.unlock(value);
+          if (!unlocked) {
+            ToastEvent.show({
+              heading: "Invalid password",
+              message: "Please enter a valid password",
+              type: "error",
+              context: "local"
+            });
+            return false;
+          }
+          resolve(unlocked);
+          useSettingStore.getState().setSheetKeyboardHandler(true);
+          return true;
+        },
+        onClose: () => {
+          resolve(false);
+          useSettingStore.getState().setSheetKeyboardHandler(true);
+        }
+      });
+    });
+  });
+}
+
 /**
  *
- * @param {"txt" | "pdf" | "md" | "html"} type
+ * @param {"txt" | "pdf" | "md" | "html" | "md-frontmatter"} type
  */
 async function exportNote(note, type) {
+  let content;
+
+  if (note.locked) {
+    try {
+      let unlocked = await unlockVault();
+      if (!unlocked) return null;
+      const unlockedNote = await db.vault.open(note.id);
+      content = unlockedNote.content;
+    } catch (e) {
+      DatabaseLogger.error(e);
+    }
+  }
+
   let path = await getPath(FolderNames[type]);
   if (!path) return;
-  let result = await exportAs(type, note);
+
+  let result = await exportAs(type, note, false, content);
   if (!result) return null;
   let fileName = sanitizeFilename(note.title + Date.now(), {
     replacement: "_"
@@ -180,7 +250,7 @@ async function exportNote(note, type) {
     filePath: path,
     type: "text/plain",
     name: "Text",
-    fileName: fileName + `.${type}`
+    fileName: fileName + `.${type === "md-frontmatter" ? "md" : type}`
   };
 }
 
@@ -192,11 +262,6 @@ function copyFileAsync(source, dest) {
   });
 }
 
-function zipsync(results) {
-  let data = zipSync(results);
-  return Buffer.from(data.buffer).toString("base64");
-}
-
 function getUniqueFileName(fileName, results) {
   const chunks = fileName.split(".");
   const ext = chunks.pop();
@@ -212,25 +277,114 @@ function getUniqueFileName(fileName, results) {
 
 /**
  *
- * @param {"txt" | "pdf" | "md" | "html"} type
+ * @param {"txt" | "pdf" | "md" | "html" | "md-frontmatter"} type
  */
 async function bulkExport(notes, type, callback) {
   let path = await getPath(FolderNames[type]);
   if (!path) return;
 
+  const exportCacheFolder =
+    RNFetchBlob.fs.dirs.CacheDir + `/export_${Date.now()}`;
+
+  await RNFetchBlob.fs.mkdir(exportCacheFolder).catch((e) => console.log(e));
+
+  const mkdir = async (dir) => {
+    const folder = `${exportCacheFolder}/${dir}`;
+    if (!(await RNFetchBlob.fs.exists(folder))) {
+      await RNFetchBlob.fs.mkdir(folder);
+    }
+  };
+
+  const writeFile = async (path, result) => {
+    const cacheFilePath = exportCacheFolder + path;
+    await RNFetchBlob.fs.writeFile(
+      cacheFilePath,
+      result,
+      type === "pdf" ? "base64" : "utf8"
+    );
+  };
+
   const results = {};
   for (var i = 0; i < notes.length; i++) {
     try {
-      await sleep(1);
       let note = notes[i];
-      if (note.locked) continue;
-      let result = await exportAs(type, note);
+      let content;
+      if (note.locked) {
+        try {
+          let unlocked = !db.vault.unlocked ? await unlockVault() : true;
+          if (!unlocked) {
+            continue;
+          }
+          const unlockedNote = await db.vault.open(note.id);
+          content = unlockedNote.content;
+        } catch (e) {
+          DatabaseLogger.error(e);
+          continue;
+        }
+      }
+      let result = await exportAs(type, note, true, content);
       let fileName = sanitizeFilename(note.title, {
         replacement: "_"
       });
       if (result) {
-        results[getUniqueFileName(fileName + `.${type}`, results)] =
-          Buffer.from(result, type === "pdf" ? "base64" : "utf-8");
+        const notebooks = [
+          ...(db.relations
+            ?.to({ id: note.id, type: "note" }, "notebook")
+            .map((notebook) => ({
+              title: notebook.title
+            })) || []),
+          ...(note.notebooks || []).map((ref) => {
+            const notebook = db.notebooks?.notebook(ref.id);
+            const topics = notebook?.topics.all || [];
+
+            return {
+              title: notebook?.title,
+              topics: ref.topics
+                .map((topicId) => topics.find((topic) => topic.id === topicId))
+                .filter(Boolean)
+            };
+          })
+        ];
+
+        for (const notebook of notebooks) {
+          results[notebook.title] = results[notebook.title] || {};
+          await mkdir(notebook.title);
+
+          if (notebook.topics && notebook.topics.length) {
+            for (const topic of notebook.topics) {
+              results[notebook.title][topic.title] =
+                results[notebook.title][topic.title] || {};
+
+              await mkdir(`${notebook.title}/${topic.title}`);
+              const exportedNoteName = getUniqueFileName(
+                fileName + `.${type}`,
+                results[notebook.title][topic.title]
+              );
+              results[notebook.title][topic.title][exportedNoteName] = true;
+
+              writeFile(
+                `/${notebook.title}/${topic.title}/${exportedNoteName}`,
+                result
+              );
+            }
+          } else {
+            const exportedNoteName = getUniqueFileName(
+              fileName + `.${type}`,
+              results[notebook.title]
+            );
+            results[notebook.title][exportedNoteName] = true;
+            writeFile(`/${notebook.title}/${exportedNoteName}`, result);
+          }
+        }
+
+        if (!notebooks.length) {
+          const exportedNoteName = getUniqueFileName(
+            fileName + `.${type}`,
+            results
+          );
+          results[exportedNoteName] = true;
+          writeFile(`/${exportedNoteName}`, result);
+        }
       }
       callback(`${i + 1}/${notes.length}`);
     } catch (e) {
@@ -241,26 +395,24 @@ async function bulkExport(notes, type, callback) {
 
   try {
     callback("zipping");
-    await sleep(1);
-    const zipped = zipsync(results);
+    const zipOutputPath =
+      Platform.OS === "ios"
+        ? path + `/${fileName}`
+        : RNFetchBlob.fs.dirs.CacheDir + `/${fileName}`;
+    await zip(exportCacheFolder, zipOutputPath);
     callback("saving to disk");
-    await sleep(1);
-
-    if (Platform.OS === "ios") {
-      RNFetchBlob.fs.writeFile(path + `/${fileName}`, zipped, "base64");
-    } else {
-      const templFile = RNFetchBlob.fs.dirs.CacheDir + `/${fileName}`;
-      await RNFetchBlob.fs.writeFile(templFile, zipped, "base64");
+    if (Platform.OS === "android") {
       const file = await ScopedStorage.createFile(
         path,
         fileName,
         "application/zip"
       );
       path = file.uri;
-      await copyFileAsync("file://" + templFile, path);
-      await RNFetchBlob.fs.unlink(templFile);
+      await copyFileAsync("file://" + zipOutputPath, path);
+      await RNFetchBlob.fs.unlink(zipOutputPath);
       callback();
     }
+    RNFetchBlob.fs.unlink(exportCacheFolder);
   } catch (e) {
     DatabaseLogger.error(e);
   }

apps/mobile/app/services/premium.js

@@ -233,7 +233,7 @@ const subscriptions = {
    *
    * @returns {RNIap.Purchase} subscription
    */
-  get: async () => {
+  get: () => {
     if (Platform.OS === "android") return;
     let _subscriptions = MMKV.getString("subscriptionsIOS");
     if (!_subscriptions) return [];
@@ -299,12 +299,16 @@ const subscriptions = {
             "Content-Type": "application/json"
           }
         };
+
+        console.log("Subscription.verify", requestData);
         try {
           let result = await fetch(
-            "https://payments.streetwriters.co/apple/verify",
+            __DEV__
+              ? "http://192.168.43.5:4264/apple/verify"
+              : "https://payments.streetwriters.co/apple/verify",
             requestData
           );
-
+          console.log("Subscribed", result);
           let text = await result.text();
 
           if (!result.ok) {
@@ -312,6 +316,8 @@ const subscriptions = {
               await subscriptions.clear(subscription);
             }
             return;
+          } else {
+            await subscriptions.clear(subscription);
           }
         } catch (e) {
           console.log("subscription error", e);
@@ -321,15 +327,18 @@ const subscriptions = {
   },
   clear: async (_subscription) => {
     if (Platform.OS === "android") return;
-    let _subscriptions = await subscriptions.get();
+    let _subscriptions = subscriptions.get();
     let subscription = null;
     if (_subscription) {
       subscription = _subscription;
     } else {
       subscription = _subscriptions.length > 0 ? _subscriptions[0] : null;
     }
+
     if (subscription) {
-      await RNIap.finishTransaction(subscription.transactionId);
+      await RNIap.finishTransaction({
+        purchase: subscription
+      });
       await RNIap.clearTransactionIOS();
       await subscriptions.remove(subscription.transactionId);
     }

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

@@ -68,8 +68,7 @@ export const useAttachmentStore = create<AttachmentStore>((set, get) => ({
     if (!progress) return;
     editorController.current?.commands.setAttachmentProgress({
       hash: hash,
-      progress: 100,
-      type: progress[hash]?.type || "download"
+      progress: 100
     });
     progress[hash] = null;
     set({ progress: { ...progress } });
@@ -80,10 +79,11 @@ export const useAttachmentStore = create<AttachmentStore>((set, get) => ({
     progress[hash] = { sent, total, hash, recieved, type };
     const progressPercentage =
       type === "upload" ? sent / total : recieved / total;
+
     editorController.current?.commands.setAttachmentProgress({
       hash: hash,
-      progress: Math.round(Math.max(progressPercentage * 100, 0)),
-      type: type
+      //@ts-ignore
+      progress: Math.round(Math.max(progressPercentage * 100, 0))
     });
     set({ progress: { ...progress } });
   },

apps/mobile/app/utils/constants.js

@@ -75,7 +75,7 @@ export const SUBSCRIPTION_STATUS_STRINGS = {
   2: Platform.OS === "ios" ? "Pro" : "Beta",
   5: "Pro",
   6: "Expired",
-  7: "Pro"
+  7: "Pro (cancelled)"
 };
 
 export const SUBSCRIPTION_PROVIDER = {

apps/mobile/app/utils/github-version.ts

@@ -61,7 +61,10 @@ export const getGithubVersion = async () => {
   if (!res?.ok) return null;
   const data = (await res?.json()) as GithubRelease[];
 
-  const versions = data?.filter((tag) => tag.tag_name.endsWith("android"));
+  const versions = data?.filter(
+    (tag) =>
+      tag.tag_name.endsWith("android") && !tag.tag_name.endsWith("beta-android")
+  );
   const latestVersion = versions[0];
   const version = latestVersion.tag_name.replace("-android", "");
   return {

apps/mobile/app/utils/note-bundle.js

@@ -21,7 +21,7 @@ import Sodium from "@ammarahmed/react-native-sodium";
 import { isImage } from "@notesnook/core/dist/utils/filename";
 import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
-import { db } from "../common/database";
+import { DatabaseLogger, db } from "../common/database";
 import { IOS_APPGROUPID } from "./constants";
 
 const santizeUri = (uri) => {
@@ -57,6 +57,7 @@ export async function attachFile(uri, hash, type, filename, options) {
     return true;
   } catch (e) {
     if (Platform.OS === "ios") RNFetchBlob.fs.unlink(uri).catch(console.log);
+    DatabaseLogger.error(e, "Attach file error");
     console.log("attach file error: ", e);
     return false;
   }
@@ -107,26 +108,31 @@ async function createNotes(bundle) {
       uri: uri,
       type: "cache"
     });
-    await attachFile(uri, hash, file.type, file.name, {
+    const attached = await attachFile(uri, hash, file.type, file.name, {
       type: "cache",
       id: id,
       appGroupId: IOS_APPGROUPID
     });
     let content = ``;
-    if (isImage(file.type)) {
-      content = `<img data-hash="${hash}" data-mime="${file.type}" data-filename="${file.name}" />`;
-    } else {
-      content = `<p><span data-hash="${hash}" data-mime="${file.type}" data-filename="${file.name}" data-size="${file.size}" /></p>`;
+
+    if (attached) {
+      if (isImage(file.type)) {
+        content = `<img data-hash="${hash}" data-mime="${file.type}" data-filename="${file.name}" />`;
+      } else {
+        content = `<p><span data-hash="${hash}" data-mime="${file.type}" data-filename="${file.name}" data-size="${file.size}" /></p>`;
+      }
+      const rawContent = await db.content.raw(
+        db.notes.note(id).data?.contentId
+      );
+      await db.notes.add({
+        id: id,
+        content: {
+          type: "tiptap",
+          data: rawContent?.data ? rawContent?.data + content : content
+        },
+        sessionId: sessionId
+      });
     }
-    const rawContent = await db.content.raw(db.notes.note(id).data?.contentId);
-    await db.notes.add({
-      id: id,
-      content: {
-        type: "tiptap",
-        data: rawContent?.data ? rawContent?.data + content : content
-      },
-      sessionId: sessionId
-    });
   }
 }
 

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

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

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

@@ -5,7 +5,7 @@
      <!-- Customize your theme here. -->
         <item name="android:windowDisablePreview">true</item>
         <item name="android:editTextBackground">@drawable/edit_text</item>
-        
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:datePickerDialogTheme">@style/DialogDatePicker.Theme</item>
     </style>
@@ -20,6 +20,7 @@
     <style name="BootTheme" parent="Theme.SplashScreen">
         <item name="windowSplashScreenBackground">@color/bootsplash_background</item>
         <item name="windowSplashScreenAnimatedIcon">@mipmap/bootsplash_logo_dark</item>
+        <item name="android:navigationBarColor">@color/bootsplash_background</item>
         <item name="postSplashScreenTheme">@style/AppTheme</item>
     </style>
 
@@ -31,6 +32,7 @@
         <item name="android:windowIsFloating">true</item>
         <item name="android:backgroundDimEnabled">true</item>
         <item name="android:editTextBackground">@drawable/edit_text</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 
     <style name="DialogDatePicker.Theme" parent="Theme.AppCompat.Light.Dialog">

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

@@ -5,7 +5,7 @@
      <!-- Customize your theme here. -->
         <item name="android:windowDisablePreview">true</item>
         <item name="android:editTextBackground">@drawable/edit_text</item>
-        
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:datePickerDialogTheme">@style/DialogDatePicker.Theme</item>
     </style>
@@ -20,6 +20,7 @@
     <style name="BootTheme" parent="Theme.SplashScreen">
         <item name="windowSplashScreenBackground">@color/bootsplash_background</item>
         <item name="windowSplashScreenAnimatedIcon">@mipmap/bootsplash_logo</item>
+        <item name="android:navigationBarColor">@color/bootsplash_background</item>
         <item name="postSplashScreenTheme">@style/AppTheme</item>
     </style>
 
@@ -31,6 +32,7 @@
         <item name="android:windowIsFloating">true</item>
         <item name="android:backgroundDimEnabled">true</item>
         <item name="android:editTextBackground">@drawable/edit_text</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 
     <style name="DialogDatePicker.Theme" parent="Theme.AppCompat.Light.Dialog">

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

@@ -1,7 +1,10 @@
-- Fixed HTML & PDF exports
-- Improved task lists in editor
-- Improved loading images
-- Allow restoring backups when logged out
-- Bug fixes and performance improvements
+- Support for exporting locked notes
+- Maintain directory structure in exports based on Notebooks/Topics
+- Match color of navigation bar in sheets with app theme
+- Improved image loading and show progress when loading images
+- Support for setting trash interval to daily
+- Fix android app UI issues with RTL languages
+- Fix pasting links in editor
+- Other Bug fixes and performance improvements
 
 Thank you for using Notesnook!

apps/mobile/native/ios/ExportOptions.plist

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>provisioningProfiles</key>
+	<dict>
+		<key>org.streetwriters.notesnook</key>
+		<string>Notesnook App Distribution 2024</string>
+        <key>org.streetwriters.notesnook.notewidget</key>
+		<string>Notesnook Widget Distribution 2024</string>
+        <key>org.streetwriters.notesnook.share</key>
+		<string>Notesnook Share Distribution 2024</string>
+	</dict>
+</dict>
+</plist>

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

@@ -14,13 +14,13 @@
 		2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		2DCD954D1E0B4F2C00145EB5 /* NotesnookTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* NotesnookTests.m */; };
-		6510626F27042891009661C3 /* OpenSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6552012F27019F7700A43C51 /* OpenSans-Regular.ttf */; };
-		6510627627042895009661C3 /* OpenSans-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6552012E27019F6E00A43C51 /* OpenSans-SemiBold.ttf */; };
 		6510E6D72877215700DACAA9 /* build.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 6510E6D62877215700DACAA9 /* build.bundle */; };
 		6515C42F2580AA3000E83E39 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6515C42E2580AA2F00E83E39 /* StoreKit.framework */; };
+		6517B7C12B6838EB0079FF37 /* OpenSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6517B7BE2B6838EB0079FF37 /* OpenSans-Regular.ttf */; };
+		6517B7C22B6838EB0079FF37 /* OpenSans-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6517B7BF2B6838EB0079FF37 /* OpenSans-SemiBold.ttf */; };
+		6517B7C32B6838EB0079FF37 /* OpenSans-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6517B7C02B6838EB0079FF37 /* OpenSans-Bold.ttf */; };
 		6529A13E279BC4C70048D4A8 /* BootSplash.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6529A13D279BC4C70048D4A8 /* BootSplash.storyboard */; };
 		6593E4A3281C345400492C50 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6593E4A2281C345400492C50 /* AppDelegate.mm */; };
-		659670B22A2754FD00C5D2AF /* OpenSans-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 659670B12A2754FD00C5D2AF /* OpenSans-Bold.ttf */; };
 		659BE46725E11A5100E05671 /* notesnook-text.png in Resources */ = {isa = PBXBuildFile; fileRef = 659BE46625E11A5100E05671 /* notesnook-text.png */; };
 		65AA857925E6DDEC00772A01 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65AA857825E6DDEC00772A01 /* WidgetKit.framework */; };
 		65AA857B25E6DDEC00772A01 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65AA857A25E6DDEC00772A01 /* SwiftUI.framework */; };
@@ -110,12 +110,12 @@
 		4C4AF691C324D95337F2FB0A /* libPods-Make Note.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Make Note.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		6510E6D62877215700DACAA9 /* build.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = build.bundle; path = "../../../../packages/editor-mobile/build.bundle"; sourceTree = "<group>"; };
 		6515C42E2580AA2F00E83E39 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
+		6517B7BE2B6838EB0079FF37 /* OpenSans-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-Regular.ttf"; path = "../../../../packages/editor-mobile/public/fonts/OpenSans-Regular.ttf"; sourceTree = "<group>"; };
+		6517B7BF2B6838EB0079FF37 /* OpenSans-SemiBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-SemiBold.ttf"; path = "../../../../packages/editor-mobile/public/fonts/OpenSans-SemiBold.ttf"; sourceTree = "<group>"; };
+		6517B7C02B6838EB0079FF37 /* OpenSans-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-Bold.ttf"; path = "../../../../packages/editor-mobile/public/fonts/OpenSans-Bold.ttf"; sourceTree = "<group>"; };
 		6529A13D279BC4C70048D4A8 /* BootSplash.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = BootSplash.storyboard; path = Notesnook/BootSplash.storyboard; sourceTree = "<group>"; };
 		6529D2B0257B4A2900B49BC3 /* NotesnookDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = NotesnookDebug.entitlements; path = Notesnook/NotesnookDebug.entitlements; sourceTree = "<group>"; };
-		6552012E27019F6E00A43C51 /* OpenSans-SemiBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-SemiBold.ttf"; path = "../android/app/src/main/assets/fonts/OpenSans-SemiBold.ttf"; sourceTree = "<group>"; };
-		6552012F27019F7700A43C51 /* OpenSans-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-Regular.ttf"; path = "../android/app/src/main/assets/fonts/OpenSans-Regular.ttf"; sourceTree = "<group>"; };
 		6593E4A2281C345400492C50 /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = Notesnook/AppDelegate.mm; sourceTree = "<group>"; };
-		659670B12A2754FD00C5D2AF /* OpenSans-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-Bold.ttf"; path = "../android/app/src/main/assets/fonts/OpenSans-Bold.ttf"; sourceTree = "<group>"; };
 		659BE46625E11A5100E05671 /* notesnook-text.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "notesnook-text.png"; path = "Notesnook/Images.xcassets/notesnook-text.png"; sourceTree = "<group>"; };
 		65A7F34F255689AD00699170 /* Notesnook.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = Notesnook.entitlements; path = Notesnook/Notesnook.entitlements; sourceTree = "<group>"; };
 		65AA857725E6DDEC00772A01 /* NotesWidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = NotesWidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -293,13 +293,13 @@
 		83CBB9F61A601CBA00E9B192 = {
 			isa = PBXGroup;
 			children = (
+				6517B7C02B6838EB0079FF37 /* OpenSans-Bold.ttf */,
+				6517B7BE2B6838EB0079FF37 /* OpenSans-Regular.ttf */,
+				6517B7BF2B6838EB0079FF37 /* OpenSans-SemiBold.ttf */,
 				65C400DD2A80B68D00AA3DF5 /* MaterialCommunityIcons.ttf */,
 				65C149862A61151B005C40F1 /* extension.bundle */,
 				6510E6D62877215700DACAA9 /* build.bundle */,
 				65EC5B71272A7EE200FB3748 /* NotesWidgetExtensionDebug.entitlements */,
-				6552012F27019F7700A43C51 /* OpenSans-Regular.ttf */,
-				659670B12A2754FD00C5D2AF /* OpenSans-Bold.ttf */,
-				6552012E27019F6E00A43C51 /* OpenSans-SemiBold.ttf */,
 				65D145C429DC30470056FE7D /* MaterialCommunityIcons.ttf */,
 				13B07FAE1A68108700A75B9A /* Notesnook */,
 				832341AE1AAA6A7D00B99B32 /* Libraries */,
@@ -542,12 +542,12 @@
 			buildActionMask = 2147483647;
 			files = (
 				65C400DE2A80B68D00AA3DF5 /* MaterialCommunityIcons.ttf in Resources */,
-				6510626F27042891009661C3 /* OpenSans-Regular.ttf in Resources */,
-				659670B22A2754FD00C5D2AF /* OpenSans-Bold.ttf in Resources */,
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
+				6517B7C32B6838EB0079FF37 /* OpenSans-Bold.ttf in Resources */,
+				6517B7C22B6838EB0079FF37 /* OpenSans-SemiBold.ttf in Resources */,
 				6529A13E279BC4C70048D4A8 /* BootSplash.storyboard in Resources */,
 				6510E6D72877215700DACAA9 /* build.bundle in Resources */,
-				6510627627042895009661C3 /* OpenSans-SemiBold.ttf in Resources */,
+				6517B7C12B6838EB0079FF37 /* OpenSans-Regular.ttf in Resources */,
 				659BE46725E11A5100E05671 /* notesnook-text.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -997,7 +997,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2061;
+				CURRENT_PROJECT_VERSION = 2067;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1071,7 +1071,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.6.10;
+				MARKETING_VERSION = 2.6.15;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1102,7 +1102,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2061;
+				CURRENT_PROJECT_VERSION = 2067;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1176,7 +1176,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.6.10;
+				MARKETING_VERSION = 2.6.15;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1186,7 +1186,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook;
 				PRODUCT_NAME = Notesnook;
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook Distribution 2023";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook App Distribution 2024";
 				SWIFT_OBJC_BRIDGING_HEADER = "Notesnook-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1335,7 +1335,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2061;
+				CURRENT_PROJECT_VERSION = 2067;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1347,7 +1347,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.10;
+				MARKETING_VERSION = 2.6.15;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
@@ -1378,7 +1378,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2061;
+				CURRENT_PROJECT_VERSION = 2067;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1391,12 +1391,12 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.10;
+				MARKETING_VERSION = 2.6.15;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook Widget Distribution 2023";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook Widget Distribution 2024";
 				SKIP_INSTALL = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
@@ -1421,7 +1421,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Make Note/Make Note.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2061;
+				CURRENT_PROJECT_VERSION = 2067;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1495,7 +1495,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.10;
+				MARKETING_VERSION = 2.6.15;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
@@ -1526,7 +1526,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2061;
+				CURRENT_PROJECT_VERSION = 2067;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1601,12 +1601,12 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.10;
+				MARKETING_VERSION = 2.6.15;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook Share Distrubution 2023";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook Share Distribution 2024";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "Make Note/Make Note-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

apps/mobile/native/ios/Podfile.lock

@@ -327,7 +327,7 @@ PODS:
     - React-Core
   - react-native-keep-awake (1.2.0):
     - React-Core
-  - react-native-mmkv-storage (0.10.0-alpha.9):
+  - react-native-mmkv-storage (0.10.0-alpha.11):
     - MMKV (~> 1.3.1)
     - React
     - React-Core
@@ -875,7 +875,7 @@ SPEC CHECKSUMS:
   react-native-image-resizer: 00ceb0e05586c7aadf061eea676957a6c2ec60fa
   react-native-in-app-review: db8bb167a5f238e7ceca5c242d6b36ce8c4404a4
   react-native-keep-awake: caee3ff89eaa21dfe29010f0d143566874a04441
-  react-native-mmkv-storage: d4ad55ab411b7f0d4e6269d801b31821ef48970b
+  react-native-mmkv-storage: e798639f91601896f1c84f4eb3d6f19af2f4a160
   react-native-netinfo: ccbe1085dffd16592791d550189772e13bf479e2
   react-native-notification-sounds: da78c828fe1bcbb92d8b505d5261890ed315ff39
   react-native-orientation: f1caf84d65f1a4fd4511a18f2b924e634ad7a628
@@ -931,4 +931,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: b0cadd188aa428b98d1eaa0b84b3b6208e714119
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.14.2

apps/mobile/native/package.json

@@ -44,7 +44,7 @@
     "react-native-image-picker": "4.1.2",
     "react-native-in-app-review": "4.3.3",
     "react-native-keychain": "4.0.5",
-    "react-native-mmkv-storage": "^0.10.0-alpha.9",
+    "react-native-mmkv-storage": "^0.10.0-alpha.11",
     "react-native-modal-datetime-picker": "14.0.0",
     "react-native-navigation-bar-color": "2.0.2",
     "react-native-notification-sounds": "0.5.5",

apps/mobile/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/mobile",
-  "version": "2.6.9",
+  "version": "2.6.15",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/mobile",
-      "version": "2.6.9",
+      "version": "2.6.15",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "workspaces": [
@@ -62,7 +62,8 @@
         "@microsoft/signalr": "^7.0.10",
         "@microsoft/signalr-protocol-msgpack": "^7.0.10",
         "@notesnook/logger": "file:../logger",
-        "@streetwriters/showdown": "^3.0.1-alpha.2",
+        "@readme/data-urls": "^3.0.0",
+        "@streetwriters/showdown": "^3.0.4-alpha",
         "async-mutex": "^0.3.2",
         "dayjs": "1.11.9",
         "entities": "^4.3.1",
@@ -81,7 +82,7 @@
         "@types/html-to-text": "^9.0.0",
         "@types/katex": "^0.16.1",
         "@types/prismjs": "^1.26.0",
-        "@types/showdown": "^2.0.0",
+        "@types/streetwriters__showdown": "npm:@types/showdown@^2.0.6",
         "@vitest/coverage-v8": "^0.34.1",
         "abortcontroller-polyfill": "^1.7.3",
         "cross-env": "^7.0.3",
@@ -117,7 +118,7 @@
         "@tiptap/extension-font-family": "2.1.12",
         "@tiptap/extension-history": "2.1.12",
         "@tiptap/extension-horizontal-rule": "2.1.12",
-        "@tiptap/extension-link": "2.1.12",
+        "@tiptap/extension-link": "^2.1.16",
         "@tiptap/extension-list-keymap": "2.1.12",
         "@tiptap/extension-placeholder": "2.1.12",
         "@tiptap/extension-subscript": "2.1.12",
@@ -133,6 +134,7 @@
         "@tiptap/extension-underline": "2.1.12",
         "@tiptap/pm": "2.1.12",
         "@tiptap/starter-kit": "2.1.12",
+        "async-mutex": "^0.4.0",
         "clipboard-polyfill": "4.0.0",
         "detect-indent": "^7.0.0",
         "entities": "^4.5.0",
@@ -247,6 +249,7 @@
       "dependencies": {
         "@flyerhq/react-native-link-preview": "^1.6.0",
         "@mdi/js": "^6.7.96",
+        "@readme/data-urls": "3.0.0",
         "@streetwriters/showdown": "^3.0.1-alpha.2",
         "absolutify": "^0.1.0",
         "buffer": "^6.0.3",
@@ -319,7 +322,7 @@
         "react-native-image-picker": "4.1.2",
         "react-native-in-app-review": "4.3.3",
         "react-native-keychain": "4.0.5",
-        "react-native-mmkv-storage": "^0.10.0-alpha.9",
+        "react-native-mmkv-storage": "^0.10.0-alpha.11",
         "react-native-modal-datetime-picker": "14.0.0",
         "react-native-navigation-bar-color": "2.0.2",
         "react-native-notification-sounds": "0.5.5",
@@ -7094,6 +7097,14 @@
         "nanoid": "^3.1.23"
       }
     },
+    "node_modules/@readme/data-urls": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@readme/data-urls/-/data-urls-3.0.0.tgz",
+      "integrity": "sha512-b0L7VWqbLZqOSSAFUrxS5ZwUfec35WDsAwwCH481vYnhk0dWO3nvmNVNCbP8CY4cXqwL1W4uCAnhDz+CUmXM3g==",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@sayem314/react-native-keep-awake": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@sayem314/react-native-keep-awake/-/react-native-keep-awake-1.2.0.tgz",
@@ -18479,9 +18490,9 @@
       "integrity": "sha512-TbiO8AO055EPjaxIuKxrCEOB4r81uQCVDFbtcs+e4pEOHxf6z3JgDC0UU0poJElKfCh37b+TFRxQhg6DbsYJBA=="
     },
     "node_modules/react-native-mmkv-storage": {
-      "version": "0.10.0-alpha.9",
-      "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.10.0-alpha.9.tgz",
-      "integrity": "sha512-nv1A0t5dxhcAtMnhqqBodNp94U4QziW1RO352GB3BPpic03abPHj+0HjBJH72VeKKMfYIc0PR5pmo6BbsaPExw==",
+      "version": "0.10.0-alpha.11",
+      "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.10.0-alpha.11.tgz",
+      "integrity": "sha512-rr5i7v9aOgMHZ3a7LjpwCrHd2ULdCX2Q+n+zlDOEgfXV0P+4EloptE39Z4iOQhQPyr3b/s3q9gj+4sS1QCPkHw==",
       "bin": {
         "mmkv-link": "autolink/postlink/run.js"
       },
@@ -26830,11 +26841,12 @@
         "@microsoft/signalr-protocol-msgpack": "^7.0.10",
         "@notesnook/crypto": "file:../crypto",
         "@notesnook/logger": "file:../logger",
-        "@streetwriters/showdown": "^3.0.1-alpha.2",
+        "@readme/data-urls": "^3.0.0",
+        "@streetwriters/showdown": "^3.0.4-alpha",
         "@types/html-to-text": "^9.0.0",
         "@types/katex": "^0.16.1",
         "@types/prismjs": "^1.26.0",
-        "@types/showdown": "^2.0.0",
+        "@types/streetwriters__showdown": "npm:@types/showdown@^2.0.6",
         "@vitest/coverage-v8": "^0.34.1",
         "abortcontroller-polyfill": "^1.7.3",
         "async-mutex": "^0.3.2",
@@ -26881,7 +26893,7 @@
         "@tiptap/extension-font-family": "2.1.12",
         "@tiptap/extension-history": "2.1.12",
         "@tiptap/extension-horizontal-rule": "2.1.12",
-        "@tiptap/extension-link": "2.1.12",
+        "@tiptap/extension-link": "^2.1.16",
         "@tiptap/extension-list-keymap": "2.1.12",
         "@tiptap/extension-placeholder": "2.1.12",
         "@tiptap/extension-subscript": "2.1.12",
@@ -26904,6 +26916,7 @@
         "@types/react-dom": "17.0.2",
         "@types/react-modal": "3.13.1",
         "@types/tinycolor2": "^1.4.3",
+        "async-mutex": "^0.4.0",
         "clipboard-polyfill": "4.0.0",
         "detect-indent": "^7.0.0",
         "entities": "^4.5.0",
@@ -26969,6 +26982,7 @@
       "requires": {
         "@flyerhq/react-native-link-preview": "^1.6.0",
         "@mdi/js": "^6.7.96",
+        "@readme/data-urls": "3.0.0",
         "@streetwriters/showdown": "^3.0.1-alpha.2",
         "absolutify": "^0.1.0",
         "buffer": "^6.0.3",
@@ -27076,7 +27090,7 @@
         "react-native-image-picker": "4.1.2",
         "react-native-in-app-review": "4.3.3",
         "react-native-keychain": "4.0.5",
-        "react-native-mmkv-storage": "^0.10.0-alpha.9",
+        "react-native-mmkv-storage": "^0.10.0-alpha.11",
         "react-native-modal-datetime-picker": "14.0.0",
         "react-native-navigation-bar-color": "2.0.2",
         "react-native-notification-sounds": "0.5.5",
@@ -27638,6 +27652,11 @@
         "nanoid": "^3.1.23"
       }
     },
+    "@readme/data-urls": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@readme/data-urls/-/data-urls-3.0.0.tgz",
+      "integrity": "sha512-b0L7VWqbLZqOSSAFUrxS5ZwUfec35WDsAwwCH481vYnhk0dWO3nvmNVNCbP8CY4cXqwL1W4uCAnhDz+CUmXM3g=="
+    },
     "@sayem314/react-native-keep-awake": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@sayem314/react-native-keep-awake/-/react-native-keep-awake-1.2.0.tgz",
@@ -36184,9 +36203,9 @@
       "integrity": "sha512-TbiO8AO055EPjaxIuKxrCEOB4r81uQCVDFbtcs+e4pEOHxf6z3JgDC0UU0poJElKfCh37b+TFRxQhg6DbsYJBA=="
     },
     "react-native-mmkv-storage": {
-      "version": "0.10.0-alpha.9",
-      "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.10.0-alpha.9.tgz",
-      "integrity": "sha512-nv1A0t5dxhcAtMnhqqBodNp94U4QziW1RO352GB3BPpic03abPHj+0HjBJH72VeKKMfYIc0PR5pmo6BbsaPExw=="
+      "version": "0.10.0-alpha.11",
+      "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.10.0-alpha.11.tgz",
+      "integrity": "sha512-rr5i7v9aOgMHZ3a7LjpwCrHd2ULdCX2Q+n+zlDOEgfXV0P+4EloptE39Z4iOQhQPyr3b/s3q9gj+4sS1QCPkHw=="
     },
     "react-native-modal-datetime-picker": {
       "version": "14.0.0",

apps/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notesnook/mobile",
-  "version": "2.6.10",
+  "version": "2.6.16",
   "private": true,
   "license": "GPL-3.0-or-later",
   "workspaces": [
@@ -10,6 +10,7 @@
   "scripts": {
     "postinstall": "patch-package && node ./scripts/optimize-fonts.mjs",
     "run-android": "cd native && react-native run-android --active-arch-only",
+    "build": "echo 'No build script defined'",
     "run-ios": "cd native && react-native run-ios",
     "start": "cd native && react-native start",
     "repack": "cd native && react-native webpack-start",

apps/theme-builder/package-lock.json

@@ -1377,7 +1377,7 @@
     },
     "../web": {
       "name": "@notesnook/web",
-      "version": "2.6.8",
+      "version": "2.6.15",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@aws-sdk/util-base64-browser": "^3.208.0",
@@ -1388,7 +1388,7 @@
         "@emotion/react": "11.11.1",
         "@mdi/js": "^7.2.96",
         "@mdi/react": "^1.6.1",
-        "@notesnook-importer/core": "^1.7.1",
+        "@notesnook-importer/core": "^2.0.0",
         "@notesnook/common": "file:../../packages/common",
         "@notesnook/core": "file:../../packages/core",
         "@notesnook/crypto": "file:../../packages/crypto",
@@ -1408,6 +1408,7 @@
         "@theme-ui/core": "^0.14.7",
         "@trpc/client": "10.38.3",
         "@trpc/react-query": "10.38.3",
+        "@zip.js/zip.js": "^2.7.32",
         "allotment": "^1.19.0",
         "axios": "^1.3.4",
         "clipboard-polyfill": "4.0.0",

apps/web/__e2e__/models/editor.model.ts

@@ -171,7 +171,7 @@ export class EditorModel {
       await this.tagInput.fill(tag);
       await this.tagInput.press("Enter");
       await this.tags
-        .locator(":scope", { hasText: new RegExp(`^${tag}$`) })
+        .locator("span", { hasText: new RegExp(`^${tag}$`) })
         .waitFor();
     }
   }
@@ -181,7 +181,7 @@ export class EditorModel {
     const count = await this.tags.count();
     for (let i = 0; i < count; ++i) {
       const item = this.tags.nth(i);
-      const tag = await item.textContent();
+      const tag = await item.locator("span").textContent();
       if (tag) tags.push(tag);
     }
     return tags;

apps/web/__e2e__/notes.test.ts-snapshots/export-html-Chromium-win32.txt

@@ -8,8 +8,11 @@
       content="This is Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1"
     />
     <title>Test 1 - Notesnook</title>
-    <meta name="created-on" content="xxx" />
-    <meta name="last-edited-on" content="xxx" />
+    <meta name="created-at" content="22-12-2023 11:33 AM" />
+    <meta name="updated-at" content="22-12-2023 11:33 AM" />
+    
+    
+    
     
     <link rel="stylesheet" href="https://app.notesnook.com/assets/editor-styles.css?d=0">
 
@@ -25,6 +28,11 @@
       color: #202124;
       font-family: "Open Sans", "Noto Sans", Frutiger, Calibri, Myriad, Arial, Ubuntu, Helvetica, -apple-system, BlinkMacSystemFont, sans-serif;
     }
+
+    .math-block {
+      padding-top: 20px;
+      padding-bottom: 20px;
+    }
     
     h1,
     h2,

apps/web/__e2e__/notes.test.ts-snapshots/export-md-Chromium-win32.txt

@@ -2,6 +2,3 @@
 
 This is Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1Test 1
 
-
----
-

apps/web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@notesnook/web",
   "description": "Your private note taking space",
-  "version": "2.6.10",
+  "version": "2.6.15",
   "private": true,
   "main": "./src/app.js",
   "homepage": "https://notesnook.com/",
@@ -16,7 +16,7 @@
     "@emotion/react": "11.11.1",
     "@mdi/js": "^7.2.96",
     "@mdi/react": "^1.6.1",
-    "@notesnook-importer/core": "^1.7.1",
+    "@notesnook-importer/core": "^2.0.0",
     "@notesnook/common": "file:../../packages/common",
     "@notesnook/core": "file:../../packages/core",
     "@notesnook/crypto": "file:../../packages/crypto",
@@ -36,6 +36,7 @@
     "@theme-ui/core": "^0.14.7",
     "@trpc/client": "10.38.3",
     "@trpc/react-query": "10.38.3",
+    "@zip.js/zip.js": "^2.7.32",
     "allotment": "^1.19.0",
     "axios": "^1.3.4",
     "clipboard-polyfill": "4.0.0",

apps/web/src/common/attachments.ts

@@ -20,11 +20,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { lazify } from "../utils/lazify";
 import { db } from "./db";
 
-async function download(hash: string) {
+async function download(hash: string, groupId?: string) {
   const attachment = db.attachments?.attachment(hash);
   if (!attachment) return;
   const downloadResult = await db.fs?.downloadFile(
-    attachment.metadata.hash,
+    groupId || attachment.metadata.hash,
     attachment.metadata.hash,
     attachment.chunkSize,
     attachment.metadata
@@ -61,8 +61,12 @@ type OutputTypeToReturnType = {
 export async function downloadAttachment<
   TType extends "blob" | "base64" | "text",
   TOutputType = OutputTypeToReturnType[TType]
->(hash: string, type: TType): Promise<TOutputType | undefined> {
-  const response = await download(hash);
+>(
+  hash: string,
+  type: TType,
+  groupId?: string
+): Promise<TOutputType | undefined> {
+  const response = await download(hash, groupId);
   if (!response) return;
   const { attachment, key } = response;
 

apps/web/src/common/export.ts

@@ -17,13 +17,15 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { db } from "./db";
 import { TaskManager } from "./task-manager";
-import { zip } from "../utils/zip";
-import { saveAs } from "file-saver";
+import { ExportStream } from "../utils/streams/export-stream";
+import { createZipStream } from "../utils/streams/zip-stream";
+import { createWriteStream } from "../utils/stream-saver";
 import { showToast } from "../utils/toast";
-import { sanitizeFilename } from "@notesnook/common";
 import Vault from "./vault";
+import { db } from "./db";
+import Note from "@notesnook/core/dist/models/note";
+import { sanitizeFilename } from "@notesnook/common";
 
 export async function exportToPDF(
   title: string,
@@ -69,7 +71,7 @@ export async function exportToPDF(
 }
 
 export async function exportNotes(
-  format: "pdf" | "md" | "txt" | "html",
+  format: "pdf" | "md" | "txt" | "html" | "md-frontmatter",
   noteIds: string[]
 ): Promise<boolean> {
   return await TaskManager.startTask({
@@ -77,76 +79,91 @@ export async function exportNotes(
     title: "Exporting notes",
     subtitle: "Please wait while your notes are exported.",
     action: async (report) => {
-      let vaultUnlocked = false;
-
-      if (noteIds.length === 1 && db.notes?.note(noteIds[0])?.data.locked) {
-        vaultUnlocked = await Vault.unlockVault();
-        if (!vaultUnlocked) return false;
-      } else if (noteIds.length > 1 && (await db.vault?.exists())) {
-        vaultUnlocked = await Vault.unlockVault();
-        if (!vaultUnlocked)
-          showToast(
-            "error",
-            "Failed to unlock vault. Locked notes will be skipped."
-          );
+      try {
+        let progress = 0;
+        await createNoteStream(noteIds)
+          .pipeThrough(
+            new TransformStream<Note, Note>({
+              transform(note, controller) {
+                controller.enqueue(note);
+                report({
+                  total: noteIds.length,
+                  current: progress++,
+                  text: `Exporting "${note?.title || "Unknown note"}"`
+                });
+              }
+            })
+          )
+          .pipeThrough(new ExportStream(format))
+          .pipeThrough(createZipStream())
+          .pipeTo(await createWriteStream("notes.zip"));
+        return true;
+      } catch (e) {
+        if (e instanceof Error) showToast("error", e.message);
       }
-
-      const files = [];
-      let index = 0;
-      for (const noteId of noteIds) {
-        const note = db.notes?.note(noteId);
-        if (!note) continue;
-        if (!vaultUnlocked && note.data.locked) continue;
-
-        report({
-          current: ++index,
-          total: noteIds.length,
-          text: `Exporting "${note.title}"...`
-        });
-
-        const rawContent = await db.content?.raw(note.data.contentId);
-        const content = note.data.locked
-          ? await db.vault?.decryptContent(rawContent)
-          : rawContent;
-
-        const exported = await note
-          .export(format === "pdf" ? "html" : format, content)
-          .catch((e: Error) => {
-            console.error(note.data, e);
-            showToast(
-              "error",
-              `Failed to export note "${note.title}": ${e.message}`
-            );
-          });
-
-        if (typeof exported !== "string") {
-          showToast("error", `Failed to export note "${note.title}"`);
-          continue;
-        }
-
-        if (format === "pdf") {
-          return await exportToPDF(note.title, exported);
-        }
-
-        files.push({
-          filename: note.title,
-          content: exported,
-          date: note.dateEdited
-        });
-      }
-
-      if (!files.length) return false;
-      if (files.length === 1) {
-        saveAs(
-          new Blob([Buffer.from(files[0].content, "utf-8")]),
-          `${sanitizeFilename(files[0].filename)}.${format}`
-        );
-      } else {
-        const zipped = await zip(files, format);
-        saveAs(new Blob([zipped.buffer]), "notes.zip");
-      }
-
-      return true;
+      return false;
     }
   });
 }
+
+function createNoteStream(noteIds: string[]) {
+  let i = 0;
+  return new ReadableStream<Note>({
+    start() {},
+    async pull(controller) {
+      const noteId = noteIds[i++];
+      if (!noteId) controller.close();
+      else controller.enqueue(db.notes?.note(noteId));
+    },
+    async cancel(reason) {
+      throw new Error(reason);
+    }
+  });
+}
+
+const FORMAT_TO_EXT = {
+  pdf: "pdf",
+  md: "md",
+  txt: "txt",
+  html: "html",
+  "md-frontmatter": "md"
+} as const;
+
+export async function exportNote(
+  note: Note,
+  format: keyof typeof FORMAT_TO_EXT,
+  disableTemplate = false
+) {
+  if (!db.vault?.unlocked && note.data.locked && !(await Vault.unlockVault())) {
+    showToast("error", `Skipping note "${note.title}" as it is locked.`);
+    return false;
+  }
+
+  const rawContent = note.data.contentId
+    ? await db.content?.raw(note.data.contentId)
+    : undefined;
+
+  const content =
+    rawContent &&
+    !rawContent.deleted &&
+    (typeof rawContent.data === "object"
+      ? await db.vault?.decryptContent(rawContent)
+      : rawContent);
+
+  const exported = await note
+    .export(format === "pdf" ? "html" : format, content, disableTemplate)
+    .catch((e: Error) => {
+      console.error(note.data, e);
+      showToast("error", `Failed to export note "${note.title}": ${e.message}`);
+      return false as const;
+    });
+
+  if (typeof exported === "boolean" && !exported) return false;
+
+  const filename = sanitizeFilename(note.title, { replacement: "-" });
+  const ext = FORMAT_TO_EXT[format];
+  return {
+    filename: [filename, ext].join("."),
+    content: exported
+  };
+}

apps/web/src/common/index.ts

@@ -36,9 +36,9 @@ import { TaskManager } from "./task-manager";
 import { EVENTS } from "@notesnook/core/dist/common";
 import { getFormattedDate } from "@notesnook/common";
 import { createWritableStream } from "./desktop-bridge";
-import { ZipStream } from "../utils/streams/zip-stream";
+import { createZipStream } from "../utils/streams/zip-stream";
 import { FeatureKeys } from "../dialogs/feature-dialog";
-import { Entry, Reader } from "../utils/zip-reader";
+import { ZipEntry, createUnzipIterator } from "../utils/streams/unzip-stream";
 
 export const CREATE_BUTTON_MAP = {
   notes: {
@@ -113,7 +113,7 @@ export async function createBackup() {
           controller.close();
         }
       })
-        .pipeThrough(new ZipStream())
+        .pipeThrough(createZipStream())
         .pipeTo(writeStream);
     }
   });
@@ -138,8 +138,9 @@ export async function selectBackupFile() {
 
 export async function importBackup() {
   const backupFile = await selectBackupFile();
-  if (!backupFile) return;
+  if (!backupFile) return false;
   await restoreBackupFile(backupFile);
+  return true;
 }
 
 export async function restoreBackupFile(backupFile: File) {
@@ -165,12 +166,12 @@ export async function restoreBackupFile(backupFile: File) {
       type: "modal",
       action: async (report) => {
         let cachedPassword: string | undefined = undefined;
-        const { read, totalFiles } = await Reader(backupFile);
-        const entries: Entry[] = [];
+        // const { read, totalFiles } = await Reader(backupFile);
+        const entries: ZipEntry[] = [];
         let filesProcessed = 0;
 
         let isValid = false;
-        for await (const entry of read()) {
+        for await (const entry of createUnzipIterator(backupFile)) {
           if (entry.name === ".nnbackup") {
             isValid = true;
             continue;
@@ -199,7 +200,6 @@ export async function restoreBackupFile(backupFile: File) {
           }
 
           report({
-            total: totalFiles,
             text: `Processed ${entry.name}`,
             current: filesProcessed++
           });

apps/web/src/common/multi-select.ts

@@ -35,20 +35,11 @@ type Item = {
 };
 
 async function moveNotesToTrash(notes: Item[], confirm = true) {
-  const item = notes[0];
   if (confirm && !(await showMultiDeleteConfirmation(notes.length))) return;
-
-  if (notes.length === 1) {
-    if (
-      item.locked &&
-      !(await Vault.unlockNote(item.id, "unlock_and_delete_note"))
-    )
-      return;
-    item.locked = false;
-  }
+  if (notes.some((n) => n.locked) && !(await Vault.unlockVault())) return;
 
   const items = notes.map((item) => {
-    if (item.locked || db.monographs?.isPublished(item.id)) return 0;
+    if (db.monographs?.isPublished(item.id)) return 0;
     return item.id;
   });
 

apps/web/src/components/announcements/body.jsx

@@ -291,7 +291,9 @@ function CalltoAction({ action, variant, sx, dismissAnnouncement }) {
           case "link": {
             const url = new URL(action.data);
             const target =
-              url.origin === window.location.origin ? "_self" : "_blank";
+              url.origin === window.location.origin && !IS_DESKTOP_APP
+                ? "_self"
+                : "_blank";
             window.open(action.data, target, "noopener noreferrer");
             break;
           }

apps/web/src/components/attachment/index.tsx

@@ -164,7 +164,11 @@ export function Attachment({
             <AttachmentError
               color={"icon-error"}
               size={16}
-              title={attachment.failed}
+              title={
+                typeof attachment.failed === "object"
+                  ? attachment.failed.toString()
+                  : attachment.failed
+              }
             />
           ) : attachment.working ? (
             <Loading size={16} />

apps/web/src/components/auth-container/index.jsx

@@ -171,8 +171,10 @@ function AuthContainer(props) {
             {testimonial.text} —{" "}
             <Link
               sx={{ fontStyle: "italic", color: "paragraph-secondary" }}
-              href={testimonial.link}
-            >
+              href={testimonial.link}  
+              target="_blank"
+              rel="noopener noreferrer"
+              >
               source
             </Link>
           </Text>

apps/web/src/components/dialog/index.tsx

@@ -80,11 +80,10 @@ function BaseDialog(props: React.PropsWithChildren<DialogProps>) {
           border: 0,
           zIndex: 999,
           backgroundColor: "var(--backdrop)"
+        },
+        overlay: {
+          opacity: 1
         }
-        // overlay: {
-        //   zIndex: 999,
-        //   background: "var(--backdrop)"
-        // }
       }}
     >
       <ScopedThemeProvider

apps/web/src/components/editor/index.tsx

@@ -72,11 +72,12 @@ type DocumentPreview = {
 function onEditorChange(
   noteId: string | undefined,
   sessionId: number,
-  content: string
+  content: string,
+  ignoreEdit: boolean
 ) {
   if (!content) return;
 
-  editorstore.get().saveSessionContent(noteId, sessionId, {
+  editorstore.get().saveSessionContent(noteId, sessionId, ignoreEdit, {
     type: "tiptap",
     data: content
   });
@@ -135,26 +136,7 @@ export default function EditorManager({
             if (result) item.data = result.data;
             else EV.publish(EVENTS.vaultLocked);
           }
-          const oldHashes = editorInstance.current.getMediaHashes();
-
           editorInstance.current.updateContent(item.data as string);
-
-          const newHashes = editorInstance.current.getMediaHashes();
-          const hashesToLoad = newHashes.filter(
-            (hash, index) => hash !== oldHashes[index]
-          );
-
-          if (appstore.get().isSyncing()) {
-            db.eventManager.subscribe(
-              EVENTS.syncCompleted,
-              async () => {
-                await db.attachments?.downloadMedia(id, hashesToLoad);
-              },
-              true
-            );
-          } else {
-            await db.attachments?.downloadMedia(id, hashesToLoad);
-          }
         } else if (isNote) {
           if (!locked && item.locked) return EV.publish(EVENTS.vaultLocked);
 
@@ -180,18 +162,6 @@ export default function EditorManager({
     setTimestamp(Date.now());
   }, []);
 
-  const loadMedia = useCallback(async () => {
-    if (previewSession.current) {
-      await db.content?.downloadMedia(
-        noteId,
-        previewSession.current.content,
-        true
-      );
-    } else if (noteId && editorstore.get().session.content) {
-      await db.attachments?.downloadMedia(noteId);
-    }
-  }, [noteId]);
-
   useEffect(() => {
     if (!isNewSession) return;
 
@@ -237,6 +207,7 @@ export default function EditorManager({
               />
             )}
             <Editor
+              id={noteId}
               nonce={timestamp}
               content={() =>
                 previewSession.current?.content?.data ||
@@ -247,7 +218,6 @@ export default function EditorManager({
               options={{
                 readonly: isReadonly || isPreviewSession,
                 onRequestFocus: () => toggleProperties(false),
-                onLoadMedia: loadMedia,
                 focusMode: isFocusMode,
                 isMobile: isMobile || isTablet
               }}
@@ -351,9 +321,9 @@ type EditorOptions = {
   readonly?: boolean;
   focusMode?: boolean;
   onRequestFocus?: () => void;
-  onLoadMedia?: () => void;
 };
 type EditorProps = {
+  id: string | number;
   content: () => string | undefined;
   nonce?: number;
   options?: EditorOptions;
@@ -361,8 +331,9 @@ type EditorProps = {
   onPreviewDocument?: (preview: DocumentPreview) => void;
 };
 export function Editor(props: EditorProps) {
-  const { content, nonce, options, onContentChange, onPreviewDocument } = props;
-  const { readonly, headless, onLoadMedia, isMobile } = options || {
+  const { id, content, nonce, options, onContentChange, onPreviewDocument } =
+    props;
+  const { readonly, headless, isMobile } = options || {
     headless: false,
     readonly: false,
     focusMode: false,
@@ -375,40 +346,16 @@ export function Editor(props: EditorProps) {
   useEffect(() => {
     const event = AppEventManager.subscribe(
       AppEvents.UPDATE_ATTACHMENT_PROGRESS,
-      ({ hash, loaded, total, type }: AttachmentProgress) => {
+      ({ hash, loaded, total }: AttachmentProgress) => {
         editor.current?.sendAttachmentProgress(
           hash,
-          type,
           Math.round((loaded / total) * 100)
         );
       }
     );
 
-    const mediaAttachmentDownloadedEvent = EV.subscribe(
-      EVENTS.mediaAttachmentDownloaded,
-      ({
-        groupId,
-        hash,
-        attachmentType,
-        src
-      }: {
-        groupId?: string;
-        attachmentType: "image" | "webclip" | "generic";
-        hash: string;
-        src: string;
-      }) => {
-        if (groupId?.startsWith("monograph")) return;
-        if (attachmentType === "image") {
-          editor.current?.loadImage(hash, src);
-        } else if (attachmentType === "webclip") {
-          editor.current?.loadWebClip(hash, src);
-        }
-      }
-    );
-
     return () => {
       event.unsubscribe();
-      mediaAttachmentDownloadedEvent.unsubscribe();
     };
   }, [editor]);
 
@@ -424,7 +371,6 @@ export function Editor(props: EditorProps) {
           corsHost: Config.get("corsProxy", "https://cors.notesnook.com")
         }}
         onLoad={() => {
-          if (onLoadMedia) onLoadMedia();
           if (nonce && nonce > 0) setIsLoading(false);
         }}
         onContentChange={onContentChange}
@@ -437,8 +383,11 @@ export function Editor(props: EditorProps) {
             const container = document.getElementById("dialogContainer");
             if (!(container instanceof HTMLElement)) return;
 
-            const dataurl =
-              data.bloburl || (await downloadAttachment(hash, "base64"));
+            const dataurl = await downloadAttachment(
+              hash,
+              "base64",
+              id.toString()
+            );
             if (!dataurl)
               return showToast("error", "This image cannot be previewed.");
 
@@ -455,7 +404,7 @@ export function Editor(props: EditorProps) {
             );
           } else if (attachment && onPreviewDocument) {
             onPreviewDocument({ hash });
-            const blob = await downloadAttachment(hash, "blob");
+            const blob = await downloadAttachment(hash, "blob", id.toString());
             if (!blob) return;
             onPreviewDocument({ url: URL.createObjectURL(blob), hash });
           }
@@ -467,6 +416,13 @@ export function Editor(props: EditorProps) {
             editor.current?.attachFile(file);
           });
         }}
+        onGetAttachmentData={(attachment) => {
+          return downloadAttachment(
+            attachment.hash,
+            attachment.type === "web-clip" ? "text" : "base64",
+            id.toString()
+          );
+        }}
         onAttachFile={async (file) => {
           const result = await attachFile(file);
           if (!result) return;
@@ -557,7 +513,7 @@ function EditorChrome(
         <Box
           id="editorToolbar"
           sx={{
-            display: readonly ? "none" : "flex",
+            display: "flex",
             bg: "background",
             position: "sticky",
             top: 0,
@@ -580,7 +536,7 @@ function PreviewModeNotice(props: PreviewModeNoticeProps) {
     async (cancelled: boolean) => {
       const { id, sessionId } = editorstore.get().session;
       if (!cancelled) {
-        await editorstore.saveSessionContent(id, sessionId, content);
+        await editorstore.saveSessionContent(id, sessionId, false, content);
       }
       onDiscard();
     },

apps/web/src/components/editor/picker.ts

@@ -25,6 +25,7 @@ import { TaskManager } from "../../common/task-manager";
 import { isUserPremium } from "../../hooks/use-is-user-premium";
 import { showToast } from "../../utils/toast";
 import { showFilePicker } from "../../utils/file-picker";
+import { Attachment } from "@notesnook/editor";
 
 const FILE_SIZE_LIMIT = 500 * 1024 * 1024;
 const IMAGE_SIZE_LIMIT = 50 * 1024 * 1024;
@@ -80,33 +81,54 @@ export async function reuploadAttachment(
 }
 
 /**
- * @param {File} selectedFile
+ * @param {File} file
  * @returns
  */
-async function pickFile(selectedFile: File, options?: AddAttachmentOptions) {
+async function pickFile(
+  file: File,
+  options?: AddAttachmentOptions
+): Promise<Attachment | undefined> {
   try {
-    if (selectedFile.size > FILE_SIZE_LIMIT)
+    if (file.size > FILE_SIZE_LIMIT)
       throw new Error("File too big. You cannot add files over 500 MB.");
-    if (!selectedFile) return;
+    if (!file) return;
 
-    return await addAttachment(selectedFile, undefined, options);
+    const hash = await addAttachment(file, options);
+    return {
+      type: "file",
+      filename: file.name,
+      hash,
+      mime: file.type,
+      size: file.size
+    };
   } catch (e) {
     showToast("error", `${(e as Error).message}`);
   }
 }
 
 /**
- * @param {File} selectedImage
+ * @param {File} file
  * @returns
  */
-async function pickImage(selectedImage: File, options?: AddAttachmentOptions) {
+async function pickImage(
+  file: File,
+  options?: AddAttachmentOptions
+): Promise<Attachment | undefined> {
   try {
-    if (selectedImage.size > IMAGE_SIZE_LIMIT)
+    if (file.size > IMAGE_SIZE_LIMIT)
       throw new Error("Image too big. You cannot add images over 50 MB.");
-    if (!selectedImage) return;
+    if (!file) return;
 
-    const dataurl = await toDataURL(selectedImage);
-    return await addAttachment(selectedImage, dataurl, options);
+    const hash = await addAttachment(file, options);
+    const dimensions = await getImageDimensions(file);
+    return {
+      type: "image",
+      filename: file.name,
+      hash,
+      mime: file.type,
+      size: file.size,
+      ...dimensions
+    };
   } catch (e) {
     showToast("error", (e as Error).message);
   }
@@ -118,12 +140,6 @@ async function getEncryptionKey(): Promise<SerializedKey> {
   return key;
 }
 
-async function toDataURL(file: File): Promise<string> {
-  const buffer = await file.arrayBuffer();
-  const base64 = Buffer.from(buffer).toString("base64");
-  return `data:${file.type};base64,${base64}`;
-}
-
 export type AttachmentProgress = {
   hash: string;
   type: "encrypt" | "download" | "upload";
@@ -131,15 +147,6 @@ export type AttachmentProgress = {
   loaded: number;
 };
 
-export type Attachment = {
-  hash: string;
-  filename: string;
-  mime: string;
-  size: number;
-  dataurl?: string;
-  bloburl?: string;
-};
-
 type AddAttachmentOptions = {
   expectedFileHash?: string;
   showProgress?: boolean;
@@ -148,9 +155,8 @@ type AddAttachmentOptions = {
 
 async function addAttachment(
   file: File,
-  dataurl: string | undefined,
   options: AddAttachmentOptions = {}
-): Promise<Attachment> {
+): Promise<string> {
   const { default: FS } = await import("../../interfaces/fs");
   const { expectedFileHash, showProgress = true } = options;
   let forceWrite = options.forceWrite;
@@ -165,7 +171,7 @@ async function addAttachment(
         `Please select the same file for reuploading. Expected hash ${expectedFileHash} but got ${hash}.`
       );
 
-    const exists = db.attachments?.exists(hash);
+    const exists = db.attachments?.attachment(hash);
     if (!forceWrite && exists) {
       forceWrite = (await FS.getUploadedFileSize(hash)) <= 0;
     }
@@ -181,19 +187,13 @@ async function addAttachment(
         ...output,
         hash,
         hashType,
-        filename: file.name,
-        type: file.type,
+        filename: exists?.metadata.filename || file.name,
+        type: exists?.metadata.type || file.type,
         key
       });
     }
 
-    return {
-      hash: hash,
-      filename: file.name,
-      mime: file.type,
-      size: file.size,
-      dataurl
-    };
+    return hash;
   };
 
   const result = showProgress
@@ -204,7 +204,10 @@ async function addAttachment(
   return result;
 }
 
-function withProgress<T>(file: File, action: () => Promise<T>): Promise<T> {
+function withProgress<T>(
+  file: File,
+  action: () => Promise<T>
+): Promise<T | Error> {
   return TaskManager.startTask({
     type: "modal",
     title: "Encrypting attachment",
@@ -226,3 +229,19 @@ function withProgress<T>(file: File, action: () => Promise<T>): Promise<T> {
     }
   });
 }
+
+function getImageDimensions(file: File) {
+  return new Promise<{ width: number; height: number } | undefined>(
+    (resolve) => {
+      const img = new Image();
+      img.onload = () => {
+        const { naturalWidth: width, naturalHeight: height } = img;
+        resolve({ width, height });
+      };
+      img.onerror = () => {
+        resolve(undefined);
+      };
+      img.src = URL.createObjectURL(file);
+    }
+  );
+}

apps/web/src/components/editor/tiptap.tsx

@@ -34,11 +34,11 @@ import {
   getTotalWords,
   countWords,
   getFontById,
-  TiptapOptions
+  TiptapOptions,
+  Attachment
 } from "@notesnook/editor";
 import { Box, Flex } from "@theme-ui/components";
 import { PropsWithChildren, useEffect, useMemo, useRef, useState } from "react";
-import { Attachment } from "./picker";
 import { IEditor } from "./types";
 import {
   useConfigureEditor,
@@ -57,12 +57,12 @@ import { store as editorstore } from "../../stores/editor-store";
 import { ScopedThemeProvider } from "../theme-provider";
 import { writeText } from "clipboard-polyfill";
 import { useStore as useThemeStore } from "../../stores/theme-store";
-import { toBlobURL } from "@notesnook/editor/dist/utils/downloader";
 
 type OnChangeHandler = (
   id: string | undefined,
   sessionId: number,
-  content: string
+  content: string,
+  ignoreEdit: boolean
 ) => void;
 type TipTapProps = {
   editorContainer: HTMLElement;
@@ -72,6 +72,7 @@ type TipTapProps = {
   onInsertAttachment?: (type: AttachmentType) => void;
   onDownloadAttachment?: (attachment: Attachment) => void;
   onPreviewAttachment?: (attachment: Attachment) => void;
+  onGetAttachmentData?: (attachment: Attachment) => Promise<string | undefined>;
   onAttachFile?: (file: File) => void;
   onFocus?: () => void;
   content?: () => string | undefined;
@@ -92,6 +93,7 @@ function save(
   editor: Editor,
   content: Fragment,
   preventSave: boolean,
+  ignoreEdit: boolean,
   onChange?: OnChangeHandler
 ) {
   configureEditor({
@@ -105,7 +107,7 @@ function save(
 
   if (preventSave) return;
   const html = getHTMLFromFragment(content, editor.schema);
-  onChange?.(noteId, sessionId, html);
+  onChange?.(noteId, sessionId, html, ignoreEdit);
 }
 
 const deferredSave = debounceWithId(save, SAVE_INTERVAL);
@@ -117,6 +119,7 @@ function TipTap(props: TipTapProps) {
     onInsertAttachment,
     onDownloadAttachment,
     onPreviewAttachment,
+    onGetAttachmentData,
     onAttachFile,
     onContentChange,
     onFocus = () => {},
@@ -210,7 +213,8 @@ function TipTap(props: TipTapProps) {
       onUpdate: ({ editor, transaction }) => {
         onContentChange?.();
 
-        const preventSave = transaction?.getMeta("preventSave") as boolean;
+        const preventSave = transaction.getMeta("preventSave") as boolean;
+        const ignoreEdit = transaction.getMeta("ignoreEdit") as boolean;
         const { id, sessionId } = editorstore.get().session;
         const content = editor.state.doc.content;
         deferredSave(
@@ -220,6 +224,7 @@ function TipTap(props: TipTapProps) {
           editor as Editor,
           content,
           preventSave || !editor.isEditable,
+          ignoreEdit,
           onChange
         );
       },
@@ -282,7 +287,8 @@ function TipTap(props: TipTapProps) {
       onOpenLink: (url) => {
         window.open(url, "_blank");
         return true;
-      }
+      },
+      getAttachmentData: onGetAttachmentData
     };
   }, [readonly, nonce, doubleSpacedLines, dateFormat, timeFormat]);
 
@@ -420,14 +426,6 @@ function toIEditor(editor: Editor): IEditor {
       }),
     undo: () => editor.current?.commands.undo(),
     redo: () => editor.current?.commands.redo(),
-    getMediaHashes: () => {
-      if (!editor.current) return [];
-      const hashes: string[] = [];
-      editor.current.state.doc.descendants((n) => {
-        if (typeof n.attrs.hash === "string") hashes.push(n.attrs.hash);
-      });
-      return hashes;
-    },
     updateContent: (content) => {
       const { from, to } = editor.state.selection;
       editor.current
@@ -443,27 +441,17 @@ function toIEditor(editor: Editor): IEditor {
         })
         .run();
     },
-    attachFile: (file: Attachment) => {
-      if (file.dataurl) {
-        editor.current?.commands.insertImage({
-          ...file,
-          bloburl: toBlobURL(file.dataurl, file.hash)
-        });
-      } else editor.current?.commands.insertAttachment(file);
-    },
-    loadWebClip: (hash, src) =>
-      editor.current?.commands.updateWebClip({ hash }, { src }),
-    loadImage: (hash, dataurl) =>
-      editor.current?.commands.updateImage(
-        { hash },
-        { hash, bloburl: toBlobURL(dataurl, hash), preventUpdate: true }
-      ),
-    sendAttachmentProgress: (hash, type, progress) =>
-      editor.current?.commands.setAttachmentProgress({
-        hash,
-        type,
-        progress
-      })
+    attachFile: (file: Attachment) =>
+      file.type === "image"
+        ? editor.current?.commands.insertImage(file)
+        : editor.current?.commands.insertAttachment(file),
+    sendAttachmentProgress: (hash, progress) =>
+      editor.current?.commands.updateAttachment(
+        {
+          progress
+        },
+        { query: (a) => a.hash === hash, preventUpdate: true }
+      )
   };
 }
 

apps/web/src/components/editor/toolbar.jsx

@@ -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 { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import { Button, Flex, Text } from "@theme-ui/components";
 import {
   Published,
@@ -51,6 +51,7 @@ function Toolbar() {
   const sessionId = useStore((store) => store.session.id);
   const isDeleted = useStore((store) => store.session.isDeleted);
   const isLocked = useStore((store) => store.session.locked);
+  const readonly = useStore((store) => store.session.readonly);
   const [isFullscreen, setIsFullscreen] = useState(false);
   const isFocusMode = useAppStore((store) => store.isFocusMode);
   const toggleFocusMode = useAppStore((store) => store.toggleFocusMode);
@@ -62,6 +63,7 @@ function Toolbar() {
   const theme = useThemeStore((store) => store.colorScheme);
   const toggleNightMode = useThemeStore((store) => store.toggleColorScheme);
   const [isTitleVisible, setIsTitleVisible] = useState(false);
+  const onScrollTitleRef = useRef(null);
 
   const monographs = useMonographStore((store) => store.monographs);
   const { canRedo, canUndo, redo, undo } = useHistory();
@@ -91,6 +93,10 @@ function Toolbar() {
     };
   }, [isTitleVisible]);
 
+  useEffect(() => {
+    if (onScrollTitleRef.current) onScrollTitleRef.current.value = title;
+  }, [title]);
+
   const tools = useMemo(
     () => [
       {
@@ -215,6 +221,7 @@ function Toolbar() {
           }}
         />
         <AnimatedInput
+          ref={onScrollTitleRef}
           variant="clean"
           ml={[2, 2, 0]}
           initial={{
@@ -227,6 +234,7 @@ function Toolbar() {
           }}
           transition={{ duration: 0.5 }}
           defaultValue={title}
+          readOnly={readonly}
           onChange={(e) => {
             AppEventManager.publish(AppEvents.changeNoteTitle, {
               title: e.target.value,

apps/web/src/components/editor/types.ts

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Attachment } from "./picker";
+import { Attachment } from "@notesnook/editor";
 
 export type NoteStatistics = {
   words: {
@@ -33,14 +33,7 @@ export interface IEditor {
   }) => void;
   undo: () => void;
   redo: () => void;
-  getMediaHashes: () => string[];
   updateContent: (content: string) => void;
   attachFile: (file: Attachment) => void;
-  loadWebClip: (hash: string, html: string) => void;
-  loadImage: (hash: string, src: string) => void;
-  sendAttachmentProgress: (
-    hash: string,
-    type: "download" | "upload" | "encrypt",
-    progress: number
-  ) => void;
+  sendAttachmentProgress: (hash: string, progress: number) => void;
 }

apps/web/src/components/group-header/index.tsx

@@ -111,7 +111,8 @@ const sortByMenu: (options: GroupingMenuOptions) => MenuItem = (options) => ({
       {
         key: "dateCreated",
         title: "Date created",
-        isHidden: options.groupingKey === "trash"
+        isHidden:
+          options.groupingKey === "trash" || options.groupingKey === "tags"
       },
       {
         key: "dateEdited",

apps/web/src/components/note/index.tsx

@@ -70,7 +70,7 @@ import { hashNavigate, navigate } from "../../navigation";
 import { showPublishView } from "../publish-view";
 import IconTag from "../icon-tag";
 import { COLORS } from "../../common/constants";
-import { exportNotes } from "../../common/export";
+import { exportNote, exportNotes, exportToPDF } from "../../common/export";
 import { Multiselect } from "../../common/multi-select";
 import { store as selectionStore } from "../../stores/selection-store";
 import {
@@ -86,7 +86,7 @@ import {
   ReferencesWithDateEdited
 } from "../list-container/types";
 import { SchemeColors } from "@notesnook/theme";
-import Vault from "../../common/vault";
+import FileSaver from "file-saver";
 
 type NoteProps = {
   tags: Item[];
@@ -305,6 +305,12 @@ const formats = [
     icon: Markdown,
     subtitle: "Can be opened in any plain-text or markdown editor."
   },
+  {
+    type: "md-frontmatter",
+    title: "Markdown + Frontmatter",
+    icon: Markdown,
+    subtitle: "Can be opened in any plain-text or markdown editor."
+  },
   {
     type: "html",
     title: "HTML",
@@ -363,10 +369,9 @@ const menuItems: (note: any, items?: any[]) => MenuItem[] = (
       onClick: async () => {
         const { unlock, lock } = store.get();
         if (!note.locked) {
-          await lock(note.id);
-          showToast("success", "Note locked successfully!");
-        } else {
-          await unlock(note.id);
+          if (await lock(note.id))
+            showToast("success", "Note locked successfully!");
+        } else if (await unlock(note.id)) {
           showToast("success", "Note unlocked successfully!");
         }
       },
@@ -416,7 +421,12 @@ const menuItems: (note: any, items?: any[]) => MenuItem[] = (
       isDisabled: !isSynced,
       icon: Print.path,
       onClick: async () => {
-        await exportNotes("pdf", [note.id]);
+        const item = db.notes?.note(note);
+        if (!item) return;
+
+        const result = await exportNote(item, "pdf");
+        if (!result) return;
+        await exportToPDF(note.title, result.content);
       }
     },
     {
@@ -450,7 +460,24 @@ const menuItems: (note: any, items?: any[]) => MenuItem[] = (
           // ? "Multiple notes cannot be exported as PDF."
           // : false,
           isPro: format.type !== "txt",
-          onClick: () => exportNotes(format.type, ids)
+          onClick: async () => {
+            if (ids.length === 1) {
+              const item = db.notes?.note(note);
+              if (!item) return;
+
+              const result = await exportNote(item, format.type);
+              if (!result) return;
+              if (format.type === "pdf")
+                return exportToPDF(note.title, result.content);
+
+              return FileSaver.saveAs(
+                new Blob([new TextEncoder().encode(result.content)]),
+                result.filename
+              );
+            }
+
+            await exportNotes(format.type, ids);
+          }
         }))
       },
       multiSelect: true,
@@ -466,7 +493,7 @@ const menuItems: (note: any, items?: any[]) => MenuItem[] = (
           {
             type: "button",
             key: "copy-as-text",
-            tooltip: `Export as Text`,
+            tooltip: `Copy as Text`,
             title: "Text",
             icon: Plaintext.path,
             onClick: () => copyNote(note.id, "txt")
@@ -474,7 +501,7 @@ const menuItems: (note: any, items?: any[]) => MenuItem[] = (
           {
             type: "button",
             key: "copy-as-markdown",
-            tooltip: `Export as Markdown`,
+            tooltip: `Copy as Markdown`,
             title: "Markdown",
             icon: Markdown.path,
             onClick: () => copyNote(note.id, "md")
@@ -533,7 +560,7 @@ const menuItems: (note: any, items?: any[]) => MenuItem[] = (
       icon: Trash.path,
       isDisabled:
         items.length === 1
-          ? db.monographs?.isPublished(note.id) || note.locked
+          ? db.monographs?.isPublished(note.id)
           : items.some((item) => !db.notes?.note(item.id).synced()),
       onClick: () => Multiselect.moveNotesToTrash(items, items.length > 1),
       multiSelect: true
@@ -700,17 +727,11 @@ async function copyNote(noteId: string, format: "md" | "txt") {
   try {
     const note = db.notes?.note(noteId);
     if (!note) throw new Error("No note with this id exists.");
-    if (note?.data.locked && !(await Vault.unlockVault()))
-      throw new Error("Please unlock this note to copy it.");
 
-    const rawContent = await db.content?.raw(note.data.contentId);
-    const content = note?.data.locked
-      ? await db.vault?.decryptContent(rawContent)
-      : rawContent;
+    const result = await exportNote(note, format, true);
+    if (!result) return;
 
-    const text = await note.export(format, content, false);
-    if (!text) throw new Error(`Could not convert note to ${format}.`);
-    await navigator.clipboard.writeText(text);
+    await navigator.clipboard.writeText(result.content);
     showToast("success", "Copied!");
   } catch (e) {
     if (e instanceof Error)

apps/web/src/components/publish-view/index.jsx

@@ -125,7 +125,7 @@ function PublishView(props) {
                     variant="body"
                     as="a"
                     target="_blank"
-                    href={`https://monograph.notesnook.com/${publishId}`}
+                    href={`https://monogr.ph/${publishId}`}
                     sx={{
                       textOverflow: "ellipsis",
                       whiteSpace: "nowrap",
@@ -134,13 +134,13 @@ function PublishView(props) {
                       mr: 2
                     }}
                   >
-                    {`https://monograph.notesnook.com/${publishId}`}
+                    {`https://monogr.ph/${publishId}`}
                   </Text>
                   <Button
                     variant="anchor"
                     className="copyPublishLink"
                     onClick={() => {
-                      writeText(`https://monograph.notesnook.com/${publishId}`);
+                      writeText(`https://monogr.ph/${publishId}`);
                     }}
                   >
                     <Copy size={20} color="accent" />

apps/web/src/components/search/index.jsx

@@ -29,7 +29,7 @@ function SearchBox({ onSearch }) {
       id="search"
       name="search"
       type="text"
-      sx={{ m: 0, mx: 2, mt: 1 }}
+      sx={{ m: 0, mx: 2, mt: 1, mb: 1 }}
       placeholder="Type your query here"
       onChange={debounce((e) => onSearch(e.target.value), 250)}
       action={{

apps/web/src/components/status-bar/index.tsx

@@ -34,7 +34,7 @@ import {
 import { useStore as useUserStore } from "../../stores/user-store";
 import { useStore as useAppStore } from "../../stores/app-store";
 import TimeAgo from "../time-ago";
-import { hardNavigate, hashNavigate, navigate } from "../../navigation";
+import { hardNavigate, hashNavigate } from "../../navigation";
 import { useAutoUpdater, UpdateStatus } from "../../hooks/use-auto-updater";
 import {
   showIssueDialog,
@@ -67,40 +67,33 @@ function StatusBar() {
       {isFocusMode ? (
         <Flex />
       ) : (
-        <Flex>
+        <Flex sx={{ gap: 1 }}>
           {isLoggedIn ? (
             <>
-              <Button
-                onClick={() =>
-                  user?.isEmailConfirmed
-                    ? navigate("/settings")
-                    : hashNavigate("/email/verify")
-                }
-                variant="statusitem"
-                sx={{
-                  alignItems: "center",
-                  justifyContent: "center",
-                  display: "flex"
-                }}
-              >
-                <Circle
-                  size={7}
-                  color={
-                    user?.isEmailConfirmed
-                      ? "var(--icon-success)"
-                      : "var(--icon-error)"
-                  }
-                />
-                <Text
-                  className="selectable"
-                  variant="subBody"
-                  ml={1}
-                  sx={{ color: "paragraph" }}
+              {user?.isEmailConfirmed ? (
+                <Circle size={7} color={"var(--icon-success)"} />
+              ) : (
+                <Button
+                  onClick={() => hashNavigate("/email/verify")}
+                  variant="statusitem"
+                  sx={{
+                    alignItems: "center",
+                    justifyContent: "center",
+                    display: "flex",
+                    height: "100%"
+                  }}
                 >
-                  {user?.email}
-                  {user?.isEmailConfirmed ? "" : " (not verified)"}
-                </Text>
-              </Button>
+                  <Circle size={7} color={"var(--icon-error)"} />
+                  <Text
+                    className="selectable"
+                    variant="subBody"
+                    ml={1}
+                    sx={{ color: "paragraph" }}
+                  >
+                    Email not confirmed
+                  </Text>
+                </Button>
+              )}
 
               <SyncStatus />
             </>

apps/web/src/components/trash-item/index.tsx

@@ -59,7 +59,9 @@ function TrashItem(props: TrashItemProps) {
       menuItems={menuItems}
       onClick={() => {
         if (item.itemType === "note")
-          hashNavigate(`/notes/${item.id}/edit`, { replace: true });
+          !item.locked
+            ? hashNavigate(`/notes/${item.id}/edit`, { replace: true })
+            : showToast("error", "Locked notes cannot be previewed in trash.");
       }}
     />
   );

apps/web/src/dialogs/feature-dialog.tsx

@@ -91,13 +91,19 @@ const features: Record<FeatureKeys, Feature> = {
         ]
       : [
           {
-            title: "Date time shortcuts in note title",
+            title: "Daily trash cleanup interval",
             subtitle:
-              "You can now use date time shortcuts (/now, /date & /time) in note & task list titles."
+              "You can now set the trash cleanup interval to Daily in addition to Weekly, Monthly & Yearly."
           },
           {
-            title: "Restore backups without an account",
-            subtitle: "You can now restore backups without logging in."
+            title: "Organized bulk exports",
+            subtitle:
+              "Bulk exports are now automatically sorted/organized into folders based on your Notebook/Topic organization."
+          },
+          {
+            title: "New domain for Monographs",
+            subtitle:
+              "Monographs will now be published to monogr.ph instead of monograph.notesnook.com. Don't worry, all your published notes will automatically redirect."
           }
         ],
     cta: {

apps/web/src/dialogs/onboarding-dialog.jsx

@@ -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 { Text, Flex, Button, Image, Box } from "@theme-ui/components";
+import { Text, Flex, Button, Image, Box, Link } from "@theme-ui/components";
 import Dialog from "../components/dialog";
 import {
   Pro,
@@ -417,9 +417,21 @@ function CrossPlatform() {
   return (
     <Flex my={4} sx={{ alignItems: "center" }}>
       {isMacStoreApp() ? null : (
-        <Image src={GooglePlay} sx={{ flexShrink: 0, width: 135 }} />
+        <Link
+          href="https://play.google.com/store/apps/details?id=com.streetwriters.notesnook"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          <Image src={GooglePlay} sx={{ flexShrink: 0, width: 135 }} />
+        </Link>
       )}
-      <Image src={AppleStore} sx={{ flexShrink: 0, width: 110 }} />
+      <Link
+        href="https://apps.apple.com/us/app/notesnook-take-private-notes/id1544027013"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        <Image src={AppleStore} sx={{ flexShrink: 0, width: 110 }} />
+      </Link>
     </Flex>
   );
 }

apps/web/src/dialogs/password-dialog.jsx

@@ -108,7 +108,8 @@ function PasswordDialog(props) {
               sx={{
                 fontSize: "body",
                 fontFamily: "body",
-                alignItems: "center"
+                alignItems: "center",
+                color: "paragraph"
               }}
             >
               <Checkbox id={check.key} name={check.key} />

apps/web/src/dialogs/reminder-preview-dialog.tsx

@@ -105,6 +105,7 @@ export default function ReminderPreviewDialog(
                 id: reminder.id,
                 snoozeUntil: Date.now() + time.interval
               });
+              props.onClose(false);
             }}
             sx={{
               borderRadius: 100,

apps/web/src/dialogs/settings/backup-export-settings.ts

@@ -67,8 +67,9 @@ export const BackupExportSettings: SettingsGroup[] = [
             type: "button",
             title: "Restore",
             action: async () => {
-              await importBackup();
-              await useAppStore.getState().refresh();
+              if (await importBackup()) {
+                await useAppStore.getState().refresh();
+              }
             },
             variant: "secondary"
           }
@@ -179,6 +180,11 @@ export const BackupExportSettings: SettingsGroup[] = [
               { value: "-", title: "Select format" },
               { value: "txt", title: "Text" },
               { value: "md", title: "Markdown", premium: true },
+              {
+                value: "md-frontmatter",
+                title: "Markdown + Frontmatter",
+                premium: true
+              },
               { value: "html", title: "HTML", premium: true }
             ],
             selectedOption: () => "-",
@@ -186,7 +192,7 @@ export const BackupExportSettings: SettingsGroup[] = [
               if (!db.notes || value === "-") return;
               if (await verifyAccount())
                 await exportNotes(
-                  value as "txt" | "md" | "html",
+                  value as "txt" | "md" | "html" | "md-frontmatter",
                   db.notes.all.map((n) => n.id)
                 );
             }

apps/web/src/dialogs/settings/behaviour-settings.ts

@@ -125,6 +125,7 @@ export const BehaviourSettings: SettingsGroup[] = [
             selectedOption: () =>
               useSettingStore.getState().trashCleanupInterval.toString(),
             options: [
+              { value: "1", title: "Daily" },
               { value: "7", title: "Weekly" },
               { value: "30", title: "Monthly" },
               { value: "365", title: "Yearly" },

apps/web/src/dialogs/settings/components/importer.tsx

@@ -75,7 +75,7 @@ export function Importer() {
         <>
           <CheckCircleOutline color="accent" sx={{ mt: 150 }} />
           <Text variant="body" my={2} sx={{ textAlign: "center" }}>
-            Import successful. {errors.length} errors occured.
+            Import completed. {errors.length} errors occured.
           </Text>
           <Button
             variant="secondary"
@@ -127,6 +127,8 @@ export function Importer() {
                 <Link
                   href="https://help.notesnook.com/importing-notes/import-notes-from-evernote"
                   target="_blank"
+                  rel="noopener noreferrer"
+                  sx={{ color: "accent" }}
                 >
                   import guide
                 </Link>{" "}
@@ -134,23 +136,25 @@ export function Importer() {
               </Text>
             </Flex>
             <Button
+              variant="accent"
               onClick={async () => {
                 setIsDone(false);
                 setIsImporting(true);
 
                 await db.syncer?.acquireLock(async () => {
                   try {
-                    for await (const {
-                      count,
-                      filesRead,
-                      totalFiles
-                    } of importFiles(files)) {
-                      if (notesCounter.current)
-                        notesCounter.current.innerText = `${count}`;
-                      if (importProgress.current)
-                        importProgress.current.style.width = `${
-                          (filesRead / totalFiles) * 100
-                        }%`;
+                    for await (const message of importFiles(files)) {
+                      switch (message.type) {
+                        case "error":
+                          setErrors((errors) => [...errors, message.error]);
+                          break;
+                        case "progress": {
+                          const { count } = message;
+                          if (notesCounter.current)
+                            notesCounter.current.innerText = `${count}`;
+                          break;
+                        }
+                      }
                     }
                   } catch (e) {
                     console.error(e);

apps/web/src/dialogs/settings/components/subscription-status.tsx

@@ -196,40 +196,27 @@ export function SubscriptionStatus() {
                 Request a refund
               </Button>
             </>
-          ) : isBasic ? (
-            <>
-              <Button
-                variant="accent"
-                onClick={async () => {
-                  showBuyDialog();
-                }}
-              >
-                Upgrade to Pro
-              </Button>
-              <Button
-                variant="secondary"
-                onClick={activateTrial}
-                sx={{ bg: "background" }}
-              >
-                {isActivatingTrial ? (
-                  <Loading size={16} />
-                ) : (
-                  "Try free for 14 days"
-                )}
-              </Button>
-            </>
-          ) : isTrial ? (
-            <>
-              <Button
-                variant="accent"
-                onClick={async () => {
-                  showBuyDialog();
-                }}
-              >
-                Upgrade to Pro
-              </Button>
-            </>
           ) : null}
+          {!isPro && (
+            <>
+              <Button variant="accent" onClick={() => showBuyDialog()}>
+                {isProCancelled ? "Resubscribe" : "Upgrade to Pro"}
+              </Button>
+              {isBasic && (
+                <Button
+                  variant="secondary"
+                  onClick={activateTrial}
+                  sx={{ bg: "background" }}
+                >
+                  {isActivatingTrial ? (
+                    <Loading size={16} />
+                  ) : (
+                    "Try free for 14 days"
+                  )}
+                </Button>
+              )}
+            </>
+          )}
         </Flex>
       </Flex>
       {isBasic ? <Features /> : null}

apps/web/src/dialogs/settings/other-settings.ts

@@ -75,16 +75,17 @@ export const AboutSettings: SettingsGroup[] = [
       {
         key: "source-code",
         title: "Source code",
-        description: "All the source code for Notesnook is available & open for everyone on GitHub.",
+        description:
+          "All the source code for Notesnook is available & open for everyone on GitHub.",
         components: [
           {
             type: "button",
             action: () => {
-                window.open(
-                  "https://github.com/streetwriters/notesnook",
-                  "_blank"
-                );
-              },
+              window.open(
+                "https://github.com/streetwriters/notesnook",
+                "_blank"
+              );
+            },
             title: "View source code",
             variant: "secondary"
           }
@@ -234,6 +235,23 @@ export const LegalSettings: SettingsGroup[] = [
             variant: "secondary"
           }
         ]
+      },
+      {
+        key: "license",
+        title: "License",
+        description: "GNU GENERAL PUBLIC LICENSE Version 3",
+        components: [
+          {
+            type: "button",
+            action: () =>
+              void window.open(
+                "https://github.com/streetwriters/notesnook/blob/master/LICENSE",
+                "_blank"
+              ),
+            title: "Read License",
+            variant: "secondary"
+          }
+        ]
       }
     ]
   }

apps/web/src/hooks/use-keyboard-list-navigation.ts

@@ -128,7 +128,7 @@ export function useKeyboardListNavigation(
           focusItemAt(nextIndex);
           return true;
         },
-        "Ctrl-a": () => {
+        "Mod-a": () => {
           resetSelection();
           for (let i = 0; i < length; ++i) select(i);
           return true;

apps/web/src/interfaces/fs.ts

@@ -361,6 +361,7 @@ async function multiPartUploadFile(
     );
   };
 
+  onUploadProgress({ bytes: 0, loaded: 0 });
   for (let i = uploadedChunks.length; i < TOTAL_PARTS; ++i) {
     const blob = await fileHandle.readChunks(
       i * UPLOAD_PART_REQUIRED_CHUNKS,
@@ -372,7 +373,7 @@ async function multiPartUploadFile(
       .request({
         url,
         method: "PUT",
-        headers: { "Content-Type": "" },
+        headers: { "Content-Type": "", "X-Content-Length": data.byteLength },
         signal,
         data,
         onUploadProgress
@@ -393,6 +394,8 @@ async function multiPartUploadFile(
     });
     await fileHandle.addAdditionalData("uploadedChunks", uploadedChunks);
     await fileHandle.addAdditionalData("uploadedBytes", uploadedBytes);
+
+    onUploadProgress({ bytes: 0, loaded: blob.size });
   }
 
   await axios

apps/web/src/interfaces/storage.ts

@@ -70,6 +70,10 @@ export class NNStorage {
     return this.database.delete(key);
   }
 
+  removeMulti(keys: string[]) {
+    return this.database.deleteMany(keys);
+  }
+
   clear() {
     return this.database.clear();
   }

apps/web/src/navigation/hash-routes.tsx

@@ -150,5 +150,6 @@ export default hashroutes;
 export type HashRoute = keyof typeof hashroutes;
 
 function afterAction() {
-  window.location.hash = "";
+  hashNavigate("/", { replace: true, notify: false });
+  if (!history.state.replace) history.back();
 }