From f93bec933c019c9b6c61373787dc009ea7664472 Mon Sep 17 00:00:00 2001
From: Mark Erikson <mark@isquaredsoftware.com>
Date: Sun, 5 Jan 2025 17:05:50 -0500
Subject: [PATCH] Fix cleanup hook issues

---
 packages/toolkit/src/query/react/buildHooks.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/toolkit/src/query/react/buildHooks.ts b/packages/toolkit/src/query/react/buildHooks.ts
index 9bd297b02f..9923b23990 100644
--- a/packages/toolkit/src/query/react/buildHooks.ts
+++ b/packages/toolkit/src/query/react/buildHooks.ts
@@ -65,10 +65,7 @@ import { useStableQueryArgs } from './useSerializedStableValue'
 import { useShallowStableValue } from './useShallowStableValue'
 import type { InfiniteQueryDirection } from '../core/apiState'
 import { isInfiniteQueryDefinition } from '../endpointDefinitions'
-import {
-  StartInfiniteQueryActionCreatorOptions,
-  StartInfiniteQueryActionCreator,
-} from '../core/buildInitiate'
+import { StartInfiniteQueryActionCreator } from '../core/buildInitiate'
 
 // Copy-pasted from React-Redux
 const canUseDOM = () =>
@@ -1647,7 +1644,8 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
     useEffect(() => {
       return () => {
         promiseRef.current?.unsubscribe?.()
-        promiseRef.current = undefined
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+        ;(promiseRef.current as any) = undefined
       }
     }, [promiseRef])
   }