fix wallet connect

apps/remix-ide/src/blockchain/blockchain.tsx

@@ -940,12 +940,20 @@ export class Blockchain extends Plugin {
 
       cb(null, txResult, address, returnValue)
     } catch (error) {
-      if (this.isInjectedWeb3()) {
+      const buildError = async (errorMessage, errorData) => {
-        const errorMessage = error.innerError ? error.innerError.message : error.message
-        const errorData = error.innerError ? error.innerError.data : error.data
         const compiledContracts = await this.call('compilerArtefacts', 'getAllContractDatas')
-        const injectedError = txExecution.checkError({ errorMessage, errorData }, compiledContracts)
+        return txExecution.checkError({ errorMessage, errorData }, compiledContracts)
-        cb(injectedError.message)
+      }
+      let errorMessage
+      let errorData
+      if (error.innerError) {
+        errorMessage = error.innerError.message
+        errorData = error.innerError.data
+        cb((await buildError(errorMessage, errorData)).message)
+      } else if (error.message || error.data) {
+        errorMessage = error.message
+        errorData = error.data     
+        cb((await buildError(errorMessage, errorData)).message)
       } else 
         cb(error)
     }

apps/walletconnect/src/services/WalletConnectRemixClient.ts

@@ -106,25 +106,40 @@ export class WalletConnectRemixClient extends PluginClient {
 
         if (provider.isMetaMask) {
           return new Promise((resolve) => {
-            provider.sendAsync(data, (err, response) => {
+            provider.sendAsync(data, (error, response) => {
-              if (err) {
+              if (error) {
-                console.error(err)
+                if (error.data && error.data.originalError && error.data.originalError.data) {
-                return resolve({jsonrpc: '2.0', result: [], id: data.id})
+                  resolve({
+                    jsonrpc: '2.0',
+                    error: error.data.originalError,
+                    id: data.id
+                  })
+                } else if (error.data && error.data.message) {
+                  resolve({
+                    jsonrpc: '2.0',
+                    error: error.data && error.data,
+                    id: data.id
+                  })
+                } else {
+                  resolve({
+                    jsonrpc: '2.0',
+                    error,
+                    id: data.id
+                  })
+                }                
               }
               return resolve(response)
             })
           })
         } else {
           const message = await provider.request(data)
-
           return {jsonrpc: '2.0', result: message, id: data.id}
         }
       }
     } else {
-      console.error(
+      const err = `Cannot make ${data.method} request. Remix client is not connected to walletconnect client`
-        `Cannot make ${data.method} request. Remix client is not connected to walletconnect client`
+      console.error(err)
-      )
+      return {jsonrpc: '2.0', error: { message: err, code: -32603 }, id: data.id}
-      return {jsonrpc: '2.0', result: [], id: data.id}
     }
   }