From cc603fc7e36b436c0336430c1086af2512cddef5 Mon Sep 17 00:00:00 2001
From: andrewnguyen22 <amnguyen1@mail.usf.edu>
Date: Fri, 28 Jun 2019 11:53:14 -0400
Subject: [PATCH] wip

---
 .../controllers/network/createPocketClient.js | 28 +++++++++++++++++--
 app/scripts/controllers/network/network.js    | 23 +++++++++------
 2 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/app/scripts/controllers/network/createPocketClient.js b/app/scripts/controllers/network/createPocketClient.js
index 95f98817c..713d61c1d 100644
--- a/app/scripts/controllers/network/createPocketClient.js
+++ b/app/scripts/controllers/network/createPocketClient.js
@@ -13,8 +13,10 @@ const devid = 'DEVO7QQqPHCK2h3cGXhh2rY'
 module.exports = createPocketClient
 
 function createPocketClient ({ network }) {
+  const networkIDs = getNetworkIds({ network })
   const pocketMiddleware = createPocketMiddleware(devid, {
-    netID: getNetworkIds({ network }).netId,
+    netID: networkIDs.netId,
+    network: networkIDs.ticker,
   })
   const pocketProvider = providerFromMiddleware(pocketMiddleware)
   const blockTracker = new BlockTracker({ provider: pocketProvider })
@@ -34,33 +36,53 @@ function createPocketClient ({ network }) {
 function getNetworkIds ({ network }) {
   let chainId
   let netId
-  
+  let ticker
   switch (network) {
     case 'mainnet':
       netId = '1'
       chainId = '0x01'
+      ticker = "ETH"
       break
     case 'ropsten':
       netId = '3'
       chainId = '0x03'
+      ticker = "ETH"
       break
     case 'rinkeby':
       netId = '4'
       chainId = '0x04'
+      ticker = "ETH"
       break
     case 'kovan':
       netId = '42'
       chainId = '0x2a'
+      ticker = "ETH"
       break
     case 'goerli':
       netId = '5'
       chainId = '0x05'
+      ticker = "ETH"
+      break
+    case 'poa':
+      netId = '99'
+      chainId = '0x63'
+      ticker = 'POA'
+      break
+    case 'dai':
+      netId = '100'
+      chainId = '0x64'
+      ticker = 'POA'
+      break
+    case 'sokol':
+      netId= '77'
+      chainId = '0x4D'
+      ticker = 'POA'
       break
     default:
       throw new Error(`createPocketClient - unknown network "${network}"`)
   }
   return {
-    chainId, netId,
+    chainId, netId, ticker
   }
 }
 
diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js
index 0b4e76fec..00f3259c9 100644
--- a/app/scripts/controllers/network/network.js
+++ b/app/scripts/controllers/network/network.js
@@ -188,13 +188,25 @@ module.exports = class NetworkController extends EventEmitter {
       }
     // other type-based rpc endpoints
     } else if (type === POA) {
-      this._configureStandardProvider({ rpcUrl: ethNetProps.RPCEndpoints(POA_CODE)[0] })
+      if (this.dProviderStore.getState().dProvider) {
+        this._configurePocketProvider(opts)
+      } else {
+        this._configureStandardProvider({ rpcUrl: ethNetProps.RPCEndpoints(POA_CODE)[0] })
+      }
     } else if (type === DAI) {
-      this._configureStandardProvider({ rpcUrl: ethNetProps.RPCEndpoints(DAI_CODE)[0] })
+      if (this.dProviderStore.getState().dProvider) {
+        this._configurePocketProvider(opts)
+      } else {
+        this._configureStandardProvider({ rpcUrl: ethNetProps.RPCEndpoints(DAI_CODE)[0] })
+      }
     } else if (type === POA_SOKOL) {
       this._configureStandardProvider({ rpcUrl: ethNetProps.RPCEndpoints(POA_SOKOL_CODE)[0] })
     } else if (type === GOERLI_TESTNET) {
-      this._configureStandardProvider({ rpcUrl: ethNetProps.RPCEndpoints(GOERLI_TESTNET_CODE)[0] })
+      if (this.dProviderStore.getState().dProvider) {
+        this._configurePocketProvider(opts)
+      } else {
+        this._configureStandardProvider({ rpcUrl: ethNetProps.RPCEndpoints(GOERLI_TESTNET_CODE)[0] })
+      }
     } else if (type === CLASSIC) {
       this._configureStandardProvider({ rpcUrl: ethNetProps.RPCEndpoints(CLASSIC_CODE)[0] })
     } else if (type === RSK) {
@@ -221,11 +233,6 @@ module.exports = class NetworkController extends EventEmitter {
     log.info('NetworkController - configurePocketProvider', type)
     const networkClient = createPocketClient({ network: type })
     this._setNetworkClient(networkClient)
-    // setup networkConfig
-    var settings = {
-      ticker: 'ETH',
-    }
-    this.networkConfig.putState(settings)
   }
 
   _configureLocalhostProvider () {