Merge pull request #814 from ita-social-projects/812-Remove-Loading-f…

…rom-the-footer bug fix
ita-social-projects · Oct 9, 2024 · c1ef0b7 · c1ef0b7
2 parents be4f8d0 + d1fa41e
commit c1ef0b7
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/FrontEnd/src/components/Footer/Top/FooterNavigation.jsx b/FrontEnd/src/components/Footer/Top/FooterNavigation.jsx
@@ -66,14 +66,6 @@ function FooterNavigation() {
     fetchContacts();
   }, []);
 
-  if (error) {
-    return <p>{error}</p>;
-  }
-
-  if (!contacts) {
-    return <p>Loading...</p>;
-  }
-
   return (
     <div className={css['navigation-content']}>
       <div className={css['navigation-content-section']}>
@@ -100,11 +92,19 @@ function FooterNavigation() {
       </div>
       <div className={css['navigation-content-section']}>
         <p className={css['navigation-content-section-service__text']}>Контакти</p>
-        <p className={css['navigation-content-section-service__text']}>{contacts.email}</p>
-        <p className={css['navigation-content-section-service__text']}>{contacts.phone}</p>
-        <p className={css['navigation-content-section-service__text']}>{contacts.university}</p>
-        <p className={css['navigation-content-section-service__text']}>{contacts.address}</p>
-     </div>
+        {error ? (
+          <p className={css['navigation-content-section-service__text']} style={{ color: 'white' }}>
+            {error}
+          </p>
+        ) : contacts && (
+          <>
+            <p className={css['navigation-content-section-service__text']}>{contacts.email}</p>
+            <p className={css['navigation-content-section-service__text']}>{contacts.phone}</p>
+            <p className={css['navigation-content-section-service__text']}>{contacts.university}</p>
+            <p className={css['navigation-content-section-service__text']}>{contacts.address}</p>
+          </>
+        )}
+      </div>
     </div>
   );
 }