improved error handling

(cherry picked from commit 9267ab4)
bobanetwork · Jun 17, 2022 · 1ef2c15 · 1ef2c15
1 parent f5ce151
commit 1ef2c15
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/packages/boba/gateway/src/actions/createAction.js b/packages/boba/gateway/src/actions/createAction.js
@@ -33,6 +33,13 @@ export function createAction (key, asyncAction) {
         return false
       }
 
+      if(response && typeof(response) === 'string' && response.includes('Insufficient balance')) {
+        //let errorMessage = JSON.parse(response)
+        dispatch({ type: `UI/ERROR/UPDATE`, payload: "Insufficient BOBA balance for emergency swap" })
+        dispatch({ type: `${key}/ERROR` })
+        return false
+      }
+
       //deal with metamask errors - they will have a 'code' field so we can detect those
       if(response && response.hasOwnProperty('message') && response.hasOwnProperty('code')) {
 

diff --git a/packages/boba/gateway/src/containers/wallet/Wallet.js b/packages/boba/gateway/src/containers/wallet/Wallet.js
@@ -115,6 +115,7 @@ function Wallet() {
 
   async function emergencySwap () {
     const res = await dispatch(getETHMetaTransaction())
+    console.log("emergencySwap - res:",res)
     if (res) dispatch(openAlert('Emergency Swap submitted'))
   }
 
@@ -129,7 +130,7 @@ function Wallet() {
       />
 
       {layer === 'L2' && tooSmallETH &&
-        <G.LayerAlert>
+        <G.LayerAlert style={{padding: '20px'}}>
           <G.AlertInfo>
             <Icon as={Info} sx={{color:"#BAE21A"}}/>
             <Typography

diff --git a/packages/boba/gateway/src/services/networkService.js b/packages/boba/gateway/src/services/networkService.js
@@ -549,6 +549,7 @@ class NetworkService {
     }
 
     let signature
+
     try {
       signature = await this.provider.send('eth_signTypedData_v4', [this.account, JSON.stringify(data)])
     } catch (error) {
@@ -569,6 +570,7 @@ class NetworkService {
       if(errorData.hasOwnProperty('error')) {
         errorData = errorData.error.error.body
       }
+      console.log("returning:",error)
       return errorData
     }
   }