From 67e2715274dcc7869baa8b39f5c8d0baf8ea4bed Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Thu, 27 Jul 2017 17:16:48 -0400
Subject: [PATCH] RN-152 Updated createGroupChannel's return value to match
 createDirectChannel (#7027)

* RN-152 Updated createGroupChannel's return value to match createDirectChannel

* Fixed handling of results from createDirectChannel

* Updated yarn.lock
---
 webapp/actions/channel_actions.jsx | 11 +++++------
 webapp/actions/global_actions.jsx  |  8 +++++---
 webapp/yarn.lock                   |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/webapp/actions/channel_actions.jsx b/webapp/actions/channel_actions.jsx
index 6e529d3326..39dc375916 100644
--- a/webapp/actions/channel_actions.jsx
+++ b/webapp/actions/channel_actions.jsx
@@ -181,14 +181,13 @@ export function openDirectChannelToUser(userId, success, error) {
 
 export function openGroupChannelToUsers(userIds, success, error) {
     ChannelActions.createGroupChannel(userIds)(dispatch, getState).then(
-        (data) => {
+        (result) => {
             loadProfilesForSidebar();
-            if (data && success) {
-                success(data, false);
-            } else if (data == null && error) {
+            if (result.data && success) {
+                success(result.data, false);
+            } else if (result.error && error) {
                 browserHistory.push(TeamStore.getCurrentTeamUrl());
-                const serverError = getState().requests.channels.createChannel.error;
-                error({id: serverError.server_error_id, ...serverError});
+                error({id: result.error.server_error_id, ...result.error});
             }
         }
     );
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx
index b3dc078c4a..2b65beffd5 100644
--- a/webapp/actions/global_actions.jsx
+++ b/webapp/actions/global_actions.jsx
@@ -45,9 +45,11 @@ export function emitChannelClickEvent(channel) {
         const currentUserId = UserStore.getCurrentId();
         const otherUserId = Utils.getUserIdFromChannelName(chan);
         createDirectChannel(currentUserId, otherUserId)(dispatch, getState).then(
-            (data) => {
-                if (data) {
-                    success(data);
+            (result) => {
+                const receivedChannel = result.data;
+
+                if (receivedChannel) {
+                    success(receivedChannel);
                 } else {
                     fail();
                 }
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 0b6275bcfa..1b7b280940 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -5004,7 +5004,7 @@ math-expression-evaluator@^1.2.14:
 
 mattermost-redux@mattermost/mattermost-redux#master:
   version "0.0.1"
-  resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/f8d106e6fde0d8633bf5d13c1ca1aaec61b0b8bb"
+  resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/9797cb8bd8fa61252336a7c6150bd364f7ca28b1"
   dependencies:
     deep-equal "1.0.1"
     harmony-reflect "1.5.1"