Merge branch 'master' into i3725-refactor-send-component

1 files changed, 14 insertions, 5 deletions

diff --git a/app/scripts/first-time-state.js b/app/scripts/first-time-state.js
index 3063df627..c49d89288 100644
--- a/app/scripts/first-time-state.js
+++ b/app/scripts/first-time-state.js
@@ -1,15 +1,24 @@
 // test and development environment variables
 const env = process.env.METAMASK_ENV
 const METAMASK_DEBUG = process.env.METAMASK_DEBUG
+const { DEFAULT_NETWORK, MAINNET } = require('./controllers/network/enums')
 
-//
-// The default state of MetaMask
-//
-module.exports = {
+/**
+ * @typedef {Object} FirstTimeState
+ * @property {Object} config Initial configuration parameters
+ * @property {Object} NetworkController Network controller state
+ */
+
+/**
+ * @type {FirstTimeState}
+ */
+const initialState = {
   config: {},
   NetworkController: {
     provider: {
-      type: (METAMASK_DEBUG || env === 'test') ? 'rinkeby' : 'mainnet',
+      type: (METAMASK_DEBUG || env === 'test') ? DEFAULT_NETWORK : MAINNET,
     },
   },
 }
+
+module.exports = initialState