diff options
author | Esteban MIno <efmino@uc.cl> | 2018-08-21 06:35:38 +0800 |
---|---|---|
committer | Esteban MIno <efmino@uc.cl> | 2018-08-21 06:35:38 +0800 |
commit | 81cd29df43feb2469b78c6240d12ffcb9a68678e (patch) | |
tree | 15b14d9d3a29e5c21776ce5f9a3b35c7934abb81 /app/scripts/background.js | |
parent | dbab9a007fc9663427cebdbe1d41c51df67fd1fe (diff) | |
parent | 887cad973f25f43d2d4502ff31657f156a44b188 (diff) | |
download | tangerine-wallet-browser-81cd29df43feb2469b78c6240d12ffcb9a68678e.tar.gz tangerine-wallet-browser-81cd29df43feb2469b78c6240d12ffcb9a68678e.tar.zst tangerine-wallet-browser-81cd29df43feb2469b78c6240d12ffcb9a68678e.zip |
Merge branch 'develop' into WatchTokenFeature
Diffstat (limited to 'app/scripts/background.js')
-rw-r--r-- | app/scripts/background.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js index c0b00730d..029ad139a 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -19,7 +19,7 @@ const PortStream = require('./lib/port-stream.js') const createStreamSink = require('./lib/createStreamSink') const NotificationManager = require('./lib/notification-manager.js') const MetamaskController = require('./metamask-controller') -const firstTimeState = require('./first-time-state') +const rawFirstTimeState = require('./first-time-state') const setupRaven = require('./lib/setupRaven') const reportFailedTxToSentry = require('./lib/reportFailedTxToSentry') const setupMetamaskMeshMetrics = require('./lib/setupMetamaskMeshMetrics') @@ -34,6 +34,9 @@ const { ENVIRONMENT_TYPE_FULLSCREEN, } = require('./lib/enums') +// METAMASK_TEST_CONFIG is used in e2e tests to set the default network to localhost +const firstTimeState = Object.assign({}, rawFirstTimeState, global.METAMASK_TEST_CONFIG) + const STORAGE_KEY = 'metamask-config' const METAMASK_DEBUG = process.env.METAMASK_DEBUG @@ -44,8 +47,8 @@ const notificationManager = new NotificationManager() global.METAMASK_NOTIFIER = notificationManager // setup sentry error reporting -const releaseVersion = platform.getVersion() -const raven = setupRaven({ releaseVersion }) +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 |