From 29f2f366ee63a2a2112d2234073f90dd4285a351 Mon Sep 17 00:00:00 2001
From: Aman Harwara <amanharwara@protonmail.com>
Date: Mon, 23 Oct 2023 19:37:45 +0530
Subject: [PATCH] chore: fix timestamps

---
 .../NoteConflictResolutionModal/ConflictListItem.tsx   |  4 ++--
 .../Components/NotesOptions/NoteAttributes.tsx         | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/web/src/javascripts/Components/NoteView/NoteConflictResolutionModal/ConflictListItem.tsx b/packages/web/src/javascripts/Components/NoteView/NoteConflictResolutionModal/ConflictListItem.tsx
index e3420493f..98bedd7d9 100644
--- a/packages/web/src/javascripts/Components/NoteView/NoteConflictResolutionModal/ConflictListItem.tsx
+++ b/packages/web/src/javascripts/Components/NoteView/NoteConflictResolutionModal/ConflictListItem.tsx
@@ -22,7 +22,7 @@ export const ConflictListItem = ({
   note: SNNote
 }) => {
   const application = useApplication()
-  const { words, characters, paragraphs, dateLastModified, dateCreated, format } = useNoteAttributes(application, note)
+  const { words, characters, paragraphs, serverUpdatedAt, dateCreated, format } = useNoteAttributes(application, note)
 
   return (
     <button
@@ -49,7 +49,7 @@ export const ConflictListItem = ({
               <Icon type="restore" size="medium" />
             </div>
           </StyledTooltip>
-          <VisuallyHidden>Last modified</VisuallyHidden> {dateLastModified}
+          <VisuallyHidden>Last modified</VisuallyHidden> {serverUpdatedAt}
         </div>
         <div className="mb-1.5 flex items-center gap-2">
           <StyledTooltip gutter={8} label="Created" className="!z-modal">
diff --git a/packages/web/src/javascripts/Components/NotesOptions/NoteAttributes.tsx b/packages/web/src/javascripts/Components/NotesOptions/NoteAttributes.tsx
index 9b8f7e4b2..f0e95db0a 100644
--- a/packages/web/src/javascripts/Components/NotesOptions/NoteAttributes.tsx
+++ b/packages/web/src/javascripts/Components/NotesOptions/NoteAttributes.tsx
@@ -10,7 +10,8 @@ export const useNoteAttributes = (application: WebApplicationInterface, note: SN
 
   const readTime = useMemo(() => (typeof words === 'number' ? calculateReadTime(words) : 'N/A'), [words])
 
-  const dateLastModified = useMemo(() => formatDateForContextMenu(note.userModifiedDate), [note.userModifiedDate])
+  const userModifiedDate = useMemo(() => formatDateForContextMenu(note.userModifiedDate), [note.userModifiedDate])
+  const serverUpdatedAt = useMemo(() => formatDateForContextMenu(note.serverUpdatedAt), [note.serverUpdatedAt])
 
   const dateCreated = useMemo(() => formatDateForContextMenu(note.created_at), [note.created_at])
 
@@ -22,7 +23,8 @@ export const useNoteAttributes = (application: WebApplicationInterface, note: SN
     characters,
     paragraphs,
     readTime,
-    dateLastModified,
+    userModifiedDate,
+    serverUpdatedAt,
     dateCreated,
     format,
   }
@@ -33,7 +35,7 @@ export const NoteAttributes: FunctionComponent<{
   note: SNNote
   className?: string
 }> = ({ application, note, className }) => {
-  const { words, characters, paragraphs, readTime, dateLastModified, dateCreated, format } = useNoteAttributes(
+  const { words, characters, paragraphs, readTime, userModifiedDate, dateCreated, format } = useNoteAttributes(
     application,
     note,
   )
@@ -51,7 +53,7 @@ export const NoteAttributes: FunctionComponent<{
         </>
       ) : null}
       <div className="mb-1">
-        <span className="font-semibold">Last modified:</span> {dateLastModified}
+        <span className="font-semibold">Last modified:</span> {userModifiedDate}
       </div>
       <div className="mb-1">
         <span className="font-semibold">Created:</span> {dateCreated}