From 9ab506a49f4c9535f95ea19f7b8af1e6986dba22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pedro?=
 <18708801+jpsl00@users.noreply.github.com>
Date: Mon, 10 Feb 2025 23:24:07 -0300
Subject: [PATCH 1/2] Update subject.tsx

---
 src/pages/subject.tsx | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/pages/subject.tsx b/src/pages/subject.tsx
index 4c03d48..b43a8e6 100644
--- a/src/pages/subject.tsx
+++ b/src/pages/subject.tsx
@@ -12,7 +12,7 @@ export default function Subject() {
   const [loading, setLoading] = useState(true);
   const [subject, setSubject] = useState<{ id: string; name: string } | null>(null);
 
-  useEffect(() => {
+  useEffect(async () => {
     if (!api.AuthService.isAuthenticated()) {
       router.push("/");
       return;
@@ -24,15 +24,14 @@ export default function Subject() {
       return;
     }
 
-    api.SubjectService.getSubject(selectedSubject)
-      .then((data) => {
-        setSubject(data.data);
-        setLoading(false);
-      })
-      .catch((error) => {
-        console.error("Erro ao buscar disciplina:", error);
-        setLoading(false);
-      });
+    try {
+      const { data } = await api.SubjectService.getSubject(selectedSubject)
+      setSubject(data.data);
+    } catch(error) {
+      console.error("Erro ao buscar disciplina:", error);
+    } finally {
+      setLoading(false);
+    }
   }, [router]);
 
   return (

From 2aadd7a4f37c5ecb7c8b6ad1ffc98e63ed140a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pedro?=
 <18708801+jpsl00@users.noreply.github.com>
Date: Mon, 10 Feb 2025 23:26:01 -0300
Subject: [PATCH 2/2] Update schools.tsx

---
 src/pages/schools.tsx | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/pages/schools.tsx b/src/pages/schools.tsx
index 6d5c571..a1b2e21 100644
--- a/src/pages/schools.tsx
+++ b/src/pages/schools.tsx
@@ -9,23 +9,20 @@ export default function Schools() {
   const [loading, setLoading] = useState(true);
   const router = useRouter();
 
-  useEffect(() => {
+  useEffect(async () => {
     if (!api.AuthService.isAuthenticated()) {
       router.push("/");
       return;
     }
 
-    api.SchoolService.getSchools()
-      .then((data) => {        
-        const allSchools = data.data;
-        
-        setSchools(allSchools);
-        setLoading(false);
-      })
-      .catch((error) => {
-        console.error("Erro ao buscar escolas:", error);
-        setLoading(false);
-      });
+    try {
+      const { data } = await api.SchoolService.getSchools()
+      setSchools(data);
+    } catch(error) {
+      console.error("Erro ao buscar escolas:", error);
+    } finally {
+      setLoading(false);
+    }
   }, [router]);
 
   const handleSelectSchool = (schoolId: string) => {