Merge branch 'master' into AddTokenList

1 files changed, 8 insertions, 4 deletions

diff --git a/app/scripts/first-time-state.js b/app/scripts/first-time-state.js
index 3196981ba..5e8577100 100644
--- a/app/scripts/first-time-state.js
+++ b/app/scripts/first-time-state.js
@@ -1,11 +1,15 @@
+// test and development environment variables
+const env = process.env.METAMASK_ENV
+const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
+
 //
 // The default state of MetaMask
 //
-
 module.exports = {
-  config: {
+  config: {},
+  NetworkController: {
     provider: {
-      type: 'testnet',
+      type: (METAMASK_DEBUG || env === 'test') ? 'rinkeby' : 'mainnet',
     },
   },
-}
\ No newline at end of file
+}