From 654469b29fa15f76811f708e1a7c9ef01383dfdc Mon Sep 17 00:00:00 2001
From: Karl Stolley <karl@zulip.com>
Date: Wed, 4 Oct 2023 14:06:27 -0500
Subject: [PATCH] compose: Make DM identifiers align with new conversations.

---
 web/src/compose_closed_ui.js                              | 8 ++++----
 web/src/compose_popovers.js                               | 2 +-
 web/src/compose_tooltips.js                               | 2 +-
 web/styles/compose.css                                    | 4 ++--
 web/templates/compose.hbs                                 | 6 +++---
 web/templates/popovers/mobile_message_buttons_popover.hbs | 2 +-
 web/tests/compose.test.js                                 | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/web/src/compose_closed_ui.js b/web/src/compose_closed_ui.js
index f30cea4013..594cd70814 100644
--- a/web/src/compose_closed_ui.js
+++ b/web/src/compose_closed_ui.js
@@ -85,14 +85,14 @@ function update_new_conversation_button(btn_text) {
     $("#new_conversation_button").text(btn_text);
 }
 
-function update_conversation_button(btn_text) {
-    $("#left_bar_compose_private_button_big").text(btn_text);
+function update_new_direct_message_button(btn_text) {
+    $("#new_direct_message_button").text(btn_text);
 }
 
 function update_buttons(text_stream, disable_reply) {
     const text_conversation = $t({defaultMessage: "New direct message"});
     update_new_conversation_button(text_stream);
-    update_conversation_button(text_conversation);
+    update_new_direct_message_button(text_conversation);
     update_reply_button_state(disable_reply);
 }
 
@@ -172,7 +172,7 @@ export function initialize() {
         compose_actions.start("stream", {trigger: "clear topic button"});
     });
 
-    $("body").on("click", ".compose_private_button", () => {
+    $("body").on("click", ".compose_new_direct_message_button", () => {
         compose_actions.start("private", {trigger: "new direct message"});
     });
 }
diff --git a/web/src/compose_popovers.js b/web/src/compose_popovers.js
index 905fab6bcf..95a730ce61 100644
--- a/web/src/compose_popovers.js
+++ b/web/src/compose_popovers.js
@@ -47,7 +47,7 @@ export function initialize() {
                 e.stopPropagation();
                 instance.hide();
             });
-            $popper.one("click", ".compose_mobile_private_button", (e) => {
+            $popper.one("click", ".compose_mobile_direct_message_button", (e) => {
                 compose_actions.start("private");
                 e.stopPropagation();
                 instance.hide();
diff --git a/web/src/compose_tooltips.js b/web/src/compose_tooltips.js
index 962d50eb1c..fdaef2aed3 100644
--- a/web/src/compose_tooltips.js
+++ b/web/src/compose_tooltips.js
@@ -20,7 +20,7 @@ export function initialize() {
             "#compose_buttons > .reply_button_container",
             "#left_bar_compose_mobile_button_big",
             "#new_conversation_button",
-            "#left_bar_compose_private_button_big",
+            "#new_direct_message_button",
         ],
         delay: EXTRA_LONG_HOVER_DELAY,
         appendTo: () => document.body,
diff --git a/web/styles/compose.css b/web/styles/compose.css
index ccfcccc4a0..77acb14049 100644
--- a/web/styles/compose.css
+++ b/web/styles/compose.css
@@ -43,7 +43,7 @@
     }
 
     .new_conversation_button_container,
-    .private_button_container {
+    .new_direct_message_button_container {
         @media (width < $sm_min) {
             display: none;
         }
@@ -1001,7 +1001,7 @@ textarea.new_message_textarea,
 }
 
 .compose_mobile_stream_button i,
-.compose_mobile_private_button i {
+.compose_mobile_direct_message_button i {
     margin-right: 4px;
 }
 
diff --git a/web/templates/compose.hbs b/web/templates/compose.hbs
index 9b3a685e90..b3c696bf53 100644
--- a/web/templates/compose.hbs
+++ b/web/templates/compose.hbs
@@ -33,9 +33,9 @@
                 </button>
             </span>
             {{#unless embedded }}
-            <span class="new_message_button private_button_container">
-                <button type="button" class="button small rounded compose_private_button"
-                  id="left_bar_compose_private_button_big"
+            <span class="new_message_button new_direct_message_button_container">
+                <button type="button" class="button small rounded compose_new_direct_message_button"
+                  id="new_direct_message_button"
                   data-tooltip-template-id="new_direct_message_button_tooltip_template">
                     {{t 'New direct message' }}
                 </button>
diff --git a/web/templates/popovers/mobile_message_buttons_popover.hbs b/web/templates/popovers/mobile_message_buttons_popover.hbs
index 869d87eb77..dd1cee006a 100644
--- a/web/templates/popovers/mobile_message_buttons_popover.hbs
+++ b/web/templates/popovers/mobile_message_buttons_popover.hbs
@@ -10,7 +10,7 @@
         </a>
     </li>
     <li>
-        <a class="compose_mobile_private_button">
+        <a class="compose_mobile_direct_message_button">
             <i class="fa fa-envelope" aria-hidden="true"></i>
             {{#if is_in_private_narrow }}
             {{t "New direct message" }}
diff --git a/web/tests/compose.test.js b/web/tests/compose.test.js
index 93d8526343..4559c70997 100644
--- a/web/tests/compose.test.js
+++ b/web/tests/compose.test.js
@@ -780,7 +780,7 @@ test_ui("narrow_button_titles", ({override}) => {
         $t({defaultMessage: "Start new conversation"}),
     );
     assert.equal(
-        $("#left_bar_compose_private_button_big").text(),
+        $("#new_direct_message_button").text(),
         $t({defaultMessage: "New direct message"}),
     );
 
@@ -790,7 +790,7 @@ test_ui("narrow_button_titles", ({override}) => {
         $t({defaultMessage: "Start new conversation"}),
     );
     assert.equal(
-        $("#left_bar_compose_private_button_big").text(),
+        $("#new_direct_message_button").text(),
         $t({defaultMessage: "New direct message"}),
     );
 });