Merge pull request #1502 from decentdao/fix/use-async-retry-typing

Add better typing to `useAsyncRetry`
decentdao · Mar 29, 2024 · 1bdf008 · 1bdf008
2 parents 2a41563 + 19690dd
commit 1bdf008
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/src/components/pages/DaoHierarchy/useFetchNodes.tsx b/src/components/pages/DaoHierarchy/useFetchNodes.tsx
@@ -96,7 +96,7 @@ export function useFetchNodes(address?: string) {
     for await (const subDAO of nodes) {
       try {
         const safeInfo = await requestWithRetries(() => fetchDAOInfo(subDAO.address), 5, 5000);
-        if (safeInfo.guard) {
+        if (safeInfo && safeInfo.guard) {
           if (safeInfo.guard === ethers.constants.AddressZero) {
             subDAOs.push(safeInfo);
           } else {

diff --git a/src/hooks/DAO/loaders/governance/useAzoriusProposals.ts b/src/hooks/DAO/loaders/governance/useAzoriusProposals.ts
@@ -167,10 +167,12 @@ export const useAzoriusProposals = () => {
         );
       };
       const proposal = await requestWithRetries(func, 5, 7000);
-      action.dispatch({
-        type: FractalGovernanceAction.UPDATE_PROPOSALS_NEW,
-        payload: proposal,
-      });
+      if (proposal) {
+        action.dispatch({
+          type: FractalGovernanceAction.UPDATE_PROPOSALS_NEW,
+          payload: proposal,
+        });
+      }
     },
     [
       baseContracts,

diff --git a/src/hooks/utils/useAsyncRetry.ts b/src/hooks/utils/useAsyncRetry.ts
@@ -5,15 +5,9 @@ function sleep(ms: number) {
   return new Promise(resolve => setTimeout(resolve, ms));
 }
 
-export type RequestWithRetries<FuncRes = any> = (
-  func: () => Promise<FuncRes>,
-  retries: number,
-  secondsToWait?: number,
-) => Promise<FuncRes | {} | null | undefined>;
-
 export function useAsyncRetry() {
-  const requestWithRetries: RequestWithRetries = useCallback(
-    async (func: () => Promise<any>, retries: number, secondsToWait: number = 2000) => {
+  const requestWithRetries = useCallback(
+    async <T>(func: () => Promise<T>, retries: number, secondsToWait: number = 2000) => {
       let currentRetries = 0;
       let result = null;