release(runway): cherry-pick fix: cp-13.12.0 Resolve race condition in useMultiPolling effect cleanup

ui/hooks/useMultiPolling.ts

@@ -26,14 +26,19 @@ const useMultiPolling = <PollingInput>(
   useEffect(() => {
     isMounted.current = true;
     return () => {
+      // stop all polling on dismount
+      for (const token of pollingTokens.current.values()) {
+        usePollingOptions.stopPollingByPollingToken(token);
+      }
+      prevPollingInputStringified.current = null;
       isMounted.current = false;
     };
   }, []);
 
   useEffect(() => {
     if (!completedOnboarding || !hasPollingInputChanged) {
       // don't start polling if no selected account, or onboarding is incomplete, or polling inputs haven't changed
-      return () => undefined;
+      return;
     }
 
     // start new polls
@@ -63,14 +68,6 @@ const useMultiPolling = <PollingInput>(
     prevPollingInputStringified.current = JSON.stringify(
       usePollingOptions.input,
     );
-
-    // stop all polling on dismount
-    return () => {
-      for (const token of pollingTokens.current.values()) {
-        usePollingOptions.stopPollingByPollingToken(token);
-      }
-      prevPollingInputStringified.current = null;
-    };
   }, [usePollingOptions, hasPollingInputChanged, completedOnboarding]);
 };