Merge branch 'master' into retry-tx-refractor

1 files changed, 12 insertions, 6 deletions

diff --git a/app/scripts/background.js b/app/scripts/background.js
index 476d073d1..601ae0372 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -13,8 +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 EdgeEncryptor = require('./edge-encryptor')
+
 
 const STORAGE_KEY = 'metamask-config'
 const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
@@ -30,6 +33,12 @@ global.METAMASK_NOTIFIER = notificationManager
 const release = platform.getVersion()
 const raven = setupRaven({ release })
 
+// browser check if it is Edge - https://stackoverflow.com/questions/9847580/how-to-detect-safari-chrome-ie-firefox-and-opera-browser
+// Internet Explorer 6-11
+const isIE = !!document.documentMode
+// Edge 20+
+const isEdge = !isIE && !!window.StyleMedia
+
 let popupIsOpen = false
 let openMetamaskTabsIDs = {}
 
@@ -79,6 +88,7 @@ function setupController (initState) {
     initState,
     // platform specific api
     platform,
+    encryptor: isEdge ? new EdgeEncryptor() : undefined,
   })
   global.metamaskController = controller
 
@@ -86,11 +96,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