From b704e9489b21b3bec17f5c8b573a1724781ee6f7 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Fri, 14 Aug 2015 08:43:49 -0400
Subject: added google sign-in functionality to the client, with minor model
 modifications

---
 web/react/pages/channel.jsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'web/react/pages/channel.jsx')

diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index 929499715..52d537f27 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -54,14 +54,15 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann
         id: team_id
     });
 
+    // ChannelLoader must be rendered first
     React.render(
-        <ErrorBar/>,
-        document.getElementById('error_bar')
+        <ChannelLoader/>,
+        document.getElementById('channel_loader')
     );
 
     React.render(
-        <ChannelLoader/>,
-        document.getElementById('channel_loader')
+        <ErrorBar/>,
+        document.getElementById('error_bar')
     );
 
     React.render(
-- 
cgit v1.2.3-1-g7c22

