From 8e36816bde97eaa435a4c7c9cbdf6daab693ba89 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 12 Mar 2020 12:50:32 +0530
Subject: [PATCH] UX: respect `prioritize_username_in_ux` setting for user
 avatar title

---
 app/assets/javascripts/discourse/helpers/user-avatar.js.es6 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
index b46a49d6ff2..f306a0356f9 100644
--- a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
@@ -1,6 +1,7 @@
 import { get } from "@ember/object";
 import { registerUnbound } from "discourse-common/lib/helpers";
 import { avatarImg, formatUsername } from "discourse/lib/utilities";
+import { prioritizeNameInUx } from "discourse/lib/settings";
 
 let _customAvatarHelpers;
 
@@ -42,7 +43,9 @@ function renderAvatar(user, options) {
       return "";
     }
 
-    let displayName = name || formatUsername(username);
+    let displayName = prioritizeNameInUx(name, this.siteSettings)
+      ? name
+      : formatUsername(username);
 
     let title = options.title;
     if (!title && !options.ignoreTitle) {