From 11c4078ff07260fb1b03b1d723196a0f720ff3a4 Mon Sep 17 00:00:00 2001 From: Alejandro Parcet Gonzalez Date: Fri, 7 Feb 2025 16:07:51 +0100 Subject: [PATCH] fix: now version dialog from preferences show current version changes Signed-off-by: Alejandro Parcet Gonzalez --- .../molecules/CustomModal/VersionUpdateDialog.tsx | 15 +++++++-------- src/renderer/modules/Settings/GeneralSettings.tsx | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/renderer/components/molecules/CustomModal/VersionUpdateDialog.tsx b/src/renderer/components/molecules/CustomModal/VersionUpdateDialog.tsx index 7ac74a54d..6fb98cade 100644 --- a/src/renderer/components/molecules/CustomModal/VersionUpdateDialog.tsx +++ b/src/renderer/components/molecules/CustomModal/VersionUpdateDialog.tsx @@ -17,7 +17,7 @@ import React, { useEffect, useState } from "react"; import { Octokit } from "@octokit/core"; -// import log from "electron-log/renderer"; +import log from "electron-log/renderer"; import SemVer from "semver"; import parse, { domToReact } from "html-react-parser"; @@ -31,7 +31,7 @@ import { version } from "../../../../../package.json"; interface VersionUpdateProps { open: boolean; onCancel: () => void; - oldVersion: string; + oldVersion: string | undefined; handleUpdate: () => void; } @@ -118,12 +118,11 @@ export function VersionUpdateDialog(props: VersionUpdateProps) { const newRelease = { name, version: tag_name, date: published_at, content: body_html }; if (!prerelease) releases.push(newRelease); }); - // log.info("Data from Dialog: ", releases, version, oldVersion); - const parsedData = releases.filter(r => - oldVersion - ? SemVer.compare(r.version, oldVersion) > 0 && SemVer.compare(r.version, version) <= 0 - : SemVer.compare(r.version, version) === 0, - ); + const parsedData = + oldVersion !== undefined + ? releases.filter(r => SemVer.compare(r.version, oldVersion) > 0 && SemVer.compare(r.version, version) <= 0) + : releases.filter(r => SemVer.compare(r.version, version) === 0); + log.info("Data from Dialog: ", releases, version, oldVersion, parsedData); setData(parsedData); } fetchData(); diff --git a/src/renderer/modules/Settings/GeneralSettings.tsx b/src/renderer/modules/Settings/GeneralSettings.tsx index 3f45edf91..aa03d26b2 100644 --- a/src/renderer/modules/Settings/GeneralSettings.tsx +++ b/src/renderer/modules/Settings/GeneralSettings.tsx @@ -297,7 +297,7 @@ const GeneralSettings = ({ {}} onCancel={() => setVersionDialog(false)} />