diff --git a/js/models/messages.js b/js/models/messages.js index ed0a66e15..59a15f964 100644 --- a/js/models/messages.js +++ b/js/models/messages.js @@ -126,7 +126,7 @@ // trigger a change event on this component. // this will call generateProps and refresh the Message.tsx component with new props - this.listenTo(conversation, 'disable:input', triggerChange ); + this.listenTo(conversation, 'disable:input', triggerChange); if (fromContact) { this.listenTo( fromContact, diff --git a/js/views/invite_friends_dialog_view.js b/js/views/invite_friends_dialog_view.js index a0be59718..a5e52aec4 100644 --- a/js/views/invite_friends_dialog_view.js +++ b/js/views/invite_friends_dialog_view.js @@ -14,7 +14,7 @@ const convos = window.getConversations().models; - if (convo.isPublic) { + if (convo.isPublic()) { this.friends = convos.filter( d => !!d && d.isFriend() && d.isPrivate() && !d.isMe() ); diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx index ad21af24f..0e5d7fd21 100644 --- a/ts/components/conversation/Message.tsx +++ b/ts/components/conversation/Message.tsx @@ -1140,7 +1140,9 @@ export class Message extends React.PureComponent { }} > {this.renderError(isIncoming)} - {isRss || isKickedFromGroup ? null : this.renderMenu(!isIncoming, triggerId)} + {isRss || isKickedFromGroup + ? null + : this.renderMenu(!isIncoming, triggerId)}
{ const hasDisappearingMessages = !isPublic && !isKickedFromGroup; const leaveGroupString = isPublic ? window.i18n('leaveOpenGroup') - : isKickedFromGroup ? window.i18n('youAreKickedFromThisGroup') : window.i18n('leaveClosedGroup'); + : isKickedFromGroup + ? window.i18n('youAreKickedFromThisGroup') + : window.i18n('leaveClosedGroup'); const disappearingMessagesOptions = timerOptions.map(option => { return { @@ -232,8 +234,10 @@ export class SessionGroupSettings extends React.Component { }; }); - const showUpdateGroupNameButton = isPublic && !isKickedFromGroup ? amMod : isAdmin; - const showUpdateGroupMembersButton = !isPublic && !isKickedFromGroup && isAdmin; + const showUpdateGroupNameButton = + isPublic && !isKickedFromGroup ? amMod : isAdmin; + const showUpdateGroupMembersButton = + !isPublic && !isKickedFromGroup && isAdmin; return (