Merge pull request #696 from neuroscr/multidevice-publicchat

Minor fixes and clean up

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);

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')
           ),

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,

ts/components/conversation/ConversationHeader.tsx

@@ -30,6 +30,7 @@ interface Props {
   isGroup: boolean;
   isArchived: boolean;
   isPublic: boolean;
+  isRss: boolean;
   amMod: boolean;
 
   members: Array<any>;
@@ -235,6 +236,7 @@ export class ConversationHeader extends React.Component<Props> {
       isMe,
       isClosable,
       isPublic,
+      isRss,
       isGroup,
       amMod,
       onDeleteMessages,
@@ -247,7 +249,7 @@ export class ConversationHeader extends React.Component<Props> {
       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<Props> {
       isGroup,
       isArchived,
       isPublic,
+      isRss,
       onResetSession,
       onSetDisappearingMessages,
       // onShowAllMedia,
@@ -355,7 +358,7 @@ export class ConversationHeader extends React.Component<Props> {
       onChangeNickname,
     } = this.props;
 
-    if (isPublic) {
+    if (isPublic || isRss) {
       return null;
     }
 

ts/components/conversation/ModeratorsAddDialog.tsx

@@ -130,7 +130,7 @@ export class AddModeratorsDialog extends React.Component<Props, State> {
     return (
       <div className="content">
         <p className="titleText">
-          ${i18n('addModerators')} <span>${this.props.chatName}</span>
+          {i18n('addModerators')} <span>{this.props.chatName}</span>
         </p>
         <div className="addModeratorBox">
           <p>Add Moderator:</p>

ts/components/conversation/ModeratorsRemoveDialog.tsx

@@ -63,7 +63,7 @@ export class RemoveModeratorsDialog extends React.Component<Props, State> {
     return (
       <div className="content">
         <p className="titleText">
-          ${i18n('removeModerators')} <span>${this.props.chatName}</span>
+          {i18n('removeModerators')} <span>{this.props.chatName}</span>
         </p>
         <div className="moderatorList">
           <p>Existing moderators:</p>