From b8d4192c027484dfccbed8877f5d970cc5492102 Mon Sep 17 00:00:00 2001
From: Eric Mastro <eric.mastro@gmail.com>
Date: Mon, 27 Sep 2021 20:31:17 +1000
Subject: [PATCH] fix(ui): User presence popup hide on second click

Partially fixes #3558.
---
 ui/app/AppMain.qml                  | 7 ++++++-
 ui/shared/UserStatusContextMenu.qml | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ui/app/AppMain.qml b/ui/app/AppMain.qml
index 6421972d4e..8d31786609 100644
--- a/ui/app/AppMain.qml
+++ b/ui/app/AppMain.qml
@@ -353,6 +353,7 @@ Item {
 
             navBarProfileButton: StatusNavBarTabButton {
                 id: profileButton
+                property bool opened: false
                 icon.source: profileModel.profile.thumbnailImage || ""
                 badge.visible: true
                 badge.anchors.rightMargin: 4
@@ -374,7 +375,11 @@ Item {
                     }*/
                 }
                 badge.border.width: 3
-                onClicked: userStatusContextMenu.open()
+                onClicked: {
+                    userStatusContextMenu.opened ?
+                        userStatusContextMenu.close() :
+                        userStatusContextMenu.open()
+                }
 
                 UserStatusContextMenu {
                     id: userStatusContextMenu
diff --git a/ui/shared/UserStatusContextMenu.qml b/ui/shared/UserStatusContextMenu.qml
index bb834fdcd9..1e60d8b688 100644
--- a/ui/shared/UserStatusContextMenu.qml
+++ b/ui/shared/UserStatusContextMenu.qml
@@ -10,7 +10,7 @@ import "./"
 PopupMenu {
     id: root
     width: profileHeader.width
-    closePolicy: Popup.CloseOnPressOutside | Popup.CloseOnEscape
+    closePolicy: Popup.CloseOnReleaseOutsideParent | Popup.CloseOnEscape
 
     Item {
         id: profileHeader