CW-2196 FIx loading state

daostack · Nov 16, 2023 · 6eefce9 · 6eefce9
1 parent 2e1f2f8
commit 6eefce9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/pages/common/components/ChatComponent/components/ChatContent/ChatContent.tsx b/src/pages/common/components/ChatComponent/components/ChatContent/ChatContent.tsx
@@ -17,10 +17,7 @@ import {
   InternalLinkData,
   DMChatMessage,
 } from "@/shared/components";
-import {
-  ChatType,
-  QueryParamKey,
-} from "@/shared/constants";
+import { ChatType, QueryParamKey } from "@/shared/constants";
 import { useQueryParams } from "@/shared/hooks";
 import {
   checkIsUserDiscussionMessage,
@@ -217,7 +214,6 @@ const ChatContent: ForwardRefRenderFunction<
     [scrollToContainerBottom],
   );
 
-
   return (
     <>
       {dateListReverse.map((day, dayIndex) => {

diff --git a/src/shared/hooks/useCases/useDiscussionMessagesById.ts b/src/shared/hooks/useCases/useDiscussionMessagesById.ts
@@ -266,7 +266,6 @@ export const useDiscussionMessagesById = ({
 
   useEffect(() => {
     (async () => {
-      setIsLoading(true);
       const discussionMessages = [...(state.data || [])];
       const filteredMessages = discussionMessages.filter(
         ({ moderation }) =>
@@ -310,13 +309,12 @@ export const useDiscussionMessagesById = ({
       }));
 
       setDiscussionMessagesWithOwners(loadedDiscussionMessages);
-      setIsLoading(false);
     })();
   }, [state.data, messageOwnersIds, messageOwners, hasPermissionToHide]);
 
   return {
     ...state,
-    loading: state.loading || isLoading,
+    loading: state.loading,
     data: discussionMessagesWithOwners,
     isEndOfList,
     fetchDiscussionMessages,