From 8f2a93ff3942892de6d1051f111f390250fb5a60 Mon Sep 17 00:00:00 2001
From: Brett Sun <brett@ascribe.io>
Date: Mon, 8 Feb 2016 17:49:11 +0100
Subject: [PATCH 1/2] Revert "Remove altUser since the UserStore is now always
 being passed as a prop"

This reverts commit 325651b581d9cd7573e0942e4c67f649d04b0349.
---
 js/actions/user_actions.js | 4 ++--
 js/alt.js                  | 1 +
 js/stores/user_store.js    | 7 ++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/js/actions/user_actions.js b/js/actions/user_actions.js
index 9d59044f..a661b8de 100644
--- a/js/actions/user_actions.js
+++ b/js/actions/user_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import { alt } from '../alt';
+import { altUser } from '../alt';
 
 
 class UserActions {
@@ -15,4 +15,4 @@ class UserActions {
     }
 }
 
-export default alt.createActions(UserActions);
+export default altUser.createActions(UserActions);
diff --git a/js/alt.js b/js/alt.js
index 3e1d3fae..141248c1 100644
--- a/js/alt.js
+++ b/js/alt.js
@@ -4,4 +4,5 @@ import Alt from 'alt';
 
 export let alt = new Alt();
 export let altThirdParty = new Alt();
+export let altUser = new Alt();
 export let altWhitelabel = new Alt();
diff --git a/js/stores/user_store.js b/js/stores/user_store.js
index 4c6725e3..fe96eaa8 100644
--- a/js/stores/user_store.js
+++ b/js/stores/user_store.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import { alt, altThirdParty } from '../alt';
+import { alt, altWhitelabel, altUser, altThirdParty } from '../alt';
 
 import EventActions from '../actions/event_actions';
 
@@ -56,8 +56,9 @@ class UserStore {
         EventActions.userDidLogout();
 
         // Reset all stores back to their initial state
-        // Don't recycle the whitelabel stores since they're not dependent on login
         alt.recycle();
+        altWhitelabel.recycle();
+        altUser.recycle();
         altThirdParty.recycle();
 
         // Since we've just logged out, we can set this store's
@@ -76,4 +77,4 @@ class UserStore {
     }
 }
 
-export default alt.createStore(UserStore, 'UserStore');
+export default altUser.createStore(UserStore, 'UserStore');

From d5b71ca4384b0d01ffc949d1a3cd4d476f557cf3 Mon Sep 17 00:00:00 2001
From: Brett Sun <brett@ascribe.io>
Date: Mon, 8 Feb 2016 17:53:58 +0100
Subject: [PATCH 2/2] Fix bool warning for showing webhook events

---
 js/components/ascribe_settings/webhook_settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/components/ascribe_settings/webhook_settings.js b/js/components/ascribe_settings/webhook_settings.js
index 4928c408..ab6f888a 100644
--- a/js/components/ascribe_settings/webhook_settings.js
+++ b/js/components/ascribe_settings/webhook_settings.js
@@ -140,7 +140,7 @@ let WebhookSettings = React.createClass({
                         a target url.
                     </p>
                 </div>
-                <AclProxy show={this.state.webhookEvents && this.state.webhookEvents.length}>
+                <AclProxy show={this.state.webhookEvents && this.state.webhookEvents.length > 0}>
                     <Form
                         ref="webhookCreateForm"
                         url={ApiUrls.webhooks}