From 4be9c51dadd116f6ce53359dfdd2bc85beb34ebe Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 21 Apr 2021 16:43:25 -0600
Subject: [PATCH] Move all the RED_EXCLAMATION badges to a single definition

---
 src/components/structures/RoomStatusBar.js          | 3 +--
 src/components/views/rooms/EventTile.js             | 3 +--
 src/components/views/rooms/RoomList.tsx             | 7 ++-----
 src/components/views/rooms/RoomTile.tsx             | 3 +--
 src/stores/notifications/StaticNotificationState.ts | 2 ++
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 42e8a32874..ab4f524faf 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -25,7 +25,6 @@ import {Action} from "../../dispatcher/actions";
 import {replaceableComponent} from "../../utils/replaceableComponent";
 import {EventStatus} from "matrix-js-sdk/src/models/event";
 import NotificationBadge from "../views/rooms/NotificationBadge";
-import {NotificationColor} from "../../stores/notifications/NotificationColor";
 import {StaticNotificationState} from "../../stores/notifications/StaticNotificationState";
 import AccessibleButton from "../views/elements/AccessibleButton";
 import InlineSpinner from "../views/elements/InlineSpinner";
@@ -236,7 +235,7 @@ export default class RoomStatusBar extends React.Component {
                 <div role="alert">
                     <div className="mx_RoomStatusBar_unsentBadge">
                         <NotificationBadge
-                            notification={StaticNotificationState.forSymbol("!", NotificationColor.Red)}
+                            notification={StaticNotificationState.RED_EXCLAMATION}
                         />
                     </div>
                     <div>
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 05afb742a4..fb07d3fdff 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -41,7 +41,6 @@ import {objectHasDiff} from "../../../utils/objects";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 import Tooltip from "../elements/Tooltip";
 import {StaticNotificationState} from "../../../stores/notifications/StaticNotificationState";
-import {NotificationColor} from "../../../stores/notifications/NotificationColor";
 import NotificationBadge from "./NotificationBadge";
 
 const eventTileTypes = {
@@ -1264,7 +1263,7 @@ class SentReceipt extends React.PureComponent<ISentReceiptProps, ISentReceiptSta
         let nonCssBadge = null;
         if (isFailed) {
             nonCssBadge = <NotificationBadge
-                notification={StaticNotificationState.forSymbol("!", NotificationColor.Red)}
+                notification={StaticNotificationState.RED_EXCLAMATION}
             />;
         }
 
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index 8ac706fc15..5b446d9f13 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -1,7 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017, 2018 Vector Creations Ltd
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2015-2018, 2020, 2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -37,7 +35,6 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import GroupAvatar from "../avatars/GroupAvatar";
 import ExtraTile from "./ExtraTile";
 import { StaticNotificationState } from "../../../stores/notifications/StaticNotificationState";
-import { NotificationColor } from "../../../stores/notifications/NotificationColor";
 import { Action } from "../../../dispatcher/actions";
 import { ViewRoomDeltaPayload } from "../../../dispatcher/payloads/ViewRoomDeltaPayload";
 import { RoomNotificationStateStore } from "../../../stores/notifications/RoomNotificationStateStore";
@@ -492,7 +489,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
                     isSelected={false}
                     displayName={g.name}
                     avatar={avatar}
-                    notificationState={StaticNotificationState.forSymbol("!", NotificationColor.Red)}
+                    notificationState={StaticNotificationState.RED_EXCLAMATION}
                     onClick={openGroup}
                     key={`temporaryGroupTile_${g.groupId}`}
                 />
diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx
index a3207d9d65..c0b52d9c0f 100644
--- a/src/components/views/rooms/RoomTile.tsx
+++ b/src/components/views/rooms/RoomTile.tsx
@@ -53,7 +53,6 @@ import { CommunityPrototypeStore, IRoomProfile } from "../../../stores/Community
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { getUnsentMessages } from "../../structures/RoomStatusBar";
 import { StaticNotificationState } from "../../../stores/notifications/StaticNotificationState";
-import { NotificationColor } from "../../../stores/notifications/NotificationColor";
 
 interface IProps {
     room: Room;
@@ -576,7 +575,7 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
                 badge = (
                     <div className="mx_RoomTile_badgeContainer" aria-hidden="true">
                         <NotificationBadge
-                            notification={StaticNotificationState.forSymbol("!", NotificationColor.Red)}
+                            notification={StaticNotificationState.RED_EXCLAMATION}
                             forceCount={false}
                             roomId={this.props.room.roomId}
                         />
diff --git a/src/stores/notifications/StaticNotificationState.ts b/src/stores/notifications/StaticNotificationState.ts
index 0392ed3716..b18aa78e0f 100644
--- a/src/stores/notifications/StaticNotificationState.ts
+++ b/src/stores/notifications/StaticNotificationState.ts
@@ -18,6 +18,8 @@ import { NotificationColor } from "./NotificationColor";
 import { NotificationState } from "./NotificationState";
 
 export class StaticNotificationState extends NotificationState {
+    public static readonly RED_EXCLAMATION = StaticNotificationState.forSymbol("!", NotificationColor.Red);
+
     constructor(symbol: string, count: number, color: NotificationColor) {
         super();
         this._symbol = symbol;