From c2e205310a1854595359581640c2c997660b720a Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Thu, 23 Jul 2026 01:19:59 -0400
Subject: [PATCH] MLE: Fix Loading Message

---
 .../messageLoggerEnhanced/components/LogsModal.tsx   |  8 ++++----
 .../messageLoggerEnhanced/components/hooks.ts        | 12 +++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/equicordplugins/messageLoggerEnhanced/components/LogsModal.tsx b/src/equicordplugins/messageLoggerEnhanced/components/LogsModal.tsx
index 9a9699cc7..f5f550cad 100644
--- a/src/equicordplugins/messageLoggerEnhanced/components/LogsModal.tsx
+++ b/src/equicordplugins/messageLoggerEnhanced/components/LogsModal.tsx
@@ -165,10 +165,10 @@ export function LogsModal({ modalProps, initalQuery }: Props) {
                     modalProps.transitionState === 1 &&
                     <div>
                         {pending && (
-                            <LoadingLogs />
+                            <LoadingLogs tab={currentTab} />
                         )}
 
-                        {messages != null && total === 0 && (
+                        {!pending && messages != null && total === 0 && (
                             <EmptyLogs
                                 hasQuery={queryEh.length !== 0}
                                 reset={reset}
@@ -292,13 +292,13 @@ function EmptyLogs({ hasQuery, reset: forceUpdate }: { hasQuery: boolean; reset:
     );
 }
 
-function LoadingLogs() {
+function LoadingLogs(tab) {
     return (
         <div className={cl("modal-empty-logs", "modal-content-inner")} style={{ textAlign: "center" }}>
             <Flex flexDirection="column" style={{ position: "relative" }}>
 
                 <BaseText size="lg">
-                    Loading Logs...
+                    Loading {tab} Logs...
                 </BaseText>
             </Flex>
         </div>
diff --git a/src/equicordplugins/messageLoggerEnhanced/components/hooks.ts b/src/equicordplugins/messageLoggerEnhanced/components/hooks.ts
index a60b472f9..05c3c86a9 100644
--- a/src/equicordplugins/messageLoggerEnhanced/components/hooks.ts
+++ b/src/equicordplugins/messageLoggerEnhanced/components/hooks.ts
@@ -33,6 +33,7 @@ export function useMessages(query: string, currentTab: LogTabs, sortNewest: bool
     const [messages, setMessages] = useState<DBMessageRecord[]>([]);
     const [statusTotal, setStatusTotal] = useState<number>(0);
     const [total, setTotal] = useState<number>(0);
+    const [resetCounter, setResetCounter] = useState(0);
 
     const debouncedQuery = useDebouncedValue(query, 300);
 
@@ -41,6 +42,8 @@ export function useMessages(query: string, currentTab: LogTabs, sortNewest: bool
     }, [pending]);
 
     useEffect(() => {
+        setPending(true);
+
         let isMounted = true;
 
         const loadMessages = async () => {
@@ -55,9 +58,8 @@ export function useMessages(query: string, currentTab: LogTabs, sortNewest: bool
                 if (isMounted) {
                     setMessages(messages);
                     setStatusTotal(statusTotal);
+                    setPending(false);
                 }
-
-                setPending(false);
             } else {
                 const allMessages = await getDateStortedMessagesByStatusIDB(sortNewest, Number.MAX_SAFE_INTEGER, status);
                 const { queries, rest } = tokenizeQuery(debouncedQuery);
@@ -78,8 +80,8 @@ export function useMessages(query: string, currentTab: LogTabs, sortNewest: bool
                 if (isMounted) {
                     setMessages(filteredMessages);
                     setStatusTotal(Number.MAX_SAFE_INTEGER);
+                    setPending(false);
                 }
-                setPending(false);
             }
         };
 
@@ -89,9 +91,9 @@ export function useMessages(query: string, currentTab: LogTabs, sortNewest: bool
             isMounted = false;
         };
 
-    }, [debouncedQuery, sortNewest, numDisplayedMessages, currentTab, pending]);
+    }, [debouncedQuery, sortNewest, numDisplayedMessages, currentTab, resetCounter]);
 
-    return { messages, statusTotal, total, pending, reset: () => setPending(true) };
+    return { messages, statusTotal, total, pending, reset: () => setResetCounter(c => c + 1) };
 }
 
 function getStatus(currentTab: LogTabs) {