From d8eaef859a27d239a8091a333f0b538c0a6edc66 Mon Sep 17 00:00:00 2001
From: Thomas Camlong <thomas@ajnart.fr>
Date: Sun, 25 Jan 2026 16:00:10 +0100
Subject: [PATCH 01/11] chore(gitignore): ignore Cursor project files

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 0aa3ed4c7..8562d4250 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,4 +67,6 @@ e2e/shared/tmp
 apps/nextjs/public/images/background.png
 
 # next-intl
-en.d.json.ts
\ No newline at end of file
+en.d.json.ts
+
+.cursor/
\ No newline at end of file

From d99b20d3efd02eda029b7f2522b9aafbd65c5e7a Mon Sep 17 00:00:00 2001
From: Thomas Camlong <thomas@ajnart.fr>
Date: Sun, 25 Jan 2026 16:00:21 +0100
Subject: [PATCH 02/11] feat(manage): consolidate user general settings form

---
 .../_components/_general-settings-form.tsx    | 451 ++++++++++++++++++
 .../manage/users/[userId]/general/page.tsx    |  74 +--
 2 files changed, 470 insertions(+), 55 deletions(-)
 create mode 100644 apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx

diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx
new file mode 100644
index 000000000..1357b330e
--- /dev/null
+++ b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx
@@ -0,0 +1,451 @@
+"use client";
+
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useRouter } from "next/navigation";
+import { Button, Card, Divider, Group, Radio, Select, SimpleGrid, Stack, Switch, Text, TextInput, Title } from "@mantine/core";
+import type { DayOfWeek } from "@mantine/dates";
+import dayjs from "dayjs";
+import localeData from "dayjs/plugin/localeData";
+
+import type { RouterOutputs } from "@homarr/api";
+import { clientApi } from "@homarr/api/client";
+import { revalidatePathActionAsync } from "@homarr/common/client";
+import { env } from "@homarr/common/env";
+import { useZodForm } from "@homarr/form";
+import { useConfirmModal } from "@homarr/modals";
+import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
+import { useI18n, useScopedI18n } from "@homarr/translation/client";
+import {
+  userChangeHomeBoardsSchema,
+  userChangeSearchPreferencesSchema,
+  userEditProfileSchema,
+  userFirstDayOfWeekSchema,
+  userPingIconsEnabledSchema,
+} from "@homarr/validation/user";
+import { z } from "zod/v4";
+
+import type { Board } from "~/app/[locale]/boards/_types";
+import { BoardSelect } from "~/components/board/board-select";
+import { CurrentLanguageCombobox } from "~/components/language/current-language-combobox";
+
+dayjs.extend(localeData);
+
+const anchorSelector = "a[href]:not([target='_blank'])";
+
+const userGeneralSettingsSchema = z.object({
+  name: userEditProfileSchema.shape.name,
+  email: userEditProfileSchema.shape.email,
+  homeBoardId: userChangeHomeBoardsSchema.shape.homeBoardId,
+  mobileHomeBoardId: userChangeHomeBoardsSchema.shape.mobileHomeBoardId,
+  defaultSearchEngineId: userChangeSearchPreferencesSchema.shape.defaultSearchEngineId,
+  openInNewTab: userChangeSearchPreferencesSchema.shape.openInNewTab,
+  firstDayOfWeek: userFirstDayOfWeekSchema.shape.firstDayOfWeek,
+  pingIconsEnabled: userPingIconsEnabledSchema.shape.pingIconsEnabled,
+});
+
+type FormValues = z.infer<typeof userGeneralSettingsSchema>;
+
+interface UserGeneralSettingsFormProps {
+  user: RouterOutputs["user"]["getById"];
+  boardsData: Pick<Board, "id" | "name" | "logoImageUrl">[];
+  searchEnginesData: { value: string; label: string }[];
+  showLanguageSelector?: boolean;
+}
+
+const buildInitialValues = (user: RouterOutputs["user"]["getById"]): FormValues => ({
+  name: user.name ?? "",
+  email: user.email ?? "",
+  homeBoardId: user.homeBoardId,
+  mobileHomeBoardId: user.mobileHomeBoardId,
+  defaultSearchEngineId: user.defaultSearchEngineId,
+  openInNewTab: user.openSearchInNewTab,
+  firstDayOfWeek: user.firstDayOfWeek as DayOfWeek,
+  pingIconsEnabled: user.pingIconsEnabled,
+});
+
+const valuesEqual = (a: unknown, b: unknown) => a === b;
+
+export const UserGeneralSettingsForm = ({
+  user,
+  boardsData,
+  searchEnginesData,
+  showLanguageSelector = false,
+}: UserGeneralSettingsFormProps) => {
+  const t = useI18n();
+  const tGeneral = useScopedI18n("management.page.user.setting.general");
+  const { openConfirmModal } = useConfirmModal();
+  const router = useRouter();
+
+  const isCredentialsUser = user.provider === "credentials";
+
+  const [savedValues, setSavedValues] = useState<FormValues>(() => buildInitialValues(user));
+  const form = useZodForm(userGeneralSettingsSchema, { initialValues: savedValues });
+  const allowLeaveRef = useRef(false);
+  const confirmOpenRef = useRef(false);
+
+  const editProfileMutation = clientApi.user.editProfile.useMutation();
+  const changeHomeBoardsMutation = clientApi.user.changeHomeBoards.useMutation();
+  const changeSearchPreferencesMutation = clientApi.user.changeSearchPreferences.useMutation();
+  const changeFirstDayOfWeekMutation = clientApi.user.changeFirstDayOfWeek.useMutation();
+  const changePingIconsEnabledMutation = clientApi.user.changePingIconsEnabled.useMutation();
+
+  const isPending =
+    editProfileMutation.isPending ||
+    changeHomeBoardsMutation.isPending ||
+    changeSearchPreferencesMutation.isPending ||
+    changeFirstDayOfWeekMutation.isPending ||
+    changePingIconsEnabledMutation.isPending;
+
+  const weekDays = useMemo(() => dayjs.weekdays(false), []);
+
+  useEffect(() => {
+    if (!form.isDirty() || allowLeaveRef.current) return;
+
+    const handleClick = (event: Event) => {
+      if (allowLeaveRef.current) return;
+
+      const target = (event.target as HTMLElement).closest("a");
+
+      if (!target) return;
+
+      event.preventDefault();
+
+      if (confirmOpenRef.current) return;
+      confirmOpenRef.current = true;
+
+      openConfirmModal({
+        title: t("common.unsavedChanges"),
+        children: t("common.unsavedChanges"),
+        confirmProps: {
+          children: t("common.action.discard"),
+        },
+        onCancel() {
+          confirmOpenRef.current = false;
+        },
+        onConfirm() {
+          allowLeaveRef.current = true;
+          confirmOpenRef.current = false;
+          router.push(target.href);
+        },
+      });
+    };
+
+    const handlePopState = (event: Event) => {
+      if (allowLeaveRef.current) return;
+
+      // Keep the user on this page and ask for confirmation.
+      window.history.pushState(null, document.title, window.location.href);
+      event.preventDefault();
+
+      if (confirmOpenRef.current) return;
+      confirmOpenRef.current = true;
+
+      openConfirmModal({
+        title: t("common.unsavedChanges"),
+        children: t("common.unsavedChanges"),
+        confirmProps: {
+          children: t("common.action.discard"),
+        },
+        onCancel() {
+          confirmOpenRef.current = false;
+        },
+        onConfirm() {
+          allowLeaveRef.current = true;
+          confirmOpenRef.current = false;
+          window.history.back();
+        },
+      });
+    };
+
+    const handleBeforeUnload = (event: BeforeUnloadEvent) => {
+      if (env.NODE_ENV === "development") return; // Allow to reload in development
+
+      event.preventDefault();
+      event.returnValue = true;
+    };
+
+    // Add a history entry so back triggers popstate for this page first.
+    window.history.pushState(null, document.title, window.location.href);
+
+    const anchors = document.querySelectorAll(anchorSelector);
+    anchors.forEach((link) => link.addEventListener("click", handleClick));
+    window.addEventListener("popstate", handlePopState);
+    window.addEventListener("beforeunload", handleBeforeUnload);
+
+    return () => {
+      anchors.forEach((link) => link.removeEventListener("click", handleClick));
+      window.removeEventListener("popstate", handlePopState);
+      window.removeEventListener("beforeunload", handleBeforeUnload);
+    };
+  }, [form, openConfirmModal, router, t]);
+
+  const handleSave = useCallback(async () => {
+    const values = form.getValues() as FormValues;
+
+    const tasks: Array<{ key: keyof FormValues | "profile"; run: () => Promise<unknown> }> = [];
+
+    const profileChanged =
+      !valuesEqual(values.name, savedValues.name) || !valuesEqual(values.email ?? "", savedValues.email ?? "");
+    if (isCredentialsUser && profileChanged) {
+      tasks.push({
+        key: "profile",
+        run: () =>
+          editProfileMutation.mutateAsync({
+            id: user.id,
+            name: values.name,
+            email: values.email ?? "",
+          }),
+      });
+    }
+
+    const boardsChanged =
+      !valuesEqual(values.homeBoardId, savedValues.homeBoardId) ||
+      !valuesEqual(values.mobileHomeBoardId, savedValues.mobileHomeBoardId);
+    if (boardsChanged) {
+      tasks.push({
+        key: "homeBoardId",
+        run: () =>
+          changeHomeBoardsMutation.mutateAsync({
+            userId: user.id,
+            homeBoardId: values.homeBoardId,
+            mobileHomeBoardId: values.mobileHomeBoardId,
+          }),
+      });
+    }
+
+    const searchChanged =
+      !valuesEqual(values.defaultSearchEngineId, savedValues.defaultSearchEngineId) ||
+      !valuesEqual(values.openInNewTab, savedValues.openInNewTab);
+    if (searchChanged) {
+      tasks.push({
+        key: "defaultSearchEngineId",
+        run: () =>
+          changeSearchPreferencesMutation.mutateAsync({
+            userId: user.id,
+            defaultSearchEngineId: values.defaultSearchEngineId,
+            openInNewTab: values.openInNewTab,
+          }),
+      });
+    }
+
+    const firstDayChanged = !valuesEqual(values.firstDayOfWeek, savedValues.firstDayOfWeek);
+    if (firstDayChanged) {
+      tasks.push({
+        key: "firstDayOfWeek",
+        run: () =>
+          changeFirstDayOfWeekMutation.mutateAsync({
+            id: user.id,
+            firstDayOfWeek: values.firstDayOfWeek,
+          }),
+      });
+    }
+
+    const pingChanged = !valuesEqual(values.pingIconsEnabled, savedValues.pingIconsEnabled);
+    if (pingChanged) {
+      tasks.push({
+        key: "pingIconsEnabled",
+        run: () =>
+          changePingIconsEnabledMutation.mutateAsync({
+            id: user.id,
+            pingIconsEnabled: values.pingIconsEnabled,
+          }),
+      });
+    }
+
+    if (tasks.length === 0) return;
+
+    const results = await Promise.allSettled(tasks.map((t) => t.run()));
+
+    const hasError = results.some((r) => r.status === "rejected");
+
+    const nextSaved: FormValues = {
+      ...savedValues,
+    };
+
+    if (!hasError) {
+      nextSaved.name = values.name;
+      nextSaved.email = values.email ?? "";
+      nextSaved.homeBoardId = values.homeBoardId;
+      nextSaved.mobileHomeBoardId = values.mobileHomeBoardId;
+      nextSaved.defaultSearchEngineId = values.defaultSearchEngineId;
+      nextSaved.openInNewTab = values.openInNewTab;
+      nextSaved.firstDayOfWeek = values.firstDayOfWeek;
+      nextSaved.pingIconsEnabled = values.pingIconsEnabled;
+    } else {
+      results.forEach((r, index) => {
+        if (r.status === "rejected") return;
+        const task = tasks[index];
+        if (!task) return;
+        if (task.key === "profile") {
+          nextSaved.name = values.name;
+          nextSaved.email = values.email ?? "";
+        }
+        if (task.key === "homeBoardId") {
+          nextSaved.homeBoardId = values.homeBoardId;
+          nextSaved.mobileHomeBoardId = values.mobileHomeBoardId;
+        }
+        if (task.key === "defaultSearchEngineId") {
+          nextSaved.defaultSearchEngineId = values.defaultSearchEngineId;
+          nextSaved.openInNewTab = values.openInNewTab;
+        }
+        if (task.key === "firstDayOfWeek") {
+          nextSaved.firstDayOfWeek = values.firstDayOfWeek;
+        }
+        if (task.key === "pingIconsEnabled") {
+          nextSaved.pingIconsEnabled = values.pingIconsEnabled;
+        }
+      });
+    }
+
+    setSavedValues(nextSaved);
+    form.setInitialValues(nextSaved);
+
+    await revalidatePathActionAsync(`/manage/users/${user.id}`);
+
+    if (hasError) {
+      showErrorNotification({
+        title: t("common.notification.update.error"),
+        message: t("common.notification.update.error"),
+      });
+      return;
+    }
+
+    showSuccessNotification({
+      title: t("common.notification.update.success"),
+      message: t("common.notification.update.success"),
+    });
+  }, [
+    changeFirstDayOfWeekMutation,
+    changeHomeBoardsMutation,
+    changePingIconsEnabledMutation,
+    changeSearchPreferencesMutation,
+    editProfileMutation,
+    form,
+    isCredentialsUser,
+    savedValues,
+    t,
+    user.id,
+  ]);
+
+  const handleDiscard = useCallback(() => {
+    form.reset();
+  }, [form]);
+
+  const firstDayInputProps = form.getInputProps("firstDayOfWeek");
+  const onFirstDayChange = firstDayInputProps.onChange as (value: number) => void;
+  const firstDayValue = (firstDayInputProps.value as number).toString();
+
+  return (
+    <form onSubmit={form.onSubmit(() => handleSave())}>
+      <Stack gap="lg">
+        <SimpleGrid cols={{ base: 1, md: 2 }} spacing="lg" verticalSpacing="lg">
+          <Card withBorder>
+            <Stack gap="md">
+              <Stack gap={2}>
+                <Title order={3}>{t("user.name")}</Title>
+                <Text c="dimmed" size="sm">
+                  {t("user.field.username.label")} · {t("user.field.email.label")}
+                </Text>
+                {!isCredentialsUser && (
+                  <Text c="dimmed" size="sm">
+                    {t("management.page.user.fieldsDisabledExternalProvider")}
+                  </Text>
+                )}
+              </Stack>
+              <Divider />
+              <TextInput
+                disabled={!isCredentialsUser}
+                label={t("user.field.username.label")}
+                withAsterisk
+                {...form.getInputProps("name")}
+              />
+              <TextInput disabled={!isCredentialsUser} label={t("user.field.email.label")} {...form.getInputProps("email")} />
+            </Stack>
+          </Card>
+
+          <Card withBorder>
+            <Stack gap="md">
+              <Stack gap={2}>
+                <Title order={3}>{tGeneral("item.board.title")}</Title>
+              </Stack>
+              <Divider />
+              <BoardSelect
+                label={tGeneral("item.board.type.general")}
+                clearable
+                boards={boardsData}
+                w="100%"
+                {...form.getInputProps("homeBoardId")}
+              />
+              <BoardSelect
+                label={tGeneral("item.board.type.mobile")}
+                clearable
+                boards={boardsData}
+                w="100%"
+                {...form.getInputProps("mobileHomeBoardId")}
+              />
+            </Stack>
+          </Card>
+
+          <Card withBorder>
+            <Stack gap="md">
+              <Stack gap={2}>
+                <Title order={3}>{tGeneral("item.search")}</Title>
+              </Stack>
+              <Divider />
+              <Select
+                label={t("user.field.defaultSearchEngine.label")}
+                w="100%"
+                data={searchEnginesData}
+                {...form.getInputProps("defaultSearchEngineId")}
+              />
+              <Switch label={t("user.field.openSearchInNewTab.label")} {...form.getInputProps("openInNewTab", { type: "checkbox" })} />
+            </Stack>
+          </Card>
+
+          <Card withBorder>
+            <Stack gap="md">
+              <Stack gap={2}>
+                <Title order={3}>{tGeneral("item.language")}</Title>
+              </Stack>
+              <Divider />
+              {showLanguageSelector && <CurrentLanguageCombobox />}
+              <Title order={4}>{tGeneral("item.firstDayOfWeek")}</Title>
+              <Radio.Group {...firstDayInputProps} value={firstDayValue} onChange={(value) => onFirstDayChange(parseInt(value))}>
+                <Group mt="xs" wrap="wrap">
+                  <Radio value="1" label={weekDays[1]} />
+                  <Radio value="6" label={weekDays[6]} />
+                  <Radio value="0" label={weekDays[0]} />
+                </Group>
+              </Radio.Group>
+              <Divider my="xs" />
+              <Title order={4}>{tGeneral("item.accessibility")}</Title>
+              <Switch
+                label={t("user.field.pingIconsEnabled.label")}
+                {...form.getInputProps("pingIconsEnabled", { type: "checkbox" })}
+              />
+            </Stack>
+          </Card>
+        </SimpleGrid>
+
+        <div style={{ position: "sticky", bottom: 20 }}>
+          {form.isDirty() && (
+            <Card withBorder>
+              <Group justify="space-between" wrap="wrap">
+                <Text fw={500}>{t("common.unsavedChanges")}</Text>
+                <Group>
+                  <Button disabled={isPending} variant="default" onClick={handleDiscard}>
+                    {t("common.action.discard")}
+                  </Button>
+                  <Button loading={isPending} type="submit">
+                    {t("common.action.saveChanges")}
+                  </Button>
+                </Group>
+              </Group>
+            </Card>
+          )}
+        </div>
+      </Stack>
+    </form>
+  );
+};
+
diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/page.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/page.tsx
index ee960b0f5..2f00f79d6 100644
--- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/page.tsx
@@ -1,23 +1,17 @@
 import { notFound } from "next/navigation";
-import { Alert, Box, Group, Stack, Title } from "@mantine/core";
-import { IconExclamationCircle } from "@tabler/icons-react";
+import { Box, Card, Group, Stack, Title } from "@mantine/core";
 
 import { api } from "@homarr/api/server";
 import { auth } from "@homarr/auth/next";
 import { getI18n, getScopedI18n } from "@homarr/translation/server";
 
-import { CurrentLanguageCombobox } from "~/components/language/current-language-combobox";
 import { DangerZoneItem, DangerZoneRoot } from "~/components/manage/danger-zone";
 import { catchTrpcNotFound } from "~/errors/trpc-catch-error";
 import { createMetaTitle } from "~/metadata";
 import { canAccessUserEditPage } from "../access";
-import { ChangeHomeBoardForm } from "./_components/_change-home-board";
-import { ChangeSearchPreferencesForm } from "./_components/_change-search-preferences";
 import { DeleteUserButton } from "./_components/_delete-user-button";
-import { FirstDayOfWeek } from "./_components/_first-day-of-week";
-import { PingIconsEnabled } from "./_components/_ping-icons-enabled";
+import { UserGeneralSettingsForm } from "./_components/_general-settings-form";
 import { UserProfileAvatarForm } from "./_components/_profile-avatar-form";
-import { UserProfileForm } from "./_components/_profile-form";
 
 interface Props {
   params: Promise<{
@@ -63,61 +57,31 @@ export default async function EditUserPage(props: Props) {
 
   const boards = await api.board.getAllBoards();
   const searchEngines = await api.searchEngine.getSelectable();
-
-  const isCredentialsUser = user.provider === "credentials";
+  const isSelf = session?.user.id === user.id;
 
   return (
     <Stack>
-      {!isCredentialsUser && (
-        <Alert variant="light" color="yellow" icon={<IconExclamationCircle size="1rem" stroke={1.5} />}>
-          {t("management.page.user.fieldsDisabledExternalProvider")}
-        </Alert>
-      )}
-
       <Title>{tGeneral("title")}</Title>
-      <Group gap="xl">
-        <Box flex={1}>
-          <UserProfileForm user={user} />
+      <Group gap="xl" align="flex-start" wrap="wrap">
+        <Box flex={1} miw={{ base: "100%", md: 540 }}>
+          <UserGeneralSettingsForm
+            user={user}
+            boardsData={boards.map((board) => ({
+              id: board.id,
+              name: board.name,
+              logoImageUrl: board.logoImageUrl,
+            }))}
+            searchEnginesData={searchEngines}
+            showLanguageSelector={isSelf}
+          />
         </Box>
-        <Box w={{ base: "100%", lg: 200 }}>
-          <UserProfileAvatarForm user={user} />
+        <Box w={{ base: "100%", lg: 260 }}>
+          <Card withBorder>
+            <UserProfileAvatarForm user={user} />
+          </Card>
         </Box>
       </Group>
 
-      {session?.user.id === user.id && (
-        <Stack mb="lg">
-          <Title order={2}>{tGeneral("item.language")}</Title>
-          <CurrentLanguageCombobox />
-        </Stack>
-      )}
-
-      <Stack mb="lg">
-        <Title order={2}>{tGeneral("item.board.title")}</Title>
-        <ChangeHomeBoardForm
-          user={user}
-          boardsData={boards.map((board) => ({
-            id: board.id,
-            name: board.name,
-            logoImageUrl: board.logoImageUrl,
-          }))}
-        />
-      </Stack>
-
-      <Stack mb="lg">
-        <Title order={2}>{tGeneral("item.search")}</Title>
-        <ChangeSearchPreferencesForm user={user} searchEnginesData={searchEngines} />
-      </Stack>
-
-      <Stack mb="lg">
-        <Title order={2}>{tGeneral("item.firstDayOfWeek")}</Title>
-        <FirstDayOfWeek user={user} />
-      </Stack>
-
-      <Stack mb="lg">
-        <Title order={2}>{tGeneral("item.accessibility")}</Title>
-        <PingIconsEnabled user={user} />
-      </Stack>
-
       <DangerZoneRoot>
         <DangerZoneItem
           label={t("user.action.delete.label")}

From b0c5de82f4862e0ac11b47b234f56c56cba1b5fa Mon Sep 17 00:00:00 2001
From: Thomas Camlong <thomas@ajnart.fr>
Date: Wed, 28 Jan 2026 11:43:28 +0100
Subject: [PATCH 03/11] chore: address pr comments

---
 .../_components/_general-settings-form.tsx    | 574 ++++++++----------
 .../manage/users/[userId]/general/page.tsx    |  13 +-
 2 files changed, 263 insertions(+), 324 deletions(-)

diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx
index 1357b330e..bb18a1a74 100644
--- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx
@@ -1,18 +1,16 @@
 "use client";
 
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { useRouter } from "next/navigation";
+import { useEffect, useMemo, useRef } from "react";
 import { Button, Card, Divider, Group, Radio, Select, SimpleGrid, Stack, Switch, Text, TextInput, Title } from "@mantine/core";
 import type { DayOfWeek } from "@mantine/dates";
 import dayjs from "dayjs";
 import localeData from "dayjs/plugin/localeData";
+import { useForm } from "@tanstack/react-form";
 
 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
 import { env } from "@homarr/common/env";
-import { useZodForm } from "@homarr/form";
-import { useConfirmModal } from "@homarr/modals";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useI18n, useScopedI18n } from "@homarr/translation/client";
 import {
@@ -30,8 +28,6 @@ import { CurrentLanguageCombobox } from "~/components/language/current-language-
 
 dayjs.extend(localeData);
 
-const anchorSelector = "a[href]:not([target='_blank'])";
-
 const userGeneralSettingsSchema = z.object({
   name: userEditProfileSchema.shape.name,
   email: userEditProfileSchema.shape.email,
@@ -45,6 +41,23 @@ const userGeneralSettingsSchema = z.object({
 
 type FormValues = z.infer<typeof userGeneralSettingsSchema>;
 
+const FIRST_DAY_OPTIONS: { value: DayOfWeek; labelKey: number }[] = [
+  { value: 1, labelKey: 1 },
+  { value: 6, labelKey: 6 },
+  { value: 0, labelKey: 0 },
+];
+
+const getErrorMessage = (errors: unknown[]): string | undefined => {
+  const messages = errors
+    .map((err) => {
+      if (typeof err === "string") return err;
+      if (err && typeof err === "object" && "message" in err) return String((err as { message: unknown }).message);
+      return null;
+    })
+    .filter(Boolean);
+  return messages.length > 0 ? messages.join(", ") : undefined;
+};
+
 interface UserGeneralSettingsFormProps {
   user: RouterOutputs["user"]["getById"];
   boardsData: Pick<Board, "id" | "name" | "logoImageUrl">[];
@@ -63,8 +76,6 @@ const buildInitialValues = (user: RouterOutputs["user"]["getById"]): FormValues
   pingIconsEnabled: user.pingIconsEnabled,
 });
 
-const valuesEqual = (a: unknown, b: unknown) => a === b;
-
 export const UserGeneralSettingsForm = ({
   user,
   boardsData,
@@ -73,279 +84,132 @@ export const UserGeneralSettingsForm = ({
 }: UserGeneralSettingsFormProps) => {
   const t = useI18n();
   const tGeneral = useScopedI18n("management.page.user.setting.general");
-  const { openConfirmModal } = useConfirmModal();
-  const router = useRouter();
-
   const isCredentialsUser = user.provider === "credentials";
 
-  const [savedValues, setSavedValues] = useState<FormValues>(() => buildInitialValues(user));
-  const form = useZodForm(userGeneralSettingsSchema, { initialValues: savedValues });
-  const allowLeaveRef = useRef(false);
-  const confirmOpenRef = useRef(false);
-
   const editProfileMutation = clientApi.user.editProfile.useMutation();
   const changeHomeBoardsMutation = clientApi.user.changeHomeBoards.useMutation();
   const changeSearchPreferencesMutation = clientApi.user.changeSearchPreferences.useMutation();
   const changeFirstDayOfWeekMutation = clientApi.user.changeFirstDayOfWeek.useMutation();
   const changePingIconsEnabledMutation = clientApi.user.changePingIconsEnabled.useMutation();
 
-  const isPending =
-    editProfileMutation.isPending ||
-    changeHomeBoardsMutation.isPending ||
-    changeSearchPreferencesMutation.isPending ||
-    changeFirstDayOfWeekMutation.isPending ||
-    changePingIconsEnabledMutation.isPending;
+  const hasChangesRef = useRef(false);
+
+  const form = useForm({
+    defaultValues: buildInitialValues(user),
+    validators: {
+      onChange: userGeneralSettingsSchema,
+    },
+    onSubmit: async ({ value, formApi }) => {
+      const parsed = userGeneralSettingsSchema.safeParse(value);
+      if (!parsed.success) return;
+
+      const defaults = formApi.options.defaultValues as FormValues | undefined;
+      if (!defaults) return;
+
+      const hasChanged = <K extends keyof FormValues>(field: K) =>
+        field === "email"
+          ? (value[field] || null) !== (defaults[field] || null)
+          : value[field] !== defaults[field];
+
+      const promises: Promise<unknown>[] = [];
+
+      const profileChanged = hasChanged("name") || hasChanged("email");
+      if (isCredentialsUser && profileChanged) {
+        promises.push(
+          editProfileMutation.mutateAsync({
+            id: user.id,
+            name: parsed.data.name,
+            email: parsed.data.email ?? "",
+          }),
+        );
+      }
+
+      const boardsChanged = hasChanged("homeBoardId") || hasChanged("mobileHomeBoardId");
+      if (boardsChanged) {
+        promises.push(
+          changeHomeBoardsMutation.mutateAsync({
+            userId: user.id,
+            homeBoardId: parsed.data.homeBoardId,
+            mobileHomeBoardId: parsed.data.mobileHomeBoardId,
+          }),
+        );
+      }
+
+      const searchChanged = hasChanged("defaultSearchEngineId") || hasChanged("openInNewTab");
+      if (searchChanged) {
+        promises.push(
+          changeSearchPreferencesMutation.mutateAsync({
+            userId: user.id,
+            defaultSearchEngineId: parsed.data.defaultSearchEngineId,
+            openInNewTab: parsed.data.openInNewTab,
+          }),
+        );
+      }
+
+      if (hasChanged("firstDayOfWeek")) {
+        promises.push(
+          changeFirstDayOfWeekMutation.mutateAsync({
+            id: user.id,
+            firstDayOfWeek: parsed.data.firstDayOfWeek,
+          }),
+        );
+      }
+
+      if (hasChanged("pingIconsEnabled")) {
+        promises.push(
+          changePingIconsEnabledMutation.mutateAsync({
+            id: user.id,
+            pingIconsEnabled: parsed.data.pingIconsEnabled,
+          }),
+        );
+      }
+
+      if (promises.length === 0) return;
+
+      try {
+        await Promise.all(promises);
+        formApi.reset({ ...parsed.data, email: parsed.data.email ?? "" });
+        await revalidatePathActionAsync(`/manage/users/${user.id}`);
+        showSuccessNotification({
+          title: t("common.notification.update.success"),
+          message: t("common.notification.update.success"),
+        });
+      } catch {
+        showErrorNotification({
+          title: t("common.notification.update.error"),
+          message: t("common.notification.update.error"),
+        });
+      }
+    },
+  });
+
+  hasChangesRef.current = !form.state.isDefaultValue;
 
   const weekDays = useMemo(() => dayjs.weekdays(false), []);
 
   useEffect(() => {
-    if (!form.isDirty() || allowLeaveRef.current) return;
-
-    const handleClick = (event: Event) => {
-      if (allowLeaveRef.current) return;
-
-      const target = (event.target as HTMLElement).closest("a");
-
-      if (!target) return;
-
-      event.preventDefault();
-
-      if (confirmOpenRef.current) return;
-      confirmOpenRef.current = true;
-
-      openConfirmModal({
-        title: t("common.unsavedChanges"),
-        children: t("common.unsavedChanges"),
-        confirmProps: {
-          children: t("common.action.discard"),
-        },
-        onCancel() {
-          confirmOpenRef.current = false;
-        },
-        onConfirm() {
-          allowLeaveRef.current = true;
-          confirmOpenRef.current = false;
-          router.push(target.href);
-        },
-      });
+    const handler = (e: BeforeUnloadEvent) => {
+      if (env.NODE_ENV === "development") return;
+      if (hasChangesRef.current) e.preventDefault();
     };
-
-    const handlePopState = (event: Event) => {
-      if (allowLeaveRef.current) return;
-
-      // Keep the user on this page and ask for confirmation.
-      window.history.pushState(null, document.title, window.location.href);
-      event.preventDefault();
-
-      if (confirmOpenRef.current) return;
-      confirmOpenRef.current = true;
-
-      openConfirmModal({
-        title: t("common.unsavedChanges"),
-        children: t("common.unsavedChanges"),
-        confirmProps: {
-          children: t("common.action.discard"),
-        },
-        onCancel() {
-          confirmOpenRef.current = false;
-        },
-        onConfirm() {
-          allowLeaveRef.current = true;
-          confirmOpenRef.current = false;
-          window.history.back();
-        },
-      });
-    };
-
-    const handleBeforeUnload = (event: BeforeUnloadEvent) => {
-      if (env.NODE_ENV === "development") return; // Allow to reload in development
-
-      event.preventDefault();
-      event.returnValue = true;
-    };
-
-    // Add a history entry so back triggers popstate for this page first.
-    window.history.pushState(null, document.title, window.location.href);
-
-    const anchors = document.querySelectorAll(anchorSelector);
-    anchors.forEach((link) => link.addEventListener("click", handleClick));
-    window.addEventListener("popstate", handlePopState);
-    window.addEventListener("beforeunload", handleBeforeUnload);
-
-    return () => {
-      anchors.forEach((link) => link.removeEventListener("click", handleClick));
-      window.removeEventListener("popstate", handlePopState);
-      window.removeEventListener("beforeunload", handleBeforeUnload);
-    };
-  }, [form, openConfirmModal, router, t]);
-
-  const handleSave = useCallback(async () => {
-    const values = form.getValues() as FormValues;
-
-    const tasks: Array<{ key: keyof FormValues | "profile"; run: () => Promise<unknown> }> = [];
-
-    const profileChanged =
-      !valuesEqual(values.name, savedValues.name) || !valuesEqual(values.email ?? "", savedValues.email ?? "");
-    if (isCredentialsUser && profileChanged) {
-      tasks.push({
-        key: "profile",
-        run: () =>
-          editProfileMutation.mutateAsync({
-            id: user.id,
-            name: values.name,
-            email: values.email ?? "",
-          }),
-      });
-    }
-
-    const boardsChanged =
-      !valuesEqual(values.homeBoardId, savedValues.homeBoardId) ||
-      !valuesEqual(values.mobileHomeBoardId, savedValues.mobileHomeBoardId);
-    if (boardsChanged) {
-      tasks.push({
-        key: "homeBoardId",
-        run: () =>
-          changeHomeBoardsMutation.mutateAsync({
-            userId: user.id,
-            homeBoardId: values.homeBoardId,
-            mobileHomeBoardId: values.mobileHomeBoardId,
-          }),
-      });
-    }
-
-    const searchChanged =
-      !valuesEqual(values.defaultSearchEngineId, savedValues.defaultSearchEngineId) ||
-      !valuesEqual(values.openInNewTab, savedValues.openInNewTab);
-    if (searchChanged) {
-      tasks.push({
-        key: "defaultSearchEngineId",
-        run: () =>
-          changeSearchPreferencesMutation.mutateAsync({
-            userId: user.id,
-            defaultSearchEngineId: values.defaultSearchEngineId,
-            openInNewTab: values.openInNewTab,
-          }),
-      });
-    }
-
-    const firstDayChanged = !valuesEqual(values.firstDayOfWeek, savedValues.firstDayOfWeek);
-    if (firstDayChanged) {
-      tasks.push({
-        key: "firstDayOfWeek",
-        run: () =>
-          changeFirstDayOfWeekMutation.mutateAsync({
-            id: user.id,
-            firstDayOfWeek: values.firstDayOfWeek,
-          }),
-      });
-    }
-
-    const pingChanged = !valuesEqual(values.pingIconsEnabled, savedValues.pingIconsEnabled);
-    if (pingChanged) {
-      tasks.push({
-        key: "pingIconsEnabled",
-        run: () =>
-          changePingIconsEnabledMutation.mutateAsync({
-            id: user.id,
-            pingIconsEnabled: values.pingIconsEnabled,
-          }),
-      });
-    }
-
-    if (tasks.length === 0) return;
-
-    const results = await Promise.allSettled(tasks.map((t) => t.run()));
-
-    const hasError = results.some((r) => r.status === "rejected");
-
-    const nextSaved: FormValues = {
-      ...savedValues,
-    };
-
-    if (!hasError) {
-      nextSaved.name = values.name;
-      nextSaved.email = values.email ?? "";
-      nextSaved.homeBoardId = values.homeBoardId;
-      nextSaved.mobileHomeBoardId = values.mobileHomeBoardId;
-      nextSaved.defaultSearchEngineId = values.defaultSearchEngineId;
-      nextSaved.openInNewTab = values.openInNewTab;
-      nextSaved.firstDayOfWeek = values.firstDayOfWeek;
-      nextSaved.pingIconsEnabled = values.pingIconsEnabled;
-    } else {
-      results.forEach((r, index) => {
-        if (r.status === "rejected") return;
-        const task = tasks[index];
-        if (!task) return;
-        if (task.key === "profile") {
-          nextSaved.name = values.name;
-          nextSaved.email = values.email ?? "";
-        }
-        if (task.key === "homeBoardId") {
-          nextSaved.homeBoardId = values.homeBoardId;
-          nextSaved.mobileHomeBoardId = values.mobileHomeBoardId;
-        }
-        if (task.key === "defaultSearchEngineId") {
-          nextSaved.defaultSearchEngineId = values.defaultSearchEngineId;
-          nextSaved.openInNewTab = values.openInNewTab;
-        }
-        if (task.key === "firstDayOfWeek") {
-          nextSaved.firstDayOfWeek = values.firstDayOfWeek;
-        }
-        if (task.key === "pingIconsEnabled") {
-          nextSaved.pingIconsEnabled = values.pingIconsEnabled;
-        }
-      });
-    }
-
-    setSavedValues(nextSaved);
-    form.setInitialValues(nextSaved);
-
-    await revalidatePathActionAsync(`/manage/users/${user.id}`);
-
-    if (hasError) {
-      showErrorNotification({
-        title: t("common.notification.update.error"),
-        message: t("common.notification.update.error"),
-      });
-      return;
-    }
-
-    showSuccessNotification({
-      title: t("common.notification.update.success"),
-      message: t("common.notification.update.success"),
-    });
-  }, [
-    changeFirstDayOfWeekMutation,
-    changeHomeBoardsMutation,
-    changePingIconsEnabledMutation,
-    changeSearchPreferencesMutation,
-    editProfileMutation,
-    form,
-    isCredentialsUser,
-    savedValues,
-    t,
-    user.id,
-  ]);
-
-  const handleDiscard = useCallback(() => {
-    form.reset();
-  }, [form]);
-
-  const firstDayInputProps = form.getInputProps("firstDayOfWeek");
-  const onFirstDayChange = firstDayInputProps.onChange as (value: number) => void;
-  const firstDayValue = (firstDayInputProps.value as number).toString();
+    window.addEventListener("beforeunload", handler);
+    return () => window.removeEventListener("beforeunload", handler);
+  }, []);
 
   return (
-    <form onSubmit={form.onSubmit(() => handleSave())}>
+    <form
+      onSubmit={(e) => {
+        e.preventDefault();
+        e.stopPropagation();
+        void form.handleSubmit();
+      }}
+    >
       <Stack gap="lg">
         <SimpleGrid cols={{ base: 1, md: 2 }} spacing="lg" verticalSpacing="lg">
-          <Card withBorder>
+          <Card withBorder bg="transparent">
             <Stack gap="md">
               <Stack gap={2}>
                 <Title order={3}>{t("user.name")}</Title>
-                <Text c="dimmed" size="sm">
-                  {t("user.field.username.label")} · {t("user.field.email.label")}
-                </Text>
                 {!isCredentialsUser && (
                   <Text c="dimmed" size="sm">
                     {t("management.page.user.fieldsDisabledExternalProvider")}
@@ -353,56 +217,105 @@ export const UserGeneralSettingsForm = ({
                 )}
               </Stack>
               <Divider />
-              <TextInput
-                disabled={!isCredentialsUser}
-                label={t("user.field.username.label")}
-                withAsterisk
-                {...form.getInputProps("name")}
-              />
-              <TextInput disabled={!isCredentialsUser} label={t("user.field.email.label")} {...form.getInputProps("email")} />
+              <form.Field name="name">
+                {({ state, handleChange, handleBlur }) => (
+                  <TextInput
+                    disabled={!isCredentialsUser}
+                    label={t("user.field.username.label")}
+                    withAsterisk
+                    value={state.value}
+                    onChange={(e) => handleChange(e.target.value)}
+                    onBlur={handleBlur}
+                    error={getErrorMessage(state.meta.errors)}
+                  />
+                )}
+              </form.Field>
+              <form.Field name="email">
+                {({ state, handleChange, handleBlur }) => (
+                  <TextInput
+                    disabled={!isCredentialsUser}
+                    label={t("user.field.email.label")}
+                    value={state.value ?? ""}
+                    onChange={(e) => handleChange(e.target.value)}
+                    onBlur={handleBlur}
+                    error={getErrorMessage(state.meta.errors)}
+                  />
+                )}
+              </form.Field>
             </Stack>
           </Card>
 
-          <Card withBorder>
+          <Card withBorder bg="transparent">
             <Stack gap="md">
               <Stack gap={2}>
                 <Title order={3}>{tGeneral("item.board.title")}</Title>
               </Stack>
               <Divider />
-              <BoardSelect
-                label={tGeneral("item.board.type.general")}
-                clearable
-                boards={boardsData}
-                w="100%"
-                {...form.getInputProps("homeBoardId")}
-              />
-              <BoardSelect
-                label={tGeneral("item.board.type.mobile")}
-                clearable
-                boards={boardsData}
-                w="100%"
-                {...form.getInputProps("mobileHomeBoardId")}
-              />
+              <form.Field name="homeBoardId">
+                {({ state, handleChange, handleBlur }) => (
+                  <BoardSelect
+                    label={tGeneral("item.board.type.general")}
+                    clearable
+                    boards={boardsData}
+                    w="100%"
+                    value={state.value}
+                    onChange={handleChange}
+                    onBlur={handleBlur}
+                    error={getErrorMessage(state.meta.errors)}
+                  />
+                )}
+              </form.Field>
+              <form.Field name="mobileHomeBoardId">
+                {({ state, handleChange, handleBlur }) => (
+                  <BoardSelect
+                    label={tGeneral("item.board.type.mobile")}
+                    clearable
+                    boards={boardsData}
+                    w="100%"
+                    value={state.value}
+                    onChange={handleChange}
+                    onBlur={handleBlur}
+                    error={getErrorMessage(state.meta.errors)}
+                  />
+                )}
+              </form.Field>
             </Stack>
           </Card>
 
-          <Card withBorder>
+          <Card withBorder bg="transparent">
             <Stack gap="md">
               <Stack gap={2}>
                 <Title order={3}>{tGeneral("item.search")}</Title>
               </Stack>
               <Divider />
-              <Select
-                label={t("user.field.defaultSearchEngine.label")}
-                w="100%"
-                data={searchEnginesData}
-                {...form.getInputProps("defaultSearchEngineId")}
-              />
-              <Switch label={t("user.field.openSearchInNewTab.label")} {...form.getInputProps("openInNewTab", { type: "checkbox" })} />
+              <form.Field name="defaultSearchEngineId">
+                {({ state, handleChange, handleBlur }) => (
+                  <Select
+                    label={t("user.field.defaultSearchEngine.label")}
+                    w="100%"
+                    data={searchEnginesData}
+                    value={state.value}
+                    onChange={handleChange}
+                    onBlur={handleBlur}
+                    error={getErrorMessage(state.meta.errors)}
+                  />
+                )}
+              </form.Field>
+              <form.Field name="openInNewTab">
+                {({ state, handleChange, handleBlur }) => (
+                  <Switch
+                    label={t("user.field.openSearchInNewTab.label")}
+                    checked={state.value}
+                    onChange={(e) => handleChange(e.currentTarget.checked)}
+                    onBlur={handleBlur}
+                    error={getErrorMessage(state.meta.errors)}
+                  />
+                )}
+              </form.Field>
             </Stack>
           </Card>
 
-          <Card withBorder>
+          <Card withBorder bg="transparent">
             <Stack gap="md">
               <Stack gap={2}>
                 <Title order={3}>{tGeneral("item.language")}</Title>
@@ -410,42 +323,63 @@ export const UserGeneralSettingsForm = ({
               <Divider />
               {showLanguageSelector && <CurrentLanguageCombobox />}
               <Title order={4}>{tGeneral("item.firstDayOfWeek")}</Title>
-              <Radio.Group {...firstDayInputProps} value={firstDayValue} onChange={(value) => onFirstDayChange(parseInt(value))}>
-                <Group mt="xs" wrap="wrap">
-                  <Radio value="1" label={weekDays[1]} />
-                  <Radio value="6" label={weekDays[6]} />
-                  <Radio value="0" label={weekDays[0]} />
-                </Group>
-              </Radio.Group>
+              <form.Field name="firstDayOfWeek">
+                {({ state, handleChange, handleBlur }) => (
+                  <Radio.Group
+                    value={String(state.value)}
+                    onChange={(value) => handleChange(parseInt(value) as DayOfWeek)}
+                    onBlur={handleBlur}
+                    error={getErrorMessage(state.meta.errors)}
+                  >
+                    <Group mt="xs" wrap="wrap">
+                      {FIRST_DAY_OPTIONS.map(({ value: dayValue, labelKey }) => (
+                        <Radio key={dayValue} value={String(dayValue)} label={weekDays[labelKey]} />
+                      ))}
+                    </Group>
+                  </Radio.Group>
+                )}
+              </form.Field>
               <Divider my="xs" />
               <Title order={4}>{tGeneral("item.accessibility")}</Title>
-              <Switch
-                label={t("user.field.pingIconsEnabled.label")}
-                {...form.getInputProps("pingIconsEnabled", { type: "checkbox" })}
-              />
+              <form.Field name="pingIconsEnabled">
+                {({ state, handleChange, handleBlur }) => (
+                  <Switch
+                    label={t("user.field.pingIconsEnabled.label")}
+                    checked={state.value}
+                    onChange={(e) => handleChange(e.currentTarget.checked)}
+                    onBlur={handleBlur}
+                    error={getErrorMessage(state.meta.errors)}
+                  />
+                )}
+              </form.Field>
             </Stack>
           </Card>
         </SimpleGrid>
 
-        <div style={{ position: "sticky", bottom: 20 }}>
-          {form.isDirty() && (
-            <Card withBorder>
-              <Group justify="space-between" wrap="wrap">
-                <Text fw={500}>{t("common.unsavedChanges")}</Text>
-                <Group>
-                  <Button disabled={isPending} variant="default" onClick={handleDiscard}>
-                    {t("common.action.discard")}
-                  </Button>
-                  <Button loading={isPending} type="submit">
-                    {t("common.action.saveChanges")}
-                  </Button>
-                </Group>
-              </Group>
-            </Card>
+        <form.Subscribe
+          selector={(state) => ({ hasChanges: !state.isDefaultValue, isSubmitting: state.isSubmitting, canSubmit: state.canSubmit })}
+        >
+          {({ hasChanges, isSubmitting, canSubmit }) => (
+            <div style={{ position: "sticky", bottom: 20 }}>
+              {hasChanges && (
+                <Card withBorder>
+                  <Group justify="space-between" wrap="wrap">
+                    <Text fw={500}>{t("common.unsavedChanges")}</Text>
+                    <Group>
+                      <Button disabled={isSubmitting} variant="default" onClick={() => form.reset()}>
+                        {t("common.action.discard")}
+                      </Button>
+                      <Button loading={isSubmitting} type="submit" disabled={!canSubmit}>
+                        {t("common.action.saveChanges")}
+                      </Button>
+                    </Group>
+                  </Group>
+                </Card>
+              )}
+            </div>
           )}
-        </div>
+        </form.Subscribe>
       </Stack>
     </form>
   );
 };
-
diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/page.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/page.tsx
index 2f00f79d6..cf68c20e2 100644
--- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/page.tsx
@@ -1,5 +1,6 @@
 import { notFound } from "next/navigation";
-import { Box, Card, Group, Stack, Title } from "@mantine/core";
+import { Alert, Box, Group, Stack, Title } from "@mantine/core";
+import { IconExclamationCircle } from "@tabler/icons-react";
 
 import { api } from "@homarr/api/server";
 import { auth } from "@homarr/auth/next";
@@ -58,9 +59,15 @@ export default async function EditUserPage(props: Props) {
   const boards = await api.board.getAllBoards();
   const searchEngines = await api.searchEngine.getSelectable();
   const isSelf = session?.user.id === user.id;
+  const isCredentialsUser = user.provider === "credentials";
 
   return (
     <Stack>
+      {!isCredentialsUser && (
+        <Alert variant="light" color="yellow" icon={<IconExclamationCircle size="1rem" stroke={1.5} />}>
+          {t("management.page.user.fieldsDisabledExternalProvider")}
+        </Alert>
+      )}
       <Title>{tGeneral("title")}</Title>
       <Group gap="xl" align="flex-start" wrap="wrap">
         <Box flex={1} miw={{ base: "100%", md: 540 }}>
@@ -76,9 +83,7 @@ export default async function EditUserPage(props: Props) {
           />
         </Box>
         <Box w={{ base: "100%", lg: 260 }}>
-          <Card withBorder>
-            <UserProfileAvatarForm user={user} />
-          </Card>
+          <UserProfileAvatarForm user={user} />
         </Box>
       </Group>
 

From c16974b8dbd05f296a25ed24fe665b3048bb4bfc Mon Sep 17 00:00:00 2001
From: Thomas Camlong <thomas@ajnart.fr>
Date: Wed, 28 Jan 2026 11:43:38 +0100
Subject: [PATCH 04/11] chore: address pr comments

---
 apps/nextjs/package.json |  1 +
 pnpm-lock.yaml           | 73 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/apps/nextjs/package.json b/apps/nextjs/package.json
index 48d7066d6..1a8b22c0d 100644
--- a/apps/nextjs/package.json
+++ b/apps/nextjs/package.json
@@ -56,6 +56,7 @@
     "@mantine/tiptap": "^8.3.13",
     "@million/lint": "1.0.14",
     "@tabler/icons-react": "^3.36.1",
+    "@tanstack/react-form": "^1.27.7",
     "@tanstack/react-query": "^5.90.19",
     "@tanstack/react-query-devtools": "^5.91.2",
     "@tanstack/react-query-next-experimental": "^5.91.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e221be443..ac7324f05 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -232,6 +232,9 @@ importers:
       '@tabler/icons-react':
         specifier: ^3.36.1
         version: 3.36.1(react@19.2.3)
+      '@tanstack/react-form':
+        specifier: ^1.27.7
+        version: 1.27.7(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
       '@tanstack/react-query':
         specifier: ^5.90.19
         version: 5.90.19(react@19.2.3)
@@ -4439,16 +4442,36 @@ packages:
   '@tabler/icons@3.36.1':
     resolution: {integrity: sha512-f4Jg3Fof/Vru5ioix/UO4GX+sdDsF9wQo47FbtvG+utIYYVQ/QVAC0QYgcBbAjQGfbdOh2CCf0BgiFOF9Ixtjw==}
 
+  '@tanstack/devtools-event-client@0.4.0':
+    resolution: {integrity: sha512-RPfGuk2bDZgcu9bAJodvO2lnZeHuz4/71HjZ0bGb/SPg8+lyTA+RLSKQvo7fSmPSi8/vcH3aKQ8EM9ywf1olaw==}
+    engines: {node: '>=18'}
+
+  '@tanstack/form-core@1.27.7':
+    resolution: {integrity: sha512-nvogpyE98fhb0NDw1Bf2YaCH+L7ZIUgEpqO9TkHucDn6zg3ni521boUpv0i8HKIrmmFwDYjWZoCnrgY4HYWTkw==}
+
   '@tanstack/match-sorter-utils@8.19.4':
     resolution: {integrity: sha512-Wo1iKt2b9OT7d+YGhvEPD3DXvPv2etTusIMhMUoG7fbhmxcXCtIjJDEygy91Y2JFlwGyjqiBPRozme7UD8hoqg==}
     engines: {node: '>=12'}
 
+  '@tanstack/pacer-lite@0.1.1':
+    resolution: {integrity: sha512-y/xtNPNt/YeyoVxE/JCx+T7yjEzpezmbb+toK8DDD1P4m7Kzs5YR956+7OKexG3f8aXgC3rLZl7b1V+yNUSy5w==}
+    engines: {node: '>=18'}
+
   '@tanstack/query-core@5.90.19':
     resolution: {integrity: sha512-GLW5sjPVIvH491VV1ufddnfldyVB+teCnpPIvweEfkpRx7CfUmUGhoh9cdcUKBh/KwVxk22aNEDxeTsvmyB/WA==}
 
   '@tanstack/query-devtools@5.92.0':
     resolution: {integrity: sha512-N8D27KH1vEpVacvZgJL27xC6yPFUy0Zkezn5gnB3L3gRCxlDeSuiya7fKge8Y91uMTnC8aSxBQhcK6ocY7alpQ==}
 
+  '@tanstack/react-form@1.27.7':
+    resolution: {integrity: sha512-xTg4qrUY0fuLaSnkATLZcK3BWlnwLp7IuAb6UTbZKngiDEvvDCNTvVvHgPlgef1O2qN4klZxInRyRY6oEkXZ2A==}
+    peerDependencies:
+      '@tanstack/react-start': '*'
+      react: ^17.0.0 || ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@tanstack/react-start':
+        optional: true
+
   '@tanstack/react-query-devtools@5.91.2':
     resolution: {integrity: sha512-ZJ1503ay5fFeEYFUdo7LMNFzZryi6B0Cacrgr2h1JRkvikK1khgIq6Nq2EcblqEdIlgB/r7XDW8f8DQ89RuUgg==}
     peerDependencies:
@@ -4467,6 +4490,12 @@ packages:
     peerDependencies:
       react: ^18 || ^19
 
+  '@tanstack/react-store@0.8.0':
+    resolution: {integrity: sha512-1vG9beLIuB7q69skxK9r5xiLN3ztzIPfSQSs0GfeqWGO2tGIyInZx0x1COhpx97RKaONSoAb8C3dxacWksm1ow==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
   '@tanstack/react-table@8.20.5':
     resolution: {integrity: sha512-WEHopKw3znbUZ61s9i0+i9g8drmDo6asTWbrQh8Us63DAk/M0FkmIqERew6P71HI75ksZ2Pxyuf4vvKh9rAkiA==}
     engines: {node: '>=12'}
@@ -4480,6 +4509,12 @@ packages:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
+  '@tanstack/store@0.7.7':
+    resolution: {integrity: sha512-xa6pTan1bcaqYDS9BDpSiS63qa6EoDkPN9RsRaxHuDdVDNntzq3xNwR5YKTU/V3SkSyC9T4YVOPh2zRQN0nhIQ==}
+
+  '@tanstack/store@0.8.0':
+    resolution: {integrity: sha512-Om+BO0YfMZe//X2z0uLF2j+75nQga6TpTJgLJQBiq85aOyZNIhkCgleNcud2KQg4k4v9Y9l+Uhru3qWMPGTOzQ==}
+
   '@tanstack/table-core@8.20.5':
     resolution: {integrity: sha512-P9dF7XbibHph2PFRz8gfBKEXEY/HJPOhym8CHmjF8y3q5mWpKx9xtZapXQUWCgkqvsK0R46Azuz+VaxD4Xl+Tg==}
     engines: {node: '>=12'}
@@ -10722,6 +10757,11 @@ packages:
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
+  use-sync-external-store@1.6.0:
+    resolution: {integrity: sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
   util-deprecate@1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
@@ -13386,14 +13426,32 @@ snapshots:
 
   '@tabler/icons@3.36.1': {}
 
+  '@tanstack/devtools-event-client@0.4.0': {}
+
+  '@tanstack/form-core@1.27.7':
+    dependencies:
+      '@tanstack/devtools-event-client': 0.4.0
+      '@tanstack/pacer-lite': 0.1.1
+      '@tanstack/store': 0.7.7
+
   '@tanstack/match-sorter-utils@8.19.4':
     dependencies:
       remove-accents: 0.5.0
 
+  '@tanstack/pacer-lite@0.1.1': {}
+
   '@tanstack/query-core@5.90.19': {}
 
   '@tanstack/query-devtools@5.92.0': {}
 
+  '@tanstack/react-form@1.27.7(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@tanstack/form-core': 1.27.7
+      '@tanstack/react-store': 0.8.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      react: 19.2.3
+    transitivePeerDependencies:
+      - react-dom
+
   '@tanstack/react-query-devtools@5.91.2(@tanstack/react-query@5.90.19(react@19.2.3))(react@19.2.3)':
     dependencies:
       '@tanstack/query-devtools': 5.92.0
@@ -13411,6 +13469,13 @@ snapshots:
       '@tanstack/query-core': 5.90.19
       react: 19.2.3
 
+  '@tanstack/react-store@0.8.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@tanstack/store': 0.8.0
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+      use-sync-external-store: 1.6.0(react@19.2.3)
+
   '@tanstack/react-table@8.20.5(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
     dependencies:
       '@tanstack/table-core': 8.20.5
@@ -13423,6 +13488,10 @@ snapshots:
       react: 19.2.3
       react-dom: 19.2.3(react@19.2.3)
 
+  '@tanstack/store@0.7.7': {}
+
+  '@tanstack/store@0.8.0': {}
+
   '@tanstack/table-core@8.20.5': {}
 
   '@tanstack/virtual-core@3.11.2': {}
@@ -20657,6 +20726,10 @@ snapshots:
     dependencies:
       react: 19.2.3
 
+  use-sync-external-store@1.6.0(react@19.2.3):
+    dependencies:
+      react: 19.2.3
+
   util-deprecate@1.0.2: {}
 
   uuid@10.0.0: {}

From e79efe06bbc4a15a6097e52c458b012a6eca2eae Mon Sep 17 00:00:00 2001
From: Thomas Camlong <thomas@ajnart.fr>
Date: Wed, 28 Jan 2026 12:19:31 +0100
Subject: [PATCH 05/11] refactor(manage): update user settings

---
 .../_components/_general-settings-form.tsx    | 367 +++++++-----------
 1 file changed, 132 insertions(+), 235 deletions(-)

diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx
index bb18a1a74..78aa058b5 100644
--- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx
@@ -5,12 +5,12 @@ import { Button, Card, Divider, Group, Radio, Select, SimpleGrid, Stack, Switch,
 import type { DayOfWeek } from "@mantine/dates";
 import dayjs from "dayjs";
 import localeData from "dayjs/plugin/localeData";
-import { useForm } from "@tanstack/react-form";
 
 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
 import { env } from "@homarr/common/env";
+import { useZodForm } from "@homarr/form";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useI18n, useScopedI18n } from "@homarr/translation/client";
 import {
@@ -47,17 +47,6 @@ const FIRST_DAY_OPTIONS: { value: DayOfWeek; labelKey: number }[] = [
   { value: 0, labelKey: 0 },
 ];
 
-const getErrorMessage = (errors: unknown[]): string | undefined => {
-  const messages = errors
-    .map((err) => {
-      if (typeof err === "string") return err;
-      if (err && typeof err === "object" && "message" in err) return String((err as { message: unknown }).message);
-      return null;
-    })
-    .filter(Boolean);
-  return messages.length > 0 ? messages.join(", ") : undefined;
-};
-
 interface UserGeneralSettingsFormProps {
   user: RouterOutputs["user"]["getById"];
   boardsData: Pick<Board, "id" | "name" | "logoImageUrl">[];
@@ -92,118 +81,90 @@ export const UserGeneralSettingsForm = ({
   const changeFirstDayOfWeekMutation = clientApi.user.changeFirstDayOfWeek.useMutation();
   const changePingIconsEnabledMutation = clientApi.user.changePingIconsEnabled.useMutation();
 
-  const hasChangesRef = useRef(false);
+  const initialValues = buildInitialValues(user);
+  const initialValuesRef = useRef(initialValues);
 
-  const form = useForm({
-    defaultValues: buildInitialValues(user),
-    validators: {
-      onChange: userGeneralSettingsSchema,
-    },
-    onSubmit: async ({ value, formApi }) => {
-      const parsed = userGeneralSettingsSchema.safeParse(value);
-      if (!parsed.success) return;
-
-      const defaults = formApi.options.defaultValues as FormValues | undefined;
-      if (!defaults) return;
-
-      const hasChanged = <K extends keyof FormValues>(field: K) =>
-        field === "email"
-          ? (value[field] || null) !== (defaults[field] || null)
-          : value[field] !== defaults[field];
-
-      const promises: Promise<unknown>[] = [];
-
-      const profileChanged = hasChanged("name") || hasChanged("email");
-      if (isCredentialsUser && profileChanged) {
-        promises.push(
-          editProfileMutation.mutateAsync({
-            id: user.id,
-            name: parsed.data.name,
-            email: parsed.data.email ?? "",
-          }),
-        );
-      }
-
-      const boardsChanged = hasChanged("homeBoardId") || hasChanged("mobileHomeBoardId");
-      if (boardsChanged) {
-        promises.push(
-          changeHomeBoardsMutation.mutateAsync({
-            userId: user.id,
-            homeBoardId: parsed.data.homeBoardId,
-            mobileHomeBoardId: parsed.data.mobileHomeBoardId,
-          }),
-        );
-      }
-
-      const searchChanged = hasChanged("defaultSearchEngineId") || hasChanged("openInNewTab");
-      if (searchChanged) {
-        promises.push(
-          changeSearchPreferencesMutation.mutateAsync({
-            userId: user.id,
-            defaultSearchEngineId: parsed.data.defaultSearchEngineId,
-            openInNewTab: parsed.data.openInNewTab,
-          }),
-        );
-      }
-
-      if (hasChanged("firstDayOfWeek")) {
-        promises.push(
-          changeFirstDayOfWeekMutation.mutateAsync({
-            id: user.id,
-            firstDayOfWeek: parsed.data.firstDayOfWeek,
-          }),
-        );
-      }
-
-      if (hasChanged("pingIconsEnabled")) {
-        promises.push(
-          changePingIconsEnabledMutation.mutateAsync({
-            id: user.id,
-            pingIconsEnabled: parsed.data.pingIconsEnabled,
-          }),
-        );
-      }
-
-      if (promises.length === 0) return;
-
-      try {
-        await Promise.all(promises);
-        formApi.reset({ ...parsed.data, email: parsed.data.email ?? "" });
-        await revalidatePathActionAsync(`/manage/users/${user.id}`);
-        showSuccessNotification({
-          title: t("common.notification.update.success"),
-          message: t("common.notification.update.success"),
-        });
-      } catch {
-        showErrorNotification({
-          title: t("common.notification.update.error"),
-          message: t("common.notification.update.error"),
-        });
-      }
-    },
+  const form = useZodForm(userGeneralSettingsSchema, {
+    initialValues,
   });
 
-  hasChangesRef.current = !form.state.isDefaultValue;
+  const isDirtyRef = useRef(false);
+  isDirtyRef.current = form.isDirty();
 
   const weekDays = useMemo(() => dayjs.weekdays(false), []);
 
+  const mutations = [editProfileMutation, changeHomeBoardsMutation, changeSearchPreferencesMutation, changeFirstDayOfWeekMutation, changePingIconsEnabledMutation];
+  const isPending = mutations.some((m) => m.isPending);
+
   useEffect(() => {
     const handler = (e: BeforeUnloadEvent) => {
       if (env.NODE_ENV === "development") return;
-      if (hasChangesRef.current) e.preventDefault();
+      if (isDirtyRef.current) e.preventDefault();
     };
     window.addEventListener("beforeunload", handler);
     return () => window.removeEventListener("beforeunload", handler);
   }, []);
 
+  const handleSubmit = async (values: FormValues) => {
+    const parsed = userGeneralSettingsSchema.safeParse(values);
+    if (!parsed.success) return;
+
+    const defaults = initialValuesRef.current;
+    const changed = <K extends keyof FormValues>(...fields: K[]) =>
+      fields.some((f) => (f === "email" ? (values[f] || null) !== (defaults[f] || null) : values[f] !== defaults[f]));
+
+    const saveActions: { when: boolean; action: () => Promise<unknown> }[] = [
+      {
+        when: isCredentialsUser && changed("name", "email"),
+        action: () => editProfileMutation.mutateAsync({ id: user.id, name: parsed.data.name, email: parsed.data.email ?? "" }),
+      },
+      {
+        when: changed("homeBoardId", "mobileHomeBoardId"),
+        action: () => changeHomeBoardsMutation.mutateAsync({ userId: user.id, homeBoardId: parsed.data.homeBoardId, mobileHomeBoardId: parsed.data.mobileHomeBoardId }),
+      },
+      {
+        when: changed("defaultSearchEngineId", "openInNewTab"),
+        action: () => changeSearchPreferencesMutation.mutateAsync({ userId: user.id, defaultSearchEngineId: parsed.data.defaultSearchEngineId, openInNewTab: parsed.data.openInNewTab }),
+      },
+      {
+        when: changed("firstDayOfWeek"),
+        action: () => changeFirstDayOfWeekMutation.mutateAsync({ id: user.id, firstDayOfWeek: parsed.data.firstDayOfWeek }),
+      },
+      {
+        when: changed("pingIconsEnabled"),
+        action: () => changePingIconsEnabledMutation.mutateAsync({ id: user.id, pingIconsEnabled: parsed.data.pingIconsEnabled }),
+      },
+    ];
+
+    const promises = saveActions.filter((s) => s.when).map((s) => s.action());
+    if (promises.length === 0) return;
+
+    try {
+      await Promise.all(promises);
+      const newValues = { ...parsed.data, email: parsed.data.email ?? "" };
+      initialValuesRef.current = newValues;
+      form.setInitialValues(newValues);
+      form.resetDirty();
+      await revalidatePathActionAsync(`/manage/users/${user.id}`);
+      showSuccessNotification({
+        title: t("common.notification.update.success"),
+        message: t("common.notification.update.success"),
+      });
+    } catch {
+      showErrorNotification({
+        title: t("common.notification.update.error"),
+        message: t("common.notification.update.error"),
+      });
+    }
+  };
+
+  const handleDiscard = () => {
+    form.setValues(initialValuesRef.current);
+    form.resetDirty();
+  };
+
   return (
-    <form
-      onSubmit={(e) => {
-        e.preventDefault();
-        e.stopPropagation();
-        void form.handleSubmit();
-      }}
-    >
+    <form onSubmit={form.onSubmit(handleSubmit)}>
       <Stack gap="lg">
         <SimpleGrid cols={{ base: 1, md: 2 }} spacing="lg" verticalSpacing="lg">
           <Card withBorder bg="transparent">
@@ -217,31 +178,17 @@ export const UserGeneralSettingsForm = ({
                 )}
               </Stack>
               <Divider />
-              <form.Field name="name">
-                {({ state, handleChange, handleBlur }) => (
-                  <TextInput
-                    disabled={!isCredentialsUser}
-                    label={t("user.field.username.label")}
-                    withAsterisk
-                    value={state.value}
-                    onChange={(e) => handleChange(e.target.value)}
-                    onBlur={handleBlur}
-                    error={getErrorMessage(state.meta.errors)}
-                  />
-                )}
-              </form.Field>
-              <form.Field name="email">
-                {({ state, handleChange, handleBlur }) => (
-                  <TextInput
-                    disabled={!isCredentialsUser}
-                    label={t("user.field.email.label")}
-                    value={state.value ?? ""}
-                    onChange={(e) => handleChange(e.target.value)}
-                    onBlur={handleBlur}
-                    error={getErrorMessage(state.meta.errors)}
-                  />
-                )}
-              </form.Field>
+              <TextInput
+                disabled={!isCredentialsUser}
+                label={t("user.field.username.label")}
+                withAsterisk
+                {...form.getInputProps("name")}
+              />
+              <TextInput
+                disabled={!isCredentialsUser}
+                label={t("user.field.email.label")}
+                {...form.getInputProps("email")}
+              />
             </Stack>
           </Card>
 
@@ -251,34 +198,20 @@ export const UserGeneralSettingsForm = ({
                 <Title order={3}>{tGeneral("item.board.title")}</Title>
               </Stack>
               <Divider />
-              <form.Field name="homeBoardId">
-                {({ state, handleChange, handleBlur }) => (
-                  <BoardSelect
-                    label={tGeneral("item.board.type.general")}
-                    clearable
-                    boards={boardsData}
-                    w="100%"
-                    value={state.value}
-                    onChange={handleChange}
-                    onBlur={handleBlur}
-                    error={getErrorMessage(state.meta.errors)}
-                  />
-                )}
-              </form.Field>
-              <form.Field name="mobileHomeBoardId">
-                {({ state, handleChange, handleBlur }) => (
-                  <BoardSelect
-                    label={tGeneral("item.board.type.mobile")}
-                    clearable
-                    boards={boardsData}
-                    w="100%"
-                    value={state.value}
-                    onChange={handleChange}
-                    onBlur={handleBlur}
-                    error={getErrorMessage(state.meta.errors)}
-                  />
-                )}
-              </form.Field>
+              <BoardSelect
+                label={tGeneral("item.board.type.general")}
+                clearable
+                boards={boardsData}
+                w="100%"
+                {...form.getInputProps("homeBoardId")}
+              />
+              <BoardSelect
+                label={tGeneral("item.board.type.mobile")}
+                clearable
+                boards={boardsData}
+                w="100%"
+                {...form.getInputProps("mobileHomeBoardId")}
+              />
             </Stack>
           </Card>
 
@@ -288,30 +221,16 @@ export const UserGeneralSettingsForm = ({
                 <Title order={3}>{tGeneral("item.search")}</Title>
               </Stack>
               <Divider />
-              <form.Field name="defaultSearchEngineId">
-                {({ state, handleChange, handleBlur }) => (
-                  <Select
-                    label={t("user.field.defaultSearchEngine.label")}
-                    w="100%"
-                    data={searchEnginesData}
-                    value={state.value}
-                    onChange={handleChange}
-                    onBlur={handleBlur}
-                    error={getErrorMessage(state.meta.errors)}
-                  />
-                )}
-              </form.Field>
-              <form.Field name="openInNewTab">
-                {({ state, handleChange, handleBlur }) => (
-                  <Switch
-                    label={t("user.field.openSearchInNewTab.label")}
-                    checked={state.value}
-                    onChange={(e) => handleChange(e.currentTarget.checked)}
-                    onBlur={handleBlur}
-                    error={getErrorMessage(state.meta.errors)}
-                  />
-                )}
-              </form.Field>
+              <Select
+                label={t("user.field.defaultSearchEngine.label")}
+                w="100%"
+                data={searchEnginesData}
+                {...form.getInputProps("defaultSearchEngineId")}
+              />
+              <Switch
+                label={t("user.field.openSearchInNewTab.label")}
+                {...form.getInputProps("openInNewTab", { type: "checkbox" })}
+              />
             </Stack>
           </Card>
 
@@ -323,62 +242,40 @@ export const UserGeneralSettingsForm = ({
               <Divider />
               {showLanguageSelector && <CurrentLanguageCombobox />}
               <Title order={4}>{tGeneral("item.firstDayOfWeek")}</Title>
-              <form.Field name="firstDayOfWeek">
-                {({ state, handleChange, handleBlur }) => (
-                  <Radio.Group
-                    value={String(state.value)}
-                    onChange={(value) => handleChange(parseInt(value) as DayOfWeek)}
-                    onBlur={handleBlur}
-                    error={getErrorMessage(state.meta.errors)}
-                  >
-                    <Group mt="xs" wrap="wrap">
-                      {FIRST_DAY_OPTIONS.map(({ value: dayValue, labelKey }) => (
-                        <Radio key={dayValue} value={String(dayValue)} label={weekDays[labelKey]} />
-                      ))}
-                    </Group>
-                  </Radio.Group>
-                )}
-              </form.Field>
+              <Radio.Group {...form.getInputProps("firstDayOfWeek")}>
+                <Group mt="xs" wrap="wrap">
+                  {FIRST_DAY_OPTIONS.map(({ value: dayValue, labelKey }) => (
+                    <Radio key={dayValue} value={dayValue} label={weekDays[labelKey]} />
+                  ))}
+                </Group>
+              </Radio.Group>
               <Divider my="xs" />
               <Title order={4}>{tGeneral("item.accessibility")}</Title>
-              <form.Field name="pingIconsEnabled">
-                {({ state, handleChange, handleBlur }) => (
-                  <Switch
-                    label={t("user.field.pingIconsEnabled.label")}
-                    checked={state.value}
-                    onChange={(e) => handleChange(e.currentTarget.checked)}
-                    onBlur={handleBlur}
-                    error={getErrorMessage(state.meta.errors)}
-                  />
-                )}
-              </form.Field>
+              <Switch
+                label={t("user.field.pingIconsEnabled.label")}
+                {...form.getInputProps("pingIconsEnabled", { type: "checkbox" })}
+              />
             </Stack>
           </Card>
         </SimpleGrid>
 
-        <form.Subscribe
-          selector={(state) => ({ hasChanges: !state.isDefaultValue, isSubmitting: state.isSubmitting, canSubmit: state.canSubmit })}
-        >
-          {({ hasChanges, isSubmitting, canSubmit }) => (
-            <div style={{ position: "sticky", bottom: 20 }}>
-              {hasChanges && (
-                <Card withBorder>
-                  <Group justify="space-between" wrap="wrap">
-                    <Text fw={500}>{t("common.unsavedChanges")}</Text>
-                    <Group>
-                      <Button disabled={isSubmitting} variant="default" onClick={() => form.reset()}>
-                        {t("common.action.discard")}
-                      </Button>
-                      <Button loading={isSubmitting} type="submit" disabled={!canSubmit}>
-                        {t("common.action.saveChanges")}
-                      </Button>
-                    </Group>
-                  </Group>
-                </Card>
-              )}
-            </div>
+        <div style={{ position: "sticky", bottom: 20 }}>
+          {form.isDirty() && (
+            <Card withBorder>
+              <Group justify="space-between" wrap="wrap">
+                <Text fw={500}>{t("common.unsavedChanges")}</Text>
+                <Group>
+                  <Button disabled={isPending} variant="default" onClick={handleDiscard}>
+                    {t("common.action.discard")}
+                  </Button>
+                  <Button loading={isPending} type="submit" disabled={!form.isValid()}>
+                    {t("common.action.saveChanges")}
+                  </Button>
+                </Group>
+              </Group>
+            </Card>
           )}
-        </form.Subscribe>
+        </div>
       </Stack>
     </form>
   );

From c4ab2c35aba5f8599eefd1bfecade6f0389126d5 Mon Sep 17 00:00:00 2001
From: Meier Lukas <meierschlumpf@gmail.com>
Date: Fri, 1 May 2026 16:38:53 +0200
Subject: [PATCH 06/11] fix: format issue

---
 .../_components/_general-settings-form.tsx    | 48 +++++++++++++++----
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx
index 78aa058b5..b142ceeb9 100644
--- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx
@@ -1,10 +1,24 @@
 "use client";
 
 import { useEffect, useMemo, useRef } from "react";
-import { Button, Card, Divider, Group, Radio, Select, SimpleGrid, Stack, Switch, Text, TextInput, Title } from "@mantine/core";
+import {
+  Button,
+  Card,
+  Divider,
+  Group,
+  Radio,
+  Select,
+  SimpleGrid,
+  Stack,
+  Switch,
+  Text,
+  TextInput,
+  Title,
+} from "@mantine/core";
 import type { DayOfWeek } from "@mantine/dates";
 import dayjs from "dayjs";
 import localeData from "dayjs/plugin/localeData";
+import { z } from "zod/v4";
 
 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
@@ -20,7 +34,6 @@ import {
   userFirstDayOfWeekSchema,
   userPingIconsEnabledSchema,
 } from "@homarr/validation/user";
-import { z } from "zod/v4";
 
 import type { Board } from "~/app/[locale]/boards/_types";
 import { BoardSelect } from "~/components/board/board-select";
@@ -93,7 +106,13 @@ export const UserGeneralSettingsForm = ({
 
   const weekDays = useMemo(() => dayjs.weekdays(false), []);
 
-  const mutations = [editProfileMutation, changeHomeBoardsMutation, changeSearchPreferencesMutation, changeFirstDayOfWeekMutation, changePingIconsEnabledMutation];
+  const mutations = [
+    editProfileMutation,
+    changeHomeBoardsMutation,
+    changeSearchPreferencesMutation,
+    changeFirstDayOfWeekMutation,
+    changePingIconsEnabledMutation,
+  ];
   const isPending = mutations.some((m) => m.isPending);
 
   useEffect(() => {
@@ -116,23 +135,36 @@ export const UserGeneralSettingsForm = ({
     const saveActions: { when: boolean; action: () => Promise<unknown> }[] = [
       {
         when: isCredentialsUser && changed("name", "email"),
-        action: () => editProfileMutation.mutateAsync({ id: user.id, name: parsed.data.name, email: parsed.data.email ?? "" }),
+        action: () =>
+          editProfileMutation.mutateAsync({ id: user.id, name: parsed.data.name, email: parsed.data.email ?? "" }),
       },
       {
         when: changed("homeBoardId", "mobileHomeBoardId"),
-        action: () => changeHomeBoardsMutation.mutateAsync({ userId: user.id, homeBoardId: parsed.data.homeBoardId, mobileHomeBoardId: parsed.data.mobileHomeBoardId }),
+        action: () =>
+          changeHomeBoardsMutation.mutateAsync({
+            userId: user.id,
+            homeBoardId: parsed.data.homeBoardId,
+            mobileHomeBoardId: parsed.data.mobileHomeBoardId,
+          }),
       },
       {
         when: changed("defaultSearchEngineId", "openInNewTab"),
-        action: () => changeSearchPreferencesMutation.mutateAsync({ userId: user.id, defaultSearchEngineId: parsed.data.defaultSearchEngineId, openInNewTab: parsed.data.openInNewTab }),
+        action: () =>
+          changeSearchPreferencesMutation.mutateAsync({
+            userId: user.id,
+            defaultSearchEngineId: parsed.data.defaultSearchEngineId,
+            openInNewTab: parsed.data.openInNewTab,
+          }),
       },
       {
         when: changed("firstDayOfWeek"),
-        action: () => changeFirstDayOfWeekMutation.mutateAsync({ id: user.id, firstDayOfWeek: parsed.data.firstDayOfWeek }),
+        action: () =>
+          changeFirstDayOfWeekMutation.mutateAsync({ id: user.id, firstDayOfWeek: parsed.data.firstDayOfWeek }),
       },
       {
         when: changed("pingIconsEnabled"),
-        action: () => changePingIconsEnabledMutation.mutateAsync({ id: user.id, pingIconsEnabled: parsed.data.pingIconsEnabled }),
+        action: () =>
+          changePingIconsEnabledMutation.mutateAsync({ id: user.id, pingIconsEnabled: parsed.data.pingIconsEnabled }),
       },
     ];
 

From c33b09c5d434edba9a7b6d6527921d4ba4037ae9 Mon Sep 17 00:00:00 2001
From: Thomas Camlong <thomas@ajnart.fr>
Date: Mon, 18 May 2026 17:25:35 +0200
Subject: [PATCH 07/11] fix(users): fix mobile layout and add missing
 ddgBangsEnabled field to general settings form

- Make avatar responsive on mobile (120px) vs desktop (200px) and center on mobile
- Add missing ddgBangsEnabled field to form schema, initial values, mutation, and UI
- Fix async function naming to satisfy lint rule
---
 .../general/_components/_general-settings-form.tsx  | 13 ++++++++++---
 .../general/_components/_profile-avatar-form.tsx    |  7 ++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx
index b142ceeb9..6d66d5abf 100644
--- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx
@@ -48,6 +48,7 @@ const userGeneralSettingsSchema = z.object({
   mobileHomeBoardId: userChangeHomeBoardsSchema.shape.mobileHomeBoardId,
   defaultSearchEngineId: userChangeSearchPreferencesSchema.shape.defaultSearchEngineId,
   openInNewTab: userChangeSearchPreferencesSchema.shape.openInNewTab,
+  ddgBangsEnabled: userChangeSearchPreferencesSchema.shape.ddgBangsEnabled,
   firstDayOfWeek: userFirstDayOfWeekSchema.shape.firstDayOfWeek,
   pingIconsEnabled: userPingIconsEnabledSchema.shape.pingIconsEnabled,
 });
@@ -74,6 +75,7 @@ const buildInitialValues = (user: RouterOutputs["user"]["getById"]): FormValues
   mobileHomeBoardId: user.mobileHomeBoardId,
   defaultSearchEngineId: user.defaultSearchEngineId,
   openInNewTab: user.openSearchInNewTab,
+  ddgBangsEnabled: user.ddgBangs,
   firstDayOfWeek: user.firstDayOfWeek as DayOfWeek,
   pingIconsEnabled: user.pingIconsEnabled,
 });
@@ -124,7 +126,7 @@ export const UserGeneralSettingsForm = ({
     return () => window.removeEventListener("beforeunload", handler);
   }, []);
 
-  const handleSubmit = async (values: FormValues) => {
+  const handleSubmitAsync = async (values: FormValues) => {
     const parsed = userGeneralSettingsSchema.safeParse(values);
     if (!parsed.success) return;
 
@@ -148,12 +150,13 @@ export const UserGeneralSettingsForm = ({
           }),
       },
       {
-        when: changed("defaultSearchEngineId", "openInNewTab"),
+        when: changed("defaultSearchEngineId", "openInNewTab", "ddgBangsEnabled"),
         action: () =>
           changeSearchPreferencesMutation.mutateAsync({
             userId: user.id,
             defaultSearchEngineId: parsed.data.defaultSearchEngineId,
             openInNewTab: parsed.data.openInNewTab,
+            ddgBangsEnabled: parsed.data.ddgBangsEnabled,
           }),
       },
       {
@@ -196,7 +199,7 @@ export const UserGeneralSettingsForm = ({
   };
 
   return (
-    <form onSubmit={form.onSubmit(handleSubmit)}>
+    <form onSubmit={form.onSubmit(handleSubmitAsync)}>
       <Stack gap="lg">
         <SimpleGrid cols={{ base: 1, md: 2 }} spacing="lg" verticalSpacing="lg">
           <Card withBorder bg="transparent">
@@ -263,6 +266,10 @@ export const UserGeneralSettingsForm = ({
                 label={t("user.field.openSearchInNewTab.label")}
                 {...form.getInputProps("openInNewTab", { type: "checkbox" })}
               />
+              <Switch
+                label={t("user.field.ddgBangs.label")}
+                {...form.getInputProps("ddgBangsEnabled", { type: "checkbox" })}
+              />
             </Stack>
           </Card>
 
diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_profile-avatar-form.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_profile-avatar-form.tsx
index e4ee64583..58ff5ff6d 100644
--- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_profile-avatar-form.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_profile-avatar-form.tsx
@@ -2,7 +2,7 @@
 
 import { useCallback } from "react";
 import { Box, Button, FileButton, Menu, UnstyledButton } from "@mantine/core";
-import { useDisclosure } from "@mantine/hooks";
+import { useDisclosure, useMediaQuery } from "@mantine/hooks";
 import { IconPencil, IconPhotoEdit, IconPhotoX } from "@tabler/icons-react";
 
 import type { RouterOutputs } from "@homarr/api";
@@ -25,6 +25,7 @@ export const UserProfileAvatarForm = ({ user }: UserProfileAvatarForm) => {
     },
   });
   const [opened, { toggle }] = useDisclosure(false);
+  const isMobile = useMediaQuery("(max-width: 48em)");
   const { openConfirmModal } = useConfirmModal();
   const t = useI18n();
   const tManageAvatar = useScopedI18n("user.action.manageAvatar");
@@ -94,11 +95,11 @@ export const UserProfileAvatarForm = ({ user }: UserProfileAvatarForm) => {
   }, [mutate, user.id, openConfirmModal, tManageAvatar]);
 
   return (
-    <Box pos="relative">
+    <Box pos="relative" display="flex" style={{ justifyContent: isMobile ? "center" : undefined }}>
       <Menu opened={opened} keepMounted onChange={toggle} position="bottom-start" withArrow>
         <Menu.Target>
           <UnstyledButton onClick={toggle}>
-            <UserAvatar user={user} size={200} />
+            <UserAvatar user={user} size={isMobile ? 120 : 200} />
             <Button
               component="div"
               pos="absolute"

From 737e2f8c42f5c4f8f3c0ac1b8ba6c32fe6350c9f Mon Sep 17 00:00:00 2001
From: Thomas Camlong <thomas@ajnart.fr>
Date: Thu, 28 May 2026 11:09:52 +0200
Subject: [PATCH 08/11] chore(users): remove unused general settings form
 components

These were superseded by UserGeneralSettingsForm in the preferences rework.
---
 .../_components/_change-home-board.tsx        | 85 -----------------
 .../_change-search-preferences.tsx            | 84 -----------------
 .../_components/_first-day-of-week.tsx        | 83 ----------------
 .../_components/_ping-icons-enabled.tsx       | 69 --------------
 .../general/_components/_profile-form.tsx     | 94 -------------------
 5 files changed, 415 deletions(-)
 delete mode 100644 apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-home-board.tsx
 delete mode 100644 apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-search-preferences.tsx
 delete mode 100644 apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_first-day-of-week.tsx
 delete mode 100644 apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_ping-icons-enabled.tsx
 delete mode 100644 apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_profile-form.tsx

diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-home-board.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-home-board.tsx
deleted file mode 100644
index bdad9cfea..000000000
--- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-home-board.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-"use client";
-
-import { Button, Group, Stack } from "@mantine/core";
-import type { z } from "zod/v4";
-
-import type { RouterOutputs } from "@homarr/api";
-import { clientApi } from "@homarr/api/client";
-import { revalidatePathActionAsync } from "@homarr/common/client";
-import { useZodForm } from "@homarr/form";
-import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
-import { useI18n } from "@homarr/translation/client";
-import { userChangeHomeBoardsSchema } from "@homarr/validation/user";
-
-import type { Board } from "~/app/[locale]/boards/_types";
-import { BoardSelect } from "~/components/board/board-select";
-
-interface ChangeHomeBoardFormProps {
-  user: RouterOutputs["user"]["getById"];
-  boardsData: Pick<Board, "id" | "name" | "logoImageUrl">[];
-}
-
-export const ChangeHomeBoardForm = ({ user, boardsData }: ChangeHomeBoardFormProps) => {
-  const t = useI18n();
-  const { mutate, isPending } = clientApi.user.changeHomeBoards.useMutation({
-    async onSettled() {
-      await revalidatePathActionAsync(`/manage/users/${user.id}`);
-    },
-    onSuccess(_, variables) {
-      form.setInitialValues({
-        homeBoardId: variables.homeBoardId,
-        mobileHomeBoardId: variables.mobileHomeBoardId,
-      });
-      showSuccessNotification({
-        message: t("user.action.changeHomeBoard.notification.success.message"),
-      });
-    },
-    onError() {
-      showErrorNotification({
-        message: t("user.action.changeHomeBoard.notification.error.message"),
-      });
-    },
-  });
-  const form = useZodForm(userChangeHomeBoardsSchema, {
-    initialValues: {
-      homeBoardId: user.homeBoardId,
-      mobileHomeBoardId: user.mobileHomeBoardId,
-    },
-  });
-
-  const handleSubmit = (values: FormType) => {
-    mutate({
-      userId: user.id,
-      ...values,
-    });
-  };
-
-  return (
-    <form onSubmit={form.onSubmit(handleSubmit)}>
-      <Stack gap="md">
-        <BoardSelect
-          label={t("management.page.user.setting.general.item.board.type.general")}
-          clearable
-          boards={boardsData}
-          w="100%"
-          {...form.getInputProps("homeBoardId")}
-        />
-        <BoardSelect
-          label={t("management.page.user.setting.general.item.board.type.mobile")}
-          clearable
-          boards={boardsData}
-          w="100%"
-          {...form.getInputProps("mobileHomeBoardId")}
-        />
-
-        <Group justify="end">
-          <Button type="submit" loading={isPending}>
-            {t("common.action.save")}
-          </Button>
-        </Group>
-      </Stack>
-    </form>
-  );
-};
-
-type FormType = z.infer<typeof userChangeHomeBoardsSchema>;
diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-search-preferences.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-search-preferences.tsx
deleted file mode 100644
index afae60dc1..000000000
--- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-search-preferences.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-"use client";
-
-import { Button, Group, Select, Stack, Switch } from "@mantine/core";
-import type { z } from "zod/v4";
-
-import type { RouterOutputs } from "@homarr/api";
-import { clientApi } from "@homarr/api/client";
-import { revalidatePathActionAsync } from "@homarr/common/client";
-import { useZodForm } from "@homarr/form";
-import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
-import { useI18n } from "@homarr/translation/client";
-import { userChangeSearchPreferencesSchema } from "@homarr/validation/user";
-
-interface ChangeSearchPreferencesFormProps {
-  user: RouterOutputs["user"]["getById"];
-  searchEnginesData: { value: string; label: string }[];
-}
-
-export const ChangeSearchPreferencesForm = ({ user, searchEnginesData }: ChangeSearchPreferencesFormProps) => {
-  const t = useI18n();
-  const { mutate, isPending } = clientApi.user.changeSearchPreferences.useMutation({
-    async onSettled() {
-      await revalidatePathActionAsync(`/manage/users/${user.id}`);
-    },
-    onSuccess(_, variables) {
-      form.setInitialValues({
-        defaultSearchEngineId: variables.defaultSearchEngineId,
-        openInNewTab: variables.openInNewTab,
-        ddgBangsEnabled: variables.ddgBangsEnabled,
-      });
-      showSuccessNotification({
-        message: t("user.action.changeSearchPreferences.notification.success.message"),
-      });
-    },
-    onError() {
-      showErrorNotification({
-        message: t("user.action.changeSearchPreferences.notification.error.message"),
-      });
-    },
-  });
-  const form = useZodForm(userChangeSearchPreferencesSchema, {
-    initialValues: {
-      defaultSearchEngineId: user.defaultSearchEngineId,
-      openInNewTab: user.openSearchInNewTab,
-      ddgBangsEnabled: user.ddgBangs,
-    },
-  });
-
-  const handleSubmit = (values: FormType) => {
-    mutate({
-      userId: user.id,
-      ...values,
-    });
-  };
-
-  return (
-    <form onSubmit={form.onSubmit(handleSubmit)}>
-      <Stack gap="md">
-        <Select
-          label={t("user.field.defaultSearchEngine.label")}
-          w="100%"
-          data={searchEnginesData}
-          {...form.getInputProps("defaultSearchEngineId")}
-        />
-        <Switch
-          label={t("user.field.openSearchInNewTab.label")}
-          {...form.getInputProps("openInNewTab", { type: "checkbox" })}
-        />
-        <Switch
-          label={t("user.field.ddgBangs.label")}
-          {...form.getInputProps("ddgBangsEnabled", { type: "checkbox" })}
-        />
-
-        <Group justify="end">
-          <Button type="submit" loading={isPending}>
-            {t("common.action.save")}
-          </Button>
-        </Group>
-      </Stack>
-    </form>
-  );
-};
-
-type FormType = z.infer<typeof userChangeSearchPreferencesSchema>;
diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_first-day-of-week.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_first-day-of-week.tsx
deleted file mode 100644
index 71bef0737..000000000
--- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_first-day-of-week.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-"use client";
-
-import { Button, Group, Radio, Stack } from "@mantine/core";
-import type { DayOfWeek } from "@mantine/dates";
-import dayjs from "dayjs";
-import localeData from "dayjs/plugin/localeData";
-import type { z } from "zod/v4";
-
-import type { RouterOutputs } from "@homarr/api";
-import { clientApi } from "@homarr/api/client";
-import { revalidatePathActionAsync } from "@homarr/common/client";
-import { useZodForm } from "@homarr/form";
-import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
-import { useI18n } from "@homarr/translation/client";
-import { userFirstDayOfWeekSchema } from "@homarr/validation/user";
-
-dayjs.extend(localeData);
-
-interface FirstDayOfWeekProps {
-  user: RouterOutputs["user"]["getById"];
-}
-
-const weekDays = dayjs.weekdays(false);
-
-export const FirstDayOfWeek = ({ user }: FirstDayOfWeekProps) => {
-  const t = useI18n();
-  const { mutate, isPending } = clientApi.user.changeFirstDayOfWeek.useMutation({
-    async onSettled() {
-      await revalidatePathActionAsync(`/manage/users/${user.id}`);
-    },
-    onSuccess(_, variables) {
-      form.setInitialValues({
-        firstDayOfWeek: variables.firstDayOfWeek as DayOfWeek,
-      });
-      showSuccessNotification({
-        message: t("user.action.changeFirstDayOfWeek.notification.success.message"),
-      });
-    },
-    onError() {
-      showErrorNotification({
-        message: t("user.action.changeFirstDayOfWeek.notification.error.message"),
-      });
-    },
-  });
-  const form = useZodForm(userFirstDayOfWeekSchema, {
-    initialValues: {
-      firstDayOfWeek: user.firstDayOfWeek as DayOfWeek,
-    },
-  });
-
-  const handleSubmit = (values: FormType) => {
-    mutate({
-      id: user.id,
-      ...values,
-    });
-  };
-
-  const inputProps = form.getInputProps("firstDayOfWeek");
-  const onChange = inputProps.onChange as (value: number) => void;
-  const value = (inputProps.value as number).toString();
-
-  return (
-    <form onSubmit={form.onSubmit(handleSubmit)}>
-      <Stack gap="md">
-        <Radio.Group {...inputProps} value={value} onChange={(value) => onChange(parseInt(value))}>
-          <Group mt="xs">
-            <Radio value="1" label={weekDays[1]} />
-            <Radio value="6" label={weekDays[6]} />
-            <Radio value="0" label={weekDays[0]} />
-          </Group>
-        </Radio.Group>
-
-        <Group justify="end">
-          <Button type="submit" loading={isPending}>
-            {t("common.action.save")}
-          </Button>
-        </Group>
-      </Stack>
-    </form>
-  );
-};
-
-type FormType = z.infer<typeof userFirstDayOfWeekSchema>;
diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_ping-icons-enabled.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_ping-icons-enabled.tsx
deleted file mode 100644
index d218ac39a..000000000
--- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_ping-icons-enabled.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-"use client";
-
-import { Button, Group, Stack, Switch } from "@mantine/core";
-import type { z } from "zod/v4";
-
-import type { RouterOutputs } from "@homarr/api";
-import { clientApi } from "@homarr/api/client";
-import { revalidatePathActionAsync } from "@homarr/common/client";
-import { useZodForm } from "@homarr/form";
-import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
-import { useI18n } from "@homarr/translation/client";
-import { userPingIconsEnabledSchema } from "@homarr/validation/user";
-
-interface PingIconsEnabledProps {
-  user: RouterOutputs["user"]["getById"];
-}
-
-export const PingIconsEnabled = ({ user }: PingIconsEnabledProps) => {
-  const t = useI18n();
-  const { mutate, isPending } = clientApi.user.changePingIconsEnabled.useMutation({
-    async onSettled() {
-      await revalidatePathActionAsync(`/manage/users/${user.id}`);
-    },
-    onSuccess(_, variables) {
-      form.setInitialValues({
-        pingIconsEnabled: variables.pingIconsEnabled,
-      });
-      showSuccessNotification({
-        message: t("user.action.changePingIconsEnabled.notification.success.message"),
-      });
-    },
-    onError() {
-      showErrorNotification({
-        message: t("user.action.changePingIconsEnabled.notification.error.message"),
-      });
-    },
-  });
-  const form = useZodForm(userPingIconsEnabledSchema, {
-    initialValues: {
-      pingIconsEnabled: user.pingIconsEnabled,
-    },
-  });
-
-  const handleSubmit = (values: FormType) => {
-    mutate({
-      id: user.id,
-      ...values,
-    });
-  };
-
-  return (
-    <form onSubmit={form.onSubmit(handleSubmit)}>
-      <Stack gap="md">
-        <Switch
-          {...form.getInputProps("pingIconsEnabled", { type: "checkbox" })}
-          label={t("user.field.pingIconsEnabled.label")}
-        />
-
-        <Group justify="end">
-          <Button type="submit" loading={isPending}>
-            {t("common.action.save")}
-          </Button>
-        </Group>
-      </Stack>
-    </form>
-  );
-};
-
-type FormType = z.infer<typeof userPingIconsEnabledSchema>;
diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_profile-form.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_profile-form.tsx
deleted file mode 100644
index 2db358cae..000000000
--- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_profile-form.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-"use client";
-
-import { useCallback } from "react";
-import { Button, Group, Stack, TextInput } from "@mantine/core";
-
-import type { RouterInputs, RouterOutputs } from "@homarr/api";
-import { clientApi } from "@homarr/api/client";
-import { revalidatePathActionAsync } from "@homarr/common/client";
-import { useZodForm } from "@homarr/form";
-import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
-import { useI18n } from "@homarr/translation/client";
-import { userEditProfileSchema } from "@homarr/validation/user";
-
-interface UserProfileFormProps {
-  user: RouterOutputs["user"]["getById"];
-}
-
-export const UserProfileForm = ({ user }: UserProfileFormProps) => {
-  const t = useI18n();
-  const { mutate, isPending } = clientApi.user.editProfile.useMutation({
-    async onSettled() {
-      await revalidatePathActionAsync("/manage/users");
-    },
-    onSuccess(_, variables) {
-      // Reset form initial values to reset dirty state
-      form.setInitialValues({
-        name: variables.name,
-        email: variables.email ?? "",
-      });
-      showSuccessNotification({
-        title: t("common.notification.update.success"),
-        message: t("user.action.editProfile.notification.success.message"),
-      });
-    },
-    onError(error) {
-      const message =
-        error.data?.code === "CONFLICT"
-          ? t("user.error.usernameTaken")
-          : t("user.action.editProfile.notification.error.message");
-      showErrorNotification({
-        title: t("common.notification.update.error"),
-        message,
-      });
-    },
-  });
-  const form = useZodForm(userEditProfileSchema.omit({ id: true }), {
-    initialValues: {
-      name: user.name ?? "",
-      email: user.email ?? "",
-    },
-  });
-
-  // Only credentials users can edit their profile
-  const isProviderCredentials = user.provider === "credentials";
-
-  const handleSubmit = useCallback(
-    (values: FormType) => {
-      if (!isProviderCredentials) return;
-      mutate({
-        ...values,
-        id: user.id,
-      });
-    },
-    [isProviderCredentials, mutate, user.id],
-  );
-
-  return (
-    <form onSubmit={form.onSubmit(handleSubmit)}>
-      <Stack>
-        <TextInput
-          disabled={!isProviderCredentials}
-          label={t("user.field.username.label")}
-          withAsterisk
-          {...form.getInputProps("name")}
-        />
-        <TextInput
-          disabled={!isProviderCredentials}
-          label={t("user.field.email.label")}
-          {...form.getInputProps("email")}
-        />
-
-        {isProviderCredentials && (
-          <Group justify="end">
-            <Button type="submit" disabled={!form.isDirty()} loading={isPending}>
-              {t("common.action.saveChanges")}
-            </Button>
-          </Group>
-        )}
-      </Stack>
-    </form>
-  );
-};
-
-type FormType = Omit<RouterInputs["user"]["editProfile"], "id">;

From d01834d97518fbbab9ee33bb8cb6f4c629ef5d4b Mon Sep 17 00:00:00 2001
From: "homarr-crowdin[bot]"
 <190541745+homarr-crowdin[bot]@users.noreply.github.com>
Date: Fri, 29 May 2026 10:07:48 +0200
Subject: [PATCH 09/11] chore(lang): updated translations from crowdin (#5814)

---
 packages/translation/src/lang/ca.json    | 13 +++++++++++--
 packages/translation/src/lang/cn.json    | 13 +++++++++++--
 packages/translation/src/lang/cr.json    | 13 +++++++++++--
 packages/translation/src/lang/cs.json    | 13 +++++++++++--
 packages/translation/src/lang/da.json    | 13 +++++++++++--
 packages/translation/src/lang/de-CH.json | 13 +++++++++++--
 packages/translation/src/lang/de.json    | 13 +++++++++++--
 packages/translation/src/lang/el.json    | 13 +++++++++++--
 packages/translation/src/lang/en-gb.json | 13 +++++++++++--
 packages/translation/src/lang/es.json    | 13 +++++++++++--
 packages/translation/src/lang/et.json    | 13 +++++++++++--
 packages/translation/src/lang/fr.json    | 13 +++++++++++--
 packages/translation/src/lang/he.json    | 13 +++++++++++--
 packages/translation/src/lang/hr.json    | 13 +++++++++++--
 packages/translation/src/lang/hu.json    | 13 +++++++++++--
 packages/translation/src/lang/it.json    | 13 +++++++++++--
 packages/translation/src/lang/ja.json    | 13 +++++++++++--
 packages/translation/src/lang/ko.json    | 13 +++++++++++--
 packages/translation/src/lang/lt.json    | 13 +++++++++++--
 packages/translation/src/lang/lv.json    | 13 +++++++++++--
 packages/translation/src/lang/nl.json    | 13 +++++++++++--
 packages/translation/src/lang/no.json    | 13 +++++++++++--
 packages/translation/src/lang/pl.json    | 13 +++++++++++--
 packages/translation/src/lang/pt-br.json | 13 +++++++++++--
 packages/translation/src/lang/pt.json    | 13 +++++++++++--
 packages/translation/src/lang/ro.json    | 13 +++++++++++--
 packages/translation/src/lang/ru.json    | 13 +++++++++++--
 packages/translation/src/lang/sk.json    | 13 +++++++++++--
 packages/translation/src/lang/sl.json    | 13 +++++++++++--
 packages/translation/src/lang/sv.json    | 13 +++++++++++--
 packages/translation/src/lang/tr.json    | 13 +++++++++++--
 packages/translation/src/lang/uk.json    | 13 +++++++++++--
 packages/translation/src/lang/vi.json    | 13 +++++++++++--
 packages/translation/src/lang/zh.json    | 13 +++++++++++--
 34 files changed, 374 insertions(+), 68 deletions(-)

diff --git a/packages/translation/src/lang/ca.json b/packages/translation/src/lang/ca.json
index 6cbd7acf6..3e5c14996 100644
--- a/packages/translation/src/lang/ca.json
+++ b/packages/translation/src/lang/ca.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": ""
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "",
       "checkLogs": "",
       "tryAgain": "",
-      "loading": ""
+      "loading": "",
+      "show": "",
+      "hide": ""
     },
     "here": "",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "",
-          "changePosition": ""
+          "changePosition": "",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "",
           "private": ""
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/cn.json b/packages/translation/src/lang/cn.json
index 3a10e9210..05caccbe2 100644
--- a/packages/translation/src/lang/cn.json
+++ b/packages/translation/src/lang/cn.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "打开媒体"
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "查阅文档",
       "checkLogs": "检查日志获取更多详情",
       "tryAgain": "重试",
-      "loading": "正在加载"
+      "loading": "正在加载",
+      "show": "",
+      "hide": ""
     },
     "here": "这里",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "新建分类",
-          "changePosition": "换位"
+          "changePosition": "换位",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "此面板是公开的",
           "private": "此面板是私有的"
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/cr.json b/packages/translation/src/lang/cr.json
index 27a4588a8..ab1fec215 100644
--- a/packages/translation/src/lang/cr.json
+++ b/packages/translation/src/lang/cr.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "crwdns2680:0crwdne2680:0"
       }
+    },
+    "noResults": {
+      "title": "crwdns4251:0crwdne4251:0"
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "crwdns546:0crwdne546:0",
       "checkLogs": "crwdns2260:0crwdne2260:0",
       "tryAgain": "crwdns548:0crwdne548:0",
-      "loading": "crwdns550:0crwdne550:0"
+      "loading": "crwdns550:0crwdne550:0",
+      "show": "crwdns4255:0crwdne4255:0",
+      "hide": "crwdns4257:0crwdne4257:0"
     },
     "here": "crwdns552:0crwdne552:0",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "crwdns686:0crwdne686:0",
-          "changePosition": "crwdns688:0crwdne688:0"
+          "changePosition": "crwdns688:0crwdne688:0",
+          "settings": "crwdns4259:0crwdne4259:0"
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "crwdns1656:0crwdne1656:0",
           "private": "crwdns1658:0crwdne1658:0"
         },
+        "noResults": {
+          "title": "crwdns4253:0crwdne4253:0"
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/cs.json b/packages/translation/src/lang/cs.json
index 46d284ee5..73bd6774f 100644
--- a/packages/translation/src/lang/cs.json
+++ b/packages/translation/src/lang/cs.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": ""
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "Přečtěte si dokumentaci",
       "checkLogs": "Pro více podrobností zkontrolujte logy",
       "tryAgain": "Zkusit znovu",
-      "loading": "Načítání"
+      "loading": "Načítání",
+      "show": "",
+      "hide": ""
     },
     "here": "zde",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "Nová kategorie",
-          "changePosition": "Změnit pozici"
+          "changePosition": "Změnit pozici",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "",
           "private": ""
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/da.json b/packages/translation/src/lang/da.json
index 09d071783..25088e56d 100644
--- a/packages/translation/src/lang/da.json
+++ b/packages/translation/src/lang/da.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "Åben medie"
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "Tjek dokumentationen",
       "checkLogs": "Tjek logs for flere detaljer",
       "tryAgain": "Prøv igen",
-      "loading": "Indlæser"
+      "loading": "Indlæser",
+      "show": "",
+      "hide": ""
     },
     "here": "her",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "Ny kategori",
-          "changePosition": "Ændre placering"
+          "changePosition": "Ændre placering",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "Denne tavle er offentlig",
           "private": "Denne tavle er privat"
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/de-CH.json b/packages/translation/src/lang/de-CH.json
index 024e95740..240cc8a8d 100644
--- a/packages/translation/src/lang/de-CH.json
+++ b/packages/translation/src/lang/de-CH.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "Medium öffnen"
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "Die Dokumentation ansehen",
       "checkLogs": "Logs für weitere Details prüfen",
       "tryAgain": "Erneut versuchen",
-      "loading": "Wird geladen"
+      "loading": "Wird geladen",
+      "show": "",
+      "hide": ""
     },
     "here": "Hier",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "Neue Kategorie",
-          "changePosition": "Position wechseln"
+          "changePosition": "Position wechseln",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "Dieses Board ist öffentlich",
           "private": "Dieses Board ist privat"
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/de.json b/packages/translation/src/lang/de.json
index db0479ba6..1ac3c8dcb 100644
--- a/packages/translation/src/lang/de.json
+++ b/packages/translation/src/lang/de.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "Medium öffnen"
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "Die Dokumentation ansehen",
       "checkLogs": "Logs für weitere Details prüfen",
       "tryAgain": "Erneut versuchen",
-      "loading": "Wird geladen"
+      "loading": "Wird geladen",
+      "show": "",
+      "hide": ""
     },
     "here": "Hier",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "Neue Kategorie",
-          "changePosition": "Position wechseln"
+          "changePosition": "Position wechseln",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "Dieses Board ist öffentlich",
           "private": "Dieses Board ist privat"
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/el.json b/packages/translation/src/lang/el.json
index 9c9b49876..2e86228dd 100644
--- a/packages/translation/src/lang/el.json
+++ b/packages/translation/src/lang/el.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": ""
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "",
       "checkLogs": "",
       "tryAgain": "Προσπαθήστε ξανά",
-      "loading": ""
+      "loading": "",
+      "show": "",
+      "hide": ""
     },
     "here": "",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "",
-          "changePosition": "Αλλαγή θέσης"
+          "changePosition": "Αλλαγή θέσης",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "",
           "private": ""
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/en-gb.json b/packages/translation/src/lang/en-gb.json
index ae6870d90..04bc5a03c 100644
--- a/packages/translation/src/lang/en-gb.json
+++ b/packages/translation/src/lang/en-gb.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "Open media"
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "Check the documentation",
       "checkLogs": "Check logs for more information",
       "tryAgain": "Try again",
-      "loading": "Loading"
+      "loading": "Loading",
+      "show": "",
+      "hide": ""
     },
     "here": "here",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "New category",
-          "changePosition": "Change position"
+          "changePosition": "Change position",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "",
           "private": ""
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/es.json b/packages/translation/src/lang/es.json
index cbbb17abd..148c022dd 100644
--- a/packages/translation/src/lang/es.json
+++ b/packages/translation/src/lang/es.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "Abrir imagen"
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "Consultar la documentación",
       "checkLogs": "Comprueba los registros para más detalles",
       "tryAgain": "Intentar de nuevo",
-      "loading": "Cargando"
+      "loading": "Cargando",
+      "show": "",
+      "hide": ""
     },
     "here": "aquí",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "Nueva Categoría",
-          "changePosition": "Cambiar posición"
+          "changePosition": "Cambiar posición",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "Este tablero es público",
           "private": "Este tablero es privado"
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/et.json b/packages/translation/src/lang/et.json
index d48280e5c..c5e54f495 100644
--- a/packages/translation/src/lang/et.json
+++ b/packages/translation/src/lang/et.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": ""
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "",
       "checkLogs": "",
       "tryAgain": "",
-      "loading": ""
+      "loading": "",
+      "show": "",
+      "hide": ""
     },
     "here": "",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "",
-          "changePosition": ""
+          "changePosition": "",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "",
           "private": ""
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/fr.json b/packages/translation/src/lang/fr.json
index a28b4718b..2f173a25c 100644
--- a/packages/translation/src/lang/fr.json
+++ b/packages/translation/src/lang/fr.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "Ouvrir le média"
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "Voir la documentation",
       "checkLogs": "Vérifiez les logs pour plus de détails",
       "tryAgain": "Réessayer",
-      "loading": "Chargement"
+      "loading": "Chargement",
+      "show": "",
+      "hide": ""
     },
     "here": "ici",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "Nouvelle catégorie",
-          "changePosition": "Modifier la position"
+          "changePosition": "Modifier la position",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "Ce tableau est public",
           "private": "Ce tableau est privé"
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/he.json b/packages/translation/src/lang/he.json
index b23563ce9..86c2e8ee3 100644
--- a/packages/translation/src/lang/he.json
+++ b/packages/translation/src/lang/he.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "פתיחת מדיה"
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "בדוק את התיעוד",
       "checkLogs": "בדוק לוגים לפרטים נוספים",
       "tryAgain": "נא לנסות שוב",
-      "loading": "טוען"
+      "loading": "טוען",
+      "show": "",
+      "hide": ""
     },
     "here": "כאן",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "קטגוריה חדשה",
-          "changePosition": "שנה מיקום"
+          "changePosition": "שנה מיקום",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "הלוח הזה ציבורי",
           "private": "הלוח הזה פרטי"
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/hr.json b/packages/translation/src/lang/hr.json
index 9558b4bfa..dd637c9a6 100644
--- a/packages/translation/src/lang/hr.json
+++ b/packages/translation/src/lang/hr.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": ""
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "",
       "checkLogs": "",
       "tryAgain": "Pokušaj ponovno",
-      "loading": ""
+      "loading": "",
+      "show": "",
+      "hide": ""
     },
     "here": "",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "",
-          "changePosition": "Promijenjen položaj"
+          "changePosition": "Promijenjen položaj",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "",
           "private": ""
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/hu.json b/packages/translation/src/lang/hu.json
index 44f4a8575..1bad936e8 100644
--- a/packages/translation/src/lang/hu.json
+++ b/packages/translation/src/lang/hu.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "Média megnyitása"
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "Tekintse meg a dokumentációt",
       "checkLogs": "További részletekért ellenőrizze a naplókat",
       "tryAgain": "Próbálja újra",
-      "loading": "Töltés"
+      "loading": "Töltés",
+      "show": "",
+      "hide": ""
     },
     "here": "itt",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "Új kategória",
-          "changePosition": "Pozíció módosítása"
+          "changePosition": "Pozíció módosítása",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "",
           "private": ""
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/it.json b/packages/translation/src/lang/it.json
index 60720ad7c..7a2202367 100644
--- a/packages/translation/src/lang/it.json
+++ b/packages/translation/src/lang/it.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "Apri media"
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "Consulta la documentazione",
       "checkLogs": "Controlla i log per maggiori dettagli",
       "tryAgain": "Riprova",
-      "loading": "Caricamento"
+      "loading": "Caricamento",
+      "show": "",
+      "hide": ""
     },
     "here": "qui",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "Nuova categoria",
-          "changePosition": "Cambia posizione"
+          "changePosition": "Cambia posizione",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "Questa board è pubblica",
           "private": "Questa board è privata"
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/ja.json b/packages/translation/src/lang/ja.json
index 752a3a529..aacb952c6 100644
--- a/packages/translation/src/lang/ja.json
+++ b/packages/translation/src/lang/ja.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "メディアを開く"
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "ドキュメントを確認する",
       "checkLogs": "詳細はログを確認してください",
       "tryAgain": "リトライ",
-      "loading": "読み込み中"
+      "loading": "読み込み中",
+      "show": "",
+      "hide": ""
     },
     "here": "こちら",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "新しいカテゴリー",
-          "changePosition": "ポジションを変更する"
+          "changePosition": "ポジションを変更する",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "このボードは公開中です",
           "private": "このボードは非公開です"
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/ko.json b/packages/translation/src/lang/ko.json
index 868611bd4..6a8639ffd 100644
--- a/packages/translation/src/lang/ko.json
+++ b/packages/translation/src/lang/ko.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": ""
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "",
       "checkLogs": "",
       "tryAgain": "다시 시도",
-      "loading": ""
+      "loading": "",
+      "show": "",
+      "hide": ""
     },
     "here": "",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "",
-          "changePosition": "위치 변경"
+          "changePosition": "위치 변경",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "",
           "private": ""
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/lt.json b/packages/translation/src/lang/lt.json
index 5b165bb86..6811b62e5 100644
--- a/packages/translation/src/lang/lt.json
+++ b/packages/translation/src/lang/lt.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": ""
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "",
       "checkLogs": "",
       "tryAgain": "",
-      "loading": ""
+      "loading": "",
+      "show": "",
+      "hide": ""
     },
     "here": "",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "",
-          "changePosition": ""
+          "changePosition": "",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "",
           "private": ""
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/lv.json b/packages/translation/src/lang/lv.json
index 762f7bff7..e3afee8da 100644
--- a/packages/translation/src/lang/lv.json
+++ b/packages/translation/src/lang/lv.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": ""
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "",
       "checkLogs": "",
       "tryAgain": "Mēģiniet vēlreiz",
-      "loading": ""
+      "loading": "",
+      "show": "",
+      "hide": ""
     },
     "here": "",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "",
-          "changePosition": "Mainīt pozīciju"
+          "changePosition": "Mainīt pozīciju",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "",
           "private": ""
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/nl.json b/packages/translation/src/lang/nl.json
index c8fb6c654..bf16ada09 100644
--- a/packages/translation/src/lang/nl.json
+++ b/packages/translation/src/lang/nl.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "Media openen"
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "De documentatie bekijken",
       "checkLogs": "Controleer logs voor meer details",
       "tryAgain": "Probeer opnieuw",
-      "loading": "Laden"
+      "loading": "Laden",
+      "show": "",
+      "hide": ""
     },
     "here": "hier",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "Nieuwe categorie",
-          "changePosition": "Positie wijzigen"
+          "changePosition": "Positie wijzigen",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "Dit bord is openbaar",
           "private": "Dit bord is privé"
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/no.json b/packages/translation/src/lang/no.json
index 224f8c0a0..4badb0f64 100644
--- a/packages/translation/src/lang/no.json
+++ b/packages/translation/src/lang/no.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "Åpne medie"
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "Les dokumentasjonen",
       "checkLogs": "Sjekk loggene for mer informasjon",
       "tryAgain": "Prøv igjen",
-      "loading": "Laster"
+      "loading": "Laster",
+      "show": "",
+      "hide": ""
     },
     "here": "her",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "Ny kategori",
-          "changePosition": "Endre posisjon"
+          "changePosition": "Endre posisjon",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "Denne tavlen er offentlig",
           "private": "Denne tavlen er privat"
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/pl.json b/packages/translation/src/lang/pl.json
index c93bb30d8..ead2f3653 100644
--- a/packages/translation/src/lang/pl.json
+++ b/packages/translation/src/lang/pl.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "Otwórz media"
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "Sprawdź dokumentację",
       "checkLogs": "Sprawdź logi, aby uzyskać więcej informacji.",
       "tryAgain": "Spróbuj ponownie",
-      "loading": "Ładowanie"
+      "loading": "Ładowanie",
+      "show": "",
+      "hide": ""
     },
     "here": "tutaj",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "Nowa kategoria",
-          "changePosition": "Zmiana pozycji"
+          "changePosition": "Zmiana pozycji",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "Ta tablica jest publiczna",
           "private": "Ta tablica jest prywatna"
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/pt-br.json b/packages/translation/src/lang/pt-br.json
index d013c5100..a436eac1d 100644
--- a/packages/translation/src/lang/pt-br.json
+++ b/packages/translation/src/lang/pt-br.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "Abrir mídia"
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "Confira a documentação",
       "checkLogs": "Verifique os logs para mais detalhes",
       "tryAgain": "Tente novamente",
-      "loading": "Carregando"
+      "loading": "Carregando",
+      "show": "",
+      "hide": ""
     },
     "here": "aqui",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "Nova categoria",
-          "changePosition": "Mudar de posição"
+          "changePosition": "Mudar de posição",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "Este quadro é publico",
           "private": "Este quadro é privado"
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/pt.json b/packages/translation/src/lang/pt.json
index 4d6cbd7f0..5d749ae0d 100644
--- a/packages/translation/src/lang/pt.json
+++ b/packages/translation/src/lang/pt.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": ""
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "",
       "checkLogs": "",
       "tryAgain": "",
-      "loading": ""
+      "loading": "",
+      "show": "",
+      "hide": ""
     },
     "here": "",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "",
-          "changePosition": ""
+          "changePosition": "",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "",
           "private": ""
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/ro.json b/packages/translation/src/lang/ro.json
index 559f78e58..d4244df64 100644
--- a/packages/translation/src/lang/ro.json
+++ b/packages/translation/src/lang/ro.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": ""
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "",
       "checkLogs": "",
       "tryAgain": "Încearcă din nou",
-      "loading": ""
+      "loading": "",
+      "show": "",
+      "hide": ""
     },
     "here": "",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "",
-          "changePosition": "Schimbă locația"
+          "changePosition": "Schimbă locația",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "",
           "private": ""
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/ru.json b/packages/translation/src/lang/ru.json
index 11d073d13..2be2fdabb 100644
--- a/packages/translation/src/lang/ru.json
+++ b/packages/translation/src/lang/ru.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "Открыть медиа"
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "Посмотреть документацию",
       "checkLogs": "Проверить логи для подробностей",
       "tryAgain": "Попробовать снова",
-      "loading": "Загрузка"
+      "loading": "Загрузка",
+      "show": "",
+      "hide": ""
     },
     "here": "здесь",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "Новая категория",
-          "changePosition": "Изменить позицию"
+          "changePosition": "Изменить позицию",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "Эта панель публичная",
           "private": "Эта панель приватная"
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/sk.json b/packages/translation/src/lang/sk.json
index 576aa56a3..bc5796623 100644
--- a/packages/translation/src/lang/sk.json
+++ b/packages/translation/src/lang/sk.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "Otvoriť médiá"
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "Pozrite si dokumentáciu",
       "checkLogs": "Ďalšie podrobnosti nájdete v protokoloch",
       "tryAgain": "Skúste znova",
-      "loading": "Nahrávam"
+      "loading": "Nahrávam",
+      "show": "",
+      "hide": ""
     },
     "here": "tu",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "Nová kategória",
-          "changePosition": "Zmeniť pozíciu"
+          "changePosition": "Zmeniť pozíciu",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "Táto tabuľa je verejná",
           "private": "Táto tabuľa je súkromná"
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/sl.json b/packages/translation/src/lang/sl.json
index 186e79151..51c078175 100644
--- a/packages/translation/src/lang/sl.json
+++ b/packages/translation/src/lang/sl.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": ""
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "",
       "checkLogs": "",
       "tryAgain": "Poskusite znova",
-      "loading": ""
+      "loading": "",
+      "show": "",
+      "hide": ""
     },
     "here": "",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "",
-          "changePosition": "Spremeni položaj"
+          "changePosition": "Spremeni položaj",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "",
           "private": ""
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/sv.json b/packages/translation/src/lang/sv.json
index 83fb869fb..20301caf2 100644
--- a/packages/translation/src/lang/sv.json
+++ b/packages/translation/src/lang/sv.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": ""
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "",
       "checkLogs": "",
       "tryAgain": "Försök igen",
-      "loading": ""
+      "loading": "",
+      "show": "",
+      "hide": ""
     },
     "here": "",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "",
-          "changePosition": "Ändra position"
+          "changePosition": "Ändra position",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "Den här tavlan är offentlig",
           "private": "Den här tavlan är privat"
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/tr.json b/packages/translation/src/lang/tr.json
index 35e29f18e..8b622b9dd 100644
--- a/packages/translation/src/lang/tr.json
+++ b/packages/translation/src/lang/tr.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "Medyayı aç"
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "Dökümanlara göz at",
       "checkLogs": "Daha fazla ayrıntı için günlükleri kontrol edin",
       "tryAgain": "Tekrar Deneyin",
-      "loading": "Yükleniyor"
+      "loading": "Yükleniyor",
+      "show": "",
+      "hide": ""
     },
     "here": "buraya",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "Yeni Kategori",
-          "changePosition": "Pozisyonu değiştir"
+          "changePosition": "Pozisyonu değiştir",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "Bu panel herkese açıktır",
           "private": "Bu panel özeldir"
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/uk.json b/packages/translation/src/lang/uk.json
index c573c65ba..9d08afe64 100644
--- a/packages/translation/src/lang/uk.json
+++ b/packages/translation/src/lang/uk.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "Відкрити медіа"
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "Переглянути документацію",
       "checkLogs": "Щоб дізнатися більше, перевірте логи",
       "tryAgain": "Повторіть спробу",
-      "loading": "Завантаження"
+      "loading": "Завантаження",
+      "show": "",
+      "hide": ""
     },
     "here": "тут",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "Нова категорія",
-          "changePosition": "Змінити положення"
+          "changePosition": "Змінити положення",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "Ця дошка є публічною",
           "private": "Ця дошка є приватною"
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/vi.json b/packages/translation/src/lang/vi.json
index f8f8823e1..a9466e9c8 100644
--- a/packages/translation/src/lang/vi.json
+++ b/packages/translation/src/lang/vi.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": ""
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "",
       "checkLogs": "",
       "tryAgain": "Thử lại",
-      "loading": ""
+      "loading": "",
+      "show": "",
+      "hide": ""
     },
     "here": "",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "",
-          "changePosition": "Đổi vị trí"
+          "changePosition": "Đổi vị trí",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "",
           "private": ""
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {
diff --git a/packages/translation/src/lang/zh.json b/packages/translation/src/lang/zh.json
index 147db32f0..7d15715a2 100644
--- a/packages/translation/src/lang/zh.json
+++ b/packages/translation/src/lang/zh.json
@@ -1054,6 +1054,9 @@
       "open": {
         "label": "開啟多媒體"
       }
+    },
+    "noResults": {
+      "title": ""
     }
   },
   "common": {
@@ -1084,7 +1087,9 @@
       "checkoutDocs": "查閱說明書",
       "checkLogs": "檢查 Logs 以取得更多詳情",
       "tryAgain": "重試",
-      "loading": "正在讀取"
+      "loading": "正在讀取",
+      "show": "",
+      "hide": ""
     },
     "here": "此處",
     "iconPicker": {
@@ -1249,7 +1254,8 @@
       "menu": {
         "label": {
           "create": "創建分類",
-          "changePosition": "變更位置"
+          "changePosition": "變更位置",
+          "settings": ""
         }
       },
       "openAllInNewTabs": {
@@ -3452,6 +3458,9 @@
           "public": "此面板是公開的",
           "private": "此面板是私人的"
         },
+        "noResults": {
+          "title": ""
+        },
         "modal": {
           "createBoard": {
             "field": {

From be61602576a8bec4bb7e4928d36e0854e926264d Mon Sep 17 00:00:00 2001
From: David <690410+d-lindahl@users.noreply.github.com>
Date: Fri, 29 May 2026 10:51:28 +0200
Subject: [PATCH 10/11] feat(auth): support custom token endpoint auth methods
 (#5806)

---
 packages/auth/env.ts                          | 3 +++
 packages/auth/providers/oidc/oidc-provider.ts | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/packages/auth/env.ts b/packages/auth/env.ts
index 4a41e8594..6fb7048dd 100644
--- a/packages/auth/env.ts
+++ b/packages/auth/env.ts
@@ -40,6 +40,9 @@ export const env = createEnv({
           AUTH_OIDC_NAME_ATTRIBUTE_OVERWRITE: z.string().optional(),
           AUTH_OIDC_FORCE_USERINFO: createBooleanSchema(false),
           AUTH_OIDC_ENABLE_DANGEROUS_ACCOUNT_LINKING: createBooleanSchema(false),
+          AUTH_OIDC_TOKEN_ENDPOINT_AUTH_METHOD: z
+            .enum(["client_secret_basic", "client_secret_post", "client_secret_jwt", "none"])
+            .default("client_secret_basic"),
         }
       : {}),
     ...(authProviders.includes("ldap")
diff --git a/packages/auth/providers/oidc/oidc-provider.ts b/packages/auth/providers/oidc/oidc-provider.ts
index c706d978f..f7f03d443 100644
--- a/packages/auth/providers/oidc/oidc-provider.ts
+++ b/packages/auth/providers/oidc/oidc-provider.ts
@@ -14,6 +14,9 @@ export const OidcProvider = (headers: ReadonlyHeaders | null): OIDCConfig<Profil
   type: "oidc",
   clientId: env.AUTH_OIDC_CLIENT_ID,
   clientSecret: env.AUTH_OIDC_CLIENT_SECRET,
+  client: {
+    token_endpoint_auth_method: env.AUTH_OIDC_TOKEN_ENDPOINT_AUTH_METHOD,
+  },
   issuer: env.AUTH_OIDC_ISSUER,
   allowDangerousEmailAccountLinking: env.AUTH_OIDC_ENABLE_DANGEROUS_ACCOUNT_LINKING,
   authorization: {

From 650f761325903dc0ec958040b6390337644fd7cd Mon Sep 17 00:00:00 2001
From: Meier Lukas <meierschlumpf@gmail.com>
Date: Fri, 29 May 2026 11:07:48 +0200
Subject: [PATCH 11/11] ci(format): fails to apply format due to conflict
 between --write and --check (#5815)

---
 apps/nextjs/package.json                                   | 2 +-
 apps/nextjs/src/app/[locale]/_client-providers/mantine.tsx | 6 +-----
 apps/tasks/package.json                                    | 2 +-
 apps/websocket/package.json                                | 2 +-
 package.json                                               | 4 ++--
 packages/analytics/package.json                            | 2 +-
 packages/api/package.json                                  | 2 +-
 packages/auth/package.json                                 | 2 +-
 packages/boards/package.json                               | 2 +-
 packages/cli/package.json                                  | 2 +-
 packages/common/package.json                               | 2 +-
 packages/core/package.json                                 | 2 +-
 packages/cron-job-status/package.json                      | 2 +-
 packages/cron-jobs-core/package.json                       | 2 +-
 packages/cron-jobs/package.json                            | 2 +-
 packages/db/package.json                                   | 2 +-
 packages/definitions/package.json                          | 2 +-
 packages/docker/package.json                               | 2 +-
 packages/form/package.json                                 | 2 +-
 packages/forms-collection/package.json                     | 2 +-
 packages/icons/package.json                                | 2 +-
 packages/image-proxy/package.json                          | 2 +-
 packages/integrations/package.json                         | 2 +-
 packages/modals-collection/package.json                    | 2 +-
 packages/modals/package.json                               | 2 +-
 packages/notifications/package.json                        | 2 +-
 packages/old-import/package.json                           | 2 +-
 packages/old-schema/package.json                           | 2 +-
 packages/ping/package.json                                 | 2 +-
 packages/redis/package.json                                | 2 +-
 packages/request-handler/package.json                      | 2 +-
 packages/server-settings/package.json                      | 2 +-
 packages/settings/package.json                             | 2 +-
 packages/spotlight/package.json                            | 2 +-
 packages/translation/package.json                          | 2 +-
 packages/ui/package.json                                   | 2 +-
 packages/validation/package.json                           | 2 +-
 packages/widgets/package.json                              | 2 +-
 38 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/apps/nextjs/package.json b/apps/nextjs/package.json
index ff5864f13..b0ed1ea99 100644
--- a/apps/nextjs/package.json
+++ b/apps/nextjs/package.json
@@ -7,7 +7,7 @@
     "build": "pnpm with-env next build",
     "clean": "git clean -xdf .next .turbo node_modules",
     "dev": "pnpm with-env next dev",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "start": "pnpm with-env next start",
     "typecheck": "tsc --noEmit",
diff --git a/apps/nextjs/src/app/[locale]/_client-providers/mantine.tsx b/apps/nextjs/src/app/[locale]/_client-providers/mantine.tsx
index 5176ab945..508074ead 100644
--- a/apps/nextjs/src/app/[locale]/_client-providers/mantine.tsx
+++ b/apps/nextjs/src/app/[locale]/_client-providers/mantine.tsx
@@ -18,11 +18,7 @@ export const CustomMantineProvider = ({
   const manager = useColorSchemeManager();
   return (
     <DirectionProvider>
-      <MantineProvider
-        defaultColorScheme={defaultColorScheme}
-        colorSchemeManager={manager}
-        theme={theme}
-      >
+      <MantineProvider defaultColorScheme={defaultColorScheme} colorSchemeManager={manager} theme={theme}>
         {children}
       </MantineProvider>
     </DirectionProvider>
diff --git a/apps/tasks/package.json b/apps/tasks/package.json
index 13b911e5f..e70a0d101 100644
--- a/apps/tasks/package.json
+++ b/apps/tasks/package.json
@@ -12,7 +12,7 @@
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
     "dev": "pnpm with-env tsx ./src/main.ts",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit",
     "with-env": "dotenv -e ../../.env --"
diff --git a/apps/websocket/package.json b/apps/websocket/package.json
index da277286e..7a5b39488 100644
--- a/apps/websocket/package.json
+++ b/apps/websocket/package.json
@@ -12,7 +12,7 @@
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
     "dev": "pnpm with-env tsx ./src/main.ts",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit",
     "with-env": "dotenv -e ../../.env --"
diff --git a/package.json b/package.json
index 1db82cbe1..c333b5a8d 100644
--- a/package.json
+++ b/package.json
@@ -17,8 +17,8 @@
     "db:studio": "pnpm -F db studio",
     "dev": "pnpm -F nextjs dev",
     "docker:dev": "docker compose -f ./development/development.docker-compose.yml up",
-    "format": "turbo format --continue",
-    "format:fix": "turbo format --continue -- --write",
+    "format": "turbo format --continue -- --check",
+    "format:fix": "turbo format --continue",
     "lint": "turbo lint --continue",
     "lint:fix": "turbo lint --continue -- --fix",
     "lint:ws": "pnpm dlx sherif@latest",
diff --git a/packages/analytics/package.json b/packages/analytics/package.json
index 6eb85decb..ffc0f2f41 100644
--- a/packages/analytics/package.json
+++ b/packages/analytics/package.json
@@ -16,7 +16,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/api/package.json b/packages/api/package.json
index 847279d59..17d5ae476 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -16,7 +16,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 36e2e965c..c83d09307 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -18,7 +18,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/boards/package.json b/packages/boards/package.json
index cc58058a1..b9fd9a40d 100644
--- a/packages/boards/package.json
+++ b/packages/boards/package.json
@@ -18,7 +18,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 6e051c217..20d5426f0 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -17,7 +17,7 @@
   "scripts": {
     "build": "esbuild src/index.ts --bundle --platform=node --outfile=cli.cjs --external:bcrypt --external:cpu-features --loader:.html=text --loader:.node=text",
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "run": "pnpm with-env node cli.cjs",
     "typecheck": "tsc --noEmit",
diff --git a/packages/common/package.json b/packages/common/package.json
index eea53a63a..f6d452cac 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -20,7 +20,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/core/package.json b/packages/core/package.json
index eee0125bf..9c46dd637 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -31,7 +31,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/cron-job-status/package.json b/packages/cron-job-status/package.json
index 10c1ade01..64cbe65d4 100644
--- a/packages/cron-job-status/package.json
+++ b/packages/cron-job-status/package.json
@@ -17,7 +17,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/cron-jobs-core/package.json b/packages/cron-jobs-core/package.json
index 3d573a3ca..426a5e9c0 100644
--- a/packages/cron-jobs-core/package.json
+++ b/packages/cron-jobs-core/package.json
@@ -18,7 +18,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/cron-jobs/package.json b/packages/cron-jobs/package.json
index 500c915a9..9d5abe1e3 100644
--- a/packages/cron-jobs/package.json
+++ b/packages/cron-jobs/package.json
@@ -17,7 +17,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/db/package.json b/packages/db/package.json
index e78b3c185..da1056859 100644
--- a/packages/db/package.json
+++ b/packages/db/package.json
@@ -20,7 +20,7 @@
     "build:postgresql": "esbuild migrations/postgresql/migrate.ts --bundle --platform=node --outfile=migrations/postgresql/migrate.cjs",
     "build:sqlite": "esbuild migrations/sqlite/migrate.ts --bundle --platform=node --outfile=migrations/sqlite/migrate.cjs",
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "migration:custom": "pnpm with-env tsx ./migrations/custom/run-custom.ts",
     "migration:mysql:drop": "pnpm with-env drizzle-kit drop --config ./configs/mysql.config.ts",
diff --git a/packages/definitions/package.json b/packages/definitions/package.json
index 992fd0eca..d20a0874f 100644
--- a/packages/definitions/package.json
+++ b/packages/definitions/package.json
@@ -16,7 +16,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "postinstall": "tsx ./src/docs/codegen.ts",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
diff --git a/packages/docker/package.json b/packages/docker/package.json
index 7c3cf0ff0..a3d5816fd 100644
--- a/packages/docker/package.json
+++ b/packages/docker/package.json
@@ -18,7 +18,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/form/package.json b/packages/form/package.json
index 72f2b2ab8..cffb7ee7e 100644
--- a/packages/form/package.json
+++ b/packages/form/package.json
@@ -17,7 +17,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/forms-collection/package.json b/packages/forms-collection/package.json
index 9641a13c4..5fd4808b0 100644
--- a/packages/forms-collection/package.json
+++ b/packages/forms-collection/package.json
@@ -16,7 +16,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/icons/package.json b/packages/icons/package.json
index 1b6b69949..d4e526e63 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -17,7 +17,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/image-proxy/package.json b/packages/image-proxy/package.json
index 90a23b43b..4017599bb 100644
--- a/packages/image-proxy/package.json
+++ b/packages/image-proxy/package.json
@@ -16,7 +16,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/integrations/package.json b/packages/integrations/package.json
index 29cc46b55..88ea6892a 100644
--- a/packages/integrations/package.json
+++ b/packages/integrations/package.json
@@ -19,7 +19,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/modals-collection/package.json b/packages/modals-collection/package.json
index e3b73b8c3..dbf66ffb6 100644
--- a/packages/modals-collection/package.json
+++ b/packages/modals-collection/package.json
@@ -16,7 +16,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/modals/package.json b/packages/modals/package.json
index c4266cc78..e8ee0594d 100644
--- a/packages/modals/package.json
+++ b/packages/modals/package.json
@@ -16,7 +16,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/notifications/package.json b/packages/notifications/package.json
index 2e0dd5cee..505e4e74b 100644
--- a/packages/notifications/package.json
+++ b/packages/notifications/package.json
@@ -17,7 +17,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/old-import/package.json b/packages/old-import/package.json
index af34228f0..14b6e3e3f 100644
--- a/packages/old-import/package.json
+++ b/packages/old-import/package.json
@@ -20,7 +20,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/old-schema/package.json b/packages/old-schema/package.json
index f01667cfd..328bd8f50 100644
--- a/packages/old-schema/package.json
+++ b/packages/old-schema/package.json
@@ -16,7 +16,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/ping/package.json b/packages/ping/package.json
index 02cc73a6a..1ae965e3b 100644
--- a/packages/ping/package.json
+++ b/packages/ping/package.json
@@ -16,7 +16,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/redis/package.json b/packages/redis/package.json
index bb514a27c..71eb8838b 100644
--- a/packages/redis/package.json
+++ b/packages/redis/package.json
@@ -16,7 +16,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/request-handler/package.json b/packages/request-handler/package.json
index dcca79f09..29609d87d 100644
--- a/packages/request-handler/package.json
+++ b/packages/request-handler/package.json
@@ -16,7 +16,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/server-settings/package.json b/packages/server-settings/package.json
index 24b682229..4decc00ae 100644
--- a/packages/server-settings/package.json
+++ b/packages/server-settings/package.json
@@ -16,7 +16,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/settings/package.json b/packages/settings/package.json
index 93f0a554e..18f93e280 100644
--- a/packages/settings/package.json
+++ b/packages/settings/package.json
@@ -17,7 +17,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/spotlight/package.json b/packages/spotlight/package.json
index a3a36a3da..39868e02e 100644
--- a/packages/spotlight/package.json
+++ b/packages/spotlight/package.json
@@ -17,7 +17,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/translation/package.json b/packages/translation/package.json
index 8fab918f3..4dc9d8cd6 100644
--- a/packages/translation/package.json
+++ b/packages/translation/package.json
@@ -21,7 +21,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 9956f7fee..52cd4c15d 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -19,7 +19,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/validation/package.json b/packages/validation/package.json
index db36ea5dc..e96c6c3c0 100644
--- a/packages/validation/package.json
+++ b/packages/validation/package.json
@@ -16,7 +16,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/widgets/package.json b/packages/widgets/package.json
index 8b8444b3d..9c80d4bd8 100644
--- a/packages/widgets/package.json
+++ b/packages/widgets/package.json
@@ -19,7 +19,7 @@
   },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "format": "oxfmt --check .",
+    "format": "oxfmt .",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit"
   },