From d1a1d3fc321b2794501e11a23fcaef090872f50d Mon Sep 17 00:00:00 2001 From: Zamitto <167933696+zamitto@users.noreply.github.com> Date: Sun, 2 Feb 2025 20:53:31 -0300 Subject: [PATCH] fix: possible undefined on bottom-panel --- package.json | 9 +- .../services/download/download-manager.ts | 2 +- .../components/bottom-panel/bottom-panel.tsx | 10 +- yarn.lock | 608 ++++++++++++++++-- 4 files changed, 549 insertions(+), 80 deletions(-) diff --git a/package.json b/package.json index c8bd338f..75f541d3 100644 --- a/package.json +++ b/package.json @@ -87,9 +87,8 @@ "@swc/core": "^1.4.16", "@types/auto-launch": "^5.0.5", "@types/color": "^3.0.6", - "@types/folder-hash": "^4.0.4", "@types/jsdom": "^21.1.7", - "@types/jsonwebtoken": "^9.0.7", + "@types/jsonwebtoken": "^9.0.8", "@types/lodash-es": "^4.17.12", "@types/node": "^20.12.7", "@types/parse-torrent": "^5.8.7", @@ -98,12 +97,12 @@ "@types/sound-play": "^1.1.3", "@types/user-agents": "^1.0.4", "@vitejs/plugin-react": "^4.2.1", - "electron": "^31.7.6", + "electron": "^31.7.7", "electron-builder": "^25.1.8", - "electron-vite": "^2.0.0", + "electron-vite": "^2.3.0", "eslint": "^8.56.0", "eslint-plugin-jsx-a11y": "^6.10.2", - "eslint-plugin-react": "^7.37.2", + "eslint-plugin-react": "^7.37.4", "eslint-plugin-react-hooks": "^4.6.0", "husky": "^9.1.7", "prettier": "^3.4.2", diff --git a/src/main/services/download/download-manager.ts b/src/main/services/download/download-manager.ts index a069deea..247d5c75 100644 --- a/src/main/services/download/download-manager.ts +++ b/src/main/services/download/download-manager.ts @@ -234,9 +234,9 @@ export class DownloadManager { }); WindowManager.mainWindow?.setProgressBar(-1); - WindowManager.mainWindow?.webContents.send("on-download-progress", null); if (downloadKey === this.downloadingGameId) { + WindowManager.mainWindow?.webContents.send("on-download-progress", null); this.downloadingGameId = null; } } diff --git a/src/renderer/src/components/bottom-panel/bottom-panel.tsx b/src/renderer/src/components/bottom-panel/bottom-panel.tsx index 8b0737a0..16f1de06 100644 --- a/src/renderer/src/components/bottom-panel/bottom-panel.tsx +++ b/src/renderer/src/components/bottom-panel/bottom-panel.tsx @@ -19,8 +19,6 @@ export function BottomPanel() { const { lastPacket, progress, downloadSpeed, eta } = useDownload(); - const isGameDownloading = !!lastPacket; - const [version, setVersion] = useState(""); const [sessionHash, setSessionHash] = useState(""); @@ -33,9 +31,11 @@ export function BottomPanel() { }, [userDetails?.id]); const status = useMemo(() => { - if (isGameDownloading) { - const game = library.find((game) => game.id === lastPacket?.gameId)!; + const game = lastPacket + ? library.find((game) => game.id === lastPacket?.gameId) + : undefined; + if (game) { if (lastPacket?.isCheckingFiles) return t("checking_files", { title: game.title, @@ -64,7 +64,7 @@ export function BottomPanel() { } return t("no_downloads_in_progress"); - }, [t, isGameDownloading, library, lastPacket, progress, eta, downloadSpeed]); + }, [t, library, lastPacket, progress, eta, downloadSpeed]); return (