Merge branch 'master' into uat

2 files changed, 13 insertions, 1 deletions

diff --git a/app/scripts/background.js b/app/scripts/background.js
index 8c1252d3e..0471cee3b 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -27,7 +27,7 @@ global.METAMASK_NOTIFIER = notificationManager
 
 // setup sentry error reporting
 const release = platform.getVersion()
-setupRaven({ release })
+const raven = setupRaven({ release })
 
 let popupIsOpen = false
 
@@ -77,6 +77,16 @@ function setupController (initState) {
   })
   global.metamaskController = controller
 
+  // report failed transactions to Sentry
+  controller.txController.on(`tx:status-update`, (txId, status) => {
+    if (status !== 'failed') return
+    const txMeta = controller.txController.txStateManager.getTx(txId)
+    raven.captureMessage('Transaction Failed', {
+      // "extra" key is required by Sentry
+      extra: txMeta,
+    })
+  })
+
   // setup state persistence
   pump(
     asStream(controller.store),
diff --git a/app/scripts/setupRaven.js b/app/scripts/setupRaven.js
index 4888c85fe..7beffeff9 100644
--- a/app/scripts/setupRaven.js
+++ b/app/scripts/setupRaven.js
@@ -21,4 +21,6 @@ function setupRaven(opts) {
   Raven.config(ravenTarget, {
     release,
   }).install()
+
+  return Raven
 }