Fix

Author: adammotts

frontend/app/signup/index.tsx

@@ -150,7 +150,7 @@ const styles = StyleSheet.create({
     flex: 1,
     backgroundColor: Colors.light.transparent,
     paddingHorizontal: 50,
-    paddingTop: '20%',
+    paddingTop: '35%',
     paddingBottom: 25,
     justifyContent: 'flex-start',
   },
@@ -159,8 +159,8 @@ const styles = StyleSheet.create({
     marginBottom: -20,
   },
   logo: {
-    width: 225,
-    height: 225,
+    width: 260,
+    height: 160,
   },
   header: {
     marginBottom: 24,

frontend/context/AuthContext.tsx

@@ -93,12 +93,10 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
   }, []);
 
   const fetchUserEntity = useCallback(async () => {
-    if (!user?.entityId) return;
-
-    // only fetch volunteer for now
+    // Fetch the current user's volunteer entity if it exists
     const volunteerResponse = await volunteerService.getSelf();
     setVolunteer(volunteerResponse);
-  }, [user?.entityId]); // Keep this dependency
+  }, []); // No need to depend on user.entityId
 
   const signOut = useCallback(async () => {
     await userService.logout();
@@ -159,7 +157,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
     if (user?.entityId && !volunteer && token) {
       fetchUserEntity();
     }
-  }, [user?.entityId, volunteer, token]);
+  }, [user?.entityId, volunteer, token, fetchUserEntity]);
 
   return <AuthContext.Provider value={value}>{children}</AuthContext.Provider>;
 }

frontend/hooks/useProfile.ts

@@ -1,12 +1,10 @@
 import { useState, useEffect } from 'react';
 import { Alert } from 'react-native';
-import { useAuth } from '@/context/AuthContext';
 import { profileService } from '@/services/profileService';
 import { ProfileData } from '@/types/api/profile';
 import { Event } from '@/types/api/event';
 import { Volunteer } from '@/types/api/volunteer';
 import { useCurrentVolunteer } from '@/hooks/useCurrentVolunteer';
-import { useUpcomingEvents } from '@/hooks/useUpcomingEvents';
 
 // TODO: abstract to backend asw
 function calculateTotalHours(completedEvents: Event[]): number {
@@ -20,49 +18,44 @@ function calculateTotalHours(completedEvents: Event[]): number {
 }
 
 export function useProfile() {
-  const { user } = useAuth();
   const {
     data: qVolunteer,
     isLoading: volunteerLoading,
     refetch: refetchVolunteer,
   } = useCurrentVolunteer();
-  const { data: qUpcomingEvents, refetch: refetchUpcomingEvents } =
-    useUpcomingEvents(user?.entityId);
   const [loading, setLoading] = useState(true);
   const [refreshing, setRefreshing] = useState(false);
   const [volunteer, setVolunteer] = useState<Volunteer | null>(null);
   const [upcomingEvents, setUpcomingEvents] = useState<Event[]>([]);
   const [profileData, setProfileData] = useState<ProfileData | null>(null);
 
   const loadProfileData = async (isRefresh = false) => {
-    if (!user?.entityId) {
-      setLoading(false);
-      return;
-    }
     try {
       if (isRefresh) {
         setRefreshing(true);
       } else {
         setLoading(true);
       }
-      // Ensure we have latest volunteer and upcoming events (React Query)
-      const [vResult, uResult, pastEventsData] = await Promise.all([
-        refetchVolunteer(),
-        refetchUpcomingEvents(),
-        profileService.getPastEvents(user.entityId),
-      ]);
+      // Ensure we have latest volunteer
+      const vResult = await refetchVolunteer();
 
-      const v = vResult.data ?? qVolunteer ?? null;
+      const v: Volunteer | null = vResult.data ?? qVolunteer ?? null;
       setVolunteer(v);
-      const upcoming = uResult.data ?? qUpcomingEvents ?? [];
-      setUpcomingEvents(upcoming);
 
       if (!v) {
+        setUpcomingEvents([]);
         setProfileData(null);
         return;
       }
 
-      const levelProgress = await profileService.getLevelProgress();
+      // Fetch upcoming and past events using the resolved volunteer id
+      const [upcoming, pastEventsData, levelProgress] = await Promise.all([
+        profileService.getUpcomingEvents(v.id),
+        profileService.getPastEvents(v.id),
+        profileService.getLevelProgress(),
+      ]);
+
+      setUpcomingEvents(upcoming);
       const totalHours = calculateTotalHours(pastEventsData);
 
       const stats = {
@@ -92,22 +85,16 @@ export function useProfile() {
 
   useEffect(() => {
     // When user or volunteer changes, rebuild profile
-    if (!user?.entityId) {
-      setLoading(false);
-      return;
-    }
     // If volunteer query is still loading, wait
     if (volunteerLoading) return;
     // Build with current data (events will be fetched)
     loadProfileData(false);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [
-    user?.entityId,
     qVolunteer?.id,
     qVolunteer?.firstName,
     qVolunteer?.lastName,
     qVolunteer?.experience,
-    qUpcomingEvents?.length,
   ]);
 
   return {