settings: Improve presentation of auto-follow topics settings.

Fixes #32761

help/include/automatically-follow-topics.md

@@ -7,7 +7,7 @@
 {settings_tab|notifications}
 
 1. Under **Topic notifications**, select the desired option from the
-   **Automatically follow topics** dropdown.
+   **Automatically follow topics based on my participation** dropdown.
 
 {end_tabs}
 

web/src/settings_config.ts

@@ -597,7 +597,7 @@ export const preferences_settings_labels = {
 
 export const notification_settings_labels = {
     automatically_follow_topics_policy: $t({
-        defaultMessage: "Automatically follow topics",
+        defaultMessage: "Automatically follow topics based on my participation",
     }),
     automatically_follow_topics_where_mentioned: $t({
         defaultMessage: "Automatically follow topics where I'm mentioned",

web/templates/settings/notification_settings.hbs

@@ -80,6 +80,12 @@
             </select>
         </div>
 
+        {{> settings_checkbox
+          setting_name="automatically_follow_topics_where_mentioned"
+          is_checked=(lookup settings_object "automatically_follow_topics_where_mentioned")
+          label=(lookup settings_label "automatically_follow_topics_where_mentioned")
+          prefix=prefix}}
+
         <div class="input-group">
             <label for="{{prefix}}automatically_unmute_topics_in_muted_streams_policy" class="settings-field-label">
                 {{ settings_label.automatically_unmute_topics_in_muted_streams_policy }}
@@ -90,12 +96,6 @@
                 {{> dropdown_options_widget option_values=automatically_unmute_topics_in_muted_streams_policy_values}}
             </select>
         </div>
-
-        {{> settings_checkbox
-          setting_name="automatically_follow_topics_where_mentioned"
-          is_checked=(lookup settings_object "automatically_follow_topics_where_mentioned")
-          label=(lookup settings_label "automatically_follow_topics_where_mentioned")
-          prefix=prefix}}
     </div>
 
     <div class="desktop_notifications m-10 {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}">