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(ChatColumnView): hide input when no active chat (#11107)

This commit is contained in:
Igor Sirotin 2023-06-15 16:58:32 +03:00 committed by GitHub
parent d534bf6773
commit 407179cd10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,8 +239,10 @@ Item {
id: chatInput
Layout.fillWidth: true
visible: !!d.activeChatContentModule
enabled: !d.activeChatContentModule.chatDetails.blocked
enabled: !!d.activeChatContentModule
&& !d.activeChatContentModule.chatDetails.blocked
&& root.rootStore.sectionDetails.joined
&& !root.rootStore.sectionDetails.amIBanned
&& root.rootStore.isUserAllowedToSendMessage
@ -249,6 +251,8 @@ Item {
usersStore: d.activeUsersStore
textInput.placeholderText: {
if (!d.activeChatContentModule)
return
if (d.activeChatContentModule.chatDetails.blocked)
return qsTr("This user has been blocked.")
if (!root.rootStore.sectionDetails.joined || root.rootStore.sectionDetails.amIBanned)
@ -262,15 +266,18 @@ Item {
suggestions.suggestionFilter.addSystemSuggestions: chatType === Constants.chatType.communityChat
textInput.onTextChanged: {
d.activeChatContentModule.inputAreaModule.preservedProperties.text = textInput.text
if (!!d.activeChatContentModule)
d.activeChatContentModule.inputAreaModule.preservedProperties.text = textInput.text
}
onReplyMessageIdChanged: {
d.activeChatContentModule.inputAreaModule.preservedProperties.replyMessageId = replyMessageId
if (!!d.activeChatContentModule)
d.activeChatContentModule.inputAreaModule.preservedProperties.replyMessageId = replyMessageId
}
onFileUrlsAndSourcesChanged: {
d.activeChatContentModule.inputAreaModule.preservedProperties.fileUrlsAndSourcesJson = JSON.stringify(chatInput.fileUrlsAndSources)
if (!!d.activeChatContentModule)
d.activeChatContentModule.inputAreaModule.preservedProperties.fileUrlsAndSourcesJson = JSON.stringify(chatInput.fileUrlsAndSources)
}
onSendTransactionCommandButtonClicked: {
@ -291,7 +298,8 @@ Item {
}
onStickerSelected: {
root.rootStore.sendSticker(d.activeChatContentModule.getMyChatId(),
if (!!d.activeChatContentModule)
root.rootStore.sendSticker(d.activeChatContentModule.getMyChatId(),
hashId,
chatInput.isReply ? chatInput.replyMessageId : "",
packId,
@ -320,10 +328,6 @@ Item {
}
}
onUnblockChat: {
}
onKeyUpPress: {
d.activeMessagesStore.setEditModeOnLastMessage(root.rootStore.userProfileInst.pubKey)
}
@ -333,11 +337,12 @@ Item {
Layout.fillHeight: true
Layout.maximumHeight: chatInput.implicitHeight
verticalPadding: 0
visible: d.activeChatContentModule.chatDetails.blocked
visible: !!d.activeChatContentModule && d.activeChatContentModule.chatDetails.blocked
text: qsTr("Unblock")
type: StatusBaseButton.Type.Danger
onClicked: {
d.activeChatContentModule.unblockChat()
if (!!d.activeChatContentModule)
d.activeChatContentModule.unblockChat()
}
}
}

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

@ -27,7 +27,6 @@ Rectangle {
signal receiveTransactionCommandButtonClicked()
signal stickerSelected(string hashId, string packId, string url)
signal sendMessage(var event)
signal unblockChat()
signal keyUpPress()
property var usersStore