diff --git a/js/models/conversations.js b/js/models/conversations.js index 1e93aa888..89d32b01c 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -965,10 +965,6 @@ * target message */ async sendReactionMessage(reaction, target) { - if (!window.ENABLE_REACTION_SEND) { - return null; - } - const timestamp = Date.now(); const outgoingReaction = { ...reaction, ...target }; const reactionModel = Whisper.Reactions.add({ diff --git a/preload.js b/preload.js index 34d8c7fdd..15e1d6a95 100644 --- a/preload.js +++ b/preload.js @@ -16,7 +16,6 @@ window.isFocused = () => browserWindow.isFocused(); // Waiting for clients to implement changes on receive side window.ENABLE_STICKER_SEND = true; -window.ENABLE_REACTION_SEND = false; window.TIMESTAMP_VALIDATION = false; window.PAD_ALL_ATTACHMENTS = false; window.SEND_RECIPIENT_UPDATES = false; diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx index 037a4e040..5697ce555 100644 --- a/ts/components/conversation/Message.tsx +++ b/ts/components/conversation/Message.tsx @@ -1089,9 +1089,6 @@ export class Message extends React.PureComponent { ); - // @ts-ignore - const ENABLE_REACTION_SEND: boolean = window.ENABLE_REACTION_SEND; - return (
{ `module-message__buttons--${direction}` )} > - {ENABLE_REACTION_SEND ? reactButton : null} + {reactButton} {downloadButton} {replyButton} {menuButton} @@ -1149,9 +1146,6 @@ export class Message extends React.PureComponent { const showRetry = status === 'error' && direction === 'outgoing'; const multipleAttachments = attachments && attachments.length > 1; - // @ts-ignore - const ENABLE_REACTION_SEND: boolean = window.ENABLE_REACTION_SEND; - const menu = ( {!isSticker && @@ -1168,21 +1162,19 @@ export class Message extends React.PureComponent { {i18n('downloadAttachment')} ) : null} - {ENABLE_REACTION_SEND ? ( - { - event.stopPropagation(); - event.preventDefault(); + { + event.stopPropagation(); + event.preventDefault(); - this.toggleReactionPicker(); - }} - > - {i18n('reactToMessage')} - - ) : null} + this.toggleReactionPicker(); + }} + > + {i18n('reactToMessage')} +