From 5247bc56b7b62933481090af3047fc3d343fd292 Mon Sep 17 00:00:00 2001
From: Beaudan Brown <beau@loki.network>
Date: Wed, 4 Sep 2019 11:09:05 +1000
Subject: [PATCH] Address review

---
 .../conversation/ConversationHeader.tsx       | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 18bd7721d..a670bd25f 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -272,6 +272,10 @@ export class ConversationHeader extends React.Component<Props> {
       onChangeNickname,
     } = this.props;
 
+    if (isPublic) {
+      return null;
+    }
+
     const disappearingTitle = i18n('disappearingMessages') as any;
 
     const blockTitle = isBlocked ? i18n('unblockUser') : i18n('blockUser');
@@ -322,19 +326,17 @@ export class ConversationHeader extends React.Component<Props> {
     );
 
     return (
-      !isPublic && (
-        <React.Fragment>
-          {/* <MenuItem onClick={onShowAllMedia}>{i18n('viewAllMedia')}</MenuItem> */}
-          {disappearingMessagesMenuItem}
-          {showMembersMenuItem}
-          {showSafetyNumberMenuItem}
-          {resetSessionMenuItem}
-          {blockHandlerMenuItem}
-          {changeNicknameMenuItem}
-          {clearNicknameMenuItem}
-          {archiveConversationMenuItem}
-        </React.Fragment>
-      )
+      <React.Fragment>
+        {/* <MenuItem onClick={onShowAllMedia}>{i18n('viewAllMedia')}</MenuItem> */}
+        {disappearingMessagesMenuItem}
+        {showMembersMenuItem}
+        {showSafetyNumberMenuItem}
+        {resetSessionMenuItem}
+        {blockHandlerMenuItem}
+        {changeNicknameMenuItem}
+        {clearNicknameMenuItem}
+        {archiveConversationMenuItem}
+      </React.Fragment>
     );
   }
 }