From: Tom Hughes <tom@compton.nu>
Date: Tue, 21 May 2024 17:34:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4822'
X-Git-Tag: live~544
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/56a34d85ccacb9068f4c2dae0be1991b31a82e16?hp=89cac21fe49ecdfe0566656af38ee2d99564d032

Merge remote-tracking branch 'upstream/pull/4822'
---

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 8942eb49c..dfe74a750 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -83,7 +83,9 @@
       <div class='d-inline-flex dropdown user-menu logged-in'>
         <button class='dropdown-toggle btn btn-outline-secondary border-secondary-subtle bg-body text-secondary px-2 py-1 flex-grow-1' type='button' data-bs-toggle='dropdown'>
           <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25, :class => "user_thumbnail_tiny rounded-1 bg-body") %>
-          <%= render :partial => "layouts/inbox" %>
+          <% if current_user.new_messages.size > 0 %>
+            <span class="badge count-number m-1"><%= current_user.new_messages.size %></span>
+          <% end %>
           <span class="user-button">
             <span class='username'>
               <%= current_user.display_name %>
diff --git a/app/views/layouts/_inbox.html.erb b/app/views/layouts/_inbox.html.erb
deleted file mode 100644
index 2f5a63753..000000000
--- a/app/views/layouts/_inbox.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% if current_user.new_messages.size > 0 %>
-<span id="inboxanchor" class="badge count-number m-1"><%= current_user.new_messages.size %></span>
-<% end %>