status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-22 19:48:52 +00:00
Code Issues Projects Releases Wiki Activity

fix: [chat] @mentions no longer working

Browse Source 
fixup undefined references which caused the users model to become
empty

Fixes #11005
This commit is contained in:
Lukáš Tinkl 2023-06-08 20:35:18 +02:00 committed by Jonathan Rainville
parent 9aeba367df
commit 0f9f5de267
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/app/AppLayouts/Chat/views/ChatColumnView.qml
View File

@ -40,7 +40,7 @@ Item {
property bool stickersLoaded: false property bool stickersLoaded: false
readonly property var contactDetails: rootStore ? rootStore.oneToOneChatContact : null readonly property var contactDetails: rootStore ? rootStore.oneToOneChatContact : null
readonly property bool isUserAdded: root.contactDetails && root.contactDetails.isAdded readonly property bool isUserAdded: !!root.contactDetails && root.contactDetails.isAdded
signal openStickerPackPopup(string stickerPackId) signal openStickerPackPopup(string stickerPackId)
@ -241,7 +241,7 @@ Item {
root.rootStore.isUserAllowedToSendMessage root.rootStore.isUserAllowedToSendMessage
store: root.rootStore store: root.rootStore
usersStore: d.usersStore usersStore: d.activeUsersStore
textInput.placeholderText: { textInput.placeholderText: {
if (d.activeChatContentModule.chatDetails.blocked) if (d.activeChatContentModule.chatDetails.blocked)

4
ui/imports/shared/status/StatusChatInput.qml
View File

@ -653,7 +653,7 @@ Rectangle {
if ((event.modifiers & Qt.ControlModifier) || (event.modifiers & Qt.MetaModifier)) // these are likely shortcuts with no meaningful text if ((event.modifiers & Qt.ControlModifier) || (event.modifiers & Qt.MetaModifier)) // these are likely shortcuts with no meaningful text
return return
if (event.key === Qt.Key_Backspace && d.textFormatMenu.opened) { if (event.key === Qt.Key_Backspace && (!!d.textFormatMenu && d.textFormatMenu.opened)) {
d.textFormatMenu.close() d.textFormatMenu.close()
} }
// the text doesn't get registered to the textarea fast enough // the text doesn't get registered to the textarea fast enough
@ -1138,8 +1138,6 @@ Rectangle {
id: textFormatMenuComponent id: textFormatMenuComponent
StatusTextFormatMenu { StatusTextFormatMenu {
id: textFormatMenu
onClosed: { onClosed: {
messageInputField.deselect() messageInputField.deselect()
destroy() destroy()