diff --git a/shatter-mobile/app/(tabs)/Events.tsx b/shatter-mobile/app/(tabs)/EventsPage.tsx
similarity index 53%
rename from shatter-mobile/app/(tabs)/Events.tsx
rename to shatter-mobile/app/(tabs)/EventsPage.tsx
index 9ddf410..7ffc8dd 100644
--- a/shatter-mobile/app/(tabs)/Events.tsx
+++ b/shatter-mobile/app/(tabs)/EventsPage.tsx
@@ -1,15 +1,17 @@
-import { getStoredAuth } from "@/src/components/general/AsyncStorage";
-import AsyncStorage from "@react-native-async-storage/async-storage";
-import { router, useFocusEffect } from "expo-router";
+import { getStoredAuth } from "@/src/components/context/AsyncStorage";
+import { useAuth } from "@/src/components/context/AuthContext";
+import { useGame } from "@/src/components/context/GameContext";
+import { useFocusEffect } from "expo-router";
 import { useCallback, useState } from "react";
 import { FlatList, StyleSheet, Text, View } from "react-native";
 import EventCard from "../../src/components/events/EventCard";
-import type Event from "../../src/interfaces/Event";
 import EventIB from "../../src/interfaces/Event";
 import { getUserEvents } from "../../src/services/event.service";
 
-const NewEvents = () => {
-	const [events, setEvents] = useState<Event[]>([]);
+export default function EventsPage() {
+	const { user } = useAuth();
+	const { setCurrentParticipantId } = useGame();
+	const [events, setEvents] = useState<EventIB[]>([]);
 	const [loading, setLoading] = useState(true);
 	const [expandedEventId, setExpandedEventId] = useState<string | null>(null);
 
@@ -19,16 +21,11 @@ const NewEvents = () => {
 
 		try {
 			const stored = await getStoredAuth();
-
-			if (stored.isGuest) {
-				const local = await AsyncStorage.getItem("guestEvents");
-				const events: EventIB[] = local ? JSON.parse(local) : [];
-				setEvents(events);
-				return;
+			if (stored.userId) {
+				//guest that has joined event or user with account
+				const data = await getUserEvents(stored.userId, stored.accessToken); //TODO: Needs to return participant data
+				setEvents(data.events || []);
 			}
-
-			const data = await getUserEvents(stored.userId, stored.accessToken);
-			setEvents(data?.events || []);
 		} finally {
 			setLoading(false);
 		}
@@ -42,8 +39,21 @@ const NewEvents = () => {
 	);
 
 	//dropdown of event
-	const handlePress = (eventId: string) => {
-		setExpandedEventId((prev) => (prev === eventId ? null : eventId));
+	const handlePress = async (event: EventIB) => {
+		//set participantId based on event pressed
+		const myParticipantId = event.participantIds?.find(
+			(p) => p.userId === user?._id,
+		)?.participantId;
+
+		if (myParticipantId) {
+			await setCurrentParticipantId(myParticipantId); //update context for participantId for tapped event
+		} else {
+			console.log("No participantId found for current user in this event.");
+			await setCurrentParticipantId(""); //reset if not found
+		}
+
+		//expand event based on ID
+		setExpandedEventId((prev) => (prev === event._id ? null : event._id));
 	};
 
 	if (loading) {
@@ -76,21 +86,13 @@ const NewEvents = () => {
 					<EventCard
 						event={item}
 						expanded={expandedEventId === item._id}
-						onPress={() => handlePress(item._id)}
-						onJoinGame={() => {
-							router.push({
-								pathname: "/GamePages/Game",
-								params: { eventId: item._id },
-							});
-						}}
+						onPress={() => handlePress(item)}
 					/>
 				)}
 			/>
 		</View>
 	);
-};
-
-export default NewEvents;
+}
 
 const styles = StyleSheet.create({
 	container: {
diff --git a/shatter-mobile/app/(tabs)/JoinEvent.tsx b/shatter-mobile/app/(tabs)/JoinEventPage.tsx
similarity index 74%
rename from shatter-mobile/app/(tabs)/JoinEvent.tsx
rename to shatter-mobile/app/(tabs)/JoinEventPage.tsx
index 7f59d5d..c4702dc 100644
--- a/shatter-mobile/app/(tabs)/JoinEvent.tsx
+++ b/shatter-mobile/app/(tabs)/JoinEventPage.tsx
@@ -10,8 +10,26 @@ export default function JoinEventPage() {
 	const [showScanner, setShowScanner] = useState(false);
 	const [eventCode, setEventCode] = useState("");
 	const { joinEvent } = useJoinEvent();
+	const [loading, setLoading] = useState(false);
 	const [errorMessage, setErrorMessage] = useState<string | null>(null);
 
+	//for manual code entry
+	const handleJoinEvent = async () => {
+		setLoading(true);
+		try {
+			const eventId = await joinEvent(eventCode);
+			setErrorMessage("");
+			router.push({
+				pathname: "/EventPages/EventLobby",
+				params: { eventId },
+			});
+		} catch (err) {
+			setErrorMessage((err as Error).message);
+		} finally {
+			setLoading(false);
+		}
+	};
+
 	return (
 		<View style={styles.container}>
 			{user ? (
@@ -34,7 +52,7 @@ export default function JoinEventPage() {
 					value={eventCode}
 					onChangeText={(text) => {
 						setEventCode(text);
-						setErrorMessage(null);
+						setErrorMessage("");
 					}}
 					autoCapitalize="characters"
 					autoCorrect={false}
@@ -42,30 +60,10 @@ export default function JoinEventPage() {
 
 				<Button
 					title="Join Event"
-					onPress={async () => {
-						const joinRes = await joinEvent(eventCode);
-
-						switch (joinRes.status) {
-							case "event-not-found":
-								setErrorMessage("We couldn’t find an event with that code.");
-								break;
-							case "no-user":
-								setErrorMessage("Your profile is missing a name.");
-								break;
-							case "no-user-id":
-								setErrorMessage("Please sign in again and retry.");
-								break;
-							case "join-error":
-								setErrorMessage("Something went wrong joining the event.");
-								break;
-							case "success":
-								setErrorMessage(null);
-								router.push({ pathname: "/Events" });
-								break;
-						}
-					}}
+					onPress={() => handleJoinEvent()}
 					disabled={!eventCode.trim()}
 				/>
+
 				{errorMessage && <Text style={styles.errorText}>{errorMessage}</Text>}
 			</View>
 		</View>
@@ -98,6 +96,7 @@ const styles = StyleSheet.create({
 	},
 	errorText: {
 		color: "#d32f2f",
+		textAlign: "center",
 		marginTop: 8,
 		fontSize: 14,
 		justifyContent: "center",
diff --git a/shatter-mobile/app/(tabs)/Profile.tsx b/shatter-mobile/app/(tabs)/Profile.tsx
deleted file mode 100644
index c33a8c7..0000000
--- a/shatter-mobile/app/(tabs)/Profile.tsx
+++ /dev/null
@@ -1,142 +0,0 @@
-import { useFocusEffect, useRouter } from "expo-router";
-import { useState, useCallback, useEffect } from "react";
-import { StyleSheet, Text, TextInput, TouchableOpacity, View } from "react-native";
-import { useAuth } from "../../src/components/context/AuthContext";
-
-export default function Profile() {
-  const { user, updateUser, logout } = useAuth();
-  const router = useRouter();
-
-  //other profile info
-  const [linkedin, setLinkedin] = useState(user?.linkedin || "");
-  const [github, setGithub] = useState(user?.github || "");
-
-  //update local form
-  useFocusEffect(
-    useCallback(() => {
-      setLinkedin(user?.linkedin || "");
-      setGithub(user?.github || "");
-    }, [user])
-  );
-
-  const handleSave = () => {
-    //TODO: Backend Logic --> Update user profile in backend
-    console.log("Saved profile info:", { linkedin, github });
-
-    //update auth state with new info
-    updateUser({ linkedin, github });
-  };
-
-  //not logged in
-  useEffect(() => {
-    if (!user) {
-      router.replace("/UserPages/Login");
-    }
-  }, [user]);
-
-  if (!user) {
-    return null; //don't render profile content while redirecting
-  }
-
-  //logged in
-  if (user && !user.isGuest) {
-    return (
-      <View style={styles.container}>
-        <Text style={styles.title}>Welcome, {user.name}!</Text>
-        <Text style={styles.subtitle}>{user.email}</Text>
-
-        <Text style={styles.label}>LinkedIn:</Text>
-        <TextInput
-          style={styles.input}
-          value={linkedin}
-          onChangeText={setLinkedin}
-          placeholder="Enter LinkedIn URL"
-          placeholderTextColor="#888"
-        />
-        <Text style={styles.label}>GitHub:</Text>
-        <TextInput
-          style={styles.input}
-          value={github}
-          onChangeText={setGithub}
-          placeholder="Enter GitHub URL"
-          placeholderTextColor="#888"
-        />
-
-        <TouchableOpacity style={styles.saveButton} onPress={handleSave}>
-          <Text style={styles.buttonText}>Save</Text>
-        </TouchableOpacity>
-
-        <TouchableOpacity style={styles.button} onPress={logout}>
-          <Text style={styles.buttonText}>Log Out</Text>
-        </TouchableOpacity>
-      </View>
-    );
-  }
-
-  if (user?.isGuest) {
-    return (
-        <View style={styles.container}>
-          <Text style={styles.title}>Welcome, {user?.name || "Guest"}!</Text>
-          <Text style={styles.subtitle}>
-            You are logged in as a guest. Some features may be limited.
-          </Text>
-    
-            <TouchableOpacity
-              style={styles.saveButton}
-              onPress={() => router.push("/UserPages/Signup")}
-            >
-            <Text style={styles.buttonText}>Create Account</Text>
-          </TouchableOpacity>
-    
-          <TouchableOpacity style={styles.button} onPress={logout}>
-            <Text style={styles.buttonText}>Log Out</Text>
-          </TouchableOpacity>
-        </View>
-      );
-  }
-};
-
-const styles = StyleSheet.create({
-  container: { 
-    flex: 1, 
-    justifyContent: "center", 
-    padding: 24, 
-    backgroundColor: "#A1C9F6" },
-  title: { 
-    fontSize: 28, 
-    fontWeight: "600", 
-    textAlign: "center", 
-    color: "#1B253A", 
-    marginBottom: 16 },
-  subtitle: { 
-    fontSize: 16, 
-    textAlign: "center", 
-    color: "#666", 
-    marginBottom: 20 },
-  label: { 
-    fontWeight: "600", 
-    marginTop: 12 },
-  input: { 
-    borderWidth: 1, 
-    borderColor: "#1B253A",
-    color: "black",
-    backgroundColor: "#fff",  
-    borderRadius: 8, 
-    padding: 10, 
-    marginTop: 5 },
-  saveButton: { 
-    backgroundColor: "#4CAF50", 
-    padding: 14, 
-    borderRadius: 8, 
-    alignItems: "center", 
-    marginTop: 15 },
-  button: { 
-    backgroundColor: "#1C1DEF", 
-    padding: 14, 
-    borderRadius: 8, 
-    alignItems: "center" },
-  buttonText: { 
-    color: "#fff", 
-    fontWeight: "600", 
-    fontSize: 16 },
-});
\ No newline at end of file
diff --git a/shatter-mobile/app/(tabs)/ProfilePage.tsx b/shatter-mobile/app/(tabs)/ProfilePage.tsx
new file mode 100644
index 0000000..67b9ae2
--- /dev/null
+++ b/shatter-mobile/app/(tabs)/ProfilePage.tsx
@@ -0,0 +1,218 @@
+import { useFocusEffect, useRouter } from "expo-router";
+import { useCallback, useEffect, useState } from "react";
+import { StyleSheet, Text, TouchableOpacity, View } from "react-native";
+import { useAuth } from "../../src/components/context/AuthContext";
+
+export default function Profile() {
+	const { user, logout } = useAuth();
+	const router = useRouter();
+	const [socialLinks, setSocialLinks] = useState(user?.socialLinks || []);
+
+	//update local form
+	useFocusEffect(
+		useCallback(() => {
+			setSocialLinks(user?.socialLinks || []);
+		}, [user]),
+	);
+
+	//not logged in
+	useEffect(() => {
+		if (!user) {
+			router.replace("/UserPages/Login");
+		}
+	}, [user]);
+
+	if (!user) {
+		return null; //don't render profile content while redirecting
+	}
+
+	//logged in
+	if (user && !user.isGuest) {
+		return (
+			<View style={styles.container}>
+				<Text style={styles.title}>Welcome, {user.name}!</Text>
+				<Text style={styles.subtitle}>{user.email}</Text>
+
+				{socialLinks.length === 0 && (
+					<Text style={styles.emptyText}>No social links added yet.</Text>
+				)}
+
+				{socialLinks.map((link, index) => (
+					<View key={index} style={styles.linkContainer}>
+						<>
+							<Text style={styles.linkLabel}>{link.label}</Text>
+							<Text style={styles.linkUrl}>{link.url}</Text>
+						</>
+					</View>
+				))}
+
+				<TouchableOpacity
+					style={styles.editButton}
+					onPress={() => router.push("/UserPages/UpdateProfile")}
+				>
+					<Text style={styles.buttonText}>Update Profile</Text>
+				</TouchableOpacity>
+
+				<TouchableOpacity style={styles.button} onPress={logout}>
+					<Text style={styles.buttonText}>Log Out</Text>
+				</TouchableOpacity>
+			</View>
+		);
+	}
+
+	if (user.isGuest) {
+		return (
+			<View style={styles.container}>
+				<Text style={styles.title}>Welcome, {user?.name || "Guest"}!</Text>
+				<Text style={styles.subtitle}>
+					You are logged in as a guest. Some features may be limited.
+				</Text>
+				{!user._id && (
+					<Text style={styles.subtitle}>
+						To upgrade your account, join an event and then come back here to
+						set it up!
+					</Text>
+				)}
+
+				{socialLinks.length === 0 && (
+					<Text style={styles.emptyText}>No social links added yet.</Text>
+				)}
+
+				{socialLinks.map((link, index) => (
+					<View key={index} style={styles.linkContainer}>
+						<>
+							<Text style={styles.linkLabel}>{link.label}</Text>
+							<Text style={styles.linkUrl}>{link.url}</Text>
+						</>
+					</View>
+				))}
+
+				{/* Guest user who has joined event / has userId */}
+				{user._id && (
+					<View>
+						<TouchableOpacity
+							style={styles.editButton}
+							onPress={() => router.push("/UserPages/UpdateProfile")}
+						>
+							<Text style={styles.buttonText}>Update Profile</Text>
+						</TouchableOpacity>
+
+						<Text style={styles.subtitle}>
+							Go here to upgrade your account to a user!
+						</Text>
+					</View>
+				)}
+
+				<TouchableOpacity style={styles.button} onPress={logout}>
+					<Text style={styles.buttonText}>Log Out</Text>
+				</TouchableOpacity>
+			</View>
+		);
+	}
+}
+
+const styles = StyleSheet.create({
+	container: {
+		flex: 1,
+		justifyContent: "center",
+		padding: 24,
+		backgroundColor: "#A1C9F6",
+	},
+	title: {
+		fontSize: 28,
+		fontWeight: "600",
+		textAlign: "center",
+		color: "#1B253A",
+		marginBottom: 16,
+	},
+	subtitle: {
+		fontSize: 16,
+		textAlign: "center",
+		color: "#666",
+		marginBottom: 20,
+	},
+	label: {
+		fontWeight: "600",
+		marginTop: 12,
+	},
+	input: {
+		borderWidth: 1,
+		borderColor: "#1B253A",
+		color: "#000000",
+		backgroundColor: "#fff",
+		borderRadius: 8,
+		padding: 10,
+		marginTop: 5,
+	},
+	saveButton: {
+		backgroundColor: "#4CAF50",
+		padding: 14,
+		borderRadius: 8,
+		alignItems: "center",
+		marginTop: 15,
+	},
+	button: {
+		backgroundColor: "#1C1DEF",
+		padding: 14,
+		borderRadius: 8,
+		alignItems: "center",
+	},
+	buttonText: {
+		color: "#fff",
+		fontWeight: "600",
+		fontSize: 16,
+	},
+	sectionTitle: {
+		fontSize: 18,
+		fontWeight: "600",
+		marginTop: 20,
+		marginBottom: 10,
+	},
+	linkContainer: {
+		marginBottom: 15,
+		padding: 10,
+		backgroundColor: "#E6F0FF",
+		borderRadius: 8,
+	},
+	addButton: {
+		backgroundColor: "#1eb4f0",
+		padding: 12,
+		borderRadius: 8,
+		alignItems: "center",
+		marginTop: 10,
+	},
+	removeButton: {
+		backgroundColor: "#F44336",
+		padding: 10,
+		borderRadius: 6,
+		alignItems: "center",
+		marginTop: 5,
+	},
+	emptyText: {
+		textAlign: "center",
+		color: "#444",
+		marginTop: 10,
+	},
+	linkLabel: {
+		fontWeight: "600",
+		fontSize: 16,
+	},
+	linkUrl: {
+		color: "#1C1DEF",
+		marginTop: 4,
+	},
+	editButton: {
+		backgroundColor: "#FF9800",
+		padding: 14,
+		borderRadius: 8,
+		alignItems: "center",
+		marginTop: 15,
+	},
+	cancelButton: {
+		backgroundColor: "#9E9E9E",
+		padding: 14,
+		borderRadius: 8,
+		alignItems: "center",
+		marginTop: 10,
+	},
+});
diff --git a/shatter-mobile/app/(tabs)/_layout.tsx b/shatter-mobile/app/(tabs)/_layout.tsx
index 48fb531..d75fdc4 100644
--- a/shatter-mobile/app/(tabs)/_layout.tsx
+++ b/shatter-mobile/app/(tabs)/_layout.tsx
@@ -1,11 +1,11 @@
 import { Tabs } from "expo-router";
 
 export default function RootLayout() {
-  return (
-    <Tabs>
-      <Tabs.Screen name="Events" options={{ title: "Events" }} />
-      <Tabs.Screen name="JoinEvent" options={{ title: "Join Event" }} />
-      <Tabs.Screen name="Profile" options={{ title: "Profile" }} />
-    </Tabs>
-  );
-}
\ No newline at end of file
+	return (
+		<Tabs>
+			<Tabs.Screen name="EventsPage" options={{ title: "Events" }} />
+			<Tabs.Screen name="JoinEventPage" options={{ title: "Join Event" }} />
+			<Tabs.Screen name="ProfilePage" options={{ title: "Profile" }} />
+		</Tabs>
+	);
+}
diff --git a/shatter-mobile/app/EventPages/EventLobby.tsx b/shatter-mobile/app/EventPages/EventLobby.tsx
index ddee6ae..c777358 100644
--- a/shatter-mobile/app/EventPages/EventLobby.tsx
+++ b/shatter-mobile/app/EventPages/EventLobby.tsx
@@ -1,6 +1,6 @@
 import { useLocalSearchParams, router } from "expo-router";
 import { useEffect, useState } from "react";
-import { View, Text, ActivityIndicator, StyleSheet } from "react-native";
+import { View, Text, ActivityIndicator, StyleSheet, TouchableOpacity } from "react-native";
 import { getEventById } from "@/src/services/event.service";
 import { EventState } from "@/src/interfaces/Event";
 
@@ -12,21 +12,19 @@ export default function EventLobby() {
   useEffect(() => {
     const interval = setInterval(async () => {
       const res = await getEventById(eventId);
+      const event = res?.event;
+      if (!event) return;
 
-      if (!res) {
-        return null
-      }
+      setStatus(event.currentState);
 
-      if (res?.event.currentState === EventState.IN_PROGRESS) {
+      if (event.currentState === EventState.IN_PROGRESS) {
         clearInterval(interval);
+
         router.replace({
           pathname: "/GamePages/Game",
-          params: { eventId },
         });
       }
-
-      setStatus(res?.event.currentState);
-    }, 3000); //poll every 3 seconds
+    }, 3000);
 
     return () => clearInterval(interval);
   }, [eventId]);
@@ -43,6 +41,14 @@ export default function EventLobby() {
           </Text>
         </>
       )}
+
+      {/* Leave Game Button */}
+      <TouchableOpacity
+        style={styles.leaveButton}
+        onPress={() => router.replace("/EventsPage")}
+      >
+        <Text style={styles.leaveButtonText}>Leave Game</Text>
+      </TouchableOpacity>
     </View>
   );
 }
@@ -62,4 +68,16 @@ const styles = StyleSheet.create({
     marginTop: 10,
     fontSize: 16,
   },
+  leaveButton: {
+    backgroundColor: "#ef4444",
+    padding: 12,
+    borderRadius: 8,
+    alignItems: "center",
+    marginTop: 20,
+  },
+  leaveButtonText: {
+    color: "#fff",
+    fontWeight: "600",
+    fontSize: 16,
+  },
 });
\ No newline at end of file
diff --git a/shatter-mobile/app/GamePages/Game.tsx b/shatter-mobile/app/GamePages/Game.tsx
index 84f8a54..94fa07e 100644
--- a/shatter-mobile/app/GamePages/Game.tsx
+++ b/shatter-mobile/app/GamePages/Game.tsx
@@ -1,4 +1,5 @@
-import { useFocusEffect, useLocalSearchParams, useRouter } from "expo-router";
+import { useGame } from "@/src/components/context/GameContext";
+import { useFocusEffect, useRouter } from "expo-router";
 import { useCallback, useState } from "react";
 import { ActivityIndicator, StyleSheet, Text, View } from "react-native";
 import IcebreakerGame from "../../src/components/games/IcebreakerGame";
@@ -6,21 +7,20 @@ import { getEventById } from "../../src/services/event.service";
 
 const GamePage = () => {
 	const router = useRouter();
-	const searchParams = useLocalSearchParams();
-	const eventId = searchParams.eventId.toString();
+	const { gameState } = useGame();
 	const [event, setEvent] = useState<any>(null);
 	const [loading, setLoading] = useState(true);
 
 	const loadGameData = useCallback(async () => {
 		setLoading(true);
 
-		if (!eventId) {
-			router.replace("/Events");
+		if (!gameState?.eventId) {
+			router.replace("/(tabs)/EventsPage");
 			return;
 		}
 
 		//fetch the event data
-		getEventById(eventId)
+		getEventById(gameState?.eventId)
 			.then((data) => {
 				setEvent(data?.event);
 			})
@@ -56,7 +56,7 @@ const GamePage = () => {
 			<Text style={styles.description}>{event.description}</Text>
 
 			{/* Game Rendering */}
-			<IcebreakerGame eventId={event._id} gameType={event.gameType} />
+			<IcebreakerGame />
 		</View>
 	);
 };
diff --git a/shatter-mobile/app/GetStarted.tsx b/shatter-mobile/app/GetStarted.tsx
index 722ebd4..4c69725 100644
--- a/shatter-mobile/app/GetStarted.tsx
+++ b/shatter-mobile/app/GetStarted.tsx
@@ -25,7 +25,7 @@ export default function GetStarted() {
           <Text style={styles.logo}>SHATTER</Text>
 
           <Text style={styles.tagline}>
-            Turn events into games
+            Break the Ice
           </Text>
 
           <TouchableOpacity
diff --git a/shatter-mobile/app/UserPages/Guest.tsx b/shatter-mobile/app/UserPages/Guest.tsx
index d1a0ba2..9cb6197 100644
--- a/shatter-mobile/app/UserPages/Guest.tsx
+++ b/shatter-mobile/app/UserPages/Guest.tsx
@@ -1,56 +1,80 @@
+import { SocialLink } from "@/src/interfaces/User";
 import { useRouter } from "expo-router";
 import { useState } from "react";
 import { Button, StyleSheet, Text, TextInput, View } from "react-native";
 import { useAuth } from "../../src/components/context/AuthContext";
 
 export default function GuestPage() {
-  const { continueAsGuest } = useAuth();
-  const [name, setName] = useState("");
-  const [linkedin, setLinkedin] = useState("");
-  const router = useRouter();
-
-  const handleContinue = async () => {
-    if (!name.trim()) return;
-    await continueAsGuest(name.trim(), linkedin);
-    router.replace("/JoinEvent"); 
-  };
-
-  return (
-    <View style={styles.container}>
-      <Text style={styles.title}>Continue as Guest</Text>
-      <Text style={styles.subtitle}>
-        Enter your name so others can identify you.
-      </Text>
-
-      <TextInput
-        style={styles.input}
-        placeholder="Your Name"
-        value={name}
-        onChangeText={setName}
-      />
-
-      <TextInput
-        style={styles.input}
-        placeholder="Your Linkedin"
-        value={linkedin}
-        onChangeText={setLinkedin}
-      />
-
-      <Button title="Continue" onPress={handleContinue} />
-      <Button title="Back" onPress={() => router.push("/UserPages/Login")} />
-    </View>
-  );
+	const { continueAsGuest } = useAuth();
+	const [name, setName] = useState("");
+	const [contactLink, setContactLink] = useState("");
+	const [error, setError] = useState("");
+	const router = useRouter();
+
+	const handleContinue = async () => {
+		//need name and social link
+		if (!name.trim() || !contactLink) {
+			setError("Name and Social Link Cannot Be Empty");
+			return;
+		}
+
+    	//TODO: Check for valid link format
+		const socialLink: SocialLink = { label: "Contact Link", url: contactLink };
+
+		setError("");
+		await continueAsGuest(name.trim(), socialLink);
+		router.replace("/JoinEventPage");
+	};
+
+	return (
+		<View style={styles.container}>
+			<Text style={styles.title}>Continue as Guest</Text>
+			<Text style={styles.subtitle}>
+				Enter your name so others can identify you.
+			</Text>
+
+			<TextInput
+				style={styles.input}
+				placeholder="Your Name"
+				value={name}
+				onChangeText={setName}
+			/>
+
+			<TextInput
+				style={styles.input}
+				placeholder="Contact Link"
+				value={contactLink}
+				onChangeText={setContactLink}
+			/>
+
+			<Button title="Continue" onPress={handleContinue} />
+			<Button title="Back" onPress={() => router.push("/UserPages/Signup")} />
+			<Text style={styles.inputInfo}>
+				Your contact link can be your email, your LinkedIn profile URL, or
+				another relevant personal link.
+			</Text>
+			{error && <Text style={styles.error}>{error}</Text>}
+		</View>
+	);
 }
 
 const styles = StyleSheet.create({
-  container: { flex: 1, padding: 20, justifyContent: "center" },
-  title: { fontSize: 24, fontWeight: "bold", marginBottom: 10 },
-  subtitle: { fontSize: 16, marginBottom: 20 },
-  input: {
-    borderWidth: 1,
-    borderColor: "#aaa",
-    padding: 10,
-    borderRadius: 8,
-    marginBottom: 20,
-  },
-});
\ No newline at end of file
+	container: { flex: 1, padding: 20, justifyContent: "center" },
+	title: { fontSize: 24, fontWeight: "bold", marginBottom: 10 },
+	subtitle: { fontSize: 16, marginBottom: 20 },
+	input: {
+		borderWidth: 1,
+		borderColor: "#aaa",
+		padding: 10,
+		borderRadius: 8,
+		marginBottom: 20,
+	},
+	error: {
+		textAlign: "center",
+		color: "#e63232",
+	},
+	inputInfo: {
+		textAlign: "center",
+		color: "#afafaf",
+	},
+});
diff --git a/shatter-mobile/app/UserPages/UpdateProfile.tsx b/shatter-mobile/app/UserPages/UpdateProfile.tsx
new file mode 100644
index 0000000..2f73a21
--- /dev/null
+++ b/shatter-mobile/app/UserPages/UpdateProfile.tsx
@@ -0,0 +1,256 @@
+import { getStoredAuth } from "@/src/components/context/AsyncStorage";
+import { userUpdate } from "@/src/services/user.service";
+import { useRouter } from "expo-router";
+import { useEffect, useState } from "react";
+import {
+	ScrollView,
+	StyleSheet,
+	Text,
+	TextInput,
+	TouchableOpacity,
+	View,
+} from "react-native";
+import { useAuth } from "../../src/components/context/AuthContext";
+
+export default function UpdateProfile() {
+	const { user, updateUser } = useAuth();
+	const router = useRouter();
+
+	const [name, setName] = useState(user?.name || "");
+	const [email, setEmail] = useState(user?.email || "");
+	const [password, setPassword] = useState("");
+	const [bio, setBio] = useState(user?.bio || "");
+	const [profilePhoto, setProfilePhoto] = useState(user?.profilePhoto || "");
+	const [socialLinks, setSocialLinks] = useState<
+		{ label: string; url: string }[]
+	>(user?.socialLinks || []);
+
+	useEffect(() => {
+		if (!user) router.replace("/UserPages/Login");
+	}, [user]);
+
+	const handleLinkChange = (
+		index: number,
+		field: "label" | "url",
+		value: string,
+	) => {
+		const updated = [...socialLinks];
+		updated[index] = { ...updated[index], [field]: value };
+		setSocialLinks(updated);
+	};
+
+	const addNewLink = () =>
+		setSocialLinks([...socialLinks, { label: "", url: "" }]);
+
+	const removeLink = (index: number) =>
+		setSocialLinks(socialLinks.filter((_, i) => i !== index));
+
+	const handleSave = async () => {
+		if (!user || !user._id) return;
+		if ((!email && password) || (email && !password && user.isGuest)) {
+			alert(
+				"Both email and password must be filled to create an account based on guest info.",
+			);
+			return;
+		}
+
+		const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+		if (!emailRegex.test(email)) {
+			console.log("Error: Invalid email format");
+			alert("Please enter a valid email.");
+			return;
+		}
+
+		if (password.length < 8 && password.length > 0) {
+			console.log("Error: Password must be at least 8 characters");
+			alert("Password must be at least 8 characters.");
+			return;
+		}
+
+		const stored = await getStoredAuth();
+		const updatedUser = await updateUser({
+			name,
+			email,
+			bio,
+			profilePhoto,
+			socialLinks,
+		}); //local update
+		const res = await userUpdate(
+			user._id,
+			{ name, email, bio, profilePhoto, socialLinks },
+			stored.accessToken,
+		); //remote update
+
+		if (updatedUser && res) {
+			router.push("/(tabs)/ProfilePage");
+		} else {
+			alert("Failed to update profile");
+		}
+	};
+
+	const handleCancel = () => {
+		router.push("/(tabs)/ProfilePage");
+	};
+
+	return (
+		<ScrollView
+			style={styles.container}
+			contentContainerStyle={{ paddingBottom: 30 }}
+		>
+			<Text style={styles.title}>Update Profile</Text>
+
+			<Text style={styles.label}>Name</Text>
+			<TextInput
+				style={styles.input}
+				value={name}
+				onChangeText={setName}
+				placeholder="Your Name"
+				placeholderTextColor="#666"
+			/>
+
+			<Text style={styles.label}>Email</Text>
+			<TextInput
+				style={styles.input}
+				value={email}
+				onChangeText={setEmail}
+				placeholder="Your Email"
+				placeholderTextColor="#666"
+				keyboardType="email-address"
+			/>
+			{user?.isGuest && (
+				<Text style={styles.inputInfo}>
+					By entering in your email and password, Shatter will create an account
+					for you with that info!
+				</Text>
+			)}
+
+			<Text style={styles.label}>Update Password</Text>
+			<TextInput
+				style={styles.input}
+				value={password}
+				onChangeText={setPassword}
+				placeholder="Update your Password"
+				placeholderTextColor="#666"
+				keyboardType="visible-password"
+			/>
+			<Text style={styles.inputInfo}>
+				Password must be at least 8 characters long
+			</Text>
+
+			<Text style={styles.label}>Bio</Text>
+			<TextInput
+				style={[styles.input, { height: 100 }]}
+				value={bio}
+				onChangeText={setBio}
+				placeholder="Short bio"
+				placeholderTextColor="#666"
+				multiline
+			/>
+
+			<Text style={styles.label}>Profile Photo URL</Text>
+			<TextInput
+				style={styles.input}
+				value={profilePhoto}
+				onChangeText={setProfilePhoto}
+				placeholder="Profile Photo URL"
+				placeholderTextColor="#666"
+			/>
+
+			{/* Social Links Section */}
+			<Text style={[styles.label, { marginTop: 20 }]}>Social Links</Text>
+			{socialLinks.map((link, index) => (
+				<View key={index} style={styles.linkContainer}>
+					<TextInput
+						style={styles.input}
+						placeholder="Label (e.g. LinkedIn)"
+						placeholderTextColor="#666"
+						value={link.label}
+						onChangeText={(text) => handleLinkChange(index, "label", text)}
+					/>
+					<TextInput
+						style={styles.input}
+						placeholder="URL"
+						placeholderTextColor="#666"
+						value={link.url}
+						onChangeText={(text) => handleLinkChange(index, "url", text)}
+					/>
+					<TouchableOpacity
+						style={styles.removeButton}
+						onPress={() => removeLink(index)}
+					>
+						<Text style={styles.buttonText}>Remove</Text>
+					</TouchableOpacity>
+				</View>
+			))}
+
+			<TouchableOpacity style={styles.addButton} onPress={addNewLink}>
+				<Text style={styles.buttonText}>+ Add Social Link</Text>
+			</TouchableOpacity>
+
+			<TouchableOpacity style={styles.saveButton} onPress={handleSave}>
+				<Text style={styles.buttonText}>Save</Text>
+			</TouchableOpacity>
+
+			<TouchableOpacity style={styles.cancelButton} onPress={handleCancel}>
+				<Text style={styles.buttonText}>Cancel</Text>
+			</TouchableOpacity>
+		</ScrollView>
+	);
+}
+
+const styles = StyleSheet.create({
+	container: { flex: 1, backgroundColor: "#A1C9F6", padding: 24 },
+	title: {
+		fontSize: 28,
+		fontWeight: "600",
+		textAlign: "center",
+		color: "#1B253A",
+		marginBottom: 16,
+	},
+	label: { fontWeight: "600", marginTop: 12 },
+	input: {
+		borderWidth: 1,
+		borderColor: "#1B253A",
+		color: "#000",
+		backgroundColor: "#fff",
+		borderRadius: 8,
+		padding: 10,
+		marginTop: 5,
+	},
+	inputInfo: { textAlign: "center", color: "#909090", fontStyle: "italic" },
+	saveButton: {
+		backgroundColor: "#4CAF50",
+		padding: 14,
+		borderRadius: 8,
+		alignItems: "center",
+		marginTop: 15,
+	},
+	cancelButton: {
+		backgroundColor: "#727272",
+		padding: 14,
+		borderRadius: 8,
+		alignItems: "center",
+		marginTop: 15,
+	},
+	addButton: {
+		backgroundColor: "#1eb4f0",
+		padding: 12,
+		borderRadius: 8,
+		alignItems: "center",
+		marginTop: 10,
+	},
+	removeButton: {
+		backgroundColor: "#F44336",
+		padding: 10,
+		borderRadius: 6,
+		alignItems: "center",
+		marginTop: 5,
+	},
+	buttonText: { color: "#fff", fontWeight: "600", fontSize: 16 },
+	linkContainer: {
+		marginBottom: 10,
+		backgroundColor: "#E6F0FF",
+		padding: 10,
+		borderRadius: 8,
+	},
+});
diff --git a/shatter-mobile/app/_layout.tsx b/shatter-mobile/app/_layout.tsx
index 540c0e1..516aab7 100644
--- a/shatter-mobile/app/_layout.tsx
+++ b/shatter-mobile/app/_layout.tsx
@@ -1,10 +1,13 @@
+import { GameProvider } from "@/src/components/context/GameContext";
 import { AuthProvider } from "../src/components/context/AuthContext";
 import { Slot } from "expo-router";
 
 export default function RootLayout() {
   return (
     <AuthProvider>
-      <Slot />
+      <GameProvider>
+        <Slot />
+      </GameProvider>
     </AuthProvider>
   );
 }
\ No newline at end of file
diff --git a/shatter-mobile/app/index.tsx b/shatter-mobile/app/index.tsx
index 48bfd4c..ba660c3 100644
--- a/shatter-mobile/app/index.tsx
+++ b/shatter-mobile/app/index.tsx
@@ -1,29 +1,29 @@
-import { useEffect, useState } from "react";
+import { getStoredAuth } from "@/src/components/context/AsyncStorage";
 import { useRouter } from "expo-router";
-import { getStoredAuth } from "@/src/components/general/AsyncStorage";
+import { useEffect } from "react";
 import { ActivityIndicator, View } from "react-native";
 
 export default function Index() {
-  const router = useRouter();
+	const router = useRouter();
 
-  //page mounted, set base page
-  useEffect(() => {
-    const checkAuth = async () => {
-      const stored = await getStoredAuth();
+	//page mounted, set base page
+	useEffect(() => {
+		const checkAuth = async () => {
+			const stored = await getStoredAuth();
 
-      if (stored?.userId) {
-        router.replace("/JoinEvent"); //skip onboarding
-      } else {
-        router.replace("/GetStarted");
-      }
-    };
+			if (stored?.userId) {
+				router.replace("/JoinEventPage"); //skip onboarding
+			} else {
+				router.replace("/GetStarted");
+			}
+		};
 
-    checkAuth();
-  }, []);
+		checkAuth();
+	}, []);
 
-  return (
-    <View style={{ flex: 1, justifyContent: "center", alignItems: "center" }}>
-      <ActivityIndicator size="large" />
-    </View>
-  );
-}
\ No newline at end of file
+	return (
+		<View style={{ flex: 1, justifyContent: "center", alignItems: "center" }}>
+			<ActivityIndicator size="large" />
+		</View>
+	);
+}
diff --git a/shatter-mobile/mobile-docs/Authentication_Shatter.png b/shatter-mobile/mobile-docs/Authentication_Shatter.png
new file mode 100644
index 0000000..2c1db23
Binary files /dev/null and b/shatter-mobile/mobile-docs/Authentication_Shatter.png differ
diff --git a/shatter-mobile/mobile-docs/Contexts_Shatter.png b/shatter-mobile/mobile-docs/Contexts_Shatter.png
new file mode 100644
index 0000000..cb01521
Binary files /dev/null and b/shatter-mobile/mobile-docs/Contexts_Shatter.png differ
diff --git a/shatter-mobile/mobile-docs/EventLobby_Shatter.png b/shatter-mobile/mobile-docs/EventLobby_Shatter.png
new file mode 100644
index 0000000..25b23f4
Binary files /dev/null and b/shatter-mobile/mobile-docs/EventLobby_Shatter.png differ
diff --git a/shatter-mobile/mobile-docs/JoinEvent_EventPage_Shatter.png b/shatter-mobile/mobile-docs/JoinEvent_EventPage_Shatter.png
new file mode 100644
index 0000000..f571909
Binary files /dev/null and b/shatter-mobile/mobile-docs/JoinEvent_EventPage_Shatter.png differ
diff --git a/shatter-mobile/mobile-docs/JoinEvent_Joining_Shatter.png b/shatter-mobile/mobile-docs/JoinEvent_Joining_Shatter.png
new file mode 100644
index 0000000..2beab73
Binary files /dev/null and b/shatter-mobile/mobile-docs/JoinEvent_Joining_Shatter.png differ
diff --git a/shatter-mobile/mobile-docs/LoadingGame_Shatter.png b/shatter-mobile/mobile-docs/LoadingGame_Shatter.png
new file mode 100644
index 0000000..7a02fd6
Binary files /dev/null and b/shatter-mobile/mobile-docs/LoadingGame_Shatter.png differ
diff --git a/shatter-mobile/mobile-docs/PlayingGame_Shatter.png b/shatter-mobile/mobile-docs/PlayingGame_Shatter.png
new file mode 100644
index 0000000..e7a85fa
Binary files /dev/null and b/shatter-mobile/mobile-docs/PlayingGame_Shatter.png differ
diff --git a/shatter-mobile/mobile-docs/Profile_Shatter.png b/shatter-mobile/mobile-docs/Profile_Shatter.png
new file mode 100644
index 0000000..7b031c9
Binary files /dev/null and b/shatter-mobile/mobile-docs/Profile_Shatter.png differ
diff --git a/shatter-mobile/package-lock.json b/shatter-mobile/package-lock.json
index cb13691..76f7bc4 100644
--- a/shatter-mobile/package-lock.json
+++ b/shatter-mobile/package-lock.json
@@ -14,19 +14,19 @@
         "@react-navigation/elements": "^2.6.3",
         "@react-navigation/native": "^7.1.8",
         "axios": "^1.13.2",
-        "expo": "~54.0.20",
-        "expo-camera": "^17.0.9",
-        "expo-constants": "~18.0.10",
-        "expo-font": "~14.0.9",
-        "expo-haptics": "~15.0.7",
-        "expo-image": "~3.0.10",
-        "expo-linking": "~8.0.8",
-        "expo-router": "~6.0.13",
-        "expo-splash-screen": "~31.0.10",
-        "expo-status-bar": "~3.0.8",
-        "expo-symbols": "~1.0.7",
-        "expo-system-ui": "~6.0.8",
-        "expo-web-browser": "~15.0.8",
+        "expo": "~54.0.33",
+        "expo-camera": "^17.0.10",
+        "expo-constants": "~18.0.13",
+        "expo-font": "~14.0.11",
+        "expo-haptics": "~15.0.8",
+        "expo-image": "~3.0.11",
+        "expo-linking": "~8.0.11",
+        "expo-router": "~6.0.23",
+        "expo-splash-screen": "~31.0.13",
+        "expo-status-bar": "~3.0.9",
+        "expo-symbols": "~1.0.8",
+        "expo-system-ui": "~6.0.9",
+        "expo-web-browser": "~15.0.10",
         "react": "^19.1.0",
         "react-dom": "19.1.0",
         "react-native": "^0.81.5",
@@ -60,12 +60,12 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
-      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
+      "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.28.5",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.1.1"
       },
@@ -74,9 +74,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.5.tgz",
-      "integrity": "sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz",
+      "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -87,7 +87,6 @@
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.5.tgz",
       "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
         "@babel/generator": "^7.28.5",
@@ -114,13 +113,13 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz",
-      "integrity": "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==",
+      "version": "7.29.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz",
+      "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.28.5",
-        "@babel/types": "^7.28.5",
+        "@babel/parser": "^7.29.0",
+        "@babel/types": "^7.29.0",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -142,12 +141,12 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
-      "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz",
+      "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.27.2",
+        "@babel/compat-data": "^7.28.6",
         "@babel/helper-validator-option": "^7.27.1",
         "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
@@ -158,17 +157,17 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.5.tgz",
-      "integrity": "sha512-q3WC4JfdODypvxArsJQROfupPBq9+lMwjKq7C33GhbFYJsufD0yd/ziwD+hJucLeWsnFPWZjsU2DNFqBPE7jwQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.6.tgz",
+      "integrity": "sha512-dTOdvsjnG3xNT9Y0AUg1wAl38y+4Rl4sf9caSQZOXdNqVn+H+HbbJ4IyyHaIqNR6SW9oJpA/RuRjsjCw2IdIow==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.27.3",
         "@babel/helper-member-expression-to-functions": "^7.28.5",
         "@babel/helper-optimise-call-expression": "^7.27.1",
-        "@babel/helper-replace-supers": "^7.27.1",
+        "@babel/helper-replace-supers": "^7.28.6",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
-        "@babel/traverse": "^7.28.5",
+        "@babel/traverse": "^7.28.6",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -196,16 +195,16 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.5.tgz",
-      "integrity": "sha512-uJnGFcPsWQK8fvjgGP5LZUZZsYGIoPeRjSF5PGwrelYgq7Q15/Ft9NGFp1zglwgIv//W0uG4BevRuSJRyylZPg==",
+      "version": "0.6.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.6.tgz",
+      "integrity": "sha512-mOAsxeeKkUKayvZR3HeTYD/fICpCPLJrU5ZjelT/PA6WHtNDBOE436YiaEUvHN454bRM3CebhDsIpieCc4texA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.27.2",
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "debug": "^4.4.1",
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "debug": "^4.4.3",
         "lodash.debounce": "^4.0.8",
-        "resolve": "^1.22.10"
+        "resolve": "^1.22.11"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -234,13 +233,13 @@
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
-      "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz",
+      "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.27.1",
-        "@babel/types": "^7.27.1"
+        "@babel/traverse": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -276,9 +275,9 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
-      "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz",
+      "integrity": "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -302,14 +301,14 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.27.1.tgz",
-      "integrity": "sha512-7EHz6qDZc8RYS5ElPoShMheWvEgERonFCs7IAonWLLUTXW59DP14bCZt89/GKyreYn8g3S83m21FelHKbeDCKA==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.28.6.tgz",
+      "integrity": "sha512-mq8e+laIk94/yFec3DxSjCRD2Z0TAjhVbEJY3UQrlwVo15Lmt7C2wAUbK4bjnTs4APkwsYLTahXRraQXhb1WCg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.27.1",
+        "@babel/helper-member-expression-to-functions": "^7.28.5",
         "@babel/helper-optimise-call-expression": "^7.27.1",
-        "@babel/traverse": "^7.27.1"
+        "@babel/traverse": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -359,14 +358,14 @@
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.28.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.28.3.tgz",
-      "integrity": "sha512-zdf983tNfLZFletc0RRXYrHrucBEg95NIFMkn6K9dbeMYnsgHaSBGcQqdsCSStG2PYwRre0Qc2NNSCXbG+xc6g==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.28.6.tgz",
+      "integrity": "sha512-z+PwLziMNBeSQJonizz2AGnndLsP2DeGHIxDAn+wdHOGuo4Fo1x1HBPPXeE9TAOPHNNWQKCSlA2VZyYyyibDnQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.27.2",
-        "@babel/traverse": "^7.28.3",
-        "@babel/types": "^7.28.2"
+        "@babel/template": "^7.28.6",
+        "@babel/traverse": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -472,12 +471,12 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
-      "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz",
+      "integrity": "sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.28.5"
+        "@babel/types": "^7.29.0"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -487,14 +486,14 @@
       }
     },
     "node_modules/@babel/plugin-proposal-decorators": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.28.0.tgz",
-      "integrity": "sha512-zOiZqvANjWDUaUS9xMxbMcK/Zccztbe/6ikvUXaG9nsPH3w6qh5UaPGAnirI/WhIbZ8m3OHU0ReyPrknG+ZKeg==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.29.0.tgz",
+      "integrity": "sha512-CVBVv3VY/XRMxRYq5dwr2DS7/MvqPm23cOCjbwNnVrfOqcWlnefua1uUs0sjdKOGjvPUG633o07uWzJq4oI6dA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/plugin-syntax-decorators": "^7.27.1"
+        "@babel/helper-create-class-features-plugin": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/plugin-syntax-decorators": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -570,12 +569,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-decorators": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.27.1.tgz",
-      "integrity": "sha512-YMq8Z87Lhl8EGkmb0MwYkt36QnxC+fzCgrl66ereamPlYToRpIk5nUjKUY3QKLWq8mwUB1BgbeXcTJhZOCDg5A==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.28.6.tgz",
+      "integrity": "sha512-71EYI0ONURHJBL4rSFXnITXqXrrY8q4P0q006DPfN+Rk+ASM+++IBXem/ruokgBZR8YNEWZ8R6B+rCb8VcUTqA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -597,12 +596,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-export-default-from": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.27.1.tgz",
-      "integrity": "sha512-eBC/3KSekshx19+N40MzjWqJd7KTEdOoLesAfa4IDFI8eRz5a47i5Oszus6zG/cwIXN63YhgLOMSSNJx49sENg==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.28.6.tgz",
+      "integrity": "sha512-Svlx1fjJFnNz0LZeUaybRukSxZI3KkpApUmIRzEdXC5k8ErTOz0OD0kNrICi5Vc3GlpP5ZCeRyRO+mfWTSz+iQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -612,12 +611,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-flow": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.27.1.tgz",
-      "integrity": "sha512-p9OkPbZ5G7UT1MofwYFigGebnrzGJacoBSQM0/6bi/PUMVE+qlWDD/OalvQKbwgQzU6dl0xAv6r4X7Jme0RYxA==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.28.6.tgz",
+      "integrity": "sha512-D+OrJumc9McXNEBI/JmFnc/0uCM2/Y3PEBG3gfV3QIYkKv5pvnpzFrl1kYCrcHJP8nOeFB/SHi1IHz29pNGuew==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -666,12 +665,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz",
-      "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.28.6.tgz",
+      "integrity": "sha512-wgEmr06G6sIpqr8YDwA2dSRTE3bJ+V0IfpzfSY3Lfgd7YWOaAdlykvJi13ZKBt8cZHfgH1IXN+CL656W3uUa4w==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -813,14 +812,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.28.0.tgz",
-      "integrity": "sha512-BEOdvX4+M765icNPZeidyADIvQ1m1gmunXufXxvRESy/jNNyfovIqUyE7MVgGBjWktCoJlzvFA1To2O4ymIO3Q==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.29.0.tgz",
+      "integrity": "sha512-va0VdWro4zlBr2JsXC+ofCPB2iG12wPtVGTWFx2WLDOM3nYQZZIGP82qku2eW/JR83sD+k2k+CsNtyEbUqhU6w==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.28.6",
         "@babel/helper-remap-async-to-generator": "^7.27.1",
-        "@babel/traverse": "^7.28.0"
+        "@babel/traverse": "^7.29.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -830,13 +829,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.27.1.tgz",
-      "integrity": "sha512-NREkZsZVJS4xmTr8qzE5y8AfIPqsdQfRuUiLRTEzb7Qii8iFWCyDKaUV2c0rCuh4ljDZ98ALHP/PetiBV2nddA==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.28.6.tgz",
+      "integrity": "sha512-ilTRcmbuXjsMmcZ3HASTe4caH5Tpo93PkTxF9oG2VZsSWsahydmcEHhix9Ik122RcTnZnUzPbmux4wh1swfv7g==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-module-imports": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
         "@babel/helper-remap-async-to-generator": "^7.27.1"
       },
       "engines": {
@@ -847,12 +846,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.5.tgz",
-      "integrity": "sha512-45DmULpySVvmq9Pj3X9B+62Xe+DJGov27QravQJU1LLcapR6/10i+gYVAucGGJpHBp5mYxIMK4nDAT/QDLr47g==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.6.tgz",
+      "integrity": "sha512-tt/7wOtBmwHPNMPu7ax4pdPz6shjFrmHDghvNC+FG9Qvj7D6mJcoRQIF5dy4njmxR941l6rgtvfSB2zX3VlUIw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -878,13 +877,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.28.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.28.3.tgz",
-      "integrity": "sha512-LtPXlBbRoc4Njl/oh1CeD/3jC+atytbnf/UqLoqTDcEYGUPj022+rvfkbDYieUrSj3CaV4yHDByPE+T2HwfsJg==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.28.6.tgz",
+      "integrity": "sha512-rfQ++ghVwTWTqQ7w8qyDxL1XGihjBss4CmTgGRCTAC9RIbhVpyp4fOeZtta0Lbf+dTNIVJer6ych2ibHwkZqsQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.28.3",
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-create-class-features-plugin": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -914,13 +913,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.27.1.tgz",
-      "integrity": "sha512-lj9PGWvMTVksbWiDT2tW68zGS/cyo4AkZ/QTp0sQT0mjPopCmrSkzxeXkznjqBxzDI6TclZhOJbBmbBLjuOZUw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.28.6.tgz",
+      "integrity": "sha512-bcc3k0ijhHbc2lEfpFHgx7eYw9KNXqOerKWfzbxEHUGKnS3sz9C4CNL9OiFN1297bDNfUiSO7DaLzbvHQQQ1BQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/template": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/template": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1025,12 +1024,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.28.5.tgz",
-      "integrity": "sha512-axUuqnUTBuXyHGcJEVVh9pORaN6wC5bYfE7FGzPiaWa3syib9m7g+/IT/4VgCOe2Upef43PHzeAvcrVek6QuuA==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.28.6.tgz",
+      "integrity": "sha512-+anKKair6gpi8VsM/95kmomGNMD0eLz1NQ8+Pfw5sAwWH9fGYXT50E55ZpV0pHUHWf6IUTWPM+f/7AAff+wr9A==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1056,13 +1055,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.27.1.tgz",
-      "integrity": "sha512-SstR5JYy8ddZvD6MhV0tM/j16Qds4mIpJTOd1Yu9J9pJjH93bxHECF7pgtc28XvkzTD6Pxcm/0Z73Hvk7kb3Ng==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.29.0.tgz",
+      "integrity": "sha512-1CZQA5KNAD6ZYQLPw7oi5ewtDNxH/2vuCh+6SmvgDfhumForvs8a1o9n0UrEoBD8HU4djO2yWngTQlXl1NDVEQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1087,12 +1086,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.27.1.tgz",
-      "integrity": "sha512-fdPKAcujuvEChxDBJ5c+0BTaS6revLV7CJL08e4m3de8qJfNIuCc2nc7XJYOjBoTMJeqSmwXJ0ypE14RCjLwaw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.28.6.tgz",
+      "integrity": "sha512-SJR8hPynj8outz+SlStQSwvziMN4+Bq99it4tMIf5/Caq+3iOc0JtKyse8puvyXkk3eFRIA5ID/XfunGgO5i6w==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1102,16 +1101,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.4.tgz",
-      "integrity": "sha512-373KA2HQzKhQCYiRVIRr+3MjpCObqzDlyrM6u4I201wL8Mp2wHf7uB8GhDwis03k2ti8Zr65Zyyqs1xOxUF/Ew==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.6.tgz",
+      "integrity": "sha512-5rh+JR4JBC4pGkXLAcYdLHZjXudVxWMXbB6u6+E9lRL5TrGVbHt1TjxGbZ8CkmYw9zjkB7jutzOROArsqtncEA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.27.2",
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/plugin-transform-destructuring": "^7.28.0",
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/plugin-transform-destructuring": "^7.28.5",
         "@babel/plugin-transform-parameters": "^7.27.7",
-        "@babel/traverse": "^7.28.4"
+        "@babel/traverse": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1121,12 +1120,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.27.1.tgz",
-      "integrity": "sha512-txEAEKzYrHEX4xSZN4kJ+OfKXFVSWKB2ZxM9dpcE3wT7smwkNmXo5ORRlVzMVdJbD+Q8ILTgSD7959uj+3Dm3Q==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.28.6.tgz",
+      "integrity": "sha512-R8ja/Pyrv0OGAvAXQhSTmWyPJPml+0TMqXlO5w+AsMEiwb2fg3WkOvob7UxFSL3OIttFSGSRFKQsOhJ/X6HQdQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1167,13 +1166,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.27.1.tgz",
-      "integrity": "sha512-10FVt+X55AjRAYI9BrdISN9/AQWHqldOeZDUoLyif1Kn05a56xVBXb8ZouL8pZ9jem8QpXaOt8TS7RHUIS+GPA==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.28.6.tgz",
+      "integrity": "sha512-piiuapX9CRv7+0st8lmuUlRSmX6mBcVeNQ1b4AYzJxfCMuBfB0vBXDiGSmm03pKJw1v6cZ8KSeM+oUnM6yAExg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-create-class-features-plugin": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1183,14 +1182,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.27.1.tgz",
-      "integrity": "sha512-5J+IhqTi1XPa0DXF83jYOaARrX+41gOewWbkPyjMNRDqgOCqdffGh8L3f/Ek5utaEBZExjSAzcyjmV9SSAWObQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.28.6.tgz",
+      "integrity": "sha512-b97jvNSOb5+ehyQmBpmhOCiUC5oVK4PMnpRvO7+ymFBoqYjeDHIU9jnrNUuwHOiL9RpGDoKBpSViarV+BU+eVA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.1",
-        "@babel/helper-create-class-features-plugin": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-create-class-features-plugin": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1215,16 +1214,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.27.1.tgz",
-      "integrity": "sha512-2KH4LWGSrJIkVf5tSiBFYuXDAoWRq2MMwgivCf+93dd0GQi8RXLjKA/0EvRnVV5G0hrHczsquXuD01L8s6dmBw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.28.6.tgz",
+      "integrity": "sha512-61bxqhiRfAACulXSLd/GxqmAedUSrRZIu/cbaT18T1CetkTmtDN15it7i80ru4DVqRK1WMxQhXs+Lf9kajm5Ow==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.1",
-        "@babel/helper-module-imports": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/plugin-syntax-jsx": "^7.27.1",
-        "@babel/types": "^7.27.1"
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-module-imports": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/plugin-syntax-jsx": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1295,12 +1294,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.28.4.tgz",
-      "integrity": "sha512-+ZEdQlBoRg9m2NnzvEeLgtvBMO4tkFBw5SQIUgLICgTrumLoU7lr+Oghi6km2PFj+dbUt2u1oby2w3BDO9YQnA==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.29.0.tgz",
+      "integrity": "sha512-FijqlqMA7DmRdg/aINBSs04y8XNTYw/lr1gJ2WsmBnnaNw1iS43EPkJW+zK7z65auG3AWRFXWj+NcTQwYptUog==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1310,13 +1309,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.28.5.tgz",
-      "integrity": "sha512-20NUVgOrinudkIBzQ2bNxP08YpKprUkRTiRSd2/Z5GOdPImJGkoN4Z7IQe1T5AdyKI1i5L6RBmluqdSzvaq9/w==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.29.0.tgz",
+      "integrity": "sha512-jlaRT5dJtMaMCV6fAuLbsQMSwz/QkvaHOHOSXRitGGwSpR1blCY4KUKoyP2tYO8vJcqYe8cEj96cqSztv3uF9w==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-module-imports": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
         "babel-plugin-polyfill-corejs2": "^0.4.14",
         "babel-plugin-polyfill-corejs3": "^0.13.0",
         "babel-plugin-polyfill-regenerator": "^0.6.5",
@@ -1345,12 +1344,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.27.1.tgz",
-      "integrity": "sha512-kpb3HUqaILBJcRFVhFUs6Trdd4mkrzcGXss+6/mxUd273PfbWqSDHRzMT2234gIg2QYfAjvXLSquP1xECSg09Q==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.28.6.tgz",
+      "integrity": "sha512-9U4QObUC0FtJl05AsUcodau/RWDytrU6uKgkxu09mLR9HLDAtUMoPuuskm5huQsoktmsYpI+bGmq+iapDcriKA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.28.6",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
       },
       "engines": {
@@ -1469,37 +1468,36 @@
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
       "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
-      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz",
+      "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/parser": "^7.27.2",
-        "@babel/types": "^7.27.1"
+        "@babel/code-frame": "^7.28.6",
+        "@babel/parser": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.5.tgz",
-      "integrity": "sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz",
+      "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/generator": "^7.28.5",
+        "@babel/code-frame": "^7.29.0",
+        "@babel/generator": "^7.29.0",
         "@babel/helper-globals": "^7.28.0",
-        "@babel/parser": "^7.28.5",
-        "@babel/template": "^7.27.2",
-        "@babel/types": "^7.28.5",
+        "@babel/parser": "^7.29.0",
+        "@babel/template": "^7.28.6",
+        "@babel/types": "^7.29.0",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -1526,9 +1524,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
-      "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
+      "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
@@ -1754,51 +1752,221 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@expo/cli": {
+      "version": "54.0.23",
+      "resolved": "https://registry.npmjs.org/@expo/cli/-/cli-54.0.23.tgz",
+      "integrity": "sha512-km0h72SFfQCmVycH/JtPFTVy69w6Lx1cHNDmfLfQqgKFYeeHTjx7LVDP4POHCtNxFP2UeRazrygJhlh4zz498g==",
+      "license": "MIT",
+      "dependencies": {
+        "@0no-co/graphql.web": "^1.0.8",
+        "@expo/code-signing-certificates": "^0.0.6",
+        "@expo/config": "~12.0.13",
+        "@expo/config-plugins": "~54.0.4",
+        "@expo/devcert": "^1.2.1",
+        "@expo/env": "~2.0.8",
+        "@expo/image-utils": "^0.8.8",
+        "@expo/json-file": "^10.0.8",
+        "@expo/metro": "~54.2.0",
+        "@expo/metro-config": "~54.0.14",
+        "@expo/osascript": "^2.3.8",
+        "@expo/package-manager": "^1.9.10",
+        "@expo/plist": "^0.4.8",
+        "@expo/prebuild-config": "^54.0.8",
+        "@expo/schema-utils": "^0.1.8",
+        "@expo/spawn-async": "^1.7.2",
+        "@expo/ws-tunnel": "^1.0.1",
+        "@expo/xcpretty": "^4.3.0",
+        "@react-native/dev-middleware": "0.81.5",
+        "@urql/core": "^5.0.6",
+        "@urql/exchange-retry": "^1.3.0",
+        "accepts": "^1.3.8",
+        "arg": "^5.0.2",
+        "better-opn": "~3.0.2",
+        "bplist-creator": "0.1.0",
+        "bplist-parser": "^0.3.1",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.3.0",
+        "compression": "^1.7.4",
+        "connect": "^3.7.0",
+        "debug": "^4.3.4",
+        "env-editor": "^0.4.1",
+        "expo-server": "^1.0.5",
+        "freeport-async": "^2.0.0",
+        "getenv": "^2.0.0",
+        "glob": "^13.0.0",
+        "lan-network": "^0.1.6",
+        "minimatch": "^9.0.0",
+        "node-forge": "^1.3.3",
+        "npm-package-arg": "^11.0.0",
+        "ora": "^3.4.0",
+        "picomatch": "^3.0.1",
+        "pretty-bytes": "^5.6.0",
+        "pretty-format": "^29.7.0",
+        "progress": "^2.0.3",
+        "prompts": "^2.3.2",
+        "qrcode-terminal": "0.11.0",
+        "require-from-string": "^2.0.2",
+        "requireg": "^0.2.2",
+        "resolve": "^1.22.2",
+        "resolve-from": "^5.0.0",
+        "resolve.exports": "^2.0.3",
+        "semver": "^7.6.0",
+        "send": "^0.19.0",
+        "slugify": "^1.3.4",
+        "source-map-support": "~0.5.21",
+        "stacktrace-parser": "^0.1.10",
+        "structured-headers": "^0.4.1",
+        "tar": "^7.5.2",
+        "terminal-link": "^2.1.1",
+        "undici": "^6.18.2",
+        "wrap-ansi": "^7.0.0",
+        "ws": "^8.12.1"
+      },
+      "bin": {
+        "expo-internal": "build/bin/cli"
+      },
+      "peerDependencies": {
+        "expo": "*",
+        "expo-router": "*",
+        "react-native": "*"
+      },
+      "peerDependenciesMeta": {
+        "expo-router": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@expo/cli/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@expo/cli/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@expo/cli/node_modules/minimatch": {
+      "version": "9.0.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@expo/cli/node_modules/picomatch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz",
+      "integrity": "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/@expo/cli/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@expo/cli/node_modules/ws": {
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz",
+      "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@expo/code-signing-certificates": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/@expo/code-signing-certificates/-/code-signing-certificates-0.0.5.tgz",
-      "integrity": "sha512-BNhXkY1bblxKZpltzAx98G2Egj9g1Q+JRcvR7E99DOj862FTCX+ZPsAUtPTr7aHxwtrL7+fL3r0JSmM9kBm+Bw==",
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/@expo/code-signing-certificates/-/code-signing-certificates-0.0.6.tgz",
+      "integrity": "sha512-iNe0puxwBNEcuua9gmTGzq+SuMDa0iATai1FlFTMHJ/vUmKvN/V//drXoLJkVb5i5H3iE/n/qIJxyoBnXouD0w==",
       "license": "MIT",
       "dependencies": {
-        "node-forge": "^1.2.1",
-        "nullthrows": "^1.1.1"
+        "node-forge": "^1.3.3"
       }
     },
     "node_modules/@expo/config": {
-      "version": "12.0.10",
-      "resolved": "https://registry.npmjs.org/@expo/config/-/config-12.0.10.tgz",
-      "integrity": "sha512-lJMof5Nqakq1DxGYlghYB/ogSBjmv4Fxn1ovyDmcjlRsQdFCXgu06gEUogkhPtc9wBt9WlTTfqENln5HHyLW6w==",
+      "version": "12.0.13",
+      "resolved": "https://registry.npmjs.org/@expo/config/-/config-12.0.13.tgz",
+      "integrity": "sha512-Cu52arBa4vSaupIWsF0h7F/Cg//N374nYb7HAxV0I4KceKA7x2UXpYaHOL7EEYYvp7tZdThBjvGpVmr8ScIvaQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "~7.10.4",
-        "@expo/config-plugins": "~54.0.2",
-        "@expo/config-types": "^54.0.8",
-        "@expo/json-file": "^10.0.7",
+        "@expo/config-plugins": "~54.0.4",
+        "@expo/config-types": "^54.0.10",
+        "@expo/json-file": "^10.0.8",
         "deepmerge": "^4.3.1",
         "getenv": "^2.0.0",
-        "glob": "^10.4.2",
+        "glob": "^13.0.0",
         "require-from-string": "^2.0.2",
         "resolve-from": "^5.0.0",
         "resolve-workspace-root": "^2.0.0",
         "semver": "^7.6.0",
         "slugify": "^1.3.4",
-        "sucrase": "3.35.0"
+        "sucrase": "~3.35.1"
       }
     },
     "node_modules/@expo/config-plugins": {
-      "version": "54.0.2",
-      "resolved": "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-54.0.2.tgz",
-      "integrity": "sha512-jD4qxFcURQUVsUFGMcbo63a/AnviK8WUGard+yrdQE3ZrB/aurn68SlApjirQQLEizhjI5Ar2ufqflOBlNpyPg==",
+      "version": "54.0.4",
+      "resolved": "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-54.0.4.tgz",
+      "integrity": "sha512-g2yXGICdoOw5i3LkQSDxl2Q5AlQCrG7oniu0pCPPO+UxGb7He4AFqSvPSy8HpRUj55io17hT62FTjYRD+d6j3Q==",
       "license": "MIT",
       "dependencies": {
-        "@expo/config-types": "^54.0.8",
-        "@expo/json-file": "~10.0.7",
-        "@expo/plist": "^0.4.7",
+        "@expo/config-types": "^54.0.10",
+        "@expo/json-file": "~10.0.8",
+        "@expo/plist": "^0.4.8",
         "@expo/sdk-runtime-versions": "^1.0.0",
         "chalk": "^4.1.2",
         "debug": "^4.3.5",
         "getenv": "^2.0.0",
-        "glob": "^10.4.2",
+        "glob": "^13.0.0",
         "resolve-from": "^5.0.0",
         "semver": "^7.5.4",
         "slash": "^3.0.0",
@@ -1808,9 +1976,9 @@
       }
     },
     "node_modules/@expo/config-plugins/node_modules/semver": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -1820,9 +1988,9 @@
       }
     },
     "node_modules/@expo/config-types": {
-      "version": "54.0.8",
-      "resolved": "https://registry.npmjs.org/@expo/config-types/-/config-types-54.0.8.tgz",
-      "integrity": "sha512-lyIn/x/Yz0SgHL7IGWtgTLg6TJWC9vL7489++0hzCHZ4iGjVcfZmPTUfiragZ3HycFFj899qN0jlhl49IHa94A==",
+      "version": "54.0.10",
+      "resolved": "https://registry.npmjs.org/@expo/config-types/-/config-types-54.0.10.tgz",
+      "integrity": "sha512-/J16SC2an1LdtCZ67xhSkGXpALYUVUNyZws7v+PVsFZxClYehDSoKLqyRaGkpHlYrCc08bS0RF5E0JV6g50psA==",
       "license": "MIT"
     },
     "node_modules/@expo/config/node_modules/@babel/code-frame": {
@@ -1835,9 +2003,9 @@
       }
     },
     "node_modules/@expo/config/node_modules/semver": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -1847,14 +2015,13 @@
       }
     },
     "node_modules/@expo/devcert": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@expo/devcert/-/devcert-1.2.0.tgz",
-      "integrity": "sha512-Uilcv3xGELD5t/b0eM4cxBFEKQRIivB3v7i+VhWLV/gL98aw810unLKKJbGAxAIhY6Ipyz8ChWibFsKFXYwstA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@expo/devcert/-/devcert-1.2.1.tgz",
+      "integrity": "sha512-qC4eaxmKMTmJC2ahwyui6ud8f3W60Ss7pMkpBq40Hu3zyiAaugPXnZ24145U7K36qO9UHdZUVxsCvIpz2RYYCA==",
       "license": "MIT",
       "dependencies": {
         "@expo/sudo-prompt": "^9.3.1",
-        "debug": "^3.1.0",
-        "glob": "^10.4.2"
+        "debug": "^3.1.0"
       }
     },
     "node_modules/@expo/devcert/node_modules/debug": {
@@ -1867,9 +2034,9 @@
       }
     },
     "node_modules/@expo/devtools": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/@expo/devtools/-/devtools-0.1.7.tgz",
-      "integrity": "sha512-dfIa9qMyXN+0RfU6SN4rKeXZyzKWsnz6xBSDccjL4IRiE+fQ0t84zg0yxgN4t/WK2JU5v6v4fby7W7Crv9gJvA==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/@expo/devtools/-/devtools-0.1.8.tgz",
+      "integrity": "sha512-SVLxbuanDjJPgc0sy3EfXUMLb/tXzp6XIHkhtPVmTWJAp+FOr6+5SeiCfJrCzZFet0Ifyke2vX3sFcKwEvCXwQ==",
       "license": "MIT",
       "dependencies": {
         "chalk": "^4.1.2"
@@ -1888,9 +2055,9 @@
       }
     },
     "node_modules/@expo/env": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@expo/env/-/env-2.0.7.tgz",
-      "integrity": "sha512-BNETbLEohk3HQ2LxwwezpG8pq+h7Fs7/vAMP3eAtFT1BCpprLYoBBFZH7gW4aqGfqOcVP4Lc91j014verrYNGg==",
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/@expo/env/-/env-2.0.11.tgz",
+      "integrity": "sha512-xV+ps6YCW7XIPVUwFVCRN2nox09dnRwy8uIjwHWTODu0zFw4kp4omnVkl0OOjuu2XOe7tdgAHxikrkJt9xB/7Q==",
       "license": "MIT",
       "dependencies": {
         "chalk": "^4.0.0",
@@ -1901,9 +2068,9 @@
       }
     },
     "node_modules/@expo/fingerprint": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/@expo/fingerprint/-/fingerprint-0.15.2.tgz",
-      "integrity": "sha512-mA3weHEOd9B3mbDLNDKmAcFWo3kqsAJqPne7uMJndheKXPbRw15bV+ajAGBYZh2SS37xixLJ5eDpuc+Wr6jJtw==",
+      "version": "0.15.4",
+      "resolved": "https://registry.npmjs.org/@expo/fingerprint/-/fingerprint-0.15.4.tgz",
+      "integrity": "sha512-eYlxcrGdR2/j2M6pEDXo9zU9KXXF1vhP+V+Tl+lyY+bU8lnzrN6c637mz6Ye3em2ANy8hhUR03Raf8VsT9Ogng==",
       "license": "MIT",
       "dependencies": {
         "@expo/spawn-async": "^1.7.2",
@@ -1911,7 +2078,7 @@
         "chalk": "^4.1.2",
         "debug": "^4.3.4",
         "getenv": "^2.0.0",
-        "glob": "^10.4.2",
+        "glob": "^13.0.0",
         "ignore": "^5.3.1",
         "minimatch": "^9.0.0",
         "p-limit": "^3.1.0",
@@ -1932,12 +2099,12 @@
       }
     },
     "node_modules/@expo/fingerprint/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "version": "9.0.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
       "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "brace-expansion": "^2.0.2"
       },
       "engines": {
         "node": ">=16 || 14 >=14.17"
@@ -1947,230 +2114,475 @@
       }
     },
     "node_modules/@expo/fingerprint/node_modules/semver": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=10"
+      }
+    },
+    "node_modules/@expo/image-utils": {
+      "version": "0.8.12",
+      "resolved": "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.8.12.tgz",
+      "integrity": "sha512-3KguH7kyKqq7pNwLb9j6BBdD/bjmNwXZG/HPWT6GWIXbwrvAJt2JNyYTP5agWJ8jbbuys1yuCzmkX+TU6rmI7A==",
+      "license": "MIT",
+      "dependencies": {
+        "@expo/spawn-async": "^1.7.2",
+        "chalk": "^4.0.0",
+        "getenv": "^2.0.0",
+        "jimp-compact": "0.16.1",
+        "parse-png": "^2.1.0",
+        "resolve-from": "^5.0.0",
+        "semver": "^7.6.0"
+      }
+    },
+    "node_modules/@expo/image-utils/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@expo/json-file": {
+      "version": "10.0.12",
+      "resolved": "https://registry.npmjs.org/@expo/json-file/-/json-file-10.0.12.tgz",
+      "integrity": "sha512-inbDycp1rMAelAofg7h/mMzIe+Owx6F7pur3XdQ3EPTy00tme+4P6FWgHKUcjN8dBSrnbRNpSyh5/shzHyVCyQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.20.0",
+        "json5": "^2.2.3"
+      }
+    },
+    "node_modules/@expo/metro": {
+      "version": "54.2.0",
+      "resolved": "https://registry.npmjs.org/@expo/metro/-/metro-54.2.0.tgz",
+      "integrity": "sha512-h68TNZPGsk6swMmLm9nRSnE2UXm48rWwgcbtAHVMikXvbxdS41NDHHeqg1rcQ9AbznDRp6SQVC2MVpDnsRKU1w==",
+      "license": "MIT",
+      "dependencies": {
+        "metro": "0.83.3",
+        "metro-babel-transformer": "0.83.3",
+        "metro-cache": "0.83.3",
+        "metro-cache-key": "0.83.3",
+        "metro-config": "0.83.3",
+        "metro-core": "0.83.3",
+        "metro-file-map": "0.83.3",
+        "metro-minify-terser": "0.83.3",
+        "metro-resolver": "0.83.3",
+        "metro-runtime": "0.83.3",
+        "metro-source-map": "0.83.3",
+        "metro-symbolicate": "0.83.3",
+        "metro-transform-plugins": "0.83.3",
+        "metro-transform-worker": "0.83.3"
+      }
+    },
+    "node_modules/@expo/metro-config": {
+      "version": "54.0.14",
+      "resolved": "https://registry.npmjs.org/@expo/metro-config/-/metro-config-54.0.14.tgz",
+      "integrity": "sha512-hxpLyDfOR4L23tJ9W1IbJJsG7k4lv2sotohBm/kTYyiG+pe1SYCAWsRmgk+H42o/wWf/HQjE5k45S5TomGLxNA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.20.0",
+        "@babel/core": "^7.20.0",
+        "@babel/generator": "^7.20.5",
+        "@expo/config": "~12.0.13",
+        "@expo/env": "~2.0.8",
+        "@expo/json-file": "~10.0.8",
+        "@expo/metro": "~54.2.0",
+        "@expo/spawn-async": "^1.7.2",
+        "browserslist": "^4.25.0",
+        "chalk": "^4.1.0",
+        "debug": "^4.3.2",
+        "dotenv": "~16.4.5",
+        "dotenv-expand": "~11.0.6",
+        "getenv": "^2.0.0",
+        "glob": "^13.0.0",
+        "hermes-parser": "^0.29.1",
+        "jsc-safe-url": "^0.2.4",
+        "lightningcss": "^1.30.1",
+        "minimatch": "^9.0.0",
+        "postcss": "~8.4.32",
+        "resolve-from": "^5.0.0"
+      },
+      "peerDependencies": {
+        "expo": "*"
+      },
+      "peerDependenciesMeta": {
+        "expo": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@expo/metro-config/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@expo/metro-config/node_modules/minimatch": {
+      "version": "9.0.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@expo/metro-runtime": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/@expo/metro-runtime/-/metro-runtime-6.1.2.tgz",
+      "integrity": "sha512-nvM+Qv45QH7pmYvP8JB1G8JpScrWND3KrMA6ZKe62cwwNiX/BjHU28Ear0v/4bQWXlOY0mv6B8CDIm8JxXde9g==",
+      "license": "MIT",
+      "dependencies": {
+        "anser": "^1.4.9",
+        "pretty-format": "^29.7.0",
+        "stacktrace-parser": "^0.1.10",
+        "whatwg-fetch": "^3.0.0"
+      },
+      "peerDependencies": {
+        "expo": "*",
+        "react": "*",
+        "react-dom": "*",
+        "react-native": "*"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@expo/metro/node_modules/hermes-estree": {
+      "version": "0.32.0",
+      "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.32.0.tgz",
+      "integrity": "sha512-KWn3BqnlDOl97Xe1Yviur6NbgIZ+IP+UVSpshlZWkq+EtoHg6/cwiDj/osP9PCEgFE15KBm1O55JRwbMEm5ejQ==",
+      "license": "MIT"
+    },
+    "node_modules/@expo/metro/node_modules/hermes-parser": {
+      "version": "0.32.0",
+      "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.32.0.tgz",
+      "integrity": "sha512-g4nBOWFpuiTqjR3LZdRxKUkij9iyveWeuks7INEsMX741f3r9xxrOe8TeQfUxtda0eXmiIFiMQzoeSQEno33Hw==",
+      "license": "MIT",
+      "dependencies": {
+        "hermes-estree": "0.32.0"
+      }
+    },
+    "node_modules/@expo/metro/node_modules/metro": {
+      "version": "0.83.3",
+      "resolved": "https://registry.npmjs.org/metro/-/metro-0.83.3.tgz",
+      "integrity": "sha512-+rP+/GieOzkt97hSJ0MrPOuAH/jpaS21ZDvL9DJ35QYRDlQcwzcvUlGUf79AnQxq/2NPiS/AULhhM4TKutIt8Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/core": "^7.25.2",
+        "@babel/generator": "^7.25.0",
+        "@babel/parser": "^7.25.3",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.3",
+        "@babel/types": "^7.25.2",
+        "accepts": "^1.3.7",
+        "chalk": "^4.0.0",
+        "ci-info": "^2.0.0",
+        "connect": "^3.6.5",
+        "debug": "^4.4.0",
+        "error-stack-parser": "^2.0.6",
+        "flow-enums-runtime": "^0.0.6",
+        "graceful-fs": "^4.2.4",
+        "hermes-parser": "0.32.0",
+        "image-size": "^1.0.2",
+        "invariant": "^2.2.4",
+        "jest-worker": "^29.7.0",
+        "jsc-safe-url": "^0.2.2",
+        "lodash.throttle": "^4.1.1",
+        "metro-babel-transformer": "0.83.3",
+        "metro-cache": "0.83.3",
+        "metro-cache-key": "0.83.3",
+        "metro-config": "0.83.3",
+        "metro-core": "0.83.3",
+        "metro-file-map": "0.83.3",
+        "metro-resolver": "0.83.3",
+        "metro-runtime": "0.83.3",
+        "metro-source-map": "0.83.3",
+        "metro-symbolicate": "0.83.3",
+        "metro-transform-plugins": "0.83.3",
+        "metro-transform-worker": "0.83.3",
+        "mime-types": "^2.1.27",
+        "nullthrows": "^1.1.1",
+        "serialize-error": "^2.1.0",
+        "source-map": "^0.5.6",
+        "throat": "^5.0.0",
+        "ws": "^7.5.10",
+        "yargs": "^17.6.2"
+      },
+      "bin": {
+        "metro": "src/cli.js"
+      },
+      "engines": {
+        "node": ">=20.19.4"
+      }
+    },
+    "node_modules/@expo/metro/node_modules/metro-babel-transformer": {
+      "version": "0.83.3",
+      "resolved": "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.83.3.tgz",
+      "integrity": "sha512-1vxlvj2yY24ES1O5RsSIvg4a4WeL7PFXgKOHvXTXiW0deLvQr28ExXj6LjwCCDZ4YZLhq6HddLpZnX4dEdSq5g==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.25.2",
+        "flow-enums-runtime": "^0.0.6",
+        "hermes-parser": "0.32.0",
+        "nullthrows": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=20.19.4"
+      }
+    },
+    "node_modules/@expo/metro/node_modules/metro-cache": {
+      "version": "0.83.3",
+      "resolved": "https://registry.npmjs.org/metro-cache/-/metro-cache-0.83.3.tgz",
+      "integrity": "sha512-3jo65X515mQJvKqK3vWRblxDEcgY55Sk3w4xa6LlfEXgQ9g1WgMh9m4qVZVwgcHoLy0a2HENTPCCX4Pk6s8c8Q==",
+      "license": "MIT",
+      "dependencies": {
+        "exponential-backoff": "^3.1.1",
+        "flow-enums-runtime": "^0.0.6",
+        "https-proxy-agent": "^7.0.5",
+        "metro-core": "0.83.3"
+      },
+      "engines": {
+        "node": ">=20.19.4"
       }
     },
-    "node_modules/@expo/image-utils": {
-      "version": "0.8.7",
-      "resolved": "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.8.7.tgz",
-      "integrity": "sha512-SXOww4Wq3RVXLyOaXiCCuQFguCDh8mmaHBv54h/R29wGl4jRY8GEyQEx8SypV/iHt1FbzsU/X3Qbcd9afm2W2w==",
+    "node_modules/@expo/metro/node_modules/metro-cache-key": {
+      "version": "0.83.3",
+      "resolved": "https://registry.npmjs.org/metro-cache-key/-/metro-cache-key-0.83.3.tgz",
+      "integrity": "sha512-59ZO049jKzSmvBmG/B5bZ6/dztP0ilp0o988nc6dpaDsU05Cl1c/lRf+yx8m9WW/JVgbmfO5MziBU559XjI5Zw==",
       "license": "MIT",
       "dependencies": {
-        "@expo/spawn-async": "^1.7.2",
-        "chalk": "^4.0.0",
-        "getenv": "^2.0.0",
-        "jimp-compact": "0.16.1",
-        "parse-png": "^2.1.0",
-        "resolve-from": "^5.0.0",
-        "resolve-global": "^1.0.0",
-        "semver": "^7.6.0",
-        "temp-dir": "~2.0.0",
-        "unique-string": "~2.0.0"
+        "flow-enums-runtime": "^0.0.6"
+      },
+      "engines": {
+        "node": ">=20.19.4"
       }
     },
-    "node_modules/@expo/image-utils/node_modules/semver": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+    "node_modules/@expo/metro/node_modules/metro-config": {
+      "version": "0.83.3",
+      "resolved": "https://registry.npmjs.org/metro-config/-/metro-config-0.83.3.tgz",
+      "integrity": "sha512-mTel7ipT0yNjKILIan04bkJkuCzUUkm2SeEaTads8VfEecCh+ltXchdq6DovXJqzQAXuR2P9cxZB47Lg4klriA==",
+      "license": "MIT",
+      "dependencies": {
+        "connect": "^3.6.5",
+        "flow-enums-runtime": "^0.0.6",
+        "jest-validate": "^29.7.0",
+        "metro": "0.83.3",
+        "metro-cache": "0.83.3",
+        "metro-core": "0.83.3",
+        "metro-runtime": "0.83.3",
+        "yaml": "^2.6.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=20.19.4"
       }
     },
-    "node_modules/@expo/json-file": {
-      "version": "10.0.7",
-      "resolved": "https://registry.npmjs.org/@expo/json-file/-/json-file-10.0.7.tgz",
-      "integrity": "sha512-z2OTC0XNO6riZu98EjdNHC05l51ySeTto6GP7oSQrCvQgG9ARBwD1YvMQaVZ9wU7p/4LzSf1O7tckL3B45fPpw==",
+    "node_modules/@expo/metro/node_modules/metro-core": {
+      "version": "0.83.3",
+      "resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.83.3.tgz",
+      "integrity": "sha512-M+X59lm7oBmJZamc96usuF1kusd5YimqG/q97g4Ac7slnJ3YiGglW5CsOlicTR5EWf8MQFxxjDoB6ytTqRe8Hw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "~7.10.4",
-        "json5": "^2.2.3"
+        "flow-enums-runtime": "^0.0.6",
+        "lodash.throttle": "^4.1.1",
+        "metro-resolver": "0.83.3"
+      },
+      "engines": {
+        "node": ">=20.19.4"
       }
     },
-    "node_modules/@expo/json-file/node_modules/@babel/code-frame": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+    "node_modules/@expo/metro/node_modules/metro-file-map": {
+      "version": "0.83.3",
+      "resolved": "https://registry.npmjs.org/metro-file-map/-/metro-file-map-0.83.3.tgz",
+      "integrity": "sha512-jg5AcyE0Q9Xbbu/4NAwwZkmQn7doJCKGW0SLeSJmzNB9Z24jBe0AL2PHNMy4eu0JiKtNWHz9IiONGZWq7hjVTA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.10.4"
+        "debug": "^4.4.0",
+        "fb-watchman": "^2.0.0",
+        "flow-enums-runtime": "^0.0.6",
+        "graceful-fs": "^4.2.4",
+        "invariant": "^2.2.4",
+        "jest-worker": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "nullthrows": "^1.1.1",
+        "walker": "^1.0.7"
+      },
+      "engines": {
+        "node": ">=20.19.4"
       }
     },
-    "node_modules/@expo/mcp-tunnel": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/@expo/mcp-tunnel/-/mcp-tunnel-0.0.8.tgz",
-      "integrity": "sha512-6261obzt6h9TQb6clET7Fw4Ig4AY2hfTNKI3gBt0gcTNxZipwMg8wER7ssDYieA9feD/FfPTuCPYFcR280aaWA==",
+    "node_modules/@expo/metro/node_modules/metro-minify-terser": {
+      "version": "0.83.3",
+      "resolved": "https://registry.npmjs.org/metro-minify-terser/-/metro-minify-terser-0.83.3.tgz",
+      "integrity": "sha512-O2BmfWj6FSfzBLrNCXt/rr2VYZdX5i6444QJU0fFoc7Ljg+Q+iqebwE3K0eTvkI6TRjELsXk1cjU+fXwAR4OjQ==",
       "license": "MIT",
       "dependencies": {
-        "ws": "^8.18.3",
-        "zod": "^3.25.76",
-        "zod-to-json-schema": "^3.24.6"
-      },
-      "peerDependencies": {
-        "@modelcontextprotocol/sdk": "^1.13.2"
+        "flow-enums-runtime": "^0.0.6",
+        "terser": "^5.15.0"
       },
-      "peerDependenciesMeta": {
-        "@modelcontextprotocol/sdk": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=20.19.4"
       }
     },
-    "node_modules/@expo/mcp-tunnel/node_modules/ws": {
-      "version": "8.18.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
-      "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
+    "node_modules/@expo/metro/node_modules/metro-resolver": {
+      "version": "0.83.3",
+      "resolved": "https://registry.npmjs.org/metro-resolver/-/metro-resolver-0.83.3.tgz",
+      "integrity": "sha512-0js+zwI5flFxb1ktmR///bxHYg7OLpRpWZlBBruYG8OKYxeMP7SV0xQ/o/hUelrEMdK4LJzqVtHAhBm25LVfAQ==",
       "license": "MIT",
-      "engines": {
-        "node": ">=10.0.0"
+      "dependencies": {
+        "flow-enums-runtime": "^0.0.6"
       },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
+      "engines": {
+        "node": ">=20.19.4"
+      }
+    },
+    "node_modules/@expo/metro/node_modules/metro-runtime": {
+      "version": "0.83.3",
+      "resolved": "https://registry.npmjs.org/metro-runtime/-/metro-runtime-0.83.3.tgz",
+      "integrity": "sha512-JHCJb9ebr9rfJ+LcssFYA2x1qPYuSD/bbePupIGhpMrsla7RCwC/VL3yJ9cSU+nUhU4c9Ixxy8tBta+JbDeZWw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.25.0",
+        "flow-enums-runtime": "^0.0.6"
       },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=20.19.4"
       }
     },
-    "node_modules/@expo/metro": {
-      "version": "54.1.0",
-      "resolved": "https://registry.npmjs.org/@expo/metro/-/metro-54.1.0.tgz",
-      "integrity": "sha512-MgdeRNT/LH0v1wcO0TZp9Qn8zEF0X2ACI0wliPtv5kXVbXWI+yK9GyrstwLAiTXlULKVIg3HVSCCvmLu0M3tnw==",
+    "node_modules/@expo/metro/node_modules/metro-source-map": {
+      "version": "0.83.3",
+      "resolved": "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.83.3.tgz",
+      "integrity": "sha512-xkC3qwUBh2psVZgVavo8+r2C9Igkk3DibiOXSAht1aYRRcztEZNFtAMtfSB7sdO2iFMx2Mlyu++cBxz/fhdzQg==",
       "license": "MIT",
       "dependencies": {
-        "metro": "0.83.2",
-        "metro-babel-transformer": "0.83.2",
-        "metro-cache": "0.83.2",
-        "metro-cache-key": "0.83.2",
-        "metro-config": "0.83.2",
-        "metro-core": "0.83.2",
-        "metro-file-map": "0.83.2",
-        "metro-resolver": "0.83.2",
-        "metro-runtime": "0.83.2",
-        "metro-source-map": "0.83.2",
-        "metro-transform-plugins": "0.83.2",
-        "metro-transform-worker": "0.83.2"
+        "@babel/traverse": "^7.25.3",
+        "@babel/traverse--for-generate-function-map": "npm:@babel/traverse@^7.25.3",
+        "@babel/types": "^7.25.2",
+        "flow-enums-runtime": "^0.0.6",
+        "invariant": "^2.2.4",
+        "metro-symbolicate": "0.83.3",
+        "nullthrows": "^1.1.1",
+        "ob1": "0.83.3",
+        "source-map": "^0.5.6",
+        "vlq": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=20.19.4"
       }
     },
-    "node_modules/@expo/metro-config": {
-      "version": "54.0.8",
-      "resolved": "https://registry.npmjs.org/@expo/metro-config/-/metro-config-54.0.8.tgz",
-      "integrity": "sha512-rCkDQ8IT6sgcGNy48O2cTE4NlazCAgAIsD5qBsNPJLZSS0XbaILvAgGsFt/4nrx0GMGj6iQcOn5ifwV4NssTmw==",
+    "node_modules/@expo/metro/node_modules/metro-symbolicate": {
+      "version": "0.83.3",
+      "resolved": "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.83.3.tgz",
+      "integrity": "sha512-F/YChgKd6KbFK3eUR5HdUsfBqVsanf5lNTwFd4Ca7uuxnHgBC3kR/Hba/RGkenR3pZaGNp5Bu9ZqqP52Wyhomw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.20.0",
-        "@babel/core": "^7.20.0",
-        "@babel/generator": "^7.20.5",
-        "@expo/config": "~12.0.10",
-        "@expo/env": "~2.0.7",
-        "@expo/json-file": "~10.0.7",
-        "@expo/metro": "~54.1.0",
-        "@expo/spawn-async": "^1.7.2",
-        "browserslist": "^4.25.0",
-        "chalk": "^4.1.0",
-        "debug": "^4.3.2",
-        "dotenv": "~16.4.5",
-        "dotenv-expand": "~11.0.6",
-        "getenv": "^2.0.0",
-        "glob": "^10.4.2",
-        "hermes-parser": "^0.29.1",
-        "jsc-safe-url": "^0.2.4",
-        "lightningcss": "^1.30.1",
-        "minimatch": "^9.0.0",
-        "postcss": "~8.4.32",
-        "resolve-from": "^5.0.0"
+        "flow-enums-runtime": "^0.0.6",
+        "invariant": "^2.2.4",
+        "metro-source-map": "0.83.3",
+        "nullthrows": "^1.1.1",
+        "source-map": "^0.5.6",
+        "vlq": "^1.0.0"
       },
-      "peerDependencies": {
-        "expo": "*"
+      "bin": {
+        "metro-symbolicate": "src/index.js"
       },
-      "peerDependenciesMeta": {
-        "expo": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=20.19.4"
       }
     },
-    "node_modules/@expo/metro-config/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+    "node_modules/@expo/metro/node_modules/metro-transform-plugins": {
+      "version": "0.83.3",
+      "resolved": "https://registry.npmjs.org/metro-transform-plugins/-/metro-transform-plugins-0.83.3.tgz",
+      "integrity": "sha512-eRGoKJU6jmqOakBMH5kUB7VitEWiNrDzBHpYbkBXW7C5fUGeOd2CyqrosEzbMK5VMiZYyOcNFEphvxk3OXey2A==",
       "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0"
+        "@babel/core": "^7.25.2",
+        "@babel/generator": "^7.25.0",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.3",
+        "flow-enums-runtime": "^0.0.6",
+        "nullthrows": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=20.19.4"
       }
     },
-    "node_modules/@expo/metro-config/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "license": "ISC",
+    "node_modules/@expo/metro/node_modules/metro-transform-worker": {
+      "version": "0.83.3",
+      "resolved": "https://registry.npmjs.org/metro-transform-worker/-/metro-transform-worker-0.83.3.tgz",
+      "integrity": "sha512-Ztekew9t/gOIMZX1tvJOgX7KlSLL5kWykl0Iwu2cL2vKMKVALRl1hysyhUw0vjpAvLFx+Kfq9VLjnHIkW32fPA==",
+      "license": "MIT",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "@babel/core": "^7.25.2",
+        "@babel/generator": "^7.25.0",
+        "@babel/parser": "^7.25.3",
+        "@babel/types": "^7.25.2",
+        "flow-enums-runtime": "^0.0.6",
+        "metro": "0.83.3",
+        "metro-babel-transformer": "0.83.3",
+        "metro-cache": "0.83.3",
+        "metro-cache-key": "0.83.3",
+        "metro-minify-terser": "0.83.3",
+        "metro-source-map": "0.83.3",
+        "metro-transform-plugins": "0.83.3",
+        "nullthrows": "^1.1.1"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": ">=20.19.4"
       }
     },
-    "node_modules/@expo/metro-runtime": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/@expo/metro-runtime/-/metro-runtime-6.1.2.tgz",
-      "integrity": "sha512-nvM+Qv45QH7pmYvP8JB1G8JpScrWND3KrMA6ZKe62cwwNiX/BjHU28Ear0v/4bQWXlOY0mv6B8CDIm8JxXde9g==",
+    "node_modules/@expo/metro/node_modules/ob1": {
+      "version": "0.83.3",
+      "resolved": "https://registry.npmjs.org/ob1/-/ob1-0.83.3.tgz",
+      "integrity": "sha512-egUxXCDwoWG06NGCS5s5AdcpnumHKJlfd3HH06P3m9TEMwwScfcY35wpQxbm9oHof+dM/lVH9Rfyu1elTVelSA==",
       "license": "MIT",
       "dependencies": {
-        "anser": "^1.4.9",
-        "pretty-format": "^29.7.0",
-        "stacktrace-parser": "^0.1.10",
-        "whatwg-fetch": "^3.0.0"
-      },
-      "peerDependencies": {
-        "expo": "*",
-        "react": "*",
-        "react-dom": "*",
-        "react-native": "*"
+        "flow-enums-runtime": "^0.0.6"
       },
-      "peerDependenciesMeta": {
-        "react-dom": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=20.19.4"
       }
     },
     "node_modules/@expo/osascript": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/@expo/osascript/-/osascript-2.3.7.tgz",
-      "integrity": "sha512-IClSOXxR0YUFxIriUJVqyYki7lLMIHrrzOaP01yxAL1G8pj2DWV5eW1y5jSzIcIfSCNhtGsshGd1tU/AYup5iQ==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/@expo/osascript/-/osascript-2.4.2.tgz",
+      "integrity": "sha512-/XP7PSYF2hzOZzqfjgkoWtllyeTN8dW3aM4P6YgKcmmPikKL5FdoyQhti4eh6RK5a5VrUXJTOlTNIpIHsfB5Iw==",
       "license": "MIT",
       "dependencies": {
-        "@expo/spawn-async": "^1.7.2",
-        "exec-async": "^2.2.0"
+        "@expo/spawn-async": "^1.7.2"
       },
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@expo/package-manager": {
-      "version": "1.9.8",
-      "resolved": "https://registry.npmjs.org/@expo/package-manager/-/package-manager-1.9.8.tgz",
-      "integrity": "sha512-4/I6OWquKXYnzo38pkISHCOCOXxfeEmu4uDoERq1Ei/9Ur/s9y3kLbAamEkitUkDC7gHk1INxRWEfFNzGbmOrA==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/@expo/package-manager/-/package-manager-1.10.3.tgz",
+      "integrity": "sha512-ZuXiK/9fCrIuLjPSe1VYmfp0Sa85kCMwd8QQpgyi5ufppYKRtLBg14QOgUqj8ZMbJTxE0xqzd0XR7kOs3vAK9A==",
       "license": "MIT",
       "dependencies": {
-        "@expo/json-file": "^10.0.7",
+        "@expo/json-file": "^10.0.12",
         "@expo/spawn-async": "^1.7.2",
         "chalk": "^4.0.0",
         "npm-package-arg": "^11.0.0",
@@ -2179,9 +2591,9 @@
       }
     },
     "node_modules/@expo/plist": {
-      "version": "0.4.7",
-      "resolved": "https://registry.npmjs.org/@expo/plist/-/plist-0.4.7.tgz",
-      "integrity": "sha512-dGxqHPvCZKeRKDU1sJZMmuyVtcASuSYh1LPFVaM1DuffqPL36n6FMEL0iUqq2Tx3xhWk8wCnWl34IKplUjJDdA==",
+      "version": "0.4.8",
+      "resolved": "https://registry.npmjs.org/@expo/plist/-/plist-0.4.8.tgz",
+      "integrity": "sha512-pfNtErGGzzRwHP+5+RqswzPDKkZrx+Cli0mzjQaus1ZWFsog5ibL+nVT3NcporW51o8ggnt7x813vtRbPiyOrQ==",
       "license": "MIT",
       "dependencies": {
         "@xmldom/xmldom": "^0.8.8",
@@ -2190,16 +2602,16 @@
       }
     },
     "node_modules/@expo/prebuild-config": {
-      "version": "54.0.6",
-      "resolved": "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-54.0.6.tgz",
-      "integrity": "sha512-xowuMmyPNy+WTNq+YX0m0EFO/Knc68swjThk4dKivgZa8zI1UjvFXOBIOp8RX4ljCXLzwxQJM5oBBTvyn+59ZA==",
+      "version": "54.0.8",
+      "resolved": "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-54.0.8.tgz",
+      "integrity": "sha512-EA7N4dloty2t5Rde+HP0IEE+nkAQiu4A/+QGZGT9mFnZ5KKjPPkqSyYcRvP5bhQE10D+tvz6X0ngZpulbMdbsg==",
       "license": "MIT",
       "dependencies": {
-        "@expo/config": "~12.0.10",
-        "@expo/config-plugins": "~54.0.2",
-        "@expo/config-types": "^54.0.8",
-        "@expo/image-utils": "^0.8.7",
-        "@expo/json-file": "^10.0.7",
+        "@expo/config": "~12.0.13",
+        "@expo/config-plugins": "~54.0.4",
+        "@expo/config-types": "^54.0.10",
+        "@expo/image-utils": "^0.8.8",
+        "@expo/json-file": "^10.0.8",
         "@react-native/normalize-colors": "0.81.5",
         "debug": "^4.3.1",
         "resolve-from": "^5.0.0",
@@ -2211,9 +2623,9 @@
       }
     },
     "node_modules/@expo/prebuild-config/node_modules/semver": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -2223,9 +2635,9 @@
       }
     },
     "node_modules/@expo/schema-utils": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/@expo/schema-utils/-/schema-utils-0.1.7.tgz",
-      "integrity": "sha512-jWHoSuwRb5ZczjahrychMJ3GWZu54jK9ulNdh1d4OzAEq672K9E5yOlnlBsfIHWHGzUAT+0CL7Yt1INiXTz68g==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/@expo/schema-utils/-/schema-utils-0.1.8.tgz",
+      "integrity": "sha512-9I6ZqvnAvKKDiO+ZF8BpQQFYWXOJvTAL5L/227RUbWG1OVZDInFifzCBiqAZ3b67NRfeAgpgvbA7rejsqhY62A==",
       "license": "MIT"
     },
     "node_modules/@expo/sdk-runtime-versions": {
@@ -2270,29 +2682,19 @@
       "license": "MIT"
     },
     "node_modules/@expo/xcpretty": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/@expo/xcpretty/-/xcpretty-4.3.2.tgz",
-      "integrity": "sha512-ReZxZ8pdnoI3tP/dNnJdnmAk7uLT4FjsKDGW7YeDdvdOMz2XCQSmSCM9IWlrXuWtMF9zeSB6WJtEhCQ41gQOfw==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@expo/xcpretty/-/xcpretty-4.4.1.tgz",
+      "integrity": "sha512-KZNxZvnGCtiM2aYYZ6Wz0Ix5r47dAvpNLApFtZWnSoERzAdOMzVBOPysBoM0JlF6FKWZ8GPqgn6qt3dV/8Zlpg==",
       "license": "BSD-3-Clause",
       "dependencies": {
-        "@babel/code-frame": "7.10.4",
+        "@babel/code-frame": "^7.20.0",
         "chalk": "^4.1.0",
-        "find-up": "^5.0.0",
         "js-yaml": "^4.1.0"
       },
       "bin": {
         "excpretty": "build/cli.js"
       }
     },
-    "node_modules/@expo/xcpretty/node_modules/@babel/code-frame": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
     "node_modules/@humanfs/core": {
       "version": "0.19.1",
       "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
@@ -2345,23 +2747,6 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@isaacs/cliui": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
-      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
-      "license": "ISC",
-      "dependencies": {
-        "string-width": "^5.1.2",
-        "string-width-cjs": "npm:string-width@^4.2.0",
-        "strip-ansi": "^7.0.1",
-        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
-        "wrap-ansi": "^8.1.0",
-        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@isaacs/fs-minipass": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
@@ -2706,16 +3091,6 @@
         "node": ">=12.4.0"
       }
     },
-    "node_modules/@pkgjs/parseargs": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
-      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
-      "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/@radix-ui/primitive": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.3.tgz",
@@ -3163,12 +3538,12 @@
       }
     },
     "node_modules/@react-navigation/core": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-7.13.0.tgz",
-      "integrity": "sha512-Fc/SO23HnlGnkou/z8JQUzwEMvhxuUhr4rdPTIZp/c8q1atq3k632Nfh8fEiGtk+MP1wtIvXdN2a5hBIWpLq3g==",
+      "version": "7.15.1",
+      "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-7.15.1.tgz",
+      "integrity": "sha512-Fqr6qxfZJIC4ewho7LtTa9zz6hcOzohX7D1lcDfrkGaYkS5xBwEZViGNxCJK/czUc74ua8NThyrObQFjB6Q/RQ==",
       "license": "MIT",
       "dependencies": {
-        "@react-navigation/routers": "^7.5.1",
+        "@react-navigation/routers": "^7.5.3",
         "escape-string-regexp": "^4.0.0",
         "fast-deep-equal": "^3.1.3",
         "nanoid": "^3.3.11",
@@ -3182,9 +3557,9 @@
       }
     },
     "node_modules/@react-navigation/elements": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-2.8.0.tgz",
-      "integrity": "sha512-uvSOkYOF7wfgkt57cl+6fZ2vQgTiYYyJleZzuWthPKHK4nDq2M4sc9SSzgK9GS9UCJFRBErNtl3S+/ErtrwREw==",
+      "version": "2.9.8",
+      "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-2.9.8.tgz",
+      "integrity": "sha512-3gpwUmVnDJYvK9nFmAA/YXw0hmT/C/lZx8RkRMK+ux9l1T+32EWnQFnn34Wa1BMDX8HN2r64yrlW93DIzKI7Uw==",
       "license": "MIT",
       "dependencies": {
         "color": "^4.2.3",
@@ -3193,7 +3568,7 @@
       },
       "peerDependencies": {
         "@react-native-masked-view/masked-view": ">= 0.2.0",
-        "@react-navigation/native": "^7.1.19",
+        "@react-navigation/native": "^7.1.31",
         "react": ">= 18.2.0",
         "react-native": "*",
         "react-native-safe-area-context": ">= 4.0.0"
@@ -3205,13 +3580,12 @@
       }
     },
     "node_modules/@react-navigation/native": {
-      "version": "7.1.19",
-      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-7.1.19.tgz",
-      "integrity": "sha512-fM7q8di4Q8sp2WUhiUWOe7bEDRyRhbzsKQOd5N2k+lHeCx3UncsRYuw4Q/KN0EovM3wWKqMMmhy/YWuEO04kgw==",
+      "version": "7.1.31",
+      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-7.1.31.tgz",
+      "integrity": "sha512-+YCUwtfDgsux59Q0LDHc3Zid9ih93ecUCFWZOH6/+eNoUGnWx77wjS6ZfvBO/7E+EiIup11IVShDzCHR4of8hw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "@react-navigation/core": "^7.13.0",
+        "@react-navigation/core": "^7.15.1",
         "escape-string-regexp": "^4.0.0",
         "fast-deep-equal": "^3.1.3",
         "nanoid": "^3.3.11",
@@ -3223,18 +3597,18 @@
       }
     },
     "node_modules/@react-navigation/native-stack": {
-      "version": "7.6.1",
-      "resolved": "https://registry.npmjs.org/@react-navigation/native-stack/-/native-stack-7.6.1.tgz",
-      "integrity": "sha512-JbYhLzZD6dHv23bGYusToaOlsdEdMgL/QtKEhwV9fEKgFNoDvkZlak8rTPJUrOlC56QwMOPe1vLG83udlNeVYQ==",
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@react-navigation/native-stack/-/native-stack-7.14.2.tgz",
+      "integrity": "sha512-/nKxFAFSUSGV+NSXrXXcWEcGAHdyp8RyWjoGMDzVPdBhjCLblVSgHWx5y4mm+k0de9V1pkjsftUaroP7rQckzw==",
       "license": "MIT",
       "dependencies": {
-        "@react-navigation/elements": "^2.8.0",
+        "@react-navigation/elements": "^2.9.8",
         "color": "^4.2.3",
         "sf-symbols-typescript": "^2.1.0",
         "warn-once": "^0.1.1"
       },
       "peerDependencies": {
-        "@react-navigation/native": "^7.1.19",
+        "@react-navigation/native": "^7.1.31",
         "react": ">= 18.2.0",
         "react-native": "*",
         "react-native-safe-area-context": ">= 4.0.0",
@@ -3242,9 +3616,9 @@
       }
     },
     "node_modules/@react-navigation/routers": {
-      "version": "7.5.1",
-      "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-7.5.1.tgz",
-      "integrity": "sha512-pxipMW/iEBSUrjxz2cDD7fNwkqR4xoi0E/PcfTQGCcdJwLoaxzab5kSadBLj1MTJyT0YRrOXL9umHpXtp+Dv4w==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-7.5.3.tgz",
+      "integrity": "sha512-1tJHg4KKRJuQ1/EvJxatrMef3NZXEPzwUIUZ3n1yJ2t7Q97siwRtbynRpQG9/69ebbtiZ8W3ScOZF/OmhvM4Rg==",
       "license": "MIT",
       "dependencies": {
         "nanoid": "^3.3.11"
@@ -3408,7 +3782,6 @@
       "integrity": "sha512-Qec1E3mhALmaspIrhWt9jkQMNdw6bReVu64mjvhbhq2NFPftLPVr+l1SZgmw/66WwBNpDh7ao5AT6gF5v41PFA==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "csstype": "^3.0.2"
       }
@@ -3480,7 +3853,6 @@
       "integrity": "sha512-BnOroVl1SgrPLywqxyqdJ4l3S2MsKVLDVxZvjI1Eoe8ev2r3kGDo+PcMihNmDE+6/KjkTubSJnmqGZZjQSBq/g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.46.2",
         "@typescript-eslint/types": "8.46.2",
@@ -4043,7 +4415,6 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4455,13 +4826,13 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.14",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.14.tgz",
-      "integrity": "sha512-Co2Y9wX854ts6U8gAAPXfn0GmAyctHuK8n0Yhfjd6t30g7yvKjspvvOo9yG+z52PZRgFErt7Ka2pYnXCjLKEpg==",
+      "version": "0.4.15",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.15.tgz",
+      "integrity": "sha512-hR3GwrRwHUfYwGfrisXPIDP3JcYfBrW7wKE7+Au6wDYl7fm/ka1NEII6kORzxNU556JjfidZeBsO10kYvtV1aw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.27.7",
-        "@babel/helper-define-polyfill-provider": "^0.6.5",
+        "@babel/compat-data": "^7.28.6",
+        "@babel/helper-define-polyfill-provider": "^0.6.6",
         "semver": "^6.3.1"
       },
       "peerDependencies": {
@@ -4482,12 +4853,12 @@
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.5.tgz",
-      "integrity": "sha512-ISqQ2frbiNU9vIJkzg7dlPpznPZ4jOiUQ1uSmB0fEHeowtN3COYRsXr/xexn64NpU13P06jc/L5TgiJXOgrbEg==",
+      "version": "0.6.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.6.tgz",
+      "integrity": "sha512-hYm+XLYRMvupxiQzrvXUj7YyvFFVfv5gI0R71AJzudg1g2AI2vyCPPIFEBjk162/wFzti3inBHo7isWFuEVS/A==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.5"
+        "@babel/helper-define-polyfill-provider": "^0.6.6"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -4553,9 +4924,9 @@
       }
     },
     "node_modules/babel-preset-expo": {
-      "version": "54.0.6",
-      "resolved": "https://registry.npmjs.org/babel-preset-expo/-/babel-preset-expo-54.0.6.tgz",
-      "integrity": "sha512-GxJfwnuOPQJbzDe5WASJZdNQiukLw7i9z+Lh6JQWkUHXsShHyQrqgiKE55MD/KaP9VqJ70yZm7bYqOu8zwcWqQ==",
+      "version": "54.0.10",
+      "resolved": "https://registry.npmjs.org/babel-preset-expo/-/babel-preset-expo-54.0.10.tgz",
+      "integrity": "sha512-wTt7POavLFypLcPW/uC5v8y+mtQKDJiyGLzYCjqr9tx0Qc3vCXcDKk1iCFIj/++Iy5CWhhTflEa7VvVPNWeCfw==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-module-imports": "^7.25.9",
@@ -4694,9 +5065,9 @@
       }
     },
     "node_modules/bplist-parser": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.1.tgz",
-      "integrity": "sha512-PyJxiNtA5T2PlLIeBot4lbp7rj4OadzjnMZD/G5zuBNt8ei/yCU7+wW0h2bag9vr8c+/WuRWmSxbqAl9hL1rBA==",
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.2.tgz",
+      "integrity": "sha512-apC2+fspHGI3mMKj+dGevkGo/tCqVB8jMb6i+OX+E29p0Iposz07fABkRIfVUPNd5A5VbuOz1bZbnmkKLYF+wQ==",
       "license": "MIT",
       "dependencies": {
         "big-integer": "1.6.x"
@@ -4728,9 +5099,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.27.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.27.0.tgz",
-      "integrity": "sha512-AXVQwdhot1eqLihwasPElhX2tAZiBjWdJ9i/Zcj2S6QYIjkx62OKSfnobkriB81C3l4w0rVy3Nt4jaTBltYEpw==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz",
+      "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==",
       "funding": [
         {
           "type": "opencollective",
@@ -4746,13 +5117,12 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "baseline-browser-mapping": "^2.8.19",
-        "caniuse-lite": "^1.0.30001751",
-        "electron-to-chromium": "^1.5.238",
-        "node-releases": "^2.0.26",
-        "update-browserslist-db": "^1.1.4"
+        "baseline-browser-mapping": "^2.9.0",
+        "caniuse-lite": "^1.0.30001759",
+        "electron-to-chromium": "^1.5.263",
+        "node-releases": "^2.0.27",
+        "update-browserslist-db": "^1.2.0"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -4881,9 +5251,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001751",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001751.tgz",
-      "integrity": "sha512-A0QJhug0Ly64Ii3eIqHu5X51ebln3k4yTUkY1j8drqpWHVreg/VLijN48cZ1bYPiqOQuqpkIKnzr/Ul8V+p6Cw==",
+      "version": "1.0.30001774",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001774.tgz",
+      "integrity": "sha512-DDdwPGz99nmIEv216hKSgLD+D4ikHQHjBC/seF98N9CPqRX4M5mSxT9eTV6oyisnJcuzxtZy4n17yKKQYmYQOA==",
       "funding": [
         {
           "type": "opencollective",
@@ -4996,35 +5366,15 @@
     "node_modules/cliui": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "license": "ISC",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/cliui/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "license": "MIT"
-    },
-    "node_modules/cliui/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "license": "MIT",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "license": "ISC",
       "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
     "node_modules/cliui/node_modules/strip-ansi": {
@@ -5039,23 +5389,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/cliui/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
     "node_modules/clone": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
@@ -5224,12 +5557,12 @@
       "license": "MIT"
     },
     "node_modules/core-js-compat": {
-      "version": "3.46.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.46.0.tgz",
-      "integrity": "sha512-p9hObIIEENxSV8xIu+V68JjSeARg6UVMG5mR+JEUguG3sI6MsiS1njz2jHmyJDvA+8jX/sytkBHup6kxhM9law==",
+      "version": "3.48.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.48.0.tgz",
+      "integrity": "sha512-OM4cAF3D6VtH/WkLtWvyNC56EZVXsZdU3iqaMG2B4WvYrlqU831pc4UtG5yp0sE9z8Y02wVN7PjW5Zf9Gt0f1Q==",
       "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.26.3"
+        "browserslist": "^4.28.1"
       },
       "funding": {
         "type": "opencollective",
@@ -5259,15 +5592,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/css-in-js-utils": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/css-in-js-utils/-/css-in-js-utils-3.1.0.tgz",
@@ -5543,12 +5867,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/eastasianwidth": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "license": "MIT"
-    },
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -5556,15 +5874,15 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.243",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.243.tgz",
-      "integrity": "sha512-ZCphxFW3Q1TVhcgS9blfut1PX8lusVi2SvXQgmEEnK4TCmE1JhH2JkjJN+DNt0pJJwfBri5AROBnz2b/C+YU9g==",
+      "version": "1.5.302",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.302.tgz",
+      "integrity": "sha512-sM6HAN2LyK82IyPBpznDRqlTQAtuSaO+ShzFiWTvoMJLHyZ+Y39r8VMfHzwbU8MVBzQ4Wdn85+wlZl2TLGIlwg==",
       "license": "ISC"
     },
     "node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "license": "MIT"
     },
     "node_modules/encodeurl": {
@@ -5800,7 +6118,6 @@
       "integrity": "sha512-t5aPOpmtJcZcz5UJyY2GbvpDlsK5E8JqRqoKtfiKE3cNh437KIqfJr3A3AKf5k64NPx6d0G3dno6XDY05PqPtw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -5997,7 +6314,6 @@
       "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.9",
@@ -6225,37 +6541,30 @@
         "node": ">=6"
       }
     },
-    "node_modules/exec-async": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/exec-async/-/exec-async-2.2.0.tgz",
-      "integrity": "sha512-87OpwcEiMia/DeiKFzaQNBNFeN3XkkpYIh9FyOqq5mS2oKv3CBE67PXoEKcr6nodWdXNogTiQ0jE2NGuoffXPw==",
-      "license": "MIT"
-    },
     "node_modules/expo": {
-      "version": "54.0.21",
-      "resolved": "https://registry.npmjs.org/expo/-/expo-54.0.21.tgz",
-      "integrity": "sha512-I3kzMNW/43a71pt6hT0Zebd2zAPIMMeucUDDEdfUKYrzzTRwISZfVAv0dp8GWKHHDjZsy+FjE4RQCMdyKmiDeQ==",
+      "version": "54.0.33",
+      "resolved": "https://registry.npmjs.org/expo/-/expo-54.0.33.tgz",
+      "integrity": "sha512-3yOEfAKqo+gqHcV8vKcnq0uA5zxlohnhA3fu4G43likN8ct5ZZ3LjAh9wDdKteEkoad3tFPvwxmXW711S5OHUw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.20.0",
-        "@expo/cli": "54.0.14",
-        "@expo/config": "~12.0.10",
-        "@expo/config-plugins": "~54.0.2",
-        "@expo/devtools": "0.1.7",
-        "@expo/fingerprint": "0.15.2",
-        "@expo/metro": "~54.1.0",
-        "@expo/metro-config": "54.0.8",
+        "@expo/cli": "54.0.23",
+        "@expo/config": "~12.0.13",
+        "@expo/config-plugins": "~54.0.4",
+        "@expo/devtools": "0.1.8",
+        "@expo/fingerprint": "0.15.4",
+        "@expo/metro": "~54.2.0",
+        "@expo/metro-config": "54.0.14",
         "@expo/vector-icons": "^15.0.3",
         "@ungap/structured-clone": "^1.3.0",
-        "babel-preset-expo": "~54.0.6",
-        "expo-asset": "~12.0.9",
-        "expo-constants": "~18.0.10",
-        "expo-file-system": "~19.0.17",
-        "expo-font": "~14.0.9",
-        "expo-keep-awake": "~15.0.7",
-        "expo-modules-autolinking": "3.0.19",
-        "expo-modules-core": "3.0.23",
+        "babel-preset-expo": "~54.0.10",
+        "expo-asset": "~12.0.12",
+        "expo-constants": "~18.0.13",
+        "expo-file-system": "~19.0.21",
+        "expo-font": "~14.0.11",
+        "expo-keep-awake": "~15.0.8",
+        "expo-modules-autolinking": "3.0.24",
+        "expo-modules-core": "3.0.29",
         "pretty-format": "^29.7.0",
         "react-refresh": "^0.14.2",
         "whatwg-url-without-unicode": "8.0.0-3"
@@ -6285,13 +6594,13 @@
       }
     },
     "node_modules/expo-asset": {
-      "version": "12.0.9",
-      "resolved": "https://registry.npmjs.org/expo-asset/-/expo-asset-12.0.9.tgz",
-      "integrity": "sha512-vrdRoyhGhBmd0nJcssTSk1Ypx3Mbn/eXaaBCQVkL0MJ8IOZpAObAjfD5CTy8+8RofcHEQdh3wwZVCs7crvfOeg==",
+      "version": "12.0.12",
+      "resolved": "https://registry.npmjs.org/expo-asset/-/expo-asset-12.0.12.tgz",
+      "integrity": "sha512-CsXFCQbx2fElSMn0lyTdRIyKlSXOal6ilLJd+yeZ6xaC7I9AICQgscY5nj0QcwgA+KYYCCEQEBndMsmj7drOWQ==",
       "license": "MIT",
       "dependencies": {
-        "@expo/image-utils": "^0.8.7",
-        "expo-constants": "~18.0.9"
+        "@expo/image-utils": "^0.8.8",
+        "expo-constants": "~18.0.12"
       },
       "peerDependencies": {
         "expo": "*",
@@ -6300,9 +6609,9 @@
       }
     },
     "node_modules/expo-camera": {
-      "version": "17.0.9",
-      "resolved": "https://registry.npmjs.org/expo-camera/-/expo-camera-17.0.9.tgz",
-      "integrity": "sha512-KgticPGurqEsaPBIwbG0T6mzAVnqZasDdM/6OoJt5zPh6tWB09+th6cBF1WafIBMPy8AWbfyUQSqQXqOrNJClg==",
+      "version": "17.0.10",
+      "resolved": "https://registry.npmjs.org/expo-camera/-/expo-camera-17.0.10.tgz",
+      "integrity": "sha512-w1RBw83mAGVk4BPPwNrCZyFop0VLiVSRE3c2V9onWbdFwonpRhzmB4drygG8YOUTl1H3wQvALJHyMPTbgsK1Jg==",
       "license": "MIT",
       "dependencies": {
         "invariant": "^2.2.4"
@@ -6320,14 +6629,13 @@
       }
     },
     "node_modules/expo-constants": {
-      "version": "18.0.10",
-      "resolved": "https://registry.npmjs.org/expo-constants/-/expo-constants-18.0.10.tgz",
-      "integrity": "sha512-Rhtv+X974k0Cahmvx6p7ER5+pNhBC0XbP1lRviL2J1Xl4sT2FBaIuIxF/0I0CbhOsySf0ksqc5caFweAy9Ewiw==",
+      "version": "18.0.13",
+      "resolved": "https://registry.npmjs.org/expo-constants/-/expo-constants-18.0.13.tgz",
+      "integrity": "sha512-FnZn12E1dRYKDHlAdIyNFhBurKTS3F9CrfrBDJI5m3D7U17KBHMQ6JEfYlSj7LG7t+Ulr+IKaj58L1k5gBwTcQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "@expo/config": "~12.0.10",
-        "@expo/env": "~2.0.7"
+        "@expo/config": "~12.0.13",
+        "@expo/env": "~2.0.8"
       },
       "peerDependencies": {
         "expo": "*",
@@ -6335,9 +6643,9 @@
       }
     },
     "node_modules/expo-file-system": {
-      "version": "19.0.17",
-      "resolved": "https://registry.npmjs.org/expo-file-system/-/expo-file-system-19.0.17.tgz",
-      "integrity": "sha512-WwaS01SUFrxBnExn87pg0sCTJjZpf2KAOzfImG0o8yhkU7fbYpihpl/oocXBEsNbj58a8hVt1Y4CVV5c1tzu/g==",
+      "version": "19.0.21",
+      "resolved": "https://registry.npmjs.org/expo-file-system/-/expo-file-system-19.0.21.tgz",
+      "integrity": "sha512-s3DlrDdiscBHtab/6W1osrjGL+C2bvoInPJD7sOwmxfJ5Woynv2oc+Fz1/xVXaE/V7HE/+xrHC/H45tu6lZzzg==",
       "license": "MIT",
       "peerDependencies": {
         "expo": "*",
@@ -6345,11 +6653,10 @@
       }
     },
     "node_modules/expo-font": {
-      "version": "14.0.9",
-      "resolved": "https://registry.npmjs.org/expo-font/-/expo-font-14.0.9.tgz",
-      "integrity": "sha512-xCoQbR/36qqB6tew/LQ6GWICpaBmHLhg/Loix5Rku/0ZtNaXMJv08M9o1AcrdiGTn/Xf/BnLu6DgS45cWQEHZg==",
+      "version": "14.0.11",
+      "resolved": "https://registry.npmjs.org/expo-font/-/expo-font-14.0.11.tgz",
+      "integrity": "sha512-ga0q61ny4s/kr4k8JX9hVH69exVSIfcIc19+qZ7gt71Mqtm7xy2c6kwsPTCyhBW2Ro5yXTT8EaZOpuRi35rHbg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fontfaceobserver": "^2.1.0"
       },
@@ -6360,18 +6667,18 @@
       }
     },
     "node_modules/expo-haptics": {
-      "version": "15.0.7",
-      "resolved": "https://registry.npmjs.org/expo-haptics/-/expo-haptics-15.0.7.tgz",
-      "integrity": "sha512-7flWsYPrwjJxZ8x82RiJtzsnk1Xp9ahnbd9PhCy3NnsemyMApoWIEUr4waPqFr80DtiLZfhD9VMLL1CKa8AImQ==",
+      "version": "15.0.8",
+      "resolved": "https://registry.npmjs.org/expo-haptics/-/expo-haptics-15.0.8.tgz",
+      "integrity": "sha512-lftutojy8Qs8zaDzzjwM3gKHFZ8bOOEZDCkmh2Ddpe95Ra6kt2izeOfOfKuP/QEh0MZ1j9TfqippyHdRd1ZM9g==",
       "license": "MIT",
       "peerDependencies": {
         "expo": "*"
       }
     },
     "node_modules/expo-image": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/expo-image/-/expo-image-3.0.10.tgz",
-      "integrity": "sha512-i4qNCEf9Ur7vDqdfDdFfWnNCAF2efDTdahuDy9iELPS2nzMKBLeeGA2KxYEPuRylGCS96Rwm+SOZJu6INc2ADQ==",
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/expo-image/-/expo-image-3.0.11.tgz",
+      "integrity": "sha512-4TudfUCLgYgENv+f48omnU8tjS2S0Pd9EaON5/s1ZUBRwZ7K8acEr4NfvLPSaeXvxW24iLAiyQ7sV7BXQH3RoA==",
       "license": "MIT",
       "peerDependencies": {
         "expo": "*",
@@ -6386,9 +6693,9 @@
       }
     },
     "node_modules/expo-keep-awake": {
-      "version": "15.0.7",
-      "resolved": "https://registry.npmjs.org/expo-keep-awake/-/expo-keep-awake-15.0.7.tgz",
-      "integrity": "sha512-CgBNcWVPnrIVII5G54QDqoE125l+zmqR4HR8q+MQaCfHet+dYpS5vX5zii/RMayzGN4jPgA4XYIQ28ePKFjHoA==",
+      "version": "15.0.8",
+      "resolved": "https://registry.npmjs.org/expo-keep-awake/-/expo-keep-awake-15.0.8.tgz",
+      "integrity": "sha512-YK9M1VrnoH1vLJiQzChZgzDvVimVoriibiDIFLbQMpjYBnvyfUeHJcin/Gx1a+XgupNXy92EQJLgI/9ZuXajYQ==",
       "license": "MIT",
       "peerDependencies": {
         "expo": "*",
@@ -6396,13 +6703,12 @@
       }
     },
     "node_modules/expo-linking": {
-      "version": "8.0.8",
-      "resolved": "https://registry.npmjs.org/expo-linking/-/expo-linking-8.0.8.tgz",
-      "integrity": "sha512-MyeMcbFDKhXh4sDD1EHwd0uxFQNAc6VCrwBkNvvvufUsTYFq3glTA9Y8a+x78CPpjNqwNAamu74yIaIz7IEJyg==",
+      "version": "8.0.11",
+      "resolved": "https://registry.npmjs.org/expo-linking/-/expo-linking-8.0.11.tgz",
+      "integrity": "sha512-+VSaNL5om3kOp/SSKO5qe6cFgfSIWnnQDSbA7XLs3ECkYzXRquk5unxNS3pg7eK5kNUmQ4kgLI7MhTggAEUBLA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "expo-constants": "~18.0.8",
+        "expo-constants": "~18.0.12",
         "invariant": "^2.2.4"
       },
       "peerDependencies": {
@@ -6411,15 +6717,14 @@
       }
     },
     "node_modules/expo-modules-autolinking": {
-      "version": "3.0.19",
-      "resolved": "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-3.0.19.tgz",
-      "integrity": "sha512-tSMYGnfZmAaN77X8iMLiaSgbCFnA7eh6s2ac09J2N2N0Rcf2RCE27jg0c0XenTMTWUcM4QvLhsNHof/WtlKqPw==",
+      "version": "3.0.24",
+      "resolved": "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-3.0.24.tgz",
+      "integrity": "sha512-TP+6HTwhL7orDvsz2VzauyQlXJcAWyU3ANsZ7JGL4DQu8XaZv/A41ZchbtAYLfozNA2Ya1Hzmhx65hXryBMjaQ==",
       "license": "MIT",
       "dependencies": {
         "@expo/spawn-async": "^1.7.2",
         "chalk": "^4.1.0",
         "commander": "^7.2.0",
-        "glob": "^10.4.2",
         "require-from-string": "^2.0.2",
         "resolve-from": "^5.0.0"
       },
@@ -6428,9 +6733,9 @@
       }
     },
     "node_modules/expo-modules-core": {
-      "version": "3.0.23",
-      "resolved": "https://registry.npmjs.org/expo-modules-core/-/expo-modules-core-3.0.23.tgz",
-      "integrity": "sha512-NYHi5LK/cdIyOjK9ZQAgfDPCOqER26cIbU3gzsce7YdnsmlNFR0qMfWOj9zAmaFBviC2kCkCOmitwk4357Td3Q==",
+      "version": "3.0.29",
+      "resolved": "https://registry.npmjs.org/expo-modules-core/-/expo-modules-core-3.0.29.tgz",
+      "integrity": "sha512-LzipcjGqk8gvkrOUf7O2mejNWugPkf3lmd9GkqL9WuNyeN2fRwU0Dn77e3ZUKI3k6sI+DNwjkq4Nu9fNN9WS7Q==",
       "license": "MIT",
       "dependencies": {
         "invariant": "^2.2.4"
@@ -6441,13 +6746,13 @@
       }
     },
     "node_modules/expo-router": {
-      "version": "6.0.14",
-      "resolved": "https://registry.npmjs.org/expo-router/-/expo-router-6.0.14.tgz",
-      "integrity": "sha512-vizLO4SgnMEL+PPs2dXr+etEOuksjue7yUQBCtfCEdqoDkQlB0r35zI7rS34Wt53sxKWSlM2p+038qQEpxtiFw==",
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/expo-router/-/expo-router-6.0.23.tgz",
+      "integrity": "sha512-qCxVAiCrCyu0npky6azEZ6dJDMt77OmCzEbpF6RbUTlfkaCA417LvY14SBkk0xyGruSxy/7pvJOI6tuThaUVCA==",
       "license": "MIT",
       "dependencies": {
         "@expo/metro-runtime": "^6.1.2",
-        "@expo/schema-utils": "^0.1.7",
+        "@expo/schema-utils": "^0.1.8",
         "@radix-ui/react-slot": "1.2.0",
         "@radix-ui/react-tabs": "^1.1.12",
         "@react-navigation/bottom-tabs": "^7.4.0",
@@ -6456,7 +6761,7 @@
         "client-only": "^0.0.1",
         "debug": "^4.3.4",
         "escape-string-regexp": "^4.0.0",
-        "expo-server": "^1.0.3",
+        "expo-server": "^1.0.5",
         "fast-deep-equal": "^3.1.3",
         "invariant": "^2.2.4",
         "nanoid": "^3.3.8",
@@ -6475,8 +6780,8 @@
         "@react-navigation/drawer": "^7.5.0",
         "@testing-library/react-native": ">= 12.0.0",
         "expo": "*",
-        "expo-constants": "^18.0.10",
-        "expo-linking": "^8.0.8",
+        "expo-constants": "^18.0.13",
+        "expo-linking": "^8.0.11",
         "react": "*",
         "react-dom": "*",
         "react-native": "*",
@@ -6485,7 +6790,7 @@
         "react-native-safe-area-context": ">= 5.4.0",
         "react-native-screens": "*",
         "react-native-web": "*",
-        "react-server-dom-webpack": ">= 19.0.0"
+        "react-server-dom-webpack": "~19.0.4 || ~19.1.5 || ~19.2.4"
       },
       "peerDependenciesMeta": {
         "@react-navigation/drawer": {
@@ -6694,30 +6999,30 @@
       }
     },
     "node_modules/expo-server": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/expo-server/-/expo-server-1.0.3.tgz",
-      "integrity": "sha512-SOwdzM/BFAL+vTFlUDJG6ljhyk6TyTl+LRK3ubGmN+Pf18ENRqKj37U8krc5vH926sAsB3IFcE8kJEYf4dG7PA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/expo-server/-/expo-server-1.0.5.tgz",
+      "integrity": "sha512-IGR++flYH70rhLyeXF0Phle56/k4cee87WeQ4mamS+MkVAVP+dDlOHf2nN06Z9Y2KhU0Gp1k+y61KkghF7HdhA==",
       "license": "MIT",
       "engines": {
         "node": ">=20.16.0"
       }
     },
     "node_modules/expo-splash-screen": {
-      "version": "31.0.10",
-      "resolved": "https://registry.npmjs.org/expo-splash-screen/-/expo-splash-screen-31.0.10.tgz",
-      "integrity": "sha512-i6g9IK798mae4yvflstQ1HkgahIJ6exzTCTw4vEdxV0J2SwiW3Tj+CwRjf0te7Zsb+7dDQhBTmGZwdv00VER2A==",
+      "version": "31.0.13",
+      "resolved": "https://registry.npmjs.org/expo-splash-screen/-/expo-splash-screen-31.0.13.tgz",
+      "integrity": "sha512-1epJLC1cDlwwj089R2h8cxaU5uk4ONVAC+vzGiTZH4YARQhL4Stlz1MbR6yAS173GMosvkE6CAeihR7oIbCkDA==",
       "license": "MIT",
       "dependencies": {
-        "@expo/prebuild-config": "^54.0.3"
+        "@expo/prebuild-config": "^54.0.8"
       },
       "peerDependencies": {
         "expo": "*"
       }
     },
     "node_modules/expo-status-bar": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/expo-status-bar/-/expo-status-bar-3.0.8.tgz",
-      "integrity": "sha512-L248XKPhum7tvREoS1VfE0H6dPCaGtoUWzRsUv7hGKdiB4cus33Rc0sxkWkoQ77wE8stlnUlL5lvmT0oqZ3ZBw==",
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/expo-status-bar/-/expo-status-bar-3.0.9.tgz",
+      "integrity": "sha512-xyYyVg6V1/SSOZWh4Ni3U129XHCnFHBTcUo0dhWtFDrZbNp/duw5AGsQfb2sVeU0gxWHXSY1+5F0jnKYC7WuOw==",
       "license": "MIT",
       "dependencies": {
         "react-native-is-edge-to-edge": "^1.2.1"
@@ -6728,9 +7033,9 @@
       }
     },
     "node_modules/expo-symbols": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/expo-symbols/-/expo-symbols-1.0.7.tgz",
-      "integrity": "sha512-ZqFUeTXbwO6BrE00n37wTXYfJmsjFrfB446jeB9k9w7aA8a6eugNUIzNsUIUfbFWoOiY4wrGmpLSLPBwk4PH+g==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/expo-symbols/-/expo-symbols-1.0.8.tgz",
+      "integrity": "sha512-7bNjK350PaQgxBf0owpmSYkdZIpdYYmaPttDBb2WIp6rIKtcEtdzdfmhsc2fTmjBURHYkg36+eCxBFXO25/1hw==",
       "license": "MIT",
       "dependencies": {
         "sf-symbols-typescript": "^2.0.0"
@@ -6741,9 +7046,9 @@
       }
     },
     "node_modules/expo-system-ui": {
-      "version": "6.0.8",
-      "resolved": "https://registry.npmjs.org/expo-system-ui/-/expo-system-ui-6.0.8.tgz",
-      "integrity": "sha512-DzJYqG2fibBSLzPDL4BybGCiilYOtnI1OWhcYFwoM4k0pnEzMBt1Vj8Z67bXglDDuz2HCQPGNtB3tQft5saKqQ==",
+      "version": "6.0.9",
+      "resolved": "https://registry.npmjs.org/expo-system-ui/-/expo-system-ui-6.0.9.tgz",
+      "integrity": "sha512-eQTYGzw1V4RYiYHL9xDLYID3Wsec2aZS+ypEssmF64D38aDrqbDgz1a2MSlHLQp2jHXSs3FvojhZ9FVela1Zcg==",
       "license": "MIT",
       "dependencies": {
         "@react-native/normalize-colors": "0.81.5",
@@ -6761,236 +7066,15 @@
       }
     },
     "node_modules/expo-web-browser": {
-      "version": "15.0.8",
-      "resolved": "https://registry.npmjs.org/expo-web-browser/-/expo-web-browser-15.0.8.tgz",
-      "integrity": "sha512-gn+Y2ABQr6/EvFN/XSjTuzwsSPLU1vNVVV0wNe4xXkcSnYGdHxt9kHxs9uLfoCyPByoaGF4VxzAhHIMI7yDcSg==",
+      "version": "15.0.10",
+      "resolved": "https://registry.npmjs.org/expo-web-browser/-/expo-web-browser-15.0.10.tgz",
+      "integrity": "sha512-fvDhW4bhmXAeWFNFiInmsGCK83PAqAcQaFyp/3pE/jbdKmFKoRCWr46uZGIfN4msLK/OODhaQ/+US7GSJNDHJg==",
       "license": "MIT",
       "peerDependencies": {
         "expo": "*",
         "react-native": "*"
       }
     },
-    "node_modules/expo/node_modules/@expo/cli": {
-      "version": "54.0.14",
-      "resolved": "https://registry.npmjs.org/@expo/cli/-/cli-54.0.14.tgz",
-      "integrity": "sha512-M7QW/GHx1FJg+CGgChGKerYXmCGWDskJ8S6w+8m49IBZ41CMDeWRH5snQkFoGCttF8WnzhGiX+nu69AFnEuDHQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@0no-co/graphql.web": "^1.0.8",
-        "@expo/code-signing-certificates": "^0.0.5",
-        "@expo/config": "~12.0.10",
-        "@expo/config-plugins": "~54.0.2",
-        "@expo/devcert": "^1.1.2",
-        "@expo/env": "~2.0.7",
-        "@expo/image-utils": "^0.8.7",
-        "@expo/json-file": "^10.0.7",
-        "@expo/mcp-tunnel": "~0.0.7",
-        "@expo/metro": "~54.1.0",
-        "@expo/metro-config": "~54.0.8",
-        "@expo/osascript": "^2.3.7",
-        "@expo/package-manager": "^1.9.8",
-        "@expo/plist": "^0.4.7",
-        "@expo/prebuild-config": "^54.0.6",
-        "@expo/schema-utils": "^0.1.7",
-        "@expo/spawn-async": "^1.7.2",
-        "@expo/ws-tunnel": "^1.0.1",
-        "@expo/xcpretty": "^4.3.0",
-        "@react-native/dev-middleware": "0.81.5",
-        "@urql/core": "^5.0.6",
-        "@urql/exchange-retry": "^1.3.0",
-        "accepts": "^1.3.8",
-        "arg": "^5.0.2",
-        "better-opn": "~3.0.2",
-        "bplist-creator": "0.1.0",
-        "bplist-parser": "^0.3.1",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.3.0",
-        "compression": "^1.7.4",
-        "connect": "^3.7.0",
-        "debug": "^4.3.4",
-        "env-editor": "^0.4.1",
-        "expo-server": "^1.0.3",
-        "freeport-async": "^2.0.0",
-        "getenv": "^2.0.0",
-        "glob": "^10.4.2",
-        "lan-network": "^0.1.6",
-        "minimatch": "^9.0.0",
-        "node-forge": "^1.3.1",
-        "npm-package-arg": "^11.0.0",
-        "ora": "^3.4.0",
-        "picomatch": "^3.0.1",
-        "pretty-bytes": "^5.6.0",
-        "pretty-format": "^29.7.0",
-        "progress": "^2.0.3",
-        "prompts": "^2.3.2",
-        "qrcode-terminal": "0.11.0",
-        "require-from-string": "^2.0.2",
-        "requireg": "^0.2.2",
-        "resolve": "^1.22.2",
-        "resolve-from": "^5.0.0",
-        "resolve.exports": "^2.0.3",
-        "semver": "^7.6.0",
-        "send": "^0.19.0",
-        "slugify": "^1.3.4",
-        "source-map-support": "~0.5.21",
-        "stacktrace-parser": "^0.1.10",
-        "structured-headers": "^0.4.1",
-        "tar": "^7.4.3",
-        "terminal-link": "^2.1.1",
-        "undici": "^6.18.2",
-        "wrap-ansi": "^7.0.0",
-        "ws": "^8.12.1"
-      },
-      "bin": {
-        "expo-internal": "build/bin/cli"
-      },
-      "peerDependencies": {
-        "expo": "*",
-        "expo-router": "*",
-        "react-native": "*"
-      },
-      "peerDependenciesMeta": {
-        "expo-router": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/expo/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/expo/node_modules/ci-info": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
-      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/sibiraj-s"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/expo/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "license": "MIT"
-    },
-    "node_modules/expo/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/expo/node_modules/picomatch": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz",
-      "integrity": "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/expo/node_modules/semver": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/expo/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/expo/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/expo/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/expo/node_modules/ws": {
-      "version": "8.18.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
-      "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/exponential-backoff": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.3.tgz",
@@ -7166,6 +7250,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
       "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "locate-path": "^6.0.0",
@@ -7247,22 +7332,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/foreground-child": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
-      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
-      "license": "ISC",
-      "dependencies": {
-        "cross-spawn": "^7.0.6",
-        "signal-exit": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/form-data": {
       "version": "4.0.5",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
@@ -7481,20 +7550,17 @@
       }
     },
     "node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
-      "license": "ISC",
+      "version": "13.0.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz",
+      "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
+        "minimatch": "^10.2.2",
+        "minipass": "^7.1.3",
+        "path-scurry": "^2.0.2"
       },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
+      "engines": {
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -7513,42 +7579,42 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/glob/node_modules/balanced-match": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+      "license": "MIT",
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
+    },
     "node_modules/glob/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
+      "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
       "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0"
+        "balanced-match": "^4.0.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
       }
     },
     "node_modules/glob/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "license": "ISC",
+      "version": "10.2.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
+      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "brace-expansion": "^5.0.2"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/global-dirs": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
-      "integrity": "sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg==",
-      "license": "MIT",
-      "dependencies": {
-        "ini": "^1.3.4"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/globals": {
       "version": "14.0.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
@@ -8442,21 +8508,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/jackspeak": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
-      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "@isaacs/cliui": "^8.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      },
-      "optionalDependencies": {
-        "@pkgjs/parseargs": "^0.11.0"
-      }
-    },
     "node_modules/jest-environment-node": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
@@ -8798,9 +8849,9 @@
       "license": "MIT"
     },
     "node_modules/lightningcss": {
-      "version": "1.30.2",
-      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.30.2.tgz",
-      "integrity": "sha512-utfs7Pr5uJyyvDETitgsaqSyjCb2qNRAtuqUeWIAKztsOYdcACf2KtARYXg2pSvhkt+9NfoaNY7fxjl6nuMjIQ==",
+      "version": "1.31.1",
+      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.31.1.tgz",
+      "integrity": "sha512-l51N2r93WmGUye3WuFoN5k10zyvrVs0qfKBhyC5ogUQ6Ew6JUSswh78mbSO+IU3nTWsyOArqPCcShdQSadghBQ==",
       "license": "MPL-2.0",
       "dependencies": {
         "detect-libc": "^2.0.3"
@@ -8813,23 +8864,23 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "lightningcss-android-arm64": "1.30.2",
-        "lightningcss-darwin-arm64": "1.30.2",
-        "lightningcss-darwin-x64": "1.30.2",
-        "lightningcss-freebsd-x64": "1.30.2",
-        "lightningcss-linux-arm-gnueabihf": "1.30.2",
-        "lightningcss-linux-arm64-gnu": "1.30.2",
-        "lightningcss-linux-arm64-musl": "1.30.2",
-        "lightningcss-linux-x64-gnu": "1.30.2",
-        "lightningcss-linux-x64-musl": "1.30.2",
-        "lightningcss-win32-arm64-msvc": "1.30.2",
-        "lightningcss-win32-x64-msvc": "1.30.2"
+        "lightningcss-android-arm64": "1.31.1",
+        "lightningcss-darwin-arm64": "1.31.1",
+        "lightningcss-darwin-x64": "1.31.1",
+        "lightningcss-freebsd-x64": "1.31.1",
+        "lightningcss-linux-arm-gnueabihf": "1.31.1",
+        "lightningcss-linux-arm64-gnu": "1.31.1",
+        "lightningcss-linux-arm64-musl": "1.31.1",
+        "lightningcss-linux-x64-gnu": "1.31.1",
+        "lightningcss-linux-x64-musl": "1.31.1",
+        "lightningcss-win32-arm64-msvc": "1.31.1",
+        "lightningcss-win32-x64-msvc": "1.31.1"
       }
     },
     "node_modules/lightningcss-android-arm64": {
-      "version": "1.30.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.30.2.tgz",
-      "integrity": "sha512-BH9sEdOCahSgmkVhBLeU7Hc9DWeZ1Eb6wNS6Da8igvUwAe0sqROHddIlvU06q3WyXVEOYDZ6ykBZQnjTbmo4+A==",
+      "version": "1.31.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.31.1.tgz",
+      "integrity": "sha512-HXJF3x8w9nQ4jbXRiNppBCqeZPIAfUo8zE/kOEGbW5NZvGc/K7nMxbhIr+YlFlHW5mpbg/YFPdbnCh1wAXCKFg==",
       "cpu": [
         "arm64"
       ],
@@ -8847,9 +8898,9 @@
       }
     },
     "node_modules/lightningcss-darwin-arm64": {
-      "version": "1.30.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.2.tgz",
-      "integrity": "sha512-ylTcDJBN3Hp21TdhRT5zBOIi73P6/W0qwvlFEk22fkdXchtNTOU4Qc37SkzV+EKYxLouZ6M4LG9NfZ1qkhhBWA==",
+      "version": "1.31.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.31.1.tgz",
+      "integrity": "sha512-02uTEqf3vIfNMq3h/z2cJfcOXnQ0GRwQrkmPafhueLb2h7mqEidiCzkE4gBMEH65abHRiQvhdcQ+aP0D0g67sg==",
       "cpu": [
         "arm64"
       ],
@@ -8867,9 +8918,9 @@
       }
     },
     "node_modules/lightningcss-darwin-x64": {
-      "version": "1.30.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.30.2.tgz",
-      "integrity": "sha512-oBZgKchomuDYxr7ilwLcyms6BCyLn0z8J0+ZZmfpjwg9fRVZIR5/GMXd7r9RH94iDhld3UmSjBM6nXWM2TfZTQ==",
+      "version": "1.31.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.31.1.tgz",
+      "integrity": "sha512-1ObhyoCY+tGxtsz1lSx5NXCj3nirk0Y0kB/g8B8DT+sSx4G9djitg9ejFnjb3gJNWo7qXH4DIy2SUHvpoFwfTA==",
       "cpu": [
         "x64"
       ],
@@ -8887,9 +8938,9 @@
       }
     },
     "node_modules/lightningcss-freebsd-x64": {
-      "version": "1.30.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.30.2.tgz",
-      "integrity": "sha512-c2bH6xTrf4BDpK8MoGG4Bd6zAMZDAXS569UxCAGcA7IKbHNMlhGQ89eRmvpIUGfKWNVdbhSbkQaWhEoMGmGslA==",
+      "version": "1.31.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.31.1.tgz",
+      "integrity": "sha512-1RINmQKAItO6ISxYgPwszQE1BrsVU5aB45ho6O42mu96UiZBxEXsuQ7cJW4zs4CEodPUioj/QrXW1r9pLUM74A==",
       "cpu": [
         "x64"
       ],
@@ -8907,9 +8958,9 @@
       }
     },
     "node_modules/lightningcss-linux-arm-gnueabihf": {
-      "version": "1.30.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.30.2.tgz",
-      "integrity": "sha512-eVdpxh4wYcm0PofJIZVuYuLiqBIakQ9uFZmipf6LF/HRj5Bgm0eb3qL/mr1smyXIS1twwOxNWndd8z0E374hiA==",
+      "version": "1.31.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.31.1.tgz",
+      "integrity": "sha512-OOCm2//MZJ87CdDK62rZIu+aw9gBv4azMJuA8/KB74wmfS3lnC4yoPHm0uXZ/dvNNHmnZnB8XLAZzObeG0nS1g==",
       "cpu": [
         "arm"
       ],
@@ -8927,9 +8978,9 @@
       }
     },
     "node_modules/lightningcss-linux-arm64-gnu": {
-      "version": "1.30.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.30.2.tgz",
-      "integrity": "sha512-UK65WJAbwIJbiBFXpxrbTNArtfuznvxAJw4Q2ZGlU8kPeDIWEX1dg3rn2veBVUylA2Ezg89ktszWbaQnxD/e3A==",
+      "version": "1.31.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.31.1.tgz",
+      "integrity": "sha512-WKyLWztD71rTnou4xAD5kQT+982wvca7E6QoLpoawZ1gP9JM0GJj4Tp5jMUh9B3AitHbRZ2/H3W5xQmdEOUlLg==",
       "cpu": [
         "arm64"
       ],
@@ -8947,9 +8998,9 @@
       }
     },
     "node_modules/lightningcss-linux-arm64-musl": {
-      "version": "1.30.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.30.2.tgz",
-      "integrity": "sha512-5Vh9dGeblpTxWHpOx8iauV02popZDsCYMPIgiuw97OJ5uaDsL86cnqSFs5LZkG3ghHoX5isLgWzMs+eD1YzrnA==",
+      "version": "1.31.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.31.1.tgz",
+      "integrity": "sha512-mVZ7Pg2zIbe3XlNbZJdjs86YViQFoJSpc41CbVmKBPiGmC4YrfeOyz65ms2qpAobVd7WQsbW4PdsSJEMymyIMg==",
       "cpu": [
         "arm64"
       ],
@@ -8967,9 +9018,9 @@
       }
     },
     "node_modules/lightningcss-linux-x64-gnu": {
-      "version": "1.30.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.30.2.tgz",
-      "integrity": "sha512-Cfd46gdmj1vQ+lR6VRTTadNHu6ALuw2pKR9lYq4FnhvgBc4zWY1EtZcAc6EffShbb1MFrIPfLDXD6Xprbnni4w==",
+      "version": "1.31.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.31.1.tgz",
+      "integrity": "sha512-xGlFWRMl+0KvUhgySdIaReQdB4FNudfUTARn7q0hh/V67PVGCs3ADFjw+6++kG1RNd0zdGRlEKa+T13/tQjPMA==",
       "cpu": [
         "x64"
       ],
@@ -8987,9 +9038,9 @@
       }
     },
     "node_modules/lightningcss-linux-x64-musl": {
-      "version": "1.30.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.30.2.tgz",
-      "integrity": "sha512-XJaLUUFXb6/QG2lGIW6aIk6jKdtjtcffUT0NKvIqhSBY3hh9Ch+1LCeH80dR9q9LBjG3ewbDjnumefsLsP6aiA==",
+      "version": "1.31.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.31.1.tgz",
+      "integrity": "sha512-eowF8PrKHw9LpoZii5tdZwnBcYDxRw2rRCyvAXLi34iyeYfqCQNA9rmUM0ce62NlPhCvof1+9ivRaTY6pSKDaA==",
       "cpu": [
         "x64"
       ],
@@ -9007,9 +9058,9 @@
       }
     },
     "node_modules/lightningcss-win32-arm64-msvc": {
-      "version": "1.30.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.30.2.tgz",
-      "integrity": "sha512-FZn+vaj7zLv//D/192WFFVA0RgHawIcHqLX9xuWiQt7P0PtdFEVaxgF9rjM/IRYHQXNnk61/H/gb2Ei+kUQ4xQ==",
+      "version": "1.31.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.31.1.tgz",
+      "integrity": "sha512-aJReEbSEQzx1uBlQizAOBSjcmr9dCdL3XuC/6HLXAxmtErsj2ICo5yYggg1qOODQMtnjNQv2UHb9NpOuFtYe4w==",
       "cpu": [
         "arm64"
       ],
@@ -9027,9 +9078,9 @@
       }
     },
     "node_modules/lightningcss-win32-x64-msvc": {
-      "version": "1.30.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.2.tgz",
-      "integrity": "sha512-5g1yc73p+iAkid5phb4oVFMB45417DkRevRbt/El/gKXJk4jid+vPFF/AXbxn05Aky8PapwzZrdJShv5C0avjw==",
+      "version": "1.31.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.31.1.tgz",
+      "integrity": "sha512-I9aiFrbd7oYHwlnQDqr1Roz+fTz61oDDJX7n9tYF9FJymH1cIN1DtKw3iYt6b8WZgEjoNwVSncwF4wx/ZedMhw==",
       "cpu": [
         "x64"
       ],
@@ -9056,6 +9107,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
       "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "p-locate": "^5.0.0"
@@ -9624,10 +9676,10 @@
       }
     },
     "node_modules/minipass": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-      "license": "ISC",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
+      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
+      "license": "BlueOak-1.0.0",
       "engines": {
         "node": ">=16 || 14 >=14.17"
       }
@@ -9750,9 +9802,9 @@
       }
     },
     "node_modules/node-forge": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.3.tgz",
+      "integrity": "sha512-rLvcdSyRCyouf6jcOIPe/BgwG/d7hKjzMKOas33/pHEr6gbq18IK9zV7DiPvzsz0oBJPme6qr6H6kGZuI9/DZg==",
       "license": "(BSD-3-Clause OR GPL-2.0)",
       "engines": {
         "node": ">= 6.13.0"
@@ -9795,9 +9847,9 @@
       }
     },
     "node_modules/npm-package-arg/node_modules/semver": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -10039,15 +10091,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/ora/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/ora/node_modules/ansi-styles": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -10107,18 +10150,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/ora/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/ora/node_modules/supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -10168,6 +10199,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
       "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "p-limit": "^3.0.2"
@@ -10188,12 +10220,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/package-json-from-dist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
-      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
-      "license": "BlueOak-1.0.0"
-    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -10262,26 +10288,29 @@
       "license": "MIT"
     },
     "node_modules/path-scurry": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
-      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
+      "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "lru-cache": "^10.2.0",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.18"
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "license": "ISC"
+      "version": "11.2.6",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz",
+      "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==",
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
     },
     "node_modules/picocolors": {
       "version": "1.1.1",
@@ -10599,7 +10628,6 @@
       "resolved": "https://registry.npmjs.org/react/-/react-19.1.0.tgz",
       "integrity": "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10619,7 +10647,6 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.1.0.tgz",
       "integrity": "sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "scheduler": "^0.26.0"
       },
@@ -10646,9 +10673,9 @@
       }
     },
     "node_modules/react-is": {
-      "version": "19.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.0.tgz",
-      "integrity": "sha512-x3Ax3kNSMIIkyVYhWPyO09bu0uttcAIoecO/um/rKGQ4EltYWVYtyiGkS/3xMynrbVQdS69Jhlv8FXUEZehlzA==",
+      "version": "19.2.4",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.4.tgz",
+      "integrity": "sha512-W+EWGn2v0ApPKgKKCy/7s7WHXkboGcsrXE+2joLyVxkbyVQfO3MUEaUQDHoSmb8TFFrSKYa9mw64WZHNHSDzYA==",
       "license": "MIT"
     },
     "node_modules/react-native": {
@@ -10656,7 +10683,6 @@
       "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.81.5.tgz",
       "integrity": "sha512-1w+/oSjEXZjMqsIvmkCRsOc8UBYv163bTWKTI8+1mxztvQPhCRYGTvZ/PL1w16xXHneIj/SLGfxWg2GWN2uexw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/create-cache-key-function": "^29.7.0",
         "@react-native/assets-registry": "0.81.5",
@@ -10714,7 +10740,6 @@
       "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.28.0.tgz",
       "integrity": "sha512-0msfJ1vRxXKVgTgvL+1ZOoYw3/0z1R+Ked0+udoJhyplC2jbVKIJ8Z1bzWdpQRCV3QcQ87Op0zJVE5DhKK2A0A==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@egjs/hammerjs": "^2.0.17",
         "hoist-non-react-statics": "^3.3.0",
@@ -10740,7 +10765,6 @@
       "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-4.1.3.tgz",
       "integrity": "sha512-GP8wsi1u3nqvC1fMab/m8gfFwFyldawElCcUSBJQgfrXeLmsPPUOpDw44lbLeCpcwUuLa05WTVePdTEwCLTUZg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "react-native-is-edge-to-edge": "^1.2.1",
         "semver": "7.7.2"
@@ -10769,7 +10793,6 @@
       "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-5.6.2.tgz",
       "integrity": "sha512-4XGqMNj5qjUTYywJqpdWZ9IG8jgkS3h06sfVjfw5yZQZfWnRFXczi0GnYyFyCc2EBps/qFmoCH8fez//WumdVg==",
       "license": "MIT",
-      "peer": true,
       "peerDependencies": {
         "react": "*",
         "react-native": "*"
@@ -10780,7 +10803,6 @@
       "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-4.16.0.tgz",
       "integrity": "sha512-yIAyh7F/9uWkOzCi1/2FqvNvK6Wb9Y1+Kzn16SuGfN9YFJDTbwlzGRvePCNTOX0recpLQF3kc2FmvMUhyTCH1Q==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "react-freeze": "^1.0.0",
         "react-native-is-edge-to-edge": "^1.2.1",
@@ -10796,7 +10818,6 @@
       "resolved": "https://registry.npmjs.org/react-native-web/-/react-native-web-0.21.2.tgz",
       "integrity": "sha512-SO2t9/17zM4iEnFvlu2DA9jqNbzNhoUP+AItkoCOyFmDMOhUnBBznBDCYN92fGdfAkfQlWzPoez6+zLxFNsZEg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.18.6",
         "@react-native/normalize-colors": "^0.74.1",
@@ -10829,7 +10850,6 @@
       "resolved": "https://registry.npmjs.org/react-native-worklets/-/react-native-worklets-0.5.1.tgz",
       "integrity": "sha512-lJG6Uk9YuojjEX/tQrCbcbmpdLCSFxDK1rJlkDhgqkVi1KZzG7cdcBFQRqyNOOzR9Y0CXNuldmtWTGOyM0k0+w==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/plugin-transform-arrow-functions": "^7.0.0-0",
         "@babel/plugin-transform-class-properties": "^7.0.0-0",
@@ -10940,15 +10960,14 @@
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
       "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/react-remove-scroll": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.7.1.tgz",
-      "integrity": "sha512-HpMh8+oahmIdOuS5aFKKY6Pyog+FNaZV/XyJOq7b4YFwsFHe5yYfdbIalI4k3vU2nSDql7YskmUseHsRrJqIPA==",
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.7.2.tgz",
+      "integrity": "sha512-Iqb9NjCCTt6Hf+vOdNIZGdTiH1QSqr27H/Ek9sv/a97gfueI/5h1s3yRi1nngzMUaOOToin5dI1dXKdXiF+u0Q==",
       "license": "MIT",
       "dependencies": {
         "react-remove-scroll-bar": "^2.3.7",
@@ -11186,18 +11205,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/resolve-global": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-global/-/resolve-global-1.0.0.tgz",
-      "integrity": "sha512-zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw==",
-      "license": "MIT",
-      "dependencies": {
-        "global-dirs": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/resolve-pkg-maps": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
@@ -11209,9 +11216,9 @@
       }
     },
     "node_modules/resolve-workspace-root": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-workspace-root/-/resolve-workspace-root-2.0.0.tgz",
-      "integrity": "sha512-IsaBUZETJD5WsI11Wt8PKHwaIe45or6pwNc8yflvLJ4DWtImK9kuLoH5kUva/2Mmx/RdIyr4aONNSa2v9LTJsw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-workspace-root/-/resolve-workspace-root-2.0.1.tgz",
+      "integrity": "sha512-nR23LHAvaI6aHtMg6RWoaHpdR4D881Nydkzi2CixINyg9T00KgaJdJI6Vwty+Ps8WLxZHuxsS0BseWjxSA4C+w==",
       "license": "MIT"
     },
     "node_modules/resolve.exports": {
@@ -11236,12 +11243,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/restore-cursor/node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "license": "ISC"
-    },
     "node_modules/reusify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
@@ -11390,10 +11391,13 @@
       }
     },
     "node_modules/sax": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
-      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
-      "license": "ISC"
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.4.tgz",
+      "integrity": "sha512-1n3r/tGXO6b6VXMdFT54SHzT9ytu9yr7TaELowdYpMqY/Ao7EnlQGmAQ1+RatX7Tkkdm6hONI2owqNx2aZj5Sw==",
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=11.0.0"
+      }
     },
     "node_modules/scheduler": {
       "version": "0.26.0",
@@ -11695,16 +11699,10 @@
       }
     },
     "node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "license": "ISC",
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "license": "ISC"
     },
     "node_modules/simple-plist": {
       "version": "1.3.1",
@@ -11717,6 +11715,18 @@
         "plist": "^3.0.5"
       }
     },
+    "node_modules/simple-plist/node_modules/bplist-parser": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.1.tgz",
+      "integrity": "sha512-PyJxiNtA5T2PlLIeBot4lbp7rj4OadzjnMZD/G5zuBNt8ei/yCU7+wW0h2bag9vr8c+/WuRWmSxbqAl9hL1rBA==",
+      "license": "MIT",
+      "dependencies": {
+        "big-integer": "1.6.x"
+      },
+      "engines": {
+        "node": ">= 5.10.0"
+      }
+    },
     "node_modules/simple-swizzle": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.4.tgz",
@@ -11890,24 +11900,6 @@
       }
     },
     "node_modules/string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-      "license": "MIT",
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/string-width-cjs": {
-      "name": "string-width",
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
@@ -11921,13 +11913,7 @@
         "node": ">=8"
       }
     },
-    "node_modules/string-width-cjs/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "license": "MIT"
-    },
-    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+    "node_modules/string-width/node_modules/strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
@@ -12038,43 +12024,24 @@
       }
     },
     "node_modules/strip-ansi": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
-      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "node_modules/strip-ansi-cjs": {
-      "name": "strip-ansi",
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^5.0.1"
+        "ansi-regex": "^4.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
       }
     },
     "node_modules/strip-ansi/node_modules/ansi-regex": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
-      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
       "license": "MIT",
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+        "node": ">=6"
       }
     },
     "node_modules/strip-bom": {
@@ -12113,17 +12080,17 @@
       "license": "MIT"
     },
     "node_modules/sucrase": {
-      "version": "3.35.0",
-      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",
-      "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==",
+      "version": "3.35.1",
+      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.1.tgz",
+      "integrity": "sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.2",
         "commander": "^4.0.0",
-        "glob": "^10.3.10",
         "lines-and-columns": "^1.1.6",
         "mz": "^2.7.0",
         "pirates": "^4.0.1",
+        "tinyglobby": "^0.2.11",
         "ts-interface-checker": "^0.1.9"
       },
       "bin": {
@@ -12181,10 +12148,10 @@
       }
     },
     "node_modules/tar": {
-      "version": "7.5.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.1.tgz",
-      "integrity": "sha512-nlGpxf+hv0v7GkWBK2V9spgactGOp0qvfWRxUMjqHyzrt3SgwE48DIv/FhqPHJYLHpgW1opq3nERbz5Anq7n1g==",
-      "license": "ISC",
+      "version": "7.5.9",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.9.tgz",
+      "integrity": "sha512-BTLcK0xsDh2+PUe9F6c2TlRp4zOOBMTkoQHQIWSIzI0R7KG46uEwq4OPk2W7bZcprBMsuaeFsqwYr7pjh6CuHg==",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
         "@isaacs/fs-minipass": "^4.0.0",
         "chownr": "^3.0.0",
@@ -12205,15 +12172,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/temp-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz",
-      "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/terminal-link": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
@@ -12320,7 +12278,6 @@
       "version": "0.2.15",
       "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
       "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "fdir": "^6.5.0",
@@ -12337,7 +12294,6 @@
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
       "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12.0.0"
@@ -12355,9 +12311,7 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-      "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -12564,7 +12518,6 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -12619,9 +12572,9 @@
       }
     },
     "node_modules/undici": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-6.22.0.tgz",
-      "integrity": "sha512-hU/10obOIu62MGYjdskASR3CUAiYaFTtC9Pa6vHyf//mAipSvSQg6od2CnJswq7fvzNS3zJhxoRkgNVaHurWKw==",
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-6.23.0.tgz",
+      "integrity": "sha512-VfQPToRA5FZs/qJxLIinmU59u0r7LXqoJkCzinq3ckNJp3vKEh7jTWN589YQ5+aoAC/TGRLyJLCPKcLQbM8r9g==",
       "license": "MIT",
       "engines": {
         "node": ">=18.17"
@@ -12673,18 +12626,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/unique-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-      "license": "MIT",
-      "dependencies": {
-        "crypto-random-string": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -12730,9 +12671,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.4.tgz",
-      "integrity": "sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
+      "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
       "funding": [
         {
           "type": "opencollective",
@@ -13252,24 +13193,6 @@
       }
     },
     "node_modules/wrap-ansi": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^6.1.0",
-        "string-width": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi-cjs": {
-      "name": "wrap-ansi",
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
@@ -13286,27 +13209,7 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "license": "MIT"
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+    "node_modules/wrap-ansi/node_modules/strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
@@ -13318,18 +13221,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
-      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -13349,12 +13240,6 @@
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
-    "node_modules/write-file-atomic/node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "license": "ISC"
-    },
     "node_modules/ws": {
       "version": "7.5.10",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
@@ -13474,38 +13359,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/yargs/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "license": "MIT"
-    },
-    "node_modules/yargs/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
@@ -13517,25 +13370,6 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
-    },
-    "node_modules/zod": {
-      "version": "3.25.76",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
-      "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
-      "license": "MIT",
-      "peer": true,
-      "funding": {
-        "url": "https://github.com/sponsors/colinhacks"
-      }
-    },
-    "node_modules/zod-to-json-schema": {
-      "version": "3.24.6",
-      "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.6.tgz",
-      "integrity": "sha512-h/z3PKvcTcTetyjl1fkj79MHNEjm+HpD6NXheWjzOekY7kV+lwDYnHw+ivHkijnCSMz1yJaWBD9vu/Fcmk+vEg==",
-      "license": "ISC",
-      "peerDependencies": {
-        "zod": "^3.24.1"
-      }
     }
   }
 }
diff --git a/shatter-mobile/package.json b/shatter-mobile/package.json
index 25b307f..3edfbbd 100644
--- a/shatter-mobile/package.json
+++ b/shatter-mobile/package.json
@@ -17,19 +17,19 @@
     "@react-navigation/elements": "^2.6.3",
     "@react-navigation/native": "^7.1.8",
     "axios": "^1.13.2",
-    "expo": "~54.0.20",
-    "expo-camera": "^17.0.9",
-    "expo-constants": "~18.0.10",
-    "expo-font": "~14.0.9",
-    "expo-haptics": "~15.0.7",
-    "expo-image": "~3.0.10",
-    "expo-linking": "~8.0.8",
-    "expo-router": "~6.0.13",
-    "expo-splash-screen": "~31.0.10",
-    "expo-status-bar": "~3.0.8",
-    "expo-symbols": "~1.0.7",
-    "expo-system-ui": "~6.0.8",
-    "expo-web-browser": "~15.0.8",
+    "expo": "~54.0.33",
+    "expo-camera": "^17.0.10",
+    "expo-constants": "~18.0.13",
+    "expo-font": "~14.0.11",
+    "expo-haptics": "~15.0.8",
+    "expo-image": "~3.0.11",
+    "expo-linking": "~8.0.11",
+    "expo-router": "~6.0.23",
+    "expo-splash-screen": "~31.0.13",
+    "expo-status-bar": "~3.0.9",
+    "expo-symbols": "~1.0.8",
+    "expo-system-ui": "~6.0.9",
+    "expo-web-browser": "~15.0.10",
     "react": "^19.1.0",
     "react-dom": "19.1.0",
     "react-native": "^0.81.5",
diff --git a/shatter-mobile/src/api/events/event.api.tsx b/shatter-mobile/src/api/events/event.api.tsx
index 10ddf94..f11a9d3 100644
--- a/shatter-mobile/src/api/events/event.api.tsx
+++ b/shatter-mobile/src/api/events/event.api.tsx
@@ -1,50 +1,137 @@
-import { EventState, GameType } from "@/src/interfaces/Event";
+import { GameType } from "@/src/interfaces/Event";
 import JoinEventByIdGuestRequest from "@/src/interfaces/requests/JoinEventByIdGuestRequest";
 import JoinEventByIdUserRequest from "@/src/interfaces/requests/JoinEventByIdUserRequest";
-import EventResponse from "@/src/interfaces/responses/GetEventByCodeResponse";
-import EventIdResponse from "@/src/interfaces/responses/GetEventByIdResponse";
+import EventResponse from "@/src/interfaces/responses/GetEventResponse";
 import EventJoinIdResponse from "@/src/interfaces/responses/JoinEventIdResponse";
-import axios, { AxiosResponse } from "axios";
-
-const API_BASE = process.env.EXPO_PUBLIC_API_BASE
-const API_BASE_URL: string = `${API_BASE}/api/events`
-
-export async function GetEventByCodeApi(joinCode: string): Promise<EventResponse | undefined> {
-    try{
-        const response: AxiosResponse<EventResponse> = await axios.get(`${API_BASE_URL}/event/${joinCode}`);
-        return response.data;
-    }catch(error){
-        console.log('Error', error);
-    }
+import axios, { AxiosError, AxiosResponse } from "axios";
+
+const API_BASE = process.env.EXPO_PUBLIC_API_BASE;
+const API_BASE_URL_EVENT: string = `${API_BASE}/api/events`;
+
+export async function GetEventByCodeApi(
+	joinCode: string,
+): Promise<EventResponse> {
+	try {
+		const response: AxiosResponse<EventResponse> = await axios.get(
+			`${API_BASE_URL_EVENT}/event/${joinCode}`,
+		);
+		return response.data;
+	} catch (error) {
+		const err = error as AxiosError;
+
+		if (err.response) {
+			switch (err.response.status) {
+				case 404:
+					throw new Error("No event with this code exists.");
+				case 400:
+					throw new Error("Invalid join code.");
+				case 500:
+					throw new Error("Server error. Please try again later.");
+				default:
+					throw new Error("Event Join failed.");
+			}
+		}
+
+		throw new Error("Network error. Check your connection.");
+	}
 }
 
-export async function GetEventByIdApi(eventId: string): Promise<EventResponse | undefined> {
-    try{
-        const response: AxiosResponse<EventIdResponse> = await axios.get(`${API_BASE_URL}/${eventId}`);
-        response.data.event.gameType = GameType.NAME_BINGO; //TODO: Remove hard coded game type
-        return response.data;
-    }catch(error){
-        console.log('Error', error);
-    }
+export async function GetEventByIdApi(eventId: string): Promise<EventResponse> {
+	try {
+		const response: AxiosResponse<EventResponse> = await axios.get(
+			`${API_BASE_URL_EVENT}/${eventId}`,
+		);
+		//response.data.event.gameType = GameType.NAME_BINGO; //TODO: Remove hard coded game type
+		return response.data;
+	} catch (error) {
+		const err = error as AxiosError;
+
+		if (err.response) {
+			switch (err.response.status) {
+				case 400:
+					throw new Error("The event ID is missing. Please try again later.");
+				case 404:
+					throw new Error("The event cannot be found. Please try again later.");
+				case 500:
+					throw new Error("Server error. Please try again later.");
+				default:
+					throw new Error("Signup failed.");
+			}
+		}
+
+		throw new Error("Network error. Check your connection.");
+	}
 }
 
-export async function JoinEventByIdUserApi(eventId: string, userId: string, name: string, token: string): Promise<EventJoinIdResponse | undefined> {
-    try{
-        const body: JoinEventByIdUserRequest = {userId, name,};
-        const response: AxiosResponse<EventJoinIdResponse> = await axios.post(`${API_BASE_URL}/${eventId}/join/user`, body, 
-            {headers: {Authorization: `Bearer ${token}`, },});
-        return response.data;
-    }catch(error){
-        console.log('Error', error);
-    }
+export async function JoinEventByIdUserApi(
+	eventId: string,
+	userId: string,
+	name: string,
+	token: string,
+): Promise<EventJoinIdResponse> {
+	try {
+		const body: JoinEventByIdUserRequest = { userId, name };
+		const response: AxiosResponse<EventJoinIdResponse> = await axios.post(
+			`${API_BASE_URL_EVENT}/${eventId}/join/user`,
+			body,
+			{ headers: { Authorization: `Bearer ${token}` } },
+		);
+		return response.data;
+	} catch (error) {
+		const err = error as AxiosError;
+
+		if (err.response) {
+			switch (err.response.status) {
+				case 400:
+					throw new Error(
+						"A required field is missing, or the event is full. Please try again later.",
+					);
+				case 404:
+					throw new Error("The event cannot be found. Please try again later.");
+				case 409:
+					throw new Error("You're already signed up for this event!");
+				case 500:
+					throw new Error("Server error. Please try again later.");
+				default:
+					throw new Error("Signup failed.");
+			}
+		}
+
+		throw new Error("Network error. Check your connection.");
+	}
 }
 
-export async function JoinEventByIdGuestApi(eventId: string, name: string): Promise<EventJoinIdResponse | undefined> {
-    try{
-        const body: JoinEventByIdGuestRequest = {name,};
-        const response: AxiosResponse<EventJoinIdResponse> = await axios.post(`${API_BASE_URL}/${eventId}/join/guest`, body);
-        return response.data;
-    }catch(error){
-        console.log('Error', error);
-    }
+export async function JoinEventByIdGuestApi(
+	eventId: string,
+	name: string,
+): Promise<EventJoinIdResponse> {
+	try {
+		const body: JoinEventByIdGuestRequest = { name };
+		const response: AxiosResponse<EventJoinIdResponse> = await axios.post(
+			`${API_BASE_URL_EVENT}/${eventId}/join/guest`,
+			body,
+		);
+		return response.data;
+	} catch (error) {
+		const err = error as AxiosError;
+
+		if (err.response) {
+			switch (err.response.status) {
+				case 400:
+					throw new Error(
+						"A required field is missing, or the event is full. Please try again later.",
+					);
+				case 404:
+					throw new Error("The event cannot be found. Please try again later.");
+				case 500:
+					throw new Error("Server error. Please try again later.");
+				default:
+					throw new Error(
+						"Event joining failed." + err.response.status + err.response.config,
+					);
+			}
+		}
+
+		throw new Error("Network error. Check your connection.");
+	}
 }
diff --git a/shatter-mobile/src/api/games/game.api.tsx b/shatter-mobile/src/api/games/game.api.tsx
index 2fd0e11..60ce5f3 100644
--- a/shatter-mobile/src/api/games/game.api.tsx
+++ b/shatter-mobile/src/api/games/game.api.tsx
@@ -1,34 +1,47 @@
-import BingoDataRequest from "@/src/interfaces/requests/GetBingoDataRequest";
 import BingoCategoriesResponse from "@/src/interfaces/responses/GetBingoCategoriesResponse";
 import BingoDataResponse from "@/src/interfaces/responses/GetBingoResponse";
-import EventIdResponse from "@/src/interfaces/responses/GetEventByIdResponse";
-import NamesByEventIdResponse from "@/src/interfaces/responses/GetNamesByEventIdResponse";
-import axios, { AxiosResponse } from "axios";
+import EventResponse from "@/src/interfaces/responses/GetEventResponse";
+import ParticipantsByEventIdResponse from "@/src/interfaces/responses/GetParticipantsByEventIdResponse";
+import axios, { AxiosError, AxiosResponse } from "axios";
 
 const API_BASE = process.env.EXPO_PUBLIC_API_BASE;
 const API_BASE_URL: string = `${API_BASE}/api`;
 const API_BASE_URL_EVENTS: string = `${API_BASE}/api/events`;
 
-export async function GetNamesByEventIdApi(
+export async function GetParticipantsByEventIdApi(
 	eventId: string,
-): Promise<NamesByEventIdResponse | undefined> {
+): Promise<ParticipantsByEventIdResponse> {
 	try {
-		const response: AxiosResponse<EventIdResponse> = await axios.get(
+		const response: AxiosResponse<EventResponse> = await axios.get(
 			`${API_BASE_URL_EVENTS}/${eventId}`,
 		);
 
 		const participantsList = response.data.event.participantIds;
-		const namesList = participantsList.map((p) => p.name);
 
-		return { success: true, names: namesList };
+		return { success: true, participants: participantsList };
 	} catch (error) {
-		console.log("Error", error);
+		const err = error as AxiosError;
+
+		if (err.response) {
+			switch (err.response.status) {
+				case 409:
+					throw new Error("A game for this event cannot be found.");
+				case 400:
+					throw new Error("Invalid game data.");
+				case 500:
+					throw new Error("Server error. Please try again later.");
+				default:
+					throw new Error("Game info cannot be fetched at this time.");
+			}
+		}
+
+		throw new Error("Network error. Check your connection.");
 	}
 }
 
 export async function GetBingoCategoriesApi(
 	eventId: string,
-): Promise<BingoCategoriesResponse | undefined> {
+): Promise<BingoCategoriesResponse> {
 	try {
 		const response: AxiosResponse<BingoDataResponse> = await axios.get(
 			`${API_BASE_URL}/bingo/getBingo/${eventId}`,
@@ -40,6 +53,21 @@ export async function GetBingoCategoriesApi(
 
 		return { success: true, categories: categoriesList };
 	} catch (error) {
-		console.log("Error", error);
+		const err = error as AxiosError;
+
+		if (err.response) {
+			switch (err.response.status) {
+				case 404:
+					throw new Error("A bingo game for this event cannot be found.");
+				case 400:
+					throw new Error("Invalid game data.");
+				case 500:
+					throw new Error("Server error. Please try again later.");
+				default:
+					throw new Error("Game info cannot be fetched at this time.");
+			}
+		}
+
+		throw new Error("Network error. Check your connection.");
 	}
 }
diff --git a/shatter-mobile/src/api/users/user.api.tsx b/shatter-mobile/src/api/users/user.api.tsx
index ad8d121..fb26b5c 100644
--- a/shatter-mobile/src/api/users/user.api.tsx
+++ b/shatter-mobile/src/api/users/user.api.tsx
@@ -1,52 +1,310 @@
-import UserDataRequest from '@/src/interfaces/requests/GetUserDataRequest';
-import UserLoginRequest from '@/src/interfaces/requests/UserLoginRequest';
-import UserSignupRequest from '@/src/interfaces/requests/UserSignupRequest';
-import UserDataResponse from '@/src/interfaces/responses/GetUserDataResponse';
-import GetUserEventsResponse from '@/src/interfaces/responses/GetUserEventsResponse';
-import UserLoginResponse from '@/src/interfaces/responses/UserLoginResponse';
-import UserSignupResponse from '@/src/interfaces/responses/UserSignupResponse';
-import axios, { type AxiosResponse } from 'axios';
-
-const API_BASE = process.env.EXPO_PUBLIC_API_BASE
+import CreateUserConnectionRequest from "@/src/interfaces/requests/CreateUserConnectionRequest";
+import UserConnectionsRequest from "@/src/interfaces/requests/GetUserConnectionsRequest";
+import UserLoginRequest from "@/src/interfaces/requests/UserLoginRequest";
+import UserSignupRequest from "@/src/interfaces/requests/UserSignupRequest";
+import CreateUserConnectionResponse from "@/src/interfaces/responses/CreateUserConnectionResponse";
+import UserConnectionsResponse from "@/src/interfaces/responses/GetUserConnectionsResponse";
+import UserDataResponse from "@/src/interfaces/responses/GetUserDataResponse";
+import GetUserEventsResponse from "@/src/interfaces/responses/GetUserEventsResponse";
+import UserInfoUpdateResponse from "@/src/interfaces/responses/UpdateUserInfoResponse";
+import UserLoginResponse from "@/src/interfaces/responses/UserLoginResponse";
+import UserSignupResponse from "@/src/interfaces/responses/UserSignupResponse";
+import { User } from "@/src/interfaces/User";
+import axios, { AxiosError, type AxiosResponse } from "axios";
+
+const API_BASE = process.env.EXPO_PUBLIC_API_BASE;
+const API_BASE_URL = `${API_BASE}/api`;
 const API_BASE_URL_AUTH = `${API_BASE}/api/auth`;
 const API_BASE_URL_USER = `${API_BASE}/api/users`;
 
-export async function UserLoginApi(email: string, password: string): Promise<UserLoginResponse | undefined> {
-    try{
-        const body: UserLoginRequest = {email, password,};
-        const response: AxiosResponse<UserLoginResponse> = await axios.post(`${API_BASE_URL_AUTH}/login`, body);
-        return response.data;
-    }catch(error){
-        console.log('Error', error);
-    }
-}
-
-export async function UserSignupApi(name: string, email: string, password: string): Promise<UserSignupResponse | undefined> {
-    try{
-        const body: UserSignupRequest = {name, email, password,};
-        const response: AxiosResponse<UserLoginResponse> = await axios.post(`${API_BASE_URL_AUTH}/signup`, body);
-        return response.data;
-    }catch(error){
-        console.log('Error', error);
-    }
-}
-
-export async function UserFetchApi(userId: string, token: string): Promise<UserDataResponse | undefined> {
-    try{
-        const response: AxiosResponse<UserDataResponse> = await axios.get(`${API_BASE_URL_USER}/${userId}`,
-            {headers: {Authorization: `Bearer ${token}`,},});
-        return response.data;
-    }catch(error){
-        console.log('Error', error);
-    }
-}
-
-export async function GetUserEventsApi(userId: string, token: string): Promise<GetUserEventsResponse | undefined> {
-    try{
-        const response: AxiosResponse<GetUserEventsResponse> = await axios.get(`${API_BASE_URL_USER}/${userId}/events`, 
-            {headers: {Authorization: `Bearer ${token}`, },});;
-        return response.data;
-    } catch (error){
-        console.log('Error', error);
-    }
+export async function UserLoginApi(
+	email: string,
+	password: string,
+): Promise<UserLoginResponse> {
+	try {
+		const body: UserLoginRequest = { email, password };
+		const response: AxiosResponse<UserLoginResponse> = await axios.post(
+			`${API_BASE_URL_AUTH}/login`,
+			body,
+		);
+		return response.data;
+	} catch (error) {
+		const err = error as AxiosError;
+
+		if (err.response) {
+			switch (err.response.status) {
+				case 401:
+					throw new Error("Invalid email or password.");
+				case 404:
+					throw new Error("User not found.");
+				case 500:
+					throw new Error("Server error. Please try again later.");
+				default:
+					throw new Error("Login failed.");
+			}
+		}
+
+		throw new Error("Network error. Check your connection.");
+	}
+}
+
+export async function UserSignupApi(
+	name: string,
+	email: string,
+	password: string,
+): Promise<UserSignupResponse> {
+	try {
+		const body: UserSignupRequest = { name, email, password };
+		const response: AxiosResponse<UserLoginResponse> = await axios.post(
+			`${API_BASE_URL_AUTH}/signup`,
+			body,
+		);
+		return response.data;
+	} catch (error) {
+		const err = error as AxiosError;
+
+		if (err.response) {
+			switch (err.response.status) {
+				case 409:
+					throw new Error("An account with this email already exists.");
+				case 400:
+					throw new Error("Invalid signup data.");
+				case 500:
+					throw new Error("Server error. Please try again later.");
+				default:
+					throw new Error("Signup failed.");
+			}
+		}
+
+		throw new Error("Network error. Check your connection.");
+	}
+}
+
+export async function UserFetchApi(
+	userId: string,
+	token: string,
+): Promise<UserDataResponse> {
+	try {
+		const response: AxiosResponse<UserDataResponse> = await axios.get(
+			`${API_BASE_URL_USER}/${userId}`,
+			{ headers: { Authorization: `Bearer ${token}` } },
+		);
+		return response.data;
+	} catch (error) {
+		const err = error as AxiosError;
+
+		if (err.response) {
+			switch (err.response.status) {
+				case 404:
+					throw new Error("This user doesn't exist.");
+				case 400:
+					throw new Error("Missing info from this user.");
+				case 500:
+					throw new Error("Server error. Please try again later.");
+				default:
+					throw new Error("This user cannot be collected at this time.");
+			}
+		}
+
+		throw new Error("Network error. Check your connection.");
+	}
+}
+
+export async function GetUserEventsApi(
+	userId: string,
+	token: string,
+): Promise<GetUserEventsResponse> {
+	try {
+		const response: AxiosResponse<GetUserEventsResponse> = await axios.get(
+			`${API_BASE_URL_USER}/${userId}/events`,
+			{ headers: { Authorization: `Bearer ${token}` } },
+		);
+		return response.data;
+	} catch (error) {
+		const err = error as AxiosError;
+
+		if (err.response) {
+			switch (err.response.status) {
+				case 404:
+					throw new Error("That user cannot be found. Please try again later.");
+				case 400:
+					throw new Error("That user cannot be found. Please try again later.");
+				case 500:
+					throw new Error("Server error. Please try again later.");
+				default:
+					throw new Error(
+						"Events cannot be loaded right now. Please try again later.",
+					);
+			}
+		}
+
+		throw new Error("Network error. Check your connection.");
+	}
+}
+
+export async function GetUserConnectionsApi(
+	participantId: string,
+	eventId: string,
+	token: string,
+): Promise<UserConnectionsResponse> {
+	try {
+		const body: UserConnectionsRequest = {
+			eventId: eventId,
+			participantId: participantId,
+		};
+		const response: AxiosResponse<UserConnectionsResponse> = await axios.post(
+			`${API_BASE_URL}/participantConnections/getByParticipantAndEvent`,
+			body,
+			{ headers: { Authorization: `Bearer ${token}` } },
+		);
+		return response.data;
+	} catch (error) {
+		const err = error as AxiosError;
+
+		if (err.response) {
+			switch (err.response.status) {
+				case 400:
+					throw new Error("Invalid user data.");
+				case 500:
+					throw new Error("Server error. Please try again later.");
+				default:
+					throw new Error("Connections cannot be found.");
+			}
+		}
+
+		throw new Error("Network error. Check your connection.");
+	}
+}
+
+export async function CreateUserConnectionsApi(
+	eventId: string,
+	primaryParticipantId: string,
+	secondaryParticipantId: string,
+	token: string,
+	description?: string | null,
+): Promise<CreateUserConnectionResponse> {
+	try {
+		const body: CreateUserConnectionRequest = {
+			eventId: eventId,
+			primaryParticipantId: primaryParticipantId,
+			secondaryParticipantId: secondaryParticipantId,
+			description: description ?? null,
+		};
+		const response: AxiosResponse<CreateUserConnectionResponse> =
+			await axios.post(
+				`${API_BASE_URL}/participantConnections/getByParticipantAndEvent`,
+				body,
+				{ headers: { Authorization: `Bearer ${token}` } },
+			);
+		return response.data;
+	} catch (error) {
+		const err = error as AxiosError;
+
+		if (err.response) {
+			switch (err.response.status) {
+				case 400:
+					throw new Error("Missing required fields, or invalid data.");
+				case 404:
+					throw new Error("Participant not found for this event.");
+				case 409:
+					throw new Error(
+						"You've already connected with this user at this event!.",
+					);
+				case 500:
+					throw new Error("Server error. Please try again later.");
+				default:
+					throw new Error("Connection creation failed.");
+			}
+		}
+
+		throw new Error("Network error. Check your connection.");
+	}
+}
+
+//TODO: Fix participant data fetch
+export async function GetParticipantApi(
+	participantId: string,
+	eventId: string,
+	token: string,
+): Promise<UserDataResponse> {
+	try {
+		const body = {
+			participantId: participantId,
+			eventId: eventId,
+		};
+
+		const response: AxiosResponse<UserDataResponse> = await axios.get(
+			`/getParticipantConnections/connected-users`,
+			body,
+			{ headers: { Authorization: `Bearer ${token}` } },
+		);
+		return response.data;
+	} catch (error) {
+		const err = error as AxiosError;
+
+		if (err.response) {
+			switch (err.response.status) {
+				case 400:
+					throw new Error(
+						"Invalid information entered. Please adjust your info and try again.",
+					);
+				case 404:
+					throw new Error("Participant not found. Please try again later.");
+				case 500:
+					throw new Error("Server error. Please try again later.");
+				default:
+					throw new Error("Participant info could not be fetched at this time. Please try again later.");
+			}
+		}
+
+		throw new Error("Network error. Check your connection.");
+	}
+}
+
+export async function UserUpdateApi(
+	userId: string,
+	updates: Partial<User>,
+	token: string,
+): Promise<UserInfoUpdateResponse> {
+	try {
+		const body = {
+			name: updates.name,
+			email: updates.email,
+			bio: updates.bio,
+			profilePhoto: updates.profilePhoto,
+			socialLinks: updates.socialLinks,
+		};
+
+		const response: AxiosResponse<UserInfoUpdateResponse> = await axios.put(
+			`${API_BASE_URL_USER}/${userId}`,
+			body,
+			{ headers: { Authorization: `Bearer ${token}` } },
+		);
+		return response.data;
+	} catch (error) {
+		const err = error as AxiosError;
+
+		if (err.response) {
+			switch (err.response.status) {
+				case 403:
+					throw new Error(
+						"You can only update your own profile. Please re-login and try again.",
+					);
+				case 400:
+					throw new Error(
+						"Invalid information entered. Please adjust your info and try again.",
+					);
+				case 404:
+					throw new Error("User not found. Please try again later.");
+				case 409:
+					throw new Error("That email is already in use.");
+				case 500:
+					throw new Error("Server error. Please try again later.");
+				default:
+					throw new Error("Info update failed.");
+			}
+		}
+
+		throw new Error("Network error. Check your connection.");
+	}
 }
diff --git a/shatter-mobile/src/components/README.md b/shatter-mobile/src/components/README_AuthContext.md
similarity index 100%
rename from shatter-mobile/src/components/README.md
rename to shatter-mobile/src/components/README_AuthContext.md
diff --git a/shatter-mobile/src/components/general/AsyncStorage.tsx b/shatter-mobile/src/components/context/AsyncStorage.tsx
similarity index 69%
rename from shatter-mobile/src/components/general/AsyncStorage.tsx
rename to shatter-mobile/src/components/context/AsyncStorage.tsx
index 6a913ec..aa0ce1d 100644
--- a/shatter-mobile/src/components/general/AsyncStorage.tsx
+++ b/shatter-mobile/src/components/context/AsyncStorage.tsx
@@ -1,16 +1,25 @@
+import { SocialLink } from "@/src/interfaces/User";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 
 const STORAGE_KEY = "AUTH_DATA";
 
 export type AuthDataStorage = {
-	userId: string;
+	userId: string | null;
 	accessToken: string;
 	isGuest: boolean;
+	guestInfo: { name: string; socialLinks: SocialLink[] };
 };
 
 export const getStoredAuth = async (): Promise<AuthDataStorage> => {
 	const json = await AsyncStorage.getItem(STORAGE_KEY);
-	return json ? JSON.parse(json) : { userId: "", accessToken: "", isGuest: false};
+	return json
+		? JSON.parse(json)
+		: {
+				userId: "",
+				accessToken: "",
+				isGuest: false,
+				guestInfo: { name: "", socialLinks: [] },
+			};
 };
 
 export const saveStoredAuth = async (data: Partial<AuthDataStorage>) => {
diff --git a/shatter-mobile/src/components/context/AuthContext.tsx b/shatter-mobile/src/components/context/AuthContext.tsx
index e91fb74..2c07579 100644
--- a/shatter-mobile/src/components/context/AuthContext.tsx
+++ b/shatter-mobile/src/components/context/AuthContext.tsx
@@ -1,29 +1,20 @@
+import { SocialLink, User } from "@/src/interfaces/User";
 import { userFetch } from "@/src/services/user.service";
-import React, { createContext, useContext, useEffect, useState } from "react";
-import {
-	AuthDataStorage,
-	getStoredAuth,
-	saveStoredAuth,
-} from "../general/AsyncStorage";
 import AsyncStorage from "@react-native-async-storage/async-storage";
-
-//internal user for mobile
-export type AuthUser = {
-	user_id: string;
-	name?: string;
-	email?: string;
-	linkedin?: string;
-	github?: string;
-	isGuest?: boolean;
-};
+import React, { createContext, useContext, useEffect, useState } from "react";
+import { AuthDataStorage, getStoredAuth, saveStoredAuth } from "./AsyncStorage";
 
 type AuthContextType = {
 	authStorage: AuthDataStorage;
-	user: AuthUser | undefined;
-	login: (user: AuthUser, accessToken: string) => Promise<void>;
-	continueAsGuest: (name: string, linkedin: string) => Promise<void>;
+	user: User | undefined;
+	authenticate: (
+		user: User,
+		accessToken: string,
+		isGuest: boolean,
+	) => Promise<void>;
+	continueAsGuest: (name: string, socialLink: SocialLink) => Promise<void>;
 	logout: () => Promise<void>;
-	updateUser: (updates: Partial<AuthUser>) => void;
+	updateUser: (updates: Partial<User>) => User | undefined;
 };
 
 const AuthContext = createContext<AuthContextType | undefined>(undefined);
@@ -33,57 +24,81 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
 		userId: "",
 		accessToken: "",
 		isGuest: true,
+		guestInfo: { name: "", socialLinks: [] },
 	});
 
-	const [user, setUser] = useState<AuthUser | undefined>(undefined);
+	const [user, setUser] = useState<User | undefined>(undefined);
 
 	//load stored data on startup
 	useEffect(() => {
 		const load = async () => {
 			const stored = await getStoredAuth();
 			setAuthStorage(stored);
-			if (stored.userId && stored.accessToken) {
-				const importedUser = await userFetch(stored.userId, stored.accessToken);
-				if (importedUser) {
-					const mappedUser: AuthUser = {
-						user_id: importedUser.userId,
-						name: importedUser.name,
-						email: importedUser.email,
+			if (!stored.isGuest && stored.userId && stored.accessToken) {
+				//user is logged in, fetch most current data
+				const res = await userFetch(stored.userId, stored.accessToken);
+				if (res) {
+					const mappedUser: User = {
+						_id: res.user._id,
+						name: res.user.name,
+						email: res.user.email,
+						isGuest: res.user.isGuest,
+						socialLinks: res.user.socialLinks,
+					};
+					setUser(mappedUser);
+				}
+			} else {
+				//user is guest, fetch last saved in local
+				const savedData = await getStoredAuth();
+				if (savedData) {
+					const mappedUser: User = {
+						_id: savedData.userId,
+						name: savedData.guestInfo.name,
+						email: "",
+						isGuest: savedData.isGuest,
+						socialLinks: savedData.guestInfo.socialLinks,
 					};
 					setUser(mappedUser);
 				}
 			}
-			
 		};
 
 		load();
 	}, []);
 
-	const login = async (user: AuthUser, accessToken: string) => {
+	//when user or guest joins an event, store for app refresh
+	const authenticate = async (
+		user: User,
+		accessToken: string,
+		isGuest: boolean,
+	) => {
 		setUser(user);
 		const storageData: AuthDataStorage = {
-			userId: user?.user_id,
+			userId: user?._id,
 			accessToken,
-			isGuest: false,
+			isGuest: isGuest,
+			guestInfo: { name: user.name, socialLinks: user.socialLinks },
 		};
 		setAuthStorage(storageData);
 		await saveStoredAuth(storageData);
 	};
 
-	const continueAsGuest = async (name: string, linkedin: string) => {
-		const guestUser: AuthUser = {
-			user_id: "guest-" + Date.now().toString(), //TODO: how to ID guests?
+	//when user initially creates a guest account
+	const continueAsGuest = async (name: string, socialLink: SocialLink) => {
+		const guestUser: User = {
+			_id: null,
 			name: name,
-			linkedin: linkedin,
+			socialLinks: [{ label: socialLink.label, url: socialLink.url }],
 			isGuest: true,
 		};
 
 		setUser(guestUser);
 
 		const storageData: AuthDataStorage = {
-			userId: guestUser.user_id,
+			userId: guestUser._id,
 			accessToken: "",
 			isGuest: true,
+			guestInfo: { name: guestUser.name, socialLinks: guestUser.socialLinks },
 		};
 
 		setAuthStorage(storageData);
@@ -92,14 +107,21 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
 
 	const logout = async () => {
 		setUser(undefined);
-		setAuthStorage({ userId: "", accessToken: "", isGuest: true});
-		await AsyncStorage.clear()
+		setAuthStorage({
+			userId: "",
+			accessToken: "",
+			isGuest: true,
+			guestInfo: { name: "", socialLinks: [] },
+		});
+		await AsyncStorage.clear();
 	};
 
 	//Update in-memory user
-	const updateUser = (updates: Partial<AuthUser>) => {
-		if (!user) return;
-		setUser({ ...user, ...updates });
+	const updateUser = (updates: Partial<User>): User | undefined => {
+		if (!user) return undefined;
+		const newUser = { ...user, ...updates };
+		setUser(newUser);
+		return newUser;
 	};
 
 	return (
@@ -107,7 +129,7 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
 			value={{
 				authStorage,
 				user,
-				login,
+				authenticate,
 				continueAsGuest,
 				logout,
 				updateUser,
diff --git a/shatter-mobile/src/components/context/GameContext.tsx b/shatter-mobile/src/components/context/GameContext.tsx
new file mode 100644
index 0000000..72426b0
--- /dev/null
+++ b/shatter-mobile/src/components/context/GameContext.tsx
@@ -0,0 +1,178 @@
+import { EventState, GameType } from "@/src/interfaces/Event";
+import AsyncStorage from "@react-native-async-storage/async-storage";
+import { createContext, ReactNode, useContext, useEffect, useState } from "react";
+
+export type GameState = {
+	gameType: GameType; //"Game Bingo"
+	eventId: string;
+	loading: boolean;
+	data: any; //generic, can hold cards, prompts, scores
+	status: string | null; //"Bingo!", "Completed"
+	progress: EventState;
+};
+
+type GameContextType = {
+	currentParticipantId: string;
+  	setCurrentParticipantId: (id: string) => Promise<void>;
+	gameState: GameState;
+	initializeGame: (
+		gameType: GameType,
+		eventId: string,
+        eventProgress: EventState,
+		initialData?: any,
+	) => void;
+	setGameData: (data: any) => void;
+	setGameStatus: (status: string | null) => void;
+	setGameProgress: (progress: EventState) => void;
+	resetGame: () => void;
+};
+
+const defaultGameState: GameState = {
+	gameType: GameType.NAME_BINGO,
+	eventId: "",
+	loading: true,
+	data: "",
+	status: null,
+	progress: EventState.UPCOMING,
+};
+
+const GameContext = createContext<GameContextType | undefined>(undefined);
+
+export const GameProvider = ({ children }: { children: ReactNode }) => {
+	const [currentParticipantId, _setCurrentParticipantId] = useState<string>("");
+	const [gameState, setGameState] = useState<GameState>(defaultGameState);
+
+	const participantStorageKey = "current-participant-id";
+
+	const storageKey = (eventId: string, gameType: GameType) =>
+		`game-${gameType}-${eventId}`;
+
+	//load participantId on app start
+	useEffect(() => {
+		const loadParticipant = async () => {
+		try {
+			const storedId = await AsyncStorage.getItem(participantStorageKey);
+			if (storedId) _setCurrentParticipantId(storedId);
+		} catch (err) {
+			console.log("Failed to load participantId:", err);
+		}
+		};
+		loadParticipant();
+	}, []);
+
+	const setCurrentParticipantId = async (id: string) => {
+		_setCurrentParticipantId(id);
+		try {
+			await AsyncStorage.setItem(participantStorageKey, id);
+		} catch (err) {
+			console.log("Failed to save participantId:", err);
+		}
+	};
+
+	const initializeGame = async (
+		gameType: GameType,
+		eventId: string,
+		eventProgress: EventState,
+		initialData: any = {},
+	) => {
+		setGameState({
+			gameType,
+			eventId,
+			loading: true,
+			data: initialData,
+			status: null,
+			progress: eventProgress,
+		});
+
+		//Load persisted state if exists
+		try {
+			const saved = await AsyncStorage.getItem(storageKey(eventId, gameType));
+			if (saved) {
+				setGameState(JSON.parse(saved));
+			}
+		} catch (err) {
+			console.log("Failed to load game state:", err);
+		} finally {
+			setGameState((prev) => ({ ...prev, loading: false }));
+		}
+	};
+
+	const setGameData = async (data: any) => {
+		if (!gameState) return;
+		const newState = { ...gameState, data };
+		setGameState(newState);
+
+		try {
+			await AsyncStorage.setItem(
+				storageKey(gameState.eventId, gameState.gameType),
+				JSON.stringify(newState),
+			);
+		} catch (err) {
+			console.log("Failed to save game data:", err);
+		}
+	};
+
+	const setGameStatus = async (status: string | null) => {
+		if (!gameState) return;
+		const newState = { ...gameState, status };
+		setGameState(newState);
+
+		try {
+			await AsyncStorage.setItem(
+				storageKey(gameState.eventId, gameState.gameType),
+				JSON.stringify(newState),
+			);
+		} catch (err) {
+			console.log("Failed to save game status:", err);
+		}
+	};
+
+	const setGameProgress = async (progress: EventState) => {
+		if (!gameState) return;
+		const newState = { ...gameState, progress };
+		setGameState(newState);
+
+		try {
+			await AsyncStorage.setItem(
+				storageKey(gameState.eventId, gameState.gameType),
+				JSON.stringify(newState),
+			);
+		} catch (err) {
+			console.log("Failed to save game progress:", err);
+		}
+	};
+
+	const resetGame = async () => {
+		if (!gameState) return;
+		const key = storageKey(gameState.eventId, gameState.gameType);
+		try {
+			await AsyncStorage.removeItem(key);
+			setGameState({ ...gameState, data: {}, status: null });
+		} catch (err) {
+			console.log("Failed to reset game:", err);
+		}
+	};
+
+	return (
+		<GameContext.Provider
+			value={{
+				currentParticipantId,
+				setCurrentParticipantId,
+				gameState,
+				initializeGame,
+				setGameData,
+				setGameStatus,
+				setGameProgress,
+				resetGame,
+			}}
+		>
+			{children}
+		</GameContext.Provider>
+	);
+};
+
+export const useGame = () => {
+	const context = useContext(GameContext);
+	if (!context) throw new Error("useGame must be used within a GameProvider");
+	return context;
+};
diff --git a/shatter-mobile/src/components/context/README.md b/shatter-mobile/src/components/context/README.md
new file mode 100644
index 0000000..6b95603
--- /dev/null
+++ b/shatter-mobile/src/components/context/README.md
@@ -0,0 +1,247 @@
+# Overview
+
+The app uses two global providers:
+
+- **AuthProvider** → Manages user authentication and guest state.
+- **GameProvider** → Manages per-event game state and participant tracking.
+
+---
+
+# AuthContext
+
+`AuthContext` is the single source of truth for:
+
+- Logged-in users
+- Guest users
+- Access tokens
+- Persisted authentication state
+
+It allows any component in the app to access authentication data using:
+
+```ts
+import { useAuth } from "@/src/context/AuthContext";
+
+const { user, authenticate, logout } = useAuth();
+```
+
+## What It Stores
+
+`user: User | undefined`: Represents the currently active user (authenticated or guest).If undefined, no user is currently authenticated.
+
+- _id
+- name
+- email (if registered)
+- isGuest
+- socialLinks
+
+`authStorage: AuthDataStorage`: Represents the persisted authentication data stored in AsyncStorage. This is the raw storage representation separate from the User object.
+
+```ts
+type AuthDataStorage = {
+  userId: string | null;
+  accessToken: string;
+  isGuest: boolean;
+  guestInfo: {
+    name: string;
+    socialLinks: SocialLink[];
+  };
+};
+```
+
+## AuthContext Lifecycle
+
+### App Startup
+
+On mount:
+- getStoredAuth() loads persisted authentication data.
+- **If the user is registered**: Fetches latest user info from backend via userFetch.
+- **If the user is a guest**: Reconstructs the user from stored guest info.
+- Sets in-memory user state.
+
+This ensures:
+- Registered users stay logged in.
+- Guests remain guests across sessions.
+- Fresh backend data is loaded for authenticated users.
+
+## AuthContext Methods
+
+`authenticate(user, accessToken, isGuest)`: Sets in-memory user, storing the userId, accessToken, isGuest, Guest fallback info, and persists that to AsyncStorage. This ensures authentication survives app reloads.
+
+Used when:
+- User signs up
+- User logs in
+- User joins an event as a registered account
+
+`continueAsGuest(name, socialLink)`: Used when a user creates a guest profile. Guests do not receive access tokens, so cannot use authenticate.
+
+What it does:
+- Creates a temporary guest User
+- Stores minimal identity info
+- Saves guest data in AsyncStorage
+- Sets isGuest = true
+
+This allows:
+- Event participation without registration
+- Profile persistence between sessions
+
+`updateUser(updates)`: Used on the Profile page.
+
+What it does:
+
+- Updates only the in-memory `user`
+- Merges partial updates
+- Returns updated user object
+
+`logout()`: Used when a user logs out.
+
+What it does:
+- Clears `user`
+- Resets `authStorage` to defaults
+- Calls `AsyncStorage.clear()`
+
+After logout
+- No local user data can be restored
+- User must authenticate again
+
+---
+
+# GameContext
+
+## Purpose
+
+`GameContext` manages:
+
+- Active event game state
+- Participant ID tracking
+- Game progress
+- Persistent per-event game data
+
+Accessed via:
+
+```ts
+import { useGame } from "@/src/context/GameContext";
+
+const { gameState, setGameData } = useGame();
+```
+
+---
+
+# Game State Structure
+
+```ts
+type GameState = {
+  gameType: GameType;
+  eventId: string;
+  loading: boolean;
+  data: any;
+  status: string | null;
+  progress: EventState;
+};
+```
+
+### Fields
+
+- `gameType` → The type of game (e.g., `NAME_BINGO`)
+- `eventId` → Event associated with the game
+- `loading` → True while restoring from storage
+- `data` → Game-specific data (cards, prompts, scores, etc.)
+- `status` → Optional state like `"Bingo!"` or `"Completed"`
+- `progress` → EventState (`UPCOMING`, `ACTIVE`, `COMPLETED`)
+
+---
+
+# GameContext Persistence Model
+
+Each game state is stored using a unique key:
+
+```
+game-{gameType}-{eventId}
+```
+
+Example:
+
+```
+game-NAME_BINGO-12345
+```
+
+This ensures:
+
+- Multiple events do not conflict
+- Multiple game types per event can coexist
+- Progress is restored per specific event + game combination
+
+Additionally, the current participant ID is stored under:
+
+```
+current-participant-id
+```
+
+---
+
+# GameContext Methods
+
+`initializeGame(gameType, eventId, eventProgress, initialData?)`: Called when entering a game.
+
+What it does:
+
+1. Sets initial state.
+2. Attempts to load persisted game state.
+3. Overrides initial state if saved data exists.
+4. Sets `loading = false` when complete.
+
+This ensures players can refresh the app without losing progress.
+
+---
+
+`setCurrentParticipantId(id)`: Used to track the active participant within an event.
+
+- Updates in-memory participant ID
+- Persists it to AsyncStorage
+
+---
+
+`setGameData(data)`
+
+- Updates `gameState.data`
+- Persists full game state to AsyncStorage
+
+Used for:
+- Updating bingo cards
+- Saving scores
+- Tracking prompts
+- Any game-specific content
+
+---
+
+`setGameStatus(status)`
+
+- Updates `gameState.status`
+- Persists state
+
+Used for:
+
+- `"Bingo!"`
+- `"Completed"`
+- Any terminal state indicator
+
+---
+
+`setGameProgress(progress)`: Ensures UI remains consistent across reloads.
+
+- Updates event progress (`UPCOMING`, `ACTIVE`, `COMPLETED`)
+- Persists state
+
+---
+
+`resetGame()`
+- Removes stored game state for current event/game
+- Clears `data`
+- Clears `status`
+
+Used when:
+
+- Restarting a game
+- Leaving an event
+- Clearing progress intentionally
+
+---
\ No newline at end of file
diff --git a/shatter-mobile/src/components/events/EventCard.tsx b/shatter-mobile/src/components/events/EventCard.tsx
index 7d3941b..c261853 100644
--- a/shatter-mobile/src/components/events/EventCard.tsx
+++ b/shatter-mobile/src/components/events/EventCard.tsx
@@ -1,124 +1,289 @@
-import { Image, Pressable, StyleSheet, Text, View } from "react-native";
-import Event, { EventState } from '../../interfaces/Event';
+import { Connection, User } from "@/src/interfaces/User";
+import {
+	fetchConnections,
+	participantFetch,
+} from "@/src/services/user.service";
+import { useRouter } from "expo-router";
+import { useEffect, useState } from "react";
+import {
+	FlatList,
+	Image,
+	Pressable,
+	StyleSheet,
+	Text,
+	View,
+} from "react-native";
+import EventIB, { EventState, GameType } from "../../interfaces/Event";
+import { useAuth } from "../context/AuthContext";
+import { useGame } from "../context/GameContext";
 
 type EventCardProps = {
-  event: Event;
-  expanded: boolean;
-  onPress: () => void; //if tapped
-  onJoinGame?: (event: Event) => void;
+	event: EventIB;
+	expanded: boolean;
+	onPress: () => void; //if tapped
 };
 
-const EventCard = ({ event, expanded, onPress, onJoinGame, }: EventCardProps) => {
-  const live = true//(event.currentState === EventState.IN_PROGRESS); //TODO: Remove hard coded live status
-
-  return (
-    <Pressable onPress={onPress} style={styles.card}>
-      <View style={styles.imageWrapper}>
-        <Image source={{ uri: event.eventImg }} style={styles.image} />
-        
-        {/* LIVE badge */}
-        {live && (
-          <View style={styles.liveBadge}>
-            <Text style={styles.liveText}>Currently Shattering!</Text>
-          </View>
-        )}
-      </View>
-      <Text style={styles.title}>{event.name}</Text>
-
-      <Text style={styles.date}>
-        {new Date(event.startDate).toLocaleString()}
-      </Text>
-
-      {expanded && (
-        <View style={styles.expandedContent}>
-          <Text>{event.description}</Text>
-
-          {/* Join Game Button */}
-          {live && onJoinGame && (
-            <Pressable
-              onPress={() => onJoinGame(event)}
-              style={styles.joinButton}
-            >
-              <Text style={styles.joinButtonText}>Join Game</Text>
-            </Pressable>
-          )}
-        </View>
-      )}
-    </Pressable>
-  );
+const EventCard = ({ event, expanded, onPress }: EventCardProps) => {
+	const router = useRouter();
+	const { user, authStorage } = useAuth();
+	const { initializeGame, currentParticipantId } = useGame();
+	const [connections, setConnections] = useState<User[]>([]);
+	const [loading, setLoading] = useState(false);
+	const [err, setError] = useState("");
+
+	const live = true; //event.currentState === EventState.IN_PROGRESS; //TODO: Remove hard coded live status
+	const completed = event.currentState === EventState.COMPLETED; //TODO: Remove hard coded completed status
+
+	useEffect(() => {
+		if (expanded) {
+			loadConnections(event._id);
+		}
+	}, [expanded]);
+
+	const loadConnections = async (eventId: string) => {
+		try {
+			setLoading(true);
+
+			const userId = user?._id;
+			const accessToken = authStorage.accessToken;
+			const participantId = currentParticipantId;
+
+			if (!userId) {
+				throw new Error("No user logged in.");
+			}
+
+			if (!participantId) {
+				throw new Error("No participant set.");
+			}
+
+			const res = await fetchConnections(participantId, eventId, accessToken);
+
+			if (!res || !res.connections) {
+				throw new Error("Unable to load connections for this event.");
+			}
+
+			const connectionList: Connection[] = res.connections;
+
+			const userPromises = connectionList.map(async (conn) => {
+				//decide which participant is secondary
+				const otherParticipantId =
+					conn.primaryParticipantId === participantId
+						? conn.secondaryParticipantId
+						: conn.primaryParticipantId;
+
+				//TODO: fetch the full user info
+				const userRes = await participantFetch(
+					otherParticipantId,
+					eventId,
+					accessToken,
+				);
+				return userRes.user;
+			});
+
+			const detailedUsers = await Promise.all(userPromises);
+			setConnections(detailedUsers);
+		} catch (err) {
+			console.log("Load connections error:", err);
+			setError((err as Error).message);
+		} finally {
+			setLoading(false);
+		}
+	};
+
+	return (
+		<Pressable onPress={onPress} style={styles.card}>
+			<View style={styles.imageWrapper}>
+				<Image source={{ uri: event.eventImg }} style={styles.image} />
+
+				{/* LIVE badge */}
+				{live && (
+					<View style={styles.liveBadge}>
+						<Text style={styles.liveText}>Currently Shattering!</Text>
+					</View>
+				)}
+			</View>
+			<Text style={styles.title}>{event.name}</Text>
+
+			<Text style={styles.date}>
+				{new Date(event.startDate).toLocaleString()}
+			</Text>
+
+			{expanded && (
+				<View style={styles.expandedContent}>
+					<Text>{event.description}</Text>
+
+					{/* Join and View Game Buttons */}
+					{live && (
+						<Pressable
+							onPress={() => {
+								if (!event.gameType) {
+									//TODO: REMOVE hard-coded event data
+									event.currentState = EventState.IN_PROGRESS;
+									event.gameType = GameType.NAME_BINGO;
+								}
+								initializeGame(event.gameType, event._id, event.currentState);
+								router.push(`/GamePages/Game`);
+							}}
+							style={styles.joinButton}
+						>
+							<Text style={styles.joinButtonText}>Join Game</Text>
+						</Pressable>
+					)}
+
+					{completed && (
+						<Pressable
+							onPress={() => {
+								if (!event.gameType) {
+									//TODO: REMOVE hard-coded event data
+									event.gameType = GameType.NAME_BINGO;
+									event.currentState = EventState.COMPLETED;
+								}
+								initializeGame(event.gameType, event._id, event.currentState);
+								router.push(`/GamePages/Game`);
+							}}
+							style={styles.viewButton}
+						>
+							<Text style={styles.viewButtonText}>View Game</Text>
+						</Pressable>
+					)}
+
+					{loading && <Text>Loading connections...</Text>}
+
+					{/* Connection List */}
+					{!loading && (
+						<Text style={styles.connectionsTitle}>Connections:</Text>
+					)}
+					<FlatList
+						data={connections}
+						keyExtractor={(item) => item._id!}
+						renderItem={({ item }) => (
+							<View style={styles.itemWrapper}>
+								{item.profilePhoto && (
+									<Image
+										source={{ uri: item.profilePhoto }}
+										style={styles.avatar}
+									/>
+								)}
+								<Text style={styles.item}>{item.name}</Text>
+							</View>
+						)}
+					/>
+
+					<Text style={styles.err}>{err}</Text>
+				</View>
+			)}
+		</Pressable>
+	);
 };
 
 export default EventCard;
 
 const styles = StyleSheet.create({
-  card: {
-    backgroundColor: "#fff",
-    padding: 15,
-    borderRadius: 10,
-    marginBottom: 10,
-    shadowColor: "#000",
-    shadowOpacity: 0.1,
-    shadowOffset: { width: 0, height: 2 },
-    shadowRadius: 5,
-    elevation: 3,
-  },
-  imageWrapper: {
-    position: "relative",
-    width: "100%",
-    borderRadius: 10,
-    overflow: "hidden",
-    marginBottom: 10,
-  },
-  image: {
-    width: "100%",
-    height: 150,
-    borderRadius: 10,
-    marginBottom: 10,
-  },
-  title: {
-    fontSize: 16,
-    fontWeight: "bold",
-  },
-  date: {
-    fontSize: 14,
-    color: "#555",
-  },
-  expandedContent: {
-    marginTop: 12,
-    borderTopWidth: 1,
-    borderTopColor: "#eee",
-    paddingTop: 12,
-  },
-  description: {
-    fontSize: 14,
-    color: "#777",
-    marginVertical: 5,
-  },
-  liveBadge: {
-    position: "absolute",
-    top: 10,
-    right: 10,
-    backgroundColor: "#ef4444",
-    paddingHorizontal: 8,
-    paddingVertical: 4,
-    borderRadius: 6,
-  },
-  joinButton: {
-    marginTop: 12,
-    backgroundColor: "#22c55e",
-    paddingVertical: 10,
-    borderRadius: 8,
-    alignItems: "center",
-  },
-  joinButtonText: {
-    color: "#fff",
-    fontWeight: "bold",
-    fontSize: 15,
-  },
-  liveText: {
-    color: "#fff",
-    fontWeight: "bold",
-    fontSize: 12,
-    zIndex: 1,
-  },
-});
\ No newline at end of file
+	card: {
+		backgroundColor: "#fff",
+		padding: 15,
+		borderRadius: 10,
+		marginBottom: 10,
+		shadowColor: "#000",
+		shadowOpacity: 0.1,
+		shadowOffset: { width: 0, height: 2 },
+		shadowRadius: 5,
+		elevation: 3,
+	},
+	imageWrapper: {
+		position: "relative",
+		width: "100%",
+		borderRadius: 10,
+		overflow: "hidden",
+		marginBottom: 10,
+	},
+	image: {
+		width: "100%",
+		height: 150,
+		borderRadius: 10,
+		marginBottom: 10,
+	},
+	title: {
+		fontSize: 16,
+		fontWeight: "bold",
+	},
+	date: {
+		fontSize: 14,
+		color: "#555",
+	},
+	expandedContent: {
+		marginTop: 12,
+		borderTopWidth: 1,
+		borderTopColor: "#eee",
+		paddingTop: 12,
+	},
+	description: {
+		fontSize: 14,
+		color: "#777",
+		marginVertical: 5,
+	},
+	liveBadge: {
+		position: "absolute",
+		top: 10,
+		right: 10,
+		backgroundColor: "#ef4444",
+		paddingHorizontal: 8,
+		paddingVertical: 4,
+		borderRadius: 6,
+	},
+	joinButton: {
+		marginTop: 12,
+		backgroundColor: "#22c55e",
+		paddingVertical: 10,
+		borderRadius: 8,
+		alignItems: "center",
+	},
+	joinButtonText: {
+		color: "#fff",
+		fontWeight: "bold",
+		fontSize: 15,
+	},
+	viewButton: {
+		marginTop: 12,
+		backgroundColor: "#e5cd15",
+		paddingVertical: 10,
+		borderRadius: 8,
+		alignItems: "center",
+	},
+	viewButtonText: {
+		color: "#fff",
+		fontWeight: "bold",
+		fontSize: 15,
+	},
+	connectionsTitle: {
+		fontSize: 13,
+		color: "#777",
+		fontWeight: "bold",
+	},
+	item: {
+		fontSize: 12,
+		color: "#777",
+	},
+	avatar: {
+		width: 24,
+		height: 24,
+		borderRadius: 12,
+		marginRight: 8,
+	},
+	itemWrapper: {
+		flexDirection: "row",
+		alignItems: "center",
+		marginVertical: 2,
+	},
+	liveText: {
+		color: "#fff",
+		fontWeight: "bold",
+		fontSize: 12,
+		zIndex: 1,
+	},
+	err: {
+		fontSize: 12,
+		fontWeight: "bold",
+		color: "#ef4444",
+	},
+});
diff --git a/shatter-mobile/src/components/games/IcebreakerGame.tsx b/shatter-mobile/src/components/games/IcebreakerGame.tsx
index 7ce0aed..01f259e 100644
--- a/shatter-mobile/src/components/games/IcebreakerGame.tsx
+++ b/shatter-mobile/src/components/games/IcebreakerGame.tsx
@@ -1,99 +1,147 @@
-import { StyleSheet, Text, TouchableOpacity, View } from "react-native";
-import NameBingo from "./NameBingo";
+import { Participant } from "@/src/interfaces/Event";
+import { createConnection } from "@/src/services/user.service";
 import { useRouter } from "expo-router";
+import { useState } from "react";
+import { Alert, StyleSheet, Text, TouchableOpacity, View } from "react-native";
+import { getStoredAuth } from "../context/AsyncStorage";
+import { useAuth } from "../context/AuthContext";
+import { useGame } from "../context/GameContext";
+import NameBingo from "./NameBingo";
 
-type IcebreakerGameProps = {
-  eventId: string;
-  gameType: "Name Bingo"; //TODO: Add more games
-};
+const IcebreakerGame = () => {
+	const { user } = useAuth();
+	const { gameState, currentParticipantId } = useGame();
+	const router = useRouter();
+
+	const [connecting, setConnecting] = useState(false);
+
+	//Pick game-specific component
+	const renderGame = () => {
+		switch (gameState.gameType) {
+			case "Name Bingo":
+				return (
+					<NameBingo
+						eventId={gameState.eventId}
+						onConnect={handleConnect}
+						connecting={connecting}
+					/>
+				);
+			default:
+				return <Text>Game not found</Text>;
+		}
+	};
+
+	const handleConnect = async (
+		userToConnect: Participant,
+		description: string | null,
+	) => {
+		if (!user || !currentParticipantId || !userToConnect?.participantId) return;
+		if (!gameState?.eventId) return;
+
+		try {
+			setConnecting(true);
+
+			const stored = await getStoredAuth();
+
+			const res = await createConnection(
+				gameState.eventId,
+				currentParticipantId, //primaryParticipantId
+				userToConnect.participantId, //secondaryParticipantId
+				stored.accessToken,
+				description,
+			);
 
-const IcebreakerGame = ({ eventId, gameType }: IcebreakerGameProps) => {
-  const router = useRouter();
+			if (!res) {
+				Alert.alert("Error", "Failed to connect. Please try again later.");
+				return;
+			}
 
-  //Pick game-specific component
-  const renderGame = () => {
-    switch (gameType) {
-      case "Name Bingo":
-        return <NameBingo eventId={eventId} />;
-      default:
-        return <Text>Game not found</Text>;
-    }
-  };
+			Alert.alert(
+				"Connected!",
+				`You are now connected with ${userToConnect.name}`,
+			);
+		} catch (err) {
+			console.log("Connection error:", err);
+			Alert.alert("Error", "Failed to connect.");
+		} finally {
+			setConnecting(false);
+		}
+	};
 
-  return (
-    <View style={styles.container}>
-      <View style={styles.border}>
-        {renderGame()}
+	return (
+		<View style={styles.container}>
+			<View style={styles.border}>
+				{renderGame()}
 
-        {/* Leave Game Button */}
-        <TouchableOpacity
-          style={styles.leaveButton}
-          onPress={() => router.replace("/Events")}
-        >
-          <Text style={styles.leaveButtonText}>Leave Game</Text>
-        </TouchableOpacity>
-      </View>
-    </View>
-  );
+				{/* Leave Game Button */}
+				<TouchableOpacity
+					style={styles.leaveButton}
+					onPress={() => router.replace("/EventsPage")}
+				>
+					<Text style={styles.leaveButtonText}>Leave Game</Text>
+				</TouchableOpacity>
+			</View>
+		</View>
+	);
 };
 
 export default IcebreakerGame;
 
 const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    padding: 15,
-    backgroundColor: "#f8f8f8",
-    justifyContent: "center",
-    alignItems: "center",
-  },
-  border: {
-    width: "100%",
-    backgroundColor: "#fff",
-    flex: 1,
-    borderRadius: 12,
-    padding: 16,
-    borderWidth: 2,
-    borderColor: "#3b82f6",
-    shadowColor: "#000",
-    shadowOpacity: 0.1,
-    shadowOffset: { width: 0, height: 3 },
-    shadowRadius: 5,
-    elevation: 3,
-  },
-  leaveButton: {
-    backgroundColor: "#ef4444",
-    padding: 12,
-    borderRadius: 8,
-    alignItems: "center",
-    marginTop: 20,
-  },
-  leaveButtonText: {
-    color: "#fff",
-    fontWeight: "600",
-    fontSize: 16,
-  },
-  timer: {
-    fontSize: 16,
-    fontWeight: "bold",
-    color: "#ef4444",
-    marginBottom: 12,
-    textAlign: "center",
-  },
-  overlay: {
-    position: "absolute",
-    top: 0,
-    left: 0,
-    right: 0,
-    bottom: 0,
-    backgroundColor: "rgba(0,0,0,0.6)",
-    justifyContent: "center",
-    alignItems: "center",
-    borderRadius: 12,
-  },
-  overlayText: {
-    fontSize: 24,
-    fontWeight: "bold",
-    color: "#fff",
-  },
-});
\ No newline at end of file
+	container: {
+		flex: 1,
+		padding: 15,
+		backgroundColor: "#f8f8f8",
+		justifyContent: "center",
+		alignItems: "center",
+	},
+	border: {
+		width: "100%",
+		backgroundColor: "#fff",
+		flex: 1,
+		borderRadius: 12,
+		padding: 16,
+		borderWidth: 2,
+		borderColor: "#3b82f6",
+		shadowColor: "#000",
+		shadowOpacity: 0.1,
+		shadowOffset: { width: 0, height: 3 },
+		shadowRadius: 5,
+		elevation: 3,
+	},
+	leaveButton: {
+		backgroundColor: "#ef4444",
+		padding: 12,
+		borderRadius: 8,
+		alignItems: "center",
+		marginTop: 20,
+	},
+	leaveButtonText: {
+		color: "#fff",
+		fontWeight: "600",
+		fontSize: 16,
+	},
+	timer: {
+		fontSize: 16,
+		fontWeight: "bold",
+		color: "#ef4444",
+		marginBottom: 12,
+		textAlign: "center",
+	},
+	overlay: {
+		position: "absolute",
+		top: 0,
+		left: 0,
+		right: 0,
+		bottom: 0,
+		backgroundColor: "rgba(0,0,0,0.6)",
+		justifyContent: "center",
+		alignItems: "center",
+		borderRadius: 12,
+	},
+	overlayText: {
+		fontSize: 24,
+		fontWeight: "bold",
+		color: "#fff",
+	},
+});
diff --git a/shatter-mobile/src/components/games/NameBingo.tsx b/shatter-mobile/src/components/games/NameBingo.tsx
index 7e0ee95..719ce3c 100644
--- a/shatter-mobile/src/components/games/NameBingo.tsx
+++ b/shatter-mobile/src/components/games/NameBingo.tsx
@@ -1,10 +1,12 @@
+import { useGame } from "@/src/components/context/GameContext";
+import { EventState, Participant } from "@/src/interfaces/Event";
 import {
 	getBingoCategories,
-	getBingoNamesByEventId,
+	getParticipantsByEventId,
 } from "@/src/services/game.service";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import { useFocusEffect } from "expo-router";
-import { useCallback, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import {
 	ActivityIndicator,
 	ScrollView,
@@ -17,68 +19,102 @@ import {
 
 type NameBingoProps = {
 	eventId: string;
+	onConnect?: (participant: Participant, description: string | null) => void;
+	connecting?: boolean;
 };
 
 type Card = {
 	cardId: string;
+	assignedParticipantId?: string;
 	assignedName?: string;
 	category: string;
 };
 
 type WinningLine = {
-  type: "row" | "col" | "diag";
-  index?: number; //row/col index; undefined for diagonal
-  reverse?: boolean;
-} | null;
+	type: "row" | "col" | "diag";
+	index?: number;
+	reverse?: boolean;
+};
 
-const NameBingo = ({ eventId }: NameBingoProps) => {
+const NameBingo = ({ eventId, onConnect, connecting }: NameBingoProps) => {
+	const { gameState, currentParticipantId } = useGame();
 	const [selectedCardId, setSelectedCardId] = useState<string | null>(null);
-	const [participants, setParticipants] = useState<string[]>([]);
+	const [participants, setParticipants] = useState<Participant[]>([]);
 	const [categories, setCategories] = useState<string[][]>([]);
 	const [cards, setCards] = useState<Card[]>([]);
 	const [search, setSearch] = useState("");
 	const [loading, setLoading] = useState(true);
+	const [err, setError] = useState("");
 	const [bingoStatus, setBingoStatus] = useState<string | null>(null);
-	const [winningLine, setWinningLine] = useState<WinningLine>(null);
+	const [winningLines, setWinningLines] = useState<WinningLine[]>([]);
+	const [blackoutAnimating, setBlackoutAnimating] = useState(false);
+	const [animatedBlackoutIds, setAnimatedBlackoutIds] = useState<string[]>([]);
 
 	const storageKey = `bingo-cards-${eventId}`;
 
+	//check bingo board state on reload
+	useEffect(() => {
+		if (!cards.length || !categories.length) return;
+
+		const result = checkBingoStatus(cards, categories);
+
+		if (result === "Blackout") {
+			setWinningLines([]);
+			playBlackoutAnimation();
+		} else if (Array.isArray(result) && result.length > 0) {
+			setWinningLines(result);
+			setBingoStatus(`Bingo x${result.length}!`);
+		} else {
+			setWinningLines([]);
+			setBingoStatus(null);
+		}
+	}, [cards, categories]);
+
 	//if left game and re-entered
 	const loadSavedCards = async () => {
-		const saved = await AsyncStorage.getItem(storageKey);
-		if (saved) {
-			setCards(JSON.parse(saved));
+		try {
+			const saved = await AsyncStorage.getItem(storageKey);
+
+			if (!saved) return false;
+			const parsed: Card[] = JSON.parse(saved);
+
+			setCards(parsed);
 			setLoading(false);
 			return true;
+		} catch (error) {
+			console.log("Error loading saved cards:", error);
+			return false;
 		}
-		return false;
 	};
 
 	const fetchGameData = useCallback(async () => {
 		setLoading(true);
 
-		const hasSaved = await loadSavedCards();
-		if (hasSaved) return;
-
 		try {
-			//fetch names
-			const namesData = await getBingoNamesByEventId(eventId);
-			const participantsList =
-				namesData?.success && namesData.names ? namesData.names : [];
-
 			//fetch categories
 			const categoriesData = await getBingoCategories(eventId);
 
 			//store locally
-			if (categoriesData) {
-				setCategories(categoriesData.categories) 
-			}
-
 			const categoriesList =
-				categoriesData?.success && categories
-					? categories
+				categoriesData?.success && categoriesData.categories
+					? categoriesData.categories
 					: [];
 
+			setCategories(categoriesList);
+
+			//fetch names
+			const res = await getParticipantsByEventId(eventId);
+
+			if (!res) {
+			}
+
+			const participantsList = res.participants;
+
+			setParticipants(participantsList);
+
+			const hasSaved = await loadSavedCards();
+			if (hasSaved) return;
+
 			//map categories to cards
 			const initialCards: Card[] = categoriesList.flatMap((row, rowIdx) =>
 				row.map((cat, colIdx) => ({
@@ -93,6 +129,7 @@ const NameBingo = ({ eventId }: NameBingoProps) => {
 			await AsyncStorage.setItem(storageKey, JSON.stringify(initialCards));
 		} catch (err) {
 			console.log("Error fetching bingo data:", err);
+			setError((err as Error).message);
 			setParticipants([]);
 			setCards([]);
 		} finally {
@@ -106,87 +143,145 @@ const NameBingo = ({ eventId }: NameBingoProps) => {
 		}, [fetchGameData]),
 	);
 
-	const handleAssign = async (name: string) => {
-		if (!selectedCardId || name === "") return;
+	const handleAssign = async (participant: Participant) => {
+		if (!selectedCardId || participant === null) return;
 
-		const trimmed = name.trim();
+		if (!currentParticipantId) return;
 
-		if (!isValidParticipant(trimmed)) return;
-		if (isAlreadyAssigned(trimmed)) return;
+		if (!isValidParticipant(participant.participantId, currentParticipantId)) return;
+		if (isAlreadyAssigned(participant.participantId)) return;
 
 		const updatedCards = cards.map((c) =>
-			c.cardId === selectedCardId ? { ...c, assignedName: name } : c,
+			c.cardId === selectedCardId
+				? {
+						...c,
+						assignedParticipantId: participant.participantId,
+						assignedName: participant.name,
+					}
+				: c,
 		);
 
-		setCards((prev) =>
-			prev.map((c) =>
-				c.cardId === selectedCardId ? { ...c, assignedName: name } : c,
-			),
-		);
+		setCards(updatedCards);
 		setSearch("");
 		setSelectedCardId(null);
 
 		await AsyncStorage.setItem(storageKey, JSON.stringify(updatedCards));
 
+		if (onConnect) {
+			const userToConnect: Participant = {
+				userId: participant.userId,
+				participantId: participant.participantId,
+				name: participant.name,
+			};
+
+			onConnect(userToConnect, "Met during Name Bingo");
+		}
+
 		if (categories) {
 			const result = checkBingoStatus(updatedCards, categories);
+
 			if (result === "Blackout") {
-				setWinningLine(null);
-				setBingoStatus("Blackout!");
-			} else if (result) {
-				setWinningLine(result);
-				setBingoStatus("Bingo!");
+				setWinningLines([]);
+				playBlackoutAnimation();
+			} else if (result.length > 0) {
+				setWinningLines(result);
+				setBingoStatus(`Bingo x${result.length}!`);
 			} else {
-				setWinningLine(null);
+				setWinningLines([]);
 				setBingoStatus(null);
 			}
 		}
 	};
 
-	const checkBingoStatus = (cards: Card[], categoriesList: string[][]): WinningLine | "Blackout" | null => {
+	const checkBingoStatus = (
+		cards: Card[],
+		categoriesList: string[][],
+	): WinningLine[] | "Blackout" => {
 		const numRows = categoriesList.length;
 		const numCols = categoriesList[0]?.length || 0;
 
-		//build grid
 		const grid: (string | undefined)[][] = [];
+
 		for (let i = 0; i < numRows; i++) {
 			grid[i] = [];
 			for (let j = 0; j < numCols; j++) {
-			const card = cards.find(c => c.cardId === `card-${i}-${j}`);
-			grid[i][j] = card?.assignedName;
+				const card = cards.find((c) => c.cardId === `card-${i}-${j}`);
+				grid[i][j] = card?.assignedParticipantId;
 			}
 		}
 
-		//check rows
+		const foundLines: WinningLine[] = [];
+
+		//Rows
 		for (let i = 0; i < numRows; i++) {
-			if (grid[i].every(name => name)) {
-				return { type: "row", index: i };
+			if (grid[i].every((name) => name)) {
+				foundLines.push({ type: "row", index: i });
 			}
 		}
 
-		//check columns
+		//Columns
 		for (let j = 0; j < numCols; j++) {
-			if (grid.every(row => row[j])) {
-				return { type: "col", index: j };
+			if (grid.every((row) => row[j])) {
+				foundLines.push({ type: "col", index: j });
 			}
 		}
 
-		//main diagonal
-		if (grid.every((row, i) => row[i])) return { type: "diag", reverse: false };
+		//Main diagonal
+		if (grid.every((row, i) => row[i])) {
+			foundLines.push({ type: "diag", reverse: false });
+		}
+
+		//Anti-diagonal
+		if (grid.every((row, i) => row[numCols - 1 - i])) {
+			foundLines.push({ type: "diag", reverse: true });
+		}
+
+		//Blackout check
+		if (cards.every((c) => c.assignedParticipantId)) return "Blackout";
+
+		return foundLines;
+	};
+
+	const playBlackoutAnimation = async () => {
+		if (!categories.length) return;
 
-		//anti-diagonal
-		if (grid.every((row, i) => row[numCols - 1 - i])) return { type: "diag", reverse: true };
+		setBlackoutAnimating(true);
+		setAnimatedBlackoutIds([]);
 
-		//check blackout
-		if (cards.every(c => c.assignedName)) return "Blackout";
+		const numRows = categories.length;
+		const numCols = categories[0].length;
 
-		return null;
+		const order: string[] = [];
+
+		for (let i = 0; i < numRows; i++) {
+			for (let j = 0; j < numCols; j++) {
+				order.push(`card-${i}-${j}`);
+			}
+		}
+
+		for (let id of order) {
+			await new Promise((res) => setTimeout(res, 80));
+			setAnimatedBlackoutIds((prev) => [...prev, id]);
+		}
+
+		setBlackoutAnimating(false);
+		setBingoStatus("Blackout!");
 	};
 
-	const isValidParticipant = (name: string) =>
-		participants.some((p) => p.toLowerCase() === name.toLowerCase());
-	const isAlreadyAssigned = (name: string) =>
-		cards.some((c) => c.assignedName?.toLowerCase() === name.toLowerCase());
+	//check if secondary is not primary and is part of event
+	const isValidParticipant = (
+		participantId: string,
+		primaryParticipantId: string,
+	) =>
+		participants.some(
+			(p) =>
+				p.participantId === participantId &&
+				p.participantId !== primaryParticipantId,
+		);
+
+	//check if secondary hasn't been assigned to anything yet
+	const isAlreadyAssigned = (participantId: string) =>
+		cards.some((c) => c.assignedParticipantId === participantId);
 
 	if (loading) {
 		return (
@@ -198,9 +293,10 @@ const NameBingo = ({ eventId }: NameBingoProps) => {
 	}
 
 	const filteredParticipants = participants.filter(
-		(name) =>
-			name.toLowerCase().includes(search.toLowerCase()) &&
-			!isAlreadyAssigned(name),
+		(participant) =>
+			participant.name.toLowerCase().includes(search.toLowerCase()) &&
+			!isAlreadyAssigned(participant.participantId) &&
+			isValidParticipant(participant.participantId, currentParticipantId),
 	);
 
 	return (
@@ -213,32 +309,53 @@ const NameBingo = ({ eventId }: NameBingoProps) => {
 			)}
 
 			{/* Search bar with type-ahead */}
-			<View style={styles.inputRow}>
-				<TextInput
-					style={styles.inputFlex}
-					placeholder="Search participant"
-					value={search}
-					onChangeText={setSearch}
-				/>
-				<TouchableOpacity
-					style={[styles.submitButton]}
-					onPress={() => handleAssign(search.trim())}
-					disabled={!selectedCardId || !isValidParticipant}
-				>
-					<Text style={styles.submitText}>Submit</Text>
-				</TouchableOpacity>
-			</View>
+			{gameState.progress === EventState.IN_PROGRESS && (
+				<View style={styles.inputRow}>
+					<TextInput
+						style={styles.inputFlex}
+						placeholder="Who did you find?"
+						value={search}
+						onChangeText={setSearch}
+					/>
+					<TouchableOpacity
+						style={[styles.submitButton]}
+						onPress={() => {
+							const participant = participants.find(
+								(p) => p.name.toLowerCase() === search.trim().toLowerCase(),
+							);
+
+							if (participant) {
+								handleAssign(participant);
+							}
+						}}
+						disabled={
+							!selectedCardId ||
+							!participants.some(
+								(p) =>
+									p.name.toLowerCase() === search.trim().toLowerCase() &&
+									isValidParticipant(
+										p.participantId,
+										currentParticipantId,
+									) &&
+									!isAlreadyAssigned(p.participantId),
+							)
+						}
+					>
+						<Text style={styles.submitText}>Submit</Text>
+					</TouchableOpacity>
+				</View>
+			)}
 
 			{/* Dropdown suggestions */}
 			{search.length > 0 && filteredParticipants.length > 0 && (
 				<ScrollView style={styles.dropdown}>
 					{filteredParticipants.map((p) => (
 						<TouchableOpacity
-							key={p}
+							key={p.name}
 							style={styles.dropdownItem}
-							onPress={() => setSearch(p)}
+							onPress={() => setSearch(p.name)}
 						>
-							<Text>{p}</Text>
+							<Text>{p.name}</Text>
 						</TouchableOpacity>
 					))}
 				</ScrollView>
@@ -248,36 +365,52 @@ const NameBingo = ({ eventId }: NameBingoProps) => {
 			<View style={styles.grid}>
 				{cards.map((card) => {
 					let isWinningCard = false;
+					const isBlackoutAnimated = animatedBlackoutIds.includes(card.cardId);
 
-					if (winningLine) {
-						const [rowIdx, colIdx] = card.cardId
-						.replace("card-", "")
-						.split("-")
-						.map(Number);
-
-						if (winningLine.type === "row" && winningLine.index === rowIdx) isWinningCard = true;
-						if (winningLine.type === "col" && winningLine.index === colIdx) isWinningCard = true;
-						if (winningLine.type === "diag") {
-						if (!winningLine.reverse && rowIdx === colIdx) isWinningCard = true;
-						if (winningLine.reverse && colIdx === cards.length / categories.length - 1 - rowIdx) isWinningCard = true;
-						}
+					//check for winning bingo line
+					if (winningLines.length > 0) {
+						winningLines.forEach((line) => {
+							const [rowIdx, colIdx] = card.cardId
+								.replace("card-", "")
+								.split("-")
+								.map(Number);
+
+							if (line.type === "row" && line.index === rowIdx)
+								isWinningCard = true;
+
+							if (line.type === "col" && line.index === colIdx)
+								isWinningCard = true;
+
+							if (line.type === "diag") {
+								const size = categories.length;
+
+								if (!line.reverse && rowIdx === colIdx) isWinningCard = true;
+
+								if (line.reverse && colIdx === size - 1 - rowIdx)
+									isWinningCard = true;
+							}
+						});
 					}
 
 					return (
 						<TouchableOpacity
-						key={card.cardId}
-						style={[
-							styles.card,
-							selectedCardId === card.cardId && styles.selectedCard,
-							isWinningCard && styles.winningCard,
-						]}
-						onPress={() => setSelectedCardId(card.cardId)}
+							key={card.cardId}
+							style={[
+								styles.card,
+								selectedCardId === card.cardId && styles.selectedCard,
+								isWinningCard && styles.winningCard,
+								isBlackoutAnimated && styles.blackoutCard,
+							]}
+							onPress={() => setSelectedCardId(card.cardId)}
 						>
-						<Text style={styles.category}>{card.category}</Text>
-						{card.assignedName && <Text style={styles.assignedName}>{card.assignedName}</Text>}
+							<Text style={styles.category}>{card.category}</Text>
+							{card.assignedParticipantId && (
+								<Text style={styles.assignedName}>{card.assignedName}</Text>
+							)}
 						</TouchableOpacity>
 					);
-					})}
+				})}
+				<Text style={styles.err}>{err}</Text>
 			</View>
 		</View>
 	);
@@ -312,9 +445,14 @@ const styles = StyleSheet.create({
 		borderWidth: 3,
 		borderColor: "gold",
 	},
+	blackoutCard: {
+		backgroundColor: "#FFD700",
+		transform: [{ scale: 1.1 }],
+	},
 	category: { fontWeight: "bold", textAlign: "center" },
 	assignedName: { fontSize: 12, textAlign: "center", marginTop: 2 },
 	inputRow: { flexDirection: "row", marginBottom: 5 },
+	inputTitle: { color: "#d4d4d4", fontWeight: "bold" },
 	inputFlex: {
 		flex: 1,
 		borderWidth: 1,
@@ -349,4 +487,9 @@ const styles = StyleSheet.create({
 		marginBottom: 10,
 	},
 	dropdownItem: { padding: 8, borderBottomWidth: 1, borderBottomColor: "#eee" },
+	err: {
+		fontSize: 12,
+		fontWeight: "bold",
+		color: "#ef4444",
+	},
 });
diff --git a/shatter-mobile/src/components/login-signup/LoginForm.tsx b/shatter-mobile/src/components/login-signup/LoginForm.tsx
index fde6fbb..5900577 100644
--- a/shatter-mobile/src/components/login-signup/LoginForm.tsx
+++ b/shatter-mobile/src/components/login-signup/LoginForm.tsx
@@ -14,12 +14,13 @@ import {
   TouchableOpacity,
   View,
 } from "react-native";
+import { useAuth } from "../context/AuthContext";
 import { SafeAreaView } from "react-native-safe-area-context";
 import { useAuth, AuthUser } from "../context/AuthContext";
 import { LoginFormStyling as styles } from "../../styling/LoginFormstyling.styles";
 
 export default function LoginForm() {
-	const { login } = useAuth();
+	const { authenticate } = useAuth();
 	const [email, setEmail] = useState("");
 	const [password, setPassword] = useState("");
 	const [loading, setLoading] = useState(false);
@@ -49,44 +50,27 @@ export default function LoginForm() {
 			return;
 		}
 
-		//TODO: Social Link storing?
 		try {
 			const userResponse = await userLogin(email, password);
 
-			if (!userResponse) {
-				throw new Error("No response from server");
-			}
-
-			if (!userResponse.userId) {
-				throw new Error("No user found.");
-			}
-
-			if (!userResponse.token) {
-				throw new Error("No access token passed.");
-			}
-
 			const userData = await userFetch(userResponse.userId, userResponse.token);
 
-			if (!userData) {
-				throw new Error("No response from server");
-			}
-
-			const user: AuthUser = {
-				user_id: userResponse.userId,
-				name: userData?.name,
+			const user: User = {
+				_id: userResponse.userId,
+				name: userData?.user.name,
 				email,
-				linkedin: "",
-				github: "",
+				socialLinks: userData?.user.socialLinks ?? [],
 				isGuest: false,
 			};
 
-			await login(user, userResponse.token);
-		} catch (e) {
-			console.log("Login failed:", e);
-			setError("Login Failure: " + e);
+			await authenticate(user, userResponse.token, false); //no event joined, set gameData to null
+
+			router.push("/JoinEventPage")
+		} catch (err) {
+			console.log("Login failed:", err);
+			setError((err as Error).message || "Uh Oh! Please check your login info and try again.");
 		} finally {
 			setLoading(false);
-			router.push("/JoinEvent")
 		}
 
 	};
diff --git a/shatter-mobile/src/components/login-signup/SignupForm.tsx b/shatter-mobile/src/components/login-signup/SignupForm.tsx
index 67f6def..7e63276 100644
--- a/shatter-mobile/src/components/login-signup/SignupForm.tsx
+++ b/shatter-mobile/src/components/login-signup/SignupForm.tsx
@@ -1,4 +1,6 @@
 //called by Profile.tsx for signing up
+import { User } from "@/src/interfaces/User";
+import { userSignup } from "@/src/services/user.service";
 import { router } from "expo-router";
 import { useState } from "react";
 import { ActivityIndicator, Button,KeyboardAvoidingView,ScrollView, Platform, StyleSheet, Text, TextInput,ImageBackground, TouchableOpacity, View } from "react-native";
@@ -8,63 +10,63 @@ import { SignUpFormStyling as styles } from "../../styling/SignUpFormStyling.sty
 import { SafeAreaView } from "react-native-safe-area-context";
 
 export default function SignUpForm() {
-  const { login, user } = useAuth();
-  const [name, setName] = useState("");
-  const [email, setEmail] = useState("");
-  const [password, setPassword] = useState("");
-  const [loading, setLoading] = useState(false);
-  const [err, setError] = useState("");
-
-  const handleSignup = async () => {
-    setError("");
-    setLoading(true);
-
-    if (!email || !password) {
-        console.log("Error: All fields are required");
-        setLoading(false)
-        setError("Please fill in all fields.");
-        return;
-    }
-
-    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    if (!emailRegex.test(email)) {
-        console.log("Error: Invalid email format");
-        setLoading(false)
-        setError("Please enter a valid email.");
-        return;
-    }
-
-    if (password.length < 8) {
-        console.log("Error: Password must be at least 8 characters");
-        setError("Password must be at least 8 characters.");
-        setLoading(false)
-        return;
-    }
-
-    try {
-      const userResponse = await userSignup(name, email, password);
-
-      if (!userResponse) {
-        throw new Error("No response from server");
-      }
-
-      const user: AuthUser = {
-        user_id: userResponse.userId,
-        name,
-        email,
-        linkedin: "",
-        github: "",
-        isGuest: false,
-      };
-
-      await login(user, userResponse.token); 
-    } catch (e) {
-      console.log("Signup failed:", e);
-      setError("Signup Failure");
-    } finally {
-      setLoading(false);
-    }
-  };
+	const { authenticate } = useAuth();
+	const [name, setName] = useState("");
+	const [email, setEmail] = useState("");
+	const [password, setPassword] = useState("");
+	const [loading, setLoading] = useState(false);
+	const [err, setError] = useState("");
+
+	const handleSignup = async () => {
+		setError("");
+		setLoading(true);
+
+		if (!email || !password) {
+			console.log("Error: All fields are required");
+			setLoading(false);
+			setError("Please fill in all fields.");
+			return;
+		}
+
+		const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+		if (!emailRegex.test(email)) {
+			console.log("Error: Invalid email format");
+			setLoading(false);
+			setError("Please enter a valid email.");
+			return;
+		}
+
+		if (password.length < 8) {
+			console.log("Error: Password must be at least 8 characters");
+			setError("Password must be at least 8 characters.");
+			setLoading(false);
+			return;
+		}
+
+		try {
+			const userResponse = await userSignup(name, email, password);
+
+			const user: User = {
+				_id: userResponse.userId,
+				name,
+				email,
+				socialLinks: [],
+				isGuest: false,
+			};
+
+			await authenticate(user, userResponse.token, false); //no event joined, set gameData to null
+
+			router.push("/(tabs)/JoinEventPage");
+		} catch (err) {
+			console.log("Signup failed:", err);
+			setError(
+				(err as Error).message ||
+					"Uh Oh! Please check your signup info and try again.",
+			);
+		} finally {
+			setLoading(false);
+		}
+	};
 
   return (
     <ImageBackground
@@ -150,4 +152,4 @@ export default function SignUpForm() {
 //     color: "#fff", 
 //     fontWeight: "600", 
 //     fontSize: 16 },
-// });
\ No newline at end of file
+// });
diff --git a/shatter-mobile/src/components/new-events/JoinEvent.tsx b/shatter-mobile/src/components/new-events/JoinEvent.tsx
index 9ab56c2..85d6c05 100644
--- a/shatter-mobile/src/components/new-events/JoinEvent.tsx
+++ b/shatter-mobile/src/components/new-events/JoinEvent.tsx
@@ -1,65 +1,89 @@
-import AsyncStorage from "@react-native-async-storage/async-storage";
-import EventIB from "@/src/interfaces/Event";
+import { useAuth } from "@/src/components/context/AuthContext";
+import { EventState, GameType } from "@/src/interfaces/Event";
 import {
 	getEventByCode,
 	JoinEventIdGuest,
 	JoinEventIdUser,
 } from "@/src/services/event.service";
-import { useAuth } from "@/src/components/context/AuthContext";
-
-export type JoinResult =
-  | { status: "success"; eventId: string }
-  | { status: "event-not-found" }
-  | { status: "no-user" }
-  | { status: "no-user-id" }
-  | { status: "join-error" };
+import { useGame } from "../context/GameContext";
 
 export function useJoinEvent() {
-	const { user, authStorage } = useAuth();
+	const { user, authStorage, authenticate } = useAuth();
+	const { setCurrentParticipantId, initializeGame } = useGame();
+
+	const joinEvent = async (joinCode: string): Promise<string> => {
+		const normalizedCode = joinCode.trim().toUpperCase();
+		const eventData = await getEventByCode(normalizedCode);
 
-	const saveGuestEvent = async (event: EventIB) => {
-		const stored = await AsyncStorage.getItem("guestEvents");
-		const events: EventIB[] = stored ? JSON.parse(stored) : [];
+		if (!user) throw new Error("No user logged in.");
+		if (!user.name) throw new Error("Your profile is missing a name.");
 
-		if (!events.some(e => e._id === event._id)) {
-			events.push(event);
-			await AsyncStorage.setItem("guestEvents", JSON.stringify(events));
+		if (!eventData || !eventData.event?._id) {
+			throw new Error("We couldn’t find that event. Double-check the code.");
 		}
-	};
-
-	const joinEvent = async (joinCode: string): Promise<JoinResult> => {
-		const userId = user?.user_id;
-		const name = user?.name;
-		const isGuest = authStorage.isGuest;
 
-		const normalizedCode = joinCode.trim().toUpperCase();
-		const eventData = await getEventByCode(normalizedCode);
-		const eventId = eventData?.event._id;
+		const event = eventData.event;
 
-		if (!userId) return { status: "no-user-id" };
-		if (!eventData || !eventId) return { status: "event-not-found"};
-		if (!name) return { status: "no-user" };
+		if (event.currentState === EventState.COMPLETED) {
+			throw new Error(
+				"That event already completed. If this isn't the case, double-check the code.",
+			);
+		}
 
 		try {
-			if (!isGuest) {
-				await JoinEventIdUser(
-					eventId,
-					userId,
-					name,
-					authStorage.accessToken
+			if (!user.isGuest && user._id) {
+				const userJoinRes = await JoinEventIdUser(
+					event._id,
+					user._id,
+					user.name,
+					authStorage.accessToken,
 				);
+
+				await setCurrentParticipantId(userJoinRes.participant.participantId);
+
+				//no authenticate because info already locally stored through signup/login
 			} else {
-				const result = await JoinEventIdGuest(eventId, name);
-				if (result?.success) {
-					await saveGuestEvent(eventData.event);
+				//guest joining event
+				if (!user._id) {
+					//first time joining event
+					const guestInfo = await JoinEventIdGuest(event._id, user.name);
+					user._id = guestInfo.userId;
+					console.log("Guest Info: ", guestInfo)
+
+					setCurrentParticipantId(guestInfo.participant.participantId);
+
+					await authenticate(user, guestInfo.token, true);
+				} else {
+					//returning guest joining another event
+					const guestUserInfo = await JoinEventIdUser(
+						event._id,
+						user._id,
+						user.name,
+						authStorage.accessToken,
+					);
+
+					await setCurrentParticipantId(
+						guestUserInfo.participant.participantId,
+					);
+
+					await authenticate(user, guestUserInfo.token, true);
 				}
 			}
-		} catch {
-			return { status:  "join-error" };
+
+			if (!event.gameType) {
+				//TODO: REMOVE hard-coded event data
+				event.currentState = EventState.IN_PROGRESS;
+				event.gameType = GameType.NAME_BINGO;
+			}
+
+			initializeGame(event.gameType, event._id, event.currentState);
+		} catch (err: any) {
+			console.log(err);
+			throw new Error(err);
 		}
 
-		return { status: "success", "eventId": eventId };
+		return event._id; //success returns eventId
 	};
 
 	return { joinEvent };
-}
\ No newline at end of file
+}
diff --git a/shatter-mobile/src/components/new-events/QRScannerBox.tsx b/shatter-mobile/src/components/new-events/QRScannerBox.tsx
index d81b019..c1a3b17 100644
--- a/shatter-mobile/src/components/new-events/QRScannerBox.tsx
+++ b/shatter-mobile/src/components/new-events/QRScannerBox.tsx
@@ -28,19 +28,6 @@ export default function QRScannerBox({ onClose }: { onClose: () => void }) {
 		}
 	};
 
-	if (!permission) return <View />;
-
-	if (!permission.granted) {
-		return (
-			<View style={styles.centered}>
-				<Text style={{ marginBottom: 10 }}>Camera access is required.</Text>
-				<Text onPress={requestPermission} style={styles.link}>
-					Grant Camera Permission
-				</Text>
-			</View>
-		);
-	}
-
 	const handleScan = async (data: string) => {
 		if (scanLock.current) return;
 		scanLock.current = true; //lock scanner
@@ -54,40 +41,33 @@ export default function QRScannerBox({ onClose }: { onClose: () => void }) {
 
 		try {
 			const result = await joinEvent(joinCode);
-
-			switch (result.status) {
-				case "no-user":
-					Alert.alert(
-						"No User Found",
-						"Please create an account to join the event",
-					);
-					router.push("/Profile");
-					break;
-
-				case "event-not-found":
-					Alert.alert("No Event Found");
-					break;
-
-				case "join-error":
-					Alert.alert("An error occurred. Please try again later.");
-					break;
-
-				case "success":
-				router.push({
-					pathname: "/EventPages/EventLobby",
-					params: { eventId: result.eventId },
-				});
-				break;
-			}
+			
+			router.push({
+				pathname: "/EventPages/EventLobby",
+				params: { eventId: result },
+			});
 
 			setScanned(true);
 			onClose();
 		} catch (err: any) {
-			Alert.alert("Error", err.message);
+			Alert.alert(err);
 			onClose();
 		}
 	};
 
+	if (!permission) return <View />;
+
+	if (!permission.granted) {
+		return (
+			<View style={styles.centered}>
+				<Text style={{ marginBottom: 10 }}>Camera access is required.</Text>
+				<Text onPress={requestPermission} style={styles.link}>
+					Grant Camera Permission
+				</Text>
+			</View>
+		);
+	}
+
 	return (
 		<View style={styles.boxContainer}>
 			{scanned && (
diff --git a/shatter-mobile/src/interfaces/Event.tsx b/shatter-mobile/src/interfaces/Event.tsx
index 09af08c..be3f0e4 100644
--- a/shatter-mobile/src/interfaces/Event.tsx
+++ b/shatter-mobile/src/interfaces/Event.tsx
@@ -1,33 +1,33 @@
 export default interface EventIB {
-    _id: string;
-    name: string;
-    description: string;
-    joinCode: string | null;
-    startDate: string;
-    endDate: string;
-    maxParticipants: number;
-    participantIds: Participant[];
-    currentState: EventState;
-    createdBy: string;
-    createdAt: string;
-    updatedAt: string;
-    eventImg: string;
-    gameType: GameType;
+	_id: string;
+	name: string;
+	description: string;
+	joinCode: string | null;
+	startDate: string;
+	endDate: string;
+	maxParticipant: number;
+	participantIds: Participant[];
+	currentState: EventState;
+	createdBy: string;
+	createdAt: string;
+	updatedAt: string;
+	eventImg: string;
+	gameType: GameType;
 }
 
-export interface Participant{
-    userId: string,
-    eventId: string,
-    name: string
+export interface Participant {
+	participantId: string;
+	userId: string | null;
+	name: string;
 }
 
-export enum EventState{
-    UPCOMING = "Upcoming",
-    IN_PROGRESS = "In Progress",
-    COMPLETED = "Completed",
-    INVALID = "Invalid",
+export enum EventState {
+	UPCOMING = "upcoming",
+	IN_PROGRESS = "in progress",
+	COMPLETED = "completed",
+	INVALID = "invalid",
 }
 
-export enum GameType{
-    NAME_BINGO = "Name Bingo"
+export enum GameType {
+	NAME_BINGO = "Name Bingo",
 }
diff --git a/shatter-mobile/src/interfaces/User.tsx b/shatter-mobile/src/interfaces/User.tsx
index 6982e49..a60da58 100644
--- a/shatter-mobile/src/interfaces/User.tsx
+++ b/shatter-mobile/src/interfaces/User.tsx
@@ -1,15 +1,24 @@
-export interface User {
-    userId: string,
-    name: string,
-    email: string,
-    password: string,
-    profilePicture: string,
-    bio: string,
-    socialLinks: string,
-    userType: UserType
-}
+export type SocialLink = {
+  label: string;
+  url: string;
+};
 
-export enum UserType{
-    Networker = "networker",
-    Organizer = "organizer"
-}
+export type Connection = {
+	_id: string;
+	_eventId: string;
+	primaryParticipantId: string;
+	secondaryParticipantId: string;
+	description: string;
+};
+
+//internal user for mobile
+export type User = {
+	_id: string | null; //null for guest users that haven't joined event before
+	name: string;
+	email?: string;
+	password?: string
+	bio?: string;
+	profilePhoto?: string;
+	socialLinks: SocialLink[]
+	isGuest: boolean;
+};
diff --git a/shatter-mobile/src/interfaces/requests/CreateUserConnectionRequest.tsx b/shatter-mobile/src/interfaces/requests/CreateUserConnectionRequest.tsx
new file mode 100644
index 0000000..9d5905f
--- /dev/null
+++ b/shatter-mobile/src/interfaces/requests/CreateUserConnectionRequest.tsx
@@ -0,0 +1,7 @@
+//create a connection in a game
+export default interface CreateUserConnectionRequest {
+	eventId: string;
+	primaryParticipantId: string;
+	secondaryParticipantId: string;
+	description?: string | null;
+}
diff --git a/shatter-mobile/src/interfaces/requests/GetBingoCategoriesByEventIdRequest.tsx b/shatter-mobile/src/interfaces/requests/GetBingoCategoriesByEventIdRequest.tsx
index f377853..eaf60a0 100644
--- a/shatter-mobile/src/interfaces/requests/GetBingoCategoriesByEventIdRequest.tsx
+++ b/shatter-mobile/src/interfaces/requests/GetBingoCategoriesByEventIdRequest.tsx
@@ -1,3 +1,4 @@
+//request bingo categories for an event
 export default interface EventBingoCategoriesRequest {
     eventId: string,
 }
\ No newline at end of file
diff --git a/shatter-mobile/src/interfaces/requests/GetBingoDataRequest.tsx b/shatter-mobile/src/interfaces/requests/GetBingoDataRequest.tsx
deleted file mode 100644
index fd8ac90..0000000
--- a/shatter-mobile/src/interfaces/requests/GetBingoDataRequest.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export default interface BingoDataRequest {
-    id: string,
-}
\ No newline at end of file
diff --git a/shatter-mobile/src/interfaces/requests/GetEventByCodeRequest.tsx b/shatter-mobile/src/interfaces/requests/GetEventByCodeRequest.tsx
index 4638028..5cb1ce3 100644
--- a/shatter-mobile/src/interfaces/requests/GetEventByCodeRequest.tsx
+++ b/shatter-mobile/src/interfaces/requests/GetEventByCodeRequest.tsx
@@ -1,3 +1,4 @@
+//join event with join code
 export default interface EventJoinCodeRequest {
     joinCode: string,
 }
\ No newline at end of file
diff --git a/shatter-mobile/src/interfaces/requests/GetEventByIdRequest.tsx b/shatter-mobile/src/interfaces/requests/GetEventByIdRequest.tsx
index 344fffa..87e1cde 100644
--- a/shatter-mobile/src/interfaces/requests/GetEventByIdRequest.tsx
+++ b/shatter-mobile/src/interfaces/requests/GetEventByIdRequest.tsx
@@ -1,3 +1,4 @@
+//get event info with event ID
 export default interface EventIdRequest {
     eventId: string,
 }
\ No newline at end of file
diff --git a/shatter-mobile/src/interfaces/requests/GetNamesByEventIdRequest.tsx b/shatter-mobile/src/interfaces/requests/GetNamesByEventIdRequest.tsx
index 40adf30..4276608 100644
--- a/shatter-mobile/src/interfaces/requests/GetNamesByEventIdRequest.tsx
+++ b/shatter-mobile/src/interfaces/requests/GetNamesByEventIdRequest.tsx
@@ -1,3 +1,4 @@
+//get participant names for game
 export default interface EventNamesRequest {
     eventId: string,
 }
\ No newline at end of file
diff --git a/shatter-mobile/src/interfaces/requests/GetUserConnectionsRequest.tsx b/shatter-mobile/src/interfaces/requests/GetUserConnectionsRequest.tsx
new file mode 100644
index 0000000..32e33c5
--- /dev/null
+++ b/shatter-mobile/src/interfaces/requests/GetUserConnectionsRequest.tsx
@@ -0,0 +1,5 @@
+//fetch connections for user and event
+export default interface UserConnectionsRequest {
+    participantId: string,
+    eventId: string
+}
\ No newline at end of file
diff --git a/shatter-mobile/src/interfaces/requests/GetUserDataRequest.tsx b/shatter-mobile/src/interfaces/requests/GetUserDataRequest.tsx
index ab62b4a..5bb2438 100644
--- a/shatter-mobile/src/interfaces/requests/GetUserDataRequest.tsx
+++ b/shatter-mobile/src/interfaces/requests/GetUserDataRequest.tsx
@@ -1,3 +1,4 @@
+//get user info with userId (after login)
 export default interface UserDataRequest {
     userId: string,
 }
\ No newline at end of file
diff --git a/shatter-mobile/src/interfaces/requests/GetUserEventsResponse.tsx b/shatter-mobile/src/interfaces/requests/GetUserEventsResponse.tsx
index c73adbe..0673ec5 100644
--- a/shatter-mobile/src/interfaces/requests/GetUserEventsResponse.tsx
+++ b/shatter-mobile/src/interfaces/requests/GetUserEventsResponse.tsx
@@ -1,3 +1,4 @@
+//Get events for user
 export default interface EventUserIdRequest {
     userId: string,
 }
\ No newline at end of file
diff --git a/shatter-mobile/src/interfaces/requests/UserLoginRequest.tsx b/shatter-mobile/src/interfaces/requests/UserLoginRequest.tsx
index b7ae18c..67675a2 100644
--- a/shatter-mobile/src/interfaces/requests/UserLoginRequest.tsx
+++ b/shatter-mobile/src/interfaces/requests/UserLoginRequest.tsx
@@ -1,3 +1,4 @@
+//login user with email and password
 export default interface UserLoginRequest {
     email: string,
     password: string,
diff --git a/shatter-mobile/src/interfaces/requests/UserSignupRequest.tsx b/shatter-mobile/src/interfaces/requests/UserSignupRequest.tsx
index 31563ff..10a85cc 100644
--- a/shatter-mobile/src/interfaces/requests/UserSignupRequest.tsx
+++ b/shatter-mobile/src/interfaces/requests/UserSignupRequest.tsx
@@ -1,3 +1,4 @@
+//create user with name and login info
 export default interface UserSignupRequest {
     name: string,
     email: string,
diff --git a/shatter-mobile/src/interfaces/responses/CreateUserConnectionResponse.tsx b/shatter-mobile/src/interfaces/responses/CreateUserConnectionResponse.tsx
new file mode 100644
index 0000000..9834c6d
--- /dev/null
+++ b/shatter-mobile/src/interfaces/responses/CreateUserConnectionResponse.tsx
@@ -0,0 +1,8 @@
+//returns connection info when connection created
+export default interface CreateUserConnectionResponse {
+    _eventId: string,
+    primaryParticipantId: string,
+    secondaryParticipantId: string,
+    description: string,
+    _id: string,
+}
\ No newline at end of file
diff --git a/shatter-mobile/src/interfaces/responses/GetBingoCategoriesResponse.tsx b/shatter-mobile/src/interfaces/responses/GetBingoCategoriesResponse.tsx
index 5686f4a..86a1d3b 100644
--- a/shatter-mobile/src/interfaces/responses/GetBingoCategoriesResponse.tsx
+++ b/shatter-mobile/src/interfaces/responses/GetBingoCategoriesResponse.tsx
@@ -1,4 +1,4 @@
-//used by name bingo
+//used by name bingo, return categories for name bingo from bingo game
 export default interface BingoCategoriesResponse {
     success: boolean,
     categories: string[][],
diff --git a/shatter-mobile/src/interfaces/responses/GetBingoResponse.tsx b/shatter-mobile/src/interfaces/responses/GetBingoResponse.tsx
index 39da8a3..af12f42 100644
--- a/shatter-mobile/src/interfaces/responses/GetBingoResponse.tsx
+++ b/shatter-mobile/src/interfaces/responses/GetBingoResponse.tsx
@@ -1,5 +1,6 @@
 import { BingoGame } from "../Game";
 
+//returns bingo data for event
 export default interface BingoDataResponse {
     success: boolean,
     bingo: BingoGame,
diff --git a/shatter-mobile/src/interfaces/responses/GetEventByIdResponse.tsx b/shatter-mobile/src/interfaces/responses/GetEventByIdResponse.tsx
deleted file mode 100644
index 408a695..0000000
--- a/shatter-mobile/src/interfaces/responses/GetEventByIdResponse.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import EventIB from '../Event'
-
-export default interface EventIdResponse {
-    success: boolean,
-    event: EventIB
-}
\ No newline at end of file
diff --git a/shatter-mobile/src/interfaces/responses/GetEventByCodeResponse.tsx b/shatter-mobile/src/interfaces/responses/GetEventResponse.tsx
similarity index 63%
rename from shatter-mobile/src/interfaces/responses/GetEventByCodeResponse.tsx
rename to shatter-mobile/src/interfaces/responses/GetEventResponse.tsx
index 4bb7bfe..dbbce91 100644
--- a/shatter-mobile/src/interfaces/responses/GetEventByCodeResponse.tsx
+++ b/shatter-mobile/src/interfaces/responses/GetEventResponse.tsx
@@ -1,5 +1,6 @@
 import EventIB from '../Event'
 
+//returned event for when it is fetched (joinCode, eventId, etc.)
 export default interface EventResponse {
     success: boolean,
     event: EventIB
diff --git a/shatter-mobile/src/interfaces/responses/GetNamesByEventIdResponse.tsx b/shatter-mobile/src/interfaces/responses/GetNamesByEventIdResponse.tsx
deleted file mode 100644
index 329aa86..0000000
--- a/shatter-mobile/src/interfaces/responses/GetNamesByEventIdResponse.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-//used by name bingo
-export default interface NamesByEventIdResponse {
-    success: boolean,
-    names: string[],
-}
\ No newline at end of file
diff --git a/shatter-mobile/src/interfaces/responses/GetParticipantsByEventIdResponse.tsx b/shatter-mobile/src/interfaces/responses/GetParticipantsByEventIdResponse.tsx
new file mode 100644
index 0000000..eaca67a
--- /dev/null
+++ b/shatter-mobile/src/interfaces/responses/GetParticipantsByEventIdResponse.tsx
@@ -0,0 +1,7 @@
+import { Participant } from "../Event";
+
+//used by name bingo, returns participants of event
+export default interface ParticipantsByEventIdResponse {
+    success: boolean,
+    participants: Participant[],
+}
\ No newline at end of file
diff --git a/shatter-mobile/src/interfaces/responses/GetUserConnectionsResponse.tsx b/shatter-mobile/src/interfaces/responses/GetUserConnectionsResponse.tsx
new file mode 100644
index 0000000..84a95a0
--- /dev/null
+++ b/shatter-mobile/src/interfaces/responses/GetUserConnectionsResponse.tsx
@@ -0,0 +1,6 @@
+import { Connection } from "../User";
+
+//return connections of a user for an event
+export default interface UserConnectionsResponse {
+	connections: Connection[];
+}
diff --git a/shatter-mobile/src/interfaces/responses/GetUserDataResponse.tsx b/shatter-mobile/src/interfaces/responses/GetUserDataResponse.tsx
index 15040d6..8ddf31b 100644
--- a/shatter-mobile/src/interfaces/responses/GetUserDataResponse.tsx
+++ b/shatter-mobile/src/interfaces/responses/GetUserDataResponse.tsx
@@ -1,5 +1,6 @@
 import { User } from "../User";
 
+//return a user with stored data
 export default interface UserDataResponse {
 	success: boolean;
 	user: User;
diff --git a/shatter-mobile/src/interfaces/responses/GetUserEventsResponse.tsx b/shatter-mobile/src/interfaces/responses/GetUserEventsResponse.tsx
index 9a43a4d..b7cdb22 100644
--- a/shatter-mobile/src/interfaces/responses/GetUserEventsResponse.tsx
+++ b/shatter-mobile/src/interfaces/responses/GetUserEventsResponse.tsx
@@ -1,5 +1,6 @@
 import EventIB from '../Event';
 
+//return event from eventId
 export default interface UserEventsResponse {
     events: EventIB[],
 }
\ No newline at end of file
diff --git a/shatter-mobile/src/interfaces/responses/JoinEventIdResponse.tsx b/shatter-mobile/src/interfaces/responses/JoinEventIdResponse.tsx
index 5bcd482..770d671 100644
--- a/shatter-mobile/src/interfaces/responses/JoinEventIdResponse.tsx
+++ b/shatter-mobile/src/interfaces/responses/JoinEventIdResponse.tsx
@@ -1,6 +1,9 @@
 import { Participant } from '../Event';
 
+//event joined, returns new info if the user is a guest
 export default interface EventJoinIdResponse {
     success: boolean,
-    participant: Participant
+    participant: Participant,
+    userId: string,
+    token: string,
 }
\ No newline at end of file
diff --git a/shatter-mobile/src/interfaces/responses/UpdateUserInfoResponse.tsx b/shatter-mobile/src/interfaces/responses/UpdateUserInfoResponse.tsx
new file mode 100644
index 0000000..b19d6c5
--- /dev/null
+++ b/shatter-mobile/src/interfaces/responses/UpdateUserInfoResponse.tsx
@@ -0,0 +1,7 @@
+import { User } from "../User";
+
+//returns new user info when updated
+export default interface UserInfoUpdateResponse {
+    success: boolean,
+    user: User
+}
\ No newline at end of file
diff --git a/shatter-mobile/src/interfaces/responses/UserLoginResponse.tsx b/shatter-mobile/src/interfaces/responses/UserLoginResponse.tsx
index 2891530..c5f0b97 100644
--- a/shatter-mobile/src/interfaces/responses/UserLoginResponse.tsx
+++ b/shatter-mobile/src/interfaces/responses/UserLoginResponse.tsx
@@ -1,5 +1,5 @@
 export default interface UserLoginResponse {
-    message: string,
-    userId: string,
-    token: string
-}
\ No newline at end of file
+	message: string;
+	userId: string;
+	token: string;
+}
diff --git a/shatter-mobile/src/services/event.service.tsx b/shatter-mobile/src/services/event.service.tsx
index 3cbee93..fbeaad5 100644
--- a/shatter-mobile/src/services/event.service.tsx
+++ b/shatter-mobile/src/services/event.service.tsx
@@ -5,31 +5,27 @@ import {
 	JoinEventByIdUserApi,
 } from "../api/events/event.api";
 import { GetUserEventsApi } from "../api/users/user.api";
-import EventResponse from "../interfaces/responses/GetEventByCodeResponse";
-import EventIdResponse from "../interfaces/responses/GetEventByIdResponse";
+import EventResponse from "../interfaces/responses/GetEventResponse";
 import UserEventsResponse from "../interfaces/responses/GetUserEventsResponse";
 import EventJoinIdResponse from "../interfaces/responses/JoinEventIdResponse";
 
 export async function getEventByCode(
 	joinCode: string,
-): Promise<EventResponse | undefined> {
-	const eventInfo = await GetEventByCodeApi(joinCode);
-	return eventInfo;
+): Promise<EventResponse> {
+	return await GetEventByCodeApi(joinCode);
 }
 
 export async function getEventById(
 	eventId: string,
-): Promise<EventIdResponse | undefined> {
-	const eventInfo = await GetEventByIdApi(eventId);
-	return eventInfo;
+): Promise<EventResponse> {
+	return await GetEventByIdApi(eventId);
 }
 
 export async function getUserEvents(
 	userId: string,
 	token: string
-): Promise<UserEventsResponse | undefined> {
-	const events = await GetUserEventsApi(userId, token);
-	return events;
+): Promise<UserEventsResponse> {
+	return await GetUserEventsApi(userId, token);
 }
 
 export async function JoinEventIdUser(
@@ -37,15 +33,13 @@ export async function JoinEventIdUser(
 	userId: string,
 	name: string,
 	token: string,
-): Promise<EventJoinIdResponse | undefined> {
-	const response = await JoinEventByIdUserApi(eventId, userId, name, token);
-	return response;
+): Promise<EventJoinIdResponse> {
+	return await JoinEventByIdUserApi(eventId, userId, name, token);
 }
 
 export async function JoinEventIdGuest(
 	eventId: string,
 	name: string,
-): Promise<EventJoinIdResponse | undefined> {
-	const response = await JoinEventByIdGuestApi(eventId, name);
-	return response;
+): Promise<EventJoinIdResponse> {
+	return await JoinEventByIdGuestApi(eventId, name);
 }
diff --git a/shatter-mobile/src/services/game.service.tsx b/shatter-mobile/src/services/game.service.tsx
index 4a21667..d7f634d 100644
--- a/shatter-mobile/src/services/game.service.tsx
+++ b/shatter-mobile/src/services/game.service.tsx
@@ -1,14 +1,14 @@
-import { GetBingoCategoriesApi, GetNamesByEventIdApi } from "../api/games/game.api";
+import { GetBingoCategoriesApi, GetParticipantsByEventIdApi } from "../api/games/game.api";
 import BingoCategoriesResponse from "../interfaces/responses/GetBingoCategoriesResponse";
-import NamesByEventIdResponse from "../interfaces/responses/GetNamesByEventIdResponse";
+import ParticipantsByEventIdResponse from "../interfaces/responses/GetParticipantsByEventIdResponse";
 
 
-export async function getBingoNamesByEventId(eventId: string): Promise<NamesByEventIdResponse | undefined> {
-    const eventInfo = await GetNamesByEventIdApi(eventId);
-    return eventInfo;
+export async function getParticipantsByEventId(eventId: string): Promise<ParticipantsByEventIdResponse> {
+    const participantInfo = await GetParticipantsByEventIdApi(eventId);
+    return participantInfo;
 }
 
-export async function getBingoCategories(eventId: string): Promise<BingoCategoriesResponse | undefined> {
+export async function getBingoCategories(eventId: string): Promise<BingoCategoriesResponse> {
     const categories = await GetBingoCategoriesApi(eventId);
     return categories;
 }
\ No newline at end of file
diff --git a/shatter-mobile/src/services/user.service.tsx b/shatter-mobile/src/services/user.service.tsx
index 73397d5..b63c834 100644
--- a/shatter-mobile/src/services/user.service.tsx
+++ b/shatter-mobile/src/services/user.service.tsx
@@ -1,8 +1,16 @@
 import {
-    UserFetchApi,
-    UserLoginApi,
-    UserSignupApi,
+	CreateUserConnectionsApi,
+	GetParticipantApi,
+	GetUserConnectionsApi,
+	UserFetchApi,
+	UserLoginApi,
+	UserSignupApi,
+	UserUpdateApi,
 } from "../api/users/user.api";
+import CreateUserConnectionResponse from "../interfaces/responses/CreateUserConnectionResponse";
+import UserConnectionsResponse from "../interfaces/responses/GetUserConnectionsResponse";
+import UserDataResponse from "../interfaces/responses/GetUserDataResponse";
+import UserInfoUpdateResponse from "../interfaces/responses/UpdateUserInfoResponse";
 import UserLoginResponse from "../interfaces/responses/UserLoginResponse";
 import UserSignupResponse from "../interfaces/responses/UserSignupResponse";
 import { User } from "../interfaces/User";
@@ -10,25 +18,61 @@ import { User } from "../interfaces/User";
 export async function userLogin(
 	email: string,
 	password: string,
-): Promise<UserLoginResponse | undefined> {
-	const userInfo = await UserLoginApi(email, password);
-	return userInfo;
+): Promise<UserLoginResponse> {
+	return await UserLoginApi(email, password);
 }
 
 export async function userSignup(
 	name: string,
 	email: string,
 	password: string,
-): Promise<UserSignupResponse | undefined> {
-	const userInfo = await UserSignupApi(name, email, password);
-	return userInfo;
+): Promise<UserSignupResponse> {
+	return await UserSignupApi(name, email, password);
 }
 
 export async function userFetch(
 	userId: string,
 	token: string,
-): Promise<User | undefined> {
-	const res = await UserFetchApi(userId, token);
-	if (!res || !res.success) return undefined;
-	return res.user;
+): Promise<UserDataResponse> {
+	return await UserFetchApi(userId, token);
+}
+
+export async function fetchConnections(
+	participantId: string,
+	eventId: string,
+	token: string,
+): Promise<UserConnectionsResponse> {
+	return await GetUserConnectionsApi(participantId, eventId, token);
+}
+
+export async function participantFetch(
+	participantId: string,
+	eventId: string,
+	token: string,
+): Promise<UserDataResponse> {
+	return await GetParticipantApi(participantId, eventId, token);
+}
+
+export async function createConnection(
+	eventId: string,
+	primaryParticipantId: string,
+	secondaryParticipantId: string,
+	token: string,
+	description?: string | null,
+): Promise<CreateUserConnectionResponse> {
+	return await CreateUserConnectionsApi(
+		eventId,
+		primaryParticipantId,
+		secondaryParticipantId,
+		token,
+		description,
+	);
+}
+
+export async function userUpdate(
+	userId: string,
+	updates: Partial<User>,
+	token: string,
+): Promise<UserInfoUpdateResponse> {
+	return await UserUpdateApi(userId, updates, token);
 }
diff --git a/shatter-web/src/hooks/useEventData.ts b/shatter-web/src/hooks/useEventData.ts
index 0116d51..79d696e 100644
--- a/shatter-web/src/hooks/useEventData.ts
+++ b/shatter-web/src/hooks/useEventData.ts
@@ -32,7 +32,7 @@ export function useEventData(joinCode: string | undefined) {
     }
 
     setLoading(true);
-    setError(null);
+    setError("");
     
     fetch(`${import.meta.env.VITE_API_URL}/events/event/${joinCode}`, {
       cache: "no-store",