[FIX] Sidenav roomlist

packages/rocketchat-lib/lib/roomTypesCommon.js

@@ -10,11 +10,12 @@ this.roomTypesCommon = class {
 	@param identifier An identifier to the room type. If a real room, MUST BE the same of `db.rocketchat_room.t` field, if not, can be null
 	@param order Order number of the type
 	@param config
-	template: template name to render on sideNav
 	icon: icon class
+	label: i18n label
 	route:
 	name: route name
 	action: route action function
+	identifier: room type identifier
 	*/
 
 	add(identifier = Random.id(), order, config) {
@@ -29,7 +30,7 @@ this.roomTypesCommon = class {
 			identifier,
 			order
 		});
-		this.roomTypes[identifier] = config;
+		this.roomTypes[identifier] = {...config, identifier};
 		if (config.route && config.route.path && config.route.name && config.route.action) {
 			const routeConfig = {
 				name: config.route.name,

packages/rocketchat-lib/startup/defaultRoomTypes.js

@@ -1,12 +1,12 @@
 /* globals openRoom */
 RocketChat.roomTypes.add(null, 0, {
-	template: 'starredRooms',
-	icon: 'icon-star'
+	icon: 'icon-star',
+	label: 'Favorites'
 });
 
 RocketChat.roomTypes.add('c', 10, {
-	template: 'channels',
 	icon: 'icon-hash',
+	label: 'Channels',
 	route: {
 		name: 'channel',
 		path: '/channel/:name',
@@ -37,8 +37,8 @@ RocketChat.roomTypes.add('c', 10, {
 });
 
 RocketChat.roomTypes.add('d', 20, {
-	template: 'directMessages',
 	icon: 'icon-at',
+	label: 'Direct_Messages',
 	route: {
 		name: 'direct',
 		path: '/direct/:username',
@@ -94,8 +94,8 @@ RocketChat.roomTypes.add('d', 20, {
 });
 
 RocketChat.roomTypes.add('p', 30, {
-	template: 'privateGroups',
 	icon: 'icon-lock',
+	label: 'Private_Groups',
 	route: {
 		name: 'group',
 		path: '/group/:name',

packages/rocketchat-livechat/roomType.js

@@ -1,8 +1,8 @@
 /* globals openRoom, LivechatInquiry */
 
 RocketChat.roomTypes.add('l', 5, {
-	template: 'livechat',
 	icon: 'icon-chat-empty',
+	label: 'Livechat',
 	route: {
 		name: 'live',
 		path: '/live/:code(\\d+)',

packages/rocketchat-theme/client/imports/base.less

@@ -1630,16 +1630,23 @@ label.required::after {
 		}
 	}
 
-	.unread-rooms-mode {
+	.unread-rooms-mode,
+	.unread-rooms-mode + ul {
 		max-height: 0;
 		opacity: 0;
 		overflow: hidden;
+		margin: 0;
+	}
 
-		&.has-unread {
-			transition: max-height 1s ease-in, opacity 0.5s linear;
-			max-height: 5000px;
-			opacity: 1;
-		}
+	.unread-rooms-mode.has-unread {
+		margin: 25px 0 0;
+	}
+
+	.unread-rooms-mode.has-unread,
+	.unread-rooms-mode.has-unread + ul {
+		transition: max-height 1s ease-in, opacity 0.5s linear;
+		max-height: 5000px;
+		opacity: 1;
 	}
 }
 

packages/rocketchat-theme/client/imports/rtl.less

@@ -109,7 +109,7 @@
 				direction: rtl;
 				.padding-right(8px);
 
-				h3.add-room {
+				h3.room-type {
 					i {
 						.left(6px);
 					}
@@ -200,7 +200,7 @@
 		h3 {
 			.padding-right(10px);
 
-			&.add-room {
+			&.room-type {
 				i {
 					.left(6px);
 				}