From 6eefce98ef22bb16b45ffe46154c87e89505add2 Mon Sep 17 00:00:00 2001
From: Pavel Meyer <meyerpavel1207@gmail.com>
Date: Thu, 16 Nov 2023 12:21:11 +0300
Subject: [PATCH] CW-2196 FIx loading state

---
 .../ChatComponent/components/ChatContent/ChatContent.tsx    | 6 +-----
 src/shared/hooks/useCases/useDiscussionMessagesById.ts      | 4 +---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/pages/common/components/ChatComponent/components/ChatContent/ChatContent.tsx b/src/pages/common/components/ChatComponent/components/ChatContent/ChatContent.tsx
index 4d31c4fd13..2fbb5cc905 100644
--- 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
index 638b08541e..90a04a6f93 100644
--- 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,