From 27c29e09b44ae48aae9bbd5ae17e8a3a5e5c7e34 Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Wed, 14 Jun 2017 09:59:54 -0400
Subject: [PATCH] RN-193 & RN-197 (#625)

* RN-193 Always show the create btn on android

* RN-197 Update channel header on channel creation

* missing android actions from never to always show the btn
---
 app/actions/views/create_channel.js                        | 3 ++-
 app/screens/account_notifications/account_notifications.js | 2 +-
 app/screens/channel_add_members/channel_add_members.js     | 2 +-
 app/screens/channel_members/channel_members.js             | 2 +-
 app/screens/create_channel/create_channel.js               | 2 +-
 app/screens/more_channels/more_channels.js                 | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/actions/views/create_channel.js b/app/actions/views/create_channel.js
index 8242f3505..58c233a3d 100644
--- a/app/actions/views/create_channel.js
+++ b/app/actions/views/create_channel.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import {handleSelectChannel} from './channel';
+import {handleSelectChannel, setChannelDisplayName} from './channel';
 import {createChannel} from 'mattermost-redux/actions/channels';
 import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
 import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';
@@ -23,6 +23,7 @@ export function handleCreateChannel(displayName, purpose, header, type) {
 
         channel = await createChannel(channel, currentUserId)(dispatch, getState);
         if (channel && channel.id) {
+            dispatch(setChannelDisplayName(displayName));
             handleSelectChannel(channel.id)(dispatch, getState);
         }
     };
diff --git a/app/screens/account_notifications/account_notifications.js b/app/screens/account_notifications/account_notifications.js
index 654d3a158..73e7cf568 100644
--- a/app/screens/account_notifications/account_notifications.js
+++ b/app/screens/account_notifications/account_notifications.js
@@ -39,7 +39,7 @@ class AccountNotifications extends PureComponent {
 
     saveButton = {
         id: 'save-notifications',
-        showAsAction: 'never'
+        showAsAction: 'always'
     };
 
     constructor(props) {
diff --git a/app/screens/channel_add_members/channel_add_members.js b/app/screens/channel_add_members/channel_add_members.js
index 64bc37035..d8f893276 100644
--- a/app/screens/channel_add_members/channel_add_members.js
+++ b/app/screens/channel_add_members/channel_add_members.js
@@ -47,7 +47,7 @@ class ChannelAddMembers extends PureComponent {
     addButton = {
         disabled: true,
         id: 'add-members',
-        showAsAction: 'never'
+        showAsAction: 'always'
     };
 
     constructor(props) {
diff --git a/app/screens/channel_members/channel_members.js b/app/screens/channel_members/channel_members.js
index 7574e72a7..41851e4d5 100644
--- a/app/screens/channel_members/channel_members.js
+++ b/app/screens/channel_members/channel_members.js
@@ -47,7 +47,7 @@ class ChannelMembers extends PureComponent {
     removeButton = {
         disabled: true,
         id: 'remove-members',
-        showAsAction: 'never'
+        showAsAction: 'always'
     };
 
     constructor(props) {
diff --git a/app/screens/create_channel/create_channel.js b/app/screens/create_channel/create_channel.js
index af5eb42e5..c7e7c8d22 100644
--- a/app/screens/create_channel/create_channel.js
+++ b/app/screens/create_channel/create_channel.js
@@ -50,7 +50,7 @@ class CreateChannel extends PureComponent {
     rightButton = {
         id: 'create-channel',
         disabled: true,
-        showAsAction: 'never'
+        showAsAction: 'always'
     };
 
     constructor(props) {
diff --git a/app/screens/more_channels/more_channels.js b/app/screens/more_channels/more_channels.js
index a897a7cd9..500b7a268 100644
--- a/app/screens/more_channels/more_channels.js
+++ b/app/screens/more_channels/more_channels.js
@@ -46,7 +46,7 @@ class MoreChannels extends PureComponent {
 
     rightButton = {
         id: 'create-pub-channel',
-        showAsAction: 'never'
+        showAsAction: 'always'
     };
 
     constructor(props) {