summaryrefslogtreecommitdiffstats
path: root/web/react/utils/channel_intro_messages.jsx
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-02-24 12:23:34 -0500
committerJoram Wilander <jwawilander@gmail.com>2016-02-24 12:23:34 -0500
commit6f319fc64c9a947d8f076262aaab51354cb39ecd (patch)
treef5fbd282297f9c83ddbcc09d90332aa1baf26552 /web/react/utils/channel_intro_messages.jsx
parent0d70b53da8f31c7ce257f94324c4ae2093364068 (diff)
parent292e1248ccba07d3c0a147747eb1c7661c7a4d57 (diff)
downloadchat-6f319fc64c9a947d8f076262aaab51354cb39ecd.tar.gz
chat-6f319fc64c9a947d8f076262aaab51354cb39ecd.tar.bz2
chat-6f319fc64c9a947d8f076262aaab51354cb39ecd.zip
Merge pull request #2242 from mattermost/profiles-fix
Fix RHS usernames and intro message usernames
Diffstat (limited to 'web/react/utils/channel_intro_messages.jsx')
-rw-r--r--web/react/utils/channel_intro_messages.jsx2
1 files changed, 1 insertions, 1 deletions
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'>