From e6d71cad1f62aa85b4e3fbd70eaa89f00c9de397 Mon Sep 17 00:00:00 2001
From: Lauryn Menard <lauryn@zulip.com>
Date: Fri, 14 Mar 2025 20:55:39 +0100
Subject: [PATCH] message-edit-history: Show channel change before topic
 change.

---
 web/templates/message_edit_history.hbs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/web/templates/message_edit_history.hbs b/web/templates/message_edit_history.hbs
index dd83732b57..9ee94e3cc4 100644
--- a/web/templates/message_edit_history.hbs
+++ b/web/templates/message_edit_history.hbs
@@ -27,6 +27,13 @@
             <div class="message_row{{#unless is_stream}} private-message{{/unless}}" role="listitem">
                 <div class="messagebox">
                     <div class="messagebox-content">
+                        {{#if stream_changed}}
+                        <div class="message_content message_edit_history_content">
+                            <p>{{t "Channel" }}: <span class="highlight_text_inserted">{{ new_stream }}</span>
+                                <span class="highlight_text_deleted">{{ prev_stream }}</span>
+                            </p>
+                        </div>
+                        {{/if}}
                         {{#if topic_edited}}
                         <div class="message_content message_edit_history_content">
                             <p>{{t "Topic" }}:
@@ -35,13 +42,6 @@
                             </p>
                         </div>
                         {{/if}}
-                        {{#if stream_changed}}
-                        <div class="message_content message_edit_history_content">
-                            <p>{{t "Channel" }}: <span class="highlight_text_inserted">{{ new_stream }}</span>
-                                <span class="highlight_text_deleted">{{ prev_stream }}</span>
-                            </p>
-                        </div>
-                        {{/if}}
                         {{#if body_to_render}}
                         <div class="message_content rendered_markdown message_edit_history_content">
                             {{ rendered_markdown body_to_render}}