From 3d4feac75b63cef7b688492fb096f10236fcf3fc Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Fri, 23 Mar 2018 17:14:29 +1300
Subject: [PATCH] Don't try to show unset display name

In the ReadReceiptMarker title, show the display name only when it is not the
same as the user ID.
---
 .../views/rooms/ReadReceiptMarker.js          | 22 ++++++++++++++-----
 src/i18n/strings/en_EN.json                   |  1 +
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index 8dc3c0f7d0..8b66cfd808 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -185,12 +185,22 @@ module.exports = React.createClass({
 
         let title;
         if (this.props.timestamp) {
-            title = _t(
-                "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
-                {displayName: this.props.member.rawDisplayName,
-                 userName: this.props.member.userId,
-                 dateTime: formatDate(new Date(this.props.timestamp), this.props.showTwelveHour)},
-            );
+            const dateString = formatDate(new Date(this.props.timestamp), this.props.showTwelveHour);
+            if (this.props.member.userId === this.props.member.rawDisplayName) {
+                title = _t(
+                    "Seen by %(userName)s at %(dateTime)s",
+                    {userName: this.props.member.userId,
+                    dateTime: dateString},
+                );
+            }
+            else {
+                title = _t(
+                    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
+                    {displayName: this.props.member.rawDisplayName,
+                    userName: this.props.member.userId,
+                    dateTime: dateString},
+                );
+            }
         }
 
         return (
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 2754880ed7..2d3ef836e0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -389,6 +389,7 @@
     "Offline": "Offline",
     "Unknown": "Unknown",
     "Replying": "Replying",
+    "Seen by %(userName)s at %(dateTime)s": "Seen by %(userName)s at %(dateTime)s",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
     "No rooms to show": "No rooms to show",
     "Unnamed room": "Unnamed room",