From befcb46ba39a4e37d6ed1b73b362a2d657d1e4c5 Mon Sep 17 00:00:00 2001
From: Sahil Batra <sahil@zulip.com>
Date: Tue, 25 Jul 2023 21:28:43 +0530
Subject: [PATCH] dialog_widget: Rename "dialog_cancel_button" to
 "dialog_exit_button".

This commit renames "dialog_cancel_button" class in the exit button
of modals to "dialog_exit_button", which seems a much better name
for a button that is used to close a modal.
---
 templates/zerver/change_email_address_visibility_modal.html | 2 +-
 web/e2e-tests/realm-linkifier.test.ts                       | 2 +-
 web/e2e-tests/settings.test.ts                              | 4 ++--
 web/src/invite.js                                           | 4 ++--
 web/styles/dark_theme.css                                   | 2 +-
 web/styles/modal.css                                        | 2 +-
 web/templates/dialog_widget.hbs                             | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/zerver/change_email_address_visibility_modal.html b/templates/zerver/change_email_address_visibility_modal.html
index 8d147378ca..8e7777a0ac 100644
--- a/templates/zerver/change_email_address_visibility_modal.html
+++ b/templates/zerver/change_email_address_visibility_modal.html
@@ -23,7 +23,7 @@
                 </p>
             </main>
             <footer class="modal__footer">
-                <button class="modal__btn dialog_cancel_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Cancel') }}</button>
+                <button class="modal__btn dialog_exit_button" aria-label="{{ '(Close this dialog window)' }}" data-micromodal-close>{{ _('Cancel') }}</button>
                 <button class="modal__btn dialog_submit_button">
                     <span>{{ _('Confirm') }}</span>
                 </button>
diff --git a/web/e2e-tests/realm-linkifier.test.ts b/web/e2e-tests/realm-linkifier.test.ts
index aaaf353ef4..5482e7d10d 100644
--- a/web/e2e-tests/realm-linkifier.test.ts
+++ b/web/e2e-tests/realm-linkifier.test.ts
@@ -104,7 +104,7 @@ async function test_edit_invalid_linkifier(page: Page): Promise<void> {
     );
     assert.strictEqual(edit_linkifier_template_status, "Failed: Invalid URL template.");
 
-    await page.click(".dialog_cancel_button");
+    await page.click(".dialog_exit_button");
     await page.waitForSelector("#dialog_widget_modal", {hidden: true});
 
     await page.waitForSelector(".linkifier_row", {visible: true});
diff --git a/web/e2e-tests/settings.test.ts b/web/e2e-tests/settings.test.ts
index 9d2f55c51d..449d112d8a 100644
--- a/web/e2e-tests/settings.test.ts
+++ b/web/e2e-tests/settings.test.ts
@@ -248,7 +248,7 @@ async function test_invalid_edit_bot_form(page: Page): Promise<void> {
         "Failed: Name is already in use!",
     );
 
-    const cancel_button_selector = "#edit_bot_modal .dialog_cancel_button";
+    const cancel_button_selector = "#edit_bot_modal .dialog_exit_button";
     await page.waitForFunction(
         (cancel_button_selector: string) =>
             !document.querySelector(cancel_button_selector)?.hasAttribute("disabled"),
@@ -320,7 +320,7 @@ async function test_duplicate_alert_words_cannot_be_added(
     const status_text = await common.get_text_from_selector(page, alert_word_status_selector);
     assert.strictEqual(status_text, "Alert word already exists!");
 
-    await page.click("#add-alert-word .dialog_cancel_button");
+    await page.click("#add-alert-word .dialog_exit_button");
     await common.wait_for_micromodal_to_close(page);
 }
 
diff --git a/web/src/invite.js b/web/src/invite.js
index 4ad3289f92..677ded92e2 100644
--- a/web/src/invite.js
+++ b/web/src/invite.js
@@ -151,7 +151,7 @@ function submit_invitation_form() {
         complete() {
             $("#invite-user-modal .dialog_submit_button").text($t({defaultMessage: "Invite"}));
             $("#invite-user-modal .dialog_submit_button").prop("disabled", false);
-            $("#invite-user-modal .dialog_cancel_button").prop("disabled", false);
+            $("#invite-user-modal .dialog_exit_button").prop("disabled", false);
             $("#invitee_emails").trigger("focus");
             scroll_util.get_scroll_element($("#invite-user-modal"))[0].scrollTop = 0;
         },
@@ -178,7 +178,7 @@ function generate_multiuse_invite() {
                 $t({defaultMessage: "Generate invite link"}),
             );
             $("#invite-user-modal .dialog_submit_button").prop("disabled", false);
-            $("#invite-user-modal .dialog_cancel_button").prop("disabled", false);
+            $("#invite-user-modal .dialog_exit_button").prop("disabled", false);
             scroll_util.get_scroll_element($("#invite-user-modal"))[0].scrollTop = 0;
         },
     });
diff --git a/web/styles/dark_theme.css b/web/styles/dark_theme.css
index b1c6ab47ce..461ec15685 100644
--- a/web/styles/dark_theme.css
+++ b/web/styles/dark_theme.css
@@ -50,7 +50,7 @@
     }
 
     /************************* MODAL DARK THEME *******************/
-    .dialog_cancel_button {
+    .dialog_exit_button {
         background-color: hsl(211deg 29% 14%);
         color: hsl(0deg 0% 100%);
         border: 1px solid hsl(0deg 0% 0% / 60%);
diff --git a/web/styles/modal.css b/web/styles/modal.css
index 600a896a84..8a7ea85021 100644
--- a/web/styles/modal.css
+++ b/web/styles/modal.css
@@ -124,7 +124,7 @@
     transform: scale(1.05);
 }
 
-.dialog_cancel_button {
+.dialog_exit_button {
     background: hsl(0deg 0% 100%);
     border: 1px solid hsl(300deg 2% 11% / 30%);
 
diff --git a/web/templates/dialog_widget.hbs b/web/templates/dialog_widget.hbs
index be95c1ff07..66102ea86d 100644
--- a/web/templates/dialog_widget.hbs
+++ b/web/templates/dialog_widget.hbs
@@ -16,7 +16,7 @@
             </main>
             <footer class="modal__footer">
                 {{#unless single_footer_button}}
-                <button class="modal__btn dialog_cancel_button" aria-label="{{t 'Close this dialog window' }}" data-micromodal-close>{{{ html_exit_button }}}</button>
+                <button class="modal__btn dialog_exit_button" aria-label="{{t 'Close this dialog window' }}" data-micromodal-close>{{{ html_exit_button }}}</button>
                 {{/unless}}
                 <button class="modal__btn dialog_submit_button"{{#if single_footer_button}} aria-label="{{t 'Close this dialog window' }}" data-micromodal-close{{/if}}>
                     <span>{{{ html_submit_button }}}</span>