Merge pull request #1431 from withspectrum/hotfix-private-channel-lock

Fix logic on channel view composer

Author: brianlovin

src/views/channel/index.js

@@ -218,16 +218,18 @@ class ChannelViewPure extends Component {
               )}
 
               {loggedInUser &&
-              hasRights &&
-              !channel.community.isPro && (
+                hasRights &&
+                channel.isPrivate &&
+                !channel.community.isPro &&
                 <UpsellUpgradeCommunityPrivateChannel
                   community={channel.community}
                 />
               )}
 
               {loggedInUser &&
-              hasRights &&
-              channel.community.isPro && (
+                hasRights &&
+                ((channel.isPrivate && channel.community.isPro) ||
+                  !channel.isPrivate) &&
                 <ThreadComposer
                   activeCommunity={communitySlug}
                   activeChannel={channelSlug}