imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1883 from matrix-org/luke/cement-sticker-messages

Browse source 
Take feature_sticker_messagse out of labs
This commit is contained in:
Luke Barnard 2018-05-09 16:52:20 +01:00 • committed by GitHub
commit 7d0406b430
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/views/rooms/MessageComposer.js
View file

@ -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