Merge pull request #2239 from MetaMask/network-controller-contd

network - make network controller internal network switching explicit

1 files changed, 3 insertions, 2 deletions

diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js
index 9079e0653..0f9db4d53 100644
--- a/app/scripts/controllers/network.js
+++ b/app/scripts/controllers/network.js
@@ -10,7 +10,7 @@ const RPC_ADDRESS_LIST = require('../config.js').network
 const DEFAULT_RPC = RPC_ADDRESS_LIST['rinkeby']
 
 module.exports = class NetworkController extends EventEmitter {
-  
+
   constructor (config) {
     super()
     config.provider.rpcTarget = this.getRpcAddressForType(config.provider.type, config.provider)
@@ -20,7 +20,6 @@ module.exports = class NetworkController extends EventEmitter {
     this._proxy = createEventEmitterProxy()
 
     this.on('networkDidChange', this.lookupNetwork)
-    this.providerStore.subscribe((state) => this._switchNetwork({ rpcUrl: state.rpcTarget }))
   }
 
   initializeProvider (_providerParams) {
@@ -64,6 +63,7 @@ module.exports = class NetworkController extends EventEmitter {
       type: 'rpc',
       rpcTarget: rpcUrl,
     })
+    this._switchNetwork({ rpcUrl })
   }
 
   getCurrentRpcAddress () {
@@ -79,6 +79,7 @@ module.exports = class NetworkController extends EventEmitter {
     const rpcTarget = this.getRpcAddressForType(type)
     assert(rpcTarget, `NetworkController - unknown rpc address for type "${type}"`)
     this.providerStore.updateState({ type, rpcTarget })
+    this._switchNetwork({ rpcUrl: rpcTarget })
   }
 
   getProviderConfig () {