Merge branch 'master' into develop

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gnosis.pm/dex-react",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "",
   "main": "src/index.js",
   "sideEffects": false,

src/api/wallet/composeProvider.ts

@@ -20,6 +20,15 @@ import {
   removeTxPendingApproval,
 } from 'components/OuterModal'
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const sanitizeErrorData = (jsonRpcError?: JsonRpcError<any>): void => {
+  if (!jsonRpcError) return
+
+  if (jsonRpcError.data?.originalError) {
+    jsonRpcError.data = jsonRpcError.data.originalError.data
+  }
+}
+
 // custom providerAsMiddleware
 function providerAsMiddleware(provider: Provider): JsonRpcMiddleware {
   // WalletConnectProvider.sendAsync is web3-provider-engine.sendAsync
@@ -46,10 +55,17 @@ function providerAsMiddleware(provider: Provider): JsonRpcMiddleware {
         return
       }
 
-      provider.request(req).then((providerRes) => {
-        Object.assign(res, providerRes)
-        end()
-      }, end)
+      provider.request(req).then(
+        (providerRes) => {
+          Object.assign(res, providerRes)
+          sanitizeErrorData(res.error)
+          end()
+        },
+        (error) => {
+          sanitizeErrorData(error)
+          end(error)
+        },
+      )
     }
   }
 
@@ -62,7 +78,11 @@ function providerAsMiddleware(provider: Provider): JsonRpcMiddleware {
 
     provider[sendFName](req, (err: JsonRpcError<unknown>, providerRes: JsonRpcResponse<unknown>) => {
       // forward any error
-      if (err) return end(err)
+      if (err) {
+        sanitizeErrorData(err)
+        return end(err)
+      }
+      sanitizeErrorData(providerRes.error)
       // copy provider response onto original response
       Object.assign(res, providerRes)
       end()