From 399ffa3c323bca82092dd7a79971a623cff7939f Mon Sep 17 00:00:00 2001 From: Vincent Date: Tue, 7 Apr 2020 18:15:23 +1000 Subject: [PATCH] Remove redundant bool casting --- js/views/conversation_view.js | 10 ++++------ ts/components/conversation/ConversationHeader.tsx | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js index 301a1eb5c..2fed7a627 100644 --- a/js/views/conversation_view.js +++ b/js/views/conversation_view.js @@ -1339,7 +1339,7 @@ // In future, we may be able to unsend private messages also // isServerDeletable also defined in ConversationHeader.tsx for // future reference - const isServerDeletable = !!isPublic; + const isServerDeletable = isPublic; const warningMessage = (() => { if (isPublic) { @@ -1390,11 +1390,9 @@ // If removable from server, we "Unsend" - otherwise "Delete" const pluralSuffix = multiple ? 's' : ''; - const title = i18n( - isPublic - ? `unsendMessage${pluralSuffix}` - : `deleteMessage${pluralSuffix}` - ); + const title = i18n(isPublic + ? `unsendMessage${pluralSuffix}` + : `deleteMessage${pluralSuffix}`); const okText = i18n(isServerDeletable ? 'unsend' : 'delete'); diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx index 3a4a676ce..227f66246 100644 --- a/ts/components/conversation/ConversationHeader.tsx +++ b/ts/components/conversation/ConversationHeader.tsx @@ -363,7 +363,7 @@ export class ConversationHeader extends React.Component { i18n, } = this.props; - const isServerDeletable = !!isPublic; + const isServerDeletable = isPublic; const deleteMessageButtonText = i18n( isServerDeletable ? 'unsend' : 'delete' );