From ee3542453e309d91eb4e8f50487e0c1290f599d7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 9 Aug 2019 11:31:04 +0100
Subject: [PATCH] Fix RoomAvatarEvent historic fallback

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/avatars/BaseAvatar.js       | 1 -
 src/components/views/messages/RoomAvatarEvent.js | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index 8e13f89d2d..afc6faa18d 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -133,7 +133,6 @@ module.exports = React.createClass({
     },
 
     onError: function(ev) {
-        console.log("onError");
         const nextIndex = this.state.urlsIndex + 1;
         if (nextIndex < this.state.imageUrls.length) {
             // try the next one
diff --git a/src/components/views/messages/RoomAvatarEvent.js b/src/components/views/messages/RoomAvatarEvent.js
index 17460ee183..207a385b92 100644
--- a/src/components/views/messages/RoomAvatarEvent.js
+++ b/src/components/views/messages/RoomAvatarEvent.js
@@ -64,8 +64,10 @@ module.exports = React.createClass({
         }
 
         const room = MatrixClientPeg.get().getRoom(ev.getRoomId());
+        // Provide all arguments to RoomAvatar via oobData because the avatar is historic
         const oobData = {
             avatarUrl: ev.getContent().url,
+            name: room ? room.name : "",
         };
 
         return (
@@ -76,7 +78,7 @@ module.exports = React.createClass({
                         'img': () =>
                             <AccessibleButton key="avatar" className="mx_RoomAvatarEvent_avatar"
                                 onClick={this.onAvatarClick}>
-                                <RoomAvatar width={14} height={14} room={room} oobData={oobData} />
+                                <RoomAvatar width={14} height={14} oobData={oobData} />
                             </AccessibleButton>,
                     })
                 }