diff options
| author | Alexander Tseung <alextsg@gmail.com> | 2018-04-04 08:06:00 +0800 |
|---|---|---|
| committer | Alexander Tseung <alextsg@gmail.com> | 2018-04-04 08:06:00 +0800 |
| commit | 34e608e9dccb1248c3f55d8e4195d0a21267ed57 (patch) | |
| tree | a74ccf1f938614fb62131dac1845a47fb843127d /app/scripts/background.js | |
| parent | bf38aa6f1d793a0e18e64164a3a735e202ca34d6 (diff) | |
| parent | ca780075a835172c60a47bac2681f4a893e1b515 (diff) | |
| download | tangerine-wallet-browser-34e608e9dccb1248c3f55d8e4195d0a21267ed57.tar.gz tangerine-wallet-browser-34e608e9dccb1248c3f55d8e4195d0a21267ed57.tar.zst tangerine-wallet-browser-34e608e9dccb1248c3f55d8e4195d0a21267ed57.zip | |
Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254
Diffstat (limited to 'app/scripts/background.js')
| -rw-r--r-- | app/scripts/background.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js index 7782fc41e..3ad0a7863 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -22,7 +22,7 @@ const EdgeEncryptor = require('./edge-encryptor') const getFirstPreferredLangCode = require('./lib/get-first-preferred-lang-code') const STORAGE_KEY = 'metamask-config' -const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG' +const METAMASK_DEBUG = process.env.METAMASK_DEBUG window.log = log log.setDefaultLevel(METAMASK_DEBUG ? 'debug' : 'warn') @@ -94,7 +94,7 @@ function setupController (initState, initLangCode) { // // MetaMask Controller // - + const controller = new MetamaskController({ // User confirmation callbacks: showUnconfirmedMessage: triggerUi, |