From f271e117cfb4657c77810e379dad92b8467c4f46 Mon Sep 17 00:00:00 2001
From: Arsh Sharma <arshsharma461@gmail.com>
Date: Tue, 24 Nov 2020 17:45:20 +0530
Subject: [PATCH 1/4] fix(EventTile): conditionally added avatar

---
 src/components/views/rooms/EventTile.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index c358ef610d..22c3136737 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -745,14 +745,26 @@ export default class EventTile extends React.Component {
         }
 
         if (this.props.mxEvent.sender && avatarSize) {
-            avatar = (
+            if(this.props.mxEvent.getType()==='m.room.third_party_invite') {
+                avatar = (
                     <div className="mx_EventTile_avatar">
-                        <MemberAvatar member={this.props.mxEvent.sender}
+                        <MemberAvatar member={this.props.mxEvent.target}
                             width={avatarSize} height={avatarSize}
                             viewUserOnClick={true}
                         />
                     </div>
-            );
+                );
+            }
+            else {
+                avatar = (
+                        <div className="mx_EventTile_avatar">
+                            <MemberAvatar member={this.props.mxEvent.sender}
+                                width={avatarSize} height={avatarSize}
+                                viewUserOnClick={true}
+                            />
+                        </div>
+                );
+            }
         }
 
         if (needsSenderProfile) {

From 5e239690da24dc50e7fb352d895b2ef4f06bb877 Mon Sep 17 00:00:00 2001
From: Arsh Sharma <arshsharma461@gmail.com>
Date: Wed, 25 Nov 2020 12:46:14 +0530
Subject: [PATCH 2/4] fix(EventTile): made revisions

---
 src/components/views/rooms/EventTile.js | 34 +++++++++++--------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 22c3136737..e2f037ceb9 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -745,26 +745,22 @@ export default class EventTile extends React.Component {
         }
 
         if (this.props.mxEvent.sender && avatarSize) {
-            if(this.props.mxEvent.getType()==='m.room.third_party_invite') {
-                avatar = (
-                    <div className="mx_EventTile_avatar">
-                        <MemberAvatar member={this.props.mxEvent.target}
-                            width={avatarSize} height={avatarSize}
-                            viewUserOnClick={true}
-                        />
-                    </div>
-                );
-            }
-            else {
-                avatar = (
-                        <div className="mx_EventTile_avatar">
-                            <MemberAvatar member={this.props.mxEvent.sender}
-                                width={avatarSize} height={avatarSize}
-                                viewUserOnClick={true}
-                            />
-                        </div>
-                );
+            let member;
+            // set member to receiver (target) if it is a 3PID invite
+            // so that the correct avatar is show
+            if (this.props.mxEvent.getContent().third_party_invite) {
+               member=this.props.mxEvent.target;
+            } else {
+                member=this.props.mxEvent.sender;
             }
+            avatar = (
+                <div className="mx_EventTile_avatar">
+                    <MemberAvatar member={member}
+                        width={avatarSize} height={avatarSize}
+                        viewUserOnClick={true}
+                    />
+                </div>
+        );
         }
 
         if (needsSenderProfile) {

From 8386e502407533571649eea375bdb750f7ea0529 Mon Sep 17 00:00:00 2001
From: Arsh Sharma <arshsharma461@gmail.com>
Date: Thu, 26 Nov 2020 17:18:11 +0530
Subject: [PATCH 3/4] fix(EventTile): commited suggestions

---
 src/components/views/rooms/EventTile.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index e2f037ceb9..0bd00ad051 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -747,11 +747,11 @@ export default class EventTile extends React.Component {
         if (this.props.mxEvent.sender && avatarSize) {
             let member;
             // set member to receiver (target) if it is a 3PID invite
-            // so that the correct avatar is show
+            // so that the correct avatar is shown
             if (this.props.mxEvent.getContent().third_party_invite) {
-               member=this.props.mxEvent.target;
+               member = this.props.mxEvent.target;
             } else {
-                member=this.props.mxEvent.sender;
+                member = this.props.mxEvent.sender;
             }
             avatar = (
                 <div className="mx_EventTile_avatar">
@@ -760,7 +760,7 @@ export default class EventTile extends React.Component {
                         viewUserOnClick={true}
                     />
                 </div>
-        );
+            );
         }
 
         if (needsSenderProfile) {

From cb3b8b6c77d2a9476fb4875cfe820d087d07296b Mon Sep 17 00:00:00 2001
From: Arsh Sharma <arshsharma461@gmail.com>
Date: Fri, 27 Nov 2020 14:13:42 +0530
Subject: [PATCH 4/4] fix(EventTile): updated comment

---
 src/components/views/rooms/EventTile.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 0bd00ad051..11277daa57 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -747,7 +747,8 @@ export default class EventTile extends React.Component {
         if (this.props.mxEvent.sender && avatarSize) {
             let member;
             // set member to receiver (target) if it is a 3PID invite
-            // so that the correct avatar is shown
+            // so that the correct avatar is shown as the text is
+            // `$target accepted the invitation for $email`
             if (this.props.mxEvent.getContent().third_party_invite) {
                member = this.props.mxEvent.target;
             } else {