Merge branch 'main' into firebase-conflict-reosulutions

ufosc · Feb 25, 2024 · 87377e6 · 87377e6
2 parents 9263c96 + 1bd5642
commit 87377e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/client/src/contexts/SocketContext.tsx b/client/src/contexts/SocketContext.tsx
@@ -35,10 +35,10 @@ export const SocketProvider = ({ children }: { children: React.ReactNode }) => {
       setMounted(true);
     }
 
+
     if (!mounted) {
       initializeSocket();
     }
-
     return () => {
       console.log("[LOG]: Cleaning up intializeSocket useEffect");
     };

diff --git a/client/src/services/store.ts b/client/src/services/store.ts
@@ -1,8 +1,8 @@
 import { User, createUserWithEmailAndPassword, onAuthStateChanged, signInWithEmailAndPassword, signOut } from 'firebase/auth'
 import { Store } from 'pullstate'
 import { auth, app } from '../configs/firebaseConfig'
-
-
+import { FirebaseError } from 'firebase/app';
+import { useUser } from '../contexts/UserContext';
 
 interface AuthStoreInterface {
     isLoggedin: boolean,