Merge branch 'master' into ImportAccountMessageV2

1 files changed, 4 insertions, 6 deletions

diff --git a/app/scripts/background.js b/app/scripts/background.js
index 476d073d1..4487ff318 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -13,9 +13,11 @@ const PortStream = require('./lib/port-stream.js')
 const NotificationManager = require('./lib/notification-manager.js')
 const MetamaskController = require('./metamask-controller')
 const firstTimeState = require('./first-time-state')
-const setupRaven = require('./setupRaven')
+const setupRaven = require('./lib/setupRaven')
+const reportFailedTxToSentry = require('./lib/reportFailedTxToSentry')
 const setupMetamaskMeshMetrics = require('./lib/setupMetamaskMeshMetrics')
 
+
 const STORAGE_KEY = 'metamask-config'
 const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
 
@@ -86,11 +88,7 @@ function setupController (initState) {
   controller.txController.on(`tx:status-update`, (txId, status) => {
     if (status !== 'failed') return
     const txMeta = controller.txController.txStateManager.getTx(txId)
-    const errorMessage = `Transaction Failed: ${txMeta.err.message}`
-    raven.captureMessage(errorMessage, {
-      // "extra" key is required by Sentry
-      extra: txMeta,
-    })
+    reportFailedTxToSentry({ raven, txMeta })
   })
 
   // setup state persistence