Improve exception handling

safe-global · Oct 29, 2024 · 62ebee0 · 62ebee0
1 parent 6a63e2a
commit 62ebee0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 38 deletions.
diff --git a/src/hooks/useConfirmSafeOperation.ts b/src/hooks/useConfirmSafeOperation.ts
@@ -45,12 +45,8 @@ export function useConfirmSafeOperation(
     ...params,
     mutationKey: [MutationKey.ConfirmSafeOperation],
     mutationSafeClientFn: async (signerClient, { safeOperationHash }) => {
-      if (!config?.safeOperationOptions)
-        throw new Error('SafeOperationOptions are not specified in SafeConfig')
-
-      if (!signerClient.confirmSafeOperation) {
-        throw new Error('You should add safeOperationOptions to the SafeConfig')
-      }
+      if (!config?.safeOperationOptions || !signerClient.confirmSafeOperation)
+        throw new Error('Property safeOperationOptions are not specified in SafeConfig')
 
       const result = await signerClient.confirmSafeOperation({
         safeOperationHash

diff --git a/src/hooks/usePendingSafeOperations.ts b/src/hooks/usePendingSafeOperations.ts
@@ -29,12 +29,8 @@ export function usePendingSafeOperations(
         throw new Error('Safe is not deployed')
       }
 
-      if (!config?.safeOperationOptions)
-        throw new Error('SafeOperationOptions are not specified in SafeConfig')
-
-      if (!safeClient.getPendingSafeOperations) {
-        throw new Error('You should add safeOperationOptions to the SafeConfig')
-      }
+      if (!config?.safeOperationOptions || !safeClient.getPendingSafeOperations)
+        throw new Error('Property safeOperationOptions are not specified in SafeConfig')
 
       const pendingSafeOperations = await safeClient.getPendingSafeOperations({
         limit: params.limit,

diff --git a/src/hooks/useSendSafeOperation.ts b/src/hooks/useSendSafeOperation.ts
@@ -39,33 +39,22 @@ export function useSendSafeOperation(
     ...params,
     mutationKey: [MutationKey.SendSafeOperation],
     mutationSafeClientFn: async (signerClient, { transactions = [], ...paymasterSendOptions }) => {
-      if (!config?.safeOperationOptions)
-        throw new Error('SafeOperationOptions are not specified in SafeConfig')
-
-      try {
-        console.log('sendSafeOperation', { transactions, ...paymasterSendOptions })
-
-        if (!signerClient.sendSafeOperation) {
-          throw new Error('You should add safeOperationOptions to the SafeConfig')
-        }
-
-        const result = await signerClient.sendSafeOperation({
-          transactions,
-          ...paymasterSendOptions
-        })
-        console.log('result', result)
-
-        if (result.safeOperations?.userOperationHash) {
-          invalidateQueries([QueryKey.SafeOperations, QueryKey.SafeInfo])
-        } else if (result.safeOperations?.safeOperationHash) {
-          invalidateQueries([QueryKey.PendingSafeOperations])
-        }
-
-        return result
-      } catch (error) {
-        console.error('error', error)
-        throw new Error("Couldn't send SafeOperation")
+      if (!config?.safeOperationOptions || !signerClient.sendSafeOperation)
+        throw new Error('Property safeOperationOptions are not specified in SafeConfig')
+
+      const result = await signerClient.sendSafeOperation({
+        transactions,
+        ...paymasterSendOptions
+      })
+      console.log('result', result)
+
+      if (result.safeOperations?.userOperationHash) {
+        invalidateQueries([QueryKey.SafeOperations, QueryKey.SafeInfo])
+      } else if (result.safeOperations?.safeOperationHash) {
+        invalidateQueries([QueryKey.PendingSafeOperations])
       }
+
+      return result
     }
   })