From b2bd4500ab97fe45fb1f48bfcc65ff82592628a8 Mon Sep 17 00:00:00 2001
From: Vector73 <v.shm.kunal@gmail.com>
Date: Mon, 7 Jul 2025 09:20:08 +0000
Subject: [PATCH] stream_settings: Reorder settings in advanced configuration
 section.

---
 .../stream_settings/stream_types.hbs          | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/web/templates/stream_settings/stream_types.hbs b/web/templates/stream_settings/stream_types.hbs
index 0fb71e9020..48709b8b4f 100644
--- a/web/templates/stream_settings/stream_types.hbs
+++ b/web/templates/stream_settings/stream_types.hbs
@@ -82,7 +82,7 @@
     <div class="advance-config-title-container {{#if is_stream_edit}}subsection-header{{/if}}">
         <div class="advance-config-toggle-area">
             <i class="fa fa-sm fa-caret-right toggle-advanced-configurations-icon" aria-hidden="true"></i>
-            <h4 class="stream_setting_subsection_title"><span>{{t 'Advanced configurations' }}</span></h4>
+            <h4 class="stream_setting_subsection_title"><span>{{t 'Advanced configuration' }}</span></h4>
         </div>
         {{#if is_stream_edit}}
             {{> ../settings/settings_save_discard_widget section_name="stream-permissions" }}
@@ -93,24 +93,6 @@
             {{t 'Organization administrators can automatically administer all channels.'}}
         </div>
 
-        {{> ../settings/group_setting_value_pill_input
-          setting_name="can_send_message_group"
-          label=group_setting_labels.can_send_message_group
-          prefix=prefix
-          help_link="/help/stream-sending-policy" }}
-
-        <div class="input-group">
-            <label for="{{prefix}}topics_policy" class="settings-field-label">{{> stream_topics_policy_label .}}</label>
-            <select name="stream-topics-policy-setting" id="{{prefix}}topics_policy" class="prop-element settings_select bootstrap-focus-style" data-setting-widget-type="string">
-                {{> ../settings/dropdown_options_widget option_values=stream_topics_policy_values}}
-            </select>
-        </div>
-
-        {{> ../settings/group_setting_value_pill_input
-          setting_name="can_administer_channel_group"
-          label=group_setting_labels.can_administer_channel_group
-          prefix=prefix }}
-
         {{> ../settings/group_setting_value_pill_input
           setting_name="can_subscribe_group"
           label=group_setting_labels.can_subscribe_group
@@ -126,6 +108,19 @@
           label=group_setting_labels.can_remove_subscribers_group
           prefix=prefix }}
 
+        {{> ../settings/group_setting_value_pill_input
+          setting_name="can_send_message_group"
+          label=group_setting_labels.can_send_message_group
+          prefix=prefix
+          help_link="/help/stream-sending-policy" }}
+
+        <div class="input-group">
+            <label for="{{prefix}}topics_policy" class="settings-field-label">{{> stream_topics_policy_label .}}</label>
+            <select name="stream-topics-policy-setting" id="{{prefix}}topics_policy" class="prop-element settings_select bootstrap-focus-style" data-setting-widget-type="string">
+                {{> ../settings/dropdown_options_widget option_values=stream_topics_policy_values}}
+            </select>
+        </div>
+
         {{> ../settings/group_setting_value_pill_input
           setting_name="can_move_messages_within_channel_group"
           label=group_setting_labels.can_move_messages_within_channel_group
@@ -136,6 +131,10 @@
           label=group_setting_labels.can_move_messages_out_of_channel_group
           prefix=prefix }}
 
+        {{> ../settings/group_setting_value_pill_input
+          setting_name="can_administer_channel_group"
+          label=group_setting_labels.can_administer_channel_group
+          prefix=prefix }}
 
         {{#if (or is_owner is_stream_edit)}}
             <div>