From e10e65945771cf38591d9af6f29f23555da18e19 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 9 May 2018 14:59:35 +0100
Subject: [PATCH] Take feature_sticker_messagse out of labs

---
 src/components/views/rooms/MessageComposer.js | 5 +----
 src/settings/Settings.js                      | 6 ------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 24b07eb3bf..28a90b375a 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -338,10 +338,7 @@ export default class MessageComposer extends React.Component {
                 }
             }
 
-            let stickerpickerButton;
-            if (SettingsStore.isFeatureEnabled('feature_sticker_messages')) {
-                stickerpickerButton = <Stickerpicker key='stickerpicker_controls_button' room={this.props.room} />;
-            }
+            const stickerpickerButton = <Stickerpicker key='stickerpicker_controls_button' room={this.props.room} />;
 
             controls.push(
                 <MessageComposerInput
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index d214d5417f..89a12580d6 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -94,12 +94,6 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
-    "feature_sticker_messages": {
-        isFeature: true,
-        displayName: _td("Sticker Messages"),
-        supportedLevels: LEVELS_FEATURE,
-        default: false,
-    },
     "MessageComposerInput.dontSuggestEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Disable Emoji suggestions while typing'),