[FIX] Send message with pending messages (#16474)

RocketChat · Feb 5, 2020 · 767730b · 767730b
1 parent 58c877a
commit 767730b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/app/ui-message/client/messageBox/messageBox.js b/app/ui-message/client/messageBox/messageBox.js
@@ -82,7 +82,6 @@ Template.messageBox.onCreated(function() {
 		autogrow.update();
 	};
 
-	let isSending = false;
 
 	this.send = (event) => {
 		const { input } = this;
@@ -95,15 +94,13 @@ Template.messageBox.onCreated(function() {
 		const { value } = input;
 		this.set('');
 
-		if (!onSend || isSending) {
+		if (!onSend) {
 			return;
 		}
 
-		isSending = true;
 		onSend.call(this.data, event, { rid, tmid, value }, () => {
 			autogrow.update();
 			input.focus();
-			isSending = false;
 		});
 	};
 });

diff --git a/app/ui/client/lib/chatMessages.js b/app/ui/client/lib/chatMessages.js
@@ -269,7 +269,7 @@ export class ChatMessages {
 
 		if (msg) {
 			readMessage.readNow(rid);
-			$('.message.first-unread').removeClass('first-unread');
+			readMessage.refreshUnreadMark(rid);
 
 			const message = await promises.run('onClientBeforeSendMessage', {
 				_id: Random.id(),
@@ -388,8 +388,8 @@ export class ChatMessages {
 			return false;
 		}
 
-		await call('updateMessage', message);
 		this.clearEditing();
+		await call('updateMessage', message);
 		return true;
 	}