From a929ceb32e3f30e6bb92fc564be4ac6572e13dbb Mon Sep 17 00:00:00 2001
From: Gil Eluard <gile@element.io>
Date: Fri, 9 Jul 2021 23:54:25 +0200
Subject: [PATCH 1/4] it's easy for the back button to trigger a leftpanel
 reveal (#4438)

- Fixed
---
 Riot/Modules/TabBar/TabBarCoordinator.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Riot/Modules/TabBar/TabBarCoordinator.swift b/Riot/Modules/TabBar/TabBarCoordinator.swift
index 0efc1c03c4..cb28c4427c 100644
--- a/Riot/Modules/TabBar/TabBarCoordinator.swift
+++ b/Riot/Modules/TabBar/TabBarCoordinator.swift
@@ -245,9 +245,9 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
     }
     
     private func setupSideMenuGestures() {
-        self.parameters.appNavigator.sideMenu.addScreenEdgePanGesturesToPresent(to: self.masterNavigationController.view)
-        
-        self.parameters.appNavigator.sideMenu.addPanGestureToPresent(to: self.masterNavigationController.navigationBar)
+        if let rootViewController = self.masterNavigationController.viewControllers.first {
+            self.parameters.appNavigator.sideMenu.addScreenEdgePanGesturesToPresent(to: rootViewController.view)
+        }
     }
     
     // MARK: Navigation

From 27b72c5408787d7dacdd457f8ec78b71bc343bf9 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gile@element.io>
Date: Fri, 9 Jul 2021 23:57:34 +0200
Subject: [PATCH 2/4] it's easy for the back button to trigger a leftpanel
 reveal (#4438)

- Updated CHANGES.rst
---
 Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
index 84ecb908a5..a9bea1d966 100644
--- a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
+++ b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
@@ -4,7 +4,8 @@
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      runPostActionsOnFailure = "NO">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"

From 61b5675896403d6d50f68ce3cd314ca3d68ca8c6 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gile@element.io>
Date: Fri, 9 Jul 2021 23:58:32 +0200
Subject: [PATCH 3/4] it's easy for the back button to trigger a leftpanel
 reveal (#4438)

- Updated CHANGES.rst
---
 CHANGES.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index e62d281e93..65744cf74f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -13,7 +13,8 @@ Changes to be released in next version
  * Fix crash on Apple Silicon Macs.
  * Media Picker: Generate video thumbnails with the correct orientation (#4515).
  * Directory List (pop-up one): Fix duplicate rooms being shown (#4537).
- * Use different title for scan button for self verification (#4525)
+ * Use different title for scan button for self verification (#4525).
+ * it's easy for the back button to trigger a leftpanel reveal (#4438).
 
 ⚠️ API Changes
  * 

From e15d842e7bba1db699a37e21340119120aa322c3 Mon Sep 17 00:00:00 2001
From: Gil Eluard <gile@element.io>
Date: Sat, 10 Jul 2021 00:01:47 +0200
Subject: [PATCH 4/4] it's easy for the back button to trigger a leftpanel
 reveal (#4438)

- Reverted Riot.xcscheme
---
 Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
index a9bea1d966..84ecb908a5 100644
--- a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
+++ b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
@@ -4,8 +4,7 @@
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      runPostActionsOnFailure = "NO">
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"