diff --git a/app.json b/app.json index ede0ea96..953985ca 100644 --- a/app.json +++ b/app.json @@ -2,7 +2,7 @@ "expo": { "name": "TAMU SHPE", "slug": "TAMU-SHPE", - "version": "1.0.17", + "version": "1.0.18", "owner": "tamu-shpe", "orientation": "portrait", "icon": "./assets/icon.png", @@ -54,7 +54,7 @@ "permissions": [ "android.permission.RECORD_AUDIO" ], - "versionCode": 90, + "versionCode": 95, "userInterfaceStyle": "automatic", "config": { "googleMaps": { diff --git a/package.json b/package.json index f10f3e1b..db4a9268 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "shpe-app", - "version": "1.0.17", + "version": "1.0.18", "scripts": { "start": "npx expo start --dev-client", "test": "jest --coverage=true --verbose --bail --config ./jest.config.ts", diff --git a/src/screens/events/EventInfo.tsx b/src/screens/events/EventInfo.tsx index 4a1b8950..a73edefe 100644 --- a/src/screens/events/EventInfo.tsx +++ b/src/screens/events/EventInfo.tsx @@ -355,7 +355,7 @@ const EventInfo = ({ navigation }: EventProps) => { {darkMode ? : } - + {startTime && endTime && formatEventTime(startTime.toDate(), endTime.toDate())} diff --git a/src/screens/events/Events.tsx b/src/screens/events/Events.tsx index 9694286e..a500b1b6 100644 --- a/src/screens/events/Events.tsx +++ b/src/screens/events/Events.tsx @@ -66,43 +66,45 @@ const Events = ({ navigation }: EventsProps) => { const mainEventsFiltered = upcomingEventsData.filter( (event: SHPEEvent) => (hasPrivileges || !event.hiddenEvent) && - event.eventType !== EventType.COMMITTEE_MEETING && - event.eventType !== EventType.INTRAMURAL_EVENT + (event.eventType !== EventType.COMMITTEE_MEETING && + event.eventType !== EventType.INTRAMURAL_EVENT) || event.general ); const intramuralEventsFiltered = upcomingEventsData.filter( (event: SHPEEvent) => (hasPrivileges || !event.hiddenEvent) && - event.eventType === EventType.INTRAMURAL_EVENT + event.eventType === EventType.INTRAMURAL_EVENT && + !event.general ); const committeeEventsFiltered = upcomingEventsData.filter( (event: SHPEEvent) => (hasPrivileges || !event.hiddenEvent) && - event.eventType === EventType.COMMITTEE_MEETING + event.eventType === EventType.COMMITTEE_MEETING && + !event.general ); const pastMainEvents = allPastEvents.filter( (event: SHPEEvent) => (hasPrivileges || !event.hiddenEvent) && - event.eventType !== EventType.COMMITTEE_MEETING && - event.eventType !== EventType.INTRAMURAL_EVENT + (event.eventType !== EventType.COMMITTEE_MEETING && + event.eventType !== EventType.INTRAMURAL_EVENT) || event.general ); const pastIntramuralEvents = allPastEvents.filter( (event: SHPEEvent) => (hasPrivileges || !event.hiddenEvent) && - event.eventType === EventType.INTRAMURAL_EVENT + event.eventType === EventType.INTRAMURAL_EVENT && + !event.general ); const pastCommitteeEvents = allPastEvents.filter( (event: SHPEEvent) => (hasPrivileges || !event.hiddenEvent) && - event.eventType === EventType.COMMITTEE_MEETING + event.eventType === EventType.COMMITTEE_MEETING && + !event.general ); - - setMainEvents({ today: todayEvents.filter(event => mainEventsFiltered.includes(event)), upcoming: upcomingEvents.filter(event => mainEventsFiltered.includes(event)), @@ -129,6 +131,8 @@ const Events = ({ navigation }: EventsProps) => { }; + + useEffect(() => { const fetchUserData = async () => { const firebaseUser = await fetchAndStoreUser();