Skip to content

armgit / zulip

Public Imported from GitHub
0

Zulip server and web application. Open-source team chat that helps teams stay productive and focused.

modal: Use danger styling for irreversible deletion confirmations.

Evy Kassirera647c5367eaa
diff --git a/web/e2e-tests/custom-profile.test.ts b/web/e2e-tests/custom-profile.test.ts
index ab54b2f61cd..10c1f7a708f 100644
--- a/web/e2e-tests/custom-profile.test.ts
+++ b/web/e2e-tests/custom-profile.test.ts
@@ -70,7 +70,7 @@ async function test_delete_custom_profile_field(page: Page): Promise<void> {
);
assert.strictEqual(
await common.get_text_from_selector(page, ".micromodal .dialog_submit_button"),
- "Confirm",
+ "Delete",
);
await page.click(".micromodal .dialog_submit_button");
await common.wait_for_micromodal_to_close(page);
diff --git a/web/src/drafts.ts b/web/src/drafts.ts
index 73ead9a1e52..26c1c461825 100644
--- a/web/src/drafts.ts
+++ b/web/src/drafts.ts
@@ -301,8 +301,10 @@ export function confirm_delete_all_drafts(): void {
confirm_dialog.launch({
modal_title_html: $t_html({defaultMessage: "Delete all drafts"}),
modal_content_html: render_confirm_delete_all_drafts(),
+ modal_submit_button_text: $t({defaultMessage: "Delete"}),
is_compact: true,
on_click: delete_all_drafts,
+ dangerous_action: true,
});
}
diff --git a/web/src/settings_profile_fields.ts b/web/src/settings_profile_fields.ts
index 7c46830f8ad..0e646bf307d 100644
--- a/web/src/settings_profile_fields.ts
+++ b/web/src/settings_profile_fields.ts
@@ -186,8 +186,10 @@ function delete_profile_field(this: HTMLElement, e: JQuery.ClickEvent): void {
confirm_dialog.launch({
modal_title_html: $t_html({defaultMessage: "Delete custom profile field?"}),
modal_content_html,
+ modal_submit_button_text: $t({defaultMessage: "Delete"}),
is_compact: true,
on_click: request_delete,
+ dangerous_action: true,
});
}
@@ -476,7 +478,9 @@ function show_modal_for_deleting_options(
{N: deleted_options_count},
),
modal_content_html,
+ modal_submit_button_text: $t({defaultMessage: "Delete"}),
on_click: update_profile_field,
+ dangerous_action: true,
});
}
diff --git a/web/src/topic_popover.ts b/web/src/topic_popover.ts
index f196739578e..ad969d76b9f 100644
--- a/web/src/topic_popover.ts
+++ b/web/src/topic_popover.ts
@@ -7,7 +7,7 @@ import render_left_sidebar_topic_actions_popover from "../templates/popovers/lef
import * as clipboard_handler from "./clipboard_handler.ts";
import * as confirm_dialog from "./confirm_dialog.ts";
-import {$t_html} from "./i18n.ts";
+import {$t, $t_html} from "./i18n.ts";
import * as message_delete from "./message_delete.ts";
import * as message_edit from "./message_edit.ts";
import * as message_summary from "./message_summary.ts";
@@ -205,9 +205,11 @@ export function initialize(): void {
modal_title_html: $t_html({defaultMessage: "Delete topic"}),
help_link: "/help/delete-a-topic",
modal_content_html,
+ modal_submit_button_text: $t({defaultMessage: "Delete"}),
on_click() {
message_delete.delete_topic(stream_id, topic_name);
},
+ dangerous_action: true,
});
popover_menus.hide_current_popover_if_visible(instance);