Updated to Expo 51 SDK

client/.eslintrc.js

@@ -1,3 +1,4 @@
+// https://docs.expo.dev/guides/using-eslint/
 module.exports = {
-  extends: "universe/native",
+  extends: 'expo',
 };

client/src/components/auth/AuthenticationResponse.tsx → client/app/components/auth/AuthenticationResponse.tsx

@@ -1,5 +1,5 @@
-import { FirebaseError } from "firebase/app";
-import { User } from "firebase/auth";
+import { FirebaseError } from "@firebase/app";
+import { User } from "@firebase/auth";
 import React from "react";
 import { StyleSheet, Text, Dimensions, TouchableOpacity } from "react-native";
 

client/src/components/chat/NearbyCount.tsx → client/app/components/chat/NearbyCount.tsx

@@ -9,7 +9,7 @@ const NearbyCount: React.FC<CounterProps> = ({ count }) => {
       <View style={styles.iconAndCount}>
         <Image
           style={styles.iconImage}
-          source={require("../../../assets/nearby_icon.png")}
+          source={require("../../../assets/icons/misc/nearby_icon.png")}
         />
         <Text style={styles.countText}>{count}</Text>
       </View>

client/src/configs/firebaseConfig.ts → client/app/configs/firebaseConfig.ts

@@ -1,12 +1,12 @@
 import { API_KEY, AUTH_DOMAIN } from "@env"; // Don't worry about this env error!
 import AsyncStorage from "@react-native-async-storage/async-storage";
-import { initializeApp, getApp, getApps } from "firebase/app";
+import { initializeApp, getApp, getApps } from "@firebase/app";
 import {
   initializeAuth,
   getReactNativePersistence,
   getAuth,
   Auth,
-} from "firebase/auth";
+} from "@firebase/auth";
 
 const firebaseConfig = {
   apiKey: API_KEY || "Mock-Key",

client/App.tsx → client/app/index.js

@@ -1,13 +1,12 @@
-import { NavigationContainer } from "@react-navigation/native";
 import React from "react";
 import { Text } from "react-native";
 
 // Navigation
-import AppNavigator from "./src/navigation/AppNavigator";
-import AuthNavigator from "./src/navigation/AuthNavigator";
+import AppNavigator from "./navigation/AppNavigator";
+import AuthNavigator from "./navigation/AuthNavigator";
 // Services/Hooks/Styles
-import { AuthStore } from "./src/services/AuthStore";
-import { useGlobalFonts } from "./src/styles/fonts";
+import { AuthStore } from "./services/AuthStore";
+import { useGlobalFonts } from "./styles/fonts";
 
 const App = () => {
   const { initialized, isLoggedin } = AuthStore.useState();
@@ -18,9 +17,7 @@ const App = () => {
   if (!initialized) return <Text>Loading...</Text>;
 
   return (
-    <NavigationContainer>
-      {isLoggedin ? <AppNavigator /> : <AuthNavigator />}
-    </NavigationContainer>
+    isLoggedin ? <AppNavigator /> : <AuthNavigator />
   );
 };
 

client/src/services/AuthStore.ts → client/app/services/AuthStore.ts

@@ -4,7 +4,7 @@
   onAuthStateChanged,
   signInWithEmailAndPassword,
   signOut,
-} from "firebase/auth";
+} from "@firebase/auth";
 import { Store } from "pullstate";
 
 import { auth } from "../configs/firebaseConfig";
@@ -21,10 +21,10 @@
   userAuthInfo: null,
 });
 
 const unsub = onAuthStateChanged(auth, (user) => {
   console.log("onAuthStateChanged", user);
   AuthStore.update((store) => {
     (store.initialized = true),
       (store.isLoggedin = !!user),
       (store.userAuthInfo = user);
   });

client/app/types/env.d.ts

@@ -0,0 +1,5 @@
+declare module '@env' {
+
+export const EXPO_IP: string;
+export const API_KEY, AUTH_DOMAIN, PROJECT_ID, STORAGE_BUCKET, MESSAGING_SENDER_ID, APP_ID: string;
+}

client/babel.config.js

@@ -3,7 +3,6 @@ module.exports = function (api) {
   return {
     presets: ["babel-preset-expo"],
     plugins: [
-      "expo-router/babel",
       [
         "module:react-native-dotenv",
         {