diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-title.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-title.hbs
index 0c097c46af8..0fadcf04f7d 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-title.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-title.hbs
@@ -19,7 +19,9 @@
{{this.usernames}}
{{else}}
{{#let @channel.chatable.users.firstObject as |user|}}
- {{user.username}}
+
+
+
{{#if this.showUserStatus}}
{{/let}}
{{/if}}
- {{else}}
- Add users
{{/if}}
diff --git a/plugins/chat/test/javascripts/components/chat-channel-title-test.js b/plugins/chat/test/javascripts/components/chat-channel-title-test.js
index 03cbe9a6879..bac19e1a5f5 100644
--- a/plugins/chat/test/javascripts/components/chat-channel-title-test.js
+++ b/plugins/chat/test/javascripts/components/chat-channel-title-test.js
@@ -80,6 +80,24 @@ module("Discourse Chat | Component | chat-channel-title", function (hooks) {
);
});
+ test("direct message channel - one user showing full name", async function (assert) {
+ this.siteSettings.prioritize_username_in_ux = true;
+ this.user = fabricators.user({
+ username: "joffrey",
+ name: "Joffrey Baratheon",
+ });
+ this.channel = fabricators.directMessageChannel({
+ chatable: fabricators.directMessage({ users: [this.user] }),
+ });
+
+ await render(hbs``);
+
+ assert
+ .dom(".chat-user-display-name__username.-first")
+ .hasText(this.user.username);
+ assert.dom(".chat-user-display-name__name").hasText(this.user.name);
+ });
+
test("direct message channel - multiple users", async function (assert) {
const channel = fabricators.directMessageChannel();