From 1bc3fa1c97b9449c916658d33ad69721cac3088d Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Tue, 30 Mar 2021 10:13:20 -0400
Subject: [PATCH] fix: fix sticker click modal to only open on sticker click

---
 .../Chat/ChatColumn/MessageComponents/CompactMessage.qml    | 4 ++--
 .../Chat/ChatColumn/MessageComponents/MessageMouseArea.qml  | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml
index b88d13484f..43919f1d9a 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml
@@ -24,8 +24,8 @@ Item {
     MouseArea {
         enabled: !placeholderMessage
         anchors.fill: messageContainer
-        acceptedButtons: Qt.LeftButton | Qt.RightButton
-        onClicked:  messageMouseArea.clicked(mouse)
+        acceptedButtons: Qt.RightButton
+        onClicked: messageMouseArea.clicked(mouse)
     }
 
     ChatButtons {
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/MessageMouseArea.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/MessageMouseArea.qml
index 8363a1a147..6df4566ac0 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/MessageMouseArea.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/MessageMouseArea.qml
@@ -15,7 +15,11 @@ MouseArea {
             }
             return;
         }
-        if (mouse.button & Qt.LeftButton && isSticker && stickersLoaded) {
+        if (mouse.button === Qt.LeftButton && isSticker && stickersLoaded) {
+            if (isHovered) {
+                isHovered = false
+            }
+            
             openPopup(statusStickerPackClickPopup, {packId: stickerPackId} )
             return;
         }