From f0826108f7c5b7fde44830c0ea3a3f8db0a1c476 Mon Sep 17 00:00:00 2001
From: kunall17 <kunall.gupta17@gmail.com>
Date: Sat, 29 Jul 2017 16:27:15 +0530
Subject: [PATCH] Display topic input only in stream narrow

---
 src/compose/ComposeBox.js  |  2 +-
 src/compose/ComposeText.js | 24 ++++++++++--------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/compose/ComposeBox.js b/src/compose/ComposeBox.js
index 06bbf00d7c..db6be5c5e0 100644
--- a/src/compose/ComposeBox.js
+++ b/src/compose/ComposeBox.js
@@ -70,7 +70,7 @@ class ComposeBox extends PureComponent {
     return (
       <View style={this.context.styles.composeBox}>
         <AutoCompleteView text={text} onAutocomplete={this.handleAutoComplete} />
-        {(isTopicNarrow(narrow) || isStreamNarrow(narrow)) &&
+        {isStreamNarrow(narrow) &&
           <View style={styles.topicWrapper}>
             <StreamBox
               optionSelected={optionSelected}
diff --git a/src/compose/ComposeText.js b/src/compose/ComposeText.js
index fd091adbfd..e3ccbe88f4 100644
--- a/src/compose/ComposeText.js
+++ b/src/compose/ComposeText.js
@@ -77,20 +77,16 @@ export default class ComposeText extends PureComponent {
 
     if (isPrivateOrGroupNarrow(narrow)) {
       sendMessage(auth, 'private', narrow[0].operand, '', text);
-    } else if (isTopicNarrow(narrow) || isStreamNarrow(narrow)) {
-      if (operator !== null) {
-        sendMessage(
-          auth,
-          'stream',
-          narrow[0].operand,
-          operator === '' ? '(no topic)' : operator,
-          text,
-        );
-      } else if (isTopicNarrow(narrow)) {
-        sendMessage(auth, 'stream', narrow[0].operand, narrow[1].operand, text);
-      } else if (isStreamNarrow(narrow)) {
-        sendMessage(auth, 'stream', narrow[0].operand, '(no topic)', text);
-      }
+    } else if (isStreamNarrow(narrow)) {
+      sendMessage(
+        auth,
+        'stream',
+        narrow[0].operand,
+        operator === '' ? '(no topic)' : operator,
+        text,
+      );
+    } else if (isTopicNarrow(narrow)) {
+      sendMessage(auth, 'stream', narrow[0].operand, narrow[1].operand, text);
     }
 
     this.clearInput();