From f0047386f6395d21ad94f3ef2ad9d201881f462d Mon Sep 17 00:00:00 2001
From: Mattermost Build <build@mattermost.com>
Date: Wed, 18 Dec 2019 19:09:50 +0100
Subject: [PATCH] MM-20682 Android back button to dismiss status modal first
 (#3724)

---
 app/components/sidebars/settings/settings_sidebar.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/components/sidebars/settings/settings_sidebar.js b/app/components/sidebars/settings/settings_sidebar.js
index 6958955ac..bb615c8f8 100644
--- a/app/components/sidebars/settings/settings_sidebar.js
+++ b/app/components/sidebars/settings/settings_sidebar.js
@@ -105,7 +105,10 @@ export default class SettingsDrawer extends PureComponent {
     };
 
     handleAndroidBack = () => {
-        if (this.drawerRef && this.drawerOpened) {
+        if (this.statusModal) {
+            this.statusModal = false;
+            return false;
+        } else if (this.drawerRef && this.drawerOpened) {
             this.drawerRef.closeDrawer();
             return true;
         }
@@ -163,6 +166,7 @@ export default class SettingsDrawer extends PureComponent {
             },
         }];
 
+        this.statusModal = true;
         showModalOverCurrentContext('OptionsModal', {items});
     });