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: sendBtn and trim

This commit is contained in:
Richard Ramos 2020-07-31 17:40:23 -04:00
parent 459de8cd1c
commit 397be0b0c0
No known key found for this signature in database
GPG Key ID: 80D4B01265FDFE8F
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/app/AppLayouts/Chat/ChatColumn/ChatButtons.qml
View File

@ -36,8 +36,9 @@ Item {
chatsModel.sendImage(sendImageArea.image);
}
if(txtData.text.trim() > 0){
chatsModel.sendMessage(txtData.text.trim(), chatColumn.isReply ? SelectedMessage.messageId : "", Utils.isOnlyEmoji(txtData.text) ? Constants.emojiType : Constants.messageType)
let msg = chatsModel.plainText(Emoji.deparse(txtData.text)).trim()
if(msg.length > 0){
chatsModel.sendMessage(msg, chatColumn.isReply ? SelectedMessage.messageId : "", Utils.isOnlyEmoji(msg) ? Constants.emojiType : Constants.messageType)
txtData.text = "";
}

7
ui/app/AppLayouts/Chat/ChatColumn/ChatInput.qml
View File

@ -39,11 +39,12 @@ Rectangle {
chatsModel.sendImage(sendImageArea.image);
}
if(txtData.text.trim().length > 0){
var msg = interpretMessage(txtData.text.trim()).trim()
var msg = chatsModel.plainText(Emoji.deparse(txtData.text).trim()).trim()
if(msg.length > 0){
msg = interpretMessage(msg)
msg = Emoji.deparse(msg)
chatsModel.sendMessage(msg, chatColumn.isReply ? SelectedMessage.messageId : "", Utils.isOnlyEmoji(txtData.text) ? Constants.emojiType : Constants.messageType);
chatsModel.sendMessage(msg, chatColumn.isReply ? SelectedMessage.messageId : "", Utils.isOnlyEmoji(msg) ? Constants.emojiType : Constants.messageType);
txtData.text = "";
event.accepted = true
sendMessageSound.stop()