Merge pull request #379 from autonomoussoftware/fix-send-error

Fix sending error messages from main to renderer

Author: gabmontes

public/main/main-worker.js

@@ -25,13 +25,22 @@ function onRendererEvent (eventName, listener) {
     const result = Promise.resolve(listener(data, event.sender))
 
     result
+      .then(res => res.error ? Promise.reject(res.error) : res)
       .then(function (res) {
         if (event.sender.isDestroyed()) {
           return
         }
         event.sender.send(eventName, { id, data: res })
         logger.verbose(`<-- ${eventName}:${id} ${JSON.stringify(res)}`)
       })
+      .catch(function (err) {
+        if (event.sender.isDestroyed()) {
+          return
+        }
+        const error = new WalletError(err.message)
+        event.sender.send(eventName, { id, data: { error } })
+        logger.warn(`<-- ${eventName}:${id} ${err.message}`)
+      })
       .catch(function (err) {
         logger.warn(`Could not send message to renderer: ${err.message}`)
       })