From f751345d32cbcf64f05c1e0287aed1e6cd448953 Mon Sep 17 00:00:00 2001 From: MathieuG-P <40181755+Zagrios@users.noreply.github.com> Date: Sun, 16 Jul 2023 15:39:11 +0200 Subject: [PATCH] [chore-245] resolve "promise but void expected" error --- .../OneClick/OneClickDownloadPlaylist.tsx | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/renderer/windows/OneClick/OneClickDownloadPlaylist.tsx b/src/renderer/windows/OneClick/OneClickDownloadPlaylist.tsx index af1e0a8b..11a19008 100644 --- a/src/renderer/windows/OneClick/OneClickDownloadPlaylist.tsx +++ b/src/renderer/windows/OneClick/OneClickDownloadPlaylist.tsx @@ -14,6 +14,7 @@ import { map, filter } from "rxjs/operators"; import { BsvPlaylist } from "shared/models/maps/beat-saver.model"; import defaultImage from "../../../../assets/images/default-version-img.jpg"; import { useService } from "renderer/hooks/use-service.hook"; +import { lastValueFrom } from "rxjs"; export default function OneClickDownloadPlaylist() { @@ -39,25 +40,17 @@ export default function OneClickDownloadPlaylist() { useEffect(() => { - const promise = new Promise(async (resolve, reject) => { + const promise = (async () => { const infos = await ipc.send<{ bpListUrl: string; id: string }>("one-click-playlist-info"); if (!infos.success) { - return reject(infos.error); + throw infos.error; } bSaver.getPlaylistDetailsById(infos.data.id).then(details => setPlaylist(details)); - playlistDownloader - .oneClickInstallPlaylist(infos.data.bpListUrl) - .toPromise() - .then(res => { - resolve(res); - }) - .catch(() => { - reject(); - }); - }); + return lastValueFrom(playlistDownloader.oneClickInstallPlaylist(infos.data.bpListUrl)); + })(); promise.catch(() => { notification.notifySystem({ title: t("notifications.types.error"), body: t("notifications.playlists.one-click-install.error") });