From 47919bc291a9ec46b1b1314758a1c86dead02966 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Fri, 29 Sep 2017 10:39:49 +0100
Subject: [PATCH] Honour the Groups feature flag

---
 src/components/structures/BottomLeftMenu.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/BottomLeftMenu.js b/src/components/structures/BottomLeftMenu.js
index 89a5f454..4014261c 100644
--- a/src/components/structures/BottomLeftMenu.js
+++ b/src/components/structures/BottomLeftMenu.js
@@ -19,9 +19,9 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import sdk from 'matrix-react-sdk';
 import dis from 'matrix-react-sdk/lib/dispatcher';
-import AccessibleButton from 'matrix-react-sdk/lib/components/views/elements/AccessibleButton';
 import Velocity from 'velocity-vector';
 import 'velocity-vector/velocity.ui';
+import UserSettingsStore from 'matrix-react-sdk/lib/UserSettingsStore';
 
 const CALLOUT_ANIM_DURATION = 1000;
 
@@ -170,6 +170,9 @@ module.exports = React.createClass({
         const GroupsButton = sdk.getComponent('elements.GroupsButton');
         const SettingsButton = sdk.getComponent('elements.SettingsButton');
 
+        const groupsButton =  UserSettingsStore.isFeatureEnabled('feature_groups') ?
+            <GroupsButton tooltip={true} /> : null;
+
         return (
             <div className="mx_BottomLeftMenu">
                 <div className="mx_BottomLeftMenu_options">
@@ -183,7 +186,7 @@ module.exports = React.createClass({
                     <div ref={this._collectCreateRoomButton}>
                         <CreateRoomButton tooltip={true} />
                     </div>
-                    <GroupsButton tooltip={true} />
+                    { groupsButton }
                     <span className="mx_BottomLeftMenu_settings">
                         <SettingsButton tooltip={true} />
                     </span>