diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-06-20 11:47:53 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-20 11:47:53 -0400 |
commit | 414b208100a36975d2fa238f4adfb33b20212122 (patch) | |
tree | c5821a854ed97d003808b2104781cf35ea48e498 /webapp/components/post_view/post_message_view | |
parent | 2e6fd031d15a9502e7a7a4536febfe49780c0697 (diff) | |
download | chat-414b208100a36975d2fa238f4adfb33b20212122.tar.gz chat-414b208100a36975d2fa238f4adfb33b20212122.tar.bz2 chat-414b208100a36975d2fa238f4adfb33b20212122.zip |
PLT-6885/PLT-6888 Fix custom emojis (#6694)
* Fix custom emojis
* Fix custom emoji reactions
Diffstat (limited to 'webapp/components/post_view/post_message_view')
-rw-r--r-- | webapp/components/post_view/post_message_view/index.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/post_view/post_message_view/index.js b/webapp/components/post_view/post_message_view/index.js index cf457a508..84682eb89 100644 --- a/webapp/components/post_view/post_message_view/index.js +++ b/webapp/components/post_view/post_message_view/index.js @@ -2,7 +2,7 @@ // See License.txt for license information. import {connect} from 'react-redux'; -import {getCustomEmojisAsMap} from 'mattermost-redux/selectors/entities/emojis'; +import {getCustomEmojisByName} from 'mattermost-redux/selectors/entities/emojis'; import {getBool} from 'mattermost-redux/selectors/entities/preferences'; import {getCurrentUserMentionKeys, getUsersByUsername} from 'mattermost-redux/selectors/entities/users'; @@ -20,7 +20,7 @@ function makeMapStateToProps() { let oldCustomEmoji; return function mapStateToProps(state, ownProps) { - const newCustomEmoji = getCustomEmojisAsMap(state); + const newCustomEmoji = getCustomEmojisByName(state); if (newCustomEmoji !== oldCustomEmoji) { emojiMap = new EmojiMap(newCustomEmoji); } |