Merge pull request #1165 from edenia/fix/review-endpoints-timeout

fix(webapp): Endpoints fail in Account and Contracts page
edenia · Mar 7, 2023 · 8462d17 · 8462d17
2 parents 9e84ac7 + 3cd018a
commit 8462d17
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/webapp/src/context/state.context.js b/webapp/src/context/state.context.js
@@ -195,7 +195,7 @@ export const useSharedState = () => {
         },
       })
     } catch (error) {
-      console.error(error)
+      console.error(error?.message || error)
     }
   }, [dispatch, state.tpb, state.tps, state.tpsWaitingBlock])
 
@@ -218,7 +218,7 @@ export const useSharedState = () => {
 
         dispatch({ type: 'updateSchedule', payload: result.active })
       } catch (error) {
-        console.error(error)
+        console.error(error?.message || error)
 
         if (error?.message === ENDPOINTS_ERROR) {
           await stopTrackingProducerSchedule()
@@ -250,7 +250,7 @@ export const useSharedState = () => {
 
         setLastBlock(info.head_block_num)
       } catch (error) {
-        console.error(error)
+        console.error(error?.message || error)
 
         if (error?.message === ENDPOINTS_ERROR) {
           await stopTrackingInfo()

diff --git a/webapp/src/utils/eosapi.js b/webapp/src/utils/eosapi.js
@@ -6,7 +6,7 @@ export const ENDPOINTS_ERROR =
   'Each endpoint failed when trying to execute the function'
 
 const waitRequestInterval = 120000
-const timeout = 15000
+const timeout = 60000
 const eosApis = eosConfig.endpoints.map(endpoint => {
   return {
     api: EosApi({
@@ -61,11 +61,14 @@ const callWithTimeout = async (promise, ms) => {
     timeoutID = setTimeout(() => reject(new Error(timeoutMessage)), ms)
   })
 
-  return Promise.race([promise, timeoutPromise]).then((response) => {
-    clearTimeout(timeoutID)
-
-    return response
-  })
+  return Promise.race([promise, timeoutPromise])
+    .then(response => response)
+    .catch(error => {
+      throw error
+    })
+    .finally(() => {
+      clearTimeout(timeoutID)
+    })
 }
 
 const getAbi = async account => {