From b590c062aa9cc5caab2a5e27399b9168dc83f517 Mon Sep 17 00:00:00 2001
From: Justin <dice.warrant-02@icloud.com>
Date: Thu, 29 Sep 2022 13:13:10 -0400
Subject: [PATCH] Show Skeleton when changing chats

---
 app/soapbox/features/chats/components/chat-message-list.tsx | 3 ++-
 app/soapbox/queries/chats.ts                                | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/chats/components/chat-message-list.tsx b/app/soapbox/features/chats/components/chat-message-list.tsx
index bd1caaf67..389559d42 100644
--- a/app/soapbox/features/chats/components/chat-message-list.tsx
+++ b/app/soapbox/features/chats/components/chat-message-list.tsx
@@ -85,6 +85,7 @@ const ChatMessageList: React.FC<IChatMessageList> = ({ chat, autosize }) => {
     isFetchingNextPage,
     isLoading,
     isPlaceholderData,
+    hasNextPage,
     refetch,
   } = useChatMessages(chat.id);
   const formattedChatMessages = chatMessages || [];
@@ -154,7 +155,7 @@ const ChatMessageList: React.FC<IChatMessageList> = ({ chat, autosize }) => {
     // const maxId = chatMessages.getIn([0, 'id']) as string;
     // dispatch(fetchChatMessages(chat.id, maxId as any));
     // setIsLoading(true);
-    if (!isFetching) {
+    if (!isFetching && hasNextPage) {
       // setMaxId(formattedChatMessages[0].id);
       fetchNextPage()
         .then(() => {
diff --git a/app/soapbox/queries/chats.ts b/app/soapbox/queries/chats.ts
index f84e43ff0..b93836c48 100644
--- a/app/soapbox/queries/chats.ts
+++ b/app/soapbox/queries/chats.ts
@@ -82,7 +82,6 @@ const useChatMessages = (chatId: string) => {
   };
 
   const queryInfo = useInfiniteQuery(chatKeys.chatMessages(chatId), ({ pageParam }) => getChatMessages(chatId, pageParam), {
-    keepPreviousData: true,
     getNextPageParam: (config) => {
       if (config.hasMore) {
         return { link: config.link };