1 files changed, 16 insertions, 1 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 9790129aa..280c28d70 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -14,6 +14,7 @@ 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 STORAGE_KEY = 'metamask-config'
 const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
@@ -25,6 +26,10 @@ const platform = new ExtensionPlatform()
 const notificationManager = new NotificationManager()
 global.METAMASK_NOTIFIER = notificationManager
 
+// setup sentry error reporting
+const release = platform.getVersion()
+const raven = setupRaven({ release })
+
 let popupIsOpen = false
 
 // state persistence
@@ -54,7 +59,7 @@ async function loadStateFromPersistence () {
   if (localStore.isSupported) {
     const localData = await localStore.get()
    // TODO: handle possible exceptions (https://developer.chrome.com/apps/runtime#property-lastError)
-    versionedData = localData || versionedData
+    versionedData = Object.keys(localData).length > 0 ? localData : versionedData
   }
 
   // migrate data
@@ -82,6 +87,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),