@@ -47,36 +47,36 @@ export default function EventsScreen() {
4747 const searchDebounceRef = useRef < ReturnType < typeof setTimeout > | null > ( null ) ;
4848
4949 const loadEvents = useCallback (
50- async ( searchQuery ?: string , filters ?: EventFilters ) => {
51- try {
52- setLoading ( true ) ;
53- const volunteerId = volunteer ?. id ;
50+ async ( searchQuery ?: string , filters ?: EventFilters ) => {
51+ try {
52+ setLoading ( true ) ;
53+ const volunteerId = volunteer ?. id ;
5454
55- let adjustedFilters = filters ;
56- if ( ( filters ?. sort_by === 'recommendations' && ! volunteerId ) ) {
57- adjustedFilters = { ...filters , sort_by : undefined } ;
58- setFilters ( adjustedFilters ) ;
55+ let adjustedFilters = filters ;
56+ if ( filters ?. sort_by === 'recommendations' && ! volunteerId ) {
57+ adjustedFilters = { ...filters , sort_by : undefined } ;
58+ setFilters ( adjustedFilters ) ;
59+ }
60+
61+ const fetchedEvents = await eventService . getAllEvents (
62+ searchQuery ,
63+ adjustedFilters ,
64+ locationFilter ,
65+ volunteerId
66+ ) ;
67+ const futureEvents = fetchedEvents . filter (
68+ event => new Date ( event . startDateTime ) . getTime ( ) > Date . now ( )
69+ ) ;
70+ setEvents ( futureEvents ) ;
71+ } catch ( error ) {
72+ console . error ( 'Error loading events:' , error ) ;
73+ Alert . alert ( 'Error' , 'Failed to load events. Please try again.' ) ;
74+ } finally {
75+ setLoading ( false ) ;
5976 }
60-
61- const fetchedEvents = await eventService . getAllEvents (
62- searchQuery ,
63- adjustedFilters ,
64- locationFilter ,
65- volunteerId
66- ) ;
67- const futureEvents = fetchedEvents . filter (
68- event => new Date ( event . startDateTime ) . getTime ( ) > Date . now ( )
69- ) ;
70- setEvents ( futureEvents ) ;
71- } catch ( error ) {
72- console . error ( 'Error loading events:' , error ) ;
73- Alert . alert ( 'Error' , 'Failed to load events. Please try again.' ) ;
74- } finally {
75- setLoading ( false ) ;
76- }
77- } ,
78- [ locationFilter , volunteer ]
79- ) ;
77+ } ,
78+ [ locationFilter , volunteer ]
79+ ) ;
8080
8181 const handleRefresh = useCallback ( async ( ) => {
8282 setRefreshing ( true ) ;
@@ -231,23 +231,23 @@ export default function EventsScreen() {
231231 return true ;
232232 } ) . map ( sortOption => {
233233 const isSelected = filters . sort_by === sortOption ;
234- return (
235- < Pressable
236- key = { sortOption }
237- onPress = { ( ) => handleSortPress ( sortOption ) }
238- style = { [ styles . sortPill , isSelected && styles . sortPillSelected ] }
239- >
240- < Text
241- style = { [
242- styles . sortPillText ,
243- isSelected && styles . sortPillTextSelected ,
244- ] }
234+ return (
235+ < Pressable
236+ key = { sortOption }
237+ onPress = { ( ) => handleSortPress ( sortOption ) }
238+ style = { [ styles . sortPill , isSelected && styles . sortPillSelected ] }
245239 >
246- { SORT_LABELS [ sortOption ] }
247- </ Text >
248- </ Pressable >
249- ) ;
250- } ) }
240+ < Text
241+ style = { [
242+ styles . sortPillText ,
243+ isSelected && styles . sortPillTextSelected ,
244+ ] }
245+ >
246+ { SORT_LABELS [ sortOption ] }
247+ </ Text >
248+ </ Pressable >
249+ ) ;
250+ } ) }
251251 </ ScrollView >
252252 </ View >
253253
0 commit comments