Apply $and helper to message template (#17280)

RocketChat · Apr 13, 2020 · 58b14d1 · 58b14d1
1 parent 2afc3ec
commit 58b14d1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/app/ui-message/client/message.html b/app/ui-message/client/message.html
@@ -121,7 +121,7 @@
 				</div>
 			{{/if}}
 
-			{{#if and settings.showReplyButton msg.tcount}}
+			{{#if $and settings.showReplyButton msg.tcount}}
 				<div class="message-discussion">
 					<button class="js-open-thread rc-button rc-button--primary rc-button--small" data-rid={{roomId}}>
 						{{> icon icon="thread"}}

diff --git a/app/ui-message/client/message.js b/app/ui-message/client/message.js
@@ -47,9 +47,6 @@ Template.message.helpers({
 		const { msg, settings } = this;
 		return Tracker.nonreactive(() => renderBody(msg, settings));
 	},
-	and(a, b) {
-		return a && b;
-	},
 	i18nReplyCounter() {
 		const { msg } = this;
 		return `<span class='reply-counter'>${ msg.tcount }</span>`;