Merge pull request #8210 from RocketChat/fix-avatar

[FIX] User avatar in DM list.
RocketChat · Sep 19, 2017 · 9fc4540 · 9fc4540
2 parents e20195a + 9f595d2
commit 9fc4540
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/rocketchat-ui-sidenav/client/chatRoomItem.js b/packages/rocketchat-ui-sidenav/client/chatRoomItem.js
@@ -1,6 +1,6 @@
 Template.chatRoomItem.helpers({
 	roomData() {
-		let name = this.name;
+		let {name} = this;
 		const realNameForDirectMessages = RocketChat.settings.get('UI_Use_Real_Name') && this.t === 'd';
 		const realNameForChannel = RocketChat.settings.get('UI_Allow_room_names_with_special_chars') && this.t !== 'd';
 		if ((realNameForDirectMessages || realNameForChannel) && this.fname) {
@@ -31,6 +31,7 @@ Template.chatRoomItem.helpers({
 			...this,
 			icon,
 			avatar,
+			username : this.name,
 			route: RocketChat.roomTypes.getRouteLink(this.t, this),
 			name,
 			unread,

diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.html b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
@@ -10,7 +10,7 @@
 				{{else}}
 					{{#if avatar}}
 						<div class="sidebar-item__user-thumb">
-							{{> avatar username=name}}
+							{{> avatar username=username}}
 						</div>
 					{{/if}}
 				{{/if}}