Merge pull request #10126 from streetwriters/mobile-release/3.4.7

mobile: release v3.4.7
2026-09-01 19:49:54 +02:00 · 2026-07-22 11:12:45 +05:00
parent 987671e59c 77c009e83d
commit d63ce5a213
9 changed files with 61 additions and 38 deletions
--- a/apps/mobile/android/app/build.gradle
+++ b/apps/mobile/android/app/build.gradle
@@ -140,7 +140,7 @@ android {
        if (project.hasProperty("prBuildNumber")) {
            versionCode Integer.parseInt(prBuildNumber())
        } else {
-            versionCode 3112
+            versionCode 3113
        }
        versionName getNpmVersion()
        testBuildType System.getProperty('testBuildType', 'debug')
--- a/apps/mobile/android/releasenotes/whatsnew-en-US
+++ b/apps/mobile/android/releasenotes/whatsnew-en-US
@@ -1,3 +1,4 @@
+- Add option to clear note version history
 - Minor bug fixes and improvements

 Thank you for using Notesnook!
--- a/apps/mobile/app/components/note-history/index.tsx
+++ b/apps/mobile/app/components/note-history/index.tsx
@@ -45,11 +45,13 @@ import { Dialog } from "../dialog";
 const HistoryItem = ({
  index,
  items,
-  note
+  note,
+  refresh
 }: {
  index: number;
  items?: VirtualizedGrouping<HistorySession>;
  note: Note;
+  refresh: () => void;
 }) => {
  const [item] = useDBItem(index, "noteHistory", items);
  const { colors } = useThemeColors();
@@ -60,8 +62,9 @@ const HistoryItem = ({
    const _start_time = getFormattedDate(start, "time");
    const _end_time = getFormattedDate(end + 60000, "time");

-    return `${_start_date} ${_start_time} - ${_end_date === _start_date ? " " : _end_date + " "
-      }${_end_time}`;
+    return `${_start_date} ${_start_time} - ${
+      _end_date === _start_date ? " " : _end_date + " "
+    }${_end_time}`;
  };

  const preview = useCallback(
@@ -76,12 +79,13 @@ const HistoryItem = ({
            }}
            content={content}
            note={note}
+            update={refresh}
          />
        ),
        context: "note_history"
      });
    },
-    [note]
+    [note, refresh]
  );

  return (
@@ -123,7 +127,7 @@ export default function NoteHistory({
  const [_loading, setLoading] = useState(true);
  const { colors } = useThemeColors();

-  useEffect(() => {
+  const refresh = useCallback(() => {
    db.noteHistory
      .get(note.id)
      .sorted({
@@ -139,11 +143,20 @@ export default function NoteHistory({
      });
  }, [note.id]);

+  useEffect(() => {
+    refresh();
+  }, [refresh]);
+
  const renderItem = useCallback(
    ({ index }: { index: number }) => (
-      <HistoryItem index={index} items={history} note={note} />
+      <HistoryItem
+        index={index}
+        items={history}
+        note={note}
+        refresh={refresh}
+      />
    ),
-    [history, note]
+    [history, note, refresh]
  );

  return (
@@ -156,27 +169,27 @@ export default function NoteHistory({
        button={
          history?.placeholders.length
            ? {
-              title: strings.clearHistory(),
-              type: "secondary",
-              onPress: () => {
-                presentDialog({
-                  title: strings.clearHistory(),
-                  paragraph: strings.clearHistoryConfirmation(),
-                  positiveText: strings.clear(),
-                  negativeText: strings.cancel(),
-                  positiveType: "errorShade",
-                  context: "local",
-                  positivePress: async () => {
-                    await db.noteHistory.clearSessions(note.id);
-                    fwdRef.current?.hide();
-                    ToastManager.show({
-                      heading: strings.historyCleared(),
-                      type: "success"
-                    });
-                  }
-                });
+                title: strings.clearHistory(),
+                type: "secondary",
+                onPress: () => {
+                  presentDialog({
+                    title: strings.clearHistory(),
+                    paragraph: strings.clearHistoryConfirmation(),
+                    positiveText: strings.clear(),
+                    negativeText: strings.cancel(),
+                    positiveType: "errorShade",
+                    context: "local",
+                    positivePress: async () => {
+                      await db.noteHistory.clearSessions(note.id);
+                      fwdRef.current?.hide();
+                      ToastManager.show({
+                        heading: strings.historyCleared(),
+                        type: "success"
+                      });
+                    }
+                  });
+                }
              }
-            }
            : undefined
        }
      />
--- a/apps/mobile/app/components/note-history/preview.tsx
+++ b/apps/mobile/app/components/note-history/preview.tsx
@@ -53,7 +53,8 @@ import {
 export default function NotePreview({
  session,
  content,
-  note
+  note,
+  update
 }: {
  session?: HistorySession & { session: string };
  content:
@@ -64,6 +65,7 @@ export default function NotePreview({
      >
    | undefined;
  note: TrashOrItem<Note>;
+  update?: () => void;
 }) {
  const { colors } = useThemeColors();
  const [locked, setLocked] = useState(false);
@@ -120,19 +122,22 @@ export default function NotePreview({
      positivePress: async () => {
        if (isSession) {
          await db.noteHistory.remove(session.id);
+          update?.();
          eSendEvent(eCloseSheet, "note_history");
          Navigation.queueRoutesForUpdate();
        } else if (note.type === "trash") {
          await db.trash.delete(note.id);
          useTrashStore.getState().refresh();
          useSelectionStore.getState().setSelectionMode();
+          eSendEvent(eCloseSheet);
        }
        ToastManager.show({
          heading: isSession ? strings.versionDeleted() : strings.noteDeleted(),
-          type: "success"
+          type: "success",
+          context: isSession ? "local" : "global"
        });

-        eSendEvent(eCloseSheet);
+        return true;
      },
      positiveType: "error"
    });
--- a/apps/mobile/ios/build-configs/ios-build.active.xcconfig
+++ b/apps/mobile/ios/build-configs/ios-build.active.xcconfig
@@ -1,6 +1,6 @@
 // Production iOS build identifiers
-IOS_CURRENT_PROJECT_VERSION = 2190
-IOS_MARKETING_VERSION = 3.4.6
+IOS_CURRENT_PROJECT_VERSION = 2191
+IOS_MARKETING_VERSION = 3.4.7
 IOS_MAIN_BUNDLE_ID = org.streetwriters.notesnook
 IOS_WIDGET_BUNDLE_ID = org.streetwriters.notesnook.notewidget
 IOS_SHARE_BUNDLE_ID = org.streetwriters.notesnook.share
--- a/apps/mobile/ios/build-configs/ios-build.production.xcconfig
+++ b/apps/mobile/ios/build-configs/ios-build.production.xcconfig
@@ -1,6 +1,6 @@
 // Production iOS build identifiers
-IOS_CURRENT_PROJECT_VERSION = 2190
-IOS_MARKETING_VERSION = 3.4.6
+IOS_CURRENT_PROJECT_VERSION = 2191
+IOS_MARKETING_VERSION = 3.4.7
 IOS_MAIN_BUNDLE_ID = org.streetwriters.notesnook
 IOS_WIDGET_BUNDLE_ID = org.streetwriters.notesnook.notewidget
 IOS_SHARE_BUNDLE_ID = org.streetwriters.notesnook.share
--- a/apps/mobile/ios/build-configs/ios-build.staging.xcconfig
+++ b/apps/mobile/ios/build-configs/ios-build.staging.xcconfig
@@ -1,6 +1,6 @@
 // Staging iOS build identifiers
-IOS_CURRENT_PROJECT_VERSION = 2190
-IOS_MARKETING_VERSION = 3.4.6
+IOS_CURRENT_PROJECT_VERSION = 2191
+IOS_MARKETING_VERSION = 3.4.7
 IOS_MAIN_BUNDLE_ID = org.streetwriters.notesnook
 IOS_WIDGET_BUNDLE_ID = org.streetwriters.notesnook.notewidget
 IOS_SHARE_BUNDLE_ID = org.streetwriters.notesnook.share
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@notesnook/mobile",
-  "version": "3.4.6",
+  "version": "3.4.7",
  "private": true,
  "license": "GPL-3.0-or-later",
  "scripts": {
--- a/fastlane/metadata/android/en-US/changelogs/15569.txt
+++ b/fastlane/metadata/android/en-US/changelogs/15569.txt
@@ -0,0 +1,4 @@
+- Add option to clear note version history
+- Minor bug fixes and improvements
+
+Thank you for using Notesnook!