Skip to content

Commit e94bf8c

Browse files
committed
#4087 check error before loading indicator
1 parent d3964d9 commit e94bf8c

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

src/frontend/src/pages/GuestDivisionPage/GuestTeamPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ const GuestTeamPage: React.FC<GuestTeamPageProps> = ({ teamTypeId }) => {
2121
error: teamTypesError
2222
} = useAllTeamTypes();
2323

24-
if (teamsIsLoading || !allTeams || teamTypesIsLoading || !allTeamTypes) return <LoadingIndicator />;
2524
if (teamsIsError) return <ErrorPage message={teamsError.message} />;
2625
if (teamTypesIsError) return <ErrorPage message={teamTypesError.message} />;
26+
if (teamsIsLoading || !allTeams || teamTypesIsLoading || !allTeamTypes) return <LoadingIndicator />;
2727

2828
const teams = allTeams.filter((team) => team.teamType?.teamTypeId === teamTypeId);
2929
const teamTypeName = allTeamTypes.find((tt) => tt.teamTypeId === teamTypeId)?.name ?? '';

src/frontend/src/pages/TeamsPage/Teams.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ const TeamOrDivisionPage: React.FC = () => {
2020
const user = useCurrentUser();
2121
const { isLoading: teamsLoading, isError: isTeamsError, data: teamTypes, error: teamsError } = useAllTeamTypes();
2222

23-
if (teamsLoading || !teamTypes) return <LoadingIndicator />;
2423
if (isTeamsError) return <ErrorPage message={teamsError.message} />;
24+
if (teamsLoading || !teamTypes) return <LoadingIndicator />;
2525

2626
if (isGuest(user.role) && teamTypes?.some((t) => t.teamTypeId === teamId)) {
2727
return <GuestTeamPage teamTypeId={teamId} />;

0 commit comments

Comments
 (0)