From 0b41929db96d429054e4729e4a3b45ffee17f856 Mon Sep 17 00:00:00 2001
From: Egor <egor@philippov.ca>
Date: Thu, 25 Sep 2025 11:19:09 -0700
Subject: [PATCH] cleaner DismissedUpdates configuration display in the config

---
 src/hooks/useUpdateChecker.ts | 32 +++++++++++++++++++-------------
 src/main/modules/config.ts    |  8 ++++----
 src/types/index.d.ts          |  5 +++++
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/hooks/useUpdateChecker.ts b/src/hooks/useUpdateChecker.ts
index 73c1d8e..5d1cd31 100644
--- a/src/hooks/useUpdateChecker.ts
+++ b/src/hooks/useUpdateChecker.ts
@@ -7,6 +7,7 @@ import {
 import { useKoboldVersionsStore } from '@/stores/koboldVersions';
 import { getROCmDownload } from '@/utils/rocm';
 import type { InstalledVersion, DownloadItem } from '@/types/electron';
+import type { DismissedUpdate } from '@/types';
 
 export interface BinaryUpdateInfo {
   currentVersion: InstalledVersion;
@@ -17,8 +18,8 @@ export const useUpdateChecker = () => {
   const [updateInfo, setUpdateInfo] = useState<BinaryUpdateInfo | null>(null);
   const [isChecking, setIsChecking] = useState(false);
   const [showUpdateModal, setShowUpdateModal] = useState(false);
-  const [dismissedUpdates, setDismissedUpdates] = useState<Set<string>>(
-    new Set()
+  const [dismissedUpdates, setDismissedUpdates] = useState<DismissedUpdate[]>(
+    []
   );
 
   const { availableDownloads: releases, loadingRemote } =
@@ -27,10 +28,10 @@ export const useUpdateChecker = () => {
     const loadDismissedUpdates = async () => {
       const dismissed = (await window.electronAPI.config.get(
         'dismissedUpdates'
-      )) as string[] | undefined;
+      )) as DismissedUpdate[] | undefined;
 
       if (dismissed) {
-        setDismissedUpdates(new Set(dismissed));
+        setDismissedUpdates(dismissed);
       }
     };
 
@@ -72,9 +73,13 @@ export const useUpdateChecker = () => {
         compareVersions(matchingDownload.version, currentVersion.version) > 0;
 
       if (hasUpdate) {
-        const updateKey = `${currentVersion.path}-${matchingDownload.version}`;
+        const isUpdateDismissed = dismissedUpdates.some(
+          (dismissedUpdate) =>
+            dismissedUpdate.currentVersionPath === currentVersion.path &&
+            dismissedUpdate.targetVersion === matchingDownload.version
+        );
 
-        if (!dismissedUpdates.has(updateKey)) {
+        if (!isUpdateDismissed) {
           setUpdateInfo({
             currentVersion,
             availableUpdate: matchingDownload,
@@ -88,14 +93,15 @@ export const useUpdateChecker = () => {
   }, [dismissedUpdates, releases, loadingRemote]);
 
   const skipUpdate = useCallback(() => {
-    if (updateInfo) {
-      const updateKey = `${updateInfo.currentVersion.path}-${updateInfo.availableUpdate.version}`;
-      const newDismissedUpdates = new Set([...dismissedUpdates, updateKey]);
+    if (updateInfo && updateInfo.availableUpdate.version) {
+      const newDismissedUpdate: DismissedUpdate = {
+        currentVersionPath: updateInfo.currentVersion.path,
+        targetVersion: updateInfo.availableUpdate.version,
+      };
+
+      const newDismissedUpdates = [...dismissedUpdates, newDismissedUpdate];
       setDismissedUpdates(newDismissedUpdates);
-      window.electronAPI.config.set(
-        'dismissedUpdates',
-        Array.from(newDismissedUpdates)
-      );
+      window.electronAPI.config.set('dismissedUpdates', newDismissedUpdates);
     }
     setShowUpdateModal(false);
     setUpdateInfo(null);
diff --git a/src/main/modules/config.ts b/src/main/modules/config.ts
index ffd1794..7788c09 100644
--- a/src/main/modules/config.ts
+++ b/src/main/modules/config.ts
@@ -6,7 +6,7 @@ import { join } from 'path';
 import { platform } from 'process';
 import { nativeTheme } from 'electron';
 import { PRODUCT_NAME } from '@/constants';
-import type { FrontendPreference } from '@/types';
+import type { FrontendPreference, DismissedUpdate } from '@/types';
 import type { MantineColorScheme } from '@mantine/core';
 import type { SavedNotepadState } from '@/types/electron';
 
@@ -27,7 +27,7 @@ interface AppConfig {
   windowBounds?: WindowBounds;
   hasSeenWelcome?: boolean;
   skipEjectConfirmation?: boolean;
-  dismissedUpdates?: string[];
+  dismissedUpdates?: DismissedUpdate[];
   zoomLevel?: number;
   notepad?: SavedNotepadState;
 }
@@ -154,9 +154,9 @@ export function setSkipEjectConfirmation(skipEjectConfirmation: boolean) {
   saveConfigAsync();
 }
 
-export const getDismissedUpdates = () => config.dismissedUpdates;
+export const getDismissedUpdates = () => config.dismissedUpdates || [];
 
-export function setDismissedUpdates(dismissedUpdates: string[]) {
+export function setDismissedUpdates(dismissedUpdates: DismissedUpdate[]) {
   config.dismissedUpdates = dismissedUpdates;
   saveConfigAsync();
 }
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index 871cc6d..f694483 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -47,6 +47,11 @@ export interface InstalledVersion {
   size?: number;
 }
 
+export interface DismissedUpdate {
+  currentVersionPath: string;
+  targetVersion: string;
+}
+
 export interface SelectOption {
   value: string;
   label: string;