From bf38ed22c4ef4e17610604ee320047393acb7072 Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Tue, 27 Feb 2018 17:20:03 -0300
Subject: [PATCH] fix livechat queue link

---
 packages/rocketchat-livechat/roomType.js      |  2 +-
 .../components/sidebar/sidebar-item.css       |  4 ----
 .../client/sidebarItem.html                   | 24 ++++++++++---------
 .../client/sidebarItem.js                     |  3 +++
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/packages/rocketchat-livechat/roomType.js b/packages/rocketchat-livechat/roomType.js
index 5a012f7edf5..27eeb36c958 100644
--- a/packages/rocketchat-livechat/roomType.js
+++ b/packages/rocketchat-livechat/roomType.js
@@ -25,7 +25,7 @@ class LivechatRoomType extends RoomTypeConfig {
 		super({
 			identifier: 'l',
 			order: 5,
-			icon: 'livechat',
+			// icon: 'livechat',
 			label: 'Livechat',
 			route: new LivechatRoomRoute()
 		});
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index 98f645f84ee..a723aaab68b 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -44,10 +44,6 @@
 		height: var(--sidebar-item-thumb-size-extended);
 	}
 
-	&__icon {
-		margin: 0 auto;
-	}
-
 	&__user-thumb {
 		width: var(--sidebar-item-thumb-size-extended);
 		height: var(--sidebar-item-thumb-size-extended);
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.html b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
index 6c975328cfb..91de8fc5e47 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarItem.html
+++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
@@ -1,19 +1,21 @@
 <template name="sidebarItem">
 	<li class="sidebar-item {{#if or unread alert }}sidebar-item--unread{{/if}} {{#if active}}sidebar-item--active{{/if}} {{#if toolbar}}popup-item{{/if}}" data-id="{{_id}}">
 		<a class="sidebar-item__link" href="{{#if route}}{{route}}{{else}}{{pathFor pathSection group=pathGroup}}{{/if}}" title="{{name}}">
-			<div class="sidebar-item__picture">
-				{{#if darken}}
-					{{#if icon}}
-						<div class="{{#if isRoom}}sidebar-item__room-type{{else}}sidebar-item__icon{{/if}}">
-							{{> icon block="sidebar-item__icon" icon=icon}}
+			{{#unless isLivechatQueue}}
+				<div class="sidebar-item__picture">
+					{{#if darken}}
+						{{#if icon}}
+							<div class="{{#if isRoom}}sidebar-item__room-type{{else}}sidebar-item__icon{{/if}}">
+								{{> icon block="sidebar-item__icon" icon=icon}}
+							</div>
+						{{/if}}
+					{{else}}
+						<div class="sidebar-item__user-thumb">
+							{{> avatar username=username roomIcon=icon}}
 						</div>
 					{{/if}}
-				{{else}}
-					<div class="sidebar-item__user-thumb">
-						{{> avatar username=username roomIcon=icon}}
-					</div>
-				{{/if}}
-			</div>
+				</div>
+			{{/unless}}
 			<div class="sidebar-item__body">
 				<div class="sidebar-item__message">
 					<div class="sidebar-item__message-top">
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.js b/packages/rocketchat-ui-sidenav/client/sidebarItem.js
index d4035b46c63..3a57603561f 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarItem.js
+++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.js
@@ -23,6 +23,9 @@ Template.sidebarItem.helpers({
 	},
 	mySelf() {
 		return this.t === 'd' && this.name === Meteor.user().username;
+	},
+	isLivechatQueue() {
+		return this.pathSection === 'livechat-queue';
 	}
 });