From 2204863aa2f1d87f3ef2bb8bd4ccb18ac6edb679 Mon Sep 17 00:00:00 2001
From: apoorvapendse <apoorvavpendse@gmail.com>
Date: Fri, 14 Feb 2025 07:43:44 +0530
Subject: [PATCH] composebox_typeahead: Update order of user typeahead
 elements.

Also fixes the extra comma issue
linked below.
Fixes: https://chat.zulip.org/#narrow/channel/9-issues/topic/.F0.9F.8E.AF.20extraneous.20comma.20after.20pronouns/with/2088251.
---
 web/styles/typeahead.css              | 4 ++++
 web/templates/typeahead_list_item.hbs | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/web/styles/typeahead.css b/web/styles/typeahead.css
index 5f44de3678..59296f31c3 100644
--- a/web/styles/typeahead.css
+++ b/web/styles/typeahead.css
@@ -198,4 +198,8 @@
     i.zulip-icon-bot {
         align-self: center;
     }
+
+    .status-emoji {
+        margin-left: 0;
+    }
 }
diff --git a/web/templates/typeahead_list_item.hbs b/web/templates/typeahead_list_item.hbs
index 8ed963a815..5473b5fd07 100644
--- a/web/templates/typeahead_list_item.hbs
+++ b/web/templates/typeahead_list_item.hbs
@@ -41,15 +41,15 @@
     {{~#if is_bot}}
         <i class="zulip-icon zulip-icon-bot" aria-label="{{t 'Bot' }}"></i>
     {{/if}}
-    {{~#if has_pronouns}}
-        <span class="pronouns">{{pronouns}}{{#if (or has_secondary_html has_secondary)}},{{/if}}</span>
-    {{~/if}}
     {{~#if should_add_guest_user_indicator}}
         <i>({{t 'guest'}})</i>
     {{~/if}}
     {{~#if has_status}}
     {{> status_emoji status_emoji_info}}
     {{~/if}}
+    {{~#if has_pronouns}}
+        <span class="pronouns">{{pronouns}}{{#if (or has_secondary_html has_secondary)}},{{/if}}</span>
+    {{~/if}}
     {{~#if has_secondary_html}}
     <span class="autocomplete_secondary rendered_markdown single-line-rendered-markdown">{{rendered_markdown secondary_html}}</span>
     {{~else if has_secondary}}