From 277a6dee10ef23e81b8237b3094a44d0a84f9436 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 10 Nov 2017 15:38:32 +0000
Subject: [PATCH] Make groups a fully-fleged baked-in feature

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

diff --git a/src/components/structures/BottomLeftMenu.js b/src/components/structures/BottomLeftMenu.js
index 4014261c..5b209d28 100644
--- a/src/components/structures/BottomLeftMenu.js
+++ b/src/components/structures/BottomLeftMenu.js
@@ -170,9 +170,6 @@ 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">
@@ -186,12 +183,12 @@ module.exports = React.createClass({
                     <div ref={this._collectCreateRoomButton}>
                         <CreateRoomButton tooltip={true} />
                     </div>
-                    { groupsButton }
+                    <GroupsButton tooltip={true} />
                     <span className="mx_BottomLeftMenu_settings">
                         <SettingsButton tooltip={true} />
                     </span>
                 </div>
             </div>
         );
-    }
+    },
 });