From 4a9e7c843eb55aa8fdfdc946dea4e34d9c1df8c4 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Mon, 13 Apr 2026 15:22:52 +0300
Subject: [PATCH] chore(options/other): merge note revisions

---
 .../client/src/translations/en/translation.json |  3 +++
 .../src/widgets/type_widgets/options/other.tsx  | 17 +++++------------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/apps/client/src/translations/en/translation.json b/apps/client/src/translations/en/translation.json
index a51f50031d..4f4b797cb1 100644
--- a/apps/client/src/translations/en/translation.json
+++ b/apps/client/src/translations/en/translation.json
@@ -1324,6 +1324,9 @@
     "erase_deleted_notes_now": "Erase deleted notes now",
     "deleted_notes_erased": "Deleted notes have been erased."
   },
+  "revisions": {
+    "title": "Note Revisions"
+  },
   "revisions_snapshot_interval": {
     "note_revisions_snapshot_interval_title": "Note Revision Snapshot Interval",
     "note_revisions_snapshot_description": "The Note revision snapshot interval is the time after which a new note revision will be created for the note. See <doc>wiki</doc> for more info.",
diff --git a/apps/client/src/widgets/type_widgets/options/other.tsx b/apps/client/src/widgets/type_widgets/options/other.tsx
index ff835419fb..ebb6158ee2 100644
--- a/apps/client/src/widgets/type_widgets/options/other.tsx
+++ b/apps/client/src/widgets/type_widgets/options/other.tsx
@@ -27,8 +27,7 @@ export default function OtherSettings() {
             </>}
             <NoteErasureTimeout />
             <AttachmentErasureTimeout />
-            <RevisionSnapshotInterval />
-            <RevisionSnapshotLimit />
+            <RevisionSettings />
             <HtmlImportTags />
             <ShareSettings />
             <NetworkSettings />
@@ -173,9 +172,11 @@ function AttachmentErasureTimeout() {
     );
 }
 
-function RevisionSnapshotInterval() {
+function RevisionSettings() {
+    const [ revisionSnapshotNumberLimit, setRevisionSnapshotNumberLimit ] = useTriliumOption("revisionSnapshotNumberLimit");
+
     return (
-        <OptionsSection title={t("revisions_snapshot_interval.note_revisions_snapshot_interval_title")}>
+        <OptionsSection title={t("revisions.title")}>
             <OptionsRow name="revision-snapshot-time-interval" label={t("revisions_snapshot_interval.snapshot_time_interval_label")} description={t("revisions_snapshot_interval.note_revisions_snapshot_description_short")}>
                 <TimeSelector
                     name="revision-snapshot-time-interval"
@@ -183,15 +184,7 @@ function RevisionSnapshotInterval() {
                     minimumSeconds={10}
                 />
             </OptionsRow>
-        </OptionsSection>
-    );
-}
 
-function RevisionSnapshotLimit() {
-    const [ revisionSnapshotNumberLimit, setRevisionSnapshotNumberLimit ] = useTriliumOption("revisionSnapshotNumberLimit");
-
-    return (
-        <OptionsSection title={t("revisions_snapshot_limit.note_revisions_snapshot_limit_title")}>
             <OptionsRow name="revision-snapshot-number-limit" label={t("revisions_snapshot_limit.snapshot_number_limit_label")} description={t("revisions_snapshot_limit.note_revisions_snapshot_limit_description_short")}>
                 <FormTextBoxWithUnit
                     type="number" min={-1}