Merge pull request #51 from evo-company/fix-loading-text-stuck

fix stuck loading text on ui
evo-company · Dec 17, 2024 · f18ecff · f18ecff
2 parents 031f14d + 7865f48
commit f18ecff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/ui/src/Dashboard/Flag.jsx b/ui/src/Dashboard/Flag.jsx
@@ -148,9 +148,9 @@ const HistoryModal = ({ flagId, open, onClose, createdTimestamp, reportedTimesta
     }
   }, [open]);
 
-  if (loading || !data) {
-    return <p>Loading...</p>;
-  };
+  if (!open || loading || !data) {
+    return null;
+  }
 
   const { flag: { changes } } = data;
 

diff --git a/ui/src/Dashboard/Value.jsx b/ui/src/Dashboard/Value.jsx
@@ -163,9 +163,9 @@ const HistoryModal = ({ valueId, open, onClose, createdTimestamp, reportedTimest
     }
   }, [open]);
 
-  if (loading || !data) {
-    return <p>Loading...</p>;
-  };
+  if (!open || loading || !data) {
+    return null;
+  }
 
   const { value: { changes } } = data;