From 414b208100a36975d2fa238f4adfb33b20212122 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Tue, 20 Jun 2017 11:47:53 -0400
Subject: PLT-6885/PLT-6888 Fix custom emojis (#6694)

* Fix custom emojis

* Fix custom emoji reactions
---
 webapp/components/post_view/post_message_view/index.js | 4 ++--
 webapp/components/post_view/reaction/index.js          | 2 +-
 webapp/components/post_view/reaction_list/index.js     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'webapp/components')

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);
         }
diff --git a/webapp/components/post_view/reaction/index.js b/webapp/components/post_view/reaction/index.js
index 9bb2524a1..b19e28f8d 100644
--- a/webapp/components/post_view/reaction/index.js
+++ b/webapp/components/post_view/reaction/index.js
@@ -20,7 +20,7 @@ function makeMapStateToProps() {
         if (Emoji.EmojiIndicesByAlias.has(ownProps.emojiName)) {
             emoji = Emoji.Emojis[Emoji.EmojiIndicesByAlias.get(ownProps.emojiName)];
         } else {
-            emoji = ownProps.emojis[ownProps.emojiName];
+            emoji = ownProps.emojis.get(ownProps.emojiName);
         }
 
         return {
diff --git a/webapp/components/post_view/reaction_list/index.js b/webapp/components/post_view/reaction_list/index.js
index 4fc9355d9..ee807ca88 100644
--- a/webapp/components/post_view/reaction_list/index.js
+++ b/webapp/components/post_view/reaction_list/index.js
@@ -4,7 +4,7 @@
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import {makeGetReactionsForPost} from 'mattermost-redux/selectors/entities/posts';
-import {getCustomEmojisAsMap} from 'mattermost-redux/selectors/entities/emojis';
+import {getCustomEmojisByName} from 'mattermost-redux/selectors/entities/emojis';
 
 import * as Actions from 'mattermost-redux/actions/posts';
 
@@ -17,7 +17,7 @@ function makeMapStateToProps() {
         return {
             ...ownProps,
             reactions: getReactionsForPost(state, ownProps.post.id),
-            emojis: getCustomEmojisAsMap(state)
+            emojis: getCustomEmojisByName(state)
         };
     };
 }
-- 
cgit v1.2.3-1-g7c22