diff --git a/web/src/compose_validate.js b/web/src/compose_validate.js index e6b7b953cc..a40cfcaa4b 100644 --- a/web/src/compose_validate.js +++ b/web/src/compose_validate.js @@ -5,6 +5,7 @@ import render_compose_banner from "../templates/compose_banner/compose_banner.hb import render_not_subscribed_warning from "../templates/compose_banner/not_subscribed_warning.hbs"; import render_private_stream_warning from "../templates/compose_banner/private_stream_warning.hbs"; import render_stream_wildcard_warning from "../templates/compose_banner/stream_wildcard_warning.hbs"; +import render_wildcard_mention_not_allowed_error from "../templates/compose_banner/wildcard_mention_not_allowed_error.hbs"; import render_compose_limit_indicator from "../templates/compose_limit_indicator.hbs"; import * as channel from "./channel"; @@ -446,14 +447,12 @@ export function validate_stream_message_mentions(opts) { subscriber_count > stream_wildcard_mention_large_stream_threshold ) { if (!stream_wildcard_mention_allowed_in_large_stream()) { - compose_banner.show_error_message( - $t({ - defaultMessage: - "You do not have permission to use stream wildcard mentions in this stream.", - }), - compose_banner.CLASSNAMES.wildcards_not_allowed, - opts.$banner_container, - ); + const new_row = render_wildcard_mention_not_allowed_error({ + banner_type: compose_banner.ERROR, + classname: compose_banner.CLASSNAMES.wildcards_not_allowed, + stream_wildcard_mention: opts.stream_wildcard_mention, + }); + compose_banner.append_compose_banner_to_banner_list(new_row, opts.$banner_container); return false; } diff --git a/web/templates/compose_banner/wildcard_mention_not_allowed_error.hbs b/web/templates/compose_banner/wildcard_mention_not_allowed_error.hbs new file mode 100644 index 0000000000..3b1d861cd3 --- /dev/null +++ b/web/templates/compose_banner/wildcard_mention_not_allowed_error.hbs @@ -0,0 +1,5 @@ +{{#> compose_banner }} +
+{{/compose_banner}} diff --git a/web/tests/compose_validate.test.js b/web/tests/compose_validate.test.js index 1273e91c0e..be04ba10fc 100644 --- a/web/tests/compose_validate.test.js +++ b/web/tests/compose_validate.test.js @@ -431,15 +431,9 @@ test_ui("validate_stream_message", ({override_rewire, mock_template}) => { assert.ok(stream_wildcard_warning_rendered); let wildcards_not_allowed_rendered = false; - mock_template("compose_banner/compose_banner.hbs", false, (data) => { + mock_template("compose_banner/wildcard_mention_not_allowed_error.hbs", false, (data) => { assert.equal(data.classname, compose_banner.CLASSNAMES.wildcards_not_allowed); - assert.equal( - data.banner_text, - $t({ - defaultMessage: - "You do not have permission to use stream wildcard mentions in this stream.", - }), - ); + assert.equal(data.stream_wildcard_mention, "all"); wildcards_not_allowed_rendered = true; }); override_rewire(