From d7ec4cb181980dc15674181d32de193f85c913e4 Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Fri, 1 Sep 2017 17:22:18 -0300
Subject: [PATCH] fix room icon on header

---
 .../client/imports/components/main-content.css | 18 ++++++++++++++++++
 .../rocketchat-ui/client/views/app/room.html   |  4 +++-
 .../rocketchat-ui/client/views/app/room.js     |  9 ++++++++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/main-content.css b/packages/rocketchat-theme/client/imports/components/main-content.css
index d231b8dff400d..8372be1c52276 100644
--- a/packages/rocketchat-theme/client/imports/components/main-content.css
+++ b/packages/rocketchat-theme/client/imports/components/main-content.css
@@ -9,6 +9,24 @@
 	height: 100%;
 }
 
+.messages-container .room-icon {
+	&.online {
+		color: var(--status-online);
+	}
+
+	&.away {
+		color: var(--status-away);
+	}
+
+	&.busy {
+		color: var(--status-busy);
+	}
+
+	&.offline {
+		color: var(--status-invisible);
+	}
+}
+
 @media (width <= 780px) {
 	.main-content {
 		position: fixed;
diff --git a/packages/rocketchat-ui/client/views/app/room.html b/packages/rocketchat-ui/client/views/app/room.html
index cc520b850ed48..02932e6977735 100644
--- a/packages/rocketchat-ui/client/views/app/room.html
+++ b/packages/rocketchat-ui/client/views/app/room.html
@@ -14,7 +14,9 @@ <h2>
 							{{#if showToggleFavorite}}
 								<a href="#favorite" class="toggle-favorite"><i class="{{favorite}}" aria-label="{{_ favoriteLabel}}"></i></a>
 							{{/if}}
-							<i class="{{roomIcon}} status-{{userStatus}}"></i>
+
+							{{> icon block="room-icon" icon=roomIcon classes=userStatus}}
+
 							<span class="room-title">{{roomName}}</span>
 							{{#if secondaryName}}
 								<span class="secondary-name">@{{secondaryName}}</span>
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index ef9241126ea90..1d37dc85156cf 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -196,7 +196,14 @@ Template.room.helpers({
 		const roomData = Session.get(`roomData${ this._id }`);
 		if (!(roomData != null ? roomData.t : undefined)) { return ''; }
 
-		return RocketChat.roomTypes.getIcon(roomData != null ? roomData.t : undefined);
+		const roomIcon = RocketChat.roomTypes.getIcon(roomData != null ? roomData.t : undefined);
+
+		// Remove this 'codegueira' on header redesign
+		if (!roomIcon) {
+			return 'at';
+		}
+
+		return roomIcon;
 	},
 
 	userStatus() {