diff --git a/js/models/conversations.js b/js/models/conversations.js index 65de492d8..f10377fdd 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -210,13 +210,13 @@ return this.id === window.storage.get('primaryDevicePubKey'); }, isPublic() { - return this.id && this.id.match(/^publicChat:/); + return !!(this.id && this.id.match(/^publicChat:/)); }, isClosable() { return !this.isRss() || this.get('closable'); }, isRss() { - return this.id && this.id.match(/^rss:/); + return !!(this.id && this.id.match(/^rss:/)); }, isBlocked() { return BlockedNumberController.isBlocked(this.id); diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js index 8af78423d..5663d35f4 100644 --- a/js/views/conversation_view.js +++ b/js/views/conversation_view.js @@ -228,6 +228,7 @@ isOnline: this.model.isOnline(), isArchived: this.model.get('isArchived'), isPublic: this.model.isPublic(), + isRss: this.model.isRss(), amMod: this.model.isModerator( window.storage.get('primaryDevicePubKey') ), diff --git a/stylesheets/_mentions.scss b/stylesheets/_mentions.scss index 65576f7c6..6d5682600 100644 --- a/stylesheets/_mentions.scss +++ b/stylesheets/_mentions.scss @@ -29,6 +29,11 @@ margin-left: 10px; } +/* remove scroll bars */ +.loki-dialog .add-moderators-dialog .content { + padding: 1.1em; +} + .invite-friends-dialog, .add-moderators-dialog, .remove-moderators-dialog, diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx index 9c710e03e..43b7070fe 100644 --- a/ts/components/conversation/ConversationHeader.tsx +++ b/ts/components/conversation/ConversationHeader.tsx @@ -30,6 +30,7 @@ interface Props { isGroup: boolean; isArchived: boolean; isPublic: boolean; + isRss: boolean; amMod: boolean; members: Array; @@ -235,6 +236,7 @@ export class ConversationHeader extends React.Component { isMe, isClosable, isPublic, + isRss, isGroup, amMod, onDeleteMessages, @@ -247,7 +249,7 @@ export class ConversationHeader extends React.Component { onInviteFriends, } = this.props; - const isPrivateGroup = isGroup && !isPublic; + const isPrivateGroup = isGroup && !isPublic && !isRss; const copyIdLabel = isGroup ? i18n('copyChatId') : i18n('copyPublicKey'); @@ -340,6 +342,7 @@ export class ConversationHeader extends React.Component { isGroup, isArchived, isPublic, + isRss, onResetSession, onSetDisappearingMessages, // onShowAllMedia, @@ -355,7 +358,7 @@ export class ConversationHeader extends React.Component { onChangeNickname, } = this.props; - if (isPublic) { + if (isPublic || isRss) { return null; } diff --git a/ts/components/conversation/ModeratorsAddDialog.tsx b/ts/components/conversation/ModeratorsAddDialog.tsx index 8c0de8e17..f55e6680c 100644 --- a/ts/components/conversation/ModeratorsAddDialog.tsx +++ b/ts/components/conversation/ModeratorsAddDialog.tsx @@ -130,7 +130,7 @@ export class AddModeratorsDialog extends React.Component { return (

- ${i18n('addModerators')} ${this.props.chatName} + {i18n('addModerators')} {this.props.chatName}

Add Moderator:

diff --git a/ts/components/conversation/ModeratorsRemoveDialog.tsx b/ts/components/conversation/ModeratorsRemoveDialog.tsx index acb69c693..c4a71121f 100644 --- a/ts/components/conversation/ModeratorsRemoveDialog.tsx +++ b/ts/components/conversation/ModeratorsRemoveDialog.tsx @@ -63,7 +63,7 @@ export class RemoveModeratorsDialog extends React.Component { return (

- ${i18n('removeModerators')} ${this.props.chatName} + {i18n('removeModerators')} {this.props.chatName}

Existing moderators: