From 58c4fa413909302ca851b953b673becab4816e2b Mon Sep 17 00:00:00 2001
From: Jon Koops <jonkoops@gmail.com>
Date: Thu, 6 Apr 2023 14:07:08 +0200
Subject: [PATCH] Ensure requests are cancelled properly in `useFetch()`
 (#19568)

---
 js/apps/admin-ui/src/context/auth/AdminClient.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/apps/admin-ui/src/context/auth/AdminClient.tsx b/js/apps/admin-ui/src/context/auth/AdminClient.tsx
index de65f1930e..e4a95a55f1 100644
--- a/js/apps/admin-ui/src/context/auth/AdminClient.tsx
+++ b/js/apps/admin-ui/src/context/auth/AdminClient.tsx
@@ -38,10 +38,11 @@ export function useFetch<T>(
   deps?: DependencyList
 ) {
   const onError = useErrorHandler();
-  const controller = new AbortController();
-  const { signal } = controller;
 
   useEffect(() => {
+    const controller = new AbortController();
+    const { signal } = controller;
+
     adminClientCall()
       .then((result) => {
         if (!signal.aborted) {