From f54f3a61bfc7e005896bac77afa619b844c84b11 Mon Sep 17 00:00:00 2001
From: Sale Djenic <aleksandardjenic@status.im>
Date: Tue, 21 Sep 2021 10:43:44 +0200
Subject: [PATCH] fix(@desktop/chat): removing contact results in the same
 contact's contact request showing up again

Fixes: #3418
---
 src/app/profile/views/contacts.nim                 | 4 ----
 ui/app/AppLayouts/Chat/components/ProfilePopup.qml | 3 ---
 vendor/status-lib                                  | 2 +-
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/app/profile/views/contacts.nim b/src/app/profile/views/contacts.nim
index c9a058c31b..fe55b49c7f 100644
--- a/src/app/profile/views/contacts.nim
+++ b/src/app/profile/views/contacts.nim
@@ -196,12 +196,9 @@ QtObject:
       )
     self.contactToAddChanged()
 
-  proc contactChanged(self: ContactsView, publicKey: string, isAdded: bool) {.signal.}
-
   proc addContact*(self: ContactsView, publicKey: string): string {.slot.} =
     result = self.status.contacts.addContact(publicKey, self.accountKeyUID)
     self.status.chat.join(status_utils.getTimelineChatId(publicKey), ChatType.Profile, "", publicKey)
-    self.contactChanged(publicKey, true)
 
   proc rejectContactRequest*(self: ContactsView, publicKey: string) {.slot.} =
     self.status.contacts.rejectContactRequest(publicKey)
@@ -238,4 +235,3 @@ QtObject:
     let channelId = status_utils.getTimelineChatId(publicKey)
     if self.status.chat.hasChannel(channelId):
       self.status.chat.leave(channelId)
-    self.contactChanged(publicKey, false)
diff --git a/ui/app/AppLayouts/Chat/components/ProfilePopup.qml b/ui/app/AppLayouts/Chat/components/ProfilePopup.qml
index 74d812f9eb..9865d74bca 100644
--- a/ui/app/AppLayouts/Chat/components/ProfilePopup.qml
+++ b/ui/app/AppLayouts/Chat/components/ProfilePopup.qml
@@ -38,7 +38,6 @@ StatusModal {
     signal contactUnblocked(publicKey: string)
     signal contactBlocked(publicKey: string)
     signal contactAdded(publicKey: string)
-    signal contactRemoved(publicKey: string)
 
     function openPopup(showFooter, userNameParam, fromAuthorParam, identiconParam, textParam, nicknameParam) {
         userName = userNameParam || ""
@@ -227,8 +226,6 @@ StatusModal {
                 }
                 removeContactConfirmationDialog.close();
                 popup.close();
-
-                popup.contactRemoved(fromAuthor);
             }
         }
 
diff --git a/vendor/status-lib b/vendor/status-lib
index 4c1b47dae1..cdb06facdd 160000
--- a/vendor/status-lib
+++ b/vendor/status-lib
@@ -1 +1 @@
-Subproject commit 4c1b47dae140bbd35e9b4fda3e7c6ee56aad0c7a
+Subproject commit cdb06facdd751d1dc69f57f7271ff2796228975f