PLT-6147 Fixed reactions not rendering properly while loading (#5958)

webapp/components/post_view/components/reaction_list_container.jsx

@@ -81,7 +81,6 @@ 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}
@@ -90,7 +89,4 @@ export default class ReactionListContainer extends React.Component {
             />
         );
     }
-
-        return null;
-    }
 }

webapp/components/post_view/components/reaction_list_view.jsx

@@ -13,9 +13,14 @@ 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 = [];
 
+        if (this.props.reactions) {
             for (const reaction of this.props.reactions) {
                 const emojiName = reaction.emoji_name;
 
@@ -26,6 +31,7 @@ export default class ReactionListView extends React.Component {
                     reactionsByName.set(emojiName, [reaction]);
                 }
             }
+        }
 
         const children = emojiNames.map((emojiName) => {
             return (

webapp/sass/layout/_post.scss

@@ -1287,10 +1287,6 @@ form {
 
         .post-reaction-list {
             min-height: 30px;
-
-            &:empty {
-                display: none;
-            }
         }
 
         .post-reaction {

webapp/stores/reaction_store.jsx

@@ -37,36 +37,36 @@ class ReactionStore extends EventEmitter {
     }
 
     addReaction(postId, reaction) {
-        const reactions = [];
+        let reactions = this.getReactions(postId) || [];
 
-        for (const existing of this.getReactions(postId)) {
+        // Make sure not to add duplicates
-            // make sure not to add duplicates
+        const existingIndex = reactions.findIndex((existing) => {
-            if (existing.user_id !== reaction.user_id || existing.post_id !== reaction.post_id ||
+            return existing.user_id === reaction.user_id && existing.post_id === reaction.post_id && existing.emoji_name === reaction.emoji_name;
-                existing.emoji_name !== reaction.emoji_name) {
+        });
-                reactions.push(existing);
-            }
-        }
 
-        reactions.push(reaction);
+        if (existingIndex === -1) {
+            reactions = [...reactions, reaction];
+        }
 
         this.setReactions(postId, reactions);
     }
 
     removeReaction(postId, reaction) {
-        const reactions = [];
+        let reactions = this.getReactions(postId) || [];
 
-        for (const existing of this.getReactions(postId)) {
+        const existingIndex = reactions.findIndex((existing) => {
-            if (existing.user_id !== reaction.user_id || existing.post_id !== reaction.post_id ||
+            return existing.user_id === reaction.user_id && existing.post_id === reaction.post_id && existing.emoji_name === reaction.emoji_name;
-                existing.emoji_name !== reaction.emoji_name) {
+        });
-                reactions.push(existing);
+
-            }
+        if (existingIndex !== -1) {
+            reactions = reactions.slice(0, existingIndex).concat(reactions.slice(existingIndex + 1));
         }
 
         this.setReactions(postId, reactions);
     }
 
     getReactions(postId) {
-        return this.reactions.get(postId) || [];
+        return this.reactions.get(postId);
     }
 
     handleEventPayload(payload) {