From bab09a6579a0cb76ff87679e60a09166e3faa14f Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulipchat.com>
Date: Wed, 30 May 2018 14:16:28 -0700
Subject: [PATCH] stream_types: Suggest private, shared history before
 protected history.

This feels like the more common use case for most users.
---
 frontend_tests/node_tests/templates.js   |  4 ++--
 static/templates/stream_types.handlebars | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend_tests/node_tests/templates.js b/frontend_tests/node_tests/templates.js
index 8bdff20746..1494539d36 100644
--- a/frontend_tests/node_tests/templates.js
+++ b/frontend_tests/node_tests/templates.js
@@ -1256,8 +1256,8 @@ run_test('handlebars_bug', () => {
 
     var other_options = $(html).find("input[name=privacy]");
     assert.equal(other_options[0].value, 'public');
-    assert.equal(other_options[1].value, 'invite-only');
-    assert.equal(other_options[2].value, 'invite-only-public-history');
+    assert.equal(other_options[1].value, 'invite-only-public-history');
+    assert.equal(other_options[2].value, 'invite-only');
 
     var button = $(html).find("#change-stream-privacy-button");
     assert(button.hasClass("btn-danger"));
diff --git a/static/templates/stream_types.handlebars b/static/templates/stream_types.handlebars
index e6e184f57f..62abcec931 100644
--- a/static/templates/stream_types.handlebars
+++ b/static/templates/stream_types.handlebars
@@ -7,14 +7,6 @@
             {{/tr}}
         </label>
     </li>
-    <li>
-        <label class="radio">
-            <input type="radio" name="privacy" value="invite-only" {{#if is_private}}checked{{/if}} />
-            {{#tr this}}
-            <b>Private, protected history:</b> must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users
-            {{/tr}}
-        </label>
-    </li>
     <li>
         <label class="radio">
             <input type="radio" name="privacy" value="invite-only-public-history" {{#if is_private_with_public_history}}checked{{/if}} />
@@ -23,4 +15,12 @@
             {{/tr}}
         </label>
     </li>
+    <li>
+        <label class="radio">
+            <input type="radio" name="privacy" value="invite-only" {{#if is_private}}checked{{/if}} />
+            {{#tr this}}
+            <b>Private, protected history:</b> must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users
+            {{/tr}}
+        </label>
+    </li>
 </ul>