From 292e1248ccba07d3c0a147747eb1c7661c7a4d57 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Wed, 24 Feb 2016 11:42:19 -0500
Subject: Fix RHS usernames and intro message usernames

---
 web/react/components/rhs_thread.jsx        | 2 +-
 web/react/utils/channel_intro_messages.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/react/components/rhs_thread.jsx b/web/react/components/rhs_thread.jsx
index d007dd47f..4d770287c 100644
--- a/web/react/components/rhs_thread.jsx
+++ b/web/react/components/rhs_thread.jsx
@@ -188,7 +188,7 @@ export default class RhsThread extends React.Component {
                             if (UserStore.getCurrentId() === selected.user_id) {
                                 p = UserStore.getCurrentUser();
                             } else {
-                                p = profiles[selected.user_id];
+                                p = profiles[comPost.user_id];
                             }
                             return (
                                 <Comment
diff --git a/web/react/utils/channel_intro_messages.jsx b/web/react/utils/channel_intro_messages.jsx
index 79e58147f..ed94f94b8 100644
--- a/web/react/utils/channel_intro_messages.jsx
+++ b/web/react/utils/channel_intro_messages.jsx
@@ -47,7 +47,7 @@ export function createDMIntroMessage(channel) {
                 </div>
                 <div className='channel-intro-profile'>
                     <strong>
-                        <UserProfile userId={teammate.id}/>
+                        <UserProfile user={teammate}/>
                     </strong>
                 </div>
                 <p className='channel-intro-text'>
-- 
cgit v1.2.3-1-g7c22