suppress channel name msg for #general (#20200)

keybase · Oct 8, 2019 · 9c21799 · 9c21799
1 parent 69e9105
commit 9c21799
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/shared/chat/conversation/messages/set-channelname/index.tsx b/shared/chat/conversation/messages/set-channelname/index.tsx
@@ -7,11 +7,13 @@ type Props = {
   message: Types.MessageSetChannelname
 }
 
-export default (props: Props) => (
-  <Kb.Text type="BodySmall" style={styles.text} selectable={true}>
-    set the channel name to <Kb.Text type="BodySmallItalic">#{props.message.newChannelname}</Kb.Text>
-  </Kb.Text>
-)
+export default (props: Props) =>
+  // suppress this message for the #general channel, it is redundant.
+  props.message.newChannelname === 'general' ? null : (
+    <Kb.Text type="BodySmall" style={styles.text} selectable={true}>
+      set the channel name to <Kb.Text type="BodySmallItalic">#{props.message.newChannelname}</Kb.Text>
+    </Kb.Text>
+  )
 
 const styles = Styles.styleSheetCreate(
   () =>

diff --git a/shared/chat/conversation/messages/wrapper/container.tsx b/shared/chat/conversation/messages/wrapper/container.tsx
@@ -42,8 +42,12 @@ const getUsernameToShow = (
     case 'requestPayment':
     case 'sendPayment':
     case 'text':
-    case 'setChannelname':
       return !previous || !sequentialUserMessages || !!timestamp ? message.author : ''
+    case 'setChannelname':
+      // suppress this message for the #general channel, it is redundant.
+      return (!previous || !sequentialUserMessages || !!timestamp) && message.newChannelname !== 'general'
+        ? message.author
+        : ''
     case 'systemAddedToTeam':
       return message.addee === you ? '' : message.addee
     case 'systemLeft':