Skip to content

Commit ce627a2

Browse files
committed
chore: sync ChatScreen, ChatList, and ChatService updates
1 parent 728e7f9 commit ce627a2

2 files changed

Lines changed: 12 additions & 6 deletions

File tree

src/components/ChatScreen.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
grid-template-columns: 320px 1fr;
8484
gap: 0;
8585
height: calc(100% - 52px);
86+
overflow: hidden;
8687
}
8788

8889
/* Sidebar */
@@ -91,6 +92,8 @@
9192
background: #f7f9fc;
9293
display: flex;
9394
flex-direction: column;
95+
height: 100%;
96+
overflow: hidden;
9497
}
9598

9699
.sidebar-header {
@@ -111,6 +114,7 @@
111114
}
112115

113116
.conversation-list {
117+
flex: 1;
114118
overflow-y: auto;
115119
padding: 8px;
116120
}
@@ -200,6 +204,8 @@
200204
display: flex;
201205
flex-direction: column;
202206
min-width: 0;
207+
height: 100%;
208+
overflow: hidden;
203209
}
204210

205211
.chat-panel-header {

src/services/chat.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ export class ChatService {
8282
type,
8383
names,
8484
unRead,
85-
createdAt: Date.now(),
86-
updatedAt: Date.now(),
85+
createdAt: serverTimestamp(),
86+
updatedAt: serverTimestamp(),
8787
latestMessage: null,
8888
latestMessageTime: null,
8989
createdBy: initiatorId,
@@ -193,8 +193,8 @@ export class ChatService {
193193
doc(this.db, COLLECTIONS.CONVERSATIONS, conversationId),
194194
{
195195
latestMessage: { ...messageData, id: messageRef.id },
196-
latestMessageTime: Date.now(),
197-
updatedAt: Date.now(),
196+
latestMessageTime: serverTimestamp(),
197+
updatedAt: serverTimestamp(),
198198
}
199199
);
200200

@@ -298,8 +298,8 @@ export class ChatService {
298298
name: names[userId] || '',
299299
members: data.members || [],
300300
unRead: unreadCounts,
301-
updatedAt: data.updatedAt ? new Date(data.updatedAt).valueOf() : Date.now(),
302-
joinedAt: data.createdAt ? new Date(data.createdAt).valueOf() : Date.now(),
301+
updatedAt: data.updatedAt?.toMillis?.() ?? data.updatedAt ?? Date.now(),
302+
joinedAt: data.createdAt?.toMillis?.() ?? data.createdAt ?? Date.now(),
303303
latestMessage: data.latestMessage || undefined,
304304
});
305305
});

0 commit comments

Comments
 (0)