Take feature_sticker_messagse out of labs

lukebarnard1 · lukebarnard1 · commit 0a326dc6a02c · 2018-05-09T17:28:29.000+01:00
diff --git 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
@@ -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'),

Original file line number	Diff line number	Diff line change
`@@ -338,10 +338,7 @@ export default class MessageComposer extends React.Component {`
`338`	`338`	`}`
`339`	`339`	`}`
`340`	`340`
`341`		`- let stickerpickerButton;`
`342`		`- if (SettingsStore.isFeatureEnabled('feature_sticker_messages')) {`
`343`		`- stickerpickerButton = <Stickerpicker key='stickerpicker_controls_button' room={this.props.room} />;`
`344`		`- }`
	`341`	`+ const stickerpickerButton = <Stickerpicker key='stickerpicker_controls_button' room={this.props.room} />;`
`345`	`342`
`346`	`343`	`controls.push(`
`347`	`344`	`<MessageComposerInput`