From 401d4b8c010d6fe67ef9193d45cc44bbd98e2457 Mon Sep 17 00:00:00 2001
From: kyle-ssg <kyle@solidstategroup.com>
Date: Tue, 14 Oct 2025 13:41:35 +0100
Subject: [PATCH] fix change request navigation

---
 .../web/components/pages/ChangeRequestDetailPage.tsx | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/frontend/web/components/pages/ChangeRequestDetailPage.tsx b/frontend/web/components/pages/ChangeRequestDetailPage.tsx
index 12a27bb5f2bf..586f61a7a1a3 100644
--- a/frontend/web/components/pages/ChangeRequestDetailPage.tsx
+++ b/frontend/web/components/pages/ChangeRequestDetailPage.tsx
@@ -38,9 +38,9 @@ import DiffChangeRequest from 'components/diff/DiffChangeRequest'
 import JSONReference from 'components/JSONReference'
 import ErrorMessage from 'components/ErrorMessage'
 import ConfigProvider from 'common/providers/ConfigProvider'
+import { useHistory } from 'react-router-dom'
 
 type ChangeRequestPageType = {
-  router: RouterChildContext['router']
   match: {
     params: {
       environmentId: string
@@ -50,10 +50,8 @@ type ChangeRequestPageType = {
   }
 }
 
-const ChangeRequestDetailPage: FC<ChangeRequestPageType> = ({
-  match,
-  router,
-}) => {
+const ChangeRequestDetailPage: FC<ChangeRequestPageType> = ({ match }) => {
+  const history = useHistory()
   const { environmentId, id, projectId } = match.params
   const [_, setUpdate] = useState(Date.now())
   const error = ChangeRequestStore.error
@@ -145,7 +143,7 @@ const ChangeRequestDetailPage: FC<ChangeRequestPageType> = ({
       destructive: true,
       onYes: () => {
         AppActions.deleteChangeRequest(id, () => {
-          router.history.replace(
+          history.replace(
             `/project/${projectId}/environment/${environmentId}/change-requests`,
           )
         })
@@ -163,7 +161,7 @@ const ChangeRequestDetailPage: FC<ChangeRequestPageType> = ({
     openModal(
       'Edit Change Request',
       <CreateFlagModal
-        history={router.history}
+        history={history}
         environmentId={environmentId}
         projectId={projectId}
         changeRequest={changeRequest}