Merge pull request #64 from jamakase/feature/front-basement

loader works
jamakase · Sep 13, 2024 · f836ea7 · f836ea7
2 parents dec96eb + 89ff74b
commit f836ea7
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/frontend/src/app/(withSidebar)/conversations/[id]/page.tsx b/frontend/src/app/(withSidebar)/conversations/[id]/page.tsx
@@ -29,7 +29,6 @@ export default function ConversationPage({
       sender: "bot",
     },
   ]);
-  const [loadingMessage, setLoadingMessage] = useState(false);
 
   const config = useConfig();
   const queryClient = useQueryClient();
@@ -65,7 +64,6 @@ export default function ConversationPage({
     {
       onSuccess: (data) => {
         queryClient.invalidateQueries(["conversation", params.id]);
-        setLoadingMessage(false);
       },
     }
   );
@@ -80,9 +78,13 @@ export default function ConversationPage({
     if (!message.trim()) return;
     sendMessageMutation.mutate(message);
     setMessage("");
-    setLoadingMessage(true);
   };
 
+  const isPendingRequest = currentConversation && 
+    currentConversation.length > 0 && 
+    currentConversation[currentConversation.length - 1].sender === "user" &&
+    currentConversation[currentConversation.length - 1].text !== null;
+
   return (
     <div className="min-h-full w-full relative overflow-hidden hide-scrollbar">
       {/* {!isSidebarOpen && (
@@ -115,7 +117,7 @@ export default function ConversationPage({
             messages={[
               ...initialMessages,
               ...(currentConversation || []),
-              ...(loadingMessage
+              ...(isPendingRequest
                 ? [{ id: Date.now(), text: "Ответ вот-вот будет...", sender: "bot" }]
                 : []),
             ]}