diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 05116bc097..b62b72bf18 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -39,7 +39,7 @@ const BannedUser = React.createClass({
propTypes: {
canUnban: React.PropTypes.bool,
member: React.PropTypes.object.isRequired, // js-sdk RoomMember
- by: React.PropTypes.object.isRequired, // js-sdk RoomMember
+ by: React.PropTypes.string.isRequired,
reason: React.PropTypes.string,
},
@@ -78,7 +78,7 @@ const BannedUser = React.createClass({
return (
{ unbanButton }
-
+
{this.props.member.name} {this.props.member.userId}
{this.props.reason ? " " +_t('Reason') + ": " + this.props.reason : ""}
@@ -673,7 +673,9 @@ module.exports = React.createClass({
{banned.map(function(member) {
const banEvent = member.events.member.getContent();
- const bannedBy = self.props.room.getMember(member.events.member.getSender());
+ const sender = self.props.room.getMember(member.events.member.getSender());
+ let bannedBy = member.events.member.getSender(); // start by falling back to mxid
+ if (sender) bannedBy = sender.name;
return (
);
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9e5524d80c..f6edae19a9 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -808,7 +808,7 @@
"This will allow you to reset your password and receive notifications.": "This will allow you to reset your password and receive notifications.",
"To return to your account in future you need to set a password": "To return to your account in future you need to set a password",
"Skip": "Skip",
- "Banned by %(displayName)s (%(userId)s)": "Banned by %(displayName)s (%(userId)s)",
+ "Banned by %(displayName)s": "Banned by %(displayName)s",
"Start verification": "Start verification",
"Share without verifying": "Share without verifying",
"Ignore request": "Ignore request",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 93b3e88332..fccf387f30 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -607,7 +607,7 @@
"Desktop specific": "Desktop specific",
"Analytics": "Analytics",
"Opt out of analytics": "Opt out of analytics",
- "Banned by %(displayName)s (%(userId)s)": "Banned by %(displayName)s (%(userId)s)",
+ "Banned by %(displayName)s": "Banned by %(displayName)s",
"Options": "Options",
"Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
"Passphrases must match": "Passphrases must match",