status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix(Chat): Reset MessageContextMenuView state on close 

Close #5289
This commit is contained in:
MishkaRogachev 2022-07-06 17:16:58 +03:00 committed by Mikhail Rogachev
parent 353110d4ae
commit 167cb9e63f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app_service/service/contacts/service.nim
View File

@ -428,25 +428,27 @@ QtObject:
proc unblockContact*(self: Service, publicKey: string) = proc unblockContact*(self: Service, publicKey: string) =
var contact = self.getContactById(publicKey) var contact = self.getContactById(publicKey)
contact.blocked = false
let response = status_contacts.unblockContact(contact.id) let response = status_contacts.unblockContact(contact.id)
if(not response.error.isNil): if(not response.error.isNil):
let msg = response.error.message let msg = response.error.message
error "error unblocking contact ", msg error "error unblocking contact ", msg
return return
contact.blocked = false
self.saveContact(contact) self.saveContact(contact)
self.events.emit(SIGNAL_CONTACT_UNBLOCKED, ContactArgs(contactId: contact.id)) self.events.emit(SIGNAL_CONTACT_UNBLOCKED, ContactArgs(contactId: contact.id))
proc blockContact*(self: Service, publicKey: string) = proc blockContact*(self: Service, publicKey: string) =
var contact = self.getContactById(publicKey) var contact = self.getContactById(publicKey)
contact.blocked = true
let response = status_contacts.blockContact(contact.id) let response = status_contacts.blockContact(contact.id)
if(not response.error.isNil): if(not response.error.isNil):
let msg = response.error.message let msg = response.error.message
error "error blocking contact ", msg error "error blocking contact ", msg
return return
contact.blocked = true
self.saveContact(contact) self.saveContact(contact)
self.events.emit(SIGNAL_CONTACT_BLOCKED, ContactArgs(contactId: contact.id)) self.events.emit(SIGNAL_CONTACT_BLOCKED, ContactArgs(contactId: contact.id))

1
ui/imports/shared/views/chat/MessageContextMenuView.qml
View File

@ -97,6 +97,7 @@ StatusPopupMenu {
onHeightChanged: { root.y = setYPosition(); } onHeightChanged: { root.y = setYPosition(); }
onWidthChanged: { root.x = setXPosition(); } onWidthChanged: { root.x = setXPosition(); }
onClosed: selectedUserPublicKey = ""
width: Math.max(emojiContainer.visible ? emojiContainer.width : 0, 200) width: Math.max(emojiContainer.visible ? emojiContainer.width : 0, 200)