From 1ca9fdcff854371b59dbfbbc57e9525c80877123 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Thu, 27 Jul 2023 11:48:47 +0200
Subject: [PATCH] Pinned Messages: Load only after sync (#3684)

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

diff --git a/src/components/middle/MiddleHeader.tsx b/src/components/middle/MiddleHeader.tsx
index a9aec4189..dcbc511b0 100644
--- a/src/components/middle/MiddleHeader.tsx
+++ b/src/components/middle/MiddleHeader.tsx
@@ -106,6 +106,7 @@ type StateProps = {
   currentTransitionKey: number;
   connectionState?: GlobalState['connectionState'];
   isSyncing?: boolean;
+  isSynced?: boolean;
   isFetchingDifference?: boolean;
 };
 
@@ -133,6 +134,7 @@ const MiddleHeader: FC<OwnProps & StateProps> = ({
   currentTransitionKey,
   connectionState,
   isSyncing,
+  isSynced,
   isFetchingDifference,
   getCurrentPinnedIndexes,
   getLoadingPinnedId,
@@ -166,10 +168,10 @@ const MiddleHeader: FC<OwnProps & StateProps> = ({
   const isForum = chat?.isForum;
 
   useEffect(() => {
-    if (isReady && (threadId === MAIN_THREAD_ID || isForum)) {
+    if (isSynced && isReady && (threadId === MAIN_THREAD_ID || isForum)) {
       loadPinnedMessages({ chatId, threadId });
     }
-  }, [chatId, threadId, isReady, isForum]);
+  }, [chatId, threadId, isSynced, isReady, isForum]);
 
   useEnsureMessage(chatId, pinnedMessageId, pinnedMessage);
 
@@ -526,6 +528,7 @@ export default memo(withGlobal<OwnProps>(
       currentTransitionKey: Math.max(0, messageLists.length - 1),
       connectionState: global.connectionState,
       isSyncing: global.isSyncing,
+      isSynced: global.isSynced,
       isFetchingDifference: global.isFetchingDifference,
       hasButtonInHeader: canStartBot || canRestartBot || canSubscribe || shouldSendJoinRequest,
     };