From f19fade448f57866695691cbf98538aa26de2d51 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Thu, 27 Jul 2017 10:50:41 +0100 Subject: [PATCH 1/2] Strip " (IRC)" from display names inserted into the timeline --- src/components/views/elements/Pill.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js index fdd657470e..cde0fb588b 100644 --- a/src/components/views/elements/Pill.js +++ b/src/components/views/elements/Pill.js @@ -150,7 +150,7 @@ const Pill = React.createClass({ const member = this.state.member; if (member) { userId = member.userId; - linkText = member.name; + linkText = member.name.replace(' (IRC)', ''); // FIXME when groups are done avatar = ; pillClass = 'mx_UserPill'; } From 4d4078be7ea7fde4c6a9aef34a5f5760dc62d36b Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Thu, 27 Jul 2017 10:54:23 +0100 Subject: [PATCH 2/2] Remove disambiguation from pills --- src/components/views/elements/Pill.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js index cde0fb588b..ade7e6ea5c 100644 --- a/src/components/views/elements/Pill.js +++ b/src/components/views/elements/Pill.js @@ -150,7 +150,7 @@ const Pill = React.createClass({ const member = this.state.member; if (member) { userId = member.userId; - linkText = member.name.replace(' (IRC)', ''); // FIXME when groups are done + linkText = member.rawDisplayName.replace(' (IRC)', ''); // FIXME when groups are done avatar = ; pillClass = 'mx_UserPill'; }