Merge pull request #269 from oasisprotocol/lw/catch-timeout

Catch timeout error in waitForTransactionReceipt

Author: lukaw3d

.changelog/269.bugfix.md

@@ -0,0 +1 @@
+Catch timeout error in waitForTransactionReceipt

stake/src/pages/StakingAmountPage/index.tsx

@@ -94,32 +94,31 @@ const StakingAmountPageCmp: FC = () => {
     const sapphireAmount = NumberUtils.consensusAmountToSapphireAmount(value)
     setStep(Steps.DelegateInProgress)
 
-    sendTransactionAsync(await populateDelegateTx(sapphireAmount, to, gasPriceSnapshot), {
-      onSuccess: async hash => {
-        await getTransactionReceipt(hash)
-
-        const [delegations] = await Promise.all([fetchDelegations(), fetchValidators()])
-
-        // This should work in 99% of cases!
-        const [diff] = delegations.filter(
-          d =>
-            !prevDelegations.some(prevD => {
-              return FormattingUtils.serializeObj(prevD) === FormattingUtils.serializeObj(d)
-            })
-        )
+    try {
+      const hash = await sendTransactionAsync(await populateDelegateTx(sapphireAmount, to, gasPriceSnapshot))
+
+      await getTransactionReceipt(hash)
+
+      const [delegations] = await Promise.all([fetchDelegations(), fetchValidators()])
 
-        if (!diff) {
-          setError('Unable to retrieve stake! Navigate to dashboard, and continue from there.')
-          setStep(Steps.DelegateFailed)
-        }
+      // This should work in 99% of cases!
+      const [diff] = delegations.filter(
+        d =>
+          !prevDelegations.some(prevD => {
+            return FormattingUtils.serializeObj(prevD) === FormattingUtils.serializeObj(d)
+          })
+      )
 
-        setStep(Steps.DelegateSuccessful)
-      },
-      onError: e => {
-        setError(toErrorString(e as Error))
+      if (!diff) {
+        setError('Unable to retrieve stake! Navigate to dashboard, and continue from there.')
         setStep(Steps.DelegateFailed)
-      },
-    })
+      }
+
+      setStep(Steps.DelegateSuccessful)
+    } catch (e) {
+      setError(toErrorString(e as Error))
+      setStep(Steps.DelegateFailed)
+    }
   }
 
   const getAmountFromPercentage = (accountBalance => (percentage: number) => {

stake/src/pages/UnstakePage/index.tsx

@@ -125,37 +125,31 @@ const UnstakePageCmp: FC = () => {
     setError('')
     setStep(Steps.UndelegateInProgress)
 
-    sendTransactionAsync(await populateUndelegateTx(amountShares, to, gasPrice!), {
-      onSuccess: async hash => {
-        await getTransactionReceipt(hash)
-
-        const [undelegations] = await Promise.all([
-          fetchUndelegations(),
-          fetchDelegations(),
-          fetchValidators(),
-        ])
-
-        // This should work in 99% of cases!
-        const [diff] = undelegations.filter(
-          und =>
-            !prevUndelegations.some(prevUnd => {
-              return FormattingUtils.serializeObj(prevUnd) === FormattingUtils.serializeObj(und)
-            })
-        )
+    try {
+      const hash = await sendTransactionAsync(await populateUndelegateTx(amountShares, to, gasPrice!))
+      await getTransactionReceipt(hash)
+
+      const [undelegations] = await Promise.all([fetchUndelegations(), fetchDelegations(), fetchValidators()])
+
+      // This should work in 99% of cases!
+      const [diff] = undelegations.filter(
+        und =>
+          !prevUndelegations.some(prevUnd => {
+            return FormattingUtils.serializeObj(prevUnd) === FormattingUtils.serializeObj(und)
+          })
+      )
 
-        if (!diff) {
-          throw new Error('Unable to retrieve unstake! Navigate to dashboard, and continue from there.')
-        }
+      if (!diff) {
+        throw new Error('Unable to retrieve unstake! Navigate to dashboard, and continue from there.')
+      }
 
-        setUndelegationEpoch(diff.epoch)
+      setUndelegationEpoch(diff.epoch)
 
-        setStep(Steps.UndelegateSuccessful)
-      },
-      onError: e => {
-        setError(toErrorString(e as Error))
-        setStep(Steps.UndelegateFailed)
-      },
-    })
+      setStep(Steps.UndelegateSuccessful)
+    } catch (e) {
+      setError(toErrorString(e as Error))
+      setStep(Steps.UndelegateFailed)
+    }
   }
 
   const getAmountFromPercentage = (delegationShares => (percentage: number) => {