3 files changed, 14 insertions, 6 deletions
diff --git a/src/actions/firebaseAdmin.js b/src/actions/firebaseAdmin.js
index e5cbb23..5c8bfca 100644
--- a/src/actions/firebaseAdmin.js
+++ b/src/actions/firebaseAdmin.js
@@ -4,10 +4,10 @@ export const UPDATE_ADMIN           = 'UPDATE_ADMIN';
 export const UPDATE_ADMIN_REQUESTS  = 'UPDATE_ADMIN_REQUESTS';
 export const UPDATE_ADMIN_COMP_LIST = 'UPDATE_ADMIN_COMP_LIST';
 
-export const updateAdmin = () => {
+export const updateAdmin = (status) => {
   return {
     type:     UPDATE_ADMIN,
-    payload:  true
+    payload:  status
   }
 }
 
@@ -28,7 +28,7 @@ export const updateAdminCompList = (compList) => {
 //Middleware to update dispatches
 
 export const adminControls = () => (dispatch) => {
-  dispatch(updateAdmin());
+  dispatch(updateAdmin(true));
   dispatch(snapshotAdminRequests());
   dispatch(snapshotAdminCompList());
 }
@@ -69,6 +69,12 @@ export const snapshotAdminCompList = () => (dispatch) => {
   });
 }
 
+export const adminClose = () => (dispatch) => {
+  dispatch(updateAdmin(false));
+  dispatch(updateAdminRequests([]));
+  dispatch(updateAdminCompList([]));
+}
+
 export const adminRejectHours = (_id, _path) => (dispatch) => {
   dispatch(adminDeleteRequest(_id, _path));
 }
diff --git a/src/actions/firebaseAuth.js b/src/actions/firebaseAuth.js
index c3f277b..37f6643 100644
--- a/src/actions/firebaseAuth.js
+++ b/src/actions/firebaseAuth.js
@@ -52,7 +52,8 @@ import {
 } from './firebaseFirestore.js';
 
 import {
-  adminListener
+  adminListener,
+  adminClose
 } from './firebaseAdmin.js'
 
 export const signIn  = (_email, _password, divison) => (dispatch) => {
@@ -89,5 +90,6 @@ export const signIn  = (_email, _password, divison) => (dispatch) => {
 export const signOut = () => (dispatch) => {
   auth.signOut().then(() => {
     dispatch(authSignOut());
+    dispatch(adminClose());
   });
 }
diff --git a/src/actions/firebaseFirestore.js b/src/actions/firebaseFirestore.js
index ff4fcfb..49e79c7 100644
--- a/src/actions/firebaseFirestore.js
+++ b/src/actions/firebaseFirestore.js
@@ -154,7 +154,7 @@ export const registerComp = (compName) => (dispatch, getState) => {
           uids:   uidArr,
           emails: emailArr
         }).then(()=> {
-          alert("Successfuly registered for " + compName.replace(/[0-9]/g, '') + ".");
+          alert("Successfuly registered for " + compName.replace(/[0-9]/g, '').replace('_', ' ') + ".");
         }).catch((error) => {
           alert(error);
         });
@@ -163,7 +163,7 @@ export const registerComp = (compName) => (dispatch, getState) => {
           uids  : [uid],
           emails: [email]
         }).then(()=> {
-          alert("Successfuly registered for " + compName.replace(/[0-9]/g, '') + ".");
+          alert("Successfuly registered for " + compName.replace(/[0-9]/g, '').replace('_', ' ') + ".");
         }).catch((error) => {
           alert(error);
         });