From 66f540c6eb95ad8ed8d0f0c9f8b45dde735925f1 Mon Sep 17 00:00:00 2001 From: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com> Date: Wed, 12 Jul 2023 17:15:06 +0300 Subject: [PATCH] Merge pull request #13845 from overleaf/ii-rp-incorrect-date [web] Fix date issues in review panel GitOrigin-RevId: 447185cc97aae5a2e6d8944be578fa103b39325b --- .../review-panel/entries/aggregate-change-entry.tsx | 2 +- .../components/review-panel/entries/change-entry.tsx | 2 +- .../source-editor/components/review-panel/entries/comment.tsx | 2 +- .../review-panel/entries/resolved-comment-entry.tsx | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/web/frontend/js/features/source-editor/components/review-panel/entries/aggregate-change-entry.tsx b/services/web/frontend/js/features/source-editor/components/review-panel/entries/aggregate-change-entry.tsx index a683bf4b13..a3643e559b 100644 --- a/services/web/frontend/js/features/source-editor/components/review-panel/entries/aggregate-change-entry.tsx +++ b/services/web/frontend/js/features/source-editor/components/review-panel/entries/aggregate-change-entry.tsx @@ -147,7 +147,7 @@ function AggregateChangeEntry({ )}
- {formatTime(entry.metadata.ts, 'MMM d, y h:mm a')} + {formatTime(entry.metadata.ts, 'MMM D, Y h:mm A')}  •  {user && (
- {formatTime(entry.metadata.ts, 'MMM d, y h:mm a')} + {formatTime(entry.metadata.ts, 'MMM D, Y h:mm A')}  •  {user && ( {!editing && (
- {!deleting && formatTime(comment.timestamp, 'MMM d, y h:mm a')} + {!deleting && formatTime(comment.timestamp, 'MMM D, Y h:mm A')} {comment.user.isSelf && !deleting && (  •  diff --git a/services/web/frontend/js/features/source-editor/components/review-panel/entries/resolved-comment-entry.tsx b/services/web/frontend/js/features/source-editor/components/review-panel/entries/resolved-comment-entry.tsx index a66e372de1..effe9d344a 100644 --- a/services/web/frontend/js/features/source-editor/components/review-panel/entries/resolved-comment-entry.tsx +++ b/services/web/frontend/js/features/source-editor/components/review-panel/entries/resolved-comment-entry.tsx @@ -88,7 +88,7 @@ function ResolvedCommentEntry({

- {formatTime(comment.timestamp, 'MMM d, y h:mm a')} + {formatTime(comment.timestamp, 'MMM D, Y h:mm A')}
) @@ -104,7 +104,7 @@ function ResolvedCommentEntry({ {t('mark_as_resolved')}.

- {formatTime(thread.resolved_at, 'MMM d, y h:mm a')} + {formatTime(thread.resolved_at, 'MMM D, Y h:mm A')}