ChoChoX/suwayomi-material-you-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent infinite loading in About

Browse Source
This commit is contained in:
schroda
2024-05-05 00:36:16 +02:00
parent 3a7c93ea06
commit b90395ef12
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/screens/settings/About.tsx
View File

@@ -203,7 +203,6 @@ export function About() {
useSetDefaultBackTo('settings'); useSetDefaultBackTo('settings');
const { data, loading, error, refetch } = requestManager.useGetAbout({ notifyOnNetworkStatusChange: true }); const { data, loading, error, refetch } = requestManager.useGetAbout({ notifyOnNetworkStatusChange: true });
const { aboutServer, aboutWebUI } = data ?? {};
const { const {
data: serverUpdateCheckData, data: serverUpdateCheckData,
@@ -225,17 +224,6 @@ export function About() {
progress: 0, progress: 0,
}; };
if (!aboutServer || !aboutWebUI) {
return <LoadingPlaceholder />;
}
const selectedServerChannelInfo = serverUpdateCheckData?.checkForServerUpdates?.find(
(channel) => channel.channel === aboutServer.buildType,
);
const isServerUpdateAvailable =
!!selectedServerChannelInfo?.tag && selectedServerChannelInfo.tag !== getVersion(aboutServer);
const isWebUIUpdateAvailable = !!webUIUpdateData?.checkForWebUIUpdate.updateAvailable;
if (loading) { if (loading) {
return <LoadingPlaceholder />; return <LoadingPlaceholder />;
} }
@@ -250,6 +238,14 @@ export function About() {
); );
} }
const { aboutServer, aboutWebUI } = data!;
const selectedServerChannelInfo = serverUpdateCheckData?.checkForServerUpdates?.find(
(channel) => channel.channel === aboutServer.buildType,
);
const isServerUpdateAvailable =
!!selectedServerChannelInfo?.tag && selectedServerChannelInfo.tag !== getVersion(aboutServer);
const isWebUIUpdateAvailable = !!webUIUpdateData?.checkForWebUIUpdate.updateAvailable;
return ( return (
<List> <List>
<List <List