Merge pull request #56 from GenerateNU/fix-inconsistent-leveling-exp

Fix inconsistent leveling exp

Author: sierrawelsch

frontend/app/(tabs)/profile.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   View,
   Text,

frontend/app/(tabs)/rank.tsx

@@ -16,6 +16,7 @@ import { volunteerService } from '@/services/volunteerService';
 import { useVolunteerProfileImage } from '@/hooks/useVolunteerProfileImage';
 import { useAuth } from '@/context/AuthContext';
 import { Volunteer } from '@/types/api/volunteer';
+import { useProfile } from '@/hooks/useProfile';
 
 interface LeaderboardEntry {
   rank: number;
@@ -26,26 +27,6 @@ interface LeaderboardEntry {
   volunteer: Volunteer;
 }
 
-// Calculate level from experience (same logic as useProfile)
-function calculateLevel(experience: number): number {
-  if (experience < 100) return 1;
-
-  let level = 1;
-  let totalXPNeeded = 0;
-
-  while (totalXPNeeded <= experience) {
-    const xpForNextLevel = level * 100 + (level - 1) * 50;
-    totalXPNeeded += xpForNextLevel;
-    if (totalXPNeeded <= experience) {
-      level++;
-    } else {
-      break;
-    }
-  }
-
-  return level;
-}
-
 function getVolunteerName(volunteer: Volunteer): string {
   if (volunteer.preferredName) {
     return volunteer.preferredName;
@@ -127,6 +108,7 @@ function Avatar({ volunteerId, size }: AvatarProps) {
 export default function LeaderboardScreen() {
   const { user } = useAuth();
   const router = useRouter();
+  const profile = useProfile();
   const [leaderboardData, setLeaderboardData] = useState<LeaderboardEntry[]>(
     []
   );
@@ -160,8 +142,7 @@ export default function LeaderboardScreen() {
             rank: index + 1,
             name: getVolunteerName(volunteer),
             experience: volunteer.experience,
-            level:
-              volunteer.currentLevel ?? calculateLevel(volunteer.experience),
+            level: volunteer.currentLevel,
             isCurrentUser: volunteerData?.id === volunteer.id,
             volunteer,
           })
@@ -177,7 +158,7 @@ export default function LeaderboardScreen() {
     };
 
     fetchLeaderboard();
-  }, [user?.entityId]);
+  }, [user?.entityId, profile.volunteer?.experience]);
 
   if (loading) {
     return (

frontend/app/(tabs)/shop.tsx

@@ -15,11 +15,14 @@ import { Fonts } from '@/constants/Fonts';
 import { Colors } from '@/constants/Colors';
 import { useRouter } from 'expo-router';
 import { useAuth } from '@/context/AuthContext';
+import { useProfile } from '@/hooks/useProfile';
 import { itemService } from '@/services/itemService';
+import { volunteerService } from '@/services/volunteerService';
 import { LoadingScreen } from '@/components/LoadingScreen';
 import SearchInputWithFilter from '@/components/SearchInputWithFilter';
 import ItemFilterDrawer from '@/components/drawers/ItemFilterDrawer';
 import { ShopItem } from '@/types/api/item';
+import { Volunteer } from '@/types/api/volunteer';
 
 export interface ItemFilters {
   priceRange: { min: number; max: number };
@@ -32,13 +35,17 @@ export default function StoreScreen() {
   const [loading, setLoading] = useState(false);
   const [refreshing, setRefreshing] = useState(false);
   const [drawerOpen, setDrawerOpen] = useState(false);
+  const profile = useProfile();
   const [filters, setFilters] = useState<ItemFilters>({
     priceRange: { min: 0, max: 10000 },
     category: '',
   });
+  const [currentVolunteer, setCurrentVolunteer] = useState<Volunteer | null>(
+    null
+  );
 
   const router = useRouter();
-  const { volunteer, token } = useAuth();
+  const { user, token } = useAuth();
 
   const loadItems = useCallback(async () => {
     try {
@@ -71,8 +78,22 @@ export default function StoreScreen() {
   }, [token]);
 
   useEffect(() => {
-    loadItems();
-  }, [loadItems]);
+    // Fetch current volunteer if user is available (same approach as profile page)
+    const fetchVolunteer = async () => {
+      let volunteerData: Volunteer | null = null;
+      if (user?.entityId) {
+        try {
+          volunteerData = await volunteerService.getSelf();
+          setCurrentVolunteer(volunteerData);
+        } catch (err) {
+          console.error('Error fetching current volunteer:', err);
+        }
+      }
+
+      await loadItems();
+    };
+    fetchVolunteer();
+  }, [loadItems, profile.volunteer?.experience]);
 
   const filteredItems = useMemo(() => {
     return items.filter(item => {
@@ -113,6 +134,12 @@ export default function StoreScreen() {
     }
   }, [loadItems]);
 
+  // useFocusEffect(
+  //   useCallback(() => {
+  //     refreshProfile();  // pulls latest XP, coins, level
+  //   }, [])
+  // );
+
   if (loading) {
     return <LoadingScreen text="Loading items..." />;
   }
@@ -156,7 +183,7 @@ export default function StoreScreen() {
                   fontFamily: Fonts.medium_500,
                 }}
               >
-                Level {volunteer?.currentLevel ?? 0}
+                Level {currentVolunteer?.currentLevel ?? 0}
               </ThemedText>
 
               <ThemedText
@@ -167,7 +194,7 @@ export default function StoreScreen() {
                   fontFamily: Fonts.medium_500,
                 }}
               >
-                {volunteer?.coins ?? 0} coins
+                {currentVolunteer?.coins ?? 0} coins
               </ThemedText>
 
               <TouchableOpacity

frontend/hooks/useProfile.ts

@@ -8,58 +8,7 @@ import { Volunteer } from '@/types/api/volunteer';
 import { useCurrentVolunteer } from '@/hooks/useCurrentVolunteer';
 import { useUpcomingEvents } from '@/hooks/useUpcomingEvents';
 
-// temporary logic idk how we're calculating level lol
-function calculateLevel(experience: number): number {
-  if (experience < 100) return 1;
-
-  let level = 1;
-  let totalXPNeeded = 0;
-
-  while (totalXPNeeded <= experience) {
-    const xpForNextLevel = level * 100 + (level - 1) * 50;
-    totalXPNeeded += xpForNextLevel;
-    if (totalXPNeeded <= experience) {
-      level++;
-    } else {
-      break;
-    }
-  }
-
-  return level;
-}
-
-function getXPForLevel(level: number): number {
-  let totalXP = 0;
-  for (let i = 1; i < level; i++) {
-    totalXP += i * 100 + (i - 1) * 50;
-  }
-  return totalXP;
-}
-
-function getXPForNextLevel(currentLevel: number): number {
-  return currentLevel * 100 + (currentLevel - 1) * 50;
-}
-
-function calculateLevelProgress(experience: number): {
-  level: number;
-  progress: number; // 0-100
-  currentLevelXP: number;
-  nextLevelXP: number;
-} {
-  const level = calculateLevel(experience);
-  const xpForCurrentLevel = getXPForLevel(level);
-  const xpForNextLevel = getXPForNextLevel(level);
-  const currentLevelXP = experience - xpForCurrentLevel;
-  const progress = (currentLevelXP / xpForNextLevel) * 100;
-
-  return {
-    level,
-    progress: Math.min(Math.max(progress, 0), 100),
-    currentLevelXP,
-    nextLevelXP: xpForNextLevel,
-  };
-}
-
+// TODO: abstract to backend asw
 function calculateTotalHours(completedEvents: Event[]): number {
   return completedEvents.reduce((sum, event) => {
     const start = new Date(event.startDateTime);
@@ -113,15 +62,14 @@ export function useProfile() {
         return;
       }
 
-      const levelData = calculateLevelProgress(v.experience);
+      const levelProgress = await profileService.getLevelProgress();
       const totalHours = calculateTotalHours(pastEventsData);
 
       const stats = {
         totalHours,
-        level: levelData.level,
-        levelProgress: levelData.progress,
+        level: v.currentLevel,
+        levelProgress: levelProgress ?? 0, // meh
         experiencePoints: v.experience,
-        nextLevelXP: levelData.nextLevelXP,
       };
 
       setProfileData({