From 3421627f31f6d21c359a68487723880a21616103 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Mon, 4 May 2026 14:12:56 +0500
Subject: [PATCH 01/39] mobile: show error if passwords do not match or fields
 empty

---
 apps/mobile/app/components/auth/signup.tsx | 42 ++++++++++++++++++----
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/apps/mobile/app/components/auth/signup.tsx b/apps/mobile/app/components/auth/signup.tsx
index d3ae56f3a..d936ad17c 100644
--- a/apps/mobile/app/components/auth/signup.tsx
+++ b/apps/mobile/app/components/auth/signup.tsx
@@ -46,6 +46,8 @@ import { AuthHeader } from "./header";
 import { SignupContext } from "./signup-context";
 import { RouteParams } from "../../stores/use-navigation-store";
 import SettingsService from "../../services/settings";
+import AppIcon from "../ui/AppIcon";
+import isEmail from "validator/lib/isEmail";
 
 const SignupSteps = {
   signup: 0,
@@ -69,6 +71,7 @@ export const Signup = ({
   const confirmPasswordInputRef = useRef<TextInput>(null);
   const confirmPassword = useRef<string>(undefined);
   const [error, setError] = useState(false);
+  const [errorMessage, setErrorMessage] = useState<string>();
   const [loading, setLoading] = useState(false);
   const setUser = useUserStore((state) => state.setUser);
   const setLastSynced = useUserStore((state) => state.setLastSynced);
@@ -78,13 +81,17 @@ export const Signup = ({
 
   const validateInfo = () => {
     if (!password.current || !email.current || !confirmPassword.current) {
-      ToastManager.show({
-        heading: strings.allFieldsRequired(),
-        message: strings.allFieldsRequiredDesc(),
-        type: "error",
-        context: "local"
-      });
+      setErrorMessage(strings.allFieldsRequiredDesc());
+      return false;
+    }
 
+    if (!isEmail(email.current)) {
+      setErrorMessage(strings.emailInvalid());
+      return false;
+    }
+
+    if (password.current !== confirmPassword.current) {
+      setErrorMessage(strings.passwordNotMatched());
       return false;
     }
 
@@ -92,6 +99,7 @@ export const Signup = ({
   };
 
   const signup = async () => {
+    setErrorMessage(undefined);
     if (!validateInfo() || error) return;
     if (loading) return;
 
@@ -277,6 +285,7 @@ export const Signup = ({
                   blurOnSubmit={false}
                   validationType="confirmPassword"
                   customValidator={() => password.current || ""}
+                  errorMessage={strings.passwordNotMatched()}
                   placeholder={strings.confirmPassword()}
                   marginBottom={12}
                   onSubmit={() => {
@@ -285,7 +294,7 @@ export const Signup = ({
                 />
 
                 <Button
-                  title={!loading ? "Continue" : null}
+                  title={!loading ? strings.continue() : null}
                   type="accent"
                   loading={loading}
                   onPress={() => {
@@ -319,6 +328,25 @@ export const Signup = ({
                     </Paragraph>
                   </Paragraph>
                 </TouchableOpacity>
+
+                {errorMessage ? (
+                  <Paragraph
+                    numberOfLines={4}
+                    onPress={() => {}}
+                    color={colors.error.accent}
+                    style={{
+                      textAlign: "center",
+                      marginTop: DefaultAppStyles.GAP_VERTICAL
+                    }}
+                  >
+                    <AppIcon
+                      color={colors.error.accent}
+                      name="alert-circle-outline"
+                      size={AppFontSize.sm - 1}
+                    />{" "}
+                    {errorMessage}
+                  </Paragraph>
+                ) : null}
               </View>
 
               <View

From 2ad39048daec8dd4478a43871402ba2dcb5a0247 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Tue, 5 May 2026 13:47:37 +0500
Subject: [PATCH 02/39] mobile: fix form validation in login, signup and forgot
 password

---
 .../app/components/auth/forgot-password.tsx   |  37 +-
 apps/mobile/app/components/auth/login.tsx     |  79 +++-
 apps/mobile/app/components/auth/signup.tsx    | 110 +++--
 apps/mobile/app/components/auth/use-login.ts  |   9 +-
 .../app/components/ui/input/form-input.tsx    | 404 ++++++++++++++++++
 apps/mobile/app/components/ui/input/index.tsx |   4 +-
 packages/intl/locale/en.po                    |  13 +-
 packages/intl/locale/pseudo-LOCALE.po         |  11 +-
 packages/intl/src/strings.ts                  |   5 +-
 9 files changed, 566 insertions(+), 106 deletions(-)
 create mode 100644 apps/mobile/app/components/ui/input/form-input.tsx

diff --git a/apps/mobile/app/components/auth/forgot-password.tsx b/apps/mobile/app/components/auth/forgot-password.tsx
index 85ced9c76..331d3c508 100644
--- a/apps/mobile/app/components/auth/forgot-password.tsx
+++ b/apps/mobile/app/components/auth/forgot-password.tsx
@@ -27,7 +27,7 @@ import { useThemeColors } from "@notesnook/theme";
 import DialogHeader from "../dialog/dialog-header";
 import { Button } from "../ui/button";
 import { IconButton } from "../ui/icon-button";
-import Input from "../ui/input";
+import FormInput, { createFormRef, validators } from "../ui/input/form-input";
 import Seperator from "../ui/seperator";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
@@ -36,14 +36,17 @@ import { DefaultAppStyles } from "../../utils/styles";
 
 export const ForgotPassword = ({ userEmail }: { userEmail: string }) => {
   const { colors } = useThemeColors("sheet");
-  const email = useRef<string>(userEmail);
+  const formRef = useRef(
+    createFormRef({
+      email: userEmail || ""
+    })
+  ).current;
   const emailInputRef = useRef<TextInput>(null);
-  const [error, setError] = useState(false);
   const [loading, setLoading] = useState(false);
   const [sent, setSent] = useState(false);
 
   const sendRecoveryEmail = async () => {
-    if (!email.current || error) {
+    if (formRef.validateField("email")) {
       ToastManager.show({
         heading: strings.emailRequired(),
         type: "error",
@@ -51,6 +54,9 @@ export const ForgotPassword = ({ userEmail }: { userEmail: string }) => {
       });
       return;
     }
+
+    const values = formRef.getValues();
+
     setLoading(true);
     try {
       const lastRecoveryEmailTime = SettingsService.get().lastRecoveryEmailTime;
@@ -60,7 +66,7 @@ export const ForgotPassword = ({ userEmail }: { userEmail: string }) => {
       ) {
         throw new Error(strings.pleaseWaitBeforeSendEmail());
       }
-      await db.user.recoverAccount(email.current.toLowerCase());
+      await db.user.recoverAccount(values.email.toLowerCase());
       SettingsService.set({
         lastRecoveryEmailTime: Date.now()
       });
@@ -126,22 +132,25 @@ export const ForgotPassword = ({ userEmail }: { userEmail: string }) => {
           <DialogHeader title={strings.accountRecovery()} />
           <Seperator />
 
-          <Input
+          <FormInput
+            name="email"
+            formRef={formRef}
             fwdRef={emailInputRef}
-            onChangeText={(value) => {
-              email.current = value;
-            }}
-            defaultValue={email.current}
-            onErrorCheck={(e) => setError(e)}
+            loading={loading}
             returnKeyLabel={strings.next()}
             returnKeyType="next"
             autoComplete="email"
-            validationType="email"
+            keyboardType="email-address"
             autoCorrect={false}
             autoCapitalize="none"
-            errorMessage={strings.emailInvalid()}
             placeholder={strings.email()}
-            onSubmit={() => {}}
+            validators={[
+              validators.required(strings.emailRequired()),
+              validators.email(strings.enterAValidEmailAddress())
+            ]}
+            onSubmitEditing={() => {
+              sendRecoveryEmail();
+            }}
           />
 
           <Button
diff --git a/apps/mobile/app/components/auth/login.tsx b/apps/mobile/app/components/auth/login.tsx
index efa44ba28..546048c34 100644
--- a/apps/mobile/app/components/auth/login.tsx
+++ b/apps/mobile/app/components/auth/login.tsx
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import { RouteProp, useRoute } from "@react-navigation/native";
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { TouchableOpacity, View, useWindowDimensions } from "react-native";
 import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
 import { DDS } from "../../services/device-detection";
@@ -38,13 +38,14 @@ import { sleep } from "../../utils/time";
 import { Dialog } from "../dialog";
 import { Progress } from "../sheets/progress";
 import { Button } from "../ui/button";
-import Input from "../ui/input";
+import FormInput, { createFormRef, validators } from "../ui/input/form-input";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { hideAuth } from "./common";
 import { ForgotPassword } from "./forgot-password";
 import { AuthHeader } from "./header";
 import { useLogin } from "./use-login";
+import AppIcon from "../ui/AppIcon";
 
 const LoginSteps = {
   emailAuth: 1,
@@ -69,8 +70,8 @@ export const Login = ({
     passwordInputRef,
     loading,
     setLoading,
-    setError,
-    login
+    login,
+    error
   } = useLogin(async () => {
     eSendEvent(eUserLoggedIn, true);
     await sleep(500);
@@ -93,6 +94,27 @@ export const Login = ({
   });
   const { width, height } = useWindowDimensions();
   const isTablet = width > 600;
+  const formRef = useRef(
+    createFormRef({
+      email: "",
+      password: ""
+    })
+  ).current;
+
+  const canContinue = () => {
+    if (step === LoginSteps.emailAuth) {
+      return !formRef.validateField("email");
+    }
+
+    return formRef.validate();
+  };
+
+  const onContinue = () => {
+    if (loading) return;
+    if (!canContinue()) return;
+    login();
+  };
+
   useEffect(() => {
     async () => {
       setStep(LoginSteps.emailAuth);
@@ -198,27 +220,30 @@ export const Login = ({
               gap: DefaultAppStyles.GAP_VERTICAL
             }}
           >
-            <Input
+            <FormInput
+              name="email"
+              formRef={formRef}
               fwdRef={emailInputRef}
               onChangeText={(value) => {
                 email.current = value;
               }}
               testID="input.email"
-              onErrorCheck={(e) => setError(e)}
               returnKeyLabel="Next"
               returnKeyType="next"
               autoComplete="email"
-              validationType="email"
+              keyboardType="email-address"
               marginBottom={0}
               autoCorrect={false}
               autoCapitalize="none"
-              errorMessage={strings.emailInvalid()}
               placeholder={strings.email()}
-              defaultValue={email.current}
               editable={step === LoginSteps.emailAuth && !loading}
-              onSubmit={() => {
+              validators={[
+                validators.required(strings.emailRequired()),
+                validators.email(strings.enterAValidEmailAddress())
+              ]}
+              onSubmitEditing={() => {
                 if (step === LoginSteps.emailAuth) {
-                  login();
+                  onContinue();
                 } else {
                   passwordInputRef.current?.focus();
                 }
@@ -227,7 +252,9 @@ export const Login = ({
 
             {step === LoginSteps.passwordAuth && (
               <>
-                <Input
+                <FormInput
+                  name="password"
+                  formRef={formRef}
                   fwdRef={passwordInputRef}
                   onChangeText={(value) => {
                     password.current = value;
@@ -242,9 +269,9 @@ export const Login = ({
                   placeholder={strings.password()}
                   marginBottom={0}
                   editable={!loading}
-                  defaultValue={password.current}
-                  onSubmit={() => {
-                    login();
+                  validators={[validators.required(strings.passwordRequired())]}
+                  onSubmitEditing={() => {
+                    onContinue();
                   }}
                 />
                 <Button
@@ -273,8 +300,7 @@ export const Login = ({
               <Button
                 loading={loading}
                 onPress={() => {
-                  if (loading) return;
-                  login();
+                  onContinue();
                 }}
                 style={{
                   width: "100%"
@@ -328,6 +354,25 @@ export const Login = ({
                   </Paragraph>
                 </TouchableOpacity>
               ) : null}
+
+              {error ? (
+                <Paragraph
+                  numberOfLines={4}
+                  onPress={() => {}}
+                  color={colors.error.accent}
+                  style={{
+                    textAlign: "center",
+                    marginTop: DefaultAppStyles.GAP_VERTICAL
+                  }}
+                >
+                  <AppIcon
+                    color={colors.error.accent}
+                    name="alert-circle-outline"
+                    size={AppFontSize.sm - 1}
+                  />{" "}
+                  {error.message}
+                </Paragraph>
+              ) : null}
             </View>
           </View>
         </View>
diff --git a/apps/mobile/app/components/auth/signup.tsx b/apps/mobile/app/components/auth/signup.tsx
index d936ad17c..9b744d703 100644
--- a/apps/mobile/app/components/auth/signup.tsx
+++ b/apps/mobile/app/components/auth/signup.tsx
@@ -30,7 +30,6 @@ import {
 import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
 import { db } from "../../common/database";
 import { DDS } from "../../services/device-detection";
-import { ToastManager } from "../../services/event-manager";
 import { clearMessage, setEmailVerifyMessage } from "../../services/message";
 import Navigation from "../../services/navigation";
 import { useUserStore } from "../../stores/use-user-store";
@@ -39,7 +38,7 @@ import { AppFontSize } from "../../utils/size";
 import { DefaultAppStyles } from "../../utils/styles";
 import { Loading } from "../loading";
 import { Button } from "../ui/button";
-import Input from "../ui/input";
+import FormInput, { createFormRef, validators } from "../ui/input/form-input";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { AuthHeader } from "./header";
@@ -47,7 +46,6 @@ import { SignupContext } from "./signup-context";
 import { RouteParams } from "../../stores/use-navigation-store";
 import SettingsService from "../../services/settings";
 import AppIcon from "../ui/AppIcon";
-import isEmail from "validator/lib/isEmail";
 
 const SignupSteps = {
   signup: 0,
@@ -64,13 +62,16 @@ export const Signup = ({
 }) => {
   const [currentStep, setCurrentStep] = useState(SignupSteps.signup);
   const { colors } = useThemeColors();
-  const email = useRef<string>(undefined);
+  const formRef = useRef(
+    createFormRef({
+      email: "",
+      password: "",
+      confirmPassword: ""
+    })
+  ).current;
   const emailInputRef = useRef<TextInput>(null);
   const passwordInputRef = useRef<TextInput>(null);
-  const password = useRef<string>(undefined);
   const confirmPasswordInputRef = useRef<TextInput>(null);
-  const confirmPassword = useRef<string>(undefined);
-  const [error, setError] = useState(false);
   const [errorMessage, setErrorMessage] = useState<string>();
   const [loading, setLoading] = useState(false);
   const setUser = useUserStore((state) => state.setUser);
@@ -79,34 +80,17 @@ export const Signup = ({
   const isTablet = width > 600;
   const route = useRoute<RouteProp<RouteParams, "Auth">>();
 
-  const validateInfo = () => {
-    if (!password.current || !email.current || !confirmPassword.current) {
-      setErrorMessage(strings.allFieldsRequiredDesc());
-      return false;
-    }
-
-    if (!isEmail(email.current)) {
-      setErrorMessage(strings.emailInvalid());
-      return false;
-    }
-
-    if (password.current !== confirmPassword.current) {
-      setErrorMessage(strings.passwordNotMatched());
-      return false;
-    }
-
-    return true;
-  };
-
   const signup = async () => {
     setErrorMessage(undefined);
-    if (!validateInfo() || error) return;
+    if (!formRef.validate()) return;
     if (loading) return;
 
+    const values = formRef.getValues();
+
     setLoading(true);
     try {
       setCurrentStep(SignupSteps.createAccount);
-      await db.user.signup(email.current!.toLowerCase(), password.current!);
+      await db.user.signup(values.email.toLowerCase(), values.password);
       const user = await db.user.getUser();
       setUser(user);
       setLastSynced(await db.lastSynced());
@@ -123,12 +107,14 @@ export const Signup = ({
     } catch (e) {
       setCurrentStep(SignupSteps.signup);
       setLoading(false);
-      ToastManager.show({
-        heading: strings.signupFailed(),
-        message: (e as Error).message,
-        type: "error",
-        context: "local"
-      });
+      if (
+        (e as Error).message === "Unable to create an account on this email."
+      ) {
+        formRef.setError("email", (e as Error).message);
+      } else {
+        setErrorMessage((e as Error).message);
+      }
+
       return false;
     }
   };
@@ -223,37 +209,35 @@ export const Signup = ({
                   alignSelf: "center"
                 }}
               >
-                <Input
+                <FormInput
+                  name="email"
+                  formRef={formRef}
                   fwdRef={emailInputRef}
-                  onChangeText={(value) => {
-                    email.current = value;
-                  }}
-                  defaultValue={email.current}
+                  loading={loading}
                   testID="input.email"
-                  onErrorCheck={(e) => setError(e)}
                   returnKeyLabel="Next"
                   returnKeyType="next"
                   autoComplete="email"
-                  validationType="email"
+                  keyboardType="email-address"
                   autoCorrect={false}
                   autoCapitalize="none"
-                  errorMessage={strings.emailInvalid()}
                   placeholder={strings.email()}
                   blurOnSubmit={false}
-                  onSubmit={() => {
-                    if (!email.current) return;
+                  validators={[
+                    validators.required(strings.emailRequired()),
+                    validators.email(strings.enterAValidEmailAddress())
+                  ]}
+                  onSubmitEditing={() => {
                     passwordInputRef.current?.focus();
                   }}
                 />
 
-                <Input
+                <FormInput
+                  name="password"
+                  formRef={formRef}
                   fwdRef={passwordInputRef}
-                  onChangeText={(value) => {
-                    password.current = value;
-                  }}
-                  defaultValue={password.current}
+                  loading={loading}
                   testID="input.password"
-                  onErrorCheck={(e) => setError(e)}
                   returnKeyLabel="Next"
                   returnKeyType="next"
                   secureTextEntry
@@ -262,20 +246,18 @@ export const Signup = ({
                   blurOnSubmit={false}
                   autoCorrect={false}
                   placeholder={strings.password()}
-                  onSubmit={() => {
-                    if (!password.current) return;
+                  validators={[validators.required(strings.passwordRequired())]}
+                  onSubmitEditing={() => {
                     confirmPasswordInputRef.current?.focus();
                   }}
                 />
 
-                <Input
+                <FormInput
+                  name="confirmPassword"
+                  formRef={formRef}
                   fwdRef={confirmPasswordInputRef}
-                  onChangeText={(value) => {
-                    confirmPassword.current = value;
-                  }}
-                  defaultValue={confirmPassword.current}
+                  loading={loading}
                   testID="input.confirmPassword"
-                  onErrorCheck={(e) => setError(e)}
                   returnKeyLabel="Signup"
                   returnKeyType="done"
                   secureTextEntry
@@ -283,12 +265,16 @@ export const Signup = ({
                   autoCapitalize="none"
                   autoCorrect={false}
                   blurOnSubmit={false}
-                  validationType="confirmPassword"
-                  customValidator={() => password.current || ""}
-                  errorMessage={strings.passwordNotMatched()}
                   placeholder={strings.confirmPassword()}
                   marginBottom={12}
-                  onSubmit={() => {
+                  validators={[
+                    validators.required(strings.confirmPasswordRequired()),
+                    validators.matchField(
+                      "password",
+                      strings.passwordNotMatched()
+                    )
+                  ]}
+                  onSubmitEditing={() => {
                     signup();
                   }}
                 />
diff --git a/apps/mobile/app/components/auth/use-login.ts b/apps/mobile/app/components/auth/use-login.ts
index f79fb3e78..a9180e849 100644
--- a/apps/mobile/app/components/auth/use-login.ts
+++ b/apps/mobile/app/components/auth/use-login.ts
@@ -39,7 +39,7 @@ export const useLogin = (
   onFinishLogin?: () => void,
   sessionExpired = false
 ) => {
-  const [error, setError] = useState(false);
+  const [error, setError] = useState<Error>();
   const [loading, setLoading] = useState(false);
   const setUser = useUserStore((state) => state.setUser);
   const [step, setStep] = useState(LoginSteps.emailAuth);
@@ -142,12 +142,7 @@ export const useLogin = (
   const finishWithError = async (e: Error) => {
     if (e.message === "invalid_grant") setStep(LoginSteps.emailAuth);
     setLoading(false);
-    ToastManager.show({
-      heading: strings.loginFailed(),
-      message: e.message,
-      type: "error",
-      context: "local"
-    });
+    setError(e);
   };
 
   const finishLogin = async () => {
diff --git a/apps/mobile/app/components/ui/input/form-input.tsx b/apps/mobile/app/components/ui/input/form-input.tsx
new file mode 100644
index 000000000..d070dd42d
--- /dev/null
+++ b/apps/mobile/app/components/ui/input/form-input.tsx
@@ -0,0 +1,404 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import React, { RefObject, useEffect, useMemo, useState } from "react";
+import {
+  ColorValue,
+  TextInput,
+  TextInputProps,
+  TouchableOpacity,
+  View,
+  ViewStyle
+} from "react-native";
+import isEmail from "validator/lib/isEmail";
+import isURL from "validator/lib/isURL";
+import { useThemeColors } from "@notesnook/theme";
+import { defaultBorderRadius, AppFontSize } from "../../../utils/size";
+import { DefaultAppStyles } from "../../../utils/styles";
+import { IconButton } from "../icon-button";
+import Paragraph from "../typography/paragraph";
+import AppIcon from "../AppIcon";
+
+export type FormValues = Record<string, string>;
+export type FormErrors = Partial<Record<string, string>>;
+export type FieldValidator = (
+  value: string,
+  values: FormValues
+) => string | undefined;
+export type ValidationSchema = Partial<Record<string, FieldValidator[]>>;
+
+export interface FormRef {
+  values: FormValues;
+  errors: FormErrors;
+  setValue: (name: string, value: string) => void;
+  getValue: (name: string) => string;
+  getValues: () => FormValues;
+  setError: (name: string, error?: string) => void;
+  getError: (name: string) => string | undefined;
+  clearErrors: () => void;
+  registerField: (name: string, validators?: FieldValidator[]) => void;
+  unregisterField: (name: string) => void;
+  validateField: (name: string) => string | undefined;
+  validate: () => boolean;
+  subscribe: (listener: () => void) => () => void;
+}
+
+export function createFormRef(initialValues: FormValues = {}): FormRef {
+  const listeners = new Set<() => void>();
+  const values: FormValues = { ...initialValues };
+  const errors: FormErrors = {};
+  const schema: ValidationSchema = {};
+
+  const notify = () => {
+    listeners.forEach((listener) => listener());
+  };
+
+  return {
+    values,
+    errors,
+    setValue(name, value) {
+      values[name] = value;
+      if (errors[name]) delete errors[name];
+      notify();
+    },
+    getValue(name) {
+      return values[name] ?? "";
+    },
+    getValues() {
+      return { ...values };
+    },
+    setError(name, error) {
+      if (!error) {
+        delete errors[name];
+      } else {
+        errors[name] = error;
+      }
+      notify();
+    },
+    getError(name) {
+      return errors[name];
+    },
+    clearErrors() {
+      Object.keys(errors).forEach((key) => delete errors[key]);
+      notify();
+    },
+    registerField(name, validators = []) {
+      schema[name] = validators;
+      if (values[name] === undefined) values[name] = "";
+    },
+    unregisterField(name) {
+      delete schema[name];
+      delete errors[name];
+      notify();
+    },
+    validateField(name) {
+      const fieldValidators = schema[name] || [];
+      const value = values[name] ?? "";
+      for (const validator of fieldValidators) {
+        const error = validator(value, values);
+        if (error) {
+          errors[name] = error;
+          notify();
+          return error;
+        }
+      }
+      delete errors[name];
+      notify();
+      return undefined;
+    },
+    validate() {
+      const nextErrors = validateForm(values, schema);
+      Object.keys(errors).forEach((key) => delete errors[key]);
+      Object.keys(nextErrors).forEach((key) => {
+        errors[key] = nextErrors[key];
+      });
+      notify();
+      return !hasFormErrors(nextErrors);
+    },
+    subscribe(listener) {
+      listeners.add(listener);
+      return () => {
+        listeners.delete(listener);
+      };
+    }
+  };
+}
+
+export function validateForm(
+  values: FormValues,
+  schema: ValidationSchema
+): FormErrors {
+  const errors: FormErrors = {};
+
+  Object.keys(schema).forEach((field) => {
+    const fieldValidators = schema[field] || [];
+    const value = values[field] ?? "";
+    for (const validator of fieldValidators) {
+      const error = validator(value, values);
+      if (error) {
+        errors[field] = error;
+        break;
+      }
+    }
+  });
+
+  return errors;
+}
+
+export function hasFormErrors(errors: FormErrors) {
+  return Object.keys(errors).length > 0;
+}
+
+export const validators = {
+  required:
+    (message = "This field is required") =>
+    (value: string) =>
+      value?.trim() ? undefined : message,
+
+  email:
+    (message = "Please enter a valid email") =>
+    (value: string) =>
+      !value?.trim() || isEmail(value.trim()) ? undefined : message,
+
+  minLength: (length: number, message?: string) => (value: string) =>
+    !value || value.length >= length
+      ? undefined
+      : message || `Must be at least ${length} characters`,
+
+  url:
+    (message = "Please enter a valid URL") =>
+    (value: string) =>
+      !value?.trim() || isURL(value.trim(), { allow_underscores: true })
+        ? undefined
+        : message,
+
+  matchField:
+    (fieldName: string, message = "Values do not match") =>
+    (value: string, values: FormValues) =>
+      value === values[fieldName] ? undefined : message
+};
+
+interface FormInputProps extends TextInputProps {
+  name: string;
+  formRef: FormRef;
+  validators?: FieldValidator[];
+  fwdRef?: RefObject<TextInput | null>;
+  loading?: boolean;
+  error?: string;
+  customColor?: ColorValue;
+  marginBottom?: number;
+  marginRight?: number;
+  button?: {
+    icon: string;
+    color: ColorValue;
+    onPress: () => void;
+    testID?: string;
+    size?: number;
+  };
+  buttons?: React.ReactNode;
+  buttonLeft?: React.ReactNode;
+  height?: number;
+  fontSize?: number;
+  inputStyle?: TextInputProps["style"];
+  containerStyle?: ViewStyle;
+  wrapperStyle?: ViewStyle;
+}
+
+export function FormInput({
+  name,
+  formRef,
+  validators: fieldValidators = [],
+  fwdRef,
+  loading,
+  error,
+  secureTextEntry,
+  customColor,
+  marginBottom = 10,
+  marginRight,
+  button,
+  buttonLeft,
+  buttons,
+  height = 45,
+  fontSize = AppFontSize.sm,
+  inputStyle = {},
+  containerStyle = {},
+  wrapperStyle = {},
+  onFocus,
+  onBlur,
+  onPress,
+  onChangeText,
+  ...restProps
+}: FormInputProps) {
+  const { colors, isDark } = useThemeColors();
+  const [focused, setFocused] = useState(false);
+  const [secureEntry, setSecureEntry] = useState(true);
+  const [, setVersion] = useState(0);
+
+  useEffect(() => {
+    formRef.registerField(name, fieldValidators);
+    const unsubscribe = formRef.subscribe(() => {
+      setVersion((v) => v + 1);
+    });
+
+    return () => {
+      unsubscribe();
+      formRef.unregisterField(name);
+    };
+  }, [fieldValidators, formRef, name]);
+
+  const value = formRef.getValue(name);
+  const fieldError = error || formRef.getError(name);
+
+  const borderColor = useMemo(() => {
+    if (fieldError) return colors.error.accent;
+    if (focused) return customColor || colors.selected.border;
+    return colors.primary.border;
+  }, [colors, customColor, fieldError, focused]);
+
+  const style: ViewStyle = {
+    borderWidth: 1,
+    borderRadius: defaultBorderRadius,
+    borderColor,
+    flexDirection: "row",
+    justifyContent: "space-between",
+    alignItems: "center",
+    paddingHorizontal: DefaultAppStyles.GAP,
+    ...containerStyle
+  };
+
+  const textStyle: TextInputProps["style"] = {
+    paddingHorizontal: 0,
+    fontSize,
+    color:
+      onPress && loading ? colors.primary.accent : colors.primary.paragraph,
+    flexGrow: 1,
+    flexShrink: 1,
+    paddingBottom: DefaultAppStyles.GAP_VERTICAL,
+    paddingTop: DefaultAppStyles.GAP_VERTICAL,
+    fontFamily: "Inter-Regular",
+    ...(inputStyle as ViewStyle)
+  };
+
+  const handleChangeText = (nextValue: string) => {
+    formRef.setValue(name, nextValue);
+    onChangeText?.(nextValue);
+  };
+
+  return (
+    <View
+      importantForAccessibility="yes"
+      style={{
+        marginBottom,
+        marginRight,
+        ...wrapperStyle
+      }}
+    >
+      <TouchableOpacity
+        disabled={!loading}
+        onPress={onPress}
+        activeOpacity={1}
+        style={style}
+      >
+        {buttonLeft}
+
+        <TextInput
+          {...restProps}
+          value={value}
+          ref={fwdRef}
+          editable={!loading && restProps.editable !== false}
+          onChangeText={handleChangeText}
+          onFocus={(e) => {
+            setFocused(true);
+            onFocus?.(e);
+          }}
+          onBlur={(e) => {
+            setFocused(false);
+            onBlur?.(e);
+          }}
+          keyboardAppearance={isDark ? "dark" : "light"}
+          style={textStyle}
+          secureTextEntry={secureTextEntry && secureEntry}
+          placeholderTextColor={colors.primary.placeholder}
+        />
+
+        <View
+          style={{
+            flexDirection: "row",
+            justifyContent: "center",
+            height: 35 > height ? height : 35,
+            alignItems: "center"
+          }}
+        >
+          {secureTextEntry && (
+            <IconButton
+              name="eye"
+              size={20}
+              top={10}
+              bottom={10}
+              onPress={() => {
+                fwdRef?.current?.blur();
+                setSecureEntry(!secureEntry);
+              }}
+              style={{
+                width: 25,
+                marginLeft: 5
+              }}
+              color={
+                secureEntry ? colors.secondary.icon : colors.primary.accent
+              }
+            />
+          )}
+
+          {buttons}
+
+          {button && (
+            <IconButton
+              testID={button.testID}
+              name={button.icon}
+              size={button.size || AppFontSize.xl}
+              top={10}
+              bottom={10}
+              onPress={button.onPress}
+              color={button.color}
+              style={{
+                marginRight: -8
+              }}
+            />
+          )}
+        </View>
+      </TouchableOpacity>
+
+      {fieldError ? (
+        <Paragraph
+          size={AppFontSize.xs}
+          style={{ marginTop: 5, color: colors.error.icon }}
+        >
+          <AppIcon
+            color={colors.error.accent}
+            name="alert-circle-outline"
+            size={AppFontSize.sm - 1}
+          />{" "}
+          {fieldError}
+        </Paragraph>
+      ) : null}
+    </View>
+  );
+}
+
+export default FormInput;
diff --git a/apps/mobile/app/components/ui/input/index.tsx b/apps/mobile/app/components/ui/input/index.tsx
index bca8d6a88..19da9fde2 100644
--- a/apps/mobile/app/components/ui/input/index.tsx
+++ b/apps/mobile/app/components/ui/input/index.tsx
@@ -121,8 +121,8 @@ const Input = ({
   const color = error
     ? colors.error.border
     : focus
-    ? customColor || colors.selected.border
-    : colors.primary.border;
+      ? customColor || colors.selected.border
+      : colors.primary.border;
 
   const validate = async (value: string) => {
     if (!validationType) return;
diff --git a/packages/intl/locale/en.po b/packages/intl/locale/en.po
index 4316660c9..a16f04684 100644
--- a/packages/intl/locale/en.po
+++ b/packages/intl/locale/en.po
@@ -1770,6 +1770,10 @@ msgstr "Confirm new password"
 msgid "Confirm password"
 msgstr "Confirm password"
 
+#: src/strings.ts:2661
+msgid "Confirm password required"
+msgstr "Confirm password required"
+
 #: src/strings.ts:1487
 msgid "Confirm pin"
 msgstr "Confirm pin"
@@ -4540,6 +4544,10 @@ msgstr "Password not entered"
 msgid "Password protection"
 msgstr "Password protection"
 
+#: src/strings.ts:2660
+msgid "Password required"
+msgstr "Password required"
+
 #: src/strings.ts:809
 msgid "Password updated"
 msgstr "Password updated"
@@ -4647,6 +4655,7 @@ msgid "Please enable automatic backups to avoid losing important data."
 msgstr "Please enable automatic backups to avoid losing important data."
 
 #: src/strings.ts:1512
+#: src/strings.ts:2662
 msgid "Please enter a valid email address"
 msgstr "Please enter a valid email address"
 
@@ -7662,8 +7671,8 @@ msgid "Your support request has been forwarded"
 msgstr "Your support request has been forwarded"
 
 #: src/strings.ts:2062
-msgid "Your support request has been forwarded to our support team. We will get back to you via email at {email}. If this email is not reachable or incorrect, please send us an email directly at support@notesnook.com."
-msgstr "Your support request has been forwarded to our support team. We will get back to you via email at {email}. If this email is not reachable or incorrect, please send us an email directly at support@notesnook.com."
+msgid "Your support request has been forwarded to our support team. We will get back to you via email as soon as possible. If you don't receive an email from us within 24-48 hours, please send us an email directly at support@notesnook.com."
+msgstr "Your support request has been forwarded to our support team. We will get back to you via email as soon as possible. If you don't receive an email from us within 24-48 hours, please send us an email directly at support@notesnook.com."
 
 #: src/strings.ts:956
 msgid "Your tags"
diff --git a/packages/intl/locale/pseudo-LOCALE.po b/packages/intl/locale/pseudo-LOCALE.po
index 709e5ab2a..2d924d193 100644
--- a/packages/intl/locale/pseudo-LOCALE.po
+++ b/packages/intl/locale/pseudo-LOCALE.po
@@ -1759,6 +1759,10 @@ msgstr ""
 msgid "Confirm password"
 msgstr ""
 
+#: src/strings.ts:2661
+msgid "Confirm password required"
+msgstr ""
+
 #: src/strings.ts:1487
 msgid "Confirm pin"
 msgstr ""
@@ -4514,6 +4518,10 @@ msgstr ""
 msgid "Password protection"
 msgstr ""
 
+#: src/strings.ts:2660
+msgid "Password required"
+msgstr ""
+
 #: src/strings.ts:809
 msgid "Password updated"
 msgstr ""
@@ -4621,6 +4629,7 @@ msgid "Please enable automatic backups to avoid losing important data."
 msgstr ""
 
 #: src/strings.ts:1512
+#: src/strings.ts:2662
 msgid "Please enter a valid email address"
 msgstr ""
 
@@ -7604,7 +7613,7 @@ msgid "Your support request has been forwarded"
 msgstr ""
 
 #: src/strings.ts:2062
-msgid "Your support request has been forwarded to our support team. We will get back to you via email at {email}. If this email is not reachable or incorrect, please send us an email directly at support@notesnook.com."
+msgid "Your support request has been forwarded to our support team. We will get back to you via email as soon as possible. If you don't receive an email from us within 24-48 hours, please send us an email directly at support@notesnook.com."
 msgstr ""
 
 #: src/strings.ts:956
diff --git a/packages/intl/src/strings.ts b/packages/intl/src/strings.ts
index ddfce1b9a..eca1169f3 100644
--- a/packages/intl/src/strings.ts
+++ b/packages/intl/src/strings.ts
@@ -2656,5 +2656,8 @@ Use this if changes from other devices are not appearing on this device. This wi
     t`Invalid recovery key. Make sure to input your account recovery key, not a 2FA recovery code.`,
   featureNotAvailable: () => t`This feature is not available on this plan.`,
   valueMustBeBetween: (min: number, max: number) =>
-    t`Value must be between ${min} and ${max}`
+    t`Value must be between ${min} and ${max}`,
+  passwordRequired: () => t`Password required`,
+  confirmPasswordRequired: () => t`Confirm password required`,
+  enterAValidEmailAddress: () => t`Please enter a valid email address`
 };

From 0801e732428a4d9d2ab5a06ffbbe8542ae337ddb Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Tue, 5 May 2026 19:06:42 +0500
Subject: [PATCH 03/39] mobile: fix login and signup flows

---
 .../app/components/auth/forgot-password.tsx   |  6 +--
 apps/mobile/app/components/auth/login.tsx     | 41 ++++----------
 .../app/components/auth/session-expired.tsx   | 42 +++++++--------
 apps/mobile/app/components/auth/signup.tsx    |  8 +--
 apps/mobile/app/components/auth/use-login.ts  | 53 ++++++++-----------
 .../list-items/headers/section-header.tsx     |  2 -
 .../app/components/list/list-item.wrapper.tsx |  1 -
 .../app/components/ui/input/form-input.tsx    | 26 +++++----
 apps/mobile/package-lock.json                 |  4 +-
 9 files changed, 79 insertions(+), 104 deletions(-)

diff --git a/apps/mobile/app/components/auth/forgot-password.tsx b/apps/mobile/app/components/auth/forgot-password.tsx
index 331d3c508..c0042f902 100644
--- a/apps/mobile/app/components/auth/forgot-password.tsx
+++ b/apps/mobile/app/components/auth/forgot-password.tsx
@@ -40,13 +40,13 @@ export const ForgotPassword = ({ userEmail }: { userEmail: string }) => {
     createFormRef({
       email: userEmail || ""
     })
-  ).current;
+  );
   const emailInputRef = useRef<TextInput>(null);
   const [loading, setLoading] = useState(false);
   const [sent, setSent] = useState(false);
 
   const sendRecoveryEmail = async () => {
-    if (formRef.validateField("email")) {
+    if (formRef.current.validateField("email")) {
       ToastManager.show({
         heading: strings.emailRequired(),
         type: "error",
@@ -55,7 +55,7 @@ export const ForgotPassword = ({ userEmail }: { userEmail: string }) => {
       return;
     }
 
-    const values = formRef.getValues();
+    const values = formRef.current.getValues();
 
     setLoading(true);
     try {
diff --git a/apps/mobile/app/components/auth/login.tsx b/apps/mobile/app/components/auth/login.tsx
index 546048c34..fd1b3c80d 100644
--- a/apps/mobile/app/components/auth/login.tsx
+++ b/apps/mobile/app/components/auth/login.tsx
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import { RouteProp, useRoute } from "@react-navigation/native";
-import React, { useEffect, useRef, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { TouchableOpacity, View, useWindowDimensions } from "react-native";
 import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
 import { DDS } from "../../services/device-detection";
@@ -37,15 +37,15 @@ import { DefaultAppStyles } from "../../utils/styles";
 import { sleep } from "../../utils/time";
 import { Dialog } from "../dialog";
 import { Progress } from "../sheets/progress";
+import AppIcon from "../ui/AppIcon";
 import { Button } from "../ui/button";
-import FormInput, { createFormRef, validators } from "../ui/input/form-input";
+import FormInput, { validators } from "../ui/input/form-input";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { hideAuth } from "./common";
 import { ForgotPassword } from "./forgot-password";
 import { AuthHeader } from "./header";
 import { useLogin } from "./use-login";
-import AppIcon from "../ui/AppIcon";
 
 const LoginSteps = {
   emailAuth: 1,
@@ -64,14 +64,13 @@ export const Login = ({
   const {
     step,
     setStep,
-    password,
-    email,
     emailInputRef,
     passwordInputRef,
     loading,
     setLoading,
     login,
-    error
+    error,
+    formRef
   } = useLogin(async () => {
     eSendEvent(eUserLoggedIn, true);
     await sleep(500);
@@ -94,24 +93,8 @@ export const Login = ({
   });
   const { width, height } = useWindowDimensions();
   const isTablet = width > 600;
-  const formRef = useRef(
-    createFormRef({
-      email: "",
-      password: ""
-    })
-  ).current;
-
-  const canContinue = () => {
-    if (step === LoginSteps.emailAuth) {
-      return !formRef.validateField("email");
-    }
-
-    return formRef.validate();
-  };
 
   const onContinue = () => {
-    if (loading) return;
-    if (!canContinue()) return;
     login();
   };
 
@@ -224,9 +207,6 @@ export const Login = ({
               name="email"
               formRef={formRef}
               fwdRef={emailInputRef}
-              onChangeText={(value) => {
-                email.current = value;
-              }}
               testID="input.email"
               returnKeyLabel="Next"
               returnKeyType="next"
@@ -256,9 +236,6 @@ export const Login = ({
                   name="password"
                   formRef={formRef}
                   fwdRef={passwordInputRef}
-                  onChangeText={(value) => {
-                    password.current = value;
-                  }}
                   testID="input.password"
                   returnKeyLabel={strings.done()}
                   returnKeyType="done"
@@ -282,9 +259,13 @@ export const Login = ({
                     paddingHorizontal: 0
                   }}
                   onPress={() => {
-                    if (loading || !email.current) return;
+                    if (loading) return;
                     presentSheet({
-                      component: <ForgotPassword userEmail={email.current} />
+                      component: (
+                        <ForgotPassword
+                          userEmail={formRef.current.getValue("email")}
+                        />
+                      )
                     });
                   }}
                   textStyle={{
diff --git a/apps/mobile/app/components/auth/session-expired.tsx b/apps/mobile/app/components/auth/session-expired.tsx
index 377bc6d79..808fcc190 100644
--- a/apps/mobile/app/components/auth/session-expired.tsx
+++ b/apps/mobile/app/components/auth/session-expired.tsx
@@ -43,29 +43,26 @@ import SheetProvider from "../sheet-provider";
 import { Toast } from "../toast";
 import { Button } from "../ui/button";
 import { IconButton } from "../ui/icon-button";
-import Input from "../ui/input";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { LoginSteps, useLogin } from "./use-login";
 import { strings } from "@notesnook/intl";
 import { getObfuscatedEmail } from "../../utils/functions";
 import { DefaultAppStyles } from "../../utils/styles";
+import FormInput, { validators } from "../ui/input/form-input";
 
 export const SessionExpired = () => {
   const { colors } = useThemeColors();
   const [visible, setVisible] = useState(false);
   const [focused, setFocused] = useState(false);
-  const { step, password, email, passwordInputRef, loading, login } = useLogin(
-    () => {
-      eSendEvent(eUserLoggedIn, true);
-      setVisible(false);
-      setFocused(false);
-      useUserStore.setState({
-        disableAppLockRequests: false
-      });
-    },
-    true
-  );
+  const { step, passwordInputRef, loading, login, formRef } = useLogin(() => {
+    eSendEvent(eUserLoggedIn, true);
+    setVisible(false);
+    setFocused(false);
+    useUserStore.setState({
+      disableAppLockRequests: false
+    });
+  }, true);
 
   const logout = async () => {
     try {
@@ -92,6 +89,8 @@ export const SessionExpired = () => {
 
   const open = React.useCallback(async () => {
     try {
+      console.log("open...");
+      throw new Error("test");
       const res = await db.tokenManager.getToken();
       if (!res) throw new Error("no token found");
       if (db.tokenManager._isTokenExpired(res))
@@ -104,7 +103,7 @@ export const SessionExpired = () => {
         if (!complete) {
           const user = await db.user.getUser();
           if (!user) return;
-          email.current = user.email;
+          formRef.current.setValue("email", user.email);
           setVisible(true);
           setFocused(false);
           return;
@@ -117,14 +116,14 @@ export const SessionExpired = () => {
     } catch (e) {
       const user = await db.user.getUser();
       if (!user) return;
-      email.current = user.email;
+      formRef.current.setValue("email", user.email);
       setFocused(false);
       setVisible(true);
       useUserStore.setState({
         disableAppLockRequests: true
       });
     }
-  }, [email]);
+  }, [formRef]);
 
   useEffect(() => {
     const sub = eSubscribeEvent(eLoginSessionExpired, open);
@@ -155,6 +154,7 @@ export const SessionExpired = () => {
         enableSheetKeyboardHandler={true}
         visible={true}
       >
+        <Dialog context="two_factor_verify" />
         <View
           style={{
             width: focused ? "100%" : "99.9%",
@@ -192,17 +192,17 @@ export const SessionExpired = () => {
               }}
             >
               {strings.sessionExpiredDesc(
-                getObfuscatedEmail(email.current as string)
+                getObfuscatedEmail(formRef.current.getValue("email") as string)
               )}
             </Paragraph>
           </View>
 
           {step === LoginSteps.passwordAuth ? (
-            <Input
+            <FormInput
               fwdRef={passwordInputRef}
-              onChangeText={(value) => {
-                password.current = value;
-              }}
+              formRef={formRef}
+              name="password"
+              validators={[validators.required(strings.passwordRequired())]}
               returnKeyLabel={strings.done()}
               returnKeyType="next"
               secureTextEntry
@@ -210,7 +210,7 @@ export const SessionExpired = () => {
               autoCapitalize="none"
               autoCorrect={false}
               placeholder={strings.password()}
-              onSubmit={() => {
+              onSubmitEditing={() => {
                 login();
               }}
             />
diff --git a/apps/mobile/app/components/auth/signup.tsx b/apps/mobile/app/components/auth/signup.tsx
index 9b744d703..26ba89d11 100644
--- a/apps/mobile/app/components/auth/signup.tsx
+++ b/apps/mobile/app/components/auth/signup.tsx
@@ -68,7 +68,7 @@ export const Signup = ({
       password: "",
       confirmPassword: ""
     })
-  ).current;
+  );
   const emailInputRef = useRef<TextInput>(null);
   const passwordInputRef = useRef<TextInput>(null);
   const confirmPasswordInputRef = useRef<TextInput>(null);
@@ -82,10 +82,10 @@ export const Signup = ({
 
   const signup = async () => {
     setErrorMessage(undefined);
-    if (!formRef.validate()) return;
+    if (!formRef.current.validate()) return;
     if (loading) return;
 
-    const values = formRef.getValues();
+    const values = formRef.current.getValues();
 
     setLoading(true);
     try {
@@ -110,7 +110,7 @@ export const Signup = ({
       if (
         (e as Error).message === "Unable to create an account on this email."
       ) {
-        formRef.setError("email", (e as Error).message);
+        formRef.current.setError("email", (e as Error).message);
       } else {
         setErrorMessage((e as Error).message);
       }
diff --git a/apps/mobile/app/components/auth/use-login.ts b/apps/mobile/app/components/auth/use-login.ts
index a9180e849..0c53e68e3 100644
--- a/apps/mobile/app/components/auth/use-login.ts
+++ b/apps/mobile/app/components/auth/use-login.ts
@@ -28,6 +28,7 @@ import SettingsService from "../../services/settings";
 import { useUserStore } from "../../stores/use-user-store";
 import { eCloseSimpleDialog } from "../../utils/events";
 import TwoFactorVerification from "./two-factor";
+import { createFormRef } from "../ui/input/form-input";
 
 export const LoginSteps = {
   emailAuth: 1,
@@ -43,41 +44,29 @@ export const useLogin = (
   const [loading, setLoading] = useState(false);
   const setUser = useUserStore((state) => state.setUser);
   const [step, setStep] = useState(LoginSteps.emailAuth);
-  const email = useRef<string>(undefined);
-  const password = useRef<string>(undefined);
   const emailInputRef = useRef<TextInput>(null);
   const passwordInputRef = useRef<TextInput>(null);
-
-  const validateInfo = () => {
-    if (
-      (!password.current && step === LoginSteps.passwordAuth) ||
-      (!email.current && step === LoginSteps.emailAuth)
-    ) {
-      ToastManager.show({
-        heading: strings.allFieldsRequired(),
-        message: strings.allFieldsRequiredDesc(),
-        type: "error",
-        context: "local"
-      });
-
-      return false;
-    }
-
-    return true;
-  };
+  const formRef = useRef(
+    createFormRef({
+      email: "",
+      password: ""
+    })
+  );
 
   const login = async () => {
-    if (!validateInfo() || error) return;
     try {
       if (loading) return;
+      setError(undefined);
       setLoading(true);
       switch (step) {
         case LoginSteps.emailAuth: {
-          if (!email.current) {
+          if (formRef.current.validateField("email")) {
             setLoading(false);
             return;
           }
-          const mfaInfo = await db.user.authenticateEmail(email.current);
+          const mfaInfo = await db.user.authenticateEmail(
+            formRef.current.getValue("email")
+          );
 
           if (mfaInfo) {
             TwoFactorVerification.present(
@@ -119,13 +108,14 @@ export const useLogin = (
           break;
         }
         case LoginSteps.passwordAuth: {
-          if (!email.current || !password.current) {
+          if (!formRef.current.validate()) {
             setLoading(false);
             return;
           }
+          const values = formRef.current.getValues();
           await db.user.authenticatePassword(
-            email.current,
-            password.current,
+            values.email,
+            values.password,
             undefined,
             sessionExpired
           );
@@ -142,7 +132,11 @@ export const useLogin = (
   const finishWithError = async (e: Error) => {
     if (e.message === "invalid_grant") setStep(LoginSteps.emailAuth);
     setLoading(false);
-    setError(e);
+    if (e.message === "Password is incorrect.") {
+      formRef.current.setError("password", e.message);
+    } else {
+      setError(e);
+    }
   };
 
   const finishLogin = async () => {
@@ -169,13 +163,12 @@ export const useLogin = (
     login,
     step,
     setStep,
-    email,
-    password,
     passwordInputRef,
     emailInputRef,
     loading,
     setLoading,
     error,
-    setError
+    setError,
+    formRef
   };
 };
diff --git a/apps/mobile/app/components/list-items/headers/section-header.tsx b/apps/mobile/app/components/list-items/headers/section-header.tsx
index de9b3f0cb..7f5d09e01 100644
--- a/apps/mobile/app/components/list-items/headers/section-header.tsx
+++ b/apps/mobile/app/components/list-items/headers/section-header.tsx
@@ -69,8 +69,6 @@ export const SectionHeader = React.memo<
       dataType as "note" | "notebook" | "searchResult"
     );
 
-    console.log(item);
-
     return (
       <View
         style={{
diff --git a/apps/mobile/app/components/list/list-item.wrapper.tsx b/apps/mobile/app/components/list/list-item.wrapper.tsx
index be5ce74e0..0bf7db65e 100644
--- a/apps/mobile/app/components/list/list-item.wrapper.tsx
+++ b/apps/mobile/app/components/list/list-item.wrapper.tsx
@@ -323,7 +323,6 @@ export function ListItemWrapper(props: ListItemWrapperProps) {
 }
 
 function getDate(item: Notebook | Note, groupType?: GroupingKey): number {
-  console.log(groupType);
   return (
     getSortValue(
       groupType
diff --git a/apps/mobile/app/components/ui/input/form-input.tsx b/apps/mobile/app/components/ui/input/form-input.tsx
index d070dd42d..3818ed356 100644
--- a/apps/mobile/app/components/ui/input/form-input.tsx
+++ b/apps/mobile/app/components/ui/input/form-input.tsx
@@ -74,8 +74,10 @@ export function createFormRef(initialValues: FormValues = {}): FormRef {
     errors,
     setValue(name, value) {
       values[name] = value;
-      if (errors[name]) delete errors[name];
-      notify();
+      if (errors[name]) {
+        delete errors[name];
+        notify();
+      }
     },
     getValue(name) {
       return values[name] ?? "";
@@ -196,7 +198,7 @@ export const validators = {
 
 interface FormInputProps extends TextInputProps {
   name: string;
-  formRef: FormRef;
+  formRef: RefObject<FormRef>;
   validators?: FieldValidator[];
   fwdRef?: RefObject<TextInput | null>;
   loading?: boolean;
@@ -251,19 +253,21 @@ export function FormInput({
   const [, setVersion] = useState(0);
 
   useEffect(() => {
-    formRef.registerField(name, fieldValidators);
-    const unsubscribe = formRef.subscribe(() => {
+    const form = formRef.current;
+    form.registerField(name, fieldValidators);
+    const unsubscribe = form.subscribe(() => {
       setVersion((v) => v + 1);
     });
 
     return () => {
       unsubscribe();
-      formRef.unregisterField(name);
+      form.unregisterField(name);
     };
-  }, [fieldValidators, formRef, name]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [formRef, name]);
 
-  const value = formRef.getValue(name);
-  const fieldError = error || formRef.getError(name);
+  const value = formRef.current.getValue(name);
+  const fieldError = error || formRef.current.getError(name);
 
   const borderColor = useMemo(() => {
     if (fieldError) return colors.error.accent;
@@ -296,7 +300,7 @@ export function FormInput({
   };
 
   const handleChangeText = (nextValue: string) => {
-    formRef.setValue(name, nextValue);
+    formRef.current.setValue(name, nextValue);
     onChangeText?.(nextValue);
   };
 
@@ -319,7 +323,7 @@ export function FormInput({
 
         <TextInput
           {...restProps}
-          value={value}
+          defaultValue={value}
           ref={fwdRef}
           editable={!loading && restProps.editable !== false}
           onChangeText={handleChangeText}
diff --git a/apps/mobile/package-lock.json b/apps/mobile/package-lock.json
index 2433ed923..18ba5b12f 100644
--- a/apps/mobile/package-lock.json
+++ b/apps/mobile/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/mobile",
-  "version": "3.3.20",
+  "version": "3.3.22",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/mobile",
-      "version": "3.3.20",
+      "version": "3.3.22",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {

From 47ba40d7cd6f97b2e53df94523b8033a1725b212 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Tue, 5 May 2026 21:00:17 +0500
Subject: [PATCH 04/39] mobile: fix ts errors in build

---
 apps/mobile/app/components/auth/session-expired.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/mobile/app/components/auth/session-expired.tsx b/apps/mobile/app/components/auth/session-expired.tsx
index 808fcc190..c627c3de4 100644
--- a/apps/mobile/app/components/auth/session-expired.tsx
+++ b/apps/mobile/app/components/auth/session-expired.tsx
@@ -89,8 +89,6 @@ export const SessionExpired = () => {
 
   const open = React.useCallback(async () => {
     try {
-      console.log("open...");
-      throw new Error("test");
       const res = await db.tokenManager.getToken();
       if (!res) throw new Error("no token found");
       if (db.tokenManager._isTokenExpired(res))

From 7fcdb3b55dab800d6cc771abd8977beb79fedac7 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Wed, 6 May 2026 08:16:35 +0500
Subject: [PATCH 05/39] mobile: skip showing toast message

---
 apps/mobile/app/components/auth/forgot-password.tsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/apps/mobile/app/components/auth/forgot-password.tsx b/apps/mobile/app/components/auth/forgot-password.tsx
index c0042f902..b1f8f6aad 100644
--- a/apps/mobile/app/components/auth/forgot-password.tsx
+++ b/apps/mobile/app/components/auth/forgot-password.tsx
@@ -47,11 +47,6 @@ export const ForgotPassword = ({ userEmail }: { userEmail: string }) => {
 
   const sendRecoveryEmail = async () => {
     if (formRef.current.validateField("email")) {
-      ToastManager.show({
-        heading: strings.emailRequired(),
-        type: "error",
-        context: "local"
-      });
       return;
     }
 

From 724ad58824fe722d66ca174f06456b8376141231 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Wed, 6 May 2026 11:28:58 +0500
Subject: [PATCH 06/39] mobile: show errors under the email input

---
 apps/mobile/app/components/auth/forgot-password.tsx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/apps/mobile/app/components/auth/forgot-password.tsx b/apps/mobile/app/components/auth/forgot-password.tsx
index b1f8f6aad..47d3836aa 100644
--- a/apps/mobile/app/components/auth/forgot-password.tsx
+++ b/apps/mobile/app/components/auth/forgot-password.tsx
@@ -76,12 +76,7 @@ export const ForgotPassword = ({ userEmail }: { userEmail: string }) => {
       setSent(true);
     } catch (e) {
       setLoading(false);
-      ToastManager.show({
-        heading: strings.recoveryEmailFailed(),
-        message: (e as Error).message,
-        type: "error",
-        context: "local"
-      });
+      formRef.current.setError("email", (e as Error).message);
     }
   };
 

From 5ef3bdcad45bbb67c480bf53f3395dfbc5a38d20 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Wed, 6 May 2026 12:03:20 +0500
Subject: [PATCH 07/39] mobile: fix handling invalid gift code

---
 apps/mobile/app/screens/settings/settings-data.tsx | 12 ++++++++++--
 packages/intl/locale/en.po                         |  4 ++++
 packages/intl/locale/pseudo-LOCALE.po              |  4 ++++
 packages/intl/src/strings.ts                       |  3 ++-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/apps/mobile/app/screens/settings/settings-data.tsx b/apps/mobile/app/screens/settings/settings-data.tsx
index c2369337c..0328b1240 100644
--- a/apps/mobile/app/screens/settings/settings-data.tsx
+++ b/apps/mobile/app/screens/settings/settings-data.tsx
@@ -238,13 +238,21 @@ export const settingsGroups: SettingSection[] = [
             inputPlaceholder: strings.code(),
             positiveText: strings.redeem(),
             positivePress: async (value) => {
-              db.subscriptions.redeemCode(value).catch((e) => {
+              try {
+                if (!value || !value.trim()) {
+                  throw new Error(strings.giftCodeRequired());
+                }
+
+                await db.subscriptions.redeemCode(value);
+                return true;
+              } catch (e) {
                 ToastManager.show({
                   heading: "Error redeeming code",
                   message: (e as Error).message,
                   type: "error"
                 });
-              });
+                return false;
+              }
             }
           });
         }
diff --git a/packages/intl/locale/en.po b/packages/intl/locale/en.po
index a16f04684..311ee8c33 100644
--- a/packages/intl/locale/en.po
+++ b/packages/intl/locale/en.po
@@ -3101,6 +3101,10 @@ msgstr "Getting information"
 msgid "Getting recovery codes"
 msgstr "Getting recovery codes"
 
+#: src/strings.ts:2663
+msgid "Gift code required"
+msgstr "Gift code required"
+
 #: src/strings.ts:2172
 msgid "GNU GENERAL PUBLIC LICENSE Version 3"
 msgstr "GNU GENERAL PUBLIC LICENSE Version 3"
diff --git a/packages/intl/locale/pseudo-LOCALE.po b/packages/intl/locale/pseudo-LOCALE.po
index 2d924d193..0f076d21c 100644
--- a/packages/intl/locale/pseudo-LOCALE.po
+++ b/packages/intl/locale/pseudo-LOCALE.po
@@ -3083,6 +3083,10 @@ msgstr ""
 msgid "Getting recovery codes"
 msgstr ""
 
+#: src/strings.ts:2663
+msgid "Gift code required"
+msgstr ""
+
 #: src/strings.ts:2172
 msgid "GNU GENERAL PUBLIC LICENSE Version 3"
 msgstr ""
diff --git a/packages/intl/src/strings.ts b/packages/intl/src/strings.ts
index eca1169f3..0b5621788 100644
--- a/packages/intl/src/strings.ts
+++ b/packages/intl/src/strings.ts
@@ -2659,5 +2659,6 @@ Use this if changes from other devices are not appearing on this device. This wi
     t`Value must be between ${min} and ${max}`,
   passwordRequired: () => t`Password required`,
   confirmPasswordRequired: () => t`Confirm password required`,
-  enterAValidEmailAddress: () => t`Please enter a valid email address`
+  enterAValidEmailAddress: () => t`Please enter a valid email address`,
+  giftCodeRequired: () => t`Gift code required`
 };

From 276239dd2b015dbe59d851fe59f7308923a68e37 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Thu, 7 May 2026 08:49:21 +0500
Subject: [PATCH 08/39] mobile: add form validation support in dialog inputs

---
 .../mobile/app/components/dialog/functions.ts | 16 +++-
 apps/mobile/app/components/dialog/index.tsx   | 92 +++++++++++++++++--
 .../app/screens/settings/settings-data.tsx    | 60 ++++++------
 3 files changed, 133 insertions(+), 35 deletions(-)

diff --git a/apps/mobile/app/components/dialog/functions.ts b/apps/mobile/app/components/dialog/functions.ts
index 4798c5986..25d643895 100644
--- a/apps/mobile/app/components/dialog/functions.ts
+++ b/apps/mobile/app/components/dialog/functions.ts
@@ -17,10 +17,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { KeyboardTypeOptions } from "react-native";
+import { KeyboardTypeOptions, TextInput } from "react-native";
 import { eSendEvent } from "../../services/event-manager";
 import { eCloseSimpleDialog, eOpenSimpleDialog } from "../../utils/events";
 import { ButtonProps } from "../ui/button";
+import { FieldValidator, FormRef } from "../ui/input/form-input";
+import { RefObject } from "react";
 
 export type DialogInfo = {
   title?: string;
@@ -43,6 +45,18 @@ export type DialogInfo = {
     | "errorShade";
   icon?: string;
   paragraphColor: string;
+  form?: {
+    formRef: FormRef;
+    items: {
+      name: string;
+      placeholder: string;
+      label?: string;
+      validators: FieldValidator[];
+      defaultValue?: string;
+      ref: RefObject<TextInput | null>;
+    }[];
+    onFormSubmit?: (form: FormRef) => Promise<boolean>;
+  };
   input: boolean;
   inputPlaceholder: string;
   defaultValue: string;
diff --git a/apps/mobile/app/components/dialog/index.tsx b/apps/mobile/app/components/dialog/index.tsx
index a9cff4864..9e8db457e 100644
--- a/apps/mobile/app/components/dialog/index.tsx
+++ b/apps/mobile/app/components/dialog/index.tsx
@@ -18,7 +18,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { useThemeColors } from "@notesnook/theme";
-import React, { useCallback, useEffect, useRef, useState } from "react";
+import React, {
+  useCallback,
+  useEffect,
+  useRef,
+  useState,
+  RefObject
+} from "react";
 import { TextInput, View, ViewStyle } from "react-native";
 import { DDS } from "../../services/device-detection";
 import {
@@ -34,6 +40,7 @@ import { sleep } from "../../utils/time";
 import { Toast } from "../toast";
 import { Button } from "../ui/button";
 import Input from "../ui/input";
+import { FormInput, type FormRef } from "../ui/input/form-input";
 import { Notice } from "../ui/notice";
 import Seperator from "../ui/seperator";
 import BaseDialog from "./base-dialog";
@@ -53,9 +60,34 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
   });
   const inputRef = useRef<TextInput>(null);
   const [dialogInfo, setDialogInfo] = useState<DialogInfo>();
+  const formRef = useRef(dialogInfo?.form?.formRef);
+  formRef.current = dialogInfo?.form?.formRef;
 
   const onPressPositive = async () => {
-    if (dialogInfo?.positivePress) {
+    // Handle form submission if form is available
+    if (dialogInfo?.form && formRef.current) {
+      inputRef.current?.blur();
+      setLoading(true);
+      try {
+        const isValid = await formRef.current.validate();
+        if (!isValid) {
+          setLoading(false);
+          return;
+        }
+
+        if (dialogInfo.form.onFormSubmit) {
+          const result = await dialogInfo.form.onFormSubmit(formRef.current);
+          if (result === false) {
+            setLoading(false);
+            return;
+          }
+        }
+      } catch (e) {
+        /** Empty */
+      }
+      setLoading(false);
+    } else if (dialogInfo?.positivePress) {
+      // Handle old input-based submission
       inputRef.current?.blur();
       setLoading(true);
       let result = false;
@@ -76,6 +108,7 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
 
     setChecked(false);
     values.current.inputValue = undefined;
+    formRef.current = undefined;
     setVisible(false);
   };
 
@@ -85,6 +118,7 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
       if (data.context !== context) return;
       setDialogInfo(data);
       setChecked(data.check?.defaultValue);
+      formRef.current = data?.form?.formRef;
       values.current.inputValue = data.defaultValue;
       setVisible(true);
     },
@@ -94,6 +128,7 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
   const hide = React.useCallback(() => {
     setChecked(false);
     values.current.inputValue = undefined;
+    formRef.current = undefined;
     setVisible(false);
     setDialogInfo(undefined);
     dialogInfo?.onClose?.();
@@ -134,19 +169,30 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
           ? false
           : dialogInfo.statusBarTranslucent
       }
-      bounce={!dialogInfo.input}
+      bounce={!dialogInfo.input && !dialogInfo.form}
       closeOnTouch={!dialogInfo.disableBackdropClosing}
       background={dialogInfo.background}
       transparent={
         dialogInfo.transparent === undefined ? true : dialogInfo.transparent
       }
       onShow={async () => {
-        if (dialogInfo.input) {
+        if (dialogInfo.input && !dialogInfo.form) {
           inputRef.current?.setNativeProps({
             text: dialogInfo.defaultValue
           });
           await sleep(300);
           inputRef.current?.focus();
+        } else if (dialogInfo.form) {
+          const items = dialogInfo.form?.items;
+          const firstItem = items[0];
+          for (const item of items) {
+            if (item.defaultValue) {
+              item.ref.current?.setNativeProps({
+                text: dialogInfo.defaultValue
+              });
+            }
+          }
+          firstItem?.ref?.current?.focus();
         }
       }}
       visible={true}
@@ -170,7 +216,36 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
           />
           <Seperator half />
 
-          {dialogInfo.input ? (
+          {dialogInfo.form ? (
+            <View
+              style={{
+                paddingHorizontal: DefaultAppStyles.GAP,
+                gap: DefaultAppStyles.GAP / 2
+              }}
+            >
+              {dialogInfo.form.items.map((item, index) => (
+                <FormInput
+                  key={item.name}
+                  fwdRef={item.ref}
+                  name={item.name}
+                  autoFocus={index === 0}
+                  placeholder={item.placeholder}
+                  formRef={formRef as RefObject<FormRef>}
+                  validators={item.validators}
+                  defaultValue={item.defaultValue}
+                  secureTextEntry={dialogInfo.secureTextEntry}
+                  onSubmitEditing={() => {
+                    const nextItem = dialogInfo?.form?.items?.[index + 1];
+                    if (nextItem) {
+                      nextItem?.ref.current?.focus();
+                    } else {
+                      onPressPositive();
+                    }
+                  }}
+                />
+              ))}
+            </View>
+          ) : dialogInfo.input ? (
             <View
               style={{
                 paddingHorizontal: DefaultAppStyles.GAP
@@ -184,7 +259,7 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
                 }}
                 testID="input-value"
                 secureTextEntry={dialogInfo.secureTextEntry}
-                //defaultValue={dialogInfo.defaultValue}
+                defaultValue={dialogInfo.defaultValue}
                 onSubmit={() => {
                   onPressPositive();
                 }}
@@ -237,7 +312,10 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
 
           <DialogButtons
             onPressNegative={onNegativePress}
-            onPressPositive={dialogInfo.positivePress && onPressPositive}
+            onPressPositive={
+              (dialogInfo.positivePress || dialogInfo.form?.onFormSubmit) &&
+              onPressPositive
+            }
             loading={loading}
             positiveTitle={dialogInfo.positiveText}
             negativeTitle={dialogInfo.negativeText}
diff --git a/apps/mobile/app/screens/settings/settings-data.tsx b/apps/mobile/app/screens/settings/settings-data.tsx
index 0328b1240..3a8089e2b 100644
--- a/apps/mobile/app/screens/settings/settings-data.tsx
+++ b/apps/mobile/app/screens/settings/settings-data.tsx
@@ -31,9 +31,10 @@ import dayjs from "dayjs";
 import React from "react";
 import { Appearance, Linking, Platform } from "react-native";
 import { getVersion } from "react-native-device-info";
+import { TextInput } from "react-native-gesture-handler";
 import * as RNIap from "react-native-iap";
-import ScreenGuardModule from "react-native-screenguard";
 import { DatabaseLogger, db } from "../../common/database";
+import { MMKV } from "../../common/database/mmkv";
 import filesystem from "../../common/filesystem";
 import { presentDialog } from "../../components/dialog/functions";
 import { AppLockPassword } from "../../components/dialogs/applock-password";
@@ -42,43 +43,45 @@ import ExportNotesSheet from "../../components/sheets/export-notes";
 import { Issue } from "../../components/sheets/github/issue";
 import { Progress } from "../../components/sheets/progress";
 import { Update } from "../../components/sheets/update";
+import {
+  createFormRef,
+  validators
+} from "../../components/ui/input/form-input";
 import { VaultStatusType, useVaultStatus } from "../../hooks/use-vault-status";
 import { BackgroundSync } from "../../services/background-sync";
 import BackupService from "../../services/backup";
 import BiometricService from "../../services/biometrics";
 import {
   ToastManager,
+  VaultRequestType,
   eSendEvent,
   eSubscribeEvent,
   openVault,
-  presentSheet,
-  VaultRequestType
+  presentSheet
 } from "../../services/event-manager";
 import Navigation from "../../services/navigation";
 import Notifications from "../../services/notifications";
 import PremiumService from "../../services/premium";
 import SettingsService from "../../services/settings";
 import Sync from "../../services/sync";
+import { clearAllStores } from "../../stores";
+import { refreshAllStores } from "../../stores/create-db-collection-store";
 import { useThemeStore } from "../../stores/use-theme-store";
 import { useUserStore } from "../../stores/use-user-store";
+import { EDITOR_LINE_HEIGHT } from "../../utils/constants";
 import {
   eAfterSync,
   eCloseSheet,
   eOpenRecoveryKeyDialog
 } from "../../utils/events";
-import { NotesnookModule } from "../../utils/notesnook-module";
 import { sleep } from "../../utils/time";
+import { resetTabStore } from "../editor/tiptap/use-tab-store";
 import { MFARecoveryCodes, MFASheet } from "./2fa";
 import { useDragState } from "./editor/state";
 import { verifyUser, verifyUserWithApplock } from "./functions";
 import { logoutUser } from "./logout";
 import { SettingSection } from "./types";
 import { getTimeLeft } from "./user-section";
-import { EDITOR_LINE_HEIGHT } from "../../utils/constants";
-import { MMKV } from "../../common/database/mmkv";
-import { resetTabStore } from "../editor/tiptap/use-tab-store";
-import { clearAllStores } from "../../stores";
-import { refreshAllStores } from "../../stores/create-db-collection-store";
 
 export const settingsGroups: SettingSection[] = [
   {
@@ -234,26 +237,29 @@ export const settingsGroups: SettingSection[] = [
           presentDialog({
             title: strings.redeemGiftCode(),
             paragraph: strings.redeemGiftCodeDesc(),
-            input: true,
-            inputPlaceholder: strings.code(),
-            positiveText: strings.redeem(),
-            positivePress: async (value) => {
-              try {
-                if (!value || !value.trim()) {
-                  throw new Error(strings.giftCodeRequired());
+            form: {
+              formRef: createFormRef({
+                code: ""
+              }),
+              items: [
+                {
+                  name: "code",
+                  placeholder: strings.code(),
+                  ref: React.createRef<TextInput | null>(),
+                  validators: [validators.required(strings.giftCodeRequired())]
+                }
+              ],
+              onFormSubmit: async (form) => {
+                try {
+                  await db.subscriptions.redeemCode(form.getValue("code"));
+                  return true;
+                } catch (e) {
+                  form.setError("code", (e as Error).message);
+                  return false;
                 }
-
-                await db.subscriptions.redeemCode(value);
-                return true;
-              } catch (e) {
-                ToastManager.show({
-                  heading: "Error redeeming code",
-                  message: (e as Error).message,
-                  type: "error"
-                });
-                return false;
               }
-            }
+            },
+            positiveText: strings.redeem()
           });
         }
       },

From e023f11cd90f49b6ff4603ca6f96266d8def081f Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Thu, 7 May 2026 09:22:59 +0500
Subject: [PATCH 09/39] mobile: fix copy button text is cut in 2fa settings
 page

---
 apps/mobile/app/screens/settings/2fa.tsx | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/apps/mobile/app/screens/settings/2fa.tsx b/apps/mobile/app/screens/settings/2fa.tsx
index f478e1bde..1db31cf50 100644
--- a/apps/mobile/app/screens/settings/2fa.tsx
+++ b/apps/mobile/app/screens/settings/2fa.tsx
@@ -322,8 +322,8 @@ export const MFASetup = ({
                 method?.id === "email"
                   ? user?.email
                   : method?.id === "app"
-                  ? authenticatorDetails?.sharedKey || ""
-                  : undefined
+                    ? authenticatorDetails?.sharedKey || ""
+                    : undefined
               }
               multiline={method.id === "app"}
               onChangeText={(value) => {
@@ -352,16 +352,20 @@ export const MFASetup = ({
                   <Button
                     onPress={onSendCode}
                     loading={sending}
+                    style={{
+                      paddingVertical: 0,
+                      paddingHorizontal: 0
+                    }}
                     title={
                       sending
                         ? null
                         : method.id === "app"
-                        ? strings.copy()
-                        : `${
-                            seconds
-                              ? strings.resendCode(seconds as number)
-                              : strings.sendCode()
-                          }`
+                          ? strings.copy()
+                          : `${
+                              seconds
+                                ? strings.resendCode(seconds as number)
+                                : strings.sendCode()
+                            }`
                     }
                   />
                 )

From 780276b30e83cf1d580e842be26ba967139d4fdc Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Thu, 7 May 2026 11:12:49 +0500
Subject: [PATCH 10/39] mobile: fix pro user walk through makes app get stuck

---
 apps/mobile/app/hooks/use-app-events.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/mobile/app/hooks/use-app-events.tsx b/apps/mobile/app/hooks/use-app-events.tsx
index 53f1bff0f..16824bd5e 100644
--- a/apps/mobile/app/hooks/use-app-events.tsx
+++ b/apps/mobile/app/hooks/use-app-events.tsx
@@ -95,6 +95,7 @@ import { BETA } from "../utils/constants";
 import {
   eAfterSync,
   eCloseSheet,
+  eCloseSimpleDialog,
   eEditorReset,
   eLoginSessionExpired,
   eOnLoadNote,
@@ -286,7 +287,10 @@ const onUserSubscriptionStatusChanged = async (
         subscription: subscription
       }
     });
-    Walkthrough.present("prouser", false, true);
+    eSendEvent(eCloseSimpleDialog);
+    setTimeout(() => {
+      Walkthrough.present("prouser", false, true);
+    }, 500);
   }
   await PremiumService.setPremiumStatus();
   useMessageStore.getState().setAnnouncement();

From e381b62e5c20727ef7745142c53de8c9582cd693 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Wed, 6 May 2026 10:30:34 +0500
Subject: [PATCH 11/39] mobile: show confirm dialog before deleting attachment
 in attachment manager

---
 .../app/components/attachments/actions.tsx    | 60 +++++++++++++------
 packages/intl/locale/en.po                    |  8 +++
 packages/intl/locale/pseudo-LOCALE.po         |  8 +++
 packages/intl/src/strings.ts                  |  5 +-
 4 files changed, 61 insertions(+), 20 deletions(-)

diff --git a/apps/mobile/app/components/attachments/actions.tsx b/apps/mobile/app/components/attachments/actions.tsx
index 811c08a0e..c156e35e6 100644
--- a/apps/mobile/app/components/attachments/actions.tsx
+++ b/apps/mobile/app/components/attachments/actions.tsx
@@ -177,26 +177,48 @@ const Actions = ({
     {
       name: strings.delete(),
       onPress: async () => {
-        const relations = await db.relations.to(attachment, "note").get();
-        await db.attachments.remove(attachment.hash, false);
-        setAttachments();
-        eSendEvent(eDBItemUpdate, attachment.id);
-        relations
-          .map((relation) => relation.fromId)
-          .forEach(async (id) => {
-            useTabStore.getState().forEachNoteTab(id, async (tab) => {
-              const isFocused = useTabStore.getState().currentTab === tab.id;
-              if (isFocused) {
-                eSendEvent(eOnLoadNote, {
-                  item: await db.notes.note(id),
-                  forced: true
-                });
-              } else {
-                editorController.current.commands.setLoading(true, tab.id);
-              }
-            });
-          });
         close?.();
+        setTimeout(() => {
+          presentDialog({
+            title: strings.deleteAttachment(),
+            paragraph: strings.deleteAttachmentConfirm(),
+            positiveText: strings.yes(),
+            negativeText: strings.no(),
+            positiveType: "errorShade",
+            positivePress: async () => {
+              try {
+                const relations = await db.relations
+                  .to(attachment, "note")
+                  .get();
+                await db.attachments.remove(attachment.hash, false);
+                setAttachments();
+                eSendEvent(eDBItemUpdate, attachment.id);
+                relations
+                  .map((relation) => relation.fromId)
+                  .forEach(async (id) => {
+                    useTabStore.getState().forEachNoteTab(id, async (tab) => {
+                      const isFocused =
+                        useTabStore.getState().currentTab === tab.id;
+                      if (isFocused) {
+                        eSendEvent(eOnLoadNote, {
+                          item: await db.notes.note(id),
+                          forced: true
+                        });
+                      } else {
+                        editorController.current.commands.setLoading(
+                          true,
+                          tab.id
+                        );
+                      }
+                    });
+                  });
+                return true;
+              } catch (e) {
+                return false;
+              }
+            }
+          });
+        }, 500);
       },
       icon: "delete-outline"
     }
diff --git a/packages/intl/locale/en.po b/packages/intl/locale/en.po
index 311ee8c33..d7d84298e 100644
--- a/packages/intl/locale/en.po
+++ b/packages/intl/locale/en.po
@@ -935,6 +935,10 @@ msgstr "Are you sure you want to clear all logs from {key}?"
 msgid "Are you sure you want to clear trash?"
 msgstr "Are you sure you want to clear trash?"
 
+#: src/strings.ts:2666
+msgid "Are you sure you want to delete this attachment?"
+msgstr "Are you sure you want to delete this attachment?"
+
 #: src/strings.ts:1542
 msgid "Are you sure you want to logout and clear all data stored on THIS DEVICE?"
 msgstr "Are you sure you want to logout and clear all data stored on THIS DEVICE?"
@@ -2142,6 +2146,10 @@ msgstr "Delete"
 msgid "Delete account"
 msgstr "Delete account"
 
+#: src/strings.ts:2664
+msgid "Delete attachment"
+msgstr "Delete attachment"
+
 #: src/strings.ts:1319
 msgid "Delete collapsed section"
 msgstr "Delete collapsed section"
diff --git a/packages/intl/locale/pseudo-LOCALE.po b/packages/intl/locale/pseudo-LOCALE.po
index 0f076d21c..6e7473b41 100644
--- a/packages/intl/locale/pseudo-LOCALE.po
+++ b/packages/intl/locale/pseudo-LOCALE.po
@@ -935,6 +935,10 @@ msgstr ""
 msgid "Are you sure you want to clear trash?"
 msgstr ""
 
+#: src/strings.ts:2666
+msgid "Are you sure you want to delete this attachment?"
+msgstr ""
+
 #: src/strings.ts:1542
 msgid "Are you sure you want to logout and clear all data stored on THIS DEVICE?"
 msgstr ""
@@ -2131,6 +2135,10 @@ msgstr ""
 msgid "Delete account"
 msgstr ""
 
+#: src/strings.ts:2664
+msgid "Delete attachment"
+msgstr ""
+
 #: src/strings.ts:1319
 msgid "Delete collapsed section"
 msgstr ""
diff --git a/packages/intl/src/strings.ts b/packages/intl/src/strings.ts
index 0b5621788..3e9657003 100644
--- a/packages/intl/src/strings.ts
+++ b/packages/intl/src/strings.ts
@@ -2660,5 +2660,8 @@ Use this if changes from other devices are not appearing on this device. This wi
   passwordRequired: () => t`Password required`,
   confirmPasswordRequired: () => t`Confirm password required`,
   enterAValidEmailAddress: () => t`Please enter a valid email address`,
-  giftCodeRequired: () => t`Gift code required`
+  giftCodeRequired: () => t`Gift code required`,
+  deleteAttachment: () => t`Delete attachment`,
+  deleteAttachmentConfirm: () =>
+    t`Are you sure you want to delete this attachment?`
 };

From 39bfff6b145a3c9154a3c90fd0b68e8ac64b2b3c Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Wed, 6 May 2026 10:42:30 +0500
Subject: [PATCH 12/39] mobile: fix base dialog background is always
 transparent

---
 apps/mobile/app/components/dialog/base-dialog.tsx | 2 +-
 apps/mobile/app/components/dialog/index.tsx       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/mobile/app/components/dialog/base-dialog.tsx b/apps/mobile/app/components/dialog/base-dialog.tsx
index f2b0ce4b2..035b4a2fb 100644
--- a/apps/mobile/app/components/dialog/base-dialog.tsx
+++ b/apps/mobile/app/components/dialog/base-dialog.tsx
@@ -136,7 +136,7 @@ const BaseDialog = ({
               ? background
               : transparent
                 ? "transparent"
-                : "rgba(0,0,0,0.3)"
+                : "rgba(0,0,0,0.1)"
           }}
         >
           <KeyboardAvoidingView
diff --git a/apps/mobile/app/components/dialog/index.tsx b/apps/mobile/app/components/dialog/index.tsx
index 9e8db457e..ed1b273b2 100644
--- a/apps/mobile/app/components/dialog/index.tsx
+++ b/apps/mobile/app/components/dialog/index.tsx
@@ -173,7 +173,7 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
       closeOnTouch={!dialogInfo.disableBackdropClosing}
       background={dialogInfo.background}
       transparent={
-        dialogInfo.transparent === undefined ? true : dialogInfo.transparent
+        dialogInfo.transparent === undefined ? false : dialogInfo.transparent
       }
       onShow={async () => {
         if (dialogInfo.input && !dialogInfo.form) {

From 6de4b4ac2d55b7ed957a413812440e201d9521ca Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Wed, 6 May 2026 10:43:13 +0500
Subject: [PATCH 13/39] mobile: show toast message after attachment deleted

---
 apps/mobile/app/components/attachments/actions.tsx | 4 ++++
 packages/intl/locale/en.po                         | 4 ++++
 packages/intl/locale/pseudo-LOCALE.po              | 4 ++++
 packages/intl/src/strings.ts                       | 3 ++-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/apps/mobile/app/components/attachments/actions.tsx b/apps/mobile/app/components/attachments/actions.tsx
index c156e35e6..d8b198d7e 100644
--- a/apps/mobile/app/components/attachments/actions.tsx
+++ b/apps/mobile/app/components/attachments/actions.tsx
@@ -191,6 +191,10 @@ const Actions = ({
                   .to(attachment, "note")
                   .get();
                 await db.attachments.remove(attachment.hash, false);
+                ToastManager.show({
+                  type: "success",
+                  message: strings.attachmentDeleted()
+                });
                 setAttachments();
                 eSendEvent(eDBItemUpdate, attachment.id);
                 relations
diff --git a/packages/intl/locale/en.po b/packages/intl/locale/en.po
index d7d84298e..22077ef22 100644
--- a/packages/intl/locale/en.po
+++ b/packages/intl/locale/en.po
@@ -992,6 +992,10 @@ msgstr "attachment"
 msgid "Attachment"
 msgstr "Attachment"
 
+#: src/strings.ts:2663
+msgid "Attachment deleted"
+msgstr "Attachment deleted"
+
 #: src/strings.ts:2458
 msgid "Attachment manager"
 msgstr "Attachment manager"
diff --git a/packages/intl/locale/pseudo-LOCALE.po b/packages/intl/locale/pseudo-LOCALE.po
index 6e7473b41..76ee7a81b 100644
--- a/packages/intl/locale/pseudo-LOCALE.po
+++ b/packages/intl/locale/pseudo-LOCALE.po
@@ -992,6 +992,10 @@ msgstr ""
 msgid "Attachment"
 msgstr ""
 
+#: src/strings.ts:2663
+msgid "Attachment deleted"
+msgstr ""
+
 #: src/strings.ts:2458
 msgid "Attachment manager"
 msgstr ""
diff --git a/packages/intl/src/strings.ts b/packages/intl/src/strings.ts
index 3e9657003..927e7be4e 100644
--- a/packages/intl/src/strings.ts
+++ b/packages/intl/src/strings.ts
@@ -2663,5 +2663,6 @@ Use this if changes from other devices are not appearing on this device. This wi
   giftCodeRequired: () => t`Gift code required`,
   deleteAttachment: () => t`Delete attachment`,
   deleteAttachmentConfirm: () =>
-    t`Are you sure you want to delete this attachment?`
+    t`Are you sure you want to delete this attachment?`,
+  attachmentDeleted: () => t`Attachment deleted`
 };

From 365e1d70292a6841eebe044c8ec6265c8b521464 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Wed, 6 May 2026 08:43:11 +0500
Subject: [PATCH 14/39] mobile: trim title before checking if title is valid

---
 .../mobile/app/screens/add-reminder/index.tsx | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/apps/mobile/app/screens/add-reminder/index.tsx b/apps/mobile/app/screens/add-reminder/index.tsx
index b88528f72..5cb054d17 100644
--- a/apps/mobile/app/screens/add-reminder/index.tsx
+++ b/apps/mobile/app/screens/add-reminder/index.tsx
@@ -172,9 +172,15 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
 
   async function saveReminder() {
     try {
-      if (!(await Notifications.checkAndRequestPermissions(true)))
-        throw new Error(strings.noNotificationPermission());
-      if (!date && reminderMode !== ReminderModes.Permanent) return;
+      if (!title.current?.trim()) throw new Error(strings.setTitleError());
+      if (
+        date.getTime() < Date.now() &&
+        reminderMode === "once" &&
+        !props.route.params.reminder
+      ) {
+        throw new Error(strings.dateError());
+      }
+
       if (
         reminderMode === ReminderModes.Repeat &&
         recurringMode !== "day" &&
@@ -183,14 +189,9 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
       )
         throw new Error(strings.selectDayError());
 
-      if (!title.current) throw new Error(strings.setTitleError());
-      if (
-        date.getTime() < Date.now() &&
-        reminderMode === "once" &&
-        !props.route.params.reminder
-      ) {
-        throw new Error(strings.dateError());
-      }
+      if (!(await Notifications.checkAndRequestPermissions(true)))
+        throw new Error(strings.noNotificationPermission());
+      if (!date && reminderMode !== ReminderModes.Permanent) return;
 
       date.setSeconds(0, 0);
 

From af08ed51740d1f8bace6d9a5ba19707413b59c12 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Wed, 6 May 2026 14:05:20 +0500
Subject: [PATCH 15/39] mobile: show title is required error under the input

---
 .../mobile/app/screens/add-reminder/index.tsx | 25 +++++++++++++++----
 packages/intl/locale/en.po                    |  6 ++++-
 packages/intl/locale/pseudo-LOCALE.po         |  6 ++++-
 packages/intl/src/strings.ts                  |  3 ++-
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/apps/mobile/app/screens/add-reminder/index.tsx b/apps/mobile/app/screens/add-reminder/index.tsx
index 5cb054d17..5383a6f36 100644
--- a/apps/mobile/app/screens/add-reminder/index.tsx
+++ b/apps/mobile/app/screens/add-reminder/index.tsx
@@ -59,6 +59,10 @@ import { TimeSince } from "../../components/ui/time-since";
 import Heading from "../../components/ui/typography/heading";
 import { eOnLoadNote } from "../../utils/events";
 import { fluidTabsRef } from "../../utils/global-refs";
+import FormInput, {
+  createFormRef,
+  validators
+} from "../../components/ui/input/form-input";
 
 const ReminderModes =
   Platform.OS === "ios"
@@ -113,7 +117,12 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
   const [repeatFrequency, setRepeatFrequency] = useState(1);
   const referencedItem = reference ? (reference as Note) : null;
   const recurringReminderFeature = useIsFeatureAvailable("recurringReminders");
-
+  const formRef = useRef(
+    createFormRef({
+      title: reminder?.title || referencedItem?.title || "",
+      description: reminder?.description || referencedItem?.headline || ""
+    })
+  );
   const title = useRef<string | undefined>(
     !reminder ? referencedItem?.title : reminder?.title
   );
@@ -172,7 +181,7 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
 
   async function saveReminder() {
     try {
-      if (!title.current?.trim()) throw new Error(strings.setTitleError());
+      if (!formRef.current.validate()) return;
       if (
         date.getTime() < Date.now() &&
         reminderMode === "once" &&
@@ -262,7 +271,10 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
           keyboardDismissMode="interactive"
           keyboardShouldPersistTaps="handled"
         >
-          <Input
+          <FormInput
+            name="title"
+            validators={[validators.required(strings.titleIsRequired())]}
+            formRef={formRef}
             fwdRef={titleRef}
             defaultValue={reminder?.title || referencedItem?.title}
             placeholder={strings.remindeMeOf()}
@@ -271,12 +283,15 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
             wrapperStyle={{
               marginTop: DefaultAppStyles.GAP_VERTICAL
             }}
-            onSubmit={() => {
+            onSubmitEditing={() => {
               descriptionRef.current?.focus();
             }}
           />
 
-          <Input
+          <FormInput
+            name="description"
+            validators={[]}
+            formRef={formRef}
             defaultValue={
               reminder ? reminder?.description : referencedItem?.headline
             }
diff --git a/packages/intl/locale/en.po b/packages/intl/locale/en.po
index 22077ef22..6499ba0ea 100644
--- a/packages/intl/locale/en.po
+++ b/packages/intl/locale/en.po
@@ -992,7 +992,7 @@ msgstr "attachment"
 msgid "Attachment"
 msgstr "Attachment"
 
-#: src/strings.ts:2663
+#: src/strings.ts:2667
 msgid "Attachment deleted"
 msgstr "Attachment deleted"
 
@@ -6664,6 +6664,10 @@ msgstr "Title"
 msgid "Title format"
 msgstr "Title format"
 
+#: src/strings.ts:2668
+msgid "Title is required"
+msgstr "Title is required"
+
 #: src/strings.ts:1188
 msgid "To use app lock, you must enable biometrics such as Fingerprint lock or Face ID on your phone."
 msgstr "To use app lock, you must enable biometrics such as Fingerprint lock or Face ID on your phone."
diff --git a/packages/intl/locale/pseudo-LOCALE.po b/packages/intl/locale/pseudo-LOCALE.po
index 76ee7a81b..add9f914c 100644
--- a/packages/intl/locale/pseudo-LOCALE.po
+++ b/packages/intl/locale/pseudo-LOCALE.po
@@ -992,7 +992,7 @@ msgstr ""
 msgid "Attachment"
 msgstr ""
 
-#: src/strings.ts:2663
+#: src/strings.ts:2667
 msgid "Attachment deleted"
 msgstr ""
 
@@ -6623,6 +6623,10 @@ msgstr ""
 msgid "Title format"
 msgstr ""
 
+#: src/strings.ts:2668
+msgid "Title is required"
+msgstr ""
+
 #: src/strings.ts:1188
 msgid "To use app lock, you must enable biometrics such as Fingerprint lock or Face ID on your phone."
 msgstr ""
diff --git a/packages/intl/src/strings.ts b/packages/intl/src/strings.ts
index 927e7be4e..472ef36c3 100644
--- a/packages/intl/src/strings.ts
+++ b/packages/intl/src/strings.ts
@@ -2664,5 +2664,6 @@ Use this if changes from other devices are not appearing on this device. This wi
   deleteAttachment: () => t`Delete attachment`,
   deleteAttachmentConfirm: () =>
     t`Are you sure you want to delete this attachment?`,
-  attachmentDeleted: () => t`Attachment deleted`
+  attachmentDeleted: () => t`Attachment deleted`,
+  titleIsRequired: () => t`Title is required`
 };

From d16cd510b347be33681559623e811e36842e5179 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Wed, 6 May 2026 18:59:31 +0500
Subject: [PATCH 16/39] mobile: cleanup

---
 apps/mobile/app/screens/add-reminder/index.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/mobile/app/screens/add-reminder/index.tsx b/apps/mobile/app/screens/add-reminder/index.tsx
index 5383a6f36..a1253ed05 100644
--- a/apps/mobile/app/screens/add-reminder/index.tsx
+++ b/apps/mobile/app/screens/add-reminder/index.tsx
@@ -35,7 +35,6 @@ import { db } from "../../common/database";
 import { Dialog } from "../../components/dialog";
 import { Header } from "../../components/header";
 import { Button } from "../../components/ui/button";
-import Input from "../../components/ui/input";
 import { ReminderTime } from "../../components/ui/reminder-time";
 import Paragraph from "../../components/ui/typography/paragraph";
 import { DDS } from "../../services/device-detection";

From 419dd555f457cff0ae2765e2abf867fd86299fdc Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Wed, 6 May 2026 09:23:54 +0500
Subject: [PATCH 17/39] mobile: fix reminder allows past time in edit mode
 without validation error

---
 apps/mobile/app/screens/add-reminder/index.tsx | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/apps/mobile/app/screens/add-reminder/index.tsx b/apps/mobile/app/screens/add-reminder/index.tsx
index a1253ed05..ccda061bc 100644
--- a/apps/mobile/app/screens/add-reminder/index.tsx
+++ b/apps/mobile/app/screens/add-reminder/index.tsx
@@ -181,11 +181,7 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
   async function saveReminder() {
     try {
       if (!formRef.current.validate()) return;
-      if (
-        date.getTime() < Date.now() &&
-        reminderMode === "once" &&
-        !props.route.params.reminder
-      ) {
+      if (date.getTime() < Date.now() && reminderMode === "once") {
         throw new Error(strings.dateError());
       }
 
@@ -197,9 +193,10 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
       )
         throw new Error(strings.selectDayError());
 
+      if (!date && reminderMode !== ReminderModes.Permanent) return;
+
       if (!(await Notifications.checkAndRequestPermissions(true)))
         throw new Error(strings.noNotificationPermission());
-      if (!date && reminderMode !== ReminderModes.Permanent) return;
 
       date.setSeconds(0, 0);
 
@@ -491,16 +488,23 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
               <DateTimePickerModal
                 isVisible={isDatePickerVisible}
                 mode="datetime"
+                minimumDate={
+                  reminderMode === "once" ? dayjs().toDate() : new Date(0)
+                }
                 onConfirm={handleConfirm}
                 onCancel={hideDatePicker}
                 isDarkModeEnabled={isDark}
                 firstDayOfWeek={weekFormat === "Mon" ? 1 : 0}
                 is24Hour={db.settings.getTimeFormat() === "24-hour"}
                 date={date || new Date(Date.now())}
+                themeVariant={isDark ? "dark" : "light"}
               />
 
               <DatePicker
                 date={date}
+                minimumDate={
+                  reminderMode === "once" ? dayjs().toDate() : new Date(0)
+                }
                 maximumDate={dayjs(date).add(3, "months").toDate()}
                 onDateChange={handleConfirm}
                 theme={isDark ? "dark" : "light"}

From 28f95b006106d735b54c9e7793c19dea15aa024d Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Wed, 6 May 2026 09:25:14 +0500
Subject: [PATCH 18/39] mobile: fix plans keep loading on paywall screen

---
 apps/mobile/app/hooks/use-pricing-plans.ts | 68 ++++++++++++----------
 1 file changed, 38 insertions(+), 30 deletions(-)

diff --git a/apps/mobile/app/hooks/use-pricing-plans.ts b/apps/mobile/app/hooks/use-pricing-plans.ts
index f0b9b749d..5b746a480 100644
--- a/apps/mobile/app/hooks/use-pricing-plans.ts
+++ b/apps/mobile/app/hooks/use-pricing-plans.ts
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 import { Plan, SubscriptionPlan } from "@notesnook/core";
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { useAsync } from "react-async-hook";
 import { Platform } from "react-native";
 import Config from "react-native-config";
@@ -181,6 +181,8 @@ const usePricingPlans = (options?: PricingPlansOptions) => {
   const [cancelPromo, setCancelPromo] = useState(false);
   const [userCanRequestTrial, setUserCanRequestTrial] = useState(false);
   const [webPricingPlans, setWebPricingPlans] = useState<Plan[]>([]);
+  const plansRef = useRef(plans);
+  plansRef.current = plans;
 
   const getProduct = React.useCallback(
     (planId: string, skuId: string) => {
@@ -190,11 +192,11 @@ const usePricingPlans = (options?: PricingPlansOptions) => {
         );
 
       return (
-        plans.find((p) => p.id === planId)?.subscriptions?.[skuId] ||
-        plans.find((p) => p.id === planId)?.products?.[skuId]
+        plansRef.current.find((p) => p.id === planId)?.subscriptions?.[skuId] ||
+        plansRef.current.find((p) => p.id === planId)?.products?.[skuId]
       );
     },
-    [plans, webPricingPlans]
+    [webPricingPlans]
   );
 
   const getProductAndroid = (planId: string, skuId: string) => {
@@ -253,35 +255,41 @@ const usePricingPlans = (options?: PricingPlansOptions) => {
 
   useEffect(() => {
     const loadPlans = async () => {
-      const items = await PremiumService.loadProductsAndSubs();
-      pricingPlans.forEach((plan) => {
-        plan.subscriptions = {};
-        plan.products = {};
-        plan.subscriptionSkuList.forEach((sku) => {
-          if (!plan.subscriptions) plan.subscriptions = {};
-          plan.subscriptions[sku] = items.subs.find((p) => p.productId === sku);
+      try {
+        const items = await PremiumService.loadProductsAndSubs();
+        pricingPlans.forEach((plan) => {
+          plan.subscriptions = {};
+          plan.products = {};
+          plan.subscriptionSkuList.forEach((sku) => {
+            if (!plan.subscriptions) plan.subscriptions = {};
+            plan.subscriptions[sku] = items.subs.find(
+              (p) => p.productId === sku
+            );
+          });
+          plan.productSkuList.forEach((sku) => {
+            if (!plan.products) plan.products = {};
+            plan.products[sku] = items.products.find(
+              (p) => p.productId === sku
+            );
+          });
         });
-        plan.productSkuList.forEach((sku) => {
-          if (!plan.products) plan.products = {};
-          plan.products[sku] = items.products.find((p) => p.productId === sku);
-        });
-      });
-      setPlans([...pricingPlans]);
-      setUserCanRequestTrial(hasTrialOffer());
-      if (
-        Config.GITHUB_RELEASE === "true" &&
-        !SettingsService.getProperty("serverUrls")
-      ) {
-        try {
-          const products = WebPlanCache || (await db.pricing.products());
-          WebPlanCache = products;
-          setWebPricingPlans(products);
-        } catch (e) {
-          /**
+        setPlans([...pricingPlans]);
+        setUserCanRequestTrial(hasTrialOffer());
+        if (
+          Config.GITHUB_RELEASE === "true" &&
+          !SettingsService.getProperty("serverUrls")
+        ) {
+          try {
+            const products = WebPlanCache || (await db.pricing.products());
+            WebPlanCache = products;
+            setWebPricingPlans(products);
+          } catch (e) {
+            /**
           empty */
+          }
         }
-      }
-      setLoadingPlans(false);
+        setLoadingPlans(false);
+      } catch (e) {}
     };
     loadPlans();
   }, [options?.promoOffer, cancelPromo, hasTrialOffer]);

From 14d680c0922b97c7f69e71771192d419a80ffdac Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Thu, 7 May 2026 18:42:47 +0500
Subject: [PATCH 19/39] mobile: show all errors inline with inputs/data-entry
 items

---
 .../mobile/app/screens/add-reminder/index.tsx | 46 +++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/apps/mobile/app/screens/add-reminder/index.tsx b/apps/mobile/app/screens/add-reminder/index.tsx
index ccda061bc..989c1d781 100644
--- a/apps/mobile/app/screens/add-reminder/index.tsx
+++ b/apps/mobile/app/screens/add-reminder/index.tsx
@@ -62,6 +62,7 @@ import FormInput, {
   createFormRef,
   validators
 } from "../../components/ui/input/form-input";
+import AppIcon from "../../components/ui/AppIcon";
 
 const ReminderModes =
   Platform.OS === "ios"
@@ -140,6 +141,8 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
         : null,
     [reminder?.id]
   );
+  const [dateError, setDateError] = useState<string>();
+  const [selectDayError, setSelectDayError] = useState<string>();
 
   const showDatePicker = () => {
     setDatePickerVisibility(true);
@@ -151,6 +154,7 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
 
   const handleConfirm = (date: Date) => {
     timer.current = setTimeout(() => {
+      setDateError(undefined);
       hideDatePicker();
       setDate(date);
     }, 10);
@@ -182,7 +186,8 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
     try {
       if (!formRef.current.validate()) return;
       if (date.getTime() < Date.now() && reminderMode === "once") {
-        throw new Error(strings.dateError());
+        setDateError(strings.dateError());
+        return;
       }
 
       if (
@@ -190,8 +195,10 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
         recurringMode !== "day" &&
         recurringMode !== "year" &&
         selectedDays.length === 0
-      )
-        throw new Error(strings.selectDayError());
+      ) {
+        setSelectDayError(strings.selectDayError());
+        return;
+      }
 
       if (!date && reminderMode !== ReminderModes.Permanent) return;
 
@@ -473,6 +480,22 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
                         />
                       ))}
               </ScrollView>
+              {selectDayError ? (
+                <Paragraph
+                  size={AppFontSize.xs}
+                  style={{
+                    marginTop: DefaultAppStyles.GAP_VERTICAL,
+                    color: colors.error.icon
+                  }}
+                >
+                  <AppIcon
+                    color={colors.error.accent}
+                    name="alert-circle-outline"
+                    size={AppFontSize.sm - 1}
+                  />{" "}
+                  {selectDayError}
+                </Paragraph>
+              ) : null}
             </View>
           ) : null}
 
@@ -538,6 +561,23 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
                   }}
                 />
               )}
+
+              {dateError ? (
+                <Paragraph
+                  size={AppFontSize.xs}
+                  style={{
+                    marginTop: DefaultAppStyles.GAP_VERTICAL,
+                    color: colors.error.icon
+                  }}
+                >
+                  <AppIcon
+                    color={colors.error.accent}
+                    name="alert-circle-outline"
+                    size={AppFontSize.sm - 1}
+                  />{" "}
+                  {dateError}
+                </Paragraph>
+              ) : null}
             </View>
           )}
 

From 0aaabfab62306de1266a4ede898492fb047918af Mon Sep 17 00:00:00 2001
From: Abdullah Atta <abdullahatta@streetwriters.co>
Date: Fri, 8 May 2026 08:53:00 +0500
Subject: [PATCH 20/39] web: exclude hidden settings from setting search
 (#9772)

* web: exclude hidden settings from search

* web: add support for searching setting section groups
---
 apps/web/src/dialogs/settings/index.tsx | 53 ++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/dialogs/settings/index.tsx b/apps/web/src/dialogs/settings/index.tsx
index 6d3bfa7fd..8b05e70d1 100644
--- a/apps/web/src/dialogs/settings/index.tsx
+++ b/apps/web/src/dialogs/settings/index.tsx
@@ -47,6 +47,7 @@ import { FlexScrollContainer } from "../../components/scroll-container";
 import { useCallback, useEffect, useRef, useState } from "react";
 import {
   DropdownSettingComponent,
+  Section,
   SectionGroup,
   SectionKeys,
   Setting,
@@ -254,9 +255,15 @@ export const SettingsDialog = DialogManager.register(function SettingsDialog(
             overflow: "auto"
           }}
         >
-          {activeSettings.map((group) => (
-            <SettingsGroupComponent item={group} />
-          ))}
+          {activeSettings.length > 0 ? (
+            activeSettings.map((group) => (
+              <SettingsGroupComponent item={group} />
+            ))
+          ) : (
+            <Text variant="body" sx={{ color: "paragraph-secondary" }}>
+              {strings.noResultsFound()}
+            </Text>
+          )}
         </FlexScrollContainer>
       </Flex>
     </Dialog>
@@ -317,12 +324,17 @@ function SettingsSideBar(props: SettingsSideBarProps) {
                   SettingsGroups.filter((g) => g.section === route)
                 );
 
-              const groups: SettingsGroup[] = [];
+              let groups: SettingsGroup[] = [];
               for (const group of SettingsGroups) {
+                const section = findSection(group.section);
+                if (section?.isHidden?.() || group.isHidden?.()) continue;
+
                 const isTitleMatch =
                   typeof group.header === "string" &&
                   group.header.toLowerCase().includes(query);
-                const isSectionMatch = group.section.includes(query);
+                const isSectionMatch = group.section
+                  .toLowerCase()
+                  .includes(query);
 
                 if (isTitleMatch || isSectionMatch) {
                   groups.push(group);
@@ -347,6 +359,18 @@ function SettingsSideBar(props: SettingsSideBarProps) {
                 if (!settings.length) continue;
                 groups.push({ ...group, settings });
               }
+              const matchedSections = findSections(query);
+              if (matchedSections.length > 0) {
+                const matchedGroups = SettingsGroups.filter((g) =>
+                  matchedSections.some((s) => s.key === g.section)
+                );
+                // remove groups whose sections were matched to avoid duplicate
+                // entries.
+                groups = groups.filter(
+                  (g) => !matchedGroups.some((mg) => mg.section === g.section)
+                );
+                groups.push(...matchedGroups);
+              }
               onNavigate(groups);
             }}
           />
@@ -717,3 +741,22 @@ function NumberInput({
     </Flex>
   );
 }
+
+function findSection(key: SectionKeys) {
+  for (const group of sectionGroups) {
+    const section = group.sections.find((s) => s.key === key);
+    if (section) return section;
+  }
+  return null;
+}
+
+function findSections(query: string) {
+  const sections: Section[] = [];
+  for (const group of sectionGroups) {
+    for (const section of group.sections) {
+      if (section.isHidden?.()) continue;
+      if (section.title.toLowerCase().includes(query)) sections.push(section);
+    }
+  }
+  return sections;
+}

From b8b7d37799b5b909363d987aff95dbc8c128ed2c Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Fri, 8 May 2026 09:24:39 +0500
Subject: [PATCH 21/39] core: remap Invalid token error to Invalid code in
 changeEmail

---
 packages/core/src/api/user-manager.ts | 30 ++++++++++++++++-----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/packages/core/src/api/user-manager.ts b/packages/core/src/api/user-manager.ts
index aa0970808..e97dead3f 100644
--- a/packages/core/src/api/user-manager.ts
+++ b/packages/core/src/api/user-manager.ts
@@ -548,18 +548,24 @@ class UserManager {
 
     const email = newEmail.toLowerCase();
 
-    await http.patch(
-      `${constants.AUTH_HOST}${ENDPOINTS.patchUser}`,
-      {
-        type: "change_email",
-        new_email: newEmail,
-        password: await this.db.storage().hash(password, email, {
-          usesFallback: await this.usesFallbackPWHash(password)
-        }),
-        verification_code: code
-      },
-      token
-    );
+    try {
+      await http.patch(
+        `${constants.AUTH_HOST}${ENDPOINTS.patchUser}`,
+        {
+          type: "change_email",
+          new_email: newEmail,
+          password: await this.db.storage().hash(password, email, {
+            usesFallback: await this.usesFallbackPWHash(password)
+          }),
+          verification_code: code
+        },
+        token
+      );
+    } catch (e) {
+      const error = e as Error;
+      if (error.message === "Invalid token.") throw new Error("Invalid code.");
+      throw error;
+    }
   }
 
   recoverAccount(email: string) {

From 9992bf8c3286026ea77fe232954a4458a8b0b525 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Fri, 8 May 2026 09:26:11 +0500
Subject: [PATCH 22/39] mobile: add form validation in change email

---
 .../screens/settings/change-email/index.tsx   | 135 +++++++++++-------
 1 file changed, 86 insertions(+), 49 deletions(-)

diff --git a/apps/mobile/app/screens/settings/change-email/index.tsx b/apps/mobile/app/screens/settings/change-email/index.tsx
index c8a35d100..2b44fe986 100644
--- a/apps/mobile/app/screens/settings/change-email/index.tsx
+++ b/apps/mobile/app/screens/settings/change-email/index.tsx
@@ -23,8 +23,15 @@ import { eSendEvent, ToastManager } from "../../../services/event-manager";
 import { eUserLoggedIn } from "../../../utils/events";
 import { strings } from "@notesnook/intl";
 import { DefaultAppStyles } from "../../../utils/styles";
-import Input from "../../../components/ui/input";
+import FormInput, {
+  createFormRef,
+  validators
+} from "../../../components/ui/input/form-input";
 import { Button } from "../../../components/ui/button";
+import Paragraph from "../../../components/ui/typography/paragraph";
+import { useThemeColors } from "@notesnook/theme";
+import { AppFontSize } from "../../../utils/size";
+import Navigation from "../../../services/navigation";
 
 enum EmailChangeSteps {
   verify,
@@ -32,14 +39,16 @@ enum EmailChangeSteps {
 }
 
 export const ChangeEmail = () => {
+  const { colors } = useThemeColors();
   const [step, setStep] = useState(EmailChangeSteps.verify);
-  const emailChangeData = useRef<{
-    email?: string;
-    password?: string;
-    code?: string;
-  }>({});
+  const formRef = useRef(
+    createFormRef({
+      email: "",
+      password: "",
+      code: ""
+    })
+  );
   const [loading, setLoading] = useState(false);
-  const [error, setError] = useState(false);
   const emailInputRef = useRef<TextInput>(null);
   const passInputRef = useRef<TextInput>(null);
   const codeInputRef = useRef<TextInput>(null);
@@ -47,44 +56,52 @@ export const ChangeEmail = () => {
   const onSubmit = async () => {
     try {
       if (step === EmailChangeSteps.verify) {
-        if (
-          !emailChangeData.current.email ||
-          !emailChangeData.current.password ||
-          error
-        )
-          return;
+        const hasEmailError = formRef.current.validateField("email");
+        const hasPasswordError = formRef.current.validateField("password");
+        if (hasEmailError || hasPasswordError) return;
+
+        const { email, password } = formRef.current.getValues();
+
         setLoading(true);
-        const verified = await db.user?.verifyPassword(
-          emailChangeData.current.password
-        );
+        const verified = await db.user?.verifyPassword(password);
         if (!verified) throw new Error(strings.passwordIncorrect());
-        await db.user?.sendVerificationEmail(emailChangeData.current.email);
+        await db.user?.sendVerificationEmail(email);
         setStep(EmailChangeSteps.changeEmail);
+        formRef.current.clearErrors();
+        formRef.current.setValue("code", "");
         setLoading(false);
       } else {
-        if (
-          !emailChangeData.current.email ||
-          !emailChangeData.current.password ||
-          error ||
-          !emailChangeData.current.code
-        )
-          return;
-        await db.user?.changeEmail(
-          emailChangeData.current.email,
-          emailChangeData.current.password,
-          emailChangeData.current.code
-        );
+        const hasCodeError = formRef.current.validateField("code");
+        if (hasCodeError) return;
+
+        const { email, password, code } = formRef.current.getValues();
+
+        setLoading(true);
+        await db.user?.changeEmail(email, password, code);
         eSendEvent(eUserLoggedIn);
-        close?.();
         ToastManager.show({
-          heading: strings.emailUpdated(emailChangeData.current.email),
+          heading: strings.emailUpdated(email),
           type: "success",
           context: "global"
         });
+        Navigation.goBack();
+        setLoading(false);
       }
     } catch (e) {
       setLoading(false);
-      ToastManager.error(e as Error);
+      const error = e as Error;
+
+      if (step === EmailChangeSteps.verify) {
+        if (error.message === strings.passwordIncorrect()) {
+          formRef.current.setError("password", error.message);
+        } else {
+          formRef.current.setError("email", error.message);
+        }
+        return;
+      } else {
+        formRef.current.setError("code", error.message);
+        return;
+      }
     }
   };
 
@@ -97,34 +114,54 @@ export const ChangeEmail = () => {
       >
         {step === EmailChangeSteps.verify ? (
           <>
-            <Input
+            <FormInput
+              name="email"
+              formRef={formRef}
               fwdRef={emailInputRef}
               placeholder={strings.enterNewEmail()}
-              validationType="email"
-              onErrorCheck={(e) => setError(e)}
-              onChangeText={(email) => {
-                emailChangeData.current.email = email;
+              keyboardType="email-address"
+              autoCapitalize="none"
+              autoCorrect={false}
+              validators={[
+                validators.required(strings.emailRequired()),
+                validators.email(strings.enterValidEmail())
+              ]}
+              onSubmitEditing={() => {
+                passInputRef.current?.focus();
               }}
             />
-            <Input
+            <FormInput
+              name="password"
+              formRef={formRef}
               fwdRef={passInputRef}
               placeholder={strings.enterAccountPassword()}
               secureTextEntry
-              onChangeText={(pass) => {
-                emailChangeData.current.password = pass;
-              }}
+              autoCapitalize="none"
+              autoCorrect={false}
+              autoComplete="password"
+              validators={[validators.required(strings.passwordRequired())]}
+              onSubmitEditing={onSubmit}
             />
           </>
         ) : (
           <>
-            <Input
-              key="code-input"
+            <FormInput
+              name="code"
+              formRef={formRef}
               fwdRef={codeInputRef}
               placeholder={strings.code()}
-              defaultValue=""
-              onChangeText={(code) => {
-                emailChangeData.current.code = code;
-              }}
+              keyboardType="number-pad"
+              autoCapitalize="none"
+              autoCorrect={false}
+              maxLength={6}
+              validators={[
+                validators.required(strings.enterSixDigitCode()),
+                (value: string) =>
+                  /^\d{6}$/.test(value.trim())
+                    ? undefined
+                    : strings.enterSixDigitCode()
+              ]}
+              onSubmitEditing={onSubmit}
             />
           </>
         )}
@@ -135,8 +172,8 @@ export const ChangeEmail = () => {
           loading
             ? undefined
             : step === EmailChangeSteps.verify
-            ? strings.verify()
-            : strings.changeEmail()
+              ? strings.verify()
+              : strings.changeEmail()
         }
         type="accent"
         style={{

From 61aaaba452cfe97c3765c009c07560bab8e8ba1d Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Fri, 8 May 2026 10:02:57 +0500
Subject: [PATCH 23/39] mobile: cleanup

---
 .../app/screens/settings/change-email/index.tsx    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/apps/mobile/app/screens/settings/change-email/index.tsx b/apps/mobile/app/screens/settings/change-email/index.tsx
index 2b44fe986..bf6d3419a 100644
--- a/apps/mobile/app/screens/settings/change-email/index.tsx
+++ b/apps/mobile/app/screens/settings/change-email/index.tsx
@@ -16,22 +16,20 @@ 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 { strings } from "@notesnook/intl";
+import { useThemeColors } from "@notesnook/theme";
 import React, { useRef, useState } from "react";
 import { TextInput, View } from "react-native";
 import { db } from "../../../common/database";
-import { eSendEvent, ToastManager } from "../../../services/event-manager";
-import { eUserLoggedIn } from "../../../utils/events";
-import { strings } from "@notesnook/intl";
-import { DefaultAppStyles } from "../../../utils/styles";
+import { Button } from "../../../components/ui/button";
 import FormInput, {
   createFormRef,
   validators
 } from "../../../components/ui/input/form-input";
-import { Button } from "../../../components/ui/button";
-import Paragraph from "../../../components/ui/typography/paragraph";
-import { useThemeColors } from "@notesnook/theme";
-import { AppFontSize } from "../../../utils/size";
+import { eSendEvent, ToastManager } from "../../../services/event-manager";
 import Navigation from "../../../services/navigation";
+import { eUserLoggedIn } from "../../../utils/events";
+import { DefaultAppStyles } from "../../../utils/styles";
 
 enum EmailChangeSteps {
   verify,

From 73c44d476b3c610237eb7115d039748c4c58a98a Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Wed, 6 May 2026 10:21:39 +0500
Subject: [PATCH 24/39] mobile: fix rename attachment does not work on iOS

---
 .../app/components/attachments/actions.tsx    | 44 +++++++++++--------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/apps/mobile/app/components/attachments/actions.tsx b/apps/mobile/app/components/attachments/actions.tsx
index d8b198d7e..17e95fc24 100644
--- a/apps/mobile/app/components/attachments/actions.tsx
+++ b/apps/mobile/app/components/attachments/actions.tsx
@@ -153,24 +153,32 @@ const Actions = ({
     {
       name: strings.rename(),
       onPress: () => {
-        presentDialog({
-          input: true,
-          title: strings.renameFile(),
-          defaultValue: attachment.filename,
-          positivePress: async (value) => {
-            if (value && value.length > 0) {
-              await db.attachments.add({
-                hash: attachment.hash,
-                filename: value
-              });
-              setFilename(value);
-              setAttachments();
-              eSendEvent(eDBItemUpdate, attachment.id);
-            }
-            return true;
-          },
-          positiveText: strings.rename()
-        });
+        close?.();
+        setTimeout(() => {
+          presentDialog({
+            input: true,
+            inputPlaceholder: strings.enterTitle(),
+            title: strings.renameFile(),
+            defaultValue: attachment.filename,
+            positivePress: async (value) => {
+              if (value && value.length > 0) {
+                await db.attachments.add({
+                  hash: attachment.hash,
+                  filename: value
+                });
+                setFilename(value);
+                setAttachments();
+                eSendEvent(eDBItemUpdate, attachment.id);
+                ToastManager.show({
+                  message: `Attachment renamed to ${value}`,
+                  type: "success"
+                });
+              }
+              return true;
+            },
+            positiveText: strings.rename()
+          });
+        }, 500);
       },
       icon: "form-textbox"
     },

From 03defb3a4835c0a513cbe15807198b1635e376c7 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Wed, 6 May 2026 12:25:47 +0500
Subject: [PATCH 25/39] mobile: fix defaultValue is used if input is empty in
 dialog input

---
 .../app/components/attachments/actions.tsx       | 11 +++++++++--
 apps/mobile/app/components/dialog/index.tsx      |  2 +-
 apps/mobile/app/hooks/use-actions.tsx            |  9 ++++++++-
 apps/mobile/app/screens/settings/functions.js    | 16 ++++++++++++++++
 .../app/screens/settings/settings-data.tsx       |  8 ++++++++
 .../mobile/app/screens/settings/user-section.jsx |  8 ++++++++
 apps/mobile/app/utils/unlock-vault.ts            |  8 ++++++++
 packages/intl/locale/en.po                       |  4 ++++
 packages/intl/locale/pseudo-LOCALE.po            |  4 ++++
 packages/intl/src/strings.ts                     |  3 ++-
 10 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/apps/mobile/app/components/attachments/actions.tsx b/apps/mobile/app/components/attachments/actions.tsx
index 17e95fc24..84a07e74a 100644
--- a/apps/mobile/app/components/attachments/actions.tsx
+++ b/apps/mobile/app/components/attachments/actions.tsx
@@ -161,7 +161,10 @@ const Actions = ({
             title: strings.renameFile(),
             defaultValue: attachment.filename,
             positivePress: async (value) => {
-              if (value && value.length > 0) {
+              try {
+                if (!value || !value.trim()) {
+                  throw new Error(strings.nameIsRequired());
+                }
                 await db.attachments.add({
                   hash: attachment.hash,
                   filename: value
@@ -173,8 +176,12 @@ const Actions = ({
                   message: `Attachment renamed to ${value}`,
                   type: "success"
                 });
+
+                return true;
+              } catch (e) {
+                ToastManager.error(e as Error, undefined, "local");
+                return false;
               }
-              return true;
             },
             positiveText: strings.rename()
           });
diff --git a/apps/mobile/app/components/dialog/index.tsx b/apps/mobile/app/components/dialog/index.tsx
index ed1b273b2..b3ebd16d3 100644
--- a/apps/mobile/app/components/dialog/index.tsx
+++ b/apps/mobile/app/components/dialog/index.tsx
@@ -93,7 +93,7 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
       let result = false;
       try {
         result = await dialogInfo.positivePress(
-          values.current.inputValue || dialogInfo.defaultValue,
+          values.current.inputValue,
           checked
         );
       } catch (e) {
diff --git a/apps/mobile/app/hooks/use-actions.tsx b/apps/mobile/app/hooks/use-actions.tsx
index 2e0a685e0..74fc1daf9 100644
--- a/apps/mobile/app/hooks/use-actions.tsx
+++ b/apps/mobile/app/hooks/use-actions.tsx
@@ -368,7 +368,14 @@ export const useActions = ({
       inputPlaceholder: strings.name(),
       defaultValue: item.title,
       positivePress: async (value) => {
-        if (!value || value.trim().length === 0) return;
+        if (!value || value.trim().length === 0) {
+          ToastManager.error(
+            new Error(strings.nameIsRequired()),
+            undefined,
+            "local"
+          );
+          return;
+        }
         await db.colors.add({
           id: item.id,
           title: value
diff --git a/apps/mobile/app/screens/settings/functions.js b/apps/mobile/app/screens/settings/functions.js
index 4e03de847..b12e5e70c 100644
--- a/apps/mobile/app/screens/settings/functions.js
+++ b/apps/mobile/app/screens/settings/functions.js
@@ -47,6 +47,14 @@ export async function verifyUser(
     negativeText: closeText || strings.cancel(),
     positivePress: async (value) => {
       try {
+        if (!value || !value.trim()) {
+          ToastManager.error(
+            new Error(strings.passwordNotEntered()),
+            undefined,
+            "local"
+          );
+          return;
+        }
         const user = await db.user.getUser();
         let verified = !user ? true : await db.user.verifyPassword(value);
         if (verified) {
@@ -95,6 +103,14 @@ export async function verifyUserWithApplock() {
         keyboardType: keyboardType,
         positivePress: async (value) => {
           try {
+            if (!value || !value.trim()) {
+              ToastManager.error(
+                new Error(strings.passwordNotEntered()),
+                undefined,
+                "local"
+              );
+              return;
+            }
             const verified = await validateAppLockPassword(value);
             if (!verified) {
               ToastManager.show({
diff --git a/apps/mobile/app/screens/settings/settings-data.tsx b/apps/mobile/app/screens/settings/settings-data.tsx
index 3a8089e2b..8c9b51509 100644
--- a/apps/mobile/app/screens/settings/settings-data.tsx
+++ b/apps/mobile/app/screens/settings/settings-data.tsx
@@ -529,6 +529,14 @@ export const settingsGroups: SettingSection[] = [
                 positiveText: strings.delete(),
                 positivePress: async (value) => {
                   try {
+                    if (!value || !value.trim()) {
+                      ToastManager.error(
+                        new Error(strings.passwordNotEntered()),
+                        undefined,
+                        "local"
+                      );
+                      return;
+                    }
                     const verified = await db.user?.verifyPassword(value);
                     if (verified) {
                       setTimeout(async () => {
diff --git a/apps/mobile/app/screens/settings/user-section.jsx b/apps/mobile/app/screens/settings/user-section.jsx
index f399ce717..b87cccfb7 100644
--- a/apps/mobile/app/screens/settings/user-section.jsx
+++ b/apps/mobile/app/screens/settings/user-section.jsx
@@ -201,6 +201,14 @@ const SettingsUserSection = ({ item }) => {
                         inputPlaceholder: strings.enterFullName(),
                         defaultValue: userProfile?.fullName,
                         positivePress: async (value) => {
+                          if (!value || !value.trim()) {
+                            ToastManager.error(
+                              new Error(strings.nameIsRequired()),
+                              undefined,
+                              "local"
+                            );
+                            return;
+                          }
                           db.settings
                             .setProfile({
                               fullName: value
diff --git a/apps/mobile/app/utils/unlock-vault.ts b/apps/mobile/app/utils/unlock-vault.ts
index 75ae34d8d..92577f154 100644
--- a/apps/mobile/app/utils/unlock-vault.ts
+++ b/apps/mobile/app/utils/unlock-vault.ts
@@ -65,6 +65,14 @@ export async function unlockVault({
             paragraph: paragraph,
             inputPlaceholder: strings.enterPassword(),
             positivePress: async (value) => {
+              if (!value || !value.trim()) {
+                ToastManager.error(
+                  new Error(strings.passwordNotEntered()),
+                  undefined,
+                  "local"
+                );
+                return;
+              }
               const unlocked = await db.vault.unlock(value);
               if (!unlocked) {
                 ToastManager.show({
diff --git a/packages/intl/locale/en.po b/packages/intl/locale/en.po
index 6499ba0ea..09fe8f1e1 100644
--- a/packages/intl/locale/en.po
+++ b/packages/intl/locale/en.po
@@ -4034,6 +4034,10 @@ msgstr "Multi-layer encryption to most important notes"
 msgid "Name"
 msgstr "Name"
 
+#: src/strings.ts:2669
+msgid "Name is required."
+msgstr "Name is required."
+
 #: src/strings.ts:1688
 msgid "Native high-performance encryption"
 msgstr "Native high-performance encryption"
diff --git a/packages/intl/locale/pseudo-LOCALE.po b/packages/intl/locale/pseudo-LOCALE.po
index add9f914c..ab3f66ba2 100644
--- a/packages/intl/locale/pseudo-LOCALE.po
+++ b/packages/intl/locale/pseudo-LOCALE.po
@@ -4014,6 +4014,10 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
+#: src/strings.ts:2669
+msgid "Name is required."
+msgstr ""
+
 #: src/strings.ts:1688
 msgid "Native high-performance encryption"
 msgstr ""
diff --git a/packages/intl/src/strings.ts b/packages/intl/src/strings.ts
index 472ef36c3..6bfe069ec 100644
--- a/packages/intl/src/strings.ts
+++ b/packages/intl/src/strings.ts
@@ -2665,5 +2665,6 @@ Use this if changes from other devices are not appearing on this device. This wi
   deleteAttachmentConfirm: () =>
     t`Are you sure you want to delete this attachment?`,
   attachmentDeleted: () => t`Attachment deleted`,
-  titleIsRequired: () => t`Title is required`
+  titleIsRequired: () => t`Title is required`,
+  nameIsRequired: () => t`Name is required.`
 };

From e7fb246c257dcdd6a3cf7894bcc6a7c06130d449 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Thu, 7 May 2026 12:49:49 +0500
Subject: [PATCH 26/39] mobile: show errors under input in rename dialog

---
 .../app/components/attachments/actions.tsx    | 56 +++++++++++--------
 packages/intl/locale/en.po                    |  8 +--
 packages/intl/locale/pseudo-LOCALE.po         |  8 +--
 3 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/apps/mobile/app/components/attachments/actions.tsx b/apps/mobile/app/components/attachments/actions.tsx
index 84a07e74a..4ee2de59e 100644
--- a/apps/mobile/app/components/attachments/actions.tsx
+++ b/apps/mobile/app/components/attachments/actions.tsx
@@ -22,7 +22,7 @@ import { Attachment, Note, VirtualizedGrouping } from "@notesnook/core";
 import { useThemeColors } from "@notesnook/theme";
 import Clipboard from "@react-native-clipboard/clipboard";
 import React, { RefObject, useEffect, useState } from "react";
-import { View } from "react-native";
+import { TextInput, View } from "react-native";
 import { ActionSheetRef } from "react-native-actions-sheet";
 import { ScrollView } from "react-native-gesture-handler";
 import { db } from "../../common/database";
@@ -59,6 +59,7 @@ import Paragraph from "../ui/typography/paragraph";
 import { strings } from "@notesnook/intl";
 import { DefaultAppStyles } from "../../utils/styles";
 import Navigation from "../../services/navigation";
+import { createFormRef, validators } from "../ui/input/form-input";
 
 const Actions = ({
   attachment,
@@ -156,31 +157,40 @@ const Actions = ({
         close?.();
         setTimeout(() => {
           presentDialog({
-            input: true,
-            inputPlaceholder: strings.enterTitle(),
             title: strings.renameFile(),
-            defaultValue: attachment.filename,
-            positivePress: async (value) => {
-              try {
-                if (!value || !value.trim()) {
-                  throw new Error(strings.nameIsRequired());
+            form: {
+              formRef: createFormRef({
+                name: attachment.filename
+              }),
+              items: [
+                {
+                  name: "name",
+                  defaultValue: attachment.filename,
+                  placeholder: strings.enterTitle(),
+                  ref: React.createRef<TextInput | null>(),
+                  validators: [validators.required(strings.nameIsRequired())]
                 }
-                await db.attachments.add({
-                  hash: attachment.hash,
-                  filename: value
-                });
-                setFilename(value);
-                setAttachments();
-                eSendEvent(eDBItemUpdate, attachment.id);
-                ToastManager.show({
-                  message: `Attachment renamed to ${value}`,
-                  type: "success"
-                });
+              ],
+              onFormSubmit: async (form) => {
+                try {
+                  const value = form.getValue("name");
+                  await db.attachments.add({
+                    hash: attachment.hash,
+                    filename: value
+                  });
+                  setFilename(value);
+                  setAttachments();
+                  eSendEvent(eDBItemUpdate, attachment.id);
+                  ToastManager.show({
+                    message: `Attachment renamed to ${value}`,
+                    type: "success"
+                  });
 
-                return true;
-              } catch (e) {
-                ToastManager.error(e as Error, undefined, "local");
-                return false;
+                  return true;
+                } catch (e) {
+                  form.setError("name", (e as Error).message);
+                  return false;
+                }
               }
             },
             positiveText: strings.rename()
diff --git a/packages/intl/locale/en.po b/packages/intl/locale/en.po
index 09fe8f1e1..534e7e949 100644
--- a/packages/intl/locale/en.po
+++ b/packages/intl/locale/en.po
@@ -1,17 +1,11 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2026-04-20 11:33+0500\n"
+"POT-Creation-Date: 2026-05-08 10:43+0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: @lingui/cli\n"
 "Language: en\n"
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"Plural-Forms: \n"
 
 #: src/strings.ts:2421
 msgid " \"Notebook > Notes\""
diff --git a/packages/intl/locale/pseudo-LOCALE.po b/packages/intl/locale/pseudo-LOCALE.po
index ab3f66ba2..0ad2efe05 100644
--- a/packages/intl/locale/pseudo-LOCALE.po
+++ b/packages/intl/locale/pseudo-LOCALE.po
@@ -1,17 +1,11 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2026-04-20 11:33+0500\n"
+"POT-Creation-Date: 2026-05-08 10:43+0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: @lingui/cli\n"
 "Language: pseudo-LOCALE\n"
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"Plural-Forms: \n"
 
 #: src/strings.ts:2421
 msgid " \"Notebook > Notes\""

From d4d7eac2403ce2c2fdecec71428a4173dc1f69bb Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Fri, 8 May 2026 08:52:17 +0500
Subject: [PATCH 27/39] mobile: fix loading indicator causes cancel button to
 jump

---
 apps/mobile/app/components/dialog/dialog-buttons.tsx | 8 ++++++--
 apps/mobile/app/components/dialog/index.tsx          | 4 +---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/mobile/app/components/dialog/dialog-buttons.tsx b/apps/mobile/app/components/dialog/dialog-buttons.tsx
index fd055abfd..01e8d1efb 100644
--- a/apps/mobile/app/components/dialog/dialog-buttons.tsx
+++ b/apps/mobile/app/components/dialog/dialog-buttons.tsx
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React from "react";
-import { StyleSheet, View } from "react-native";
+import { ActivityIndicator, StyleSheet, View } from "react-native";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { notesnook } from "../../../e2e/test.ids";
 import { getColorLinearShade } from "../../utils/colors";
@@ -79,6 +79,11 @@ const DialogButtons = ({
           />
           <Paragraph color={colors.primary.accent}>{" " + doneText}</Paragraph>
         </View>
+      ) : loading ? (
+        <ActivityIndicator
+          size={AppFontSize.lg}
+          color={colors.primary.accent}
+        />
       ) : (
         <View />
       )}
@@ -105,7 +110,6 @@ const DialogButtons = ({
             style={{
               marginLeft: 10
             }}
-            loading={loading}
             bold
             type={positiveType || "transparent"}
             title={positiveTitle}
diff --git a/apps/mobile/app/components/dialog/index.tsx b/apps/mobile/app/components/dialog/index.tsx
index b3ebd16d3..c4e6a1080 100644
--- a/apps/mobile/app/components/dialog/index.tsx
+++ b/apps/mobile/app/components/dialog/index.tsx
@@ -67,15 +67,13 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
     // Handle form submission if form is available
     if (dialogInfo?.form && formRef.current) {
       inputRef.current?.blur();
-      setLoading(true);
       try {
         const isValid = await formRef.current.validate();
         if (!isValid) {
-          setLoading(false);
           return;
         }
-
         if (dialogInfo.form.onFormSubmit) {
+          setLoading(true);
           const result = await dialogInfo.form.onFormSubmit(formRef.current);
           if (result === false) {
             setLoading(false);

From d3f1690dcaa2ac1293a8d9411c6dcf66a462f1a4 Mon Sep 17 00:00:00 2001
From: 01zulfi <85733202+01zulfi@users.noreply.github.com>
Date: Mon, 11 May 2026 10:19:20 +0500
Subject: [PATCH 28/39] web: bump version to 3.3.18 Signed-off-by: 01zulfi
 <85733202+01zulfi@users.noreply.github.com>

---
 apps/desktop/package-lock.json | 4 ++--
 apps/desktop/package.json      | 2 +-
 apps/web/package-lock.json     | 4 ++--
 apps/web/package.json          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/desktop/package-lock.json b/apps/desktop/package-lock.json
index a796ae015..00ad61378 100644
--- a/apps/desktop/package-lock.json
+++ b/apps/desktop/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/desktop",
-  "version": "3.3.17",
+  "version": "3.3.18",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/desktop",
-      "version": "3.3.17",
+      "version": "3.3.18",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 513471002..22a540c3c 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -2,7 +2,7 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "3.3.17",
+  "version": "3.3.18",
   "appAppleId": "1544027013",
   "private": true,
   "main": "./dist/cjs/index.js",
diff --git a/apps/web/package-lock.json b/apps/web/package-lock.json
index 41b693d27..34899ec8e 100644
--- a/apps/web/package-lock.json
+++ b/apps/web/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/web",
-  "version": "3.3.17",
+  "version": "3.3.18",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/web",
-      "version": "3.3.17",
+      "version": "3.3.18",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {
diff --git a/apps/web/package.json b/apps/web/package.json
index 4dd75dd64..7112274ad 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@notesnook/web",
   "description": "Your private note taking space",
-  "version": "3.3.17",
+  "version": "3.3.18",
   "private": true,
   "main": "./src/app.js",
   "homepage": "https://notesnook.com/",

From 238abee126e00d4cf9ccf5d3ae93023ccdf9f081 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Mon, 11 May 2026 13:35:28 +0500
Subject: [PATCH 29/39] mobile: add form validation in change password screen

---
 .../app/components/auth/change-password.tsx   | 106 +++++++++++-------
 packages/intl/locale/en.po                    |  15 ++-
 packages/intl/locale/pseudo-LOCALE.po         |  15 ++-
 packages/intl/src/strings.ts                  |   5 +-
 4 files changed, 92 insertions(+), 49 deletions(-)

diff --git a/apps/mobile/app/components/auth/change-password.tsx b/apps/mobile/app/components/auth/change-password.tsx
index a3ca00938..d10ae1341 100644
--- a/apps/mobile/app/components/auth/change-password.tsx
+++ b/apps/mobile/app/components/auth/change-password.tsx
@@ -18,6 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { strings } from "@notesnook/intl";
+import { useThemeColors } from "@notesnook/theme";
 import React, { useRef, useState } from "react";
 import { View } from "react-native";
 import { db } from "../../common/database";
@@ -26,42 +27,44 @@ import { eSendEvent, ToastManager } from "../../services/event-manager";
 import Navigation from "../../services/navigation";
 import { useUserStore } from "../../stores/use-user-store";
 import { eOpenRecoveryKeyDialog } from "../../utils/events";
+import { AppFontSize } from "../../utils/size";
 import { DefaultAppStyles } from "../../utils/styles";
 import { Dialog } from "../dialog";
+import AppIcon from "../ui/AppIcon";
 import { Button } from "../ui/button";
-import Input from "../ui/input";
+import FormInput, { createFormRef, validators } from "../ui/input/form-input";
 import { Notice } from "../ui/notice";
+import Paragraph from "../ui/typography/paragraph";
 import { TextInput } from "react-native-gesture-handler";
 
 export const ChangePassword = () => {
-  const passwordInputRef = useRef<TextInput>(null);
-  const password = useRef<string>(undefined);
+  const { colors } = useThemeColors();
+  const formRef = useRef(
+    createFormRef({
+      oldPassword: "",
+      password: ""
+    })
+  );
   const oldPasswordInputRef = useRef<TextInput>(null);
-  const oldPassword = useRef<string>(undefined);
-
-  const [error, setError] = useState(false);
+  const passwordInputRef = useRef<TextInput>(null);
   const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string>();
   const user = useUserStore((state) => state.user);
 
   const changePassword = async () => {
+    setError(undefined);
+    formRef.current.clearErrors();
+
     if (!user?.isEmailConfirmed) {
-      ToastManager.show({
-        heading: strings.emailNotConfirmed(),
-        message: strings.emailNotConfirmedDesc(),
-        type: "error",
-        context: "local"
-      });
+      setError(strings.emailNotConfirmedDesc());
       return;
     }
-    if (error || !oldPassword.current || !password.current) {
-      ToastManager.show({
-        heading: strings.allFieldsRequired(),
-        message: strings.allFieldsRequiredDesc(),
-        type: "error",
-        context: "local"
-      });
+    if (!formRef.current.validate()) {
       return;
     }
+
+    const values = formRef.current.getValues();
+
     setLoading(true);
     try {
       const result = await BackupService.run(
@@ -74,8 +77,8 @@ export const ChangePassword = () => {
       }
 
       const passwordChanged = await db.user.changePassword(
-        oldPassword.current,
-        password.current
+        values.oldPassword,
+        values.password
       );
 
       if (!passwordChanged) {
@@ -91,15 +94,15 @@ export const ChangePassword = () => {
       Navigation.goBack();
       eSendEvent(eOpenRecoveryKeyDialog);
     } catch (e) {
+      const message = (e as Error).message;
       setLoading(false);
-      ToastManager.show({
-        heading: strings.passwordChangeFailed(),
-        message: (e as Error).message,
-        type: "error",
-        context: "local"
-      });
+
+      if (/old password/i.test(message)) {
+        formRef.current.setError("oldPassword", message);
+      } else {
+        setError(message);
+      }
     }
-    setLoading(false);
   };
 
   return (
@@ -110,36 +113,61 @@ export const ChangePassword = () => {
       }}
     >
       <Dialog context="change-password-dialog" />
-      <Input
+      <FormInput
+        name="oldPassword"
+        formRef={formRef}
         fwdRef={oldPasswordInputRef}
-        onChangeText={(value) => {
-          oldPassword.current = value;
-        }}
+        loading={loading}
+        validators={[validators.required(strings.currentPasswordRequired())]}
         returnKeyLabel="Next"
         returnKeyType="next"
         secureTextEntry
         autoComplete="password"
         autoCapitalize="none"
         autoCorrect={false}
-        placeholder={strings.oldPassword()}
+        placeholder={strings.currentPassword()}
+        onSubmitEditing={() => {
+          passwordInputRef.current?.focus();
+        }}
       />
 
-      <Input
+      <FormInput
+        name="password"
+        formRef={formRef}
         fwdRef={passwordInputRef}
-        onChangeText={(value) => {
-          password.current = value;
-        }}
-        onErrorCheck={(e) => setError(e)}
+        loading={loading}
+        validators={[validators.required(strings.passwordRequired())]}
         returnKeyLabel={strings.next()}
         returnKeyType="next"
         secureTextEntry
-        validationType="password"
         autoComplete="password"
         autoCapitalize="none"
         autoCorrect={false}
         placeholder={strings.newPassword()}
+        onSubmitEditing={() => {
+          changePassword();
+        }}
       />
 
+      {error ? (
+        <Paragraph
+          numberOfLines={4}
+          onPress={() => {}}
+          color={colors.error.accent}
+          style={{
+            textAlign: "center",
+            marginTop: DefaultAppStyles.GAP_VERTICAL
+          }}
+        >
+          <AppIcon
+            color={colors.error.accent}
+            name="alert-circle-outline"
+            size={AppFontSize.sm - 1}
+          />{" "}
+          {error}
+        </Paragraph>
+      ) : null}
+
       <Notice text={strings.changePasswordNotice()} type="alert" />
 
       <View style={{ height: 10 }} />
diff --git a/packages/intl/locale/en.po b/packages/intl/locale/en.po
index 534e7e949..3bc3c0f7e 100644
--- a/packages/intl/locale/en.po
+++ b/packages/intl/locale/en.po
@@ -6,6 +6,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: @lingui/cli\n"
 "Language: en\n"
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Plural-Forms: \n"
 
 #: src/strings.ts:2421
 msgid " \"Notebook > Notes\""
@@ -1962,10 +1968,15 @@ msgstr "Curate the toolbar that fits your needs and matches your personality."
 msgid "Current note"
 msgstr "Current note"
 
+#: src/strings.ts:1479
 #: src/strings.ts:1485
 msgid "Current password"
 msgstr "Current password"
 
+#: src/strings.ts:2670
+msgid "Current password required"
+msgstr "Current password required"
+
 #: src/strings.ts:1229
 msgid "Current path: {path}"
 msgstr "Current path: {path}"
@@ -4401,10 +4412,6 @@ msgstr "Okay"
 msgid "Old - new"
 msgstr "Old - new"
 
-#: src/strings.ts:1479
-msgid "Old password"
-msgstr "Old password"
-
 #: src/strings.ts:1835
 msgid "Older version"
 msgstr "Older version"
diff --git a/packages/intl/locale/pseudo-LOCALE.po b/packages/intl/locale/pseudo-LOCALE.po
index 0ad2efe05..0ca7eae41 100644
--- a/packages/intl/locale/pseudo-LOCALE.po
+++ b/packages/intl/locale/pseudo-LOCALE.po
@@ -6,6 +6,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: @lingui/cli\n"
 "Language: pseudo-LOCALE\n"
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Plural-Forms: \n"
 
 #: src/strings.ts:2421
 msgid " \"Notebook > Notes\""
@@ -1951,10 +1957,15 @@ msgstr ""
 msgid "Current note"
 msgstr ""
 
+#: src/strings.ts:1479
 #: src/strings.ts:1485
 msgid "Current password"
 msgstr ""
 
+#: src/strings.ts:2670
+msgid "Current password required"
+msgstr ""
+
 #: src/strings.ts:1229
 msgid "Current path: {path}"
 msgstr ""
@@ -4375,10 +4386,6 @@ msgstr ""
 msgid "Old - new"
 msgstr ""
 
-#: src/strings.ts:1479
-msgid "Old password"
-msgstr ""
-
 #: src/strings.ts:1835
 msgid "Older version"
 msgstr ""
diff --git a/packages/intl/src/strings.ts b/packages/intl/src/strings.ts
index 6bfe069ec..92e750d0c 100644
--- a/packages/intl/src/strings.ts
+++ b/packages/intl/src/strings.ts
@@ -1476,7 +1476,7 @@ $day$: Current day (eg. Monday)`,
   someNotesPublished: () => t`Some notes are published`,
   unpublishToDelete: () => t`Unpublish notes to delete them`,
   filterAttachments: () => t`Filter attachments by filename, type or hash`,
-  oldPassword: () => t`Old password`,
+  oldPassword: () => t`Current password`,
   newPassword: () => t`New password`,
   email: () => t`Email`,
   emailInvalid: () => t`Invalid email`,
@@ -2666,5 +2666,6 @@ Use this if changes from other devices are not appearing on this device. This wi
     t`Are you sure you want to delete this attachment?`,
   attachmentDeleted: () => t`Attachment deleted`,
   titleIsRequired: () => t`Title is required`,
-  nameIsRequired: () => t`Name is required.`
+  nameIsRequired: () => t`Name is required.`,
+  currentPasswordRequired: () => t`Current password required`
 };

From f2925725b875541fecf640adefe5bb3d11256301 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Thu, 7 May 2026 12:36:59 +0500
Subject: [PATCH 30/39] mobile: add input validation for 2fa method
 configuration

---
 .../app/components/ui/input/form-input.tsx    |   5 +-
 apps/mobile/app/screens/settings/2fa.tsx      | 244 +++++++++++++-----
 2 files changed, 178 insertions(+), 71 deletions(-)

diff --git a/apps/mobile/app/components/ui/input/form-input.tsx b/apps/mobile/app/components/ui/input/form-input.tsx
index 3818ed356..7d510ea0b 100644
--- a/apps/mobile/app/components/ui/input/form-input.tsx
+++ b/apps/mobile/app/components/ui/input/form-input.tsx
@@ -22,6 +22,7 @@ import {
   ColorValue,
   TextInput,
   TextInputProps,
+  TextStyle,
   TouchableOpacity,
   View,
   ViewStyle
@@ -220,6 +221,7 @@ interface FormInputProps extends TextInputProps {
   inputStyle?: TextInputProps["style"];
   containerStyle?: ViewStyle;
   wrapperStyle?: ViewStyle;
+  errorStyle?: TextStyle;
 }
 
 export function FormInput({
@@ -245,6 +247,7 @@ export function FormInput({
   onBlur,
   onPress,
   onChangeText,
+  errorStyle,
   ...restProps
 }: FormInputProps) {
   const { colors, isDark } = useThemeColors();
@@ -391,7 +394,7 @@ export function FormInput({
       {fieldError ? (
         <Paragraph
           size={AppFontSize.xs}
-          style={{ marginTop: 5, color: colors.error.icon }}
+          style={[{ marginTop: 5, color: colors.error.icon }, errorStyle]}
         >
           <AppIcon
             color={colors.error.accent}
diff --git a/apps/mobile/app/screens/settings/2fa.tsx b/apps/mobile/app/screens/settings/2fa.tsx
index 1db31cf50..a1463b0d6 100644
--- a/apps/mobile/app/screens/settings/2fa.tsx
+++ b/apps/mobile/app/screens/settings/2fa.tsx
@@ -21,6 +21,7 @@ import { sanitizeFilename, useIsFeatureAvailable } from "@notesnook/common";
 import { strings } from "@notesnook/intl";
 import { useThemeColors, VariantsWithStaticColors } from "@notesnook/theme";
 import Clipboard from "@react-native-clipboard/clipboard";
+import isMobilePhone from "validator/lib/isMobilePhone";
 import React, {
   Dispatch,
   SetStateAction,
@@ -28,7 +29,13 @@ import React, {
   useRef,
   useState
 } from "react";
-import { ActivityIndicator, Linking, Platform, View } from "react-native";
+import {
+  ActivityIndicator,
+  Linking,
+  Platform,
+  TextInput,
+  View
+} from "react-native";
 import RNFetchBlob from "react-native-blob-util";
 import { FlatList } from "react-native-gesture-handler";
 import * as ScopedStorage from "react-native-scoped-storage";
@@ -37,7 +44,10 @@ import filesystem from "../../common/filesystem";
 import DialogHeader from "../../components/dialog/dialog-header";
 import { Button } from "../../components/ui/button";
 import { IconButton } from "../../components/ui/icon-button";
-import Input from "../../components/ui/input";
+import FormInput, {
+  createFormRef,
+  validators
+} from "../../components/ui/input/form-input";
 import { Pressable } from "../../components/ui/pressable";
 import Seperator from "../../components/ui/seperator";
 import { SvgView } from "../../components/ui/svg";
@@ -183,27 +193,60 @@ export const MFASetup = ({
 }: MFAStepProps) => {
   const { colors } = useThemeColors();
   const user = useUserStore((state) => state.user);
+  const methodId = method?.id;
+  const formRef = useRef(
+    createFormRef({
+      target: "",
+      code: ""
+    })
+  );
+  const targetInputRef = useRef<TextInput>(null);
+  const codeInputRef = useRef<TextInput>(null);
   const [authenticatorDetails, setAuthenticatorDetails] = useState({
     sharedKey: null,
     authenticatorUri: null
   });
-  const code = useRef<string>(undefined);
-  const phoneNumber = useRef<string>(undefined);
   const { seconds, setId, start } = useTimer(method?.id);
 
   const [loading, setLoading] = useState(method?.id === "app" ? true : false);
   const [enabling, setEnabling] = useState(false);
   const [sending, setSending] = useState(false);
-  const [error, setError] = useState(false);
+  const [generalError, setGeneralError] = useState<string>();
 
   useEffect(() => {
-    if (method?.id === "app") {
-      db.mfa?.setup("app").then((data) => {
-        setAuthenticatorDetails(data);
-        setLoading(false);
-      });
+    if (methodId === "app") {
+      setLoading(true);
+      db.mfa
+        ?.setup("app")
+        .then((data) => {
+          setAuthenticatorDetails(data);
+          setLoading(false);
+        })
+        .catch((error: Error) => {
+          setLoading(false);
+          setGeneralError(error.message);
+        });
+      return;
     }
-  }, [method?.id]);
+
+    setLoading(false);
+  }, [methodId]);
+
+  useEffect(() => {
+    if (!methodId) return;
+
+    formRef.current.clearErrors();
+    formRef.current.setValue(
+      "target",
+      methodId === "email"
+        ? user?.email || ""
+        : methodId === "app"
+          ? authenticatorDetails.sharedKey || ""
+          : formRef.current.getValue("target")
+    );
+    formRef.current.setValue("code", "");
+    setGeneralError(undefined);
+  }, [authenticatorDetails.sharedKey, methodId, user?.email]);
 
   const codeHelpText = {
     app: "After putting the above code in authenticator app, the app will display a code that you can enter below.",
@@ -212,15 +255,43 @@ export const MFASetup = ({
       "You will receive a 2FA code on your email address which you can enter below"
   };
 
+  const targetValidators =
+    method?.id === "sms"
+      ? [
+          validators.required(strings.phoneNumberNotEntered()),
+          (value: string) =>
+            isMobilePhone(value, "any", {
+              strictMode: true
+            })
+              ? undefined
+              : strings.enterValidPhone()
+        ]
+      : method?.id === "email"
+        ? [
+            validators.required(strings.emailRequired()),
+            validators.email(strings.enterValidEmail())
+          ]
+        : [];
+
+  const codeValidators = [
+    validators.required(strings.enterSixDigitCode()),
+    (value: string) =>
+      /^\d{6}$/.test(value.trim()) ? undefined : strings.enterSixDigitCode()
+  ];
+
   const onNext = async () => {
-    if (!code.current || code.current.length !== 6) return;
+    if (formRef.current.validateField("code")) return;
+
     try {
       if (!method) return;
+      const code = formRef.current.getValue("code").trim();
+
+      setGeneralError(undefined);
       setEnabling(true);
       if (recovery) {
-        await db.mfa.enableFallback(method.id, code.current);
+        await db.mfa.enableFallback(method.id, code);
       } else {
-        await db.mfa.enable(method.id, code.current);
+        await db.mfa.enable(method.id, code);
       }
 
       const user = await db.user.fetchUser();
@@ -229,14 +300,18 @@ export const MFASetup = ({
       setEnabling(false);
     } catch (e) {
       const error = e as Error;
-      ToastManager.error(error, "Error submitting 2fa code");
+      formRef.current.setError("code", error.message);
       setEnabling(false);
     }
   };
 
   const onSendCode = async () => {
-    if (error) return;
     if (!method || sending) return;
+
+    if (method.id !== "app" && formRef.current.validateField("target")) {
+      return;
+    }
+
     if (method.id === "app" && authenticatorDetails.sharedKey) {
       Clipboard.setString(authenticatorDetails.sharedKey);
       if (authenticatorDetails.authenticatorUri) {
@@ -254,30 +329,37 @@ export const MFASetup = ({
     }
 
     try {
-      if (seconds) throw new Error(strings.resendCodeWait());
-      if (method.id === "sms" && !phoneNumber.current)
-        throw new Error(strings.phoneNumberNotEntered());
+      const target = formRef.current.getValue("target").trim();
+
+      setGeneralError(undefined);
+      if (seconds) {
+        setGeneralError(strings.resendCodeWait());
+        return;
+      }
+
       setSending(true);
-      await db.mfa.setup(method?.id, phoneNumber.current);
+      await db.mfa.setup(method.id, method.id === "sms" ? target : undefined);
 
       if (method.id === "sms") {
-        setId(method.id + phoneNumber.current);
+        setId(method.id + target);
       }
       await sleep(300);
-      start(
-        60,
-        method.id === "sms" ? method.id + phoneNumber.current : method.id
-      );
+      start(60, method.id === "sms" ? method.id + target : method.id);
       setSending(false);
       ToastManager.show({
         heading: strings["2faCodeSentVia"](method.id),
         type: "success",
         context: "local"
       });
+      codeInputRef.current?.focus();
     } catch (e) {
       setSending(false);
       const error = e as Error;
-      ToastManager.error(error, strings.errorSend2fa());
+      if (method.id === "sms" || method.id === "email") {
+        formRef.current.setError("target", error.message);
+      } else {
+        setGeneralError(error.message);
+      }
     }
   };
 
@@ -316,59 +398,54 @@ export const MFASetup = ({
           </View>
         ) : (
           <>
-            <Input
-              loading={method?.id !== "sms" ? true : false}
-              value={
-                method?.id === "email"
-                  ? user?.email
-                  : method?.id === "app"
-                    ? authenticatorDetails?.sharedKey || ""
+            <FormInput
+              key={`${method.id}-${authenticatorDetails.sharedKey || user?.email || ""}`}
+              name="target"
+              formRef={formRef}
+              fwdRef={targetInputRef}
+              loading={method?.id !== "sms"}
+              editable={method.id === "sms"}
+              defaultValue={
+                method.id === "email"
+                  ? user?.email || ""
+                  : method.id === "app"
+                    ? authenticatorDetails.sharedKey || ""
                     : undefined
               }
               multiline={method.id === "app"}
-              onChangeText={(value) => {
-                phoneNumber.current = value;
+              onChangeText={() => {
+                setGeneralError(undefined);
               }}
               placeholder={
-                method?.id === "email"
+                method.id === "email"
                   ? strings.enterEmailAddress()
                   : "+1234567890"
               }
-              onSubmit={() => {
-                onSendCode();
-              }}
-              onErrorCheck={(e) => setError(e)}
-              validationType={method?.id === "email" ? "email" : "phonenumber"}
+              onSubmitEditing={onSendCode}
+              validators={targetValidators}
               keyboardType={
-                method.id == "email" ? "email-address" : "phone-pad"
-              }
-              errorMessage={
-                method?.id === "email"
-                  ? strings.enterValidEmail()
-                  : strings.enterValidPhone()
+                method.id === "email" ? "email-address" : "phone-pad"
               }
               buttons={
-                error ? null : (
-                  <Button
-                    onPress={onSendCode}
-                    loading={sending}
-                    style={{
-                      paddingVertical: 0,
-                      paddingHorizontal: 0
-                    }}
-                    title={
-                      sending
-                        ? null
-                        : method.id === "app"
-                          ? strings.copy()
-                          : `${
-                              seconds
-                                ? strings.resendCode(seconds as number)
-                                : strings.sendCode()
-                            }`
-                    }
-                  />
-                )
+                <Button
+                  onPress={onSendCode}
+                  loading={sending}
+                  style={{
+                    paddingVertical: 0,
+                    paddingHorizontal: 0
+                  }}
+                  title={
+                    sending
+                      ? null
+                      : method.id === "app"
+                        ? strings.copy()
+                        : `${
+                            seconds
+                              ? strings.resendCode(seconds as number)
+                              : strings.sendCode()
+                          }`
+                  }
+                />
               }
             />
 
@@ -377,13 +454,22 @@ export const MFASetup = ({
             </Heading>
             <Paragraph>{codeHelpText[method?.id]}</Paragraph>
             <Seperator />
-            <Input
+            <FormInput
+              name="code"
+              formRef={formRef}
+              fwdRef={codeInputRef}
               placeholder="xxxxxx"
               maxLength={6}
               loading={loading}
               textAlign="center"
               keyboardType="numeric"
-              onChangeText={(value) => (code.current = value)}
+              onChangeText={() => {
+                setGeneralError(undefined);
+              }}
+              onSubmitEditing={onNext}
+              returnKeyLabel={strings.next()}
+              returnKeyType="done"
+              validators={codeValidators}
               inputStyle={{
                 fontSize: AppFontSize.lg,
                 height: 60,
@@ -396,7 +482,25 @@ export const MFASetup = ({
                 borderWidth: 0,
                 width: undefined
               }}
+              errorStyle={{
+                textAlign: "center"
+              }}
             />
+
+            {generalError ? (
+              <Paragraph
+                size={AppFontSize.sm}
+                style={{
+                  color: colors.error.icon,
+                  marginBottom: DefaultAppStyles.GAP_VERTICAL,
+                  textAlign: "center",
+                  width: "100%"
+                }}
+              >
+                {generalError}
+              </Paragraph>
+            ) : null}
+
             <Seperator />
             <Button
               title={enabling ? null : strings.next()}

From 977968510232bd7cca359ca0ccbb6984d84a0b6d Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Fri, 8 May 2026 16:13:30 +0500
Subject: [PATCH 31/39] mobile: fix no success message on copying 2fa codes

---
 apps/mobile/app/screens/settings/2fa.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/mobile/app/screens/settings/2fa.tsx b/apps/mobile/app/screens/settings/2fa.tsx
index a1463b0d6..fdb0bdc20 100644
--- a/apps/mobile/app/screens/settings/2fa.tsx
+++ b/apps/mobile/app/screens/settings/2fa.tsx
@@ -625,7 +625,7 @@ export const MFARecoveryCodes = ({
                 ToastManager.show({
                   heading: strings.codesCopied(),
                   type: "success",
-                  context: "global"
+                  context: "local"
                 });
               }}
               style={{

From d0bfc21b49ad0e2947a20bfdcf0de214a5205434 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Mon, 11 May 2026 14:04:02 +0500
Subject: [PATCH 32/39] mobile: release 3.3.23

---
 apps/mobile/android/app/build.gradle          |   2 +-
 apps/mobile/fonts/MaterialCommunityIcons.ttf  | Bin 26296 -> 26484 bytes
 .../build-configs/ios-build.active.xcconfig   |   4 ++--
 .../ios-build.production.xcconfig             |   4 ++--
 .../build-configs/ios-build.staging.xcconfig  |   4 ++--
 apps/mobile/package-lock.json                 |   4 ++--
 apps/mobile/package.json                      |   2 +-
 .../android/en-US/changelogs/15519.txt        |   3 +++
 8 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/15519.txt

diff --git a/apps/mobile/android/app/build.gradle b/apps/mobile/android/app/build.gradle
index b09ee995d..be041705d 100644
--- a/apps/mobile/android/app/build.gradle
+++ b/apps/mobile/android/app/build.gradle
@@ -140,7 +140,7 @@ android {
         if (project.hasProperty("prBuildNumber")) {
             versionCode Integer.parseInt(prBuildNumber())
         } else {
-            versionCode 3103
+            versionCode 3104
         }
         versionName getNpmVersion()
         testBuildType System.getProperty('testBuildType', 'debug')
diff --git a/apps/mobile/fonts/MaterialCommunityIcons.ttf b/apps/mobile/fonts/MaterialCommunityIcons.ttf
index 3a5471b8efe3d70c19d2bcd8272f41b60a8f30a9..23909c71431a7d2d546b9043e01f1f15c190945f 100644
GIT binary patch
delta 1452
zcmY+?Z%kWN9LDkI(Av^@$3@oO{-Lym(gF*?A;KoBiy>;JQC@5cXmGBKc6BQQN7YV{
zJ8@2&)8N=}GNY)Qim<s+vXB^Of|wW+muYk_=AzMPoSLXF(D=eQpZ=0*Z1U;%p5D{j
z+jGzSCu-@e8V#A2<E~mjX+Yul*7UCAiH~CI0mo6`&XH6i-W?C#Gz7GB4w_Q@!194w
z;JBOP%2ZD#t1j~h?IXNKI^DY^e)m@`EkMT-$J=`1**<j+?*aF2=A_V$cuykT|LvC?
z?*<BH`g;49XFN5IY2ZHoz_MFU%}goBU7VVK9m#DfxL`4@e?uoA1^ud<1@HjdDu8Y5
z1_5kmlLAPyI|b0g4hdifdr$zq?27{EV_y-#gY0=>0{M%4BY=MBwju#!*johf5X%eO
zdU>M{v(F14%f2drUF=B#Jj#A3fC2VX0SvPIVFDh5Zf`RAwweRpy}elgyV*_wJkBO4
z$vJNJcL5ATFLVmv3DzrsJ#3u-o@DC<u$OHUz*FqI0x(CQJ2U}2&90(){@6aYRRH_h
zBLaAqeT$|z=Q;Kr0gSR|1i;mC@E;R!fc-)MW9-)g;3IPU0NvypaEOB+1uzbM881M<
z3+%iA4zs){0eq%cTLdt{b_?z)_7Tc*&Pyy;m4KJo69V8K(72xnn1rcoT^w|Az~{J}
z&xU~4pcip767V|98zJB*`@R5<LDx?S;0^YY0N!MO6#!SNn5#!}qs3fy0;Zr}qw=`_
z@HX@n+?@nWvs?`VX4uaJa2&ex83FL07{vnM@*5=rI0@a&eL(<k%)>uMz$|ocivV&Q
zTM24fZAT$;#~g!IrUkhClRB@)xyP=>8eoO1NZG@#hJbRr8XDKB)eVi|I#tzZ=ZK&2
z49_=)UHpt^)+u*|&1qcMbba*a=8g8+TKmT4mH!^BtX^xYsj;oCzH)G*L(@t$O&z*2
zFZ|y(+W$8*|CKHIxg}aISf7YkedZ1K=SJEl)L5vaYV5X-v!>zP>>P9+aDMDua#gy9
zT^EfF#(rbbt+`jZ+uXl+)_6KR2R#?Pwcal8sCUx)xzFZH`VRXRN>LgpU0?c#zs}$3
zAM!8y|0*-es>@PkrvvkW?*e}Y1Ho8uIJgjsg<3<|&}8UbxxajG`CR#>ide-&#c$!J
za5j886uwZYRqlx(Vnl9_WFu#yMbSH=<I%<Z64P96_MYzxEOR`V=uD~tH8;Cyz-qT;
O;ybq{GP!}SnDrmFX%vS5

delta 1276
zcmW;KYiv_x9LMqR+3H-ku`{IWjnZ~oTN49jBL)faLdY<@FnwVR4ud3RTdmNsy3JSw
zSH&Anjkqbo)QJ<p!JNYqLr^qPd}F2pL1NHoG<e$^ViYCD1b_QC`Sg39=JZ^i=lSbP
z=hzp{u6XJ4rN(-2>Y#e)-u%|=>amM^z$>?3$aQDBGO?9|uy#AJET<nTKXpFQ_^8H-
zT+cwUf-6@v{zli>l<)1#ES|pgPUvXYIM<UY7M!m*0qZ7petb)&r#s*O)3+MWK*eOC
zw}0NiA4~omh4n?Kx%tTCgyUVKQ|CUT<qZ|*D@#|k;|k=|w1NB7I}B`6vj#S+eFpOC
zpn)FsMFU&Zy#{*K*9{cZa|Z5Le>5e~1*_@}^sB2445+$TRj(fI0rdp~52|k%D5}#2
zwyK{Qct|~MV4JEN3v9=|dYRm)<A>E1rMWK+=DOa%BWkx~^?N|QWZ+TUYM+4}YRJH2
z>h%U5SKACcp{_OXr22t@r*OS>M)%#RgH~zN&7M}%2A)x0G4QPVwoK@p=hSx%Jg<Ia
zV3(>l7SK$2zcw(e{$OB4{ndb$%lkWSNnh|1ZjJsVuv<N5;AK@871)DYTWLV+Tia!{
zk5ny5t#%lC;9Bhof!EY217o;#+D`)74|N+2?4#t))7l7VP3yH81;$m~T;NUhV*~qf
z-6ICxQhzgWK)q<-AZ~+ZOzc4$H0=VK!TFAX3ETzRkP8ahe;m?*W<cPudd9#cu20J#
z@D8rO!GPY%e~kexML>H&U>Y~5Hxtl9hE^GPPh*eZ9CkKS&3xi4(P*jPS5-dYEnHhZ
z-PW1(j1SlBD=)um)EPP3ksSG_<5a2Mcb#vgujm{1ooQ@s9P;B|;qUVw_kSPo1YQmN
z608cY3JwL&hZ;h+gwmlMp`&46__lB%JQbb^|GjYk!tWwAk;Rd|$f3x|$hk%SMP1Qs
zbU1n-Iuo6ZwZ;mu+1P*aR6HFYjDOyAL(|5l-A%L2YnsQJFSMjux>|NdT8<}{CZ-Z6
u6PJ^zWIp*}^50Z@st-r6QZ8rj{<)&Etb_DDS*QH|hHakm^3Iz)4*vr=GW|{f

diff --git a/apps/mobile/ios/build-configs/ios-build.active.xcconfig b/apps/mobile/ios/build-configs/ios-build.active.xcconfig
index c43e701d0..e074c69be 100644
--- a/apps/mobile/ios/build-configs/ios-build.active.xcconfig
+++ b/apps/mobile/ios/build-configs/ios-build.active.xcconfig
@@ -1,6 +1,6 @@
 // Production iOS build identifiers
-IOS_CURRENT_PROJECT_VERSION = 2182
-IOS_MARKETING_VERSION = 3.3.22
+IOS_CURRENT_PROJECT_VERSION = 2183
+IOS_MARKETING_VERSION = 3.3.23
 IOS_MAIN_BUNDLE_ID = org.streetwriters.notesnook
 IOS_WIDGET_BUNDLE_ID = org.streetwriters.notesnook.notewidget
 IOS_SHARE_BUNDLE_ID = org.streetwriters.notesnook.share
diff --git a/apps/mobile/ios/build-configs/ios-build.production.xcconfig b/apps/mobile/ios/build-configs/ios-build.production.xcconfig
index c43e701d0..e074c69be 100644
--- a/apps/mobile/ios/build-configs/ios-build.production.xcconfig
+++ b/apps/mobile/ios/build-configs/ios-build.production.xcconfig
@@ -1,6 +1,6 @@
 // Production iOS build identifiers
-IOS_CURRENT_PROJECT_VERSION = 2182
-IOS_MARKETING_VERSION = 3.3.22
+IOS_CURRENT_PROJECT_VERSION = 2183
+IOS_MARKETING_VERSION = 3.3.23
 IOS_MAIN_BUNDLE_ID = org.streetwriters.notesnook
 IOS_WIDGET_BUNDLE_ID = org.streetwriters.notesnook.notewidget
 IOS_SHARE_BUNDLE_ID = org.streetwriters.notesnook.share
diff --git a/apps/mobile/ios/build-configs/ios-build.staging.xcconfig b/apps/mobile/ios/build-configs/ios-build.staging.xcconfig
index ebddfea0f..4d54a910d 100644
--- a/apps/mobile/ios/build-configs/ios-build.staging.xcconfig
+++ b/apps/mobile/ios/build-configs/ios-build.staging.xcconfig
@@ -1,6 +1,6 @@
 // Staging iOS build identifiers
-IOS_CURRENT_PROJECT_VERSION = 2182
-IOS_MARKETING_VERSION = 3.3.22
+IOS_CURRENT_PROJECT_VERSION = 2183
+IOS_MARKETING_VERSION = 3.3.23
 IOS_MAIN_BUNDLE_ID = org.streetwriters.notesnook
 IOS_WIDGET_BUNDLE_ID = org.streetwriters.notesnook.notewidget
 IOS_SHARE_BUNDLE_ID = org.streetwriters.notesnook.share
diff --git a/apps/mobile/package-lock.json b/apps/mobile/package-lock.json
index 18ba5b12f..bcff135b9 100644
--- a/apps/mobile/package-lock.json
+++ b/apps/mobile/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/mobile",
-  "version": "3.3.22",
+  "version": "3.3.23",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/mobile",
-      "version": "3.3.22",
+      "version": "3.3.23",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index 748d71929..964c0a730 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@notesnook/mobile",
-  "version": "3.3.22",
+  "version": "3.3.23",
   "private": true,
   "license": "GPL-3.0-or-later",
   "scripts": {
diff --git a/fastlane/metadata/android/en-US/changelogs/15519.txt b/fastlane/metadata/android/en-US/changelogs/15519.txt
new file mode 100644
index 000000000..3aaf71b15
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/15519.txt
@@ -0,0 +1,3 @@
+- Bug fixes and improvements
+
+Thank you for using Notesnook!

From 8093f44a70a781df3ebeb1e6cf2eb9323923b751 Mon Sep 17 00:00:00 2001
From: 01zulfi <85733202+01zulfi@users.noreply.github.com>
Date: Tue, 12 May 2026 09:08:26 +0500
Subject: [PATCH 33/39] web: skip attachments restore from backup if user not
 logged in (#9778)

* web: skip attachments restore from backup if user not logged in
Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>

* web: show login message when downloading attachments without login
Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>

* web: show backup restored success toast
Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>
---
 apps/web/src/common/index.ts                  | 41 +++++++++++++++----
 apps/web/src/interfaces/fs.ts                 | 21 +++++++---
 .../login-to-restore-attachments-in-backup.md |  8 ++++
 docs/help/docgen.yaml                         |  1 +
 packages/intl/locale/en.po                    | 18 ++++++++
 packages/intl/locale/pseudo-LOCALE.po         | 15 +++++++
 packages/intl/src/strings.ts                  |  9 +++-
 7 files changed, 99 insertions(+), 14 deletions(-)
 create mode 100644 docs/help/contents/faqs/login-to-restore-attachments-in-backup.md

diff --git a/apps/web/src/common/index.ts b/apps/web/src/common/index.ts
index f58402b61..076274b34 100644
--- a/apps/web/src/common/index.ts
+++ b/apps/web/src/common/index.ts
@@ -231,15 +231,40 @@ export async function restoreBackupFile(backupFile: File) {
     }
     await db.initCollections();
   } else {
+    const { createUnzipIterator } = await import(
+      "../utils/streams/unzip-stream"
+    );
+
+    let skipAttachments = false;
+    if (!useUserStore.getState().isLoggedIn) {
+      let hasAttachments = false;
+      for await (const entry of createUnzipIterator(backupFile)) {
+        if (
+          entry.name.startsWith("attachments/") &&
+          entry.name !== "attachments/.attachments_key"
+        ) {
+          hasAttachments = true;
+          break;
+        }
+      }
+
+      if (hasAttachments) {
+        const result = await ConfirmDialog.show({
+          title: strings.loginToRestoreAttachments(),
+          message: strings.loginToRestoreAttachmentsDesc(),
+          positiveButtonText: strings.yes(),
+          negativeButtonText: strings.no()
+        });
+        if (!result) return;
+        skipAttachments = true;
+      }
+    }
+
     const error = await TaskManager.startTask<Error | void>({
       title: strings.restoringBackup(),
       subtitle: strings.restoringBackupDesc(),
       type: "modal",
       action: async (report) => {
-        const { createUnzipIterator } = await import(
-          "../utils/streams/unzip-stream"
-        );
-
         let cachedPassword: string | undefined = undefined;
         let cachedKey: string | undefined = undefined;
         // const { read, totalFiles } = await Reader(backupFile);
@@ -254,13 +279,13 @@ export async function restoreBackupFile(backupFile: File) {
             isValid = true;
             continue;
           }
-          if (entry.name === "attachments/.attachments_key")
+          if (!skipAttachments && entry.name === "attachments/.attachments_key")
             attachmentsKey = JSON.parse(await entry.text()) as
               | SerializedKey
               | Cipher<"base64">;
-          else if (entry.name.startsWith("attachments/"))
+          else if (!skipAttachments && entry.name.startsWith("attachments/"))
             attachments.push(entry);
-          else entries.push(entry);
+          else if (!entry.name.startsWith("attachments/")) entries.push(entry);
         }
         if (!isValid)
           console.warn(
@@ -339,6 +364,8 @@ export async function restoreBackupFile(backupFile: File) {
     if (error) {
       console.error(error);
       showToast("error", `${strings.restoreFailed()}: ${error.message}`);
+    } else {
+      showToast("success", strings.backupRestored());
     }
   }
 }
diff --git a/apps/web/src/interfaces/fs.ts b/apps/web/src/interfaces/fs.ts
index 7bc5cb340..fda669c2e 100644
--- a/apps/web/src/interfaces/fs.ts
+++ b/apps/web/src/interfaces/fs.ts
@@ -49,6 +49,7 @@ import {
 } from "@notesnook/core";
 import { logger } from "../utils/logger";
 import { newQueue } from "@henrygd/queue";
+import { strings } from "@notesnook/intl";
 
 export const ABYTES = 17;
 const CHUNK_SIZE = 512 * 1024;
@@ -499,12 +500,20 @@ async function downloadFile(
       { type: "download", hash: filename }
     );
 
-    const signedUrl = (
-      await axios.get(url, {
-        headers,
-        responseType: "text"
-      })
-    ).data;
+    const signedUrlResponse = await axios
+      .get(url, { headers, responseType: "text" })
+      .catch((e) => {
+        if (e.response?.status === 401) {
+          showToast("error", strings.pleaseLoginToDownloadAttachments());
+          return null;
+        }
+        throw e;
+      });
+    if (!signedUrlResponse) {
+      reportProgress(undefined, { type: "download", hash: filename });
+      return false;
+    }
+    const signedUrl = signedUrlResponse.data;
 
     logger.debug("Got attachment signed url", { filename });
 
diff --git a/docs/help/contents/faqs/login-to-restore-attachments-in-backup.md b/docs/help/contents/faqs/login-to-restore-attachments-in-backup.md
new file mode 100644
index 000000000..13bddecfb
--- /dev/null
+++ b/docs/help/contents/faqs/login-to-restore-attachments-in-backup.md
@@ -0,0 +1,8 @@
+---
+title: Login to restore attachments in backup.  
+description: We require users to be logged in to restore attachments in backup. 
+---
+
+# Login to restore attachments in backup. 
+
+We require users to be logged in to restore attachments in backup. This is because attachments are encrypted using a sub-key derived from your database encryption key. Without a login, we cannot encrypt/upload/sync attachments.
diff --git a/docs/help/docgen.yaml b/docs/help/docgen.yaml
index 4f0c76900..1f0e647ac 100644
--- a/docs/help/docgen.yaml
+++ b/docs/help/docgen.yaml
@@ -87,3 +87,4 @@ navigation:
       - path: faqs/what-are-merge-conflicts.md
       - path: faqs/is-there-an-eta.md
       - path: faqs/login-to-upload-attachments.md
+      - path: faqs/login-to-restore-attachments-in-backup.md
diff --git a/packages/intl/locale/en.po b/packages/intl/locale/en.po
index 3bc3c0f7e..2f6857a76 100644
--- a/packages/intl/locale/en.po
+++ b/packages/intl/locale/en.po
@@ -3789,6 +3789,10 @@ msgstr "Login failed"
 msgid "Login required"
 msgstr "Login required"
 
+#: src/strings.ts:2671
+msgid "Login required to restore attachments"
+msgstr "Login required to restore attachments"
+
 #: src/strings.ts:779
 msgid "Login successful"
 msgstr "Login successful"
@@ -4736,6 +4740,10 @@ msgstr "Please fill all the fields to continue."
 msgid "Please grant notifications permission to add new reminders."
 msgstr "Please grant notifications permission to add new reminders."
 
+#: src/strings.ts:2666
+msgid "Please login to download attachments."
+msgstr "Please login to download attachments."
+
 #: src/strings.ts:873
 msgid "Please make sure you have saved the recovery key. Tap one more time to confirm."
 msgstr "Please make sure you have saved the recovery key. Tap one more time to confirm."
@@ -7490,6 +7498,16 @@ msgstr "You have unsynced notes. Take a backup or sync your notes to avoid losin
 msgid "You must log out in order to change/reset server URLs."
 msgstr "You must log out in order to change/reset server URLs."
 
+#: src/strings.ts:2673
+msgid ""
+"You need to login to restore attachments from a backup file. [Read more](https://help.notesnook.com/faqs/login-to-restore-attachments-in-backup).\n"
+"  \n"
+"Continue without attachments?"
+msgstr ""
+"You need to login to restore attachments from a backup file. [Read more](https://help.notesnook.com/faqs/login-to-restore-attachments-in-backup).\n"
+"  \n"
+"Continue without attachments?"
+
 #: src/strings.ts:836
 msgid "You simply cannot get any better of a note taking app than @notesnook. The UI is clean and slick, it is feature rich, encrypted, reasonably priced (esp. for students & educators) & open source"
 msgstr "You simply cannot get any better of a note taking app than @notesnook. The UI is clean and slick, it is feature rich, encrypted, reasonably priced (esp. for students & educators) & open source"
diff --git a/packages/intl/locale/pseudo-LOCALE.po b/packages/intl/locale/pseudo-LOCALE.po
index 0ca7eae41..31f2f27ba 100644
--- a/packages/intl/locale/pseudo-LOCALE.po
+++ b/packages/intl/locale/pseudo-LOCALE.po
@@ -3769,6 +3769,10 @@ msgstr ""
 msgid "Login required"
 msgstr ""
 
+#: src/strings.ts:2671
+msgid "Login required to restore attachments"
+msgstr ""
+
 #: src/strings.ts:779
 msgid "Login successful"
 msgstr ""
@@ -4710,6 +4714,10 @@ msgstr ""
 msgid "Please grant notifications permission to add new reminders."
 msgstr ""
 
+#: src/strings.ts:2666
+msgid "Please login to download attachments."
+msgstr ""
+
 #: src/strings.ts:873
 msgid "Please make sure you have saved the recovery key. Tap one more time to confirm."
 msgstr ""
@@ -7432,6 +7440,13 @@ msgstr ""
 msgid "You must log out in order to change/reset server URLs."
 msgstr ""
 
+#: src/strings.ts:2673
+msgid ""
+"You need to login to restore attachments from a backup file. [Read more](https://help.notesnook.com/faqs/login-to-restore-attachments-in-backup).\n"
+"  \n"
+"Continue without attachments?"
+msgstr ""
+
 #: src/strings.ts:836
 msgid "You simply cannot get any better of a note taking app than @notesnook. The UI is clean and slick, it is feature rich, encrypted, reasonably priced (esp. for students & educators) & open source"
 msgstr ""
diff --git a/packages/intl/src/strings.ts b/packages/intl/src/strings.ts
index 92e750d0c..e318c1a76 100644
--- a/packages/intl/src/strings.ts
+++ b/packages/intl/src/strings.ts
@@ -2667,5 +2667,12 @@ Use this if changes from other devices are not appearing on this device. This wi
   attachmentDeleted: () => t`Attachment deleted`,
   titleIsRequired: () => t`Title is required`,
   nameIsRequired: () => t`Name is required.`,
-  currentPasswordRequired: () => t`Current password required`
+  currentPasswordRequired: () => t`Current password required`,
+  loginToRestoreAttachments: () => t`Login required to restore attachments`,
+  loginToRestoreAttachmentsDesc: () =>
+    t`You need to login to restore attachments from a backup file. [Read more](https://help.notesnook.com/faqs/login-to-restore-attachments-in-backup).
+  
+Continue without attachments?`,
+  pleaseLoginToDownloadAttachments: () =>
+    t`Please login to download attachments.`
 };

From 8048c90a89ee1a515b4bea710c35653c28b485cf Mon Sep 17 00:00:00 2001
From: 01zulfi <85733202+01zulfi@users.noreply.github.com>
Date: Wed, 13 May 2026 11:46:23 +0500
Subject: [PATCH 34/39] web: disable months/year menu options where applicable
 (#9846)

Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>
---
 apps/web/src/components/day-picker/index.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/web/src/components/day-picker/index.tsx b/apps/web/src/components/day-picker/index.tsx
index dd28672c2..d9004ccf3 100644
--- a/apps/web/src/components/day-picker/index.tsx
+++ b/apps/web/src/components/day-picker/index.tsx
@@ -93,6 +93,7 @@ export function DayPicker(props: DayPickerProps) {
                 key={month.month + year}
                 value={month.month}
                 data-date={month.$date.toDateString()}
+                disabled={month.disabled}
               >
                 {month.month}
               </option>
@@ -121,6 +122,7 @@ export function DayPicker(props: DayPickerProps) {
                 key={year.year}
                 value={year.year}
                 data-date={year.$date.toDateString()}
+                disabled={year.disabled}
               >
                 {year.year}
               </option>

From e635bf628a6459c3ed66cc0eae0a167cd11cc922 Mon Sep 17 00:00:00 2001
From: 01zulfi <85733202+01zulfi@users.noreply.github.com>
Date: Thu, 14 May 2026 09:25:13 +0500
Subject: [PATCH 35/39] web: fix expiring notes option on free plan (#9853)

Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>
---
 apps/web/src/components/note/index.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/components/note/index.tsx b/apps/web/src/components/note/index.tsx
index cf09e6ee5..eed125711 100644
--- a/apps/web/src/components/note/index.tsx
+++ b/apps/web/src/components/note/index.tsx
@@ -104,6 +104,7 @@ import ListItem from "../list-item";
 import { PublishDialog } from "../publish-view";
 import TimeAgo from "../time-ago";
 import { NoteExpiryDateDialog } from "../../dialogs/note-expiry-date-dialog";
+import { withFeatureCheck } from "../../common";
 
 type NoteProps = NoteResolvedData & {
   item: NoteType;
@@ -665,11 +666,11 @@ export const noteMenuItems: (
           title: strings.setExpiry(),
           icon: Destruct.path,
           premium: !features.expiringNotes.isAllowed,
-          onClick: async () => {
+          onClick: withFeatureCheck(features.expiringNotes, async () => {
             await NoteExpiryDateDialog.show({
               noteId: note.id
             });
-          }
+          })
         },
     {
       type: "button",

From d912c93f815dbf3d3589314311bde154544b6609 Mon Sep 17 00:00:00 2001
From: 01zulfi <85733202+01zulfi@users.noreply.github.com>
Date: Thu, 14 May 2026 09:25:21 +0500
Subject: [PATCH 36/39] web: fix validation error message on add notebook
 dialog (#9852)

* only title is required field

Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>
---
 apps/web/src/dialogs/add-notebook-dialog.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/dialogs/add-notebook-dialog.tsx b/apps/web/src/dialogs/add-notebook-dialog.tsx
index ad95e727a..15fea9be8 100644
--- a/apps/web/src/dialogs/add-notebook-dialog.tsx
+++ b/apps/web/src/dialogs/add-notebook-dialog.tsx
@@ -44,7 +44,7 @@ export const AddNotebookDialog = DialogManager.register(
 
     const onSubmit = useCallback(async () => {
       if (!title.current.trim())
-        return showToast("error", strings.allFieldsRequired());
+        return showToast("error", strings.titleIsRequired());
 
       const id = await db.notebooks.add({
         id: props.notebook?.id,

From 3f11b768112ddfb40809b8a58a30c7b37305056e Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Fri, 8 May 2026 10:37:58 +0500
Subject: [PATCH 37/39] mobile: fix form validation in set your name dialog

---
 .../app/screens/settings/user-section.jsx     | 47 ++++++++++++-------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/apps/mobile/app/screens/settings/user-section.jsx b/apps/mobile/app/screens/settings/user-section.jsx
index b87cccfb7..ea8430517 100644
--- a/apps/mobile/app/screens/settings/user-section.jsx
+++ b/apps/mobile/app/screens/settings/user-section.jsx
@@ -29,6 +29,10 @@ import ImagePicker from "react-native-image-crop-picker";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { db } from "../../common/database";
 import { presentDialog } from "../../components/dialog/functions";
+import {
+  createFormRef,
+  validators
+} from "../../components/ui/input/form-input";
 import { PlanLimits } from "../../components/sheets/plan-limits";
 import AppIcon from "../../components/ui/AppIcon";
 import { Button } from "../../components/ui/button";
@@ -197,27 +201,34 @@ const SettingsUserSection = ({ item }) => {
                         title: strings.setFullName(),
                         paragraph: strings.setFullNameDesc(),
                         positiveText: strings.save(),
-                        input: true,
-                        inputPlaceholder: strings.enterFullName(),
-                        defaultValue: userProfile?.fullName,
-                        positivePress: async (value) => {
-                          if (!value || !value.trim()) {
-                            ToastManager.error(
-                              new Error(strings.nameIsRequired()),
-                              undefined,
-                              "local"
-                            );
-                            return;
-                          }
-                          db.settings
-                            .setProfile({
-                              fullName: value
-                            })
-                            .then(async () => {
+                        form: {
+                          formRef: createFormRef({
+                            fullName: userProfile?.fullName || ""
+                          }),
+                          items: [
+                            {
+                              name: "fullName",
+                              placeholder: strings.enterFullName(),
+                              defaultValue: userProfile?.fullName,
+                              validators: [
+                                validators.required(strings.nameIsRequired())
+                              ]
+                            }
+                          ],
+                          onFormSubmit: async (form) => {
+                            try {
+                              await db.settings.setProfile({
+                                fullName: form.getValue("fullName")
+                              });
                               useUserStore.setState({
                                 profile: db.settings.getProfile()
                               });
-                            });
+                              return true;
+                            } catch (e) {
+                              form.setError("fullName", e.message);
+                              return false;
+                            }
+                          }
                         }
                       });
                     }}

From 70d1119cf0d8a5eaee6e9e00294ccbea4f1abd3f Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Mon, 11 May 2026 12:14:50 +0500
Subject: [PATCH 38/39] mobile: fix crash on tap set your name

---
 apps/mobile/ios/Podfile.lock          | 35 +++++++++++++++++++--------
 packages/intl/locale/en.po            |  5 ++--
 packages/intl/locale/pseudo-LOCALE.po |  5 ++--
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/apps/mobile/ios/Podfile.lock b/apps/mobile/ios/Podfile.lock
index b52180351..bd63c44de 100644
--- a/apps/mobile/ios/Podfile.lock
+++ b/apps/mobile/ios/Podfile.lock
@@ -2235,14 +2235,35 @@ PODS:
     - ReactCommon/turbomodule/core
     - SocketRocket
     - Yoga
-  - react-native-screenguard (1.0.0):
+  - react-native-screenguard (2.0.0-beta5):
+    - boost
+    - DoubleConversion
+    - fast_float
+    - fmt
+    - glog
+    - hermes-engine
     - RCT-Folly
+    - RCT-Folly/Fabric
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - 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
-    - SDWebImage (~> 5.11.1)
+    - SDWebImage (~> 5.11)
+    - SocketRocket
+    - Yoga
   - react-native-share-extension (2.9.5):
     - React
   - react-native-sodium (1.6.8):
@@ -3097,8 +3118,6 @@ PODS:
     - RNNotifee/NotifeeCore (= 7.4.12)
   - RNNotifee/NotifeeCore (7.4.12):
     - React-Core
-  - RNPrivacySnapshot (1.0.0):
-    - React-Core
   - RNReanimated (4.2.0):
     - boost
     - DoubleConversion
@@ -3573,7 +3592,6 @@ DEPENDENCIES:
   - RNImageCropPicker (from `../node_modules/react-native-image-crop-picker`)
   - RNKeychain (from `../node_modules/react-native-keychain`)
   - "RNNotifee (from `../node_modules/@ammarahmed/notifee-react-native`)"
-  - RNPrivacySnapshot (from `../node_modules/react-native-privacy-snapshot`)
   - RNReanimated (from `../node_modules/react-native-reanimated`)
   - RNScreens (from `../node_modules/react-native-screens`)
   - RNSecureRandom (from `../node_modules/react-native-securerandom`)
@@ -3839,8 +3857,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-keychain"
   RNNotifee:
     :path: "../node_modules/@ammarahmed/notifee-react-native"
-  RNPrivacySnapshot:
-    :path: "../node_modules/react-native-privacy-snapshot"
   RNReanimated:
     :path: "../node_modules/react-native-reanimated"
   RNScreens:
@@ -3942,7 +3958,7 @@ SPEC CHECKSUMS:
   react-native-pdf: edc236298f13f1609e42d41e45b8b6ea88ed10f9
   react-native-quick-sqlite: 1ed8d3db1e22a8604d006be69f06053382e93bb0
   react-native-safe-area-context: c6e2edd1c1da07bdce287fa9d9e60c5f7b514616
-  react-native-screenguard: 9fc3b4ad5b97783fc0832638fae0dce51272c661
+  react-native-screenguard: 975d4612dce0c348b19b08a48aa23e9b68584d98
   react-native-share-extension: fdc6aaab51591a2d445df239c446aaa3a99658ec
   react-native-sodium: 066f76e46c9be13e9260521e3fa994937c4cdab4
   react-native-theme-switch-animation: 449d6db7a760f55740505e7403ae8061debc9a7e
@@ -3995,7 +4011,6 @@ SPEC CHECKSUMS:
   RNImageCropPicker: 5fd4ceaead64d8c53c787e4e559004f97bc76df7
   RNKeychain: ffd0513e676445c637410b47249460cbf56bc9cb
   RNNotifee: dea82c9ec44684eeeac9da85deb5eeb8ebe5937f
-  RNPrivacySnapshot: ccad3a548338c2f526bb7b1789af3fb0618b7d1d
   RNReanimated: f1868b36f4b2b52a0ed00062cfda69506f75eaee
   RNScreens: ffbb0296608eb3560de641a711bbdb663ed1f6b4
   RNSecureRandom: b64d263529492a6897e236a22a2c4249aa1b53dc
diff --git a/packages/intl/locale/en.po b/packages/intl/locale/en.po
index 2f6857a76..b8a10442e 100644
--- a/packages/intl/locale/en.po
+++ b/packages/intl/locale/en.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2026-05-08 10:43+0500\n"
+"POT-Creation-Date: 2026-05-11 12:10+0500\n"
+"POT-Creation-Date: 2026-05-11 12:10+0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -4740,7 +4741,7 @@ msgstr "Please fill all the fields to continue."
 msgid "Please grant notifications permission to add new reminders."
 msgstr "Please grant notifications permission to add new reminders."
 
-#: src/strings.ts:2666
+#: src/strings.ts:2677
 msgid "Please login to download attachments."
 msgstr "Please login to download attachments."
 
diff --git a/packages/intl/locale/pseudo-LOCALE.po b/packages/intl/locale/pseudo-LOCALE.po
index 31f2f27ba..718e2c9d3 100644
--- a/packages/intl/locale/pseudo-LOCALE.po
+++ b/packages/intl/locale/pseudo-LOCALE.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2026-05-08 10:43+0500\n"
+"POT-Creation-Date: 2026-05-11 12:10+0500\n"
+"POT-Creation-Date: 2026-05-11 12:10+0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -4714,7 +4715,7 @@ msgstr ""
 msgid "Please grant notifications permission to add new reminders."
 msgstr ""
 
-#: src/strings.ts:2666
+#: src/strings.ts:2677
 msgid "Please login to download attachments."
 msgstr ""
 

From 6ba1fda2f27bf66441e7febb6e9725dd1c7f51ea Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Thu, 14 May 2026 13:43:20 +0500
Subject: [PATCH 39/39] mobile: fix app crashes on upgrade from v2.6.x to v3

---
 apps/mobile/app/services/settings.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/mobile/app/services/settings.ts b/apps/mobile/app/services/settings.ts
index 9938eb376..114a8b113 100644
--- a/apps/mobile/app/services/settings.ts
+++ b/apps/mobile/app/services/settings.ts
@@ -26,7 +26,6 @@ import {
 } from "../stores/use-setting-store";
 import { NotesnookModule } from "../utils/notesnook-module";
 import { scale, updateSize } from "../utils/size";
-import { DatabaseLogger } from "../common/database";
 import { useUserStore } from "../stores/use-user-store";
 import ScreenGuardModule from "react-native-screenguard";
 ScreenGuardModule.initSettings();
@@ -89,7 +88,6 @@ function migrateAppLock() {
       biometricsAuthEnabled: true
     });
   }
-  DatabaseLogger.debug("App lock Migrated");
 }
 
 function migrateSettings(settings: SettingStore["settings"]) {