Fix polling error handling

trilitech · Sep 18, 2024 · 90be62a · 90be62a
1 parent 5d1e423
commit 90be62a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/packages/data-polling/src/useReactQueryErrorHandler.ts b/packages/data-polling/src/useReactQueryErrorHandler.ts
@@ -6,20 +6,25 @@ import { useCallback } from "react";
 export const useReactQueryErrorHandler = () => {
   const dispatch = useAppDispatch();
   const toast = useToast();
+  const toastId = "data-fetching-error";
 
   return useCallback(
     (error: any) => {
       if (!error) {
         return;
       }
       dispatch(errorsActions.add(getErrorContext(error)));
-      toast({
-        id: "data-fetching-error",
-        description: `Data fetching error: ${error.message}`,
-        status: "error",
-        isClosable: true,
-        duration: 10000,
-      });
+
+      if (!toast.isActive(toastId)) {
+        toast({
+          id: toastId,
+          description: `Data fetching error: ${error.message}`,
+          status: "error",
+          isClosable: true,
+          duration: 10000,
+        });
+      }
+      console.error(error);
     },
     [dispatch, toast]
   );

diff --git a/packages/multisig/src/helpers.ts b/packages/multisig/src/helpers.ts
@@ -83,7 +83,7 @@ const parseMultisigOperation = (raw: RawTzktMultisigBigMap): MultisigOperation =
     bigmapId: bigmap,
     rawActions: value.actions,
     // For now, we assume the approver is always an implicit account
-    approvals: value.approvals.map(parseImplicitPkh),
+    approvals: value.approvals?.map(parseImplicitPkh) ?? [],
   };
 };