fix: fix incorrect isFuture calculation in history section

Author: joshuawootonn

src/app/history/history-log-2.tsx

@@ -12,8 +12,8 @@ import {
     endOfWeek,
     eachDayOfInterval,
     isWithinInterval,
-    startOfToday,
     isSameYear,
+    endOfToday,
 } from 'date-fns'
 import { MonthlyLogDTO } from './log2'
 import clsx from 'clsx'
@@ -29,7 +29,7 @@ function isInThisYear(date: Date) {
 }
 
 function isInTheFuture(date: Date) {
-    return isAfter(date, startOfToday())
+    return isAfter(date, endOfToday())
 }
 
 export function HistoryLogV2({ monthLogs }: { monthLogs: MonthlyLogDTO[] }) {
@@ -62,8 +62,8 @@ export function HistoryLogV2({ monthLogs }: { monthLogs: MonthlyLogDTO[] }) {
                                     {isThisMonth(month)
                                         ? 'This Month'
                                         : isInThisYear(month)
-                                        ? format(month, 'MMMM')
-                                        : format(month, 'MMMM, yyyy')}
+                                          ? format(month, 'MMMM')
+                                          : format(month, 'MMMM, yyyy')}
                                 </h3>
                                 <p>Verses: {monthLog.numberOfVersesTyped}</p>
                             </div>

src/app/history/log2.tsx

@@ -42,9 +42,10 @@ export function getLog2(
     for (const typingSession of typingSessions) {
         if (typingSession.typedVerses.length === 0) continue
         const serverUTCOffset = new Date().getTimezoneOffset()
+
         const clientTimezoneCreatedAt = new Date(
             typingSession.createdAt.getTime() +
-                (clientTimezoneOffset - serverUTCOffset) * 60 * 1000,
+                (serverUTCOffset - clientTimezoneOffset) * 60 * 1000,
         )
         const monthString = format(clientTimezoneCreatedAt, 'yyyy-MM')
         const dayString = format(clientTimezoneCreatedAt, 'dd')
@@ -59,7 +60,7 @@ export function getLog2(
                     [dayString]: {
                         typedVerses: typingSession.typedVerses,
                         numberOfVersesTyped: typingSession.typedVerses.length,
-                        createdAt: clientTimezoneCreatedAt,
+                        createdAt: typingSession.createdAt,
                     },
                 },
             }
@@ -69,7 +70,7 @@ export function getLog2(
             currentMonthLog.days[dayString] = {
                 typedVerses: typingSession.typedVerses,
                 numberOfVersesTyped: typingSession.typedVerses.length,
-                createdAt: clientTimezoneCreatedAt,
+                createdAt: typingSession.createdAt,
             }
         } else {
             currentMonthLog.numberOfVersesTyped +=
@@ -82,7 +83,7 @@ export function getLog2(
                 numberOfVersesTyped:
                     currentDayLog.numberOfVersesTyped +
                     typingSession.typedVerses.length,
-                createdAt: clientTimezoneCreatedAt,
+                createdAt: typingSession.createdAt,
             }
         }
     }