From e0b096227fac70c3db5bb279de25e2a4a6f68b87 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Tue, 1 Nov 2022 18:53:38 +0100
Subject: [PATCH] Middle Header: Fix cleaning up after transition

---
 src/components/middle/MiddleHeader.tsx | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/components/middle/MiddleHeader.tsx b/src/components/middle/MiddleHeader.tsx
index 98b53f46e..8d64439d1 100644
--- a/src/components/middle/MiddleHeader.tsx
+++ b/src/components/middle/MiddleHeader.tsx
@@ -48,6 +48,7 @@ import useCurrentOrPrev from '../../hooks/useCurrentOrPrev';
 import buildClassName from '../../util/buildClassName';
 import useLang from '../../hooks/useLang';
 import useConnectionStatus from '../../hooks/useConnectionStatus';
+import usePrevious from '../../hooks/usePrevious';
 
 import PrivateChatInfo from '../common/PrivateChatInfo';
 import GroupChatInfo from '../common/GroupChatInfo';
@@ -262,6 +263,11 @@ const MiddleHeader: FC<OwnProps & StateProps> = ({
   const renderingCanUnpin = useCurrentOrPrev(canUnpin, true);
   const renderingPinnedMessageTitle = useCurrentOrPrev(topMessageTitle);
 
+  const prevTransitionKey = usePrevious(currentTransitionKey);
+  const cleanupExceptionKey = (
+    prevTransitionKey !== undefined && prevTransitionKey < currentTransitionKey ? prevTransitionKey : undefined
+  );
+
   const canRevealTools = (shouldRenderPinnedMessage && renderingPinnedMessage)
     || (shouldRenderAudioPlayer && renderingAudioMessage);
 
@@ -388,6 +394,8 @@ const MiddleHeader: FC<OwnProps & StateProps> = ({
       <Transition
         name={shouldSkipHistoryAnimations ? 'none' : 'slide-fade'}
         activeKey={currentTransitionKey}
+        shouldCleanup
+        cleanupExceptionKey={cleanupExceptionKey}
       >
         {renderInfo()}
       </Transition>