Fix date in same day

Signed-off-by: Ajay Bura <ajbura@gmail.com>

diff --git a/src/client/state/RoomTimeline.js b/src/client/state/RoomTimeline.js
index ea7376ad05c364f153fd087038ccbb9fd32fb66c..b6800ab199f6a6922eecdf7fce89582cfb4b3168 100644 (file)
--- a/src/client/state/RoomTimeline.js
+++ b/src/client/state/RoomTimeline.js
@@ -90,6 +90,7 @@ class RoomTimeline extends EventEmitter {
   }
 
   canPaginateBackward() {
+    if (this.timeline[0].getType() === 'm.room.create') return false;
     const tm = getFirstLinkedTimeline(this.activeTimeline);
     return tm.getPaginationToken('b') !== null;
   }

diff --git a/src/util/common.js b/src/util/common.js
index 8932aa6c0d085f5445cfc4406e0e7545f84227f4..d7f4c36500265458a8265143599584a2f784f588 100644 (file)
--- a/src/util/common.js
+++ b/src/util/common.js
@@ -14,11 +14,7 @@ export function diffMinutes(dt2, dt1) {
 }
 
 export function isInSameDay(dt2, dt1) {
-  return (
-    dt2.getDay() === dt1.getDay()
-    && dt2.getMonth() === dt1.getMonth()
-    && dt2.getYear() === dt1.getYear()
-  );
+  return (dt2.setHours(0, 0, 0, 0) === dt1.setHours(0, 0, 0, 0));
 }
 
 export function getEventCords(ev) {