From af530cd7591d3ef2dd21b17ae611efeb6586e032 Mon Sep 17 00:00:00 2001
From: Pavel Meyer <meyerpavel1207@gmail.com>
Date: Thu, 27 Jun 2024 17:32:47 +0300
Subject: [PATCH 1/2] CW-Infinite-spinner-on-proposal-creation Added condition
 for end loading in empty chats

---
 src/shared/hooks/useCases/useDiscussionMessagesById.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/shared/hooks/useCases/useDiscussionMessagesById.ts b/src/shared/hooks/useCases/useDiscussionMessagesById.ts
index 1b7370a5b..3780879eb 100644
--- a/src/shared/hooks/useCases/useDiscussionMessagesById.ts
+++ b/src/shared/hooks/useCases/useDiscussionMessagesById.ts
@@ -311,6 +311,13 @@ export const useDiscussionMessagesById = ({
 
   useDeepCompareEffect(() => {
     (async () => {
+      if(Array.isArray(state.data) && state.data.length === 0) {
+        setIsFirstBatchLoaded((prev) => ({
+          ...prev,
+          [discussionId]: true,
+        }));
+      }
+
       if (!state.data || state.data.length === 0) {
         setDiscussionMessagesWithOwners([]);
         return;

From 24c18678086de54c2ea2a64a5babafb759169235 Mon Sep 17 00:00:00 2001
From: Pavel Meyer <meyerpavel1207@gmail.com>
Date: Mon, 1 Jul 2024 15:08:12 +0300
Subject: [PATCH 2/2] CW-infinite-spinner-on-proposal-creation Refactoring

---
 src/shared/hooks/useCases/useDiscussionMessagesById.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/shared/hooks/useCases/useDiscussionMessagesById.ts b/src/shared/hooks/useCases/useDiscussionMessagesById.ts
index 3780879eb..e4a946d2a 100644
--- a/src/shared/hooks/useCases/useDiscussionMessagesById.ts
+++ b/src/shared/hooks/useCases/useDiscussionMessagesById.ts
@@ -316,9 +316,10 @@ export const useDiscussionMessagesById = ({
           ...prev,
           [discussionId]: true,
         }));
+        setDiscussionMessagesWithOwners([]);
       }
 
-      if (!state.data || state.data.length === 0) {
+      if (!state.data) {
         setDiscussionMessagesWithOwners([]);
         return;
       }