From 157438545c879c7b13248296f2a8392133245b05 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Mon, 2 May 2016 08:08:53 -0400
Subject: Properly checked for channel change before closing LHS (#2833)

---
 webapp/components/sidebar.jsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx
index 1f73e743f..4ab8b6b40 100644
--- a/webapp/components/sidebar.jsx
+++ b/webapp/components/sidebar.jsx
@@ -162,7 +162,7 @@ export default class Sidebar extends React.Component {
         }
         return false;
     }
-    componentDidUpdate() {
+    componentDidUpdate(prevProps, prevState) {
         this.updateTitle();
         this.updateUnreadIndicators();
         if (!Utils.isMobile()) {
@@ -170,8 +170,10 @@ export default class Sidebar extends React.Component {
         }
 
         // close the LHS on mobile when you change channels
-        $('.app__body .inner-wrap').removeClass('move--right');
-        $('.app__body .sidebar--left').removeClass('move--right');
+        if (this.state.activeId !== prevState.activeId) {
+            $('.app__body .inner-wrap').removeClass('move--right');
+            $('.app__body .sidebar--left').removeClass('move--right');
+        }
     }
     componentWillUnmount() {
         window.removeEventListener('resize', this.handleResize);
-- 
cgit v1.2.3-1-g7c22