From 346cbd243344c10ebc6b7e6dbbd51328cc9733e5 Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Wed, 26 May 2021 16:04:42 -0400
Subject: [PATCH] disable accept and decline all buttons on empty list and join
 on approve

---
 ui/app/AppLayouts/Chat/components/ContactRequestsPopup.qml   | 2 ++
 .../AppLayouts/Profile/Sections/Contacts/ContactRequest.qml  | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ui/app/AppLayouts/Chat/components/ContactRequestsPopup.qml b/ui/app/AppLayouts/Chat/components/ContactRequestsPopup.qml
index 2365de5c58..a71d9a920e 100644
--- a/ui/app/AppLayouts/Chat/components/ContactRequestsPopup.qml
+++ b/ui/app/AppLayouts/Chat/components/ContactRequestsPopup.qml
@@ -87,6 +87,7 @@ ModalPopup {
 
         StatusButton {
             id: blockBtn
+            enabled: contactList.count > 0
             anchors.right: addToContactsButton.left
             anchors.rightMargin: Style.current.padding
             anchors.bottom: parent.bottom
@@ -97,6 +98,7 @@ ModalPopup {
 
         StatusButton {
             id: addToContactsButton
+            enabled: contactList.count > 0
             anchors.right: parent.right
             text: qsTr("Accept all")
             anchors.bottom: parent.bottom
diff --git a/ui/app/AppLayouts/Profile/Sections/Contacts/ContactRequest.qml b/ui/app/AppLayouts/Profile/Sections/Contacts/ContactRequest.qml
index 237b26a351..5e72da7164 100644
--- a/ui/app/AppLayouts/Profile/Sections/Contacts/ContactRequest.qml
+++ b/ui/app/AppLayouts/Profile/Sections/Contacts/ContactRequest.qml
@@ -76,7 +76,10 @@ Rectangle {
     StatusIconButton {
         id: acceptBtn
         icon.name: "check-circle"
-        onClicked: profileModel.contacts.addContact(container.address)
+        onClicked: {
+            chatsModel.joinPrivateChat(container.address, "")
+            profileModel.contacts.addContact(container.address)
+        }
         width: 32
         height: 32
         padding: 6