From 09f6fccae105c5946e4e0fcbac59c625f23fd63e Mon Sep 17 00:00:00 2001
From: Nat <natalie.tay@discourse.org>
Date: Wed, 26 Mar 2025 11:37:10 +0800
Subject: [PATCH] lint

---
 .../solved-unaccept-answer-button.gjs         | 20 ++++++++++++++-----
 assets/stylesheets/solutions.scss             |  3 ++-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/assets/javascripts/discourse/components/solved-unaccept-answer-button.gjs b/assets/javascripts/discourse/components/solved-unaccept-answer-button.gjs
index ef3b3ff..5f125d5 100644
--- a/assets/javascripts/discourse/components/solved-unaccept-answer-button.gjs
+++ b/assets/javascripts/discourse/components/solved-unaccept-answer-button.gjs
@@ -1,11 +1,12 @@
 import Component from "@glimmer/component";
-import { htmlSafe } from "@ember/template";
 import { action } from "@ember/object";
 import { service } from "@ember/service";
+import { htmlSafe } from "@ember/template";
 import DButton from "discourse/components/d-button";
 import icon from "discourse/helpers/d-icon";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import { formatUsername } from "discourse/lib/utilities";
 import { i18n } from "discourse-i18n";
 import DTooltip from "float-kit/components/d-tooltip";
 
@@ -51,12 +52,21 @@ export default class SolvedUnacceptAnswerButton extends Component {
   }
 
   get solvedBy() {
-    const username = this.args.post.topic.accepted_answer.accepter_username
-    if (this.siteSettings.show_who_marked_solved && this.args.post.topic.accepted_answer.accepter_username) {
+    if (!this.siteSettings.show_who_marked_solved) {
+      return;
+    }
+
+    const username = this.args.post.topic.accepted_answer.accepter_username;
+    const name = this.args.post.topic.accepted_answer.accepter_name;
+    const displayedName =
+      this.siteSettings.display_name_on_posts && name
+        ? name
+        : formatUsername(username);
+    if (this.args.post.topic.accepted_answer.accepter_username) {
       return i18n("solved.marked_solved_by", {
-        username,
+        username: displayedName,
         username_lower: username,
-      })
+      });
     }
   }
 
diff --git a/assets/stylesheets/solutions.scss b/assets/stylesheets/solutions.scss
index 2ffab94..06209e4 100644
--- a/assets/stylesheets/solutions.scss
+++ b/assets/stylesheets/solutions.scss
@@ -99,6 +99,7 @@ aside.quote.accepted-answer {
   display: inline-block;
 }
 
-.post-action-menu__solved-accepted-tooltip-content .fk-d-tooltip__inner-content {
+.post-action-menu__solved-accepted-tooltip-content
+  .fk-d-tooltip__inner-content {
   display: block;
 }