Merge branch 'master' of https://github.com/MetaMask/metamask-plugin …

…into feature/classic

app/scripts/controllers/network.js

@@ -5,11 +5,13 @@ const ComposedStore = require('obs-store/lib/composed')
 const extend = require('xtend')
 const EthQuery = require('eth-query')
 const RPC_ADDRESS_LIST = require('../config.js').network
+const OVERWRITE_LIST = require('../config.js').networkIdOverwrites
 const DEFAULT_RPC = RPC_ADDRESS_LIST['rinkeby']
 
 module.exports = class NetworkController extends EventEmitter {
   constructor (config) {
     super()
+    this.overwriteNetworkId = this.getNetworkIdOverwrite(config.provider.type)
     this.networkStore = new ObservableStore('loading')
     config.provider.rpcTarget = this.getRpcAddressForType(config.provider.type, config.provider)
     this.providerStore = new ObservableStore(config.provider)
@@ -83,7 +85,11 @@ module.exports = class NetworkController extends EventEmitter {
     this.ethQuery.sendAsync({ method: 'net_version' }, (err, network) => {
       if (err) return this.setNetworkState('loading')
       log.info('web3.getNetwork returned ' + network)
-      this.setNetworkState(network)
+      if (this.overwriteNetworkId) {
+        this.setNetworkState(this.overwriteNetworkId)
+      } else {
+        this.setNetworkState(network)
+      }
     })
   }
 
@@ -115,6 +121,10 @@ module.exports = class NetworkController extends EventEmitter {
     return provider && provider.rpcTarget ? provider.rpcTarget : DEFAULT_RPC
   }
 
+  getNetworkIdOverwrite (type) {
+    return OVERWRITE_LIST[type]
+  }
+
   _logBlock (block) {
     log.info(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`)
     this.verifyNetwork()

app/scripts/metamask-controller.js

@@ -627,55 +627,9 @@ module.exports = class MetamaskController extends EventEmitter {
     this.networkController.setRpcTarget(rpcTarget)
 
     return this.preferencesController.updateFrequentRpcList(rpcTarget)
-      .then(() => {
-        this.platform.reload()
-        this.lookupNetwork()
-        return Promise.resolve(rpcTarget)
-      })
-  }
-
-  setProviderType (type) {
-    this.configManager.setProviderType(type)
-    this.platform.reload()
-    this.lookupNetwork()
-  }
-
-  useEtherscanProvider () {
-    this.configManager.useEtherscanProvider()
-    this.platform.reload()
-  }
-
-  getNetworkState () {
-    return this.networkStore.getState().network
-  }
-
-  setNetworkState (network) {
-    return this.networkStore.updateState({ network })
-  }
-
-  isNetworkLoading () {
-    return this.getNetworkState() === 'loading'
-  }
-
-  lookupNetwork (err) {
-    if (err) {
-      this.setNetworkState('loading')
-    }
-
-    this.ethQuery.sendAsync({ method: 'net_version' }, (err, network) => {
-      if (err) {
-        this.setNetworkState('loading')
-        return
-      }
-      log.info('web3.getNetwork returned ' + network)
-      const overwrite = this.configManager.getNetworkIdOverwrite()
-      if (overwrite) {
-        this.setNetworkState(overwrite)
-      } else {
-        this.setNetworkState(network)
-      }
+    .then(() => {
+      return Promise.resolve(rpcTarget)
     })
   }
 
-
 }