Merge pull request #3220 from matrix-org/travis/kick-reason

Don't show a reason if there's no reason for a kick/ban
matrix-org · Jul 15, 2019 · 3fcbd46 · 3fcbd46
2 parents 141352b + 31339aa
commit 3fcbd46
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
@@ -305,7 +305,7 @@ module.exports = React.createClass({
                 const {memberName, reason} = this._getKickOrBanInfo();
                 title = _t("You were kicked from %(roomName)s by %(memberName)s",
                     {memberName, roomName: this._roomName()});
-                subTitle = _t("Reason: %(reason)s", {reason});
+                subTitle = reason ? _t("Reason: %(reason)s", {reason}) : null;
 
                 if (this._joinRule() === "invite") {
                     primaryActionLabel = _t("Forget this room");
@@ -322,7 +322,7 @@ module.exports = React.createClass({
                 const {memberName, reason} = this._getKickOrBanInfo();
                 title = _t("You were banned from %(roomName)s by %(memberName)s",
                     {memberName, roomName: this._roomName()});
-                subTitle = _t("Reason: %(reason)s", {reason});
+                subTitle = reason ? _t("Reason: %(reason)s", {reason}) : null;
                 primaryActionLabel = _t("Forget this room");
                 primaryActionHandler = this.props.onForgetClick;
                 break;