fix user chats

Ethemkizilyer · Jul 5, 2024 · 192b6f2 · 192b6f2
1 parent db4bfea
commit 192b6f2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/components/Chat.jsx b/src/components/Chat.jsx
@@ -12,7 +12,7 @@ const Chat = () => {
   return (
     <div className="chat">
       <div className="chatInfo">
-        <span>{data?.user?.username}</span>
+        <span>{data?.user?.username || data?.user?.displayName}</span>
         <div className="chatIcons">
           <BsCameraVideo />
           <BiUserPlus />

diff --git a/src/components/Chats.jsx b/src/components/Chats.jsx
@@ -32,7 +32,7 @@ delete chats?.chats
         <div className="userChat" key={chat[0]} onClick={()=>handleSelect(chat[1]?.userInfo)}>
           <img src={chat[1]?.userInfo.avatar} alt="" />
           <div className="userChatInfo">
-            <span>{chat[1]?.userInfo.username}</span>
+            <span>{chat[1]?.userInfo?.username || chat[1]?.userInfo?.displayName}</span>
             <p>{chat[1]?.lastMessage?.text}</p>
           </div>
         </div>

diff --git a/src/components/Search.jsx b/src/components/Search.jsx
@@ -52,7 +52,7 @@ console.log(asd)
     const combinedId =
       currentUser.id > user.id
         ? currentUser.id + user.id
-        : user.uid + currentUser.id;
+        : user.id + currentUser.id;
     try {
       const res = await getDoc(doc(db, "chats", combinedId));
 
@@ -74,7 +74,7 @@ console.log(asd)
         await updateDoc(doc(db, "userchats", user.id), {
           [combinedId + ".userInfo"]: {
             id: currentUser.id,
-            displayName: currentUser.username,
+            username: currentUser.username,
             avatar: currentUser.avatar,
           },
           [combinedId + ".date"]: serverTimestamp(),