From 63cdb89144f27929928f819b4ffae936ff79ac15 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Tue, 4 Apr 2017 00:21:15 -0400
Subject: PLT-6147 Fixed reactions not rendering properly while loading (#5958)

---
 .../post_view/components/reaction_list_container.jsx | 18 +++++++-----------
 .../post_view/components/reaction_list_view.jsx      | 20 +++++++++++++-------
 2 files changed, 20 insertions(+), 18 deletions(-)

(limited to 'webapp/components/post_view')

diff --git a/webapp/components/post_view/components/reaction_list_container.jsx b/webapp/components/post_view/components/reaction_list_container.jsx
index 906145eed..cdc58003b 100644
--- a/webapp/components/post_view/components/reaction_list_container.jsx
+++ b/webapp/components/post_view/components/reaction_list_container.jsx
@@ -81,16 +81,12 @@ export default class ReactionListContainer extends React.Component {
     }
 
     render() {
-        if (this.props.post.has_reactions && this.state.reactions.length > 0) {
-            return (
-                <ReactionListView
-                    post={this.props.post}
-                    reactions={this.state.reactions}
-                    emojis={this.state.emojis}
-                />
-            );
-        }
-
-        return null;
+        return (
+            <ReactionListView
+                post={this.props.post}
+                reactions={this.state.reactions}
+                emojis={this.state.emojis}
+            />
+        );
     }
 }
diff --git a/webapp/components/post_view/components/reaction_list_view.jsx b/webapp/components/post_view/components/reaction_list_view.jsx
index c322ce727..b6c4b3a19 100644
--- a/webapp/components/post_view/components/reaction_list_view.jsx
+++ b/webapp/components/post_view/components/reaction_list_view.jsx
@@ -13,17 +13,23 @@ export default class ReactionListView extends React.Component {
     }
 
     render() {
+        if (!this.props.post.has_reactions || (this.props.reactions && this.props.reactions.length === 0)) {
+            return null;
+        }
+
         const reactionsByName = new Map();
         const emojiNames = [];
 
-        for (const reaction of this.props.reactions) {
-            const emojiName = reaction.emoji_name;
+        if (this.props.reactions) {
+            for (const reaction of this.props.reactions) {
+                const emojiName = reaction.emoji_name;
 
-            if (reactionsByName.has(emojiName)) {
-                reactionsByName.get(emojiName).push(reaction);
-            } else {
-                emojiNames.push(emojiName);
-                reactionsByName.set(emojiName, [reaction]);
+                if (reactionsByName.has(emojiName)) {
+                    reactionsByName.get(emojiName).push(reaction);
+                } else {
+                    emojiNames.push(emojiName);
+                    reactionsByName.set(emojiName, [reaction]);
+                }
             }
         }
 
-- 
cgit v1.2.3-1-g7c22