From 4349defbc20f9bebc45d843269f614f45edb0325 Mon Sep 17 00:00:00 2001
From: Evan Purkhiser <evanpurkhiser@gmail.com>
Date: Thu, 29 Aug 2024 15:09:10 -0400
Subject: [PATCH] fix(rr6): Avoid recursive import of useNavigate/useRouter
 (#76747)

---
 static/app/utils/useNavigate.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/static/app/utils/useNavigate.tsx b/static/app/utils/useNavigate.tsx
index 8df3abc400a27..148a6b8b51429 100644
--- a/static/app/utils/useNavigate.tsx
+++ b/static/app/utils/useNavigate.tsx
@@ -6,7 +6,7 @@ import {NODE_ENV} from 'sentry/constants';
 import normalizeUrl from 'sentry/utils/url/normalizeUrl';
 
 import {locationDescriptorToTo} from './reactRouter6Compat/location';
-import useRouter from './useRouter';
+import {useRouteContext} from './useRouteContext';
 
 type NavigateOptions = {
   replace?: boolean;
@@ -48,8 +48,11 @@ export function useNavigate(): ReactRouter3Navigate {
     return navigate;
   }
 
+  // XXX(epurkihser): We are using react-router 3 here, to avoid recursive
+  // dependencies we just use the useRouteContext instead of useRouter here
+
   // biome-ignore lint/correctness/useHookAtTopLevel: react-router-6 migration
-  const router = useRouter();
+  const {router} = useRouteContext();
 
   // biome-ignore lint/correctness/useHookAtTopLevel: react-router-6 migration
   const hasMountedRef = useRef(false);