mobile: fix wrong trial end date shown in settings

mobile: fix app crash when trying to restore an invalid file

.github/workflows/android.e2e.yml

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

.github/workflows/android.publish.yml

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

.github/workflows/desktop.tests.yml

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

.github/workflows/ios.publish.yml

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

.github/workflows/themes.publish.yml

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

.vscode/settings.json

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

apps/desktop/package.json

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

apps/mobile/.detoxrc.js

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

apps/mobile/android/app/build.gradle

@@ -1,6 +1,7 @@
 apply plugin: "com.android.application"
 apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
+apply plugin: 'kotlin-parcelize'
 
 apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
 
@@ -124,7 +125,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode 3079
+        versionCode 3088
         versionName getNpmVersion()
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

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

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

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

@@ -20,7 +20,7 @@ import com.zoontek.rnbootsplash.RNBootSplash;
 
 public class MainActivity extends ReactActivity {
   @Override
-    protected void onCreate(Bundle savedInstanceState) {
+  protected void onCreate(Bundle savedInstanceState) {
     RNBootSplash.init(this, R.style.BootTheme);
 
     super.onCreate(null);
@@ -32,19 +32,6 @@ public class MainActivity extends ReactActivity {
       startService(new Intent(getBaseContext(), OnClearFromRecentService.class));
     } catch (Exception ignored) {}
 
-    if (Build.VERSION.SDK_INT >= 35) {
-      final View rootView = findViewById(android.R.id.content);
-      ViewCompat.setOnApplyWindowInsetsListener(rootView, (v, insets) -> {
-        Insets innerPadding = insets.getInsets(WindowInsetsCompat.Type.ime());
-        rootView.setPadding(
-                innerPadding.left,
-                innerPadding.top,
-                innerPadding.right,
-                innerPadding.bottom
-        );
-        return insets;
-      });
-    }
   }
 
   /**
@@ -60,20 +47,20 @@ public class MainActivity extends ReactActivity {
             DefaultNewArchitectureEntryPoint.getFabricEnabled());
   }
 
-@Override
-public void onNewIntent(Intent intent) {
-  super.onNewIntent(intent);
-  setIntent(intent);
-}
+  @Override
+  public void onNewIntent(Intent intent) {
+    super.onNewIntent(intent);
+    setIntent(intent);
+  }
 
-@Override
-public void onConfigurationChanged(Configuration newConfig) {
-  super.onConfigurationChanged(newConfig);
-  getReactInstanceManager().onConfigurationChanged(this, newConfig);
-  Intent intent = new Intent("onConfigurationChanged");
-  intent.putExtra("newConfig", newConfig);
-  this.sendBroadcast(intent);
-}
+  @Override
+  public void onConfigurationChanged(Configuration newConfig) {
+    super.onConfigurationChanged(newConfig);
+    getReactHost().onConfigurationChanged(this);
+    Intent intent = new Intent("onConfigurationChanged");
+    intent.putExtra("newConfig", newConfig);
+    this.sendBroadcast(intent);
+  }
 
   @Override
   protected String getMainComponentName() {

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

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

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

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

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

@@ -1,3 +1,3 @@
 - Bug fixes and minor improvements
 
-Thank you for using Notesnook!
+Thank you for using Notesnook!

apps/mobile/app/app.tsx

@@ -51,8 +51,9 @@ const { appLockEnabled, appLockMode } = SettingsService.get();
 if (appLockEnabled || appLockMode !== "none") {
   useUserStore.getState().lockApp(true);
 }
-
-RNBootSplash.hide();
+RNBootSplash.hide({
+  fade: true
+});
 const App = (props: { configureMode: "note-preview" }) => {
   useAppEvents();
   //@ts-ignore
@@ -63,7 +64,7 @@ const App = (props: { configureMode: "note-preview" }) => {
     setTimeout(async () => {
       await Notifications.get();
       if (SettingsService.get().notifNotes) {
-        Notifications.pinQuickNote(true);
+        Notifications.pinQuickNote();
       }
       TipManager.init();
     }, 100);

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

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

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

@@ -222,15 +222,21 @@ export async function deleteCacheFileByName(name: string) {
 }
 
 export async function deleteDCacheFiles() {
-  await createCacheDir();
-  const files = await RNFetchBlob.fs.ls(cacheDir);
-  for (const file of files) {
-    if (file.includes("_dcache") || file.startsWith("NN_")) {
-      await RNFetchBlob.fs.unlink(file).catch(() => {
-        /* empty */
-      });
+  try {
+    await createCacheDir();
+    const files = await RNFetchBlob.fs.ls(cacheDir);
+    for (const file of files) {
+      if (
+        file.includes("_dcache") ||
+        file.startsWith("NN_") ||
+        file.endsWith(".pdf")
+      ) {
+        await RNFetchBlob.fs.unlink(file).catch(() => {
+          /* empty */
+        });
+      }
     }
-  }
+  } catch (e) {}
 }
 
 export async function getCachePathForFile(filename: string) {

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

@@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { RequestOptions } from "@notesnook/core";
-import { Platform } from "react-native";
+import { isImage, RequestOptions } from "@notesnook/core";
+import { PermissionsAndroid, Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
 import { ToastManager } from "../../services/event-manager";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
@@ -31,6 +31,7 @@ import {
   FileSizeResult,
   getUploadedFileSize
 } from "./utils";
+import Upload from "@ammarahmed/react-native-upload";
 
 export async function uploadFile(
   filename: string,
@@ -64,47 +65,87 @@ export async function uploadFile(
       );
     }
 
-    const fileSize = (await RNFetchBlob.fs.stat(filePath)).size;
+    const fileInfo = await RNFetchBlob.fs.stat(filePath);
 
     const remoteFileSize = await getUploadedFileSize(filename);
     if (remoteFileSize === FileSizeResult.Error) return false;
 
-    if (remoteFileSize > FileSizeResult.Empty && remoteFileSize === fileSize) {
+    if (
+      remoteFileSize > FileSizeResult.Empty &&
+      remoteFileSize === fileInfo.size
+    ) {
       DatabaseLogger.log(`File ${filename} is already uploaded.`);
       return true;
     }
 
-    DatabaseLogger.info(`Starting upload: ${filename}`);
+    let attachmentInfo = await db.attachments.attachment(filename);
 
-    const uploadRequest = RNFetchBlob.config({
-      //@ts-ignore
-      IOSBackgroundTask: !globalThis["IS_SHARE_EXTENSION"]
-    })
-      .fetch(
-        "PUT",
-        url,
-        {
-          ...headers,
-          "content-type": ""
-        },
-        RNFetchBlob.wrap(filePath)
-      )
-      .uploadProgress((sent, total) => {
-        useAttachmentStore
-          .getState()
-          .setProgress(sent, total, filename, 0, "upload");
-        DatabaseLogger.info(
-          `File upload progress: ${filename}, ${sent}/${total}`
-        );
-      });
+    DatabaseLogger.info(
+      `Starting upload of ${filename} at path: ${fileInfo.path} ${fileInfo.size}`
+    );
 
+    if (Platform.OS === "android") {
+      const status = await PermissionsAndroid.request(
+        "android.permission.POST_NOTIFICATIONS"
+      );
+      if (status !== "granted") {
+        ToastManager.show({
+          message: `The permission to show file upload notification was disallowed by the user.`,
+          type: "info"
+        });
+      }
+    }
+
+    const upload = Upload.create({
+      customUploadId: filename,
+      path: Platform.OS === "ios" ? "file://" + fileInfo.path : fileInfo.path,
+      url: url,
+      method: "PUT",
+      headers: {
+        ...headers,
+        "content-type": "application/octet-stream"
+      },
+      appGroup: IOS_APPGROUPID,
+      notification: {
+        filename:
+          attachmentInfo && isImage(attachmentInfo?.mimeType)
+            ? "image"
+            : attachmentInfo?.filename || "file",
+        enabled: true,
+        enableRingTone: true,
+        autoClear: true
+      }
+    }).onChange((event) => {
+      switch (event.status) {
+        case "running":
+        case "pending":
+          useAttachmentStore
+            .getState()
+            .setProgress(
+              event.uploadedBytes || 0,
+              event.totalBytes || fileInfo.size,
+              filename,
+              0,
+              "upload"
+            );
+          DatabaseLogger.info(
+            `File upload progress: ${filename}, ${event.uploadedBytes}/${
+              event.totalBytes || fileInfo.size
+            }`
+          );
+          break;
+        case "completed":
+          console.log("Upload completed");
+          break;
+      }
+    });
+    const result = await upload.start();
     cancelToken.cancel = async () => {
       useAttachmentStore.getState().remove(filename);
-      uploadRequest.cancel();
+      upload.cancel();
     };
 
-    const uploadResponse = await uploadRequest;
-    const status = uploadResponse.info().status;
+    const status = result.responseCode || 0;
     const uploaded = status >= 200 && status < 300;
 
     useAttachmentStore.getState().remove(filename);
@@ -114,12 +155,12 @@ export async function uploadFile(
       throw new Error(
         `${status}, name: ${fileInfo.filename}, length: ${
           fileInfo.size
-        }, info: ${JSON.stringify(uploadResponse.info())}`
+        }, info: ${JSON.stringify(result.error)}`
       );
     }
-    const attachment = await db.attachments.attachment(filename);
-    if (!attachment) return false;
-    await checkUpload(filename, requestOptions.chunkSize, attachment.size);
+    attachmentInfo = await db.attachments.attachment(filename);
+    if (!attachmentInfo) return false;
+    await checkUpload(filename, requestOptions.chunkSize, attachmentInfo.size);
     DatabaseLogger.info(`File upload status: ${filename}, ${status}`);
     return uploaded;
   } catch (e) {

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

@@ -155,16 +155,16 @@ export async function checkUpload(
   expectedSize: number
 ) {
   const size = await getUploadedFileSize(filename);
-  const totalChunks = Math.ceil(size / chunkSize);
+  const totalChunks = Math.ceil(size / (chunkSize + ABYTES));
   const decryptedLength = size - totalChunks * ABYTES;
   const error =
     size === 0
       ? `File size is 0.`
       : size === -1
-      ? `File verification check failed.`
-      : expectedSize !== decryptedLength
-      ? `File size mismatch. Expected ${size} bytes but got ${decryptedLength} bytes.`
-      : undefined;
+        ? `File verification check failed.`
+        : expectedSize !== decryptedLength
+          ? `File size mismatch. Expected ${size} bytes but got ${decryptedLength} bytes.`
+          : undefined;
   if (error) throw new Error(error);
 }
 
@@ -189,3 +189,7 @@ export async function checkAndCreateDir(path: string) {
   }
   return dir;
 }
+
+export const santizeUri = (uri: string) => {
+  return Platform.OS === "ios" ? decodeURI(uri).replace("file:///", "/") : uri;
+};

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

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

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

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

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

@@ -136,12 +136,12 @@ const BaseDialog = ({
             backgroundColor: background
               ? background
               : transparent
-              ? "transparent"
-              : "rgba(0,0,0,0.3)"
+                ? "transparent"
+                : "rgba(0,0,0,0.3)"
           }}
         >
           <KeyboardAvoidingView
-            enabled={!floating && Platform.OS === "ios" && !avoidKeyboardResize}
+            enabled={!floating && !avoidKeyboardResize}
             behavior="padding"
           >
             <BouncingView
@@ -155,8 +155,8 @@ const BaseDialog = ({
                   justifyContent: centered
                     ? "center"
                     : bottom
-                    ? "flex-end"
-                    : "flex-start"
+                      ? "flex-end"
+                      : "flex-start"
                 }
               ]}
             >

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

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

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

@@ -96,22 +96,22 @@ export class VaultDialog extends Component {
     this.title = !this.state.novault
       ? strings.createVault()
       : this.state.fingerprintAccess
-      ? strings.vaultFingerprintUnlock()
-      : this.state.revokeFingerprintAccess
-      ? strings.revokeVaultFingerprintUnlock()
-      : this.state.changePassword
-      ? strings.changeVaultPassword()
-      : this.state.noteLocked
-      ? this.state.deleteNote
-        ? strings.deleteNote()
-        : this.state.share
-        ? strings.shareNote()
-        : this.state.copyNote
-        ? strings.copyNote()
-        : this.state.goToEditor
-        ? strings.goToEditor()
-        : strings.goToEditor()
-      : strings.lockNote();
+        ? strings.vaultFingerprintUnlock()
+        : this.state.revokeFingerprintAccess
+          ? strings.revokeVaultFingerprintUnlock()
+          : this.state.changePassword
+            ? strings.changeVaultPassword()
+            : this.state.noteLocked
+              ? this.state.deleteNote
+                ? strings.deleteNote()
+                : this.state.share
+                  ? strings.shareNote()
+                  : this.state.copyNote
+                    ? strings.copyNote()
+                    : this.state.goToEditor
+                      ? strings.goToEditor()
+                      : strings.goToEditor()
+              : strings.lockNote();
   }
 
   componentDidMount() {
@@ -337,12 +337,13 @@ export class VaultDialog extends Component {
             );
           });
         }
-
         eSendEvent("vaultUpdated");
         this.setState({
           loading: false
         });
-        this.close();
+        setTimeout(() => {
+          this.close();
+        }, 100);
       } else {
         ToastManager.show({
           heading: strings.passwordIncorrect(),
@@ -353,9 +354,6 @@ export class VaultDialog extends Component {
     } catch (e) {
       console.error(e);
     }
-    this.setState({
-      loading: false
-    });
   };
 
   clearVault = async () => {
@@ -874,24 +872,24 @@ export class VaultDialog extends Component {
               deleteVault
                 ? strings.delete()
                 : clearVault
-                ? strings.clear()
-                : fingerprintAccess
-                ? strings.enable()
-                : this.state.revokeFingerprintAccess
-                ? strings.revoke()
-                : changePassword
-                ? strings.change()
-                : this.state.noteLocked
-                ? deleteNote
-                  ? strings.delete()
-                  : share
-                  ? strings.share()
-                  : goToEditor
-                  ? strings.open()
-                  : strings.unlock()
-                : !note.id
-                ? strings.create()
-                : strings.lock()
+                  ? strings.clear()
+                  : fingerprintAccess
+                    ? strings.enable()
+                    : this.state.revokeFingerprintAccess
+                      ? strings.revoke()
+                      : changePassword
+                        ? strings.change()
+                        : this.state.noteLocked
+                          ? deleteNote
+                            ? strings.delete()
+                            : share
+                              ? strings.share()
+                              : goToEditor
+                                ? strings.open()
+                                : strings.unlock()
+                          : !note.id
+                            ? strings.create()
+                            : strings.lock()
             }
           />
         </View>

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

@@ -31,6 +31,7 @@ import { Gesture, GestureDetector } from "react-native-gesture-handler";
 import Animated, {
   runOnJS,
   SharedValue,
+  SnappySpringConfig,
   useAnimatedReaction,
   useAnimatedStyle,
   useSharedValue,
@@ -110,7 +111,6 @@ export const FluidPanels = forwardRef<TabsRef, TabProps>(function FluidTabs(
   const containerWidth = widths
     ? widths.sidebar + widths.list + widths.editor
     : dimensions.width;
-
   const drawerPosition = 0;
   const homePosition = widths.sidebar;
   const editorPosition = widths.sidebar + widths.list;
@@ -354,13 +354,10 @@ export const FluidPanels = forwardRef<TabsRef, TabProps>(function FluidTabs(
       const finalValue = isSwipeLeft
         ? translateX.value - velocityX / 40.0
         : translateX.value + velocityX / 40.0;
-
+      const velocity = velocityX / 5000;
       const animationConfig: WithSpringConfig = {
-        velocity: velocityX,
-        mass: 0.5,
-        overshootClamping: true,
-        damping: 800,
-        stiffness: 800
+        velocity: velocity,
+        ...SnappySpringConfig
       };
 
       if (finalValue < homePosition) {
@@ -443,15 +440,7 @@ export const FluidPanels = forwardRef<TabsRef, TabProps>(function FluidTabs(
             width: containerWidth,
             flexDirection: "row"
           },
-          deviceMode === "tablet"
-            ? {
-                transform: [
-                  {
-                    translateX: 0
-                  }
-                ]
-              }
-            : animatedStyles
+          animatedStyles
         ]}
       >
         {children}

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

@@ -994,7 +994,7 @@ const PricingPlanCard = ({
           PremiumService.get() &&
           (pricingPlans?.user?.subscription?.productId ===
             (product as RNIap.Subscription)?.productId ||
-            pricingPlans?.user?.subscription?.productId.startsWith(
+            pricingPlans?.user?.subscription?.productId?.startsWith(
               (product as RNIap.Subscription)?.productId
             ));
         pricingPlans?.selectPlan(

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

@@ -352,7 +352,7 @@ const ProductItem = (props: {
     props.pricingPlans.isSubscribed() &&
     (props.pricingPlans.user?.subscription?.productId ===
       (product as RNIap.Subscription)?.productId ||
-      props.pricingPlans.user?.subscription?.productId.startsWith(
+      props.pricingPlans.user?.subscription?.productId?.startsWith(
         (product as RNIap.Subscription)?.productId
       ) ||
       props.pricingPlans.user?.subscription?.productId ===

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

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

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

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

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

@@ -104,15 +104,12 @@ function _MenuItem({
   const _onPress = () => {
     if (useSideBarDraggingStore.getState().dragging) return;
     if (item.onPress) return item.onPress(item);
-
+    Navigation.closeDrawer();
     if (useNavigationStore.getState().currentRoute !== item.id) {
       Navigation.navigate(item.id as keyof RouteParams, {
         canGoBack: false
       });
     }
-    setImmediate(() => {
-      Navigation.closeDrawer();
-    });
   };
 
   return (
@@ -154,8 +151,8 @@ function _MenuItem({
               item.icon === "crown"
                 ? colors.static.yellow
                 : isFocused
-                ? colors.selected.icon
-                : colors.secondary.icon
+                  ? colors.selected.icon
+                  : colors.secondary.icon
             }
             size={AppFontSize.md}
           />

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

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

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

@@ -42,7 +42,7 @@ const SheetWrapper = ({
   closeOnTouchBackdrop = true,
   onHasReachedTop,
   overlay,
-  overlayOpacity = 0.3,
+  overlayOpacity = 0.7,
   enableGesturesInScrollView = false,
   bottomPadding = true,
   keyboardHandlerDisabled

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

@@ -107,6 +107,7 @@ import { fluidTabsRef } from "../utils/global-refs";
 import { NotesnookModule } from "../utils/notesnook-module";
 import { sleep } from "../utils/time";
 import useFeatureManager from "./use-feature-manager";
+import { deleteDCacheFiles } from "../common/filesystem/io";
 
 const onCheckSyncStatus = async (type: SyncStatusEvent) => {
   const { disableSync, disableAutoSync } = SettingsService.get();
@@ -176,6 +177,7 @@ const onAppOpenedFromURL = async (event: { url: string }) => {
       if (id) {
         const note = await db.notes.note(id);
         if (note) {
+          editorState().initialLoadCalled = true;
           eSendEvent(eOnLoadNote, {
             item: note
           });
@@ -454,11 +456,9 @@ const initializeDatabase = async (password?: string) => {
     await setAppMessage();
     useSettingStore.getState().setAppLoading(false);
     Notifications.setupReminders(true);
-    if (SettingsService.get().notifNotes) {
-      Notifications.pinQuickNote(false);
-    }
     DatabaseLogger.info("Database initialized");
     Notifications.restorePinnedNotes();
+    deleteDCacheFiles();
   }
   Walkthrough.init();
 };

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

@@ -660,9 +660,25 @@ const usePricingPlans = (options?: PricingPlansOptions) => {
     }
   }
 
+  function isSubscribedToPlan(planId: string) {
+    if (!PremiumService.get()) return false;
+    return user?.subscription?.productId?.includes(planId);
+  }
+
+  function isSubscribedToProduct(productId: string) {
+    if (!PremiumService.get()) return false;
+    return (
+      user?.subscription?.productId &&
+      (user?.subscription?.productId === productId ||
+        user?.subscription?.productId?.startsWith(productId))
+    );
+  }
+
   return {
     currentPlan: pricingPlans.find((p) => p.id === currentPlan),
     pricingPlans: plans,
+    isSubscribedToPlan,
+    isSubscribedToProduct,
     getStandardPrice: getLocalizedPrice,
     loadingPlans,
     loading,

apps/mobile/app/navigation/fluid-panels-view.tsx

@@ -29,7 +29,7 @@ import React, {
   useRef,
   useState
 } from "react";
-import { Dimensions, LayoutChangeEvent, Platform, View } from "react-native";
+import { LayoutChangeEvent, View } from "react-native";
 import Orientation, {
   OrientationType,
   useDeviceOrientationChange
@@ -39,7 +39,6 @@ import Animated, {
   useSharedValue,
   withTiming
 } from "react-native-reanimated";
-import { SafeAreaView } from "react-native-safe-area-context";
 import { notesnook } from "../../e2e/test.ids";
 import { db } from "../common/database";
 import { FluidPanels } from "../components/fluid-panels";
@@ -69,15 +68,13 @@ import {
   eOpenFullscreenEditor,
   eUnlockNote
 } from "../utils/events";
-import { editorRef, fluidTabsRef } from "../utils/global-refs";
+import { valueLimiter } from "../utils/functions";
+import { fluidTabsRef } from "../utils/global-refs";
 import { AppNavigationStack } from "./navigation-stack";
+import type { PaneWidths } from "../screens/editor/wrapper";
 
 const MOBILE_SIDEBAR_SIZE = 0.85;
 
-const valueLimiter = (value: number, min: number, max: number) => {
-  return value < min ? min : value > max ? max : value;
-};
-
 let SideMenu: any = null;
 let EditorWrapper: any = null;
 
@@ -93,7 +90,6 @@ export const FluidPanelsView = React.memo(
     const insets = useGlobalSafeAreaInsets();
     const animatedOpacity = useSharedValue(0);
     const animatedTranslateY = useSharedValue(-9999);
-
     const overlayRef = useRef<Animated.View>(null);
     const [orientation, setOrientation] = useState<OrientationType>(
       Orientation.getInitialOrientation()
@@ -102,16 +98,21 @@ export const FluidPanelsView = React.memo(
     const [isLoading, setIsLoading] = useState(false);
 
     useDeviceOrientationChange((o) => {
-      setOrientation(o);
+      if (
+        o !== OrientationType.UNKNOWN &&
+        o !== OrientationType["FACE-UP"] &&
+        o !== OrientationType["FACE-DOWN"] &&
+        o !== OrientationType["PORTRAIT-UPSIDEDOWN"]
+      ) {
+        setOrientation(o);
+      }
     });
 
-    const isLandscape = orientation.includes("LANDSCAPE");
-
     useEffect(() => {
       if (!appLoading) {
         setTimeout(() => {
           setIsLoading(false);
-        }, 500);
+        }, 200);
       }
     }, [appLoading]);
 
@@ -147,16 +148,6 @@ export const FluidPanelsView = React.memo(
       if (deviceMode === "smallTablet") {
         fluidTabsRef.current?.openDrawer(false);
       }
-      editorRef.current?.setNativeProps({
-        style: {
-          width: dimensions.width,
-          zIndex: 999,
-          paddingHorizontal:
-            deviceMode === "smallTablet"
-              ? dimensions.width * 0
-              : dimensions.width * 0.15
-        }
-      });
     }, [deviceMode, dimensions.width, setFullscreen]);
 
     const closeFullScreenEditor = useCallback(
@@ -169,17 +160,6 @@ export const FluidPanelsView = React.memo(
         editorController.current?.commands.updateSettings({
           fullscreen: false
         });
-        editorRef.current?.setNativeProps({
-          style: {
-            width:
-              _deviceMode === "smallTablet"
-                ? dimensions.width -
-                  valueLimiter(dimensions.width * 0.4, 300, 450)
-                : dimensions.width * 0.48,
-            zIndex: null,
-            paddingHorizontal: 0
-          }
-        });
         if (_deviceMode === "smallTablet") {
           fluidTabsRef.current?.goToIndex(1, false);
         }
@@ -221,38 +201,8 @@ export const FluidPanelsView = React.memo(
       (current: string | null, size: { width: number; height: number }) => {
         setDeviceModeState(current);
 
-        const needsLayout = current !== deviceMode;
-
-        if (fullscreen && current !== "mobile") {
-          // Runs after size is set via state.
-          setTimeout(() => {
-            editorRef.current?.setNativeProps({
-              style: {
-                width: size.width,
-                zIndex: 999,
-                paddingHorizontal:
-                  current === "smallTablet" ? size.width * 0 : size.width * 0.15
-              }
-            });
-          }, 1);
-        } else {
-          if (fullscreen) eSendEvent(eCloseFullscreenEditor, current);
-          editorRef.current?.setNativeProps({
-            style: {
-              position: "relative",
-              width:
-                current === "tablet"
-                  ? size.width * 0.48
-                  : current === "smallTablet"
-                    ? size.width - valueLimiter(size.width * 0.4, 300, 450)
-                    : size.width,
-              zIndex: null,
-              paddingHorizontal: 0
-            }
-          });
-        }
-        if (!needsLayout) {
-          return;
+        if (fullscreen && current === "mobile") {
+          eSendEvent(eCloseFullscreenEditor, current);
         }
 
         const state = getAppState();
@@ -264,8 +214,6 @@ export const FluidPanelsView = React.memo(
             case "smallTablet":
               if (!fullscreen) {
                 fluidTabsRef.current?.closeDrawer(false);
-              } else {
-                fluidTabsRef.current?.openDrawer(false);
               }
               break;
             case "mobile":
@@ -274,46 +222,52 @@ export const FluidPanelsView = React.memo(
                 editorState().movedAway === false &&
                 useTabStore.getState().getCurrentNoteId()
               ) {
-                fluidTabsRef.current?.goToIndex(2, false);
+                fluidTabsRef.current?.goToPage("editor", false);
               } else {
-                fluidTabsRef.current?.goToIndex(1, false);
+                fluidTabsRef.current?.goToPage(
+                  fluidTabsRef.current?.page(),
+                  false
+                );
               }
               break;
           }
-        }, 32);
+        }, 0);
       },
       [deviceMode, fullscreen, setDeviceModeState]
     );
 
     const checkDeviceType = React.useCallback(
       (size: { width: number; height: number }) => {
-        setDimensions({
-          width: size.width,
-          height: size.height
-        });
+        if (DDS.width === size.width && orientation === DDS.orientation) return;
         DDS.setSize(size, orientation);
         const nextDeviceMode = DDS.isLargeTablet()
           ? "tablet"
           : DDS.isSmallTab
             ? "smallTablet"
             : "mobile";
-
         setDeviceMode(nextDeviceMode, size);
       },
       [orientation, setDeviceMode, setDimensions]
     );
 
+    useEffect(() => {
+      if (orientation !== "UNKNOWN") {
+        checkDeviceType(dimensions);
+      }
+    }, [orientation, dimensions]);
+
     const _onLayout = React.useCallback(
       (event: LayoutChangeEvent) => {
         const size = event?.nativeEvent?.layout;
-        if (!size || (size.width === dimensions.width && deviceMode !== null)) {
-          DDS.setSize(size, orientation);
-          setDeviceMode(deviceMode, size);
-          checkDeviceType(size);
-          return;
+        setDimensions({
+          width: size.width,
+          height: size.height
+        });
+        if (size.width > size.height) {
+          setOrientation(OrientationType["LANDSCAPE-RIGHT"]);
+        } else {
+          setOrientation(OrientationType["PORTRAIT"]);
         }
-
-        checkDeviceType(size);
       },
       [
         checkDeviceType,
@@ -324,11 +278,6 @@ export const FluidPanelsView = React.memo(
       ]
     );
 
-    if (!deviceMode) {
-      const size = Dimensions.get("window");
-      checkDeviceType(size);
-    }
-
     const PANE_OFFSET = useMemo(
       () => ({
         mobile: {
@@ -356,7 +305,7 @@ export const FluidPanelsView = React.memo(
       [dimensions.width, fullscreen]
     );
 
-    const PANE_WIDTHS = useMemo(
+    const PANE_WIDTHS: PaneWidths = useMemo(
       () => ({
         mobile: {
           sidebar: dimensions.width * MOBILE_SIDEBAR_SIZE,
@@ -382,6 +331,7 @@ export const FluidPanelsView = React.memo(
       (scrollOffset: number) => {
         if (!deviceMode) return;
         hideAllTooltips();
+
         if (
           scrollOffset >
           PANE_OFFSET[deviceMode as keyof typeof PANE_OFFSET].sidebar - 10
@@ -409,7 +359,7 @@ export const FluidPanelsView = React.memo(
       };
     }, []);
 
-    if (!isLoading) {
+    if (!isLoading && !SideMenu && !EditorWrapper) {
       SideMenu = require("../components/side-menu").SideMenu;
       EditorWrapper = require("../screens/editor/wrapper").EditorWrapper;
     }
@@ -421,15 +371,7 @@ export const FluidPanelsView = React.memo(
         style={{
           height: "100%",
           width: "100%",
-          backgroundColor: colors.primary.background,
-          marginRight:
-            orientation === "LANDSCAPE-RIGHT" && Platform.OS === "ios"
-              ? insets.right
-              : 0,
-          marginLeft:
-            orientation === "LANDSCAPE-LEFT" && Platform.OS === "ios"
-              ? insets.left
-              : 0
+          backgroundColor: colors.primary.background
         }}
       >
         {deviceMode && PANE_WIDTHS[deviceMode as keyof typeof PANE_WIDTHS] ? (
@@ -503,9 +445,7 @@ export const FluidPanelsView = React.memo(
                   style={{
                     flex: 1,
                     paddingTop: insets.top,
-                    paddingBottom: insets.bottom,
-                    paddingLeft: insets.left,
-                    paddingRight: insets.right
+                    paddingBottom: insets.bottom
                   }}
                 >
                   <AppNavigationStack />

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

@@ -273,6 +273,7 @@ let Settings: any = null;
 let ManageTags: any = null;
 let AddReminder: any = null;
 let PayWall: any = null;
+let Wrapped: any = null;
 export const RootNavigation = () => {
   const introCompleted = useSettingStore(
     (state) => state.settings.introCompleted
@@ -384,6 +385,14 @@ export const RootNavigation = () => {
             return PayWall;
           }}
         />
+
+        <RootStack.Screen
+          name="Wrapped"
+          getComponent={() => {
+            Wrapped = Wrapped || require("../screens/wrapped").default;
+            return Wrapped;
+          }}
+        />
       </RootStack.Navigator>
     </NavigationContainer>
   );

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

@@ -62,6 +62,7 @@ import { fluidTabsRef } from "../../utils/global-refs";
 import { strings } from "@notesnook/intl";
 import { i18n } from "@lingui/core";
 import { useVaultStatus } from "../../hooks/use-vault-status";
+import { useSettingStore } from "../../stores/use-setting-store";
 
 const style: ViewStyle = {
   height: "100%",
@@ -231,7 +232,6 @@ const useLockedNoteHandler = () => {
     const unlockWithBiometrics = async () => {
       try {
         if (!tabRef.current?.session?.noteLocked || !tabRef.current) return;
-        console.log("Trying to unlock with biometrics...");
         const credentials = await BiometricService.getCredentials(
           "Unlock note",
           "Unlock note to open it in editor."
@@ -320,12 +320,16 @@ const useLockedNoteHandler = () => {
       }
     };
 
-    const unlock = () => {
+    const unlock = (forced?: boolean) => {
+      const isMovedAway =
+        useSettingStore.getState().deviceMode !== "mobile"
+          ? false
+          : editorState().movedAway;
       if (
-        (tabRef.current?.session?.locked,
+        tabRef.current?.session?.locked &&
         useTabStore.getState().biometryAvailable &&
-          useTabStore.getState().biometryEnrolled &&
-          !editorState().movedAway)
+        useTabStore.getState().biometryEnrolled &&
+        (!isMovedAway || forced)
       ) {
         setTimeout(() => {
           unlockWithBiometrics();
@@ -344,13 +348,15 @@ const useLockedNoteHandler = () => {
     const subs = [
       eSubscribeEvent(eUnlockNote, unlock),
       eSubscribeEvent(eUnlockWithBiometrics, () => {
-        unlock();
+        unlock(true);
       }),
       eSubscribeEvent(eUnlockWithPassword, onSubmit)
     ];
+
     if (
       tabRef.current?.session?.locked &&
-      fluidTabsRef.current?.page() === "editor"
+      (fluidTabsRef.current?.page() === "editor" ||
+        useSettingStore.getState().deviceMode !== "mobile")
     ) {
       unlock();
     }

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

@@ -22,10 +22,10 @@ import { isFeatureAvailable } from "@notesnook/common";
 import { isImage } from "@notesnook/core";
 import { strings } from "@notesnook/intl";
 import {
-  pick as pickFile,
   DocumentPickerOptions,
-  DocumentPickerResponse,
-  keepLocalCopy
+  keepLocalCopy,
+  KeepLocalCopyResponse,
+  pick as pickFile
 } from "@react-native-documents/picker";
 import { basename } from "pathe";
 import { Platform } from "react-native";
@@ -35,31 +35,13 @@ import { DatabaseLogger, db } from "../../../common/database";
 import filesystem from "../../../common/filesystem";
 import { compressToFile } from "../../../common/filesystem/compress";
 import AttachImage from "../../../components/dialogs/attach-image-dialog";
-import {
-  ToastManager,
-  eSendEvent,
-  presentSheet
-} from "../../../services/event-manager";
+import { ToastManager } from "../../../services/event-manager";
 import PremiumService from "../../../services/premium";
 import { useSettingStore } from "../../../stores/use-setting-store";
 import { useUserStore } from "../../../stores/use-user-store";
-import { eCloseSheet } from "../../../utils/events";
 import { useTabStore } from "./use-tab-store";
 import { editorController, editorState } from "./utils";
-
-const showEncryptionSheet = (file: DocumentPickerResponse) => {
-  presentSheet({
-    title: strings.encryptingAttachment(),
-    paragraph: strings.encryptingAttachmentDesc(file.name || ""),
-    icon: "attachment"
-  });
-};
-
-const santizeUri = (uri: string) => {
-  uri = decodeURI(uri);
-  uri = Platform.OS === "ios" ? uri.replace("file:///", "/") : uri;
-  return uri;
-};
+import { santizeUri } from "../../../common/filesystem/utils";
 
 type PickerOptions = {
   noteId?: string;
@@ -80,7 +62,7 @@ const file = async (fileOptions: PickerOptions) => {
     await db.attachments.generateKey();
 
     let file;
-    let fileCopyUri;
+    let fileCopyUri: KeepLocalCopyResponse[0];
     let fileName;
     try {
       useSettingStore.getState().setAppDidEnterBackgroundForAction(true);
@@ -97,12 +79,10 @@ const file = async (fileOptions: PickerOptions) => {
       });
       fileCopyUri = result[0];
     } catch (e) {
+      DatabaseLogger.error(e as Error, "Error picking file");
       return;
     }
 
-    let uri =
-      Platform.OS === "ios" ? fileCopyUri.sourceUri || file.uri : file.uri;
-
     const featureResult = await isFeatureAvailable("fileSize", file.size || 0);
     if (!featureResult.isAllowed) {
       ToastManager.show({
@@ -122,8 +102,7 @@ const file = async (fileOptions: PickerOptions) => {
       return;
     }
 
-    uri = Platform.OS === "ios" ? santizeUri(uri) : uri;
-    showEncryptionSheet(file);
+    let uri = santizeUri(fileCopyUri.localUri);
     const hash = await Sodium.hashFile({
       uri: uri,
       type: "url"
@@ -139,7 +118,8 @@ const file = async (fileOptions: PickerOptions) => {
     ) {
       throw new Error("Failed to attach file");
     }
-    if (Platform.OS === "ios") await RNFetchBlob.fs.unlink(uri);
+
+    await RNFetchBlob.fs.unlink(uri);
 
     if (
       fileOptions.tabId !== undefined &&
@@ -173,10 +153,7 @@ const file = async (fileOptions: PickerOptions) => {
     } else {
       throw new Error("Failed to attach file, no tabId is set");
     }
-
-    eSendEvent(eCloseSheet);
   } catch (e) {
-    eSendEvent(eCloseSheet);
     ToastManager.show({
       heading: (e as Error).message,
       type: "error",
@@ -205,7 +182,9 @@ const camera = async (options: PickerOptions) => {
           options
         );
       })
-      .catch((e) => {});
+      .catch((e) => {
+        console.log(e);
+      });
   } catch (e) {
     ToastManager.show({
       heading: (e as Error).message,

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

@@ -664,7 +664,8 @@ export const useEditorEvents = (
               if (note) {
                 eSendEvent(eOnLoadNote, {
                   item: note,
-                  tabId: editorMessage.tabId
+                  tabId: editorMessage.tabId,
+                  loadedFromEditor: true
                 });
               }
             } else {
@@ -675,7 +676,8 @@ export const useEditorEvents = (
                   if (note) {
                     eSendEvent(eOnLoadNote, {
                       item: note,
-                      tabId: editorMessage.tabId
+                      tabId: editorMessage.tabId,
+                      loadedFromEditor: true
                     });
                   }
                 }

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

@@ -508,9 +508,17 @@ export const useEditor = (
       newTab?: boolean;
       refresh?: boolean;
       searchResultIndex?: number;
+      loadedFromEditor?: boolean;
     }) => {
       loadNoteMutex.runExclusive(async () => {
-        if (!event) return;
+        if (
+          !event ||
+          (event.loadedFromEditor &&
+            event.item &&
+            event.item?.id !== useTabStore.getState().getCurrentNoteId())
+        ) {
+          return;
+        }
         if (event.blockId) {
           blockIdRef.current = event.blockId;
         }
@@ -669,7 +677,7 @@ export const useEditor = (
           state.current.currentlyEditing = true;
           if (!tabLocked) {
             await loadContent(item);
-          } else {
+          } else if (fluidTabsRef.current?.page() === "editor") {
             commands.focus(tabId!);
           }
 
@@ -719,6 +727,7 @@ export const useEditor = (
           }, 300);
         }
         postMessage(NativeEvents.theme, theme);
+        console.log("load finished", event.item?.id);
       });
     },
     [

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

@@ -23,21 +23,36 @@ import {
   AppState,
   AppStateStatus,
   KeyboardAvoidingView,
-  Platform,
   TextInput,
   View
 } from "react-native";
 import Editor from ".";
 import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
 import useIsFloatingKeyboard from "../../hooks/use-is-floating-keyboard";
-import useKeyboard from "../../hooks/use-keyboard";
 import { DDS } from "../../services/device-detection";
 import { useSettingStore } from "../../stores/use-setting-store";
 import { editorRef } from "../../utils/global-refs";
 import { editorController, textInput } from "./tiptap/utils";
-import deviceInfo from "react-native-device-info";
 
-export const EditorWrapper = ({ widths }: { widths: any }) => {
+export type PaneWidths = {
+  mobile: {
+    sidebar: number;
+    list: number;
+    editor: number;
+  };
+  smallTablet: {
+    sidebar: number;
+    list: number;
+    editor: number;
+  };
+  tablet: {
+    sidebar: number;
+    list: number;
+    editor: number;
+  };
+};
+
+export const EditorWrapper = ({ widths }: { widths: PaneWidths }) => {
   const { colors } = useThemeColors();
   const { colors: toolBarColors } = useThemeColors("editorToolbar");
   const deviceMode = useSettingStore((state) => state.deviceMode);
@@ -47,8 +62,9 @@ export const EditorWrapper = ({ widths }: { widths: any }) => {
   const introCompleted = useSettingStore(
     (state) => state.settings.introCompleted
   );
-  const keyboard = useKeyboard();
   const prevState = useRef<AppStateStatus>(undefined);
+  const isFullscreen = useSettingStore((state) => state.fullscreen);
+  const dimensions = useSettingStore((state) => state.dimensions);
 
   const onAppStateChanged = async (state: AppStateStatus) => {
     if (!prevState.current) {
@@ -72,37 +88,40 @@ export const EditorWrapper = ({ widths }: { widths: any }) => {
     };
   }, [loading]);
 
-  const getMarginBottom = () => {
-    const bottomInsets =
-      Platform.OS === "android" ? 12 : insets.bottom + 16 || 14;
-    if (!keyboard.keyboardShown) return bottomInsets / 1.5;
-    if (deviceInfo.isTablet() && Platform.OS === "ios" && !floating)
-      return bottomInsets;
-    if (Platform.OS === "ios") return bottomInsets / 1.5;
-    return 0;
-  };
-
-  const KeyboardAvoidingViewIOS =
-    Platform.OS === "ios" ? KeyboardAvoidingView : View;
-
   return (
     <View
       testID="editor-wrapper"
       ref={editorRef}
-      style={{
-        width: widths[!introCompleted ? "mobile" : (deviceMode as any)]?.editor,
-        height: "100%",
-        minHeight: "100%",
-        backgroundColor: toolBarColors.primary.background,
-        borderLeftWidth: DDS.isTab ? 1 : 0,
-        borderLeftColor: DDS.isTab
-          ? colors.secondary.background
-          : "transparent",
-        paddingBottom: insets.bottom
-      }}
+      style={[
+        {
+          width: isFullscreen
+            ? dimensions.width
+            : widths[
+                !introCompleted ? "mobile" : (deviceMode as keyof PaneWidths)
+              ]?.editor,
+          height: "100%",
+          minHeight: "100%",
+          backgroundColor: toolBarColors.primary.background,
+          paddingLeft: isFullscreen
+            ? deviceMode === "smallTablet"
+              ? 0
+              : dimensions.width * 0.15
+            : null,
+          paddingRight: isFullscreen
+            ? deviceMode === "smallTablet"
+              ? 0
+              : dimensions.width * 0.15
+            : insets.right,
+          borderLeftWidth: DDS.isTab ? 1 : 0,
+          borderLeftColor: DDS.isTab
+            ? colors.secondary.background
+            : "transparent",
+          paddingBottom: insets.bottom
+        }
+      ]}
     >
       {loading || !introCompleted ? null : (
-        <KeyboardAvoidingViewIOS
+        <KeyboardAvoidingView
           behavior="padding"
           style={{
             backgroundColor: colors.primary.background,
@@ -118,7 +137,7 @@ export const EditorWrapper = ({ widths }: { widths: any }) => {
             blurOnSubmit={false}
           />
           <Editor key="editor" withController={true} />
-        </KeyboardAvoidingViewIOS>
+        </KeyboardAvoidingView>
       )}
     </View>
   );

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

@@ -217,12 +217,12 @@ const NotebookScreen = ({ route, navigation }: NavigationProps<"Notebook">) => {
           position: "absolute",
           bottom: 20,
           right: 20,
-          gap: DefaultAppStyles.GAP_VERTICAL,
           alignItems: "center"
         }}
       >
         <FloatingButton
           icon="file-tree"
+          testID="notebookTreeSheet"
           size="small"
           onPress={() => {
             Notebooks.present(params.current.item);
@@ -230,7 +230,8 @@ const NotebookScreen = ({ route, navigation }: NavigationProps<"Notebook">) => {
           style={{
             position: "relative",
             right: 0,
-            bottom: 5
+            bottom: 0,
+            paddingBottom: 10
           }}
         />
         <FloatingButton
@@ -238,6 +239,7 @@ const NotebookScreen = ({ route, navigation }: NavigationProps<"Notebook">) => {
           alwaysVisible
           style={{
             position: "relative",
+            paddingTop: 10,
             right: 0,
             bottom: 0
           }}

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

@@ -23,7 +23,6 @@ import React, { useRef, useState } from "react";
 import { View } from "react-native";
 import { TextInput } from "react-native-gesture-handler";
 import { IconButton } from "../../components/ui/icon-button";
-import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
 import Navigation from "../../services/navigation";
 import useNavigationStore from "../../stores/use-navigation-store";
 import { useSelectionStore } from "../../stores/use-selection-store";
@@ -41,7 +40,6 @@ export const SearchBar = ({
   const isFocused = useNavigationStore(
     (state) => state.focusedRouteId === "Search"
   );
-  const insets = useGlobalSafeAreaInsets();
   const { colors } = useThemeColors();
   const inputRef = useRef<TextInput>(null);
   const _onChangeText = (value: string) => {
@@ -58,7 +56,6 @@ export const SearchBar = ({
     >
       <View
         style={{
-          marginTop: DefaultAppStyles.GAP_SMALL,
           flexDirection: "row",
           alignItems: "center",
           width: "100%",

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

@@ -59,7 +59,7 @@ const Group = ({
           id="Settings"
         />
       )}
-      <DelayLayout type="settings" delay={0}>
+      <DelayLayout type="settings">
         <View
           style={{
             flex: 1

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

@@ -59,7 +59,7 @@ const Home = ({
         hasSearch={false}
         id="Settings"
       />
-      <DelayLayout delay={0} type="settings">
+      <DelayLayout type="settings">
         <LegendList
           data={settingsGroups}
           keyExtractor={keyExtractor}

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

@@ -17,23 +17,29 @@ 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 { ScopedThemeProvider, useThemeColors } from "@notesnook/theme";
 import { createNativeStackNavigator } from "@react-navigation/native-stack";
 import React from "react";
+import { View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 import useNavigationStore from "../../stores/use-navigation-store";
-import { ScopedThemeProvider, useThemeColors } from "@notesnook/theme";
 import Group from "./group";
 import Home from "./home";
 import { RouteParams } from "./types";
-import { SafeAreaView } from "react-native-safe-area-context";
 const SettingsStack = createNativeStackNavigator<RouteParams>();
 
 export const Settings = () => {
   const { colors } = useThemeColors();
+  const insets = useSafeAreaInsets();
   return (
-    <SafeAreaView
+    <View
       style={{
         flex: 1,
-        backgroundColor: colors.primary.background
+        backgroundColor: colors.primary.background,
+        paddingTop: insets.top,
+        paddingBottom: insets.bottom,
+        paddingLeft: insets.left,
+        paddingRight: insets.right
       }}
     >
       <ScopedThemeProvider value="list">
@@ -58,7 +64,7 @@ export const Settings = () => {
           <SettingsStack.Screen name="SettingsGroup" component={Group} />
         </SettingsStack.Navigator>
       </ScopedThemeProvider>
-    </SafeAreaView>
+    </View>
   );
 };
 

apps/mobile/app/screens/settings/restore-backup/index.tsx

@@ -95,6 +95,15 @@ const restoreBackup = async (options: {
   deleteFile?: boolean;
 }) => {
   try {
+    if (
+      !options.uri.endsWith(".nnbackup") &&
+      !options.uri.endsWith(".nnbackupz")
+    ) {
+      throw new Error(
+        `Invalid backup file selected. Only .nnbackup and .nnbackupz files can be restored.`
+      );
+    }
+
     const isLegacyBackup = options.uri.endsWith(".nnbackup");
 
     startProgress({
@@ -367,7 +376,6 @@ export const RestoreBackup = () => {
                 disableAppLockRequests: true
               });
               const file = await pick();
-
               const fileCopy = await keepLocalCopy({
                 destination: "cachesDirectory",
                 files: [
@@ -390,10 +398,7 @@ export const RestoreBackup = () => {
               }, 1000);
 
               restoreBackup({
-                uri:
-                  Platform.OS === "android"
-                    ? (("file://" + fileCopy[0].sourceUri) as string)
-                    : (fileCopy[0].sourceUri as string),
+                uri: fileCopy[0].localUri,
                 deleteFile: true
               });
             },

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

@@ -118,7 +118,8 @@ export const settingsGroups: SettingSection[] = [
           if (
             (user.subscription?.provider === SubscriptionProvider.GOOGLE ||
               user.subscription?.provider === SubscriptionProvider.APPLE) &&
-            isCurrentPlatform
+            isCurrentPlatform &&
+            user?.subscription?.productId
           ) {
             RNIap.deepLinkToSubscriptions({
               sku: user?.subscription.productId
@@ -142,16 +143,20 @@ export const settingsGroups: SettingSection[] = [
             "dddd, MMMM D, YYYY h:mm A"
           );
 
-          if (user.subscription?.plan !== SubscriptionPlan.FREE) {
+          const trialEndDate = dayjs(user?.subscription?.start)
+            .add(
+              user?.subscription?.productId?.includes("monthly") ? 7 : 14,
+              "day"
+            )
+            .format("dddd, MMMM D, YYYY h:mm A");
+
+          if (
+            user.subscription?.plan !== SubscriptionPlan.FREE &&
+            user.subscription?.productId
+          ) {
             const status = user.subscription?.status;
             return status === SubscriptionStatus.TRIAL
-              ? strings.trialEndsOn(
-                  dayjs(user?.subscription?.start)
-                    .add(
-                      user?.subscription?.productId.includes("monthly") ? 7 : 14
-                    )
-                    .format("dddd, MMMM D, YYYY h:mm A")
-                )
+              ? strings.trialOnGoing(trialEndDate)
               : status === SubscriptionStatus.ACTIVE
                 ? strings.subRenewOn(expiryDate)
                 : status === SubscriptionStatus.CANCELED ||
@@ -1323,7 +1328,7 @@ export const settingsGroups: SettingSection[] = [
           if (settings.notifNotes) {
             Notifications.unpinQuickNote();
           } else {
-            Notifications.pinQuickNote(false);
+            Notifications.pinQuickNote();
           }
           SettingsService.set({
             notifNotes: !settings.notifNotes

apps/mobile/app/screens/settings/theme-selector.tsx

@@ -16,6 +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 { LegendList } from "@legendapp/list";
+import { strings } from "@notesnook/intl";
 import {
   THEME_COMPATIBILITY_VERSION,
   ThemeDefinition,
@@ -28,8 +30,7 @@ import type {
   ThemeMetadata,
   ThemesRouter
 } from "@notesnook/themes-server";
-import { pick } from "@react-native-documents/picker";
-import Icon from "react-native-vector-icons/MaterialCommunityIcons";
+import { keepLocalCopy, pick } from "@react-native-documents/picker";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { createTRPCProxyClient, httpBatchLink } from "@trpc/client";
 import { createTRPCReact } from "@trpc/react-query";
@@ -40,23 +41,24 @@ import {
   TouchableOpacity,
   View
 } from "react-native";
+import ReactNativeBlobUtil from "react-native-blob-util";
+import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { DatabaseLogger, db } from "../../common/database";
+import { santizeUri } from "../../common/filesystem/utils";
 import SheetProvider from "../../components/sheet-provider";
 import { Button } from "../../components/ui/button";
+import { IconButton } from "../../components/ui/icon-button";
 import Input from "../../components/ui/input";
+import { Pressable } from "../../components/ui/pressable";
 import Heading from "../../components/ui/typography/heading";
 import Paragraph from "../../components/ui/typography/paragraph";
 import { ToastManager, presentSheet } from "../../services/event-manager";
 import { useThemeStore } from "../../stores/use-theme-store";
-import { defaultBorderRadius, AppFontSize } from "../../utils/size";
+import { getColorLinearShade } from "../../utils/colors";
 import { getElevationStyle } from "../../utils/elevation";
 import { MenuItemsList } from "../../utils/menu-items";
-import { IconButton } from "../../components/ui/icon-button";
-import { Pressable } from "../../components/ui/pressable";
-import { getColorLinearShade } from "../../utils/colors";
-import { strings } from "@notesnook/intl";
+import { AppFontSize, defaultBorderRadius } from "../../utils/size";
 import { DefaultAppStyles } from "../../utils/styles";
-import { LegendList } from "@legendapp/list";
 
 const THEME_SERVER_URL = "https://themes-api.notesnook.com";
 //@ts-ignore
@@ -412,20 +414,43 @@ function ThemeSelector() {
               type={"secondaryAccented"}
               icon="folder"
               fontSize={AppFontSize.xs}
-              onPress={() => {
-                pick({
-                  allowMultiSelection: false
-                }).then((r) => {
-                  fetch(r[0].uri).then(async (response) => {
-                    const json = await response.json();
-                    const result = validateTheme(json);
-                    if (result.error) {
-                      ToastManager.error(new Error(result.error));
-                      return;
-                    }
-                    select(json, true);
+              onPress={async () => {
+                try {
+                  const pickResponse = await pick({
+                    allowMultiSelection: false
                   });
-                });
+                  const copiedFile = await keepLocalCopy({
+                    destination: "cachesDirectory",
+                    files: [
+                      {
+                        uri: pickResponse[0].uri,
+                        fileName: pickResponse[0].name || "theme.json"
+                      }
+                    ]
+                  });
+                  if (copiedFile[0].status !== "success") return;
+
+                  const themeJsonCopiedPath = santizeUri(
+                    copiedFile[0].localUri
+                  );
+
+                  const themeJson = await ReactNativeBlobUtil.fs.readFile(
+                    themeJsonCopiedPath,
+                    "utf8"
+                  );
+                  ReactNativeBlobUtil.fs
+                    .unlink(themeJsonCopiedPath)
+                    .catch(() => {});
+                  const json = JSON.parse(themeJson);
+                  const result = validateTheme(json);
+                  if (result.error) {
+                    ToastManager.error(new Error(result.error));
+                    return;
+                  }
+                  select(json, true);
+                } catch (e) {
+                  ToastManager.error(e as Error);
+                }
               }}
             />
           </View>

apps/mobile/app/services/background-sync.ts

@@ -114,7 +114,7 @@ async function onBackgroundSyncStarted() {
     }
     await Notifications.setupReminders();
     if (SettingsService.get().notifNotes) {
-      Notifications.pinQuickNote(false);
+      Notifications.pinQuickNote();
     }
     Notifications.restorePinnedNotes();
     NotePreviewWidget.updateNotes();
@@ -142,7 +142,7 @@ const onBoot = async () => {
 
     await Notifications.setupReminders();
     if (SettingsService.get().notifNotes) {
-      Notifications.pinQuickNote(false);
+      Notifications.pinQuickNote();
     }
     Notifications.restorePinnedNotes();
     NotePreviewWidget.updateNotes();

apps/mobile/app/services/biometrics.ts

@@ -76,11 +76,11 @@ async function getCredentials(title?: string, description?: string) {
     const options = Platform.select({
       ios: {
         fallbackEnabled: false,
-        description: description
+        description: description || title || "Unlock"
       },
       android: {
         title: title,
-        description: description,
+        description: description || "Unlock",
         deviceCredentialAllowed: false
       }
     });
@@ -132,11 +132,11 @@ async function validateUser(title: string, description?: string) {
       Platform.select({
         ios: {
           fallbackEnabled: false,
-          description: title
+          description: title || "Unlock"
         },
         android: {
           title: title,
-          description: description,
+          description: description || "Unlock",
           deviceCredentialAllowed: false
         }
       }) as AuthenticateIOS

apps/mobile/app/services/device-detection.js

@@ -50,6 +50,7 @@ export class DeviceDetectionService {
     windowSize = size || windowSize;
     this.width = windowSize.width;
     this.height = windowSize.height;
+    this.orientation = orientation;
     this.adjustedWidth = this.width * this.pixelDensity;
     this.adjustedHeight = this.height * this.pixelDensity;
     screenSize = Dimensions.get("screen");

apps/mobile/app/services/navigation.ts

@@ -71,7 +71,8 @@ const routeNames = {
   Archive: "Archive",
   ManageTags: "ManageTags",
   AddReminder: "AddReminder",
-  PayWall: "PayWall"
+  PayWall: "PayWall",
+  Wrapped: "Wrapped"
 };
 
 export type NavigationProps<T extends RouteName> = NativeStackScreenProps<

apps/mobile/app/services/notifications.ts

@@ -109,6 +109,15 @@ async function initDatabase() {
 const onEvent = async ({ type, detail }: Event) => {
   await initDatabase();
   const { notification, pressAction, input } = detail;
+  if (
+    type === EventType.DISMISSED &&
+    Platform.OS === "android" &&
+    notification?.id === "notesnook_note_input" &&
+    SettingsService.getProperty("notifNotes")
+  ) {
+    pinQuickNote();
+  }
+
   if (type === EventType.DELIVERED && Platform.OS === "android") {
     if (notification?.id) {
       const reminder = await db.reminders?.reminder(
@@ -438,6 +447,7 @@ async function scheduleNotification(
 
 async function loadNote(id: string, jump: boolean) {
   if (!id || id === "notesnook_note_input") return;
+  editorState().initialLoadCalled = true;
   const note = await db.notes.note(id);
   if (!note) return;
   if (!DDS.isTab && jump) {
@@ -453,9 +463,11 @@ async function loadNote(id: string, jump: boolean) {
 
   const tab = useTabStore.getState().getTabForNote(id);
   if (useTabStore.getState().currentTab !== tab) {
-    eSendEvent(eOnLoadNote, {
-      item: note
-    });
+    setTimeout(() => {
+      eSendEvent(eOnLoadNote, {
+        item: note
+      });
+    }, 300);
   }
 }
 
@@ -502,7 +514,8 @@ async function displayNotification({
   ongoing,
   reply_placeholder_text,
   reply_button_text,
-  id
+  id,
+  channelId = "default"
 }: {
   title?: string;
   message: string;
@@ -513,6 +526,7 @@ async function displayNotification({
   reply_placeholder_text?: string;
   reply_button_text?: string;
   id?: string;
+  channelId?: "silent" | "vibrate" | "urgent" | "default";
 }) {
   useUserStore.setState({
     disableAppLockRequests: true
@@ -537,7 +551,7 @@ async function displayNotification({
         ongoing: ongoing,
         smallIcon: "ic_stat_name",
         localOnly: true,
-        channelId: await getChannelId("default"),
+        channelId: await getChannelId(channelId),
         autoCancel: false,
         pressAction: {
           id: "default",
@@ -884,7 +898,7 @@ function init() {
   notifee.onForegroundEvent(onEvent);
 }
 
-async function pinQuickNote(launch: boolean) {
+async function pinQuickNote() {
   useUserStore.setState({
     disableAppLockRequests: true
   });
@@ -896,14 +910,13 @@ async function pinQuickNote(launch: boolean) {
     return;
   }
   get().then((items) => {
-    const notification = items.filter((n) => n.id === "notesnook_note_input");
-    if (notification && launch) {
-      return;
-    }
+    const notification = items.find((n) => n.id === "notesnook_note_input");
+    if (notification) return;
     displayNotification({
       title: strings.quickNoteTitle(),
       message: strings.quickNoteContent(),
       ongoing: true,
+      channelId: "silent",
       actions: ["ReplyInput", strings.hide()],
       reply_button_text: strings.takeNote(),
       reply_placeholder_text: strings.quickNotePlaceholder(),
@@ -1030,6 +1043,7 @@ async function pinNote(id: string) {
       subtitle: "",
       bigText: html,
       ongoing: true,
+      channelId: "silent",
       actions: [strings.unpin()],
       id: note.id
     });
@@ -1040,9 +1054,13 @@ async function pinNote(id: string) {
 
 async function restorePinnedNotes() {
   const pinnedNotes = PinnedNotesStorage.get();
-  for (const id of pinnedNotes) {
-    pinNote(id);
-  }
+  Notifications.get().then(() => {
+    for (const id of pinnedNotes) {
+      if (!isNotePinned(id)) {
+        pinNote(id);
+      }
+    }
+  });
 }
 
 async function clearPinnedNotes() {

apps/mobile/app/share/share.tsx

@@ -251,6 +251,7 @@ const ShareView = () => {
             setRawData(item);
             if (isURL(item.value)) {
               note = await showLinkPreview(note, item.value);
+              noteTitle.current = note.title;
             } else {
               note.content.data = makeHtmlFromPlainText(item.value);
             }
@@ -261,9 +262,6 @@ const ShareView = () => {
               if (key.includes("TITLE") || key.includes("SUBJECT")) {
                 note.title = item[key];
                 noteTitle.current = note.title;
-                inputRef.current?.setNativeProps?.({
-                  text: noteTitle.current
-                });
               }
               if (key.includes("TEXT") && !note.content.data) {
                 note.content.data = item[key];
@@ -294,6 +292,10 @@ const ShareView = () => {
             }
           }
         }
+
+        inputRef.current?.setNativeProps?.({
+          text: noteTitle.current
+        });
         onLoad();
         setNote({ ...note });
       } catch (e) {
@@ -308,7 +310,6 @@ const ShareView = () => {
       try {
         await initDatabase();
         setLoadingExtension(false);
-        loadData(false);
         useShareStore.getState().restore();
       } catch (e) {
         DatabaseLogger.error(e);

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

@@ -112,6 +112,7 @@ export interface RouteParams extends ParamListBase {
     context: "signup" | "logged-in" | "logged-out" | "subscribed";
     state?: BillingState;
   };
+  Wrapped: GenericRouteParam;
 }
 
 export type RouteName = keyof RouteParams;

apps/mobile/app/utils/functions.ts

@@ -35,6 +35,10 @@ import { useTagStore } from "../stores/use-tag-store";
 import { eUpdateNoteInEditor } from "./events";
 import { unlockVault } from "./unlock-vault";
 
+export const valueLimiter = (value: number, min: number, max: number) => {
+  return value < min ? min : value > max ? max : value;
+};
+
 export function getObfuscatedEmail(email: string) {
   if (!email) return "";
   const [username, provider] = email.split("@");

apps/mobile/babel.config.js

@@ -23,7 +23,7 @@ module.exports = function (api, opts) {
     });
   }
 
-  env.plugins.push("react-native-reanimated/plugin");
+  env.plugins.push("react-native-worklets/plugin");
 
   api.cache(true);
   return env;

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

@@ -134,7 +134,7 @@ describe("NOTE TESTS", () => {
       .run();
   });
 
-  it("Assign colors to a note", async () => {
+  it.only("Assign colors to a note", async () => {
     await TestBuilder.create()
       .prepare()
       .createNote()

apps/mobile/e2e/tests/notebook.e2e.ts

@@ -121,7 +121,7 @@ describe("NOTEBOOKS", () => {
       .run();
   });
 
-  it.only("Remove note from notebook", async () => {
+  it("Remove note from notebook", async () => {
     await TestBuilder.create()
       .prepare()
       .openSideMenu()
@@ -138,7 +138,8 @@ describe("NOTEBOOKS", () => {
           .longPressByText(note.body)
           .wait(500)
           .waitAndTapById("select-minus")
-          .isNotVisibleById(note.title)
+          .wait(500)
+          .isNotVisibleByText(note.body)
           .run();
       })
       .run();
@@ -199,6 +200,7 @@ describe("NOTEBOOKS", () => {
       .longPressByText("Notebook 1")
       .wait(500)
       .waitAndTapByText("Move to trash")
+      .wait(500)
       .waitAndTapByText("Delete")
       .waitAndTapById("tab-home")
       .waitAndTapByText("Trash")

apps/mobile/e2e/tests/sort.e2e.ts

@@ -34,7 +34,7 @@ describe("Sort & filter", () => {
           .element(by.web.className("ProseMirror"))
           .typeText("Edited ", true);
       })
-      .pressBack()
+      .pressBack(2)
       .waitAndTapById("icon-sort")
       .wait(500)
       .waitAndTapByText("Date created")

apps/mobile/e2e/tests/utils.ts

@@ -32,7 +32,10 @@ const testvars = {
 
 class Element {
   element: Detox.NativeElement;
-  constructor(public type: "id" | "text", public value: string) {
+  constructor(
+    public type: "id" | "text",
+    public value: string
+  ) {
     if (type == "id") {
       this.element = element(by.id(value)).atIndex(0);
     } else {
@@ -135,6 +138,7 @@ const Tests = {
     );
     await titleInput.isVisible();
     await titleInput.element.typeText(title);
+    await Tests.sleep(1000);
     if (description) {
       await Tests.fromId(
         notesnook.ids.dialogs.notebook.inputs.description

apps/mobile/e2e/tests/vault.e2e.ts

@@ -84,7 +84,7 @@ describe("VAULT", () => {
       .run();
   });
 
-  it.only("Change vault password", async () => {
+  it("Change vault password", async () => {
     await TestBuilder.create()
       .prepare()
       .createNote()
@@ -94,7 +94,7 @@ describe("VAULT", () => {
       .typeTextById(notesnook.ids.dialogs.vault.pwd, "1234")
       .typeTextById(notesnook.ids.dialogs.vault.changePwd, "2362")
       .waitAndTapByText("Change")
-      .pressBack(3)
+      .pressBack(4)
       .addStep(async () => await openLockedNote("2362"))
       .run();
   });

apps/mobile/ios/ExportOptions.plist

@@ -5,11 +5,11 @@
 	<key>provisioningProfiles</key>
 	<dict>
 		<key>org.streetwriters.notesnook</key>
-		<string>Notesnook App Distribution 2025</string>
+		<string>Notesnook 2026</string>
         <key>org.streetwriters.notesnook.notewidget</key>
-		<string>Notesnook Widget Distribution 2025</string>
+		<string>Notesnook Note Widget 2026</string>
         <key>org.streetwriters.notesnook.share</key>
-		<string>Notesnook Share Distribution 2025</string>
+		<string>Notesnook Share 2026</string>
 	</dict>
 </dict>
 </plist>

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

@@ -1029,7 +1029,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2158;
+				CURRENT_PROJECT_VERSION = 2168;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1104,7 +1104,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.10;
+				MARKETING_VERSION = 3.3.12;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1135,7 +1135,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2158;
+				CURRENT_PROJECT_VERSION = 2168;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1210,7 +1210,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.10;
+				MARKETING_VERSION = 3.3.12;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1220,7 +1220,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook;
 				PRODUCT_NAME = Notesnook;
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook App Distribution 2025";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook 2026";
 				SWIFT_OBJC_BRIDGING_HEADER = "Notesnook-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1367,7 +1367,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2158;
+				CURRENT_PROJECT_VERSION = 2168;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1379,7 +1379,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.3.10;
+				MARKETING_VERSION = 3.3.12;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget;
@@ -1410,7 +1410,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2158;
+				CURRENT_PROJECT_VERSION = 2168;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1423,12 +1423,12 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.3.10;
+				MARKETING_VERSION = 3.3.12;
 				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 2025";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook Note Widget 2026";
 				SKIP_INSTALL = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
@@ -1453,7 +1453,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Make Note/Make Note.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2158;
+				CURRENT_PROJECT_VERSION = 2168;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 53CWBG3QUC;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1534,7 +1534,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
-				MARKETING_VERSION = 3.3.10;
+				MARKETING_VERSION = 3.3.12;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share;
@@ -1565,7 +1565,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2158;
+				CURRENT_PROJECT_VERSION = 2168;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 53CWBG3QUC;
@@ -1647,12 +1647,12 @@
 					"@executable_path/../../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
-				MARKETING_VERSION = 3.3.10;
+				MARKETING_VERSION = 3.3.12;
 				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 Distribution 2025";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Notesnook Share 2026";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "Make Note/Make Note-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

apps/mobile/ios/Notesnook/AppDelegate.mm

@@ -4,6 +4,7 @@
 #import "RNShortcuts.h"
 #import "RNBootSplash.h"
 #import <ReactAppDependencyProvider/RCTAppDependencyProvider.h>
+#import "RNFileUploader.h"
 
 @interface ReactNativeDelegate : RCTDefaultReactNativeFactoryDelegate
 @end
@@ -79,4 +80,8 @@
   [RNBootSplash initWithStoryboard:@"BootSplash" rootView:rootView]; // ⬅️ initialize the splash screen
 }
 
+- (void)application:(UIApplication *)application handleEventsForBackgroundURLSession:(NSString *)identifier completionHandler:(void (^)())completionHandler {
+  [RNFileUploader setCompletionHandlerWithIdentifier:identifier completionHandler:completionHandler];
+}
+
 @end

apps/mobile/ios/Notesnook/PrivacyInfo.xcprivacy

@@ -10,8 +10,6 @@
 			<key>NSPrivacyAccessedAPITypeReasons</key>
 			<array>
 				<string>35F9.1</string>
-				<string>3B52.1</string>
-				<string>C617.1</string>
 			</array>
 		</dict>
 		<dict>

apps/mobile/ios/Podfile.lock

@@ -1887,7 +1887,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - SocketRocket
     - Yoga
-  - react-native-document-picker (10.1.7):
+  - react-native-document-picker (11.0.3):
     - boost
     - DoubleConversion
     - fast_float
@@ -1969,14 +1969,14 @@ PODS:
     - React-Core
     - React-RCTFabric
     - ReactCommon/turbomodule/core
-  - react-native-mmkv-storage (0.11.2):
+  - react-native-mmkv-storage (12.0.1):
     - boost
     - DoubleConversion
     - fast_float
     - fmt
     - glog
     - hermes-engine
-    - MMKV (~> 1.3.9)
+    - MMKV (~> 1.3.14)
     - RCT-Folly
     - RCT-Folly/Fabric
     - RCTRequired
@@ -2004,35 +2004,7 @@ PODS:
     - React
   - react-native-orientation-locker (1.7.0):
     - React-Core
-  - react-native-pager-view (6.9.1):
-    - boost
-    - DoubleConversion
-    - fast_float
-    - fmt
-    - glog
-    - hermes-engine
-    - RCT-Folly
-    - RCT-Folly/Fabric
-    - RCTRequired
-    - RCTTypeSafety
-    - React-Core
-    - React-debug
-    - React-Fabric
-    - React-featureflags
-    - React-graphics
-    - React-ImageManager
-    - React-jsi
-    - React-NativeModulesApple
-    - React-RCTFabric
-    - React-renderercss
-    - React-rendererdebug
-    - React-utils
-    - ReactCodegen
-    - ReactCommon/turbomodule/bridging
-    - ReactCommon/turbomodule/core
-    - SocketRocket
-    - Yoga
-  - react-native-pdf (6.7.7):
+  - react-native-pdf (7.0.3):
     - boost
     - DoubleConversion
     - fast_float
@@ -2244,6 +2216,36 @@ PODS:
     - ReactCommon/turbomodule/core
     - SocketRocket
     - Yoga
+  - react-native-upload (6.29.0):
+    - React
+  - react-native-view-shot (4.0.3):
+    - boost
+    - DoubleConversion
+    - fast_float
+    - fmt
+    - glog
+    - hermes-engine
+    - RCT-Folly
+    - RCT-Folly/Fabric
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-jsi
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-renderercss
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - SocketRocket
+    - Yoga
   - react-native-webview (13.16.0):
     - boost
     - DoubleConversion
@@ -3031,14 +3033,14 @@ PODS:
     - Yoga
   - RNKeychain (4.0.5):
     - React
-  - RNNotifee (7.4.9):
+  - RNNotifee (7.4.11):
     - React-Core
-    - RNNotifee/NotifeeCore (= 7.4.9)
-  - RNNotifee/NotifeeCore (7.4.9):
+    - RNNotifee/NotifeeCore (= 7.4.11)
+  - RNNotifee/NotifeeCore (7.4.11):
     - React-Core
   - RNPrivacySnapshot (1.0.0):
     - React-Core
-  - RNReanimated (4.1.3):
+  - RNReanimated (4.2.0):
     - boost
     - DoubleConversion
     - fast_float
@@ -3065,11 +3067,11 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNReanimated/reanimated (= 4.1.3)
+    - RNReanimated/reanimated (= 4.2.0)
     - RNWorklets
     - SocketRocket
     - Yoga
-  - RNReanimated/reanimated (4.1.3):
+  - RNReanimated/reanimated (4.2.0):
     - boost
     - DoubleConversion
     - fast_float
@@ -3096,11 +3098,11 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNReanimated/reanimated/apple (= 4.1.3)
+    - RNReanimated/reanimated/apple (= 4.2.0)
     - RNWorklets
     - SocketRocket
     - Yoga
-  - RNReanimated/reanimated/apple (4.1.3):
+  - RNReanimated/reanimated/apple (4.2.0):
     - boost
     - DoubleConversion
     - fast_float
@@ -3130,7 +3132,7 @@ PODS:
     - RNWorklets
     - SocketRocket
     - Yoga
-  - RNScreens (4.18.0):
+  - RNScreens (4.19.0):
     - boost
     - DoubleConversion
     - fast_float
@@ -3157,10 +3159,10 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNScreens/common (= 4.18.0)
+    - RNScreens/common (= 4.19.0)
     - SocketRocket
     - Yoga
-  - RNScreens/common (4.18.0):
+  - RNScreens/common (4.19.0):
     - boost
     - DoubleConversion
     - fast_float
@@ -3280,7 +3282,7 @@ PODS:
     - pop (~> 1.0)
     - React
     - SexyTooltip
-  - RNWorklets (0.6.1):
+  - RNWorklets (0.7.1):
     - boost
     - DoubleConversion
     - fast_float
@@ -3307,10 +3309,10 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNWorklets/worklets (= 0.6.1)
+    - RNWorklets/worklets (= 0.7.1)
     - SocketRocket
     - Yoga
-  - RNWorklets/worklets (0.6.1):
+  - RNWorklets/worklets (0.7.1):
     - boost
     - DoubleConversion
     - fast_float
@@ -3337,10 +3339,10 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNWorklets/worklets/apple (= 0.6.1)
+    - RNWorklets/worklets/apple (= 0.7.1)
     - SocketRocket
     - Yoga
-  - RNWorklets/worklets/apple (0.6.1):
+  - RNWorklets/worklets/apple (0.7.1):
     - boost
     - DoubleConversion
     - fast_float
@@ -3454,7 +3456,6 @@ DEPENDENCIES:
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
   - react-native-notification-sounds (from `../node_modules/react-native-notification-sounds`)
   - react-native-orientation-locker (from `../node_modules/react-native-orientation-locker`)
-  - react-native-pager-view (from `../node_modules/react-native-pager-view`)
   - react-native-pdf (from `../node_modules/react-native-pdf`)
   - react-native-quick-sqlite (from `../node_modules/react-native-quick-sqlite`)
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
@@ -3462,6 +3463,8 @@ DEPENDENCIES:
   - "react-native-share-extension (from `../node_modules/@ammarahmed/react-native-share-extension`)"
   - "react-native-sodium (from `../node_modules/@ammarahmed/react-native-sodium`)"
   - react-native-theme-switch-animation (from `../node_modules/react-native-theme-switch-animation`)
+  - "react-native-upload (from `../node_modules/@ammarahmed/react-native-upload`)"
+  - react-native-view-shot (from `../node_modules/react-native-view-shot`)
   - react-native-webview (from `../node_modules/react-native-webview`)
   - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)
   - React-oscompat (from `../node_modules/react-native/ReactCommon/oscompat`)
@@ -3659,8 +3662,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-notification-sounds"
   react-native-orientation-locker:
     :path: "../node_modules/react-native-orientation-locker"
-  react-native-pager-view:
-    :path: "../node_modules/react-native-pager-view"
   react-native-pdf:
     :path: "../node_modules/react-native-pdf"
   react-native-quick-sqlite:
@@ -3675,6 +3676,10 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@ammarahmed/react-native-sodium"
   react-native-theme-switch-animation:
     :path: "../node_modules/react-native-theme-switch-animation"
+  react-native-upload:
+    :path: "../node_modules/@ammarahmed/react-native-upload"
+  react-native-view-shot:
+    :path: "../node_modules/react-native-view-shot"
   react-native-webview:
     :path: "../node_modules/react-native-webview"
   React-NativeModulesApple:
@@ -3855,7 +3860,7 @@ SPEC CHECKSUMS:
   react-native-blob-util: 7946b7e13acf0da5e849dc2f73fcfebe1d981699
   react-native-config: 963b5efabc864cf69412e54b5de49b6a23e4af03
   react-native-date-picker: 4f4f40f6e65798038bb4b1bff47890c2be69c2e6
-  react-native-document-picker: 1734eb0aa3dbd1cd7bf1b105936f9b55031ae616
+  react-native-document-picker: d624d3d9bd9311da87f6f7b64aa44f69927d8543
   react-native-fingerprint-scanner: d5e143a361f3f01858e9c45141ddcabc4fd57055
   react-native-get-random-values: d16467cf726c618e9c7a8c3c39c31faa2244bbba
   react-native-gzip: 794e0e964a0d9e1dfd1773fee938adb4d4310e26
@@ -3863,18 +3868,19 @@ SPEC CHECKSUMS:
   react-native-image-resizer: 290b045c34c69db7574e4d08aadfc4abe1ff5a99
   react-native-in-app-review: 1516ba69d60d58053b7eb3aaaf8d2a5a74af8b57
   react-native-keep-awake: a351e6f67006b47f316ae2b17ee8ee69386167f4
-  react-native-mmkv-storage: b7ce5a5eb3d3bfddcf2df127671abba6ef3d76ae
+  react-native-mmkv-storage: e84980084e371a9c2230bbde071536a7e1539406
   react-native-netinfo: cec9c4e86083cb5b6aba0e0711f563e2fbbff187
   react-native-notification-sounds: ce106d58df0dd384bccbd2e84fb53accab7cc068
   react-native-orientation-locker: cc6f357b289a2e0dd2210fea0c52cb8e0727fdaa
-  react-native-pager-view: a0516effb17ca5120ac2113bfd21b91130ad5748
-  react-native-pdf: c586da0d19c14e6d859e62bf957851687fba0f25
+  react-native-pdf: edc236298f13f1609e42d41e45b8b6ea88ed10f9
   react-native-quick-sqlite: 1ed8d3db1e22a8604d006be69f06053382e93bb0
   react-native-safe-area-context: c6e2edd1c1da07bdce287fa9d9e60c5f7b514616
   react-native-screenguard: 9fc3b4ad5b97783fc0832638fae0dce51272c661
   react-native-share-extension: fdc6aaab51591a2d445df239c446aaa3a99658ec
   react-native-sodium: 066f76e46c9be13e9260521e3fa994937c4cdab4
   react-native-theme-switch-animation: 449d6db7a760f55740505e7403ae8061debc9a7e
+  react-native-upload: 1459a4be625dda39e4364d9e7d859477a3000f2a
+  react-native-view-shot: 6c008e58f4720de58370848201c5d4a082c6d4ca
   react-native-webview: 654f794a7686b47491cf43aa67f7f428bea00eed
   React-NativeModulesApple: 46690a0fe94ec28fc6fc686ec797b911d251ded0
   React-oscompat: 95875e81f5d4b3c7b2c888d5bd2c9d83450d8bdb
@@ -3921,15 +3927,15 @@ SPEC CHECKSUMS:
   RNIap: 61f183ac917792fae42b0326b1bef33598c1adf6
   RNImageCropPicker: 5fd4ceaead64d8c53c787e4e559004f97bc76df7
   RNKeychain: ffd0513e676445c637410b47249460cbf56bc9cb
-  RNNotifee: dabf3cdd7bfd9340bb84358cc78f635af4bc80e2
+  RNNotifee: c4827fa2cec60ab634d62bafdb5cf57cd2999d54
   RNPrivacySnapshot: ccad3a548338c2f526bb7b1789af3fb0618b7d1d
-  RNReanimated: 732e7d1662f8cc0e533fa32791800de5b5934726
-  RNScreens: d821082c6dd1cb397cc0c98b026eeafaa68be479
+  RNReanimated: f1868b36f4b2b52a0ed00062cfda69506f75eaee
+  RNScreens: ffbb0296608eb3560de641a711bbdb663ed1f6b4
   RNSecureRandom: b64d263529492a6897e236a22a2c4249aa1b53dc
   RNShare: 5d39a36f2d3d9a6c9344bfb3232c8ed607924a35
   RNSVG: 8c0bbfa480a24b24468f1c76bd852a4aac3178e6
   RNTooltips: 50ff94bd2bff84ef74279c9532d008f5fdcddb95
-  RNWorklets: ab618bf7d1c7fd2cb793b9f0f39c3e29274b3ebf
+  RNWorklets: d9c050940f140af5d8b611d937eab1cbfce5e9a5
   RNZipArchive: 71befbdc20e7fbd4b64552a0b324ad0e8d0efefb
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SexyTooltip: 5c9b4dec52bfb317938cb0488efd9da3717bb6fd

apps/mobile/package-lock.json

@@ -1,21 +1,22 @@
 {
   "name": "@notesnook/mobile",
-  "version": "3.3.10-beta.0",
+  "version": "3.3.12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/mobile",
-      "version": "3.3.10-beta.0",
+      "version": "3.3.12",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {
-        "@ammarahmed/notifee-react-native": "7.4.9",
+        "@ammarahmed/notifee-react-native": "^7.4.11",
         "@ammarahmed/react-native-background-fetch": "^4.2.2",
         "@ammarahmed/react-native-eventsource": "1.1.0",
         "@ammarahmed/react-native-fingerprint-scanner": "^5.0.1",
         "@ammarahmed/react-native-share-extension": "^2.9.5",
         "@ammarahmed/react-native-sodium": "^1.6.8",
+        "@ammarahmed/react-native-upload": "^6.29.0",
         "@azure/core-asynciterator-polyfill": "^1.0.2",
         "@bam.tech/react-native-image-resizer": "3.0.11",
         "@callstack/repack": "~5.2.1",
@@ -41,7 +42,7 @@
         "@react-native-community/datetimepicker": "^8.4.5",
         "@react-native-community/netinfo": "^11.4.1",
         "@react-native-community/toolbar-android": "^0.2.1",
-        "@react-native-documents/picker": "^10.1.7",
+        "@react-native-documents/picker": "^11.0.3",
         "@react-native-masked-view/masked-view": "^0.3.2",
         "@react-navigation/elements": "^1.3.3",
         "@react-navigation/native": "^6.0.10",
@@ -71,7 +72,7 @@
         "react": "19.1.1",
         "react-async-hook": "^4.0.0",
         "react-native": "0.82.1",
-        "react-native-actions-sheet": "10.0.0-alpha.8",
+        "react-native-actions-sheet": "^10.1.0",
         "react-native-actions-shortcuts": "^1.0.1",
         "react-native-background-actions": "^2.6.6",
         "react-native-begin-background-task": "github:blockfirm/react-native-begin-background-task",
@@ -96,35 +97,34 @@
         "react-native-keyboard-aware-scroll-view": "^0.9.5",
         "react-native-keychain": "4.0.5",
         "react-native-material-menu": "^2.0.0",
-        "react-native-mmkv-storage": "^12.0.0",
+        "react-native-mmkv-storage": "^12.0.1",
         "react-native-modal-datetime-picker": "14.0.0",
         "react-native-navigation-bar-color": "2.0.2",
         "react-native-notification-sounds": "0.5.5",
         "react-native-orientation-locker": "^1.7.0",
-        "react-native-pager-view": "^6.5.1",
-        "react-native-pdf": "6.7.7",
+        "react-native-pdf": "^7.0.3",
         "react-native-privacy-snapshot": "github:standardnotes/react-native-privacy-snapshot",
         "react-native-progress": "5.0.0",
         "react-native-qrcode-svg": "^6.0.6",
         "react-native-quick-sqlite": "^8.2.7",
-        "react-native-reanimated": "^4.1.3",
+        "react-native-reanimated": "^4.2.0",
         "react-native-reanimated-progress-bar": "1.0.1",
         "react-native-safe-area-context": "^5.6.1",
         "react-native-scoped-storage": "^1.9.5",
         "react-native-screenguard": "1.0.0",
-        "react-native-screens": "^4.16.0",
+        "react-native-screens": "^4.19.0",
         "react-native-securerandom": "^1.0.1",
         "react-native-share": "^12.0.3",
         "react-native-svg": "^15.12.0",
         "react-native-swiper-flatlist": "3.2.2",
-        "react-native-tab-view": "^4.1.3",
         "react-native-theme-switch-animation": "^0.6.0",
         "react-native-tooltips": "^1.0.3",
         "react-native-url-polyfill": "^2.0.0",
         "react-native-vector-icons": "10.3.0",
+        "react-native-view-shot": "^4.0.3",
         "react-native-webview": "^13.13.5",
         "react-native-wheel-color-picker": "^1.3.1",
-        "react-native-worklets": "^0.6.1",
+        "react-native-worklets": "^0.7.1",
         "react-native-zip-archive": "6.0.9",
         "timeago.js": "4.0.2",
         "toggle-switch-react-native": "3.2.0",
@@ -227,6 +227,7 @@
         "@streetwriters/kysely": "^0.27.4",
         "@streetwriters/showdown": "^3.0.9-alpha",
         "@types/mime-db": "^1.43.5",
+        "alfaaz": "^1.1.0",
         "async-mutex": "0.5.0",
         "dayjs": "1.11.13",
         "dom-serializer": "^2.0.0",
@@ -482,9 +483,9 @@
       }
     },
     "node_modules/@ammarahmed/notifee-react-native": {
-      "version": "7.4.9",
-      "resolved": "https://registry.npmjs.org/@ammarahmed/notifee-react-native/-/notifee-react-native-7.4.9.tgz",
-      "integrity": "sha512-DK4ogXPBnoM8UsDQQLK6AQZUbP9TqOcL3YDEKtXmsWug1hzvcP/AfJ42KUCni/XR5NMI1VWW7a7tEwdbdzmS8g==",
+      "version": "7.4.11",
+      "resolved": "https://registry.npmjs.org/@ammarahmed/notifee-react-native/-/notifee-react-native-7.4.11.tgz",
+      "integrity": "sha512-9zKhONgir2FN/sMj/rsKAhDwfxadDuxB6LJILKxpGwzqvcIuG70oCKWmBBG9LJJpSfcVpNTdxBoH9RtNZTZSsQ==",
       "license": "Apache-2.0",
       "peerDependencies": {
         "react-native": "*"
@@ -529,6 +530,16 @@
       "integrity": "sha512-FbX9fMfqJ3ysd+zkSS5di459tPv5iB0fhmK3dx/xo+l07sf7f1gzJu17mghSGkOKkbjXaoLPcq3XLMwWGpvapQ==",
       "license": "ISC"
     },
+    "node_modules/@ammarahmed/react-native-upload": {
+      "version": "6.29.0",
+      "resolved": "https://registry.npmjs.org/@ammarahmed/react-native-upload/-/react-native-upload-6.29.0.tgz",
+      "integrity": "sha512-k2FJAVR4Nohx4VhfgHuXzLXQpgEnco/PAv9R080X7oY3O12DTgY0ruDvOFwvQGFW0PDIHlXfLfUiMq2kZc/k1A==",
+      "license": "BSD-3-Clause",
+      "peerDependencies": {
+        "react": "*",
+        "react-native": ">=0.47.0"
+      }
+    },
     "node_modules/@azure/core-asynciterator-polyfill": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@azure/core-asynciterator-polyfill/-/core-asynciterator-polyfill-1.0.2.tgz",
@@ -1990,6 +2001,7 @@
       "version": "7.28.5",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.28.5.tgz",
       "integrity": "sha512-N6fut9IZlPnjPwgiQkXNhb+cT8wQKFlJNqcZkWlcTqkcqx6/kU4ynGmLFoa4LViBSirn05YAwk+sQBbPfxtYzQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1",
@@ -2472,16 +2484,16 @@
       }
     },
     "node_modules/@babel/preset-typescript": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.28.5.tgz",
-      "integrity": "sha512-+bQy5WOI2V6LJZpPVxY+yp66XdZ2yifu0Mc1aP5CQKgjn4QM5IN2i5fAZ4xKop47pr8rpVhiAeu+nDQa12C8+g==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.27.1.tgz",
+      "integrity": "sha512-l7WfQfX0WK4M0v2RudjuQK4u99BS6yLHYEmdtVPP7lKV013zr9DygFuWNlnbvQ9LR+LS0Egz/XAvGx5U9MX0fQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1",
         "@babel/helper-validator-option": "^7.27.1",
         "@babel/plugin-syntax-jsx": "^7.27.1",
         "@babel/plugin-transform-modules-commonjs": "^7.27.1",
-        "@babel/plugin-transform-typescript": "^7.28.5"
+        "@babel/plugin-transform-typescript": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -4839,13 +4851,13 @@
       }
     },
     "node_modules/@react-native-documents/picker": {
-      "version": "10.1.7",
-      "resolved": "https://registry.npmjs.org/@react-native-documents/picker/-/picker-10.1.7.tgz",
-      "integrity": "sha512-Tb8SPU+pHxrSJmDHBozSUStIPeyFHTHLrU3MW0N3sUAioLd5z+nmUdypfg5fs+Yzp7KTxVW06APe2HLB1ysLww==",
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/@react-native-documents/picker/-/picker-11.0.3.tgz",
+      "integrity": "sha512-q+vQNT1NtZcFGwsDpTwMKNNcgOEq6foFDGlPQVt8H7KaEjCjC+wTGdXuVSe8JJr2uO9xZR6kJ7aRHReZ4XDRBw==",
       "license": "MIT",
       "peerDependencies": {
         "react": "*",
-        "react-native": "*"
+        "react-native": ">=0.79.0"
       }
     },
     "node_modules/@react-native-masked-view/masked-view": {
@@ -7486,6 +7498,15 @@
       "resolved": "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz",
       "integrity": "sha512-Y5gU45svrR5tI2Vt/X9GPd3L0HNIKzGu202EjxrXMpuc2V2CiKgemAbUUsqYmZJvPtCXoUKjNZwBJzsNScUbXA=="
     },
+    "node_modules/base64-arraybuffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+      "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -8542,6 +8563,15 @@
       "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==",
       "license": "MIT"
     },
+    "node_modules/css-line-break": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz",
+      "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
+      "license": "MIT",
+      "dependencies": {
+        "utrie": "^1.0.2"
+      }
+    },
     "node_modules/css-select": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.2.2.tgz",
@@ -11622,6 +11652,19 @@
         "entities": "^4.4.0"
       }
     },
+    "node_modules/html2canvas": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
+      "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
+      "license": "MIT",
+      "dependencies": {
+        "css-line-break": "^2.1.0",
+        "text-segmentation": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/htmlparser2": {
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz",
@@ -17119,9 +17162,9 @@
       }
     },
     "node_modules/react-native-actions-sheet": {
-      "version": "10.0.0-alpha.8",
-      "resolved": "https://registry.npmjs.org/react-native-actions-sheet/-/react-native-actions-sheet-10.0.0-alpha.8.tgz",
-      "integrity": "sha512-olKqucpGaxP/kiO2/nw0uPXn69ZdWWhcHFzu2tcv5RBMl+PhRv870HuODbE21X4jXY/fWTG6FwPJqRqWpKkY8A==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/react-native-actions-sheet/-/react-native-actions-sheet-10.1.0.tgz",
+      "integrity": "sha512-pfbfWs2YqdF3Vo7Cx6LUsDQ/uS3iw8H64iFxZvtLXhZ3cVHWundJ903sZtadzJC+TpQIRV7NQsdnhErhf+wBlg==",
       "license": "MIT",
       "peerDependencies": {
         "react-native": "*",
@@ -17644,13 +17687,10 @@
       }
     },
     "node_modules/react-native-mmkv-storage": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-12.0.0.tgz",
-      "integrity": "sha512-sssZInILQBquytDDfjosjEdvevwMPk3fqQQjdjfnH362IcsBsApvtT8yJS406Mz9aJ6VhqVsZw/awltsUuPSYg==",
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-12.0.1.tgz",
+      "integrity": "sha512-4I4NzjStuCqkeXGfJ7pcACNQ2FlZKlAQqeRvI80iZL7mQcaO5NMO26ILUk2f4LPEvxaT2ns+NcqPMZSj7L83ng==",
       "license": "MIT",
-      "bin": {
-        "mmkv-link": "autolink/postlink/run.js"
-      },
       "peerDependencies": {
         "react-native": "*"
       }
@@ -17700,20 +17740,10 @@
         }
       }
     },
-    "node_modules/react-native-pager-view": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/react-native-pager-view/-/react-native-pager-view-6.9.1.tgz",
-      "integrity": "sha512-uUT0MMMbNtoSbxe9pRvdJJKEi9snjuJ3fXlZhG8F2vVMOBJVt/AFtqMPUHu9yMflmqOr08PewKzj9EPl/Yj+Gw==",
-      "license": "MIT",
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
-      }
-    },
     "node_modules/react-native-pdf": {
-      "version": "6.7.7",
-      "resolved": "https://registry.npmjs.org/react-native-pdf/-/react-native-pdf-6.7.7.tgz",
-      "integrity": "sha512-D0ga/eyPsVWSPEBm622sGVZLl3gibxPmfm2cxsLcUrZ4WDSGR5HyGmvvWaR/m9wXEyIbD4J6q9qzuG6yObcSXw==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/react-native-pdf/-/react-native-pdf-7.0.3.tgz",
+      "integrity": "sha512-zDtF6CGXPAfGptQZqX7LQK3CVQrIGsD+rYuBnMK0sVmd8mrq7ciwmWXINT+d92emMtZ7+PLnx1IQZIdsh0fphA==",
       "license": "MIT",
       "dependencies": {
         "crypto-js": "4.2.0",
@@ -17788,19 +17818,18 @@
       }
     },
     "node_modules/react-native-reanimated": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-4.1.3.tgz",
-      "integrity": "sha512-GP8wsi1u3nqvC1fMab/m8gfFwFyldawElCcUSBJQgfrXeLmsPPUOpDw44lbLeCpcwUuLa05WTVePdTEwCLTUZg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-4.2.0.tgz",
+      "integrity": "sha512-frhu5b8/m/VvaMWz48V8RxcsXnE3hrlErQ5chr21MzAeDCpY4X14sQjvm+jvu3aOI+7Cz2atdRpyhhIuqxVaXg==",
       "license": "MIT",
       "dependencies": {
-        "react-native-is-edge-to-edge": "^1.2.1",
-        "semver": "7.7.2"
+        "react-native-is-edge-to-edge": "1.2.1",
+        "semver": "7.7.3"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0",
         "react": "*",
         "react-native": "*",
-        "react-native-worklets": ">=0.5.0"
+        "react-native-worklets": ">=0.7.0"
       }
     },
     "node_modules/react-native-reanimated-progress-bar": {
@@ -17815,9 +17844,9 @@
       }
     },
     "node_modules/react-native-reanimated/node_modules/semver": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -17859,9 +17888,9 @@
       }
     },
     "node_modules/react-native-screens": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-4.18.0.tgz",
-      "integrity": "sha512-mRTLWL7Uc1p/RFNveEIIrhP22oxHduC2ZnLr/2iHwBeYpGXR0rJZ7Bgc0ktxQSHRjWTPT70qc/7yd4r9960PBQ==",
+      "version": "4.19.0",
+      "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-4.19.0.tgz",
+      "integrity": "sha512-qSDAO3AL5bti0Ri7KZRSVmWlhDr8MV86N5GruiKVQfEL7Zx2nUi3Dl62lqHUAD/LnDvOPuDDsMHCfIpYSv3hPQ==",
       "license": "MIT",
       "dependencies": {
         "react-freeze": "^1.0.0",
@@ -17917,20 +17946,6 @@
         "react-native": ">=0.59.0"
       }
     },
-    "node_modules/react-native-tab-view": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/react-native-tab-view/-/react-native-tab-view-4.2.0.tgz",
-      "integrity": "sha512-TUbh7Yr0tE/99t1pJQLbQ+4/Px67xkT7/r3AhfV+93Q3WoUira0Lx7yuKUP2C118doqxub8NCLERwcqsHr29nQ==",
-      "license": "MIT",
-      "dependencies": {
-        "use-latest-callback": "^0.2.4"
-      },
-      "peerDependencies": {
-        "react": ">= 18.2.0",
-        "react-native": "*",
-        "react-native-pager-view": ">= 6.0.0"
-      }
-    },
     "node_modules/react-native-theme-switch-animation": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/react-native-theme-switch-animation/-/react-native-theme-switch-animation-0.6.0.tgz",
@@ -18058,6 +18073,19 @@
         "node": ">=10"
       }
     },
+    "node_modules/react-native-view-shot": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/react-native-view-shot/-/react-native-view-shot-4.0.3.tgz",
+      "integrity": "sha512-USNjYmED7C0me02c1DxKA0074Hw+y/nxo+xJKlffMvfUWWzL5ELh/TJA/pTnVqFurIrzthZDPtDM7aBFJuhrHQ==",
+      "license": "MIT",
+      "dependencies": {
+        "html2canvas": "^1.4.1"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
+      }
+    },
     "node_modules/react-native-webview": {
       "version": "13.16.0",
       "resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-13.16.0.tgz",
@@ -18082,33 +18110,49 @@
       }
     },
     "node_modules/react-native-worklets": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/react-native-worklets/-/react-native-worklets-0.6.1.tgz",
-      "integrity": "sha512-URca8l7c7Uog7gv4mcg9KILdJlnbvwdS5yfXQYf5TDkD2W1VY1sduEKrD+sA3lUPXH/TG1vmXAvNxCNwPMYgGg==",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/react-native-worklets/-/react-native-worklets-0.7.1.tgz",
+      "integrity": "sha512-KNsvR48ULg73QhTlmwPbdJLPsWcyBotrGPsrDRDswb5FYpQaJEThUKc2ncXE4UM5dn/ewLoQHjSjLaKUVPxPhA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/plugin-transform-arrow-functions": "^7.0.0-0",
-        "@babel/plugin-transform-class-properties": "^7.0.0-0",
-        "@babel/plugin-transform-classes": "^7.0.0-0",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.0.0-0",
-        "@babel/plugin-transform-optional-chaining": "^7.0.0-0",
-        "@babel/plugin-transform-shorthand-properties": "^7.0.0-0",
-        "@babel/plugin-transform-template-literals": "^7.0.0-0",
-        "@babel/plugin-transform-unicode-regex": "^7.0.0-0",
-        "@babel/preset-typescript": "^7.16.7",
-        "convert-source-map": "^2.0.0",
-        "semver": "7.7.2"
+        "@babel/plugin-transform-arrow-functions": "7.27.1",
+        "@babel/plugin-transform-class-properties": "7.27.1",
+        "@babel/plugin-transform-classes": "7.28.4",
+        "@babel/plugin-transform-nullish-coalescing-operator": "7.27.1",
+        "@babel/plugin-transform-optional-chaining": "7.27.1",
+        "@babel/plugin-transform-shorthand-properties": "7.27.1",
+        "@babel/plugin-transform-template-literals": "7.27.1",
+        "@babel/plugin-transform-unicode-regex": "7.27.1",
+        "@babel/preset-typescript": "7.27.1",
+        "convert-source-map": "2.0.0",
+        "semver": "7.7.3"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0",
+        "@babel/core": "*",
         "react": "*",
         "react-native": "*"
       }
     },
+    "node_modules/react-native-worklets/node_modules/@babel/plugin-transform-optional-chaining": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.27.1.tgz",
+      "integrity": "sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/react-native-worklets/node_modules/semver": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -20255,6 +20299,15 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/text-segmentation": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
+      "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
+      "license": "MIT",
+      "dependencies": {
+        "utrie": "^1.0.2"
+      }
+    },
     "node_modules/thingies": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/thingies/-/thingies-2.5.0.tgz",
@@ -21066,6 +21119,15 @@
         "node": ">= 0.4.0"
       }
     },
+    "node_modules/utrie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz",
+      "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
+      "license": "MIT",
+      "dependencies": {
+        "base64-arraybuffer": "^1.0.2"
+      }
+    },
     "node_modules/uuid": {
       "version": "11.1.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",

apps/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notesnook/mobile",
-  "version": "3.3.10-beta.0",
+  "version": "3.3.12",
   "private": true,
   "license": "GPL-3.0-or-later",
   "scripts": {
@@ -26,12 +26,13 @@
     "react": "19.1.1"
   },
   "dependencies": {
-    "@ammarahmed/notifee-react-native": "7.4.9",
+    "@ammarahmed/notifee-react-native": "^7.4.11",
     "@ammarahmed/react-native-background-fetch": "^4.2.2",
     "@ammarahmed/react-native-eventsource": "1.1.0",
     "@ammarahmed/react-native-fingerprint-scanner": "^5.0.1",
     "@ammarahmed/react-native-share-extension": "^2.9.5",
     "@ammarahmed/react-native-sodium": "^1.6.8",
+    "@ammarahmed/react-native-upload": "^6.29.0",
     "@azure/core-asynciterator-polyfill": "^1.0.2",
     "@bam.tech/react-native-image-resizer": "3.0.11",
     "@callstack/repack": "~5.2.1",
@@ -57,7 +58,7 @@
     "@react-native-community/datetimepicker": "^8.4.5",
     "@react-native-community/netinfo": "^11.4.1",
     "@react-native-community/toolbar-android": "^0.2.1",
-    "@react-native-documents/picker": "^10.1.7",
+    "@react-native-documents/picker": "^11.0.3",
     "@react-native-masked-view/masked-view": "^0.3.2",
     "@react-navigation/elements": "^1.3.3",
     "@react-navigation/native": "^6.0.10",
@@ -87,7 +88,7 @@
     "react": "19.1.1",
     "react-async-hook": "^4.0.0",
     "react-native": "0.82.1",
-    "react-native-actions-sheet": "10.0.0-alpha.8",
+    "react-native-actions-sheet": "^10.1.0",
     "react-native-actions-shortcuts": "^1.0.1",
     "react-native-background-actions": "^2.6.6",
     "react-native-begin-background-task": "github:blockfirm/react-native-begin-background-task",
@@ -112,35 +113,34 @@
     "react-native-keyboard-aware-scroll-view": "^0.9.5",
     "react-native-keychain": "4.0.5",
     "react-native-material-menu": "^2.0.0",
-    "react-native-mmkv-storage": "^12.0.0",
+    "react-native-mmkv-storage": "^12.0.1",
     "react-native-modal-datetime-picker": "14.0.0",
     "react-native-navigation-bar-color": "2.0.2",
     "react-native-notification-sounds": "0.5.5",
     "react-native-orientation-locker": "^1.7.0",
-    "react-native-pager-view": "^6.5.1",
-    "react-native-pdf": "6.7.7",
+    "react-native-pdf": "^7.0.3",
     "react-native-privacy-snapshot": "github:standardnotes/react-native-privacy-snapshot",
     "react-native-progress": "5.0.0",
     "react-native-qrcode-svg": "^6.0.6",
     "react-native-quick-sqlite": "^8.2.7",
-    "react-native-reanimated": "^4.1.3",
+    "react-native-reanimated": "^4.2.0",
     "react-native-reanimated-progress-bar": "1.0.1",
     "react-native-safe-area-context": "^5.6.1",
     "react-native-scoped-storage": "^1.9.5",
     "react-native-screenguard": "1.0.0",
-    "react-native-screens": "^4.16.0",
+    "react-native-screens": "^4.19.0",
     "react-native-securerandom": "^1.0.1",
     "react-native-share": "^12.0.3",
     "react-native-svg": "^15.12.0",
     "react-native-swiper-flatlist": "3.2.2",
-    "react-native-tab-view": "^4.1.3",
     "react-native-theme-switch-animation": "^0.6.0",
     "react-native-tooltips": "^1.0.3",
     "react-native-url-polyfill": "^2.0.0",
     "react-native-vector-icons": "10.3.0",
+    "react-native-view-shot": "^4.0.3",
     "react-native-webview": "^13.13.5",
     "react-native-wheel-color-picker": "^1.3.1",
-    "react-native-worklets": "^0.6.1",
+    "react-native-worklets": "^0.7.1",
     "react-native-zip-archive": "6.0.9",
     "timeago.js": "4.0.2",
     "toggle-switch-react-native": "3.2.0",

apps/mobile/patches/react-native+0.82.1.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js b/node_modules/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js
+index 6eca156..5a42107 100644
+--- a/node_modules/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js
++++ b/node_modules/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js
+@@ -208,7 +208,7 @@ class KeyboardAvoidingView extends React.Component<
+       ];
+     } else {
+       this._subscriptions = [
+-        Keyboard.addListener('keyboardDidHide', this._onKeyboardChange),
++        Keyboard.addListener('keyboardDidHide', this._onKeyboardHide),
+         Keyboard.addListener('keyboardDidShow', this._onKeyboardChange),
+       ];
+     }

apps/mobile/patches/react-native-actions-shortcuts+1.0.1.patch

@@ -1,3 +1,22 @@
+diff --git a/node_modules/react-native-actions-shortcuts/android/.settings/org.eclipse.buildship.core.prefs b/node_modules/react-native-actions-shortcuts/android/.settings/org.eclipse.buildship.core.prefs
+deleted file mode 100644
+index 8c253d6..0000000
+--- a/node_modules/react-native-actions-shortcuts/android/.settings/org.eclipse.buildship.core.prefs
++++ /dev/null
+@@ -1,13 +0,0 @@
+-arguments=
+-auto.sync=false
+-build.scans.enabled=false
+-connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.0))
+-connection.project.dir=
+-eclipse.preferences.version=1
+-gradle.user.home=
+-java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home
+-jvm.arguments=
+-offline.mode=false
+-override.workspace.settings=true
+-show.console.view=true
+-show.executions.view=true
 diff --git a/node_modules/react-native-actions-shortcuts/android/build.gradle b/node_modules/react-native-actions-shortcuts/android/build.gradle
 index 19bd311..642ddbc 100644
 --- a/node_modules/react-native-actions-shortcuts/android/build.gradle
@@ -3788,7 +3807,7 @@ index b438823..ba03915 100644
          }
  
 diff --git a/node_modules/react-native-actions-shortcuts/android/src/main/java/com/reactnativeshortcuts/ShortcutsModule.kt b/node_modules/react-native-actions-shortcuts/android/src/main/java/com/reactnativeshortcuts/ShortcutsModule.kt
-index ec847cc..a4686a0 100644
+index ec847cc..f101793 100644
 --- a/node_modules/react-native-actions-shortcuts/android/src/main/java/com/reactnativeshortcuts/ShortcutsModule.kt
 +++ b/node_modules/react-native-actions-shortcuts/android/src/main/java/com/reactnativeshortcuts/ShortcutsModule.kt
 @@ -28,18 +28,18 @@ class ShortcutsModule(reactContext: ReactApplicationContext) :
@@ -3853,7 +3872,7 @@ index ec847cc..a4686a0 100644
          shortcutManager?.removeAllDynamicShortcuts()
      }
  
-@@ -145,6 +145,19 @@ class ShortcutsModule(reactContext: ReactApplicationContext) :
+@@ -145,6 +145,17 @@ class ShortcutsModule(reactContext: ReactApplicationContext) :
      fun isSupported(): Boolean {
          return Build.VERSION.SDK_INT >= 25
      }
@@ -3863,9 +3882,7 @@ index ec847cc..a4686a0 100644
 +        requestCode: Int,
 +        resultCode: Int,
 +        data: Intent?
-+    ) {
-+        TODO("Not yet implemented")
-+    }
++    ) {}
 +
 +    override fun onNewIntent(intent: Intent) {
 +        emitEvent(intent)

apps/mobile/patches/react-native-gesture-handler+2.28.0.patch

@@ -0,0 +1,12 @@
+diff --git a/node_modules/react-native-gesture-handler/android/build.gradle b/node_modules/react-native-gesture-handler/android/build.gradle
+index ac149a0..37f620c 100644
+--- a/node_modules/react-native-gesture-handler/android/build.gradle
++++ b/node_modules/react-native-gesture-handler/android/build.gradle
+@@ -187,6 +187,7 @@ android {
+         exclude "**/libreactnative.so"
+         exclude "**/libjsi.so"
+         exclude "**/libc++_shared.so"
++        exclude "**/libfbjni.so"
+     }
+ 
+     sourceSets.main {

apps/mobile/patches/react-native-pdf+6.7.7.patch

@@ -1,72 +0,0 @@
-diff --git a/node_modules/react-native-pdf/android/.gradle/5.6.1/fileChanges/last-build.bin b/node_modules/react-native-pdf/android/.gradle/5.6.1/fileChanges/last-build.bin
-deleted file mode 100644
-index f76dd23..0000000
-Binary files a/node_modules/react-native-pdf/android/.gradle/5.6.1/fileChanges/last-build.bin and /dev/null differ
-diff --git a/node_modules/react-native-pdf/android/.gradle/5.6.1/fileHashes/fileHashes.lock b/node_modules/react-native-pdf/android/.gradle/5.6.1/fileHashes/fileHashes.lock
-deleted file mode 100644
-index 52d8866..0000000
-Binary files a/node_modules/react-native-pdf/android/.gradle/5.6.1/fileHashes/fileHashes.lock and /dev/null differ
-diff --git a/node_modules/react-native-pdf/android/.gradle/5.6.1/gc.properties b/node_modules/react-native-pdf/android/.gradle/5.6.1/gc.properties
-deleted file mode 100644
-index e69de29..0000000
-diff --git a/node_modules/react-native-pdf/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/node_modules/react-native-pdf/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
-deleted file mode 100644
-index 1508dc9..0000000
-Binary files a/node_modules/react-native-pdf/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ
-diff --git a/node_modules/react-native-pdf/android/.gradle/buildOutputCleanup/cache.properties b/node_modules/react-native-pdf/android/.gradle/buildOutputCleanup/cache.properties
-deleted file mode 100644
-index f4a32a7..0000000
---- a/node_modules/react-native-pdf/android/.gradle/buildOutputCleanup/cache.properties
-+++ /dev/null
-@@ -1,2 +0,0 @@
--#Sat Oct 12 21:44:37 CST 2019
--gradle.version=5.6.1
-diff --git a/node_modules/react-native-pdf/android/.gradle/vcs-1/gc.properties b/node_modules/react-native-pdf/android/.gradle/vcs-1/gc.properties
-deleted file mode 100644
-index e69de29..0000000
-diff --git a/node_modules/react-native-pdf/android/build.gradle b/node_modules/react-native-pdf/android/build.gradle
-index 3dfe1dc..70ef9da 100644
---- a/node_modules/react-native-pdf/android/build.gradle
-+++ b/node_modules/react-native-pdf/android/build.gradle
-@@ -126,6 +126,6 @@ dependencies {
-     // The repo from zacharee is based on PdfiumAndroidKt, a much newer fork of PdfiumAndroid, with better maintenance and updated native libraries.
-     implementation 'com.github.zacharee:AndroidPdfViewer:4.0.1'
-     // Depend on PdfiumAndroidKt directly so this can be updated independently of AndroidPdfViewer as updates are provided.
--    implementation 'io.legere:pdfiumandroid:1.0.24'
-+    implementation 'io.legere:pdfiumandroid:1.0.32'
-     implementation 'com.google.code.gson:gson:2.8.5'
- }
-diff --git a/node_modules/react-native-pdf/android/src/main/java/org/wonday/pdf/PdfView.java b/node_modules/react-native-pdf/android/src/main/java/org/wonday/pdf/PdfView.java
-index 7b7a125..361924b 100644
---- a/node_modules/react-native-pdf/android/src/main/java/org/wonday/pdf/PdfView.java
-+++ b/node_modules/react-native-pdf/android/src/main/java/org/wonday/pdf/PdfView.java
-@@ -12,6 +12,8 @@ import java.io.File;
- 
- import android.content.ContentResolver;
- import android.content.Context;
-+import android.os.Handler;
-+import android.os.Looper;
- import android.util.SizeF;
- import android.view.View;
- import android.view.ViewGroup;
-@@ -105,7 +107,7 @@ public class PdfView extends PDFView implements OnPageChangeListener,OnLoadCompl
-         TopChangeEvent tce = new TopChangeEvent(surfaceId, getId(), event);
- 
-         if (dispatcher != null) {
--            dispatcher.dispatchEvent(tce);
-+            new Handler(Looper.getMainLooper()).postDelayed(() -> dispatcher.dispatchEvent(tce), 10);
-         }
- 
- //        ReactContext reactContext = (ReactContext)this.getContext();
-diff --git a/node_modules/react-native-pdf/index.js b/node_modules/react-native-pdf/index.js
-index 56df005..dd14412 100644
---- a/node_modules/react-native-pdf/index.js
-+++ b/node_modules/react-native-pdf/index.js
-@@ -364,7 +364,6 @@ export default class Pdf extends Component {
-     }
- 
-     _onChange = (event) => {
--
-         let message = event.nativeEvent.message.split('|');
-         //__DEV__ && console.log("onChange: " + message);
-         if (message.length > 0) {

apps/mobile/rspack.config.js

@@ -155,39 +155,8 @@ module.exports = (env) => {
           type: "javascript/auto"
         },
         ...Repack.getAssetTransformRules({
-          inline: true
-        }),
-
-        /**
-         * This loader handles all static assets (images, video, audio and others), so that you can
-         * use (reference) them inside your application.
-         *
-         * If you wan to handle specific asset type manually, filter out the extension
-         * from `ASSET_EXTENSIONS`, for example:
-         * ```
-         * Repack.ASSET_EXTENSIONS.filter((ext) => ext !== 'svg')
-         * ```
-         */
-        {
-          test: Repack.getAssetExtensionsRegExp(
-            Repack.ASSET_EXTENSIONS.filter((ext) => ext !== "svg")
-          ),
-          use: {
-            loader: "@callstack/repack/assets-loader"
-          }
-        },
-        {
-          test: /\.svg$/,
-          use: [
-            {
-              loader: "@svgr/webpack",
-              options: {
-                native: true,
-                dimensions: false
-              }
-            }
-          ]
-        }
+          inline: false
+        })
       ]
     },
     plugins: [