From 84f8b6404089d68685cf6df8701eea18f01536cb Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Sat, 15 May 2021 00:53:25 +0300
Subject: [PATCH] Pinned Messages: Fix broken order after switching chats

---
 src/components/middle/MiddleHeader.tsx | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/middle/MiddleHeader.tsx b/src/components/middle/MiddleHeader.tsx
index 99faff837..9227ff6a0 100644
--- a/src/components/middle/MiddleHeader.tsx
+++ b/src/components/middle/MiddleHeader.tsx
@@ -134,15 +134,16 @@ const MiddleHeader: FC<OwnProps & StateProps & DispatchProps> = ({
     }
   }, [chatId, loadPinnedMessages, lastSyncTime, threadId]);
 
-  useEffect(() => {
-    setPinnedMessageIndex(0);
-  }, [chatId]);
-
-  // Modify index after unpinning
+  // Modify pinned index after unpinning
   useEffect(() => {
     setPinnedMessageIndex(pinnedMessagesCount ? cycleRestrict(pinnedMessagesCount, pinnedMessageIndex) : -1);
   }, [pinnedMessagesCount, pinnedMessageIndex]);
 
+  // Reset pinned index when switching chats
+  useEffect(() => {
+    setPinnedMessageIndex(0);
+  }, [chatId]);
+
   useEnsureMessage(chatId, pinnedMessageId, pinnedMessage);
 
   const { width: windowWidth } = useWindowSize();