From f6e551ef5f3773cf5637c2ae0e11fdeb5f40645b Mon Sep 17 00:00:00 2001 From: frankiebee Date: Mon, 13 Mar 2017 21:14:19 -0700 Subject: Swithch the default network to mainnet --- app/scripts/first-time-state.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'app/scripts/first-time-state.js') diff --git a/app/scripts/first-time-state.js b/app/scripts/first-time-state.js index 3196981ba..46fcde998 100644 --- a/app/scripts/first-time-state.js +++ b/app/scripts/first-time-state.js @@ -1,11 +1,14 @@ +// 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: { provider: { - type: 'testnet', + type: (METAMASK_DEBUG || env === 'test') ? 'testnet' : 'mainnet', }, }, -} \ No newline at end of file +} -- cgit v1.2.3 From 6bdb4c87288a522d9ea2e984bc1f6436d6c7369a Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Wed, 26 Apr 2017 21:05:45 -0700 Subject: Fix linting warnings --- app/scripts/first-time-state.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/scripts/first-time-state.js') diff --git a/app/scripts/first-time-state.js b/app/scripts/first-time-state.js index 3196981ba..87a7bb7b5 100644 --- a/app/scripts/first-time-state.js +++ b/app/scripts/first-time-state.js @@ -8,4 +8,4 @@ module.exports = { type: 'testnet', }, }, -} \ No newline at end of file +} -- cgit v1.2.3 From 3367363b1234a076695758762d7f1220fe4a7f8c Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Mon, 15 May 2017 19:11:16 -0700 Subject: Remove all traces of testnet --- app/scripts/first-time-state.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/scripts/first-time-state.js') diff --git a/app/scripts/first-time-state.js b/app/scripts/first-time-state.js index 87a7bb7b5..29ec1d8d3 100644 --- a/app/scripts/first-time-state.js +++ b/app/scripts/first-time-state.js @@ -5,7 +5,7 @@ module.exports = { config: { provider: { - type: 'testnet', + type: 'rinkeby', }, }, } -- cgit v1.2.3 From 243eeff7cb0d4c5d613a9250d234f81fdccbbf15 Mon Sep 17 00:00:00 2001 From: frankiebee Date: Tue, 23 May 2017 02:12:28 -0400 Subject: Fix for tests --- app/scripts/first-time-state.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/scripts/first-time-state.js') diff --git a/app/scripts/first-time-state.js b/app/scripts/first-time-state.js index 29ec1d8d3..dc7788311 100644 --- a/app/scripts/first-time-state.js +++ b/app/scripts/first-time-state.js @@ -3,7 +3,8 @@ // module.exports = { - config: { + config: {}, + NetworkController: { provider: { type: 'rinkeby', }, -- cgit v1.2.3 From c0a023ffdb6e04646e45b2a3c96241f5fb006326 Mon Sep 17 00:00:00 2001 From: kumavis Date: Mon, 12 Jun 2017 13:46:56 -0700 Subject: default testnet - fix typo --- app/scripts/first-time-state.js | 1 - 1 file changed, 1 deletion(-) (limited to 'app/scripts/first-time-state.js') diff --git a/app/scripts/first-time-state.js b/app/scripts/first-time-state.js index 5d89a0a21..5e8577100 100644 --- a/app/scripts/first-time-state.js +++ b/app/scripts/first-time-state.js @@ -10,7 +10,6 @@ module.exports = { NetworkController: { provider: { type: (METAMASK_DEBUG || env === 'test') ? 'rinkeby' : 'mainnet', - type: 'rinkeby', }, }, } -- cgit v1.2.3