From ee6910200146ce5b868b3e4297d17ef54bad1b6f Mon Sep 17 00:00:00 2001
From: Aman Harwara <amanharwara@protonmail.com>
Date: Tue, 21 Jun 2022 16:56:33 +0530
Subject: [PATCH] fix: session history (#1128)

---
 .../RevisionHistoryModal/SessionHistoryList.tsx          | 2 +-
 .../javascripts/Components/RevisionHistoryModal/utils.ts | 9 +++++----
 .../Controllers/NoteHistory/NoteHistoryController.ts     | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/web/src/javascripts/Components/RevisionHistoryModal/SessionHistoryList.tsx b/packages/web/src/javascripts/Components/RevisionHistoryModal/SessionHistoryList.tsx
index 34b7df92a..618e637bc 100644
--- a/packages/web/src/javascripts/Components/RevisionHistoryModal/SessionHistoryList.tsx
+++ b/packages/web/src/javascripts/Components/RevisionHistoryModal/SessionHistoryList.tsx
@@ -37,7 +37,7 @@ const SessionHistoryList: FunctionComponent<Props> = ({ noteHistoryController })
               {group.entries.map((entry, index) => (
                 <HistoryListItem
                   key={index}
-                  isSelected={selectedRevision?.payload.created_at === entry.payload.created_at}
+                  isSelected={selectedRevision?.payload.updated_at === entry.payload.updated_at}
                   onClick={() => {
                     selectSessionRevision(entry)
                   }}
diff --git a/packages/web/src/javascripts/Components/RevisionHistoryModal/utils.ts b/packages/web/src/javascripts/Components/RevisionHistoryModal/utils.ts
index 782b5bc39..4b329da67 100644
--- a/packages/web/src/javascripts/Components/RevisionHistoryModal/utils.ts
+++ b/packages/web/src/javascripts/Components/RevisionHistoryModal/utils.ts
@@ -17,15 +17,16 @@ export type ListGroup<EntryType extends RevisionEntry> = {
 export type RemoteRevisionListGroup = ListGroup<RevisionListEntry>
 export type SessionRevisionListGroup = ListGroup<NoteHistoryEntry>
 
-export const formatDateAsMonthYearString = (date: Date) =>
-  date.toLocaleDateString(undefined, {
+export const formatDateAsMonthYearString = (date: Date) => {
+  return date.toLocaleDateString(undefined, {
     month: 'long',
     year: 'numeric',
   })
+}
 
 export const getGroupIndexForEntry = (entry: RevisionEntry, groups: ListGroup<RevisionEntry>[]) => {
   const todayAsDate = new Date()
-  const entryDate = new Date((entry as RevisionListEntry).created_at ?? (entry as NoteHistoryEntry).payload.created_at)
+  const entryDate = new Date((entry as RevisionListEntry).created_at ?? (entry as NoteHistoryEntry).payload.updated_at)
 
   const differenceBetweenDatesInDays = calculateDifferenceBetweenDatesInDays(todayAsDate, entryDate)
 
@@ -78,7 +79,7 @@ export const sortRevisionListIntoGroups = <EntryType extends RevisionEntry>(revi
     } else {
       addBeforeLastGroup({
         title: formatDateAsMonthYearString(
-          new Date((entry as RevisionListEntry).created_at ?? (entry as NoteHistoryEntry).payload.created_at),
+          new Date((entry as RevisionListEntry).created_at ?? (entry as NoteHistoryEntry).payload.updated_at),
         ),
         entries: [entry],
       })
diff --git a/packages/web/src/javascripts/Controllers/NoteHistory/NoteHistoryController.ts b/packages/web/src/javascripts/Controllers/NoteHistory/NoteHistoryController.ts
index ab6512c59..227fd0298 100644
--- a/packages/web/src/javascripts/Controllers/NoteHistory/NoteHistoryController.ts
+++ b/packages/web/src/javascripts/Controllers/NoteHistory/NoteHistoryController.ts
@@ -174,6 +174,7 @@ export class NoteHistoryController {
     this.clearSelection()
     this.setSelectedEntry(entry)
     this.setSelectedRevision(entry)
+    this.setContentState(RevisionContentState.Loaded)
   }
 
   private get flattenedRemoteHistory() {