diff --git a/src/routes/Home/Home.tsx b/src/routes/Home/Home.tsx
index 3844e42..b0c2b5a 100644
--- a/src/routes/Home/Home.tsx
+++ b/src/routes/Home/Home.tsx
@@ -379,23 +379,23 @@ export default function Home() {
>
);
+ } else if (
+ (StudentStatusQuery.isFetching && studying) ||
+ StudentStatusListQuery.isFetching ||
+ StudyGroupQuery.isFetching ||
+ (StudentStatusQuery.isFetching && !studying) ||
+ StudentStatusListGlobalQuery.isFetching ||
+ StudyGroupGlobalQuery.isFetching
+ ) {
+ return (
+ <>
+
+
+ Loading...
+ >
+ );
} else if (dist && location) {
- if (
- (StudentStatusQuery.isFetching && studying) ||
- StudentStatusListQuery.isFetching ||
- StudyGroupQuery.isFetching ||
- (StudentStatusQuery.isFetching && !studying) ||
- StudentStatusListGlobalQuery.isFetching ||
- StudyGroupGlobalQuery.isFetching
- ) {
- return (
- <>
-
-
- Loading...
- >
- );
- } else if (dist <= 1 || map_distance_override) {
+ if (dist <= 1 || map_distance_override) {
return (
<>