Merge branch 'feature/PROFILE_-_Registration' of honey.fitz.guru:eventment-app into feature/PROFILE_-_Registration

2019-08-12 17:44:42 -04:00
parent f0460a1b76 769fc0c2b5
commit cf07ab1c2e
1 changed files with 2 additions and 2 deletions
--- a/app/selectors/events.js
+++ b/app/selectors/events.js
@@ -18,8 +18,8 @@ export const getActiveEvent = createSelector(
 );

 export const getDefaultEvent = createSelector(
-    [getEvents],
-    (eventsAsMap) => eventsAsMap.first(),
+    [getActiveEvent, getEvents],
+    (activeEvent, eventsAsMap) => activeEvent || eventsAsMap.first(),
 );

 export const getEventsAsList = createSelector(