From 0079e219062cc12d4ee38857999b181fb82adf20 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Fri, 20 Aug 2021 23:47:22 +0300
Subject: [PATCH] Middle Header: Exit select mode with Back button (#1409)

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

diff --git a/src/components/middle/MiddleHeader.tsx b/src/components/middle/MiddleHeader.tsx
index d6ef0d6eb..e7988b639 100644
--- a/src/components/middle/MiddleHeader.tsx
+++ b/src/components/middle/MiddleHeader.tsx
@@ -188,6 +188,11 @@ const MiddleHeader: FC<OwnProps & StateProps & DispatchProps> = ({
       }
     }
 
+    if (isSelectModeActive) {
+      exitMessageSelectMode();
+      return;
+    }
+
     if (threadId === MAIN_THREAD_ID && messageListType === 'thread' && currentTransitionKey === 0) {
       if (IS_SINGLE_COLUMN_LAYOUT || shouldShowCloseButton) {
         e.stopPropagation(); // Stop propagation to prevent chat re-opening on tablets
@@ -199,10 +204,6 @@ const MiddleHeader: FC<OwnProps & StateProps & DispatchProps> = ({
       return;
     }
 
-    if (messageListType === 'scheduled' && isSelectModeActive) {
-      exitMessageSelectMode();
-    }
-
     openPreviousChat();
   }, [
     threadId, messageListType, currentTransitionKey, isSelectModeActive, openPreviousChat, shouldShowCloseButton,