address CodeRabbit suggestions

Author: esimkowitz

apps/web/components/dashboard/preview/ReaderSettingsPopover.tsx

@@ -20,6 +20,7 @@ import {
   TooltipContent,
   TooltipTrigger,
 } from "@/components/ui/tooltip";
+import { useTranslation } from "@/lib/i18n/client";
 import { useReaderSettings } from "@/lib/readerSettings";
 import {
   Globe,
@@ -51,6 +52,7 @@ export default function ReaderSettingsPopover({
   onOpenChange,
   variant = "outline",
 }: ReaderSettingsPopoverProps) {
+  const { t } = useTranslation();
   const {
     settings,
     serverSettings,
@@ -78,15 +80,15 @@ export default function ReaderSettingsPopover({
   // Build tooltip message for the settings button
   const getSettingsTooltip = () => {
     if (hasSessionChanges && hasLocalOverrides) {
-      return "Unsaved preview changes; device settings differ from global";
+      return t("settings.info.reader_settings.tooltip_preview_and_local");
     }
     if (hasSessionChanges) {
-      return "Unsaved preview changes";
+      return t("settings.info.reader_settings.tooltip_preview");
     }
     if (hasLocalOverrides) {
-      return "Device settings differ from global";
+      return t("settings.info.reader_settings.tooltip_local");
     }
-    return "Reading settings";
+    return t("settings.info.reader_settings.tooltip_default");
   };
 
   return (

apps/web/lib/i18n/locales/en/translation.json

@@ -152,7 +152,11 @@
         "clear_local_overrides": "Clear device settings",
         "serif": "Serif",
         "sans": "Sans Serif",
-        "mono": "Monospace"
+        "mono": "Monospace",
+        "tooltip_default": "Reading settings",
+        "tooltip_preview": "Unsaved preview changes",
+        "tooltip_local": "Device settings differ from global",
+        "tooltip_preview_and_local": "Unsaved preview changes; device settings differ from global"
       }
     },
     "stats": {

apps/web/lib/readerSettings.tsx

@@ -127,6 +127,12 @@ export function useReaderSettings() {
   const apiUtils = api.useUtils();
   const { mutate: updateServerSettings } = api.users.updateSettings.useMutation(
     {
+      onSuccess: () => {
+        // Clear session and local overrides only after successful server save
+        setSessionOverrides({});
+        setLocalOverrides({});
+        saveLocalOverridesToStorage({});
+      },
       onSettled: () => {
         apiUtils.users.settings.invalidate();
       },
@@ -212,16 +218,8 @@ export function useReaderSettings() {
       readerLineHeight: settingsToSave.lineHeight,
       readerFontFamily: settingsToSave.fontFamily,
     });
-    // Clear session and local overrides
-    setSessionOverrides({});
-    setLocalOverrides({});
-    saveLocalOverridesToStorage({});
-  }, [
-    effectiveSettings,
-    updateServerSettings,
-    setSessionOverrides,
-    setLocalOverrides,
-  ]);
+    // Note: Session and local overrides are cleared in onSuccess callback
+  }, [effectiveSettings, updateServerSettings, setPendingServerSave]);
 
   // Clear all server defaults (set to null)
   const clearServerDefaults = useCallback(() => {

packages/trpc/models/users.ts

@@ -478,15 +478,9 @@ export class User {
         backupsEnabled: input.backupsEnabled,
         backupsFrequency: input.backupsFrequency,
         backupsRetentionDays: input.backupsRetentionDays,
-        ...(input.readerFontSize !== undefined && {
-          readerFontSize: input.readerFontSize,
-        }),
-        ...(input.readerLineHeight !== undefined && {
-          readerLineHeight: input.readerLineHeight,
-        }),
-        ...(input.readerFontFamily !== undefined && {
-          readerFontFamily: input.readerFontFamily,
-        }),
+        readerFontSize: input.readerFontSize,
+        readerLineHeight: input.readerLineHeight,
+        readerFontFamily: input.readerFontFamily,
       })
       .where(eq(users.id, this.user.id));
   }