Merge pull request #1493 from Instadapp/hf/batch-modal-close

fix: remove nested try-catch
oddgeeks · Jan 10, 2024 · d26bf31 · d26bf31
2 parents 61689c0 + 9b4abfe
commit d26bf31
Showing 1 changed file with 11 additions and 25 deletions.
diff --git a/components/modals/TransactionBatch.vue b/components/modals/TransactionBatch.vue
@@ -8,7 +8,6 @@ const { transactionStack } = storeToRefs(useShared())
 const { removeActionsByChainId, removeActionsByMetadata } = useShared()
 const { tokens } = storeToRefs(useTokens())
 const { sendTransactions } = useAvocadoSafe()
-const { switchToAvocadoNetwork } = useNetworks()
 const { parseTransactionError } = useErrorHandler()
 
 const loading = ref(false)
@@ -57,32 +56,19 @@ async function onSubmit() {
   try {
     loading.value = true
 
-    await switchToAvocadoNetwork()
-
     for await (const action of multipleActions.value) {
-      try {
-        const hash = await sendTransactions(
-          action.actions,
-          action.chainId,
-          action.options,
-          'transfer',
-        )
-
-        if (hash) {
-          addTransactionToQueue({
-            hash,
-            chainId: action.chainId,
-          })
-        }
-      }
-      catch (e: any) {
-        const err = parseTransactionError(e)
-
-        openSnackbar({
-          message: err.formatted,
-          type: 'error',
+      const hash = await sendTransactions(
+        action.actions,
+        action.chainId,
+        action.options,
+        'transfer',
+      )
+
+      if (hash) {
+        addTransactionToQueue({
+          hash,
+          chainId: action.chainId,
         })
-        continue
       }
     }