1 files changed, 18 insertions, 22 deletions

diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index 182721bef..43493de45 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -17,7 +17,6 @@ var RenameChannelModal = require('../components/rename_channel_modal.jsx');
 var EditPostModal = require('../components/edit_post_modal.jsx');
 var DeletePostModal = require('../components/delete_post_modal.jsx');
 var MoreChannelsModal = require('../components/more_channels.jsx');
-var NewChannelModal = require('../components/new_channel.jsx');
 var PostDeletedModal = require('../components/post_deleted_modal.jsx');
 var ChannelNotificationsModal = require('../components/channel_notifications.jsx');
 var UserSettingsModal = require('../components/user_settings_modal.jsx');
@@ -34,24 +33,21 @@ var AccessHistoryModal = require('../components/access_history_modal.jsx');
 var ActivityLogModal = require('../components/activity_log_modal.jsx');
 var RemovedFromChannelModal = require('../components/removed_from_channel_modal.jsx');
 var FileUploadOverlay = require('../components/file_upload_overlay.jsx');
-
-var AsyncClient = require('../utils/async_client.jsx');
+var RegisterAppModal = require('../components/register_app_modal.jsx');
 
 var Constants = require('../utils/constants.jsx');
 var ActionTypes = Constants.ActionTypes;
 
-function setupChannelPage(teamName, teamType, teamId, channelName, channelId) {
-    AsyncClient.getConfig();
-
+function setupChannelPage(props) {
     AppDispatcher.handleViewAction({
         type: ActionTypes.CLICK_CHANNEL,
-        name: channelName,
-        id: channelId
+        name: props.ChannelName,
+        id: props.ChannelId
     });
 
     AppDispatcher.handleViewAction({
         type: ActionTypes.CLICK_TEAM,
-        id: teamId
+        id: props.TeamId
     });
 
     // ChannelLoader must be rendered first
@@ -66,14 +62,14 @@ function setupChannelPage(teamName, teamType, teamId, channelName, channelId) {
     );
 
     React.render(
-        <Navbar teamDisplayName={teamName} />,
+        <Navbar teamDisplayName={props.TeamDisplayName} />,
         document.getElementById('navbar')
     );
 
     React.render(
         <Sidebar
-            teamDisplayName={teamName}
-            teamType={teamType}
+            teamDisplayName={props.TeamDisplayName}
+            teamType={props.TeamType}
         />,
         document.getElementById('sidebar-left')
     );
@@ -89,17 +85,17 @@ function setupChannelPage(teamName, teamType, teamId, channelName, channelId) {
     );
 
     React.render(
-        <TeamSettingsModal teamDisplayName={teamName} />,
+        <TeamSettingsModal teamDisplayName={props.TeamDisplayName} />,
         document.getElementById('team_settings_modal')
     );
 
     React.render(
-        <TeamMembersModal teamDisplayName={teamName} />,
+        <TeamMembersModal teamDisplayName={props.TeamDisplayName} />,
         document.getElementById('team_members_modal')
     );
 
     React.render(
-        <MemberInviteModal teamType={teamType} />,
+        <MemberInviteModal teamType={props.TeamType} />,
         document.getElementById('invite_member_modal')
     );
 
@@ -154,11 +150,6 @@ function setupChannelPage(teamName, teamType, teamId, channelName, channelId) {
     );
 
     React.render(
-        <NewChannelModal />,
-        document.getElementById('new_channel_modal')
-    );
-
-    React.render(
         <PostListContainer />,
         document.getElementById('post-list')
     );
@@ -190,8 +181,8 @@ function setupChannelPage(teamName, teamType, teamId, channelName, channelId) {
 
     React.render(
         <SidebarRightMenu
-            teamDisplayName={teamName}
-            teamType={teamType}
+            teamDisplayName={props.TeamDisplayName}
+            teamType={props.TeamType}
         />,
         document.getElementById('sidebar-menu')
     );
@@ -232,6 +223,11 @@ function setupChannelPage(teamName, teamType, teamId, channelName, channelId) {
         />,
         document.getElementById('file_upload_overlay')
     );
+
+    React.render(
+        <RegisterAppModal />,
+        document.getElementById('register_app_modal')
+    );
 }
 
 global.window.setup_channel_page = setupChannelPage;