From 96969e287a48ef389c4f3623699286637653f720 Mon Sep 17 00:00:00 2001
From: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Date: Mon, 13 Apr 2020 10:06:44 -0300
Subject: [PATCH] [FIX] Threads: Hide Usernames hides Full names. (#16959)

---
 app/theme/client/imports/general/base_old.css | 2 +-
 app/threads/client/flextab/thread.html        | 2 +-
 app/threads/client/flextab/thread.js          | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/theme/client/imports/general/base_old.css b/app/theme/client/imports/general/base_old.css
index 33c75af298e..dc786964fff 100644
--- a/app/theme/client/imports/general/base_old.css
+++ b/app/theme/client/imports/general/base_old.css
@@ -4848,7 +4848,7 @@ rc-old select,
 	display: block;
 }
 
-.rc-old .hide-usernames .message .user.user-card-message {
+.rc-old .hide-usernames .message .user.user-card-message .message-alias {
 	display: none;
 }
 
diff --git a/app/threads/client/flextab/thread.html b/app/threads/client/flextab/thread.html
index c5378fb8608..3677d402c8c 100644
--- a/app/threads/client/flextab/thread.html
+++ b/app/threads/client/flextab/thread.html
@@ -11,7 +11,7 @@
 			{{> icon block="contextual-bar__header-close-icon" icon="plus"}}
 		</button>
 	</header>
-	<section class="contextual-bar__content flex-tab threads dropzone {{dragAndDrop}}">
+	<section class="contextual-bar__content flex-tab threads dropzone {{dragAndDrop}} {{hideUsername}}">
 		<div class="dropzone-overlay {{isDropzoneDisabled}} background-transparent-darkest color-content-background-color">{{_ dragAndDropLabel}}</div>
 		<div class="thread-list js-scroll-thread">
 			<ul class="thread">
diff --git a/app/threads/client/flextab/thread.js b/app/threads/client/flextab/thread.js
index cf089f3dea8..5bdd2aba8b5 100644
--- a/app/threads/client/flextab/thread.js
+++ b/app/threads/client/flextab/thread.js
@@ -1,4 +1,5 @@
 import _ from 'underscore';
+import { Meteor } from 'meteor/meteor';
 import { Mongo } from 'meteor/mongo';
 import { Template } from 'meteor/templating';
 import { ReactiveDict } from 'meteor/reactive-dict';
@@ -12,6 +13,7 @@ import { Messages } from '../../../models';
 import { fileUpload } from '../../../ui/client/lib/fileUpload';
 import { dropzoneEvents, dropzoneHelpers } from '../../../ui/client/views/app/room';
 import './thread.html';
+import { getUserPreference } from '../../../utils';
 
 const sort = { ts: 1 };
 
@@ -76,6 +78,9 @@ Template.thread.helpers({
 			onKeyDown: (...args) => instance.chatMessages && instance.chatMessages.keydown.apply(instance.chatMessages, args),
 		};
 	},
+	hideUsername() {
+		return getUserPreference(Meteor.userId(), 'hideUsernames') ? 'hide-usernames' : undefined;
+	},
 });