From c8cc65506bbf683a8f2d5b686509f6a3cc0f6c37 Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Wed, 26 May 2021 15:25:29 -0400
Subject: [PATCH] fix(CommunityRequest): fix request list emptying after
 accepting

Fixes #2474
---
 src/app/chat/views/community_item.nim         |  3 ++-
 src/status/chat.nim                           |  8 --------
 ui/app/AppLayouts/Chat/ChatColumn/Message.qml | 16 ----------------
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/src/app/chat/views/community_item.nim b/src/app/chat/views/community_item.nim
index 3ad9e0076c..06e3c2d246 100644
--- a/src/app/chat/views/community_item.nim
+++ b/src/app/chat/views/community_item.nim
@@ -43,7 +43,8 @@ QtObject:
     self.categories.setCategories(communityItem.categories)
     self.members.setMembers(communityItem.members)
     self.nbMembersChanged()
-    self.communityMembershipRequestList.setNewData(communityItem.membershipRequests)
+    if communityItem.membershipRequests.len > 0:
+      self.communityMembershipRequestList.setNewData(communityItem.membershipRequests)
 
   proc activeChanged*(self: CommunityItemView) {.signal.}
 
diff --git a/src/status/chat.nim b/src/status/chat.nim
index 9410916ea4..2ee95951e2 100644
--- a/src/status/chat.nim
+++ b/src/status/chat.nim
@@ -223,14 +223,6 @@ proc init*(self: ChatModel, pubKey: string) =
     self.mailserverReady = true
     self.requestMissingCommunityInfos()
 
-  if (topics.len == 0): 
-    warn "No topics found for chats. Cannot load past messages"
-  else:
-    self.events.once("mailserverAvailable") do(a: Args):
-      self.mailserverReady = true
-      self.requestMissingCommunityInfos()
-      self.events.emit("mailserverTopics", TopicArgs(topics: topics));
-
   self.events.on("contactUpdate") do(a: Args):
     var evArgs = ContactUpdateArgs(a)
     self.updateContacts(evArgs.contacts)
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/Message.qml b/ui/app/AppLayouts/Chat/ChatColumn/Message.qml
index d2a79185ef..d375d50a2b 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/Message.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/Message.qml
@@ -61,22 +61,6 @@ Item {
         return Utils.removeStatusEns(alias)
     }
 
-    property string displayUserName: {
-        if (isCurrentUser) {
-            //% "You"
-            return qsTrId("You")
-        }
-
-        if (localName !== "") {
-            return localName
-        }
-
-        if (userName !== "") {
-            return Utils.removeStatusEns(userName)
-        }
-        return Utils.removeStatusEns(alias)
-    }
-
     property string authorCurrentMsg: "authorCurrentMsg"
     property string authorPrevMsg: "authorPrevMsg"