Merge pull request #5374 from trufflesuite/develop

chore(release): 2.7.1-beta

README.md

@@ -80,7 +80,7 @@ This will create a signed `.dmg` file in `./out/make`.
 
 #### On Linux:
 
-Bulding on Linux will create a `.AppImage` file, meant to run on many versions of Linux.
+Building on Linux will create a `.AppImage` file, meant to run on many versions of Linux.
 
 Linux requires no signing keys, so there's no set up. Simply run the following command:
 
@@ -105,11 +105,11 @@ Note from the author: I found managing these assets manually -- especially the a
 
 ### Flavored Development
 
-"Extras" aren't stored here in this repository fordue to file size issues, licensing issues, or both.
+"Extras" aren't stored here in this repository due to file size issues, licensing issues, or both.
 
 Non-ethereum "flavored" Ganache extras are uploaded to releases here: https://github.com/trufflesuite/ganache-flavors/releases
 
-When "extras" change they should be uploaded to a new release, and a corresonding Ganache release that targets the new ganache-flavors release (see `common/extras/index.js` for what you'dd need to update)
+When "extras" change they should be uploaded to a new release, and a corresponding Ganache release that targets the new ganache-flavors release (see `common/extras/index.js` for what you'd need to update)
 
 ### VS Code Debugging
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ganache/ui",
   "productName": "Ganache",
-  "version": "2.7.0",
+  "version": "2.7.1-beta",
   "description": "Personal Blockchain for Ethereum",
   "repository": {
     "type": "git",

src/integrations/ethereum/common/services/TruffleIntegrationService.js

@@ -165,10 +165,12 @@ class TruffleIntegrationService extends EventEmitter {
     return new Promise((resolve, reject) => {
       if (this.child !== null && this.child.connected) {
         this.once("decode-event-response", data => {
-          if (typeof data === "object") {
-            resolve(data);
+          if (data && data.error) {
+            reject(data.error);
           } else {
-            reject(data);
+            // data may be `undefined`, in which case the raw event will be displayed
+            // see https://github.com/trufflesuite/ganache-ui/issues/5296 for details
+            resolve(data);
           }
         });
         this.child.send({
@@ -185,10 +187,12 @@ class TruffleIntegrationService extends EventEmitter {
     return new Promise((resolve, reject) => {
       if (this.child !== null && this.child.connected) {
         this.once("decode-transaction-response", data => {
-          if (typeof data === "object") {
-            resolve(data);
+          if (data && data.error) {
+            reject(data.error);
           } else {
-            reject(data);
+            // data may be `undefined`, in which case the raw event will be displayed
+            // see https://github.com/trufflesuite/ganache-ui/issues/3805 for details
+            resolve(data);
           }
         });