From 727b1ca545a94b1734a1cf7a0e27a592425688c6 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Mon, 24 Jul 2017 15:07:33 +0100
Subject: [PATCH] Remove disambiguation from user mentions, add tooltip for
 mxid

Also add a tooltip for room pills = room alias/ID

Requires: https://github.com/matrix-org/matrix-js-sdk/pull/513
---
 src/components/views/elements/Pill.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 39987228e5..294474a41a 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -78,7 +78,7 @@ export default React.createClass({
                 new RoomMember(null, resource);
             if (member) {
                 userId = member.userId;
-                linkText = member.name;
+                linkText = member.rawDisplayName;
                 avatar = <MemberAvatar member={member} width={16} height={16}/>;
             }
         } else if (isRoomPill) {
@@ -101,11 +101,11 @@ export default React.createClass({
 
         if ((isUserPill || isRoomPill) && avatar) {
             return this.props.inMessage ?
-                <a className={classes} href={this.props.url}>
+                <a className={classes} href={this.props.url} title={resource}>
                     {avatar}
                     {linkText}
                 </a> :
-                <span className={classes}>
+                <span className={classes} title={resource}>
                     {avatar}
                     {linkText}
                 </span>;