matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-20 16:22:28 +03:00
Code Activity

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
parent bcf003757c e10e659457
commit 7d0406b430
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