remove old style close on flextab

packages/rocketchat-lib/client/lib/RocketChatTabBar.js

@@ -58,6 +58,7 @@ export class RocketChatTabBar {
 		$('.flex-tab, .contextual-bar').css('width', button.width ? `${ button.width }px` : '');
 		this.template.set(button.template);
 		this.id.set(button.id);
+		return button;
 	}
 
 	close() {

packages/rocketchat-lib/client/lib/TabBar.js

@@ -53,9 +53,7 @@ RocketChat.TabBar = new (class TabBar {
 	}
 
 	getButton(id) {
-		const button = _.findWhere(this.buttons.get(), { id });
-
-		return !button.condition || button.condition();
+		return _.findWhere(this.buttons.get(), { id });
 	}
 
 	addGroup(id, groups) {

packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css

@@ -3,6 +3,7 @@
 .rooms-list {
 	position: relative;
 
+	overflow-x: hidden;
 	overflow-y: scroll;
 
 	flex: 1 1 auto;

packages/rocketchat-theme/client/imports/general/base_old.css

@@ -3463,10 +3463,6 @@ body:not(.is-cordova) {
 		}
 
 		& .content {
-			position: absolute;
-			top: 0;
-			left: 0;
-
 			overflow-x: hidden;
 			overflow-y: auto;
 
@@ -3565,7 +3561,7 @@ body:not(.is-cordova) {
 			}
 		}
 
-		& .close-flex-tab {
+		/*& .close-flex-tab {
 			position: absolute;
 			z-index: 20;
 			top: 3px;
@@ -3591,7 +3587,7 @@ body:not(.is-cordova) {
 					font-size: 10px;
 				}
 			}
-		}
+		}*/
 	}
 
 	& .flex-tab-bar {
@@ -3599,6 +3595,8 @@ body:not(.is-cordova) {
 
 		min-width: 40px;
 
+		border: 1px solid rgba(31, 35, 41, 0.08);
+
 		& .tab-button {
 			position: relative;
 
@@ -4455,7 +4453,7 @@ body:not(.is-cordova) {
 	& .forgot-password,
 	& .back-to-login {
 		margin-top: 12px;
-		
+
 		& button {
 			margin: 0 auto;
 		}

packages/rocketchat-ui-flextab/client/flexTabBar.html

@@ -3,9 +3,17 @@
 		<div class="flex-tab-container border-component-color {{opened}}">
 			<section class="flex-tab border-component-color content-background-color">
 				<div class="content flex-tab__content">
-					<button class="close-flex-tab secondary-font-color">
-						<span class="secondary-background-color"><i class="icon-cancel"></i></span>
-					</button>
+					<header class="contextual-bar__header">
+						{{#with headerData}}
+							<div class="contextual-bar__header-data">
+								{{> icon block="contextual-bar__header-icon" icon=icon}}
+								<h1 class="contextual-bar__header-title">{{_ label}}</h1>
+							</div>
+						{{/with}}
+						<button class="contextual-bar__header-close js-close close-flex-tab">
+							{{> icon block="contextual-bar__header-close-icon" icon="plus"}}
+						</button>
+					</header>
 					{{> Template.dynamic template=template data=flexData}}
 				</div>
 			</section>

packages/rocketchat-ui-flextab/client/flexTabBar.js

@@ -13,6 +13,9 @@ const commonHelpers = {
 };
 
 Template.flexTabBar.helpers({
+	headerData() {
+		return Template.instance().tabBar.getData();
+	},
 	...commonHelpers,
 	buttons() {
 		return RocketChat.TabBar.getButtons().filter(button => {
@@ -97,7 +100,7 @@ Template.flexTabBar.events({
 
 		$flexTab.attr('template', this.template);
 
-		instance.tabBar.open(this);
+		instance.tabBar.open(this.id);
 	},
 
 	'click .close-flex-tab'(event, instance) {

packages/rocketchat-ui-flextab/client/tabs/userInfo.html

@@ -1,9 +1,11 @@
 <template name="userInfo">
-	<header class="contextual-bar__header">
-		<button class="contextual-bar__header-close js-close">
-			{{> icon block="contextual-bar__header-close-icon" icon="plus"}}
-		</button>
-	</header>
+	{{#unless hideHeader}}
+		<header class="contextual-bar__header">
+			<button class="contextual-bar__header-close js-close">
+				{{> icon block="contextual-bar__header-close-icon" icon="plus"}}
+			</button>
+		</header>
+	{{/unless}}
 
 	{{#if isLoading}}
 		{{> loading}}
@@ -18,7 +20,7 @@
 							{{> avatar username=username}}
 						</div>
 						<h3 title="{{name}}" class="rc-user-info__name"><i class="status-{{status}}"></i> {{name}}</h3>
-						<p class="rc-user-info__username">@{{username}}</p>
+						{{#if username}}<p class="rc-user-info__username">@{{username}}</p>{{/if}}
 					</div>
 
 					<div class="rc-user-info-action">

packages/rocketchat-ui-flextab/client/tabs/userInfo.js

@@ -11,6 +11,9 @@ const more = function() {
 
 
 Template.userInfo.helpers({
+	hideHeader() {
+		return ['Template.adminUserInfo', 'adminUserInfo'].includes(Template.parentData(2).viewName);
+	},
 	moreActions: more,
 
 	actions() {