From 35a2012479d5b50e8b8edc2ef2db326e118c0358 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Mon, 22 Apr 2019 15:02:14 -0300
Subject: [PATCH 1/2] Use main message as thread tab title

---
 .../client/imports/components/contextual-bar.css      |  9 +++++++++
 app/threads/client/flextab/thread.html                |  5 +++--
 app/threads/client/flextab/thread.js                  | 11 +++++------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/theme/client/imports/components/contextual-bar.css b/app/theme/client/imports/components/contextual-bar.css
index 7d45730a97df2..67ac24cf86d0f 100644
--- a/app/theme/client/imports/components/contextual-bar.css
+++ b/app/theme/client/imports/components/contextual-bar.css
@@ -65,11 +65,15 @@
 
 		&-data {
 			display: flex;
+			overflow: hidden;
 			flex: 1 1;
 			align-items: center;
 		}
 
 		&-icon {
+
+			flex: 0 0 auto;
+
 			margin: 0 0.25rem;
 
 			font-size: 22px;
@@ -80,10 +84,15 @@
 		}
 
 		&-title {
+
+			overflow: hidden;
 			flex: 1;
 
 			margin: 0 0.25rem;
 
+			white-space: nowrap;
+			text-overflow: ellipsis;
+
 			font-size: 16px;
 			font-weight: 400;
 		}
diff --git a/app/threads/client/flextab/thread.html b/app/threads/client/flextab/thread.html
index 64d88d2c8735a..62bf7571cc3e3 100644
--- a/app/threads/client/flextab/thread.html
+++ b/app/threads/client/flextab/thread.html
@@ -2,8 +2,9 @@
 	<header class="contextual-bar__header">
 		<div class="contextual-bar__header-data">
 			{{> icon block="contextual-bar__header-icon" icon='thread'}}
-			<h2 class="contextual-bar__header-title">{{_ 'Thread'}}
-				<sub class="contextual-bar__header-description">{{ room.fname }}</sub>
+			<h2 class="contextual-bar__header-title">
+				<span class="message-body--unstyled">{{threadTitle}}</span>
+				<sub class="contextual-bar__header-description">{{room.fname}}</sub>
 			</h2>
 		</div>
 		<button class="contextual-bar__header-close js-close">
diff --git a/app/threads/client/flextab/thread.js b/app/threads/client/flextab/thread.js
index 96f70d058cd37..eaec26f4e13ab 100644
--- a/app/threads/client/flextab/thread.js
+++ b/app/threads/client/flextab/thread.js
@@ -1,18 +1,14 @@
+import _ from 'underscore';
 import { Mongo } from 'meteor/mongo';
 import { Template } from 'meteor/templating';
 import { ReactiveDict } from 'meteor/reactive-dict';
 import { Tracker } from 'meteor/tracker';
-
-import _ from 'underscore';
-
 import { ChatMessages } from '../../../ui';
-import { call } from '../../../ui-utils';
+import { normalizeThreadMessage, call } from '../../../ui-utils/client';
 import { messageContext } from '../../../ui-utils/client/lib/messageContext';
 import { Messages } from '../../../models';
 import { lazyloadtick } from '../../../lazy-load';
-
 import { upsert } from '../upsert';
-
 import './thread.html';
 
 const sort = { ts: 1 };
@@ -31,6 +27,9 @@ Template.thread.events({
 });
 
 Template.thread.helpers({
+	threadTitle() {
+		return normalizeThreadMessage(Template.currentData().mainMessage);
+	},
 	mainMessage() {
 		return Template.parentData().mainMessage;
 	},

From 95ec4c97a3d35726c98fdbd79774ea7a26c29f1c Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Mon, 22 Apr 2019 15:26:24 -0300
Subject: [PATCH 2/2] Remove room name from thread tab title

---
 app/threads/client/flextab/thread.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/threads/client/flextab/thread.html b/app/threads/client/flextab/thread.html
index 62bf7571cc3e3..c75c6b5192857 100644
--- a/app/threads/client/flextab/thread.html
+++ b/app/threads/client/flextab/thread.html
@@ -4,7 +4,7 @@
 			{{> icon block="contextual-bar__header-icon" icon='thread'}}
 			<h2 class="contextual-bar__header-title">
 				<span class="message-body--unstyled">{{threadTitle}}</span>
-				<sub class="contextual-bar__header-description">{{room.fname}}</sub>
+				{{!-- <sub class="contextual-bar__header-description">{{room.fname}}</sub> --}}
 			</h2>
 		</div>
 		<button class="contextual-bar__header-close js-close">