From e397f14b6b4db7612097ac06c2ea12fddc3ee623 Mon Sep 17 00:00:00 2001
From: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>
Date: Mon, 30 Oct 2023 12:09:46 +0200
Subject: [PATCH] Merge pull request #15358 from
 overleaf/ii-ide-page-prototype-history-view

History diff view and changes list for React IDE page

GitOrigin-RevId: 1a4fb7abbb00537f45a3dc779120327cf9edc781
---
 .../frontend/js/features/ide-react/components/history.tsx  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/services/web/frontend/js/features/ide-react/components/history.tsx b/services/web/frontend/js/features/ide-react/components/history.tsx
index 4205b5e1ba..173b039b5f 100644
--- a/services/web/frontend/js/features/ide-react/components/history.tsx
+++ b/services/web/frontend/js/features/ide-react/components/history.tsx
@@ -1,6 +1,8 @@
 import { createPortal } from 'react-dom'
 import HistoryFileTree from '@/features/history/components/history-file-tree'
 import LoadingSpinner from '@/shared/components/loading-spinner'
+import DiffView from '@/features/history/components/diff-view/diff-view'
+import ChangeList from '@/features/history/components/change-list/change-list'
 import { useHistoryContext } from '@/features/history/context/history-context'
 
 export default function History() {
@@ -15,7 +17,10 @@ export default function History() {
         {updatesInfo.loadingState === 'loadingInitial' ? (
           <LoadingSpinner />
         ) : (
-          'History document diff viewer and versions list placeholder'
+          <>
+            <DiffView />
+            <ChangeList />
+          </>
         )}
       </div>
     </>