Add DayChangeMarker where suitable before unconfirmed messages (#57)

open-chat-labs · Jan 14, 2021 · 9859444 · 9859444
1 parent 9ec27dd
commit 9859444
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/website/public/components/MessagesList.tsx b/src/website/public/components/MessagesList.tsx
@@ -38,6 +38,10 @@ function MessagesList() {
             continue;
         } else if (message.kind === "unconfirmed") {
             const now = new Date();
+            const dayString = now.toDateString();
+            if (lastSeenDayString === null || lastSeenDayString !== dayString) {
+                children.push(<DayChangeMarker key={dayString} date={now} />);
+            }
 
             const mergeWithPrevious: boolean =
                 lastSeenDate !== null &&
@@ -49,12 +53,14 @@ function MessagesList() {
                 mergeWithPrevious
             };
             children.push(<UnconfirmedMessage key={"u-" + i} {...props} />);
-            prevMessageSender = myUserId;
+
             lastSeenDate = now;
+            lastSeenDayString = dayString;
+            prevMessageSender = myUserId;
         } else {
             const dayString = message.date.toDateString();
             if (lastSeenDayString === null || lastSeenDayString !== dayString) {
-                children.push(<DayChangeMarker key={dayString} date={message.date}/>);
+                children.push(<DayChangeMarker key={dayString} date={message.date} />);
             }
 
             const mergeWithPrevious: boolean =