summaryrefslogtreecommitdiffstats
path: root/webapp/components/announcement_bar/announcement_bar.jsx
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/components/announcement_bar/announcement_bar.jsx')
-rw-r--r--webapp/components/announcement_bar/announcement_bar.jsx9
1 files changed, 8 insertions, 1 deletions
diff --git a/webapp/components/announcement_bar/announcement_bar.jsx b/webapp/components/announcement_bar/announcement_bar.jsx
index 84061ec05..cd0cd0cb9 100644
--- a/webapp/components/announcement_bar/announcement_bar.jsx
+++ b/webapp/components/announcement_bar/announcement_bar.jsx
@@ -13,6 +13,7 @@ import * as AdminActions from 'actions/admin_actions.jsx';
import {ErrorBarTypes, StatTypes} from 'utils/constants.jsx';
import {isLicenseExpiring, isLicenseExpired, isLicensePastGracePeriod, displayExpiryDate} from 'utils/license_utils.jsx';
import * as Utils from 'utils/utils.jsx';
+import * as TextFormatting from 'utils/text_formatting.jsx';
const RENEWAL_LINK = 'https://licensing.mattermost.com/renew';
@@ -219,7 +220,13 @@ export default class AnnouncementBar extends React.PureComponent {
const renewalLink = RENEWAL_LINK + '?id=' + global.window.mm_license.Id + '&user_count=' + this.state.totalUsers;
let message = this.state.message;
- if (message === ErrorBarTypes.PREVIEW_MODE) {
+ if (this.state.type === BAR_ANNOUNCEMENT_TYPE) {
+ message = (
+ <span
+ dangerouslySetInnerHTML={{__html: TextFormatting.formatText(message, {singleline: true, mentionHighlight: false})}}
+ />
+ );
+ } else if (message === ErrorBarTypes.PREVIEW_MODE) {
message = (
<FormattedMessage
id={ErrorBarTypes.PREVIEW_MODE}