From f39c8dd5823699876f0b6a40ef49a0e4afd52307 Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Sat, 5 Apr 2025 22:17:54 +0300
Subject: [PATCH] Show valid username in header when renaming

---
 app/views/layouts/_header.html.erb |  2 +-
 test/system/account_rename_test.rb | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 test/system/account_rename_test.rb

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 69e323a99..62691fbbf 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -75,7 +75,7 @@
             <span class="badge count-number position-static m-1"><%= current_user.new_messages.size %></span>
           <% end %>
           <span class='username align-middle text-truncate' dir='auto'>
-            <%= current_user.display_name %>
+            <%= current_user.display_name_was %>
           </span>
         </button>
         <div class='dropdown-menu dropdown-menu-end'>
diff --git a/test/system/account_rename_test.rb b/test/system/account_rename_test.rb
new file mode 100644
index 000000000..a52fda6eb
--- /dev/null
+++ b/test/system/account_rename_test.rb
@@ -0,0 +1,19 @@
+require "application_system_test_case"
+
+class AccountRenameTest < ApplicationSystemTestCase
+  test "renaming to invalid name shouldn't alter user button" do
+    user = create(:user, :display_name => "Valid User")
+    sign_in_as(user)
+
+    visit account_path
+
+    assert_button "Valid User"
+    assert_field "Display Name", :with => "Valid User"
+
+    fill_in "Display Name", :with => "x"
+    click_on "Save Changes"
+
+    assert_button "Valid User"
+    assert_field "Display Name", :with => "x"
+  end
+end
-- 
2.39.5