From 2fb145755bd5d840441c028ab4fc10b111ac4aa0 Mon Sep 17 00:00:00 2001
From: fvh_P <ko_kurihara@yahoo.co.jp>
Date: Tue, 28 May 2019 14:36:38 +0900
Subject: [PATCH 1/2] fix avatar and display name on direct conversation

---
 app/javascript/mastodon/components/status.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 7dded434c2d376..74d2c51b688641 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -277,9 +277,7 @@ class Status extends ImmutablePureComponent {
       );
     }
 
-    if (otherAccounts) {
-      statusAvatar = <AvatarComposite accounts={otherAccounts} size={48} />;
-    } else if (account === undefined || account === null) {
+    if (account === undefined || account === null) {
       if (status.get('visibility') === 'public') {
         statusAvatar = <Avatar account={status.get('account')} size={48} />;
       } else {

From 6fd1f06cf7451094f77a4f18dd774e7d9d59f2b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=B5=E3=81=81=E3=81=BC=E5=8E=9F?=
 <ko_kurihara@yahoo.co.jp>
Date: Tue, 28 May 2019 19:47:56 +0900
Subject: [PATCH 2/2] Update app/javascript/mastodon/components/status.js

Co-Authored-By: rinsuki <428rinsuki+git@gmail.com>
---
 app/javascript/mastodon/components/status.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 74d2c51b688641..5eed9b629fa6f0 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -277,7 +277,7 @@ class Status extends ImmutablePureComponent {
       );
     }
 
-    if (account === undefined || account === null) {
+    if (account == null) {
       if (status.get('visibility') === 'public') {
         statusAvatar = <Avatar account={status.get('account')} size={48} />;
       } else {