From ca351db73ea4940d50fe77c64ae254d088e9be4d Mon Sep 17 00:00:00 2001
From: Djorkaeff Alexandre <djorkaeff.unb@gmail.com>
Date: Thu, 26 Sep 2019 14:12:27 -0300
Subject: [PATCH] [FIX] Delete message on thread (#1214)

---
 app/containers/MessageActions.js | 2 +-
 app/containers/message/Thread.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/containers/MessageActions.js b/app/containers/MessageActions.js
index 0710fa1d6..360227562 100644
--- a/app/containers/MessageActions.js
+++ b/app/containers/MessageActions.js
@@ -237,7 +237,7 @@ class MessageActions extends React.Component {
 					style: 'destructive',
 					onPress: async() => {
 						try {
-							await RocketChat.deleteMessage(message.id, message.rid);
+							await RocketChat.deleteMessage(message.id, message.subscription.id);
 						} catch (e) {
 							log(e);
 						}
diff --git a/app/containers/message/Thread.js b/app/containers/message/Thread.js
index c8d36b40d..c27473489 100644
--- a/app/containers/message/Thread.js
+++ b/app/containers/message/Thread.js
@@ -10,7 +10,7 @@ import { THREAD } from './constants';
 const Thread = React.memo(({
 	msg, tcount, tlm, customThreadTimeFormat, isThreadRoom
 }) => {
-	if (!tlm || isThreadRoom) {
+	if (!tlm || isThreadRoom || tcount === 0) {
 		return null;
 	}