From af3bc8a143c7224d70278929dbe46316ddc50ef3 Mon Sep 17 00:00:00 2001
From: DomW <domw30@gmail.com>
Date: Sat, 24 Aug 2024 12:38:38 +0100
Subject: [PATCH] refactor(chat-view): improve chat skeleton positioning when
 loading messages (#2202)

---
 src/components/chat-view-container/chat-view.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/chat-view-container/chat-view.tsx b/src/components/chat-view-container/chat-view.tsx
index 4c96983c2..c7fff08a2 100644
--- a/src/components/chat-view-container/chat-view.tsx
+++ b/src/components/chat-view-container/chat-view.tsx
@@ -271,10 +271,10 @@ export class ChatView extends React.Component<Properties, State> {
                 <Waypoint onEnter={this.props.onFetchMore} />
               </div>
             )}
-            {this.props.messages.length > 0 && this.renderMessages()}
             {!this.props.hasLoadedMessages && this.props.messagesFetchStatus !== MessagesFetchState.FAILED && (
               <ChatSkeleton conversationId={this.props.id} />
             )}
+            {this.props.messages.length > 0 && this.renderMessages()}
           </div>
 
           {this.props.messagesFetchStatus === MessagesFetchState.FAILED && (