diff --git a/src/components/LoadingFeedback/LoadingFeedback.tsx b/src/components/LoadingFeedback/LoadingFeedback.tsx
new file mode 100644
index 0000000..eecefad
--- /dev/null
+++ b/src/components/LoadingFeedback/LoadingFeedback.tsx
@@ -0,0 +1,17 @@
+import * as React from "react";
+import styles from "../../styles";
+import { View, Text, ActivityIndicator } from "react-native";
+import { colors } from "../../styles";
+import AnimatedContainer from "../AnimatedContainer/AnimatedContainer";
+
+export default function LoadingFeedback() {
+ return (
+
+
+
+
+ Loading...
+
+
+ );
+}
diff --git a/src/routes/SubjectsPage/SubjectsPage.tsx b/src/routes/SubjectsPage/SubjectsPage.tsx
index e7d5905..d15515a 100644
--- a/src/routes/SubjectsPage/SubjectsPage.tsx
+++ b/src/routes/SubjectsPage/SubjectsPage.tsx
@@ -26,6 +26,9 @@ import AnimatedContainerNoScroll from "../../components/AnimatedContainer/Animat
import { useSelector } from "react-redux";
import { RootState } from "../../features/redux/Store/Store";
import { useToast } from "react-native-toast-notifications";
+import AnimatedContainer from "../../components/AnimatedContainer/AnimatedContainer";
+import Loading from "../Loading/Loading";
+import LoadingFeedback from "../../components/LoadingFeedback/LoadingFeedback";
export default function SubjectsPage() {
const logged_in_user = useSelector((state: RootState) => state.user.user);
@@ -184,15 +187,7 @@ export default function SubjectsPage() {
}
}
if (StudentInfo.isLoading || Subjects.isLoading) {
- return (
-
-
-
-
- Loading...
-
-
- );
+ return ;
}
return (
diff --git a/src/routes/UserInfoPage/UserInfoPage.tsx b/src/routes/UserInfoPage/UserInfoPage.tsx
index 129bdd4..cced0a8 100644
--- a/src/routes/UserInfoPage/UserInfoPage.tsx
+++ b/src/routes/UserInfoPage/UserInfoPage.tsx
@@ -43,6 +43,9 @@ import { setUser as setUserinState } from "../../features/redux/slices/UserSlice
import * as ImagePicker from "expo-image-picker";
import * as FileSystem from "expo-file-system";
import { useToast } from "react-native-toast-notifications";
+import AnimatedContainer from "../../components/AnimatedContainer/AnimatedContainer";
+import Loading from "../Loading/Loading";
+import LoadingFeedback from "../../components/LoadingFeedback/LoadingFeedback";
export default function UserInfoPage() {
const logged_in_user = useSelector((state: RootState) => state.user.user);
@@ -292,15 +295,7 @@ export default function UserInfoPage() {
yearlevel_query.isLoading ||
course_query.isLoading
) {
- return (
-
-
-
-
- Loading...
-
-
- );
+ return ;
}
return (