From 6a133bc034745209e84addc76f2cd52831ee4f29 Mon Sep 17 00:00:00 2001
From: Aviral Dasgupta <me@aviraldg.com>
Date: Tue, 5 Jul 2016 10:24:18 +0530
Subject: [PATCH] feat: and emojify name in MemberInfo

---
 src/components/views/rooms/MemberInfo.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index ddd0d1f6c6..0e14776e82 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -32,6 +32,7 @@ var Modal = require("../../../Modal");
 var sdk = require('../../../index');
 var UserSettingsStore = require('../../../UserSettingsStore');
 var createRoom = require('../../../createRoom');
+import {emojifyText} from '../../../HtmlUtils';
 
 module.exports = React.createClass({
     displayName: 'MemberInfo',
@@ -601,6 +602,8 @@ module.exports = React.createClass({
                 </div>
         }
 
+        let memberNameHTML = emojifyText(this.props.member.name);
+
         var MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
         var PowerSelector = sdk.getComponent('elements.PowerSelector');
         return (
@@ -610,7 +613,7 @@ module.exports = React.createClass({
                     <MemberAvatar onClick={this.onMemberAvatarClick} member={this.props.member} width={48} height={48} />
                 </div>
 
-                <h2>{ this.props.member.name }</h2>
+                <h2 dangerouslySetInnerHTML={memberNameHTML}></h2>
 
                 <div className="mx_MemberInfo_profile">
                     <div className="mx_MemberInfo_profileField">