aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2018-04-04 00:51:33 +0800
committerkumavis <aaron@kumavis.me>2018-04-04 00:51:33 +0800
commit00657e14a8b102051157e18bbea24630ff050488 (patch)
treeac3cc49f188cfb256480adfd4f9022270b4b964c /app
parent69778416cab4900d2c6ef5876ecddc92aa63642b (diff)
downloadtangerine-wallet-browser-00657e14a8b102051157e18bbea24630ff050488.tar
tangerine-wallet-browser-00657e14a8b102051157e18bbea24630ff050488.tar.gz
tangerine-wallet-browser-00657e14a8b102051157e18bbea24630ff050488.tar.bz2
tangerine-wallet-browser-00657e14a8b102051157e18bbea24630ff050488.tar.lz
tangerine-wallet-browser-00657e14a8b102051157e18bbea24630ff050488.tar.xz
tangerine-wallet-browser-00657e14a8b102051157e18bbea24630ff050488.tar.zst
tangerine-wallet-browser-00657e14a8b102051157e18bbea24630ff050488.zip
build - correctly set METAMASK_ENV via envify
Diffstat (limited to 'app')
-rw-r--r--app/scripts/background.js4
-rw-r--r--app/scripts/config.js2
-rw-r--r--app/scripts/first-time-state.js2
-rw-r--r--app/scripts/inpage.js2
-rw-r--r--app/scripts/lib/setupRaven.js2
5 files changed, 6 insertions, 6 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,
diff --git a/app/scripts/config.js b/app/scripts/config.js
index 74c5b576e..a8470ed82 100644
--- a/app/scripts/config.js
+++ b/app/scripts/config.js
@@ -13,7 +13,7 @@ const DEFAULT_RPC = 'rinkeby'
const OLD_UI_NETWORK_TYPE = 'network'
const BETA_UI_NETWORK_TYPE = 'networkBeta'
-global.METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
+global.METAMASK_DEBUG = process.env.METAMASK_DEBUG
module.exports = {
network: {
diff --git a/app/scripts/first-time-state.js b/app/scripts/first-time-state.js
index 5e8577100..3063df627 100644
--- a/app/scripts/first-time-state.js
+++ b/app/scripts/first-time-state.js
@@ -1,6 +1,6 @@
// test and development environment variables
const env = process.env.METAMASK_ENV
-const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
+const METAMASK_DEBUG = process.env.METAMASK_DEBUG
//
// The default state of MetaMask
diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js
index 9261e7d64..ec99bfc35 100644
--- a/app/scripts/inpage.js
+++ b/app/scripts/inpage.js
@@ -9,7 +9,7 @@ const setupDappAutoReload = require('./lib/auto-reload.js')
const MetamaskInpageProvider = require('./lib/inpage-provider.js')
restoreContextAfterImports()
-const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
+const METAMASK_DEBUG = process.env.METAMASK_DEBUG
window.log = log
log.setDefaultLevel(METAMASK_DEBUG ? 'debug' : 'warn')
diff --git a/app/scripts/lib/setupRaven.js b/app/scripts/lib/setupRaven.js
index b93591e65..9ec9a256f 100644
--- a/app/scripts/lib/setupRaven.js
+++ b/app/scripts/lib/setupRaven.js
@@ -1,5 +1,5 @@
const Raven = require('raven-js')
-const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
+const METAMASK_DEBUG = process.env.METAMASK_DEBUG
const extractEthjsErrorMessage = require('./extractEthjsErrorMessage')
const PROD = 'https://3567c198f8a8412082d32655da2961d0@sentry.io/273505'
const DEV = 'https://f59f3dd640d2429d9d0e2445a87ea8e1@sentry.io/273496'