From 0cc5854b64756010c1d3e85a2021bf7a7010e63b Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Tue, 1 Aug 2017 13:27:18 -0400
Subject: Fixed error thrown when viewing a channel containing an invalid emoji
 reaction (#7080)

* Added better error handling for when reacting with a non-existant emoji

* Re-added emoji aliases ca, za, and pk
---
 webapp/components/post_view/reaction/index.js     | 7 ++++++-
 webapp/components/post_view/reaction/reaction.jsx | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'webapp/components/post_view')

diff --git a/webapp/components/post_view/reaction/index.js b/webapp/components/post_view/reaction/index.js
index b19e28f8d..74edd1324 100644
--- a/webapp/components/post_view/reaction/index.js
+++ b/webapp/components/post_view/reaction/index.js
@@ -23,13 +23,18 @@ function makeMapStateToProps() {
             emoji = ownProps.emojis.get(ownProps.emojiName);
         }
 
+        let emojiImageUrl = '';
+        if (emoji) {
+            emojiImageUrl = getEmojiImageUrl(emoji);
+        }
+
         return {
             ...ownProps,
             profiles,
             otherUsersCount: ownProps.reactions.length - profiles.length,
             currentUserId: getCurrentUserId(state),
             reactionCount: ownProps.reactions.length,
-            emojiImageUrl: getEmojiImageUrl(emoji)
+            emojiImageUrl
         };
     };
 }
diff --git a/webapp/components/post_view/reaction/reaction.jsx b/webapp/components/post_view/reaction/reaction.jsx
index f256a1fb5..673f8fd7f 100644
--- a/webapp/components/post_view/reaction/reaction.jsx
+++ b/webapp/components/post_view/reaction/reaction.jsx
@@ -93,6 +93,10 @@ export default class Reaction extends React.PureComponent {
     }
 
     render() {
+        if (!this.props.emojiImageUrl) {
+            return null;
+        }
+
         let currentUserReacted = false;
         const users = [];
         const otherUsersCount = this.props.otherUsersCount;
-- 
cgit v1.2.3-1-g7c22