Fix tests, refactor menu items to please linter and lint

_locales/en/messages.json

@@ -1042,7 +1042,8 @@
     "description": "Menu item for deleting messages, title case."
   },
   "deletePublicConversationConfirmation": {
-    "message": "Permanently delete the messages locally from this public channel?",
+    "message":
+      "Permanently delete the messages locally from this public channel?",
     "description":
       "Confirmation dialog text that asks the user if they really wish to delete the public channel messages locally. Answer buttons use the strings 'ok' and 'cancel'. The deletion is permanent, i.e. it cannot be undone."
   },

js/models/conversations.js

@@ -195,7 +195,7 @@
       return this.id === this.ourNumber;
     },
     isPublic() {
-      return this.id.match(/^publicChat:/);
+      return this.id && this.id.match(/^publicChat:/);
     },
     isClosable() {
       return !this.isRss() || this.get('closable');

ts/components/ConversationListItem.tsx

@@ -199,9 +199,13 @@ export class ConversationListItem extends React.PureComponent<Props> {
         <MenuItem onClick={onDeleteMessages}>{i18n('deleteMessages')}</MenuItem>
         {!isMe && isClosable ? (
           !isPublic ? (
-            <MenuItem onClick={onDeleteContact}>{i18n('deleteContact')}</MenuItem>
+            <MenuItem onClick={onDeleteContact}>
+              {i18n('deleteContact')}
+            </MenuItem>
           ) : (
-            <MenuItem onClick={onDeleteContact}>{i18n('deletePublicChannel')}</MenuItem>
+            <MenuItem onClick={onDeleteContact}>
+              {i18n('deletePublicChannel')}
+            </MenuItem>
           )
         ) : null}
       </ContextMenu>

ts/components/conversation/ConversationHeader.tsx

@@ -201,93 +201,28 @@ export class ConversationHeader extends React.Component<Props> {
   public renderMenu(triggerId: string) {
     const {
       i18n,
-      isBlocked,
       isMe,
       isClosable,
-      isGroup,
-      isArchived,
       isPublic,
       onDeleteMessages,
       onDeleteContact,
-      onResetSession,
-      onSetDisappearingMessages,
-      // onShowAllMedia,
-      onShowGroupMembers,
-      onShowSafetyNumber,
-      onArchive,
-      onMoveToInbox,
-      timerOptions,
-      onBlockUser,
-      onUnblockUser,
-      hasNickname,
-      onClearNickname,
-      onChangeNickname,
       onCopyPublicKey,
     } = this.props;
 
-    const disappearingTitle = i18n('disappearingMessages') as any;
-
-    const blockTitle = isBlocked ? i18n('unblockUser') : i18n('blockUser');
-    const blockHandler = isBlocked ? onUnblockUser : onBlockUser;
-
     return (
       <ContextMenu id={triggerId}>
-        {!isPublic ? (
-          <SubMenu title={disappearingTitle}>
-            {(timerOptions || []).map(item => (
-              <MenuItem
-                key={item.value}
-                onClick={() => {
-                  onSetDisappearingMessages(item.value);
-                }}
-              >
-                {item.name}
-              </MenuItem>
-            ))}
-          </SubMenu>
-        ) : null}
-        {/* <MenuItem onClick={onShowAllMedia}>{i18n('viewAllMedia')}</MenuItem> */}
-        {!isPublic && isGroup ? (
-          <MenuItem onClick={onShowGroupMembers}>
-            {i18n('showMembers')}
-          </MenuItem>
-        ) : null}
-        {!isPublic && !isGroup && !isMe ? (
-          <MenuItem onClick={onShowSafetyNumber}>
-            {i18n('showSafetyNumber')}
-          </MenuItem>
-        ) : null}
-        {!isPublic && !isGroup ? (
-          <MenuItem onClick={onResetSession}>{i18n('resetSession')}</MenuItem>
-        ) : null}
-        {/* Only show the block on other conversations */}
-        {!isPublic && !isMe ? (
-          <MenuItem onClick={blockHandler}>{blockTitle}</MenuItem>
-        ) : null}
-        {!isPublic && !isMe ? (
-          <MenuItem onClick={onChangeNickname}>
-            {i18n('changeNickname')}
-          </MenuItem>
-        ) : null}
-        {!isPublic && !isMe && hasNickname ? (
-          <MenuItem onClick={onClearNickname}>{i18n('clearNickname')}</MenuItem>
-        ) : null}
+        {this.renderPublicMenuItems()}
         <MenuItem onClick={onCopyPublicKey}>{i18n('copyPublicKey')}</MenuItem>
-        {!isPublic ? (
-          isArchived ? (
-            <MenuItem onClick={onMoveToInbox}>
-              {i18n('moveConversationToInbox')}
-            </MenuItem>
-          ) : (
-            <MenuItem onClick={onArchive}>{i18n('archiveConversation')}</MenuItem>
-          )
-        ) : null}
         <MenuItem onClick={onDeleteMessages}>{i18n('deleteMessages')}</MenuItem>
         {!isMe && isClosable ? (
           !isPublic ? (
-            <MenuItem onClick={onDeleteContact}>{i18n('deleteContact')}</MenuItem>
+            <MenuItem onClick={onDeleteContact}>
+              {i18n('deleteContact')}
+            </MenuItem>
           ) : (
-            <MenuItem onClick={onDeleteContact}>{i18n('deletePublicChannel')}</MenuItem>
+            <MenuItem onClick={onDeleteContact}>
+              {i18n('deletePublicChannel')}
+            </MenuItem>
           )
         ) : null}
       </ContextMenu>
@@ -313,4 +248,93 @@ export class ConversationHeader extends React.Component<Props> {
       </div>
     );
   }
+
+  private renderPublicMenuItems() {
+    const {
+      i18n,
+      isBlocked,
+      isMe,
+      isGroup,
+      isArchived,
+      isPublic,
+      onResetSession,
+      onSetDisappearingMessages,
+      // onShowAllMedia,
+      onShowGroupMembers,
+      onShowSafetyNumber,
+      onArchive,
+      onMoveToInbox,
+      timerOptions,
+      onBlockUser,
+      onUnblockUser,
+      hasNickname,
+      onClearNickname,
+      onChangeNickname,
+    } = this.props;
+
+    const disappearingTitle = i18n('disappearingMessages') as any;
+
+    const blockTitle = isBlocked ? i18n('unblockUser') : i18n('blockUser');
+    const blockHandler = isBlocked ? onUnblockUser : onBlockUser;
+
+    const disappearingMessagesMenuItem = (
+      <SubMenu title={disappearingTitle}>
+        {(timerOptions || []).map(item => (
+          <MenuItem
+            key={item.value}
+            onClick={() => {
+              onSetDisappearingMessages(item.value);
+            }}
+          >
+            {item.name}
+          </MenuItem>
+        ))}
+      </SubMenu>
+    );
+    const showMembersMenuItem = isGroup && (
+      <MenuItem onClick={onShowGroupMembers}>{i18n('showMembers')}</MenuItem>
+    );
+    const showSafetyNumberMenuItem = !isGroup &&
+      !isMe && (
+        <MenuItem onClick={onShowSafetyNumber}>
+          {i18n('showSafetyNumber')}
+        </MenuItem>
+      );
+    const resetSessionMenuItem = !isGroup && (
+      <MenuItem onClick={onResetSession}>{i18n('resetSession')}</MenuItem>
+    );
+    const blockHandlerMenuItem = !isMe && (
+      <MenuItem onClick={blockHandler}>{blockTitle}</MenuItem>
+    );
+    const changeNicknameMenuItem = !isMe && (
+      <MenuItem onClick={onChangeNickname}>{i18n('changeNickname')}</MenuItem>
+    );
+    const clearNicknameMenuItem = !isMe &&
+      hasNickname && (
+        <MenuItem onClick={onClearNickname}>{i18n('clearNickname')}</MenuItem>
+      );
+    const archiveConversationMenuItem = isArchived ? (
+      <MenuItem onClick={onMoveToInbox}>
+        {i18n('moveConversationToInbox')}
+      </MenuItem>
+    ) : (
+      <MenuItem onClick={onArchive}>{i18n('archiveConversation')}</MenuItem>
+    );
+
+    return (
+      !isPublic && (
+        <React.Fragment>
+          {/* <MenuItem onClick={onShowAllMedia}>{i18n('viewAllMedia')}</MenuItem> */}
+          {disappearingMessagesMenuItem}
+          {showMembersMenuItem}
+          {showSafetyNumberMenuItem}
+          {resetSessionMenuItem}
+          {blockHandlerMenuItem}
+          {changeNicknameMenuItem}
+          {clearNicknameMenuItem}
+          {archiveConversationMenuItem}
+        </React.Fragment>
+      )
+    );
+  }
 }

ts/components/conversation/MessageDetail.tsx

@@ -56,18 +56,16 @@ export class MessageDetail extends React.Component<Props> {
   public renderDeleteButton() {
     const { i18n, message } = this.props;
 
-    return (
-      message.isDeletable ? (
-        <div className="module-message-detail__delete-button-container">
-          <button
-            onClick={message.onDelete}
-            className="module-message-detail__delete-button"
-          >
-            {i18n('deleteThisMessage')}
-          </button>
-        </div>
-      ) : null
-    );
+    return message.isDeletable ? (
+      <div className="module-message-detail__delete-button-container">
+        <button
+          onClick={message.onDelete}
+          className="module-message-detail__delete-button"
+        >
+          {i18n('deleteThisMessage')}
+        </button>
+      </div>
+    ) : null;
   }
 
   public renderContact(contact: Contact) {