Fix UI bugs

171 files changed, 855 insertions, 822 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7202817..3826b93b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1205,6 +1205,8 @@ Made seed word restoring BIP44 compatible.
 Added the ability to restore accounts from seed words.
 ## Current Master
 
+## 1.0.3 Fri Nov 09 2018
+
 ## 1.0.2 Fri Nov 09 2018
 
 ## 1.0.1 Thu Nov 08 2018
diff --git a/app/manifest.json b/app/manifest.json
index d9d1ba76..2196b59a 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "manifest_version": 2,
   "author": "https://dexon.org",
   "description": "__MSG_appDescription__",
@@ -45,7 +45,8 @@
       "matches": [
         "https://*.dexscan.org/*",
         "https://*.dexon.org/*",
-        "https://deversi.netlify.com/*"
+        "https://deversi.netlify.com/*",
+        "http://localhost:3000/*"
       ],
       "js": [
         "contentscript.js"
diff --git a/app/scripts/background.js b/app/scripts/background.js
index b47c5bac..601dfc06 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -82,7 +82,7 @@ setupMetamaskMeshMetrics()
  * @property {number} id - An internally unique tx identifier.
  * @property {number} time - Time the tx was first suggested, in unix epoch time (ms).
  * @property {string} status - The current transaction status (unapproved, signed, submitted, dropped, failed, rejected), as defined in `tx-state-manager.js`.
- * @property {string} metamaskNetworkId - The transaction's network ID, used for EIP-155 compliance.
+ * @property {string} dekusanNetworkId - The transaction's network ID, used for EIP-155 compliance.
  * @property {boolean} loadingDefaults - TODO: Document
  * @property {Object} txParams - The tx params as passed to the network provider.
  * @property {Object[]} history - A history of mutations to this TransactionMeta object.
@@ -97,7 +97,7 @@ setupMetamaskMeshMetrics()
  */
 
 /**
- * The data emitted from the DekuSanController.store EventEmitter, also used to initialize the DekuSanController. Available in UI on React state as state.metamask.
+ * The data emitted from the DekuSanController.store EventEmitter, also used to initialize the DekuSanController. Available in UI on React state as state.dekusan.
  * @typedef DekuSanState
  * @property {boolean} isInitialized - Whether the first vault has been created.
  * @property {boolean} isUnlocked - Whether the vault is currently decrypted and accounts are available for selection.
diff --git a/app/scripts/controllers/transactions/README.md b/app/scripts/controllers/transactions/README.md
index 75e3749a..ef2257b0 100644
--- a/app/scripts/controllers/transactions/README.md
+++ b/app/scripts/controllers/transactions/README.md
@@ -30,7 +30,7 @@ txMeta = {
   "id": 2828415030114568, // unique id for this txMeta used for look ups
   "time": 1524094064821, // time of creation
   "status": "confirmed",
-  "metamaskNetworkId": "1524091532133", //the network id for the transaction
+  "dekusanNetworkId": "1524091532133", //the network id for the transaction
   "loadingDefaults": false, // used to tell the ui when we are done calculatyig gass defaults
   "txParams": { // the txParams object
     "from": "0x8acce2391c0d510a6c5e5d8f819a678f79b7e675",
@@ -44,7 +44,7 @@ txMeta = {
             "id": 2828415030114568,
             "time": 1524094064821,
             "status": "unapproved",
-            "metamaskNetworkId": "1524091532133",
+            "dekusanNetworkId": "1524091532133",
             "loadingDefaults": true,
             "txParams": {
               "from": "0x8acce2391c0d510a6c5e5d8f819a678f79b7e675",
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index 718dd20e..e8ef5595 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -190,7 +190,7 @@ class TransactionController extends EventEmitter {
 
     try {
       // check whether recipient account is blacklisted
-      recipientBlacklistChecker.checkAccount(txMeta.metamaskNetworkId, normalizedTxParams.to)
+      recipientBlacklistChecker.checkAccount(txMeta.dekusanNetworkId, normalizedTxParams.to)
       // add default tx params
       txMeta = await this.addTxGasDefaults(txMeta)
     } catch (error) {
@@ -619,7 +619,7 @@ class TransactionController extends EventEmitter {
     const unapprovedTxs = this.txStateManager.getUnapprovedTxList()
     const selectedAddressTxList = this.txStateManager.getFilteredTxList({
       from: this.getSelectedAddress(),
-      metamaskNetworkId: this.getNetwork(),
+      dekusanNetworkId: this.getNetwork(),
     })
     this.memStore.updateState({ unapprovedTxs, selectedAddressTxList })
   }
diff --git a/app/scripts/controllers/transactions/tx-state-manager.js b/app/scripts/controllers/transactions/tx-state-manager.js
index 72d869fa..49d3dfc8 100644
--- a/app/scripts/controllers/transactions/tx-state-manager.js
+++ b/app/scripts/controllers/transactions/tx-state-manager.js
@@ -49,7 +49,7 @@ class TransactionStateManager extends EventEmitter {
       id: createId(),
       time: (new Date()).getTime(),
       status: 'unapproved',
-      metamaskNetworkId: this.getNetwork(),
+      dekusanNetworkId: this.getNetwork(),
       loadingDefaults: true,
     }, opts)
   }
@@ -60,7 +60,7 @@ class TransactionStateManager extends EventEmitter {
   getTxList () {
     const network = this.getNetwork()
     const fullTxList = this.getFullTxList()
-    return fullTxList.filter((txMeta) => txMeta.metamaskNetworkId === network)
+    return fullTxList.filter((txMeta) => txMeta.dekusanNetworkId === network)
   }
 
   /**
@@ -384,7 +384,7 @@ class TransactionStateManager extends EventEmitter {
     const network = this.getNetwork()
 
     // Filter out the ones from the current account and network
-    const otherAccountTxs = txs.filter((txMeta) => !(txMeta.txParams.from === address && txMeta.metamaskNetworkId === network))
+    const otherAccountTxs = txs.filter((txMeta) => !(txMeta.txParams.from === address && txMeta.dekusanNetworkId === network))
 
     // Update state
     this._saveTxList(otherAccountTxs)
diff --git a/app/scripts/migrations/003.js b/app/scripts/migrations/003.js
index 140f81d4..17023265 100644
--- a/app/scripts/migrations/003.js
+++ b/app/scripts/migrations/003.js
@@ -1,6 +1,6 @@
 const version = 3
 const oldTestRpc = 'https://rawtestrpc.metamask.io/'
-const newTestRpc = 'https://testrpc.metamask.io/'
+const newTestRpc = 'https://api-testnet.dexon.org/v1/network/rpc/'
 
 const clone = require('clone')
 
diff --git a/app/scripts/migrations/019.js b/app/scripts/migrations/019.js
index 46a56d90..00e35c5d 100644
--- a/app/scripts/migrations/019.js
+++ b/app/scripts/migrations/019.js
@@ -39,12 +39,12 @@ function transformState (state) {
 
       const confirmedTxs = txList.filter((tx) => tx.status === 'confirmed')
       .filter((tx) => tx.txParams.from === txMeta.txParams.from)
-      .filter((tx) => tx.metamaskNetworkId.from === txMeta.metamaskNetworkId.from)
+      .filter((tx) => tx.dekusanNetworkId.from === txMeta.dekusanNetworkId.from)
       const highestConfirmedNonce = getHighestNonce(confirmedTxs)
 
       const pendingTxs = txList.filter((tx) => tx.status === 'submitted')
       .filter((tx) => tx.txParams.from === txMeta.txParams.from)
-      .filter((tx) => tx.metamaskNetworkId.from === txMeta.metamaskNetworkId.from)
+      .filter((tx) => tx.dekusanNetworkId.from === txMeta.dekusanNetworkId.from)
       const highestContinuousNonce = getHighestContinuousFrom(pendingTxs, highestConfirmedNonce)
 
       const maxNonce = Math.max(highestContinuousNonce, highestConfirmedNonce)
diff --git a/app/scripts/migrations/020.js b/app/scripts/migrations/020.js
index f0937753..a5d55675 100644
--- a/app/scripts/migrations/020.js
+++ b/app/scripts/migrations/020.js
@@ -29,9 +29,9 @@ module.exports = {
 
 function transformState (state) {
   const newState = state
-  if ('metamask' in newState &&
-      !('firstTimeInfo' in newState.metamask)) {
-    newState.metamask.firstTimeInfo = {
+  if ('dekusan' in newState &&
+      !('firstTimeInfo' in newState.dekusan)) {
+    newState.dekusan.firstTimeInfo = {
       version: '3.12.0',
       date: Date.now(),
     }
diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js
index 9ef0d22c..e15f5d5b 100644
--- a/app/scripts/platforms/extension.js
+++ b/app/scripts/platforms/extension.js
@@ -1,5 +1,5 @@
 const extension = require('extensionizer')
-const explorerLink = require('etherscan-link').createExplorerLink
+const txLink = require('../../../ui/lib/tx-link')
 
 class ExtensionPlatform {
 
@@ -73,11 +73,11 @@ class ExtensionPlatform {
 
     this._subscribeToNotificationClicked()
 
-    const url = explorerLink(txMeta.hash, parseInt(txMeta.metamaskNetworkId))
+    const url = txLink(txMeta.hash, parseInt(txMeta.dekusanNetworkId))
     const nonce = parseInt(txMeta.txParams.nonce, 16)
 
     const title = 'Confirmed transaction'
-    const message = `Transaction ${nonce} confirmed! View on EtherScan`
+    const message = `Transaction ${nonce} confirmed! View on DexScan`
     this._showNotification(title, message, url)
   }
 
@@ -107,7 +107,7 @@ class ExtensionPlatform {
   }
 
   _viewOnEtherScan (txId) {
-    if (txId.startsWith('http://')) {
+    if (txId.startsWith('https://')) {
       global.metamaskController.platform.openWindow({ url: txId })
     }
   }
diff --git a/development/states.json b/development/states.json
index bdd0a6b2..cb245d65 100644
--- a/development/states.json
+++ b/development/states.json
@@ -1 +1 @@
-module.exports = [{"account detail":{"metamask":{"isInitialized":true,"isUnlocked":true,"currentDomain":"example.com","rpcTarget":"https://rawtestrpc.metamask.io/","identities":{"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6":{"name":"Secret Wallet!","address":"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6","mayBeFauceting":false},"0x843963b837841dad3b0f5969ff271108776616df":{"name":"Main Wallet","address":"0x843963b837841dad3b0f5969ff271108776616df","mayBeFauceting":false},"0x2cb215323857bec1c91e5db10fe87379a5cf129a":{"name":"Wallet 3","address":"0x2cb215323857bec1c91e5db10fe87379a5cf129a","mayBeFauceting":false}},"unconfTxs":{},"accounts":{"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6":{"code":"0x","balance":"0x0","nonce":"0x0","address":"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6"},"0x843963b837841dad3b0f5969ff271108776616df":{"code":"0x","balance":"0x0","nonce":"0x0","address":"0x843963b837841dad3b0f5969ff271108776616df"},"0x2cb215323857bec1c91e5db10fe87379a5cf129a":{"code":"0x","balance":"0x0","nonce":"0x0","address":"0x2cb215323857bec1c91e5db10fe87379a5cf129a"}},"transactions":[],"selectedAddress":"0x843963b837841dad3b0f5969ff271108776616df","network":"2","seedWords":null,"isDisclaimerConfirmed":true,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"},"selectedAddress":"0x843963b837841dad3b0f5969ff271108776616df"},"appState":{"menuOpen":false,"currentView":{"name":"accountDetail","detailView":null,"context":"0x843963b837841dad3b0f5969ff271108776616df"},"accountDetail":{"subview":"transactions"},"currentDomain":"127.0.0.1:9966","transForward":true,"isLoading":false,"warning":null},"identities":{}}},{"accounts":{"metamask":{"isInitialized":true,"isUnlocked":true,"currentDomain":"example.com","rpcTarget":"https://rawtestrpc.metamask.io/","identities":{"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc":{"name":"Wallet 1","address":"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc","mayBeFauceting":false},"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b":{"name":"Wallet 2","address":"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b","mayBeFauceting":false},"0xeb9e64b93097bc15f01f13eae97015c57ab64823":{"name":"Wallet 3","address":"0xeb9e64b93097bc15f01f13eae97015c57ab64823","mayBeFauceting":false},"0x704107d04affddd9b66ab9de3dd7b095852e9b69":{"name":"Wallet 4","address":"0x704107d04affddd9b66ab9de3dd7b095852e9b69","mayBeFauceting":false}},"unconfTxs":{},"accounts":{"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc"},"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b"},"0xeb9e64b93097bc15f01f13eae97015c57ab64823":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0xeb9e64b93097bc15f01f13eae97015c57ab64823"},"0x704107d04affddd9b66ab9de3dd7b095852e9b69":{"balance":"0x0","code":"0x","nonce":"0x0","address":"0x704107d04affddd9b66ab9de3dd7b095852e9b69"}},"transactions":[],"network":"2","isDisclaimerConfirmed":true,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"},"selectedAddress":"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc","selectedAddress":"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc","seedWords":null},"appState":{"menuOpen":false,"currentView":{"name":"accounts"},"accountDetail":{"subview":"transactions","accountExport":"none","privateKey":""},"currentDomain":"extensions","transForward":true,"isLoading":false,"warning":null,"scrollToBottom":true},"identities":{}}},{"config":{"metamask":{"isInitialized":true,"isUnlocked":true,"currentDomain":"example.com","rpcTarget":"https://rawtestrpc.metamask.io/","identities":{"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6":{"name":"Wallet 1","address":"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6","mayBeFauceting":false},"0x843963b837841dad3b0f5969ff271108776616df":{"name":"Wallet 2","address":"0x843963b837841dad3b0f5969ff271108776616df","mayBeFauceting":false},"0x2cb215323857bec1c91e5db10fe87379a5cf129a":{"name":"Wallet 3","address":"0x2cb215323857bec1c91e5db10fe87379a5cf129a","mayBeFauceting":false},"0xc5091450b7548b0dce3a76b8d325929c39e648d1":{"name":"Wallet 4","address":"0xc5091450b7548b0dce3a76b8d325929c39e648d1","mayBeFauceting":false}},"unconfTxs":{},"accounts":{"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6"},"0x843963b837841dad3b0f5969ff271108776616df":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0x843963b837841dad3b0f5969ff271108776616df"},"0x2cb215323857bec1c91e5db10fe87379a5cf129a":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0x2cb215323857bec1c91e5db10fe87379a5cf129a"},"0xc5091450b7548b0dce3a76b8d325929c39e648d1":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0xc5091450b7548b0dce3a76b8d325929c39e648d1"}},"transactions":[],"selectedAddress":"0x843963b837841dad3b0f5969ff271108776616df","network":"2","isDisclaimerConfirmed":true,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"},"selectedAddress":"0x843963b837841dad3b0f5969ff271108776616df","seedWords":null},"appState":{"menuOpen":false,"currentView":{"name":"accounts"},"accountDetail":{"subview":"transactions","accountExport":"none","privateKey":""},"currentDomain":"testfaucet.metamask.io","transForward":true,"isLoading":false,"warning":null,"scrollToBottom":true},"identities":{}}},{"create vault password":{"metamask":{"isInitialized":false,"isUnlocked":false,"currentDomain":"example.com","rpcTarget":"https://rawtestrpc.metamask.io/","identities":{},"unconfTxs":{},"accounts":{},"transactions":[],"network":"2","seedWords":null,"isDisclaimerConfirmed":true,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"}},"appState":{"menuOpen":false,"currentView":{"name":"accounts","detailView":null},"accountDetail":{"subview":"transactions"},"currentDomain":"extensions","transForward":false,"isLoading":false,"warning":null},"identities":{}}},{"help":{"metamask":{"isInitialized":true,"isUnlocked":true,"currentDomain":"example.com","rpcTarget":"https://rawtestrpc.metamask.io/","identities":{"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc":{"name":"Wallet 1","address":"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc","mayBeFauceting":false},"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b":{"name":"Wallet 2","address":"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b","mayBeFauceting":false},"0xeb9e64b93097bc15f01f13eae97015c57ab64823":{"name":"Wallet 3","address":"0xeb9e64b93097bc15f01f13eae97015c57ab64823","mayBeFauceting":false},"0x704107d04affddd9b66ab9de3dd7b095852e9b69":{"name":"Wallet 4","address":"0x704107d04affddd9b66ab9de3dd7b095852e9b69","mayBeFauceting":false}},"unconfTxs":{},"accounts":{"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc":{"code":"0x","balance":"0x0","nonce":"0x0","address":"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc"},"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b":{"code":"0x","balance":"0x0","nonce":"0x0","address":"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b"},"0xeb9e64b93097bc15f01f13eae97015c57ab64823":{"code":"0x","balance":"0x0","nonce":"0x0","address":"0xeb9e64b93097bc15f01f13eae97015c57ab64823"},"0x704107d04affddd9b66ab9de3dd7b095852e9b69":{"code":"0x","nonce":"0x0","balance":"0x0","address":"0x704107d04affddd9b66ab9de3dd7b095852e9b69"}},"transactions":[],"network":"2","isDisclaimerConfirmed":true,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"},"selectedAddress":"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc","selectedAddress":"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc","seedWords":null},"appState":{"menuOpen":false,"currentView":{"name":"info"},"accountDetail":{"subview":"transactions","accountExport":"none","privateKey":""},"currentDomain":"extensions","transForward":true,"isLoading":false,"warning":null,"scrollToBottom":true},"identities":{}}},{"locked":{"metamask":{"isInitialized":true,"isUnlocked":true,"currentDomain":"example.com","rpcTarget":"https://rawtestrpc.metamask.io/","identities":{"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6":{"name":"Wallet 1","address":"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6","mayBeFauceting":false},"0x843963b837841dad3b0f5969ff271108776616df":{"name":"Wallet 2","address":"0x843963b837841dad3b0f5969ff271108776616df","mayBeFauceting":false},"0x2cb215323857bec1c91e5db10fe87379a5cf129a":{"name":"Wallet 3","address":"0x2cb215323857bec1c91e5db10fe87379a5cf129a","mayBeFauceting":false},"0xc5091450b7548b0dce3a76b8d325929c39e648d1":{"name":"Wallet 4","address":"0xc5091450b7548b0dce3a76b8d325929c39e648d1","mayBeFauceting":false}},"unconfTxs":{},"accounts":{"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6"},"0x843963b837841dad3b0f5969ff271108776616df":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0x843963b837841dad3b0f5969ff271108776616df"},"0x2cb215323857bec1c91e5db10fe87379a5cf129a":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0x2cb215323857bec1c91e5db10fe87379a5cf129a"},"0xc5091450b7548b0dce3a76b8d325929c39e648d1":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0xc5091450b7548b0dce3a76b8d325929c39e648d1"}},"transactions":[],"selectedAddress":"0x843963b837841dad3b0f5969ff271108776616df","network":"2","isDisclaimerConfirmed":true,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"},"selectedAddress":"0x843963b837841dad3b0f5969ff271108776616df"},"appState":{"menuOpen":false,"currentView":{"name":"accountDetail"},"accountDetail":{"subview":"transactions","accountExport":"none","privateKey":""},"currentDomain":"testfaucet.metamask.io","transForward":false,"isLoading":false,"warning":null,"scrollToBottom":false},"identities":{}}},{"new vault":{"metamask":{"isInitialized":false,"isUnlocked":false,"currentDomain":"example.com","rpcTarget":"https://rawtestrpc.metamask.io/","identities":{},"unconfTxs":{},"accounts":{},"transactions":[],"network":"2","seedWords":null,"isDisclaimerConfirmed":false,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"}},"appState":{"menuOpen":false,"currentView":{"name":"accounts","detailView":null},"accountDetail":{"subview":"transactions"},"currentDomain":"extensions","transForward":true,"isLoading":false,"warning":null},"identities":{}}},{"show seed words":{"metamask":{"isInitialized":false,"isUnlocked":true,"currentDomain":"example.com","rpcTarget":"https://rawtestrpc.metamask.io/","identities":{"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc":{"name":"Wallet 1","address":"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc","mayBeFauceting":false},"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b":{"name":"Wallet 2","address":"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b","mayBeFauceting":false},"0xeb9e64b93097bc15f01f13eae97015c57ab64823":{"name":"Wallet 3","address":"0xeb9e64b93097bc15f01f13eae97015c57ab64823","mayBeFauceting":false}},"unconfTxs":{},"accounts":{"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc"},"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b"},"0xeb9e64b93097bc15f01f13eae97015c57ab64823":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0xeb9e64b93097bc15f01f13eae97015c57ab64823"}},"transactions":[],"network":"2","seedWords":"debris dizzy just program just float decrease vacant alarm reduce speak stadium","isDisclaimerConfirmed":false,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"}},"appState":{"menuOpen":false,"currentView":{"name":"createVaultComplete","seedWords":"debris dizzy just program just float decrease vacant alarm reduce speak stadium"},"accountDetail":{"subview":"transactions"},"currentDomain":"extensions","transForward":true,"isLoading":false,"warning":null},"identities":{}}},{"terms":{"metamask":{"accounts":{},"transactions":[],"identities":{},"network":"2","isInitialized":false,"isUnlocked":false,"seedWords":null,"isDisclaimerConfirmed":false,"unconfTxs":{},"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"}},"appState":{"currentDomain":"extensions"}}}]
\ No newline at end of file
+module.exports = [{"account detail":{"dekusan":{"isInitialized":true,"isUnlocked":true,"currentDomain":"example.com","rpcTarget":"https://api-testnet.dexon.org/v1/network/rpc/","identities":{"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6":{"name":"Secret Wallet!","address":"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6","mayBeFauceting":false},"0x843963b837841dad3b0f5969ff271108776616df":{"name":"Main Wallet","address":"0x843963b837841dad3b0f5969ff271108776616df","mayBeFauceting":false},"0x2cb215323857bec1c91e5db10fe87379a5cf129a":{"name":"Wallet 3","address":"0x2cb215323857bec1c91e5db10fe87379a5cf129a","mayBeFauceting":false}},"unconfTxs":{},"accounts":{"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6":{"code":"0x","balance":"0x0","nonce":"0x0","address":"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6"},"0x843963b837841dad3b0f5969ff271108776616df":{"code":"0x","balance":"0x0","nonce":"0x0","address":"0x843963b837841dad3b0f5969ff271108776616df"},"0x2cb215323857bec1c91e5db10fe87379a5cf129a":{"code":"0x","balance":"0x0","nonce":"0x0","address":"0x2cb215323857bec1c91e5db10fe87379a5cf129a"}},"transactions":[],"selectedAddress":"0x843963b837841dad3b0f5969ff271108776616df","network":"2","seedWords":null,"isDisclaimerConfirmed":true,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"},"selectedAddress":"0x843963b837841dad3b0f5969ff271108776616df"},"appState":{"menuOpen":false,"currentView":{"name":"accountDetail","detailView":null,"context":"0x843963b837841dad3b0f5969ff271108776616df"},"accountDetail":{"subview":"transactions"},"currentDomain":"127.0.0.1:9966","transForward":true,"isLoading":false,"warning":null},"identities":{}}},{"accounts":{"dekusan":{"isInitialized":true,"isUnlocked":true,"currentDomain":"example.com","rpcTarget":"https://api-testnet.dexon.org/v1/network/rpc/","identities":{"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc":{"name":"Wallet 1","address":"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc","mayBeFauceting":false},"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b":{"name":"Wallet 2","address":"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b","mayBeFauceting":false},"0xeb9e64b93097bc15f01f13eae97015c57ab64823":{"name":"Wallet 3","address":"0xeb9e64b93097bc15f01f13eae97015c57ab64823","mayBeFauceting":false},"0x704107d04affddd9b66ab9de3dd7b095852e9b69":{"name":"Wallet 4","address":"0x704107d04affddd9b66ab9de3dd7b095852e9b69","mayBeFauceting":false}},"unconfTxs":{},"accounts":{"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc"},"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b"},"0xeb9e64b93097bc15f01f13eae97015c57ab64823":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0xeb9e64b93097bc15f01f13eae97015c57ab64823"},"0x704107d04affddd9b66ab9de3dd7b095852e9b69":{"balance":"0x0","code":"0x","nonce":"0x0","address":"0x704107d04affddd9b66ab9de3dd7b095852e9b69"}},"transactions":[],"network":"2","isDisclaimerConfirmed":true,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"},"selectedAddress":"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc","selectedAddress":"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc","seedWords":null},"appState":{"menuOpen":false,"currentView":{"name":"accounts"},"accountDetail":{"subview":"transactions","accountExport":"none","privateKey":""},"currentDomain":"extensions","transForward":true,"isLoading":false,"warning":null,"scrollToBottom":true},"identities":{}}},{"config":{"dekusan":{"isInitialized":true,"isUnlocked":true,"currentDomain":"example.com","rpcTarget":"https://api-testnet.dexon.org/v1/network/rpc/","identities":{"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6":{"name":"Wallet 1","address":"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6","mayBeFauceting":false},"0x843963b837841dad3b0f5969ff271108776616df":{"name":"Wallet 2","address":"0x843963b837841dad3b0f5969ff271108776616df","mayBeFauceting":false},"0x2cb215323857bec1c91e5db10fe87379a5cf129a":{"name":"Wallet 3","address":"0x2cb215323857bec1c91e5db10fe87379a5cf129a","mayBeFauceting":false},"0xc5091450b7548b0dce3a76b8d325929c39e648d1":{"name":"Wallet 4","address":"0xc5091450b7548b0dce3a76b8d325929c39e648d1","mayBeFauceting":false}},"unconfTxs":{},"accounts":{"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6"},"0x843963b837841dad3b0f5969ff271108776616df":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0x843963b837841dad3b0f5969ff271108776616df"},"0x2cb215323857bec1c91e5db10fe87379a5cf129a":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0x2cb215323857bec1c91e5db10fe87379a5cf129a"},"0xc5091450b7548b0dce3a76b8d325929c39e648d1":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0xc5091450b7548b0dce3a76b8d325929c39e648d1"}},"transactions":[],"selectedAddress":"0x843963b837841dad3b0f5969ff271108776616df","network":"2","isDisclaimerConfirmed":true,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"},"selectedAddress":"0x843963b837841dad3b0f5969ff271108776616df","seedWords":null},"appState":{"menuOpen":false,"currentView":{"name":"accounts"},"accountDetail":{"subview":"transactions","accountExport":"none","privateKey":""},"currentDomain":"testfaucet.metamask.io","transForward":true,"isLoading":false,"warning":null,"scrollToBottom":true},"identities":{}}},{"create vault password":{"dekusan":{"isInitialized":false,"isUnlocked":false,"currentDomain":"example.com","rpcTarget":"https://api-testnet.dexon.org/v1/network/rpc/","identities":{},"unconfTxs":{},"accounts":{},"transactions":[],"network":"2","seedWords":null,"isDisclaimerConfirmed":true,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"}},"appState":{"menuOpen":false,"currentView":{"name":"accounts","detailView":null},"accountDetail":{"subview":"transactions"},"currentDomain":"extensions","transForward":false,"isLoading":false,"warning":null},"identities":{}}},{"help":{"dekusan":{"isInitialized":true,"isUnlocked":true,"currentDomain":"example.com","rpcTarget":"https://api-testnet.dexon.org/v1/network/rpc/","identities":{"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc":{"name":"Wallet 1","address":"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc","mayBeFauceting":false},"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b":{"name":"Wallet 2","address":"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b","mayBeFauceting":false},"0xeb9e64b93097bc15f01f13eae97015c57ab64823":{"name":"Wallet 3","address":"0xeb9e64b93097bc15f01f13eae97015c57ab64823","mayBeFauceting":false},"0x704107d04affddd9b66ab9de3dd7b095852e9b69":{"name":"Wallet 4","address":"0x704107d04affddd9b66ab9de3dd7b095852e9b69","mayBeFauceting":false}},"unconfTxs":{},"accounts":{"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc":{"code":"0x","balance":"0x0","nonce":"0x0","address":"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc"},"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b":{"code":"0x","balance":"0x0","nonce":"0x0","address":"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b"},"0xeb9e64b93097bc15f01f13eae97015c57ab64823":{"code":"0x","balance":"0x0","nonce":"0x0","address":"0xeb9e64b93097bc15f01f13eae97015c57ab64823"},"0x704107d04affddd9b66ab9de3dd7b095852e9b69":{"code":"0x","nonce":"0x0","balance":"0x0","address":"0x704107d04affddd9b66ab9de3dd7b095852e9b69"}},"transactions":[],"network":"2","isDisclaimerConfirmed":true,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"},"selectedAddress":"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc","selectedAddress":"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc","seedWords":null},"appState":{"menuOpen":false,"currentView":{"name":"info"},"accountDetail":{"subview":"transactions","accountExport":"none","privateKey":""},"currentDomain":"extensions","transForward":true,"isLoading":false,"warning":null,"scrollToBottom":true},"identities":{}}},{"locked":{"dekusan":{"isInitialized":true,"isUnlocked":true,"currentDomain":"example.com","rpcTarget":"https://api-testnet.dexon.org/v1/network/rpc/","identities":{"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6":{"name":"Wallet 1","address":"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6","mayBeFauceting":false},"0x843963b837841dad3b0f5969ff271108776616df":{"name":"Wallet 2","address":"0x843963b837841dad3b0f5969ff271108776616df","mayBeFauceting":false},"0x2cb215323857bec1c91e5db10fe87379a5cf129a":{"name":"Wallet 3","address":"0x2cb215323857bec1c91e5db10fe87379a5cf129a","mayBeFauceting":false},"0xc5091450b7548b0dce3a76b8d325929c39e648d1":{"name":"Wallet 4","address":"0xc5091450b7548b0dce3a76b8d325929c39e648d1","mayBeFauceting":false}},"unconfTxs":{},"accounts":{"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6"},"0x843963b837841dad3b0f5969ff271108776616df":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0x843963b837841dad3b0f5969ff271108776616df"},"0x2cb215323857bec1c91e5db10fe87379a5cf129a":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0x2cb215323857bec1c91e5db10fe87379a5cf129a"},"0xc5091450b7548b0dce3a76b8d325929c39e648d1":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0xc5091450b7548b0dce3a76b8d325929c39e648d1"}},"transactions":[],"selectedAddress":"0x843963b837841dad3b0f5969ff271108776616df","network":"2","isDisclaimerConfirmed":true,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"},"selectedAddress":"0x843963b837841dad3b0f5969ff271108776616df"},"appState":{"menuOpen":false,"currentView":{"name":"accountDetail"},"accountDetail":{"subview":"transactions","accountExport":"none","privateKey":""},"currentDomain":"testfaucet.metamask.io","transForward":false,"isLoading":false,"warning":null,"scrollToBottom":false},"identities":{}}},{"new vault":{"dekusan":{"isInitialized":false,"isUnlocked":false,"currentDomain":"example.com","rpcTarget":"https://api-testnet.dexon.org/v1/network/rpc/","identities":{},"unconfTxs":{},"accounts":{},"transactions":[],"network":"2","seedWords":null,"isDisclaimerConfirmed":false,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"}},"appState":{"menuOpen":false,"currentView":{"name":"accounts","detailView":null},"accountDetail":{"subview":"transactions"},"currentDomain":"extensions","transForward":true,"isLoading":false,"warning":null},"identities":{}}},{"show seed words":{"dekusan":{"isInitialized":false,"isUnlocked":true,"currentDomain":"example.com","rpcTarget":"https://api-testnet.dexon.org/v1/network/rpc/","identities":{"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc":{"name":"Wallet 1","address":"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc","mayBeFauceting":false},"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b":{"name":"Wallet 2","address":"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b","mayBeFauceting":false},"0xeb9e64b93097bc15f01f13eae97015c57ab64823":{"name":"Wallet 3","address":"0xeb9e64b93097bc15f01f13eae97015c57ab64823","mayBeFauceting":false}},"unconfTxs":{},"accounts":{"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc"},"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b"},"0xeb9e64b93097bc15f01f13eae97015c57ab64823":{"balance":"0x0","nonce":"0x0","code":"0x","address":"0xeb9e64b93097bc15f01f13eae97015c57ab64823"}},"transactions":[],"network":"2","seedWords":"debris dizzy just program just float decrease vacant alarm reduce speak stadium","isDisclaimerConfirmed":false,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"}},"appState":{"menuOpen":false,"currentView":{"name":"createVaultComplete","seedWords":"debris dizzy just program just float decrease vacant alarm reduce speak stadium"},"accountDetail":{"subview":"transactions"},"currentDomain":"extensions","transForward":true,"isLoading":false,"warning":null},"identities":{}}},{"terms":{"dekusan":{"accounts":{},"transactions":[],"identities":{},"network":"2","isInitialized":false,"isUnlocked":false,"seedWords":null,"isDisclaimerConfirmed":false,"unconfTxs":{},"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"}},"appState":{"currentDomain":"extensions"}}}]
\ No newline at end of file
diff --git a/development/states/account-detail-with-shapeshift-tx.json b/development/states/account-detail-with-shapeshift-tx.json
index 97d5e9f0..f30b50bd 100644
--- a/development/states/account-detail-with-shapeshift-tx.json
+++ b/development/states/account-detail-with-shapeshift-tx.json
@@ -1,12 +1,12 @@
 {
-  "metamask": {
+  "dekusan": {
     "currentCurrency": "USD",
     "conversionRate": 11.06608791,
     "conversionDate": 1470421024,
     "isInitialized": true,
     "isUnlocked": true,
     "currentDomain": "example.com",
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "shapeShiftTxList":[
       {
         "depositAddress": "1L8BJCR6KHkCiVceDqibt7zJscqPpH7pFw",
@@ -49,7 +49,7 @@
           "value": "0x66c899104aa57038000",
           "origin": "thelongestdomainnameintheworldandthensomeandthensomemoreandmore.com",
           "metamaskId": 1467921503489592,
-          "metamaskNetworkId": "2"
+          "dekusanNetworkId": "2"
         },
         "time": 1467921503489,
         "status": "rejected",
@@ -63,7 +63,7 @@
           "value": "0x0",
           "origin": "thelongestdomainnameintheworldandthensomeandthensomemoreandmore.com",
           "metamaskId": 1467923203344608,
-          "metamaskNetworkId": "2"
+          "dekusanNetworkId": "2"
         },
         "time": 1467923203344,
         "status": "confirmed",
@@ -78,7 +78,7 @@
           "value": "0x66c899104aa57038000",
           "origin": "thelongestdomainnameintheworldandthensomeandthensomemoreandmore.com",
           "metamaskId": 1467921503489592,
-          "metamaskNetworkId": "2"
+          "dekusanNetworkId": "2"
         },
         "time": 1467921503489,
         "status": "confirmed",
diff --git a/development/states/account-detail-with-transaction-history.json b/development/states/account-detail-with-transaction-history.json
index a6bcc265..4bc31510 100644
--- a/development/states/account-detail-with-transaction-history.json
+++ b/development/states/account-detail-with-transaction-history.json
@@ -1,12 +1,12 @@
 {
-  "metamask": {
+  "dekusan": {
     "currentCurrency": "USD",
     "conversionRate": 11.06608791,
     "conversionDate": 1470421024,
     "isInitialized": true,
     "isUnlocked": true,
     "currentDomain": "example.com",
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc": {
         "name": "Wallet 1",
@@ -64,7 +64,7 @@
           "value": "0x66c899104aa57038000",
           "origin": "thelongestdomainnameintheworldandthensomeandthensomemoreandmore.com",
           "metamaskId": 1467921503489592,
-          "metamaskNetworkId": "2"
+          "dekusanNetworkId": "2"
         },
         "time": 1467921503489,
         "status": "rejected",
@@ -78,7 +78,7 @@
           "value": "0x0",
           "origin": "thelongestdomainnameintheworldandthensomeandthensomemoreandmore.com",
           "metamaskId": 1467923203344608,
-          "metamaskNetworkId": "2"
+          "dekusanNetworkId": "2"
         },
         "time": 1467923203344,
         "status": "confirmed",
@@ -93,7 +93,7 @@
           "value": "0x66c899104aa57038000",
           "origin": "thelongestdomainnameintheworldandthensomeandthensomemoreandmore.com",
           "metamaskId": 1467921503489592,
-          "metamaskNetworkId": "2"
+          "dekusanNetworkId": "2"
         },
         "time": 1467921503489,
         "status": "confirmed",
diff --git a/development/states/account-detail.json b/development/states/account-detail.json
index 6d11c1de..2a2be622 100644
--- a/development/states/account-detail.json
+++ b/development/states/account-detail.json
@@ -1,12 +1,12 @@
 {
-  "metamask": {
+  "dekusan": {
     "currentCurrency": "USD",
     "conversionRate": 11.06608791,
     "conversionDate": 1470421024,
     "isInitialized": true,
     "isUnlocked": true,
     "currentDomain": "example.com",
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc": {
         "name": "Wallet 1",
diff --git a/development/states/account-list-with-imported.json b/development/states/account-list-with-imported.json
index 41d586db..248528c6 100644
--- a/development/states/account-list-with-imported.json
+++ b/development/states/account-list-with-imported.json
@@ -1,8 +1,8 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0x58bda1f9d87dc7d2bcc6f7c2513efc9d03fca683": {
         "address": "0x58bda1f9d87dc7d2bcc6f7c2513efc9d03fca683",
diff --git a/development/states/accounts-loose.json b/development/states/accounts-loose.json
index df51f0d7..406c00e8 100644
--- a/development/states/accounts-loose.json
+++ b/development/states/accounts-loose.json
@@ -1,8 +1,8 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0xac39b311dceb2a4b2f5d8461c1cdaf756f4f7ae9": {
         "address": "0xac39b311dceb2a4b2f5d8461c1cdaf756f4f7ae9",
diff --git a/development/states/accounts.json b/development/states/accounts.json
index c8ff40ed..86e0b38b 100644
--- a/development/states/accounts.json
+++ b/development/states/accounts.json
@@ -1,8 +1,8 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0x0abdd95cafcabec9b3e99dcd09fc4b441037cb80": {
         "name": "Wallet 1",
diff --git a/development/states/add-token.json b/development/states/add-token.json
index b59e9b75..6034fc1e 100644
--- a/development/states/add-token.json
+++ b/development/states/add-token.json
@@ -1,9 +1,9 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
     "featureFlags": {"betaUI": true},
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
         "address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
diff --git a/development/states/compilation-bug.json b/development/states/compilation-bug.json
index 588d069d..00c35f9d 100644
--- a/development/states/compilation-bug.json
+++ b/development/states/compilation-bug.json
@@ -1,8 +1,8 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0xac39b311dceb2a4b2f5d8461c1cdaf756f4f7ae9": {
         "address": "0xac39b311dceb2a4b2f5d8461c1cdaf756f4f7ae9",
@@ -30,12 +30,12 @@
           "data": "0x606060405234610000575b60da806100186000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630dbe671f14603c575b6000565b3460005760466088565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a72305820a99dfa6091771f518dd1ae8d1ee347bae3304dffd98fd24b1b99a8380bc60a750029",
           "gas": "0x1af75",
           "metamaskId": 7992944905869041,
-          "metamaskNetworkId": "3"
+          "dekusanNetworkId": "3"
         },
         "time": 1482279685589,
         "status": "unconfirmed",
         "gasMultiplier": 1,
-        "metamaskNetworkId": "3",
+        "dekusanNetworkId": "3",
         "gasLimitSpecified": true,
         "estimatedGas": "0x1af75",
         "simulationFails": true
@@ -81,12 +81,12 @@
           "data": "0x606060405234610000575b60da806100186000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630dbe671f14603c575b6000565b3460005760466088565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a72305820a99dfa6091771f518dd1ae8d1ee347bae3304dffd98fd24b1b99a8380bc60a750029",
           "gas": "0x1af75",
           "metamaskId": 7992944905869041,
-          "metamaskNetworkId": "3"
+          "dekusanNetworkId": "3"
         },
         "time": 1482279685589,
         "status": "unconfirmed",
         "gasMultiplier": 1,
-        "metamaskNetworkId": "3",
+        "dekusanNetworkId": "3",
         "gasLimitSpecified": true,
         "estimatedGas": "0x1af75",
         "simulationFails": true
diff --git a/development/states/conf-tx.json b/development/states/conf-tx.json
index 51d48cce..dd054cb6 100644
--- a/development/states/conf-tx.json
+++ b/development/states/conf-tx.json
@@ -1,8 +1,8 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
         "address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
@@ -31,13 +31,13 @@
         "time": 1487363153561,
         "status": "unapproved",
         "gasMultiplier": 1,
-        "metamaskNetworkId": "3",
+        "dekusanNetworkId": "3",
         "txParams": {
           "from": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
           "to": "0x18a3462427bcc9133bb46e88bcbe39cd7ef0e761",
           "value": "0xde0b6b3a7640000",
           "metamaskId": 4768706228115573,
-          "metamaskNetworkId": "3",
+          "dekusanNetworkId": "3",
           "gas": "0x5209"
         },
         "gasLimitSpecified": false,
@@ -99,13 +99,13 @@
         "time": 1487271497135,
         "status": "confirmed",
         "gasMultiplier": 1,
-        "metamaskNetworkId": "3",
+        "dekusanNetworkId": "3",
         "txParams": {
           "from": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
           "to": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
           "value": "0x38d7ea4c68000",
           "metamaskId": 3870222542191014,
-          "metamaskNetworkId": "3",
+          "dekusanNetworkId": "3",
           "gas": "0x5209",
           "gasPrice": "0x458d0be6b8",
           "nonce": "0x0",
@@ -123,13 +123,13 @@
         "time": 1487271512355,
         "status": "confirmed",
         "gasMultiplier": 1,
-        "metamaskNetworkId": "3",
+        "dekusanNetworkId": "3",
         "txParams": {
           "from": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
           "to": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
           "value": "0x0",
           "metamaskId": 3870222542191015,
-          "metamaskNetworkId": "3",
+          "dekusanNetworkId": "3",
           "gas": "0x5209",
           "nonce": "0x01",
           "gasPrice": "0x458d0be6b8",
@@ -147,13 +147,13 @@
         "time": 1487363153561,
         "status": "unapproved",
         "gasMultiplier": 1,
-        "metamaskNetworkId": "3",
+        "dekusanNetworkId": "3",
         "txParams": {
           "from": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
           "to": "0x18a3462427bcc9133bb46e88bcbe39cd7ef0e761",
           "value": "0xde0b6b3a7640000",
           "metamaskId": 4768706228115573,
-          "metamaskNetworkId": "3",
+          "dekusanNetworkId": "3",
           "gas": "0x5209"
         },
         "gasLimitSpecified": false,
diff --git a/development/states/config.json b/development/states/config.json
index 551c0e3f..5b5844c6 100644
--- a/development/states/config.json
+++ b/development/states/config.json
@@ -1,12 +1,12 @@
 {
-  "metamask": {
+  "dekusan": {
     "currentCurrency": "USD",
     "conversionRate": 11.06608791,
     "conversionDate": 1470421024,
     "isInitialized": true,
     "isUnlocked": true,
     "currentDomain": "example.com",
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6": {
         "name": "Wallet 1",
diff --git a/development/states/confirm-new-ui.json b/development/states/confirm-new-ui.json
index fffee989..c950ffcb 100644
--- a/development/states/confirm-new-ui.json
+++ b/development/states/confirm-new-ui.json
@@ -1,9 +1,9 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
     "featureFlags": {"betaUI": true},
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
         "address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
@@ -70,13 +70,13 @@
         "time": 1487363153561,
         "status": "unapproved",
         "gasMultiplier": 1,
-        "metamaskNetworkId": "3",
+        "dekusanNetworkId": "3",
         "txParams": {
           "from": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
           "to": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d",
           "value": "0x1bc16d674ec80000",
           "metamaskId": 4768706228115573,
-          "metamaskNetworkId": "3",
+          "dekusanNetworkId": "3",
           "gas": "0xea60",
           "gasPrice": "0xba43b7400"
         }
diff --git a/development/states/confirm-sig-requests.json b/development/states/confirm-sig-requests.json
index 1ffde393..b46ec7a6 100644
--- a/development/states/confirm-sig-requests.json
+++ b/development/states/confirm-sig-requests.json
@@ -1,9 +1,9 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
     "featureFlags": {"betaUI": true},
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
         "address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
diff --git a/development/states/create-vault-password.json b/development/states/create-vault-password.json
index 1ff51b42..55fcb176 100644
--- a/development/states/create-vault-password.json
+++ b/development/states/create-vault-password.json
@@ -1,9 +1,9 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": false,
     "isUnlocked": false,
     "currentDomain": "example.com",
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {},
     "unconfTxs": {},
     "accounts": {},
diff --git a/development/states/currency-localization.json b/development/states/currency-localization.json
index ef28891a..41bdd342 100644
--- a/development/states/currency-localization.json
+++ b/development/states/currency-localization.json
@@ -1,9 +1,9 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
     "featureFlags": {"betaUI": true},
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
         "address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
diff --git a/development/states/custom-rpc.json b/development/states/custom-rpc.json
index 7917352e..624fdc73 100644
--- a/development/states/custom-rpc.json
+++ b/development/states/custom-rpc.json
@@ -1,9 +1,9 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
     "currentDomain": "example.com",
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
         "name": "Wallet 1",
@@ -43,7 +43,7 @@
           "gas": "0xf4240",
           "origin": "tokenfactory.surge.sh",
           "metamaskId": 1470676748243181,
-          "metamaskNetworkId": "2"
+          "dekusanNetworkId": "2"
         },
         "time": 1470676748243,
         "status": "confirmed",
@@ -62,7 +62,7 @@
           "gasLimit": "0x5ce40",
           "origin": "www.etherfaces.com",
           "metamaskId": 1470682363931487,
-          "metamaskNetworkId": "1"
+          "dekusanNetworkId": "1"
         },
         "time": 1470682363931,
         "status": "confirmed",
@@ -82,7 +82,7 @@
           "gasLimit": "0x2fc7720",
           "origin": "www.etherfaces.com",
           "metamaskId": 1470682617417416,
-          "metamaskNetworkId": "1"
+          "dekusanNetworkId": "1"
         },
         "time": 1470682617417,
         "status": "confirmed",
@@ -102,7 +102,7 @@
           "gasLimit": "0x2fc7720",
           "origin": "www.etherfaces.com",
           "metamaskId": 1470682742887332,
-          "metamaskNetworkId": "1"
+          "dekusanNetworkId": "1"
         },
         "time": 1470682742887,
         "status": "confirmed",
@@ -119,7 +119,7 @@
           "gas": "0xf4240",
           "origin": "tokenfactory.surge.sh",
           "metamaskId": 1470692493483229,
-          "metamaskNetworkId": "1"
+          "dekusanNetworkId": "1"
         },
         "time": 1470692493483,
         "status": "confirmed",
@@ -134,7 +134,7 @@
           "value": "0x2",
           "origin": "localhost",
           "metamaskId": 1470962599348486,
-          "metamaskNetworkId": "1"
+          "dekusanNetworkId": "1"
         },
         "time": 1470962599348,
         "status": "rejected",
@@ -149,7 +149,7 @@
           "value": "0x2",
           "origin": "localhost",
           "metamaskId": 1470963263070463,
-          "metamaskNetworkId": "1"
+          "dekusanNetworkId": "1"
         },
         "time": 1470963263070,
         "status": "rejected",
diff --git a/development/states/empty-account-detail.json b/development/states/empty-account-detail.json
index 60b04f03..a60e69a1 100644
--- a/development/states/empty-account-detail.json
+++ b/development/states/empty-account-detail.json
@@ -1,9 +1,9 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
     "currentDomain": "example.com",
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc": {
         "name": "Wallet 1",
diff --git a/development/states/first-time.json b/development/states/first-time.json
index 10878db8..2c59ded0 100644
--- a/development/states/first-time.json
+++ b/development/states/first-time.json
@@ -1,8 +1,8 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": false,
     "isUnlocked": false,
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {},
     "computedBalances": {},
     "frequentRpcList": [],
diff --git a/development/states/help.json b/development/states/help.json
index cb8b1197..5f479651 100644
--- a/development/states/help.json
+++ b/development/states/help.json
@@ -1,9 +1,9 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
     "currentDomain": "example.com",
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc": {
         "name": "Wallet 1",
diff --git a/development/states/import-private-key-warning.json b/development/states/import-private-key-warning.json
index 80ebc650..8879d5b0 100644
--- a/development/states/import-private-key-warning.json
+++ b/development/states/import-private-key-warning.json
@@ -1,8 +1,8 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0x01208723ba84e15da2e71656544a2963b0c06d40": {
         "address": "0x01208723ba84e15da2e71656544a2963b0c06d40",
diff --git a/development/states/import-private-key.json b/development/states/import-private-key.json
index bd455c6d..3aa24222 100644
--- a/development/states/import-private-key.json
+++ b/development/states/import-private-key.json
@@ -1,8 +1,8 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0x01208723ba84e15da2e71656544a2963b0c06d40": {
         "address": "0x01208723ba84e15da2e71656544a2963b0c06d40",
diff --git a/development/states/locked.json b/development/states/locked.json
index 866394e8..f5c04205 100644
--- a/development/states/locked.json
+++ b/development/states/locked.json
@@ -1,9 +1,9 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": false,
     "currentDomain": "example.com",
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {},
     "unconfTxs": {},
     "currentCurrency": "USD",
diff --git a/development/states/lost-accounts.json b/development/states/lost-accounts.json
index 4f50092b..873bcc83 100644
--- a/development/states/lost-accounts.json
+++ b/development/states/lost-accounts.json
@@ -1,5 +1,5 @@
 {
-  "metamask": {
+  "dekusan": {
     "currentCurrency": "USD",
     "lostAccounts": [
       "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc",
@@ -10,7 +10,7 @@
     "isInitialized": true,
     "isUnlocked": true,
     "currentDomain": "example.com",
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc": {
         "name": "Wallet 1",
diff --git a/development/states/new-account.json b/development/states/new-account.json
index dc2341b0..9cadd10b 100644
--- a/development/states/new-account.json
+++ b/development/states/new-account.json
@@ -1,8 +1,8 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0xa6ef573d60594731178b7f85d80da13cc2af52dd": {
         "address": "0xa6ef573d60594731178b7f85d80da13cc2af52dd",
diff --git a/development/states/new-vault.json b/development/states/new-vault.json
index 8db8222f..a9afe20b 100644
--- a/development/states/new-vault.json
+++ b/development/states/new-vault.json
@@ -1,9 +1,9 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": false,
     "isUnlocked": false,
     "currentDomain": "example.com",
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {},
     "unconfTxs": {},
     "accounts": {},
diff --git a/development/states/notice.json b/development/states/notice.json
index 4401393c..760e36c7 100644
--- a/development/states/notice.json
+++ b/development/states/notice.json
@@ -1,5 +1,5 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
     "identities": {
diff --git a/development/states/pending-crash.json b/development/states/pending-crash.json
index cbb39535..1f777f3a 100644
--- a/development/states/pending-crash.json
+++ b/development/states/pending-crash.json
@@ -1 +1 @@
-{"metamask":{"isInitialized":true,"isUnlocked":true,"currentDomain":"example.com","rpcTarget":"https://rawtestrpc.metamask.io/","identities":{},"unconfTxs":{"1467755147235616":{"id":1467755147235616,"txParams":{"from":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","data":"0x60a060405260046060527f48302e31000000000000000000000000000000000000000000000000000000006080526006805460008290527f48302e310000000000000000000000000000000000000000000000000000000882556100b5907ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f602060026001841615610100026000190190931692909204601f01919091048101905b8082111561017957600081556001016100a1565b505060405161099338038061099383398101604052808051906020019091908051820191906020018051906020019091908051820191906020015050836000600050600033600160a060020a0316815260200190815260200160002060005081905550836002600050819055508260036000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017d57805160ff19168380011785555b506101ad9291506100a1565b5090565b8280016001018555821561016d579182015b8281111561016d57825182600050559160200191906001019061018f565b50506004805460ff19168317905560058054825160008390527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db0602060026001851615610100026000190190941693909304601f90810184900482019386019083901061022d57805160ff19168380011785555b5061025d9291506100a1565b82800160010185558215610221579182015b8281111561022157825182600050559160200191906001019061023f565b505050505050610722806102716000396000f36060604052361561008d5760e060020a600035046306fdde038114610095578063095ea7b3146100f257806318160ddd1461015d57806323b872dd14610166578063313ce567146102c757806354fd4d50146102d357806370a082311461033057806395d89b411461035e578063a9059cbb146103bb578063cae9ca511461044d578063dd62ed3e14610639575b610000610002565b61066d60038054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b61034c60043560243533600160a060020a03908116600081815260016020908152604080832094871680845294825282208590556060858152919392917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259190a35060015b92915050565b61034c60025481565b61034c600435602435604435600160a060020a0383166000908152602081905260408120548290108015906101b9575060016020908152604080832033600160a060020a03168452909152812054829010155b80156101c55750600082115b1561071d57816000600050600085600160a060020a03168152602001908152602001600020600082828250540192505081905550816000600050600086600160a060020a03168152602001908152602001600020600082828250540392505081905550816001600050600086600160a060020a03168152602001908152602001600020600050600033600160a060020a0316815260200190815260200160002060008282825054039250508190555082600160a060020a031684600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3506001610632565b6106db60045460ff1681565b61066d60068054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b600160a060020a03600435166000908152602081905260409020545b60408051918252519081900360200190f35b61066d60058054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b61034c60043560243533600160a060020a03166000908152602081905260408120548290108015906103ed5750600082115b1561071857604080822080548490039055600160a060020a03808516808452918320805485019055606084815233909116907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef90602090a3506001610157565b60806020604435600481810135601f81018490049093028401604052606083815261034c94823594602480359560649493910191908190838280828437509496505050505050506000826001600050600033600160a060020a03168152602001908152602001600020600050600086600160a060020a031681526020019081526020016000206000508190555083600160a060020a031660405180807f72656365697665417070726f76616c28616464726573732c75696e743235362c81526020017f616464726573732c627974657329000000000000000000000000000000000000815260200150602e019050604051809103902060e060020a8091040260e060020a9004338530866040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a031681526020018280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156105d45780820380516001836020036101000a031916815260200191505b509450505050506000604051808303816000876161da5a03f1505060408051868152905133600160a060020a031692507f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259181900360200190a35060015b9392505050565b61034c600435602435600160a060020a03808316600090815260016020908152604080832093851683529290522054610157565b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156106cd5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6060908152602090f35b820191906000526020600020905b8154815290600101906020018083116106f357829003601f168201915b505050505081565b610157565b6106325600000000000000000000000000000000000000000000000000000000000f42400000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000844616e4275636b7300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000034442580000000000000000000000000000000000000000000000000000000000","gasPrice":"0xba43b7400","gas":"0xf4240","origin":"tokenfactory.surge.sh","metamaskId":1467755147235616,"metamaskNetworkId":"1"},"time":1467755147235,"status":"unconfirmed"}},"accounts":{"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825":{}},"transactions":[{"id":1467742640796159,"txParams":{"from":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","data":"0x60a060405260046060527f48302e31000000000000000000000000000000000000000000000000000000006080526006805460008290527f48302e310000000000000000000000000000000000000000000000000000000882556100b5907ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f602060026001841615610100026000190190931692909204601f01919091048101905b8082111561017957600081556001016100a1565b505060405161099338038061099383398101604052808051906020019091908051820191906020018051906020019091908051820191906020015050836000600050600033600160a060020a0316815260200190815260200160002060005081905550836002600050819055508260036000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017d57805160ff19168380011785555b506101ad9291506100a1565b5090565b8280016001018555821561016d579182015b8281111561016d57825182600050559160200191906001019061018f565b50506004805460ff19168317905560058054825160008390527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db0602060026001851615610100026000190190941693909304601f90810184900482019386019083901061022d57805160ff19168380011785555b5061025d9291506100a1565b82800160010185558215610221579182015b8281111561022157825182600050559160200191906001019061023f565b505050505050610722806102716000396000f36060604052361561008d5760e060020a600035046306fdde038114610095578063095ea7b3146100f257806318160ddd1461015d57806323b872dd14610166578063313ce567146102c757806354fd4d50146102d357806370a082311461033057806395d89b411461035e578063a9059cbb146103bb578063cae9ca511461044d578063dd62ed3e14610639575b610000610002565b61066d60038054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b61034c60043560243533600160a060020a03908116600081815260016020908152604080832094871680845294825282208590556060858152919392917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259190a35060015b92915050565b61034c60025481565b61034c600435602435604435600160a060020a0383166000908152602081905260408120548290108015906101b9575060016020908152604080832033600160a060020a03168452909152812054829010155b80156101c55750600082115b1561071d57816000600050600085600160a060020a03168152602001908152602001600020600082828250540192505081905550816000600050600086600160a060020a03168152602001908152602001600020600082828250540392505081905550816001600050600086600160a060020a03168152602001908152602001600020600050600033600160a060020a0316815260200190815260200160002060008282825054039250508190555082600160a060020a031684600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3506001610632565b6106db60045460ff1681565b61066d60068054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b600160a060020a03600435166000908152602081905260409020545b60408051918252519081900360200190f35b61066d60058054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b61034c60043560243533600160a060020a03166000908152602081905260408120548290108015906103ed5750600082115b1561071857604080822080548490039055600160a060020a03808516808452918320805485019055606084815233909116907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef90602090a3506001610157565b60806020604435600481810135601f81018490049093028401604052606083815261034c94823594602480359560649493910191908190838280828437509496505050505050506000826001600050600033600160a060020a03168152602001908152602001600020600050600086600160a060020a031681526020019081526020016000206000508190555083600160a060020a031660405180807f72656365697665417070726f76616c28616464726573732c75696e743235362c81526020017f616464726573732c627974657329000000000000000000000000000000000000815260200150602e019050604051809103902060e060020a8091040260e060020a9004338530866040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a031681526020018280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156105d45780820380516001836020036101000a031916815260200191505b509450505050506000604051808303816000876161da5a03f1505060408051868152905133600160a060020a031692507f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259181900360200190a35060015b9392505050565b61034c600435602435600160a060020a03808316600090815260016020908152604080832093851683529290522054610157565b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156106cd5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6060908152602090f35b820191906000526020600020905b8154815290600101906020018083116106f357829003601f168201915b505050505081565b610157565b6106325600000000000000000000000000000000000000000000000000000000000186a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000844616e6275636b7300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000034442580000000000000000000000000000000000000000000000000000000000","gasPrice":"0xba43b7400","gas":"0xf4240","origin":"tokenfactory.surge.sh","metamaskId":1467742640796159,"metamaskNetworkId":"2"},"time":1467742640796,"status":"rejected"},{"id":1467742652846512,"txParams":{"from":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","data":"0x60a060405260046060527f48302e31000000000000000000000000000000000000000000000000000000006080526006805460008290527f48302e310000000000000000000000000000000000000000000000000000000882556100b5907ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f602060026001841615610100026000190190931692909204601f01919091048101905b8082111561017957600081556001016100a1565b505060405161099338038061099383398101604052808051906020019091908051820191906020018051906020019091908051820191906020015050836000600050600033600160a060020a0316815260200190815260200160002060005081905550836002600050819055508260036000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017d57805160ff19168380011785555b506101ad9291506100a1565b5090565b8280016001018555821561016d579182015b8281111561016d57825182600050559160200191906001019061018f565b50506004805460ff19168317905560058054825160008390527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db0602060026001851615610100026000190190941693909304601f90810184900482019386019083901061022d57805160ff19168380011785555b5061025d9291506100a1565b82800160010185558215610221579182015b8281111561022157825182600050559160200191906001019061023f565b505050505050610722806102716000396000f36060604052361561008d5760e060020a600035046306fdde038114610095578063095ea7b3146100f257806318160ddd1461015d57806323b872dd14610166578063313ce567146102c757806354fd4d50146102d357806370a082311461033057806395d89b411461035e578063a9059cbb146103bb578063cae9ca511461044d578063dd62ed3e14610639575b610000610002565b61066d60038054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b61034c60043560243533600160a060020a03908116600081815260016020908152604080832094871680845294825282208590556060858152919392917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259190a35060015b92915050565b61034c60025481565b61034c600435602435604435600160a060020a0383166000908152602081905260408120548290108015906101b9575060016020908152604080832033600160a060020a03168452909152812054829010155b80156101c55750600082115b1561071d57816000600050600085600160a060020a03168152602001908152602001600020600082828250540192505081905550816000600050600086600160a060020a03168152602001908152602001600020600082828250540392505081905550816001600050600086600160a060020a03168152602001908152602001600020600050600033600160a060020a0316815260200190815260200160002060008282825054039250508190555082600160a060020a031684600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3506001610632565b6106db60045460ff1681565b61066d60068054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b600160a060020a03600435166000908152602081905260409020545b60408051918252519081900360200190f35b61066d60058054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b61034c60043560243533600160a060020a03166000908152602081905260408120548290108015906103ed5750600082115b1561071857604080822080548490039055600160a060020a03808516808452918320805485019055606084815233909116907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef90602090a3506001610157565b60806020604435600481810135601f81018490049093028401604052606083815261034c94823594602480359560649493910191908190838280828437509496505050505050506000826001600050600033600160a060020a03168152602001908152602001600020600050600086600160a060020a031681526020019081526020016000206000508190555083600160a060020a031660405180807f72656365697665417070726f76616c28616464726573732c75696e743235362c81526020017f616464726573732c627974657329000000000000000000000000000000000000815260200150602e019050604051809103902060e060020a8091040260e060020a9004338530866040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a031681526020018280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156105d45780820380516001836020036101000a031916815260200191505b509450505050506000604051808303816000876161da5a03f1505060408051868152905133600160a060020a031692507f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259181900360200190a35060015b9392505050565b61034c600435602435600160a060020a03808316600090815260016020908152604080832093851683529290522054610157565b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156106cd5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6060908152602090f35b820191906000526020600020905b8154815290600101906020018083116106f357829003601f168201915b505050505081565b610157565b6106325600000000000000000000000000000000000000000000000000000000000186a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000844616e6275636b7300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000034442580000000000000000000000000000000000000000000000000000000000","gasPrice":"0xba43b7400","gas":"0xf4240","origin":"tokenfactory.surge.sh","metamaskId":1467742652846512,"metamaskNetworkId":"2"},"time":1467742652846,"status":"confirmed","hash":"0xa991793a6918aea6d58c30934dab5ca4c0a47c2444e5b60769637491f118de26"},{"id":1467755147235616,"txParams":{"from":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","data":"0x60a060405260046060527f48302e31000000000000000000000000000000000000000000000000000000006080526006805460008290527f48302e310000000000000000000000000000000000000000000000000000000882556100b5907ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f602060026001841615610100026000190190931692909204601f01919091048101905b8082111561017957600081556001016100a1565b505060405161099338038061099383398101604052808051906020019091908051820191906020018051906020019091908051820191906020015050836000600050600033600160a060020a0316815260200190815260200160002060005081905550836002600050819055508260036000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017d57805160ff19168380011785555b506101ad9291506100a1565b5090565b8280016001018555821561016d579182015b8281111561016d57825182600050559160200191906001019061018f565b50506004805460ff19168317905560058054825160008390527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db0602060026001851615610100026000190190941693909304601f90810184900482019386019083901061022d57805160ff19168380011785555b5061025d9291506100a1565b82800160010185558215610221579182015b8281111561022157825182600050559160200191906001019061023f565b505050505050610722806102716000396000f36060604052361561008d5760e060020a600035046306fdde038114610095578063095ea7b3146100f257806318160ddd1461015d57806323b872dd14610166578063313ce567146102c757806354fd4d50146102d357806370a082311461033057806395d89b411461035e578063a9059cbb146103bb578063cae9ca511461044d578063dd62ed3e14610639575b610000610002565b61066d60038054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b61034c60043560243533600160a060020a03908116600081815260016020908152604080832094871680845294825282208590556060858152919392917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259190a35060015b92915050565b61034c60025481565b61034c600435602435604435600160a060020a0383166000908152602081905260408120548290108015906101b9575060016020908152604080832033600160a060020a03168452909152812054829010155b80156101c55750600082115b1561071d57816000600050600085600160a060020a03168152602001908152602001600020600082828250540192505081905550816000600050600086600160a060020a03168152602001908152602001600020600082828250540392505081905550816001600050600086600160a060020a03168152602001908152602001600020600050600033600160a060020a0316815260200190815260200160002060008282825054039250508190555082600160a060020a031684600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3506001610632565b6106db60045460ff1681565b61066d60068054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b600160a060020a03600435166000908152602081905260409020545b60408051918252519081900360200190f35b61066d60058054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b61034c60043560243533600160a060020a03166000908152602081905260408120548290108015906103ed5750600082115b1561071857604080822080548490039055600160a060020a03808516808452918320805485019055606084815233909116907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef90602090a3506001610157565b60806020604435600481810135601f81018490049093028401604052606083815261034c94823594602480359560649493910191908190838280828437509496505050505050506000826001600050600033600160a060020a03168152602001908152602001600020600050600086600160a060020a031681526020019081526020016000206000508190555083600160a060020a031660405180807f72656365697665417070726f76616c28616464726573732c75696e743235362c81526020017f616464726573732c627974657329000000000000000000000000000000000000815260200150602e019050604051809103902060e060020a8091040260e060020a9004338530866040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a031681526020018280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156105d45780820380516001836020036101000a031916815260200191505b509450505050506000604051808303816000876161da5a03f1505060408051868152905133600160a060020a031692507f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259181900360200190a35060015b9392505050565b61034c600435602435600160a060020a03808316600090815260016020908152604080832093851683529290522054610157565b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156106cd5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6060908152602090f35b820191906000526020600020905b8154815290600101906020018083116106f357829003601f168201915b505050505081565b610157565b6106325600000000000000000000000000000000000000000000000000000000000f42400000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000844616e4275636b7300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000034442580000000000000000000000000000000000000000000000000000000000","gasPrice":"0xba43b7400","gas":"0xf4240","origin":"tokenfactory.surge.sh","metamaskId":1467755147235616,"metamaskNetworkId":"1"},"time":1467755147235,"status":"unconfirmed"}],"selectedAddress":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","network":"1","seedWords":null,"unconfMsgs":{},"messages":[],"provider":{"type":"mainnet"},"selectedAddress":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"},"appState":{"menuOpen":false,"currentView":{"name":"confTx","context":0},"accountDetail":{"subview":"transactions"},"currentDomain":"tokenfactory.surge.sh","transForward":true,"isLoading":false,"warning":null},"identities":{}}
+{"dekusan":{"isInitialized":true,"isUnlocked":true,"currentDomain":"example.com","rpcTarget":"https://api-testnet.dexon.org/v1/network/rpc/","identities":{},"unconfTxs":{"1467755147235616":{"id":1467755147235616,"txParams":{"from":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","data":"0x60a060405260046060527f48302e31000000000000000000000000000000000000000000000000000000006080526006805460008290527f48302e310000000000000000000000000000000000000000000000000000000882556100b5907ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f602060026001841615610100026000190190931692909204601f01919091048101905b8082111561017957600081556001016100a1565b505060405161099338038061099383398101604052808051906020019091908051820191906020018051906020019091908051820191906020015050836000600050600033600160a060020a0316815260200190815260200160002060005081905550836002600050819055508260036000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017d57805160ff19168380011785555b506101ad9291506100a1565b5090565b8280016001018555821561016d579182015b8281111561016d57825182600050559160200191906001019061018f565b50506004805460ff19168317905560058054825160008390527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db0602060026001851615610100026000190190941693909304601f90810184900482019386019083901061022d57805160ff19168380011785555b5061025d9291506100a1565b82800160010185558215610221579182015b8281111561022157825182600050559160200191906001019061023f565b505050505050610722806102716000396000f36060604052361561008d5760e060020a600035046306fdde038114610095578063095ea7b3146100f257806318160ddd1461015d57806323b872dd14610166578063313ce567146102c757806354fd4d50146102d357806370a082311461033057806395d89b411461035e578063a9059cbb146103bb578063cae9ca511461044d578063dd62ed3e14610639575b610000610002565b61066d60038054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b61034c60043560243533600160a060020a03908116600081815260016020908152604080832094871680845294825282208590556060858152919392917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259190a35060015b92915050565b61034c60025481565b61034c600435602435604435600160a060020a0383166000908152602081905260408120548290108015906101b9575060016020908152604080832033600160a060020a03168452909152812054829010155b80156101c55750600082115b1561071d57816000600050600085600160a060020a03168152602001908152602001600020600082828250540192505081905550816000600050600086600160a060020a03168152602001908152602001600020600082828250540392505081905550816001600050600086600160a060020a03168152602001908152602001600020600050600033600160a060020a0316815260200190815260200160002060008282825054039250508190555082600160a060020a031684600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3506001610632565b6106db60045460ff1681565b61066d60068054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b600160a060020a03600435166000908152602081905260409020545b60408051918252519081900360200190f35b61066d60058054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b61034c60043560243533600160a060020a03166000908152602081905260408120548290108015906103ed5750600082115b1561071857604080822080548490039055600160a060020a03808516808452918320805485019055606084815233909116907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef90602090a3506001610157565b60806020604435600481810135601f81018490049093028401604052606083815261034c94823594602480359560649493910191908190838280828437509496505050505050506000826001600050600033600160a060020a03168152602001908152602001600020600050600086600160a060020a031681526020019081526020016000206000508190555083600160a060020a031660405180807f72656365697665417070726f76616c28616464726573732c75696e743235362c81526020017f616464726573732c627974657329000000000000000000000000000000000000815260200150602e019050604051809103902060e060020a8091040260e060020a9004338530866040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a031681526020018280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156105d45780820380516001836020036101000a031916815260200191505b509450505050506000604051808303816000876161da5a03f1505060408051868152905133600160a060020a031692507f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259181900360200190a35060015b9392505050565b61034c600435602435600160a060020a03808316600090815260016020908152604080832093851683529290522054610157565b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156106cd5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6060908152602090f35b820191906000526020600020905b8154815290600101906020018083116106f357829003601f168201915b505050505081565b610157565b6106325600000000000000000000000000000000000000000000000000000000000f42400000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000844616e4275636b7300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000034442580000000000000000000000000000000000000000000000000000000000","gasPrice":"0xba43b7400","gas":"0xf4240","origin":"tokenfactory.surge.sh","metamaskId":1467755147235616,"dekusanNetworkId":"1"},"time":1467755147235,"status":"unconfirmed"}},"accounts":{"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825":{}},"transactions":[{"id":1467742640796159,"txParams":{"from":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","data":"0x60a060405260046060527f48302e31000000000000000000000000000000000000000000000000000000006080526006805460008290527f48302e310000000000000000000000000000000000000000000000000000000882556100b5907ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f602060026001841615610100026000190190931692909204601f01919091048101905b8082111561017957600081556001016100a1565b505060405161099338038061099383398101604052808051906020019091908051820191906020018051906020019091908051820191906020015050836000600050600033600160a060020a0316815260200190815260200160002060005081905550836002600050819055508260036000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017d57805160ff19168380011785555b506101ad9291506100a1565b5090565b8280016001018555821561016d579182015b8281111561016d57825182600050559160200191906001019061018f565b50506004805460ff19168317905560058054825160008390527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db0602060026001851615610100026000190190941693909304601f90810184900482019386019083901061022d57805160ff19168380011785555b5061025d9291506100a1565b82800160010185558215610221579182015b8281111561022157825182600050559160200191906001019061023f565b505050505050610722806102716000396000f36060604052361561008d5760e060020a600035046306fdde038114610095578063095ea7b3146100f257806318160ddd1461015d57806323b872dd14610166578063313ce567146102c757806354fd4d50146102d357806370a082311461033057806395d89b411461035e578063a9059cbb146103bb578063cae9ca511461044d578063dd62ed3e14610639575b610000610002565b61066d60038054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b61034c60043560243533600160a060020a03908116600081815260016020908152604080832094871680845294825282208590556060858152919392917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259190a35060015b92915050565b61034c60025481565b61034c600435602435604435600160a060020a0383166000908152602081905260408120548290108015906101b9575060016020908152604080832033600160a060020a03168452909152812054829010155b80156101c55750600082115b1561071d57816000600050600085600160a060020a03168152602001908152602001600020600082828250540192505081905550816000600050600086600160a060020a03168152602001908152602001600020600082828250540392505081905550816001600050600086600160a060020a03168152602001908152602001600020600050600033600160a060020a0316815260200190815260200160002060008282825054039250508190555082600160a060020a031684600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3506001610632565b6106db60045460ff1681565b61066d60068054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b600160a060020a03600435166000908152602081905260409020545b60408051918252519081900360200190f35b61066d60058054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b61034c60043560243533600160a060020a03166000908152602081905260408120548290108015906103ed5750600082115b1561071857604080822080548490039055600160a060020a03808516808452918320805485019055606084815233909116907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef90602090a3506001610157565b60806020604435600481810135601f81018490049093028401604052606083815261034c94823594602480359560649493910191908190838280828437509496505050505050506000826001600050600033600160a060020a03168152602001908152602001600020600050600086600160a060020a031681526020019081526020016000206000508190555083600160a060020a031660405180807f72656365697665417070726f76616c28616464726573732c75696e743235362c81526020017f616464726573732c627974657329000000000000000000000000000000000000815260200150602e019050604051809103902060e060020a8091040260e060020a9004338530866040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a031681526020018280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156105d45780820380516001836020036101000a031916815260200191505b509450505050506000604051808303816000876161da5a03f1505060408051868152905133600160a060020a031692507f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259181900360200190a35060015b9392505050565b61034c600435602435600160a060020a03808316600090815260016020908152604080832093851683529290522054610157565b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156106cd5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6060908152602090f35b820191906000526020600020905b8154815290600101906020018083116106f357829003601f168201915b505050505081565b610157565b6106325600000000000000000000000000000000000000000000000000000000000186a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000844616e6275636b7300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000034442580000000000000000000000000000000000000000000000000000000000","gasPrice":"0xba43b7400","gas":"0xf4240","origin":"tokenfactory.surge.sh","metamaskId":1467742640796159,"dekusanNetworkId":"2"},"time":1467742640796,"status":"rejected"},{"id":1467742652846512,"txParams":{"from":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","data":"0x60a060405260046060527f48302e31000000000000000000000000000000000000000000000000000000006080526006805460008290527f48302e310000000000000000000000000000000000000000000000000000000882556100b5907ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f602060026001841615610100026000190190931692909204601f01919091048101905b8082111561017957600081556001016100a1565b505060405161099338038061099383398101604052808051906020019091908051820191906020018051906020019091908051820191906020015050836000600050600033600160a060020a0316815260200190815260200160002060005081905550836002600050819055508260036000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017d57805160ff19168380011785555b506101ad9291506100a1565b5090565b8280016001018555821561016d579182015b8281111561016d57825182600050559160200191906001019061018f565b50506004805460ff19168317905560058054825160008390527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db0602060026001851615610100026000190190941693909304601f90810184900482019386019083901061022d57805160ff19168380011785555b5061025d9291506100a1565b82800160010185558215610221579182015b8281111561022157825182600050559160200191906001019061023f565b505050505050610722806102716000396000f36060604052361561008d5760e060020a600035046306fdde038114610095578063095ea7b3146100f257806318160ddd1461015d57806323b872dd14610166578063313ce567146102c757806354fd4d50146102d357806370a082311461033057806395d89b411461035e578063a9059cbb146103bb578063cae9ca511461044d578063dd62ed3e14610639575b610000610002565b61066d60038054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b61034c60043560243533600160a060020a03908116600081815260016020908152604080832094871680845294825282208590556060858152919392917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259190a35060015b92915050565b61034c60025481565b61034c600435602435604435600160a060020a0383166000908152602081905260408120548290108015906101b9575060016020908152604080832033600160a060020a03168452909152812054829010155b80156101c55750600082115b1561071d57816000600050600085600160a060020a03168152602001908152602001600020600082828250540192505081905550816000600050600086600160a060020a03168152602001908152602001600020600082828250540392505081905550816001600050600086600160a060020a03168152602001908152602001600020600050600033600160a060020a0316815260200190815260200160002060008282825054039250508190555082600160a060020a031684600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3506001610632565b6106db60045460ff1681565b61066d60068054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b600160a060020a03600435166000908152602081905260409020545b60408051918252519081900360200190f35b61066d60058054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b61034c60043560243533600160a060020a03166000908152602081905260408120548290108015906103ed5750600082115b1561071857604080822080548490039055600160a060020a03808516808452918320805485019055606084815233909116907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef90602090a3506001610157565b60806020604435600481810135601f81018490049093028401604052606083815261034c94823594602480359560649493910191908190838280828437509496505050505050506000826001600050600033600160a060020a03168152602001908152602001600020600050600086600160a060020a031681526020019081526020016000206000508190555083600160a060020a031660405180807f72656365697665417070726f76616c28616464726573732c75696e743235362c81526020017f616464726573732c627974657329000000000000000000000000000000000000815260200150602e019050604051809103902060e060020a8091040260e060020a9004338530866040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a031681526020018280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156105d45780820380516001836020036101000a031916815260200191505b509450505050506000604051808303816000876161da5a03f1505060408051868152905133600160a060020a031692507f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259181900360200190a35060015b9392505050565b61034c600435602435600160a060020a03808316600090815260016020908152604080832093851683529290522054610157565b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156106cd5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6060908152602090f35b820191906000526020600020905b8154815290600101906020018083116106f357829003601f168201915b505050505081565b610157565b6106325600000000000000000000000000000000000000000000000000000000000186a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000844616e6275636b7300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000034442580000000000000000000000000000000000000000000000000000000000","gasPrice":"0xba43b7400","gas":"0xf4240","origin":"tokenfactory.surge.sh","metamaskId":1467742652846512,"dekusanNetworkId":"2"},"time":1467742652846,"status":"confirmed","hash":"0xa991793a6918aea6d58c30934dab5ca4c0a47c2444e5b60769637491f118de26"},{"id":1467755147235616,"txParams":{"from":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","data":"0x60a060405260046060527f48302e31000000000000000000000000000000000000000000000000000000006080526006805460008290527f48302e310000000000000000000000000000000000000000000000000000000882556100b5907ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f602060026001841615610100026000190190931692909204601f01919091048101905b8082111561017957600081556001016100a1565b505060405161099338038061099383398101604052808051906020019091908051820191906020018051906020019091908051820191906020015050836000600050600033600160a060020a0316815260200190815260200160002060005081905550836002600050819055508260036000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017d57805160ff19168380011785555b506101ad9291506100a1565b5090565b8280016001018555821561016d579182015b8281111561016d57825182600050559160200191906001019061018f565b50506004805460ff19168317905560058054825160008390527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db0602060026001851615610100026000190190941693909304601f90810184900482019386019083901061022d57805160ff19168380011785555b5061025d9291506100a1565b82800160010185558215610221579182015b8281111561022157825182600050559160200191906001019061023f565b505050505050610722806102716000396000f36060604052361561008d5760e060020a600035046306fdde038114610095578063095ea7b3146100f257806318160ddd1461015d57806323b872dd14610166578063313ce567146102c757806354fd4d50146102d357806370a082311461033057806395d89b411461035e578063a9059cbb146103bb578063cae9ca511461044d578063dd62ed3e14610639575b610000610002565b61066d60038054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b61034c60043560243533600160a060020a03908116600081815260016020908152604080832094871680845294825282208590556060858152919392917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259190a35060015b92915050565b61034c60025481565b61034c600435602435604435600160a060020a0383166000908152602081905260408120548290108015906101b9575060016020908152604080832033600160a060020a03168452909152812054829010155b80156101c55750600082115b1561071d57816000600050600085600160a060020a03168152602001908152602001600020600082828250540192505081905550816000600050600086600160a060020a03168152602001908152602001600020600082828250540392505081905550816001600050600086600160a060020a03168152602001908152602001600020600050600033600160a060020a0316815260200190815260200160002060008282825054039250508190555082600160a060020a031684600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3506001610632565b6106db60045460ff1681565b61066d60068054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b600160a060020a03600435166000908152602081905260409020545b60408051918252519081900360200190f35b61066d60058054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156107105780601f106106e557610100808354040283529160200191610710565b61034c60043560243533600160a060020a03166000908152602081905260408120548290108015906103ed5750600082115b1561071857604080822080548490039055600160a060020a03808516808452918320805485019055606084815233909116907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef90602090a3506001610157565b60806020604435600481810135601f81018490049093028401604052606083815261034c94823594602480359560649493910191908190838280828437509496505050505050506000826001600050600033600160a060020a03168152602001908152602001600020600050600086600160a060020a031681526020019081526020016000206000508190555083600160a060020a031660405180807f72656365697665417070726f76616c28616464726573732c75696e743235362c81526020017f616464726573732c627974657329000000000000000000000000000000000000815260200150602e019050604051809103902060e060020a8091040260e060020a9004338530866040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a031681526020018280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156105d45780820380516001836020036101000a031916815260200191505b509450505050506000604051808303816000876161da5a03f1505060408051868152905133600160a060020a031692507f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259181900360200190a35060015b9392505050565b61034c600435602435600160a060020a03808316600090815260016020908152604080832093851683529290522054610157565b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156106cd5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6060908152602090f35b820191906000526020600020905b8154815290600101906020018083116106f357829003601f168201915b505050505081565b610157565b6106325600000000000000000000000000000000000000000000000000000000000f42400000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000844616e4275636b7300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000034442580000000000000000000000000000000000000000000000000000000000","gasPrice":"0xba43b7400","gas":"0xf4240","origin":"tokenfactory.surge.sh","metamaskId":1467755147235616,"dekusanNetworkId":"1"},"time":1467755147235,"status":"unconfirmed"}],"selectedAddress":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","network":"1","seedWords":null,"unconfMsgs":{},"messages":[],"provider":{"type":"mainnet"},"selectedAddress":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"},"appState":{"menuOpen":false,"currentView":{"name":"confTx","context":0},"accountDetail":{"subview":"transactions"},"currentDomain":"tokenfactory.surge.sh","transForward":true,"isLoading":false,"warning":null},"identities":{}}
diff --git a/development/states/pending-signature.json b/development/states/pending-signature.json
index 7deaee8f..0428640f 100644
--- a/development/states/pending-signature.json
+++ b/development/states/pending-signature.json
@@ -1,9 +1,9 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
     "currentDomain": "example.com",
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
         "name": "Wallet 1",
@@ -54,7 +54,7 @@
           "data": "0x90b98a11000000000000000000000000c5b8dbac4c1d3f152cdeb400e2313f309c410acb000000000000000000000000000000000000000000000000000000000000000a",
           "origin": "localhost",
           "metamaskId": 1471975421223082,
-          "metamaskNetworkId": "1471904489432"
+          "dekusanNetworkId": "1471904489432"
         },
         "time": 1471975421223,
         "status": "confirmed",
@@ -70,7 +70,7 @@
           "data": "0x90b98a11000000000000000000000000c5b8dbac4c1d3f152cdeb400e2313f309c410acb000000000000000000000000000000000000000000000000000000000000000a",
           "origin": "localhost",
           "metamaskId": 1471975427199819,
-          "metamaskNetworkId": "1471904489432"
+          "dekusanNetworkId": "1471904489432"
         },
         "time": 1471975427199,
         "status": "rejected",
@@ -86,7 +86,7 @@
           "data": "0x90b98a11000000000000000000000000c5b8dbac4c1d3f152cdeb400e2313f309c410acb000000000000000000000000000000000000000000000000000000000000000a",
           "origin": "localhost",
           "metamaskId": 1471975806981442,
-          "metamaskNetworkId": "1471904489432"
+          "dekusanNetworkId": "1471904489432"
         },
         "time": 1471975806981,
         "status": "confirmed",
@@ -102,7 +102,7 @@
           "data": "0x90b98a11000000000000000000000000c5b8dbac4c1d3f152cdeb400e2313f309c410acb000000000000000000000000000000000000000000000000000000000000000a",
           "origin": "localhost",
           "metamaskId": 1471975810133789,
-          "metamaskNetworkId": "1471904489432"
+          "dekusanNetworkId": "1471904489432"
         },
         "time": 1471975810133,
         "status": "confirmed",
@@ -118,7 +118,7 @@
           "data": "0x90b98a11000000000000000000000000c5b8dbac4c1d3f152cdeb400e2313f309c410acb000000000000000000000000000000000000000000000000000000000000000a",
           "origin": "localhost",
           "metamaskId": 1471976546865348,
-          "metamaskNetworkId": "1471904489432"
+          "dekusanNetworkId": "1471904489432"
         },
         "time": 1471976546865,
         "status": "confirmed",
@@ -134,7 +134,7 @@
           "data": "0x90b98a11000000000000000000000000c5b8dbac4c1d3f152cdeb400e2313f309c410acb0000000000000000000000000000000000000000000000000000000000000005",
           "origin": "localhost",
           "metamaskId": 1471976930101889,
-          "metamaskNetworkId": "1471904489432"
+          "dekusanNetworkId": "1471904489432"
         },
         "time": 1471976930101,
         "status": "confirmed",
@@ -150,7 +150,7 @@
           "data": "0x90b98a11000000000000000000000000c5b8dbac4c1d3f152cdeb400e2313f309c410acb0000000000000000000000000000000000000000000000000000000000000002",
           "origin": "localhost",
           "metamaskId": 1471977268048169,
-          "metamaskNetworkId": "1471904489432"
+          "dekusanNetworkId": "1471904489432"
         },
         "time": 1471977268048,
         "status": "confirmed",
@@ -166,7 +166,7 @@
           "data": "0x90b98a11000000000000000000000000c5b8dbac4c1d3f152cdeb400e2313f309c410acb0000000000000000000000000000000000000000000000000000000000000005",
           "origin": "localhost",
           "metamaskId": 1471977310778630,
-          "metamaskNetworkId": "1471904489432"
+          "dekusanNetworkId": "1471904489432"
         },
         "time": 1471977310778,
         "status": "rejected",
@@ -181,7 +181,7 @@
           "data": "0x90b98a11000000000000000000000000c5b8dbac4c1d3f152cdeb400e2313f309c410acb0000000000000000000000000000000000000000000000000000000000000005",
           "origin": "localhost",
           "metamaskId": 1471977316241561,
-          "metamaskNetworkId": "1471904489432"
+          "dekusanNetworkId": "1471904489432"
         },
         "time": 1471977316240,
         "status": "confirmed",
@@ -197,7 +197,7 @@
           "data": "0x90b98a11000000000000000000000000c5b8dbac4c1d3f152cdeb400e2313f309c410acb0000000000000000000000000000000000000000000000000000000000000004",
           "origin": "localhost",
           "metamaskId": 1471977344018510,
-          "metamaskNetworkId": "1471904489432"
+          "dekusanNetworkId": "1471904489432"
         },
         "time": 1471977344018,
         "status": "confirmed",
@@ -213,7 +213,7 @@
           "data": "0x90b98a11000000000000000000000000c5b8dbac4c1d3f152cdeb400e2313f309c410acb0000000000000000000000000000000000000000000000000000000000000001",
           "origin": "localhost",
           "metamaskId": 1471977403830380,
-          "metamaskNetworkId": "1471904489432"
+          "dekusanNetworkId": "1471904489432"
         },
         "time": 1471977403830,
         "status": "confirmed",
@@ -229,7 +229,7 @@
           "data": "0x90b98a11000000000000000000000000c5b8dbac4c1d3f152cdeb400e2313f309c410acb0000000000000000000000000000000000000000000000000000000000000001",
           "origin": "localhost",
           "metamaskId": 1471977431563703,
-          "metamaskNetworkId": "1471904489432"
+          "dekusanNetworkId": "1471904489432"
         },
         "time": 1471977431563,
         "status": "rejected",
@@ -244,7 +244,7 @@
           "data": "0x90b98a11000000000000000000000000c5b8dbac4c1d3f152cdeb400e2313f309c410acb0000000000000000000000000000000000000000000000000000000000000001",
           "origin": "localhost",
           "metamaskId": 1471977436074587,
-          "metamaskNetworkId": "1471904489432"
+          "dekusanNetworkId": "1471904489432"
         },
         "time": 1471977436074,
         "status": "confirmed",
@@ -260,7 +260,7 @@
           "data": "0x90b98a11000000000000000000000000c5b8dbac4c1d3f152cdeb400e2313f309c410acb0000000000000000000000000000000000000000000000000000000000000004",
           "origin": "localhost",
           "metamaskId": 1471991826717707,
-          "metamaskNetworkId": "1471904489432"
+          "dekusanNetworkId": "1471904489432"
         },
         "time": 1471991826717,
         "status": "confirmed",
@@ -276,7 +276,7 @@
           "data": "0x90b98a11000000000000000000000000c5b8dbac4c1d3f152cdeb400e2313f309c410acb0000000000000000000000000000000000000000000000000000000000000004",
           "origin": "localhost",
           "metamaskId": 1471991851917592,
-          "metamaskNetworkId": "1471904489432"
+          "dekusanNetworkId": "1471904489432"
         },
         "time": 1471991851917,
         "status": "confirmed",
@@ -292,7 +292,7 @@
           "data": "0x90b98a11000000000000000000000000c5b8dbac4c1d3f152cdeb400e2313f309c410acb0000000000000000000000000000000000000000000000000000000000000005",
           "origin": "localhost",
           "metamaskId": 1471992032999543,
-          "metamaskNetworkId": "1471904489432"
+          "dekusanNetworkId": "1471904489432"
         },
         "time": 1471992032999,
         "status": "confirmed",
@@ -308,7 +308,7 @@
           "data": "0x90b98a11000000000000000000000000c5b8dbac4c1d3f152cdeb400e2313f309c410acb0000000000000000000000000000000000000000000000000000000000000005",
           "origin": "localhost",
           "metamaskId": 1471992043490878,
-          "metamaskNetworkId": "1471904489432"
+          "dekusanNetworkId": "1471904489432"
         },
         "time": 1471992043490,
         "status": "rejected",
@@ -325,7 +325,7 @@
           "data": "0x5b7d47a900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
           "origin": "www.rouleth.com",
           "metamaskId": 1472068030402279,
-          "metamaskNetworkId": "1"
+          "dekusanNetworkId": "1"
         },
         "time": 1472068030402,
         "status": "rejected",
@@ -342,7 +342,7 @@
           "data": "0x5b7d47a900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
           "origin": "www.rouleth.com",
           "metamaskId": 1472068061833258,
-          "metamaskNetworkId": "1"
+          "dekusanNetworkId": "1"
         },
         "time": 1472068061833,
         "status": "confirmed",
diff --git a/development/states/pending-tx-insufficient.json b/development/states/pending-tx-insufficient.json
index 18be8408..2c508505 100644
--- a/development/states/pending-tx-insufficient.json
+++ b/development/states/pending-tx-insufficient.json
@@ -1,8 +1,8 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0xa06599bd35921cfb5b71b4be3869740385b0b306": {
         "address": "0xa06599bd35921cfb5b71b4be3869740385b0b306",
@@ -15,13 +15,13 @@
         "time": 1487662234127,
         "status": "unapproved",
         "gasMultiplier": 1,
-        "metamaskNetworkId": "3",
+        "dekusanNetworkId": "3",
         "txParams": {
           "from": "0xa06599bd35921cfb5b71b4be3869740385b0b306",
           "to": "0x18a3462427bcc9133bb46e88bcbe39cd7ef0e761",
           "value": "0xde0b6b3a7640000",
           "metamaskId": 1188547363326880,
-          "metamaskNetworkId": "3",
+          "dekusanNetworkId": "3",
           "gas": "0x5209"
         },
         "gasLimitSpecified": false,
@@ -51,13 +51,13 @@
         "time": 1487662234127,
         "status": "unapproved",
         "gasMultiplier": 1,
-        "metamaskNetworkId": "3",
+        "dekusanNetworkId": "3",
         "txParams": {
           "from": "0xa06599bd35921cfb5b71b4be3869740385b0b306",
           "to": "0x18a3462427bcc9133bb46e88bcbe39cd7ef0e761",
           "value": "0xde0b6b3a7640000",
           "metamaskId": 1188547363326880,
-          "metamaskNetworkId": "3",
+          "dekusanNetworkId": "3",
           "gas": "0x5209"
         },
         "gasLimitSpecified": false,
diff --git a/development/states/pending-tx.json b/development/states/pending-tx.json
index 00a318e2..7d77be43 100644
--- a/development/states/pending-tx.json
+++ b/development/states/pending-tx.json
@@ -1,9 +1,9 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
     "isMascara": false,
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
         "address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
@@ -37,7 +37,7 @@
         "id": 3516145537630216,
         "time": 1512615655535,
         "status": "submitted",
-        "metamaskNetworkId": "1",
+        "dekusanNetworkId": "1",
         "txParams": {
           "from": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
           "to": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
@@ -55,7 +55,7 @@
             "id": 3516145537630216,
             "time": 1512615655535,
             "status": "unapproved",
-            "metamaskNetworkId": "1",
+            "dekusanNetworkId": "1",
             "txParams": {
               "from": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
               "to": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
@@ -193,7 +193,7 @@
         "id": 3516145537630211,
         "time": 1512613432658,
         "status": "confirmed",
-        "metamaskNetworkId": "1",
+        "dekusanNetworkId": "1",
         "txParams": {
           "from": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
           "to": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
@@ -211,7 +211,7 @@
             "id": 3516145537630211,
             "time": 1512613432658,
             "status": "unapproved",
-            "metamaskNetworkId": "1",
+            "dekusanNetworkId": "1",
             "txParams": {
               "from": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
               "to": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
@@ -357,7 +357,7 @@
         "id": 3516145537630210,
         "time": 1512612826136,
         "status": "confirmed",
-        "metamaskNetworkId": "1",
+        "dekusanNetworkId": "1",
         "txParams": {
           "from": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
           "to": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
@@ -375,7 +375,7 @@
             "id": 3516145537630210,
             "time": 1512612826136,
             "status": "unapproved",
-            "metamaskNetworkId": "1",
+            "dekusanNetworkId": "1",
             "txParams": {
               "from": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
               "to": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
@@ -521,7 +521,7 @@
         "id": 3516145537630209,
         "time": 1512612809252,
         "status": "failed",
-        "metamaskNetworkId": "1",
+        "dekusanNetworkId": "1",
         "txParams": {
           "from": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
           "to": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
@@ -539,7 +539,7 @@
             "id": 3516145537630209,
             "time": 1512612809252,
             "status": "unapproved",
-            "metamaskNetworkId": "1",
+            "dekusanNetworkId": "1",
             "txParams": {
               "from": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
               "to": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
diff --git a/development/states/personal-sign.json b/development/states/personal-sign.json
index 8ded6205..52a11713 100644
--- a/development/states/personal-sign.json
+++ b/development/states/personal-sign.json
@@ -1,8 +1,8 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
         "address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
diff --git a/development/states/private-key-export-success.json b/development/states/private-key-export-success.json
index 2ff3c4d1..1c4b4ec9 100644
--- a/development/states/private-key-export-success.json
+++ b/development/states/private-key-export-success.json
@@ -1,8 +1,8 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0x07284e146926a4facd0ea60598dc4f001ad620f1": {
         "address": "0x07284e146926a4facd0ea60598dc4f001ad620f1",
diff --git a/development/states/private-key-export.json b/development/states/private-key-export.json
index db7a53e2..88eef4bf 100644
--- a/development/states/private-key-export.json
+++ b/development/states/private-key-export.json
@@ -1,8 +1,8 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0x07284e146926a4facd0ea60598dc4f001ad620f1": {
         "address": "0x07284e146926a4facd0ea60598dc4f001ad620f1",
diff --git a/development/states/private-network.json b/development/states/private-network.json
index 8cdcb4ee..e32850be 100644
--- a/development/states/private-network.json
+++ b/development/states/private-network.json
@@ -1,8 +1,8 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
         "name": "Account 1",
@@ -41,12 +41,12 @@
           "to": "0x48ff0cbac0acefedf152281ee80e9a0a01d5da63",
           "data": "0x90b98a11000000000000000000000000c5b8dbac4c1d3f152cdeb400e2313f309c410acb000000000000000000000000000000000000000000000000000000000000000a",
           "metamaskId": 5551995700357153,
-          "metamaskNetworkId": "1479490588308"
+          "dekusanNetworkId": "1479490588308"
         },
         "time": 1479498745949,
         "status": "confirmed",
         "gasMultiplier": 1,
-        "metamaskNetworkId": "1479490588308",
+        "dekusanNetworkId": "1479490588308",
         "containsDelegateCall": true,
         "estimatedGas": "0x24b33",
         "hash": "0xad609a6931f54a575ad71222ffc27cd6746017106d5b89f4ad300b37b273f8ac"
diff --git a/development/states/restore-vault.json b/development/states/restore-vault.json
index 0d6c2610..6abdb4e0 100644
--- a/development/states/restore-vault.json
+++ b/development/states/restore-vault.json
@@ -1,9 +1,9 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": false,
     "isUnlocked": false,
     "currentDomain": "example.com",
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {},
     "unconfTxs": {},
     "currentCurrency": "USD",
diff --git a/development/states/send-edit.json b/development/states/send-edit.json
index a519f30b..2a3cd115 100644
--- a/development/states/send-edit.json
+++ b/development/states/send-edit.json
@@ -1,9 +1,9 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
     "featureFlags": {"betaUI": true},
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
         "address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
@@ -71,13 +71,13 @@
         "time": 1487363153561,
         "status": "unapproved",
         "gasMultiplier": 1,
-        "metamaskNetworkId": "3",
+        "dekusanNetworkId": "3",
         "txParams": {
           "from": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
           "to": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d",
           "value": "0x1bc16d674ec80000",
           "metamaskId": 4768706228115573,
-          "metamaskNetworkId": "3",
+          "dekusanNetworkId": "3",
           "gas": "0xea60",
           "gasPrice": "0xba43b7400"
         }
diff --git a/development/states/send-new-ui.json b/development/states/send-new-ui.json
index 479b6d3e..26087cf9 100644
--- a/development/states/send-new-ui.json
+++ b/development/states/send-new-ui.json
@@ -1,9 +1,9 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
     "featureFlags": {"betaUI": true},
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
         "address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
diff --git a/development/states/send.json b/development/states/send.json
index 8ae38556..56447e13 100644
--- a/development/states/send.json
+++ b/development/states/send.json
@@ -1,8 +1,8 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
         "address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
diff --git a/development/states/shapeshift.json b/development/states/shapeshift.json
index bfd4b7c1..a65b6596 100644
--- a/development/states/shapeshift.json
+++ b/development/states/shapeshift.json
@@ -1,9 +1,9 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
     "currentDomain": "example.com",
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
         "name": "Wallet 1",
diff --git a/development/states/show-seed-words.json b/development/states/show-seed-words.json
index 55127f60..ecb3443f 100644
--- a/development/states/show-seed-words.json
+++ b/development/states/show-seed-words.json
@@ -1,9 +1,9 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": false,
     "isUnlocked": true,
     "currentDomain": "example.com",
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc": {
         "name": "Wallet 1",
diff --git a/development/states/terms-and-conditions.json b/development/states/terms-and-conditions.json
index f5ebe825..9d53421f 100644
--- a/development/states/terms-and-conditions.json
+++ b/development/states/terms-and-conditions.json
@@ -1,8 +1,8 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": false,
     "isUnlocked": false,
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {},
     "unconfTxs": {},
     "currentCurrency": "USD",
diff --git a/development/states/tx-list-items.json b/development/states/tx-list-items.json
index e83179a1..5ea9b9fa 100644
--- a/development/states/tx-list-items.json
+++ b/development/states/tx-list-items.json
@@ -1,9 +1,9 @@
 {
-  "metamask": {
+  "dekusan": {
     "isInitialized": true,
     "isUnlocked": true,
     "featureFlags": {"betaUI": true},
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "rpcTarget": "https://api-testnet.dexon.org/v1/network/rpc/",
     "identities": {
       "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
         "address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
@@ -63,14 +63,14 @@
     "tokens": [],
     "transactions": {},
     "selectedAddressTxList": [
-      {"err":{"message":"Error: [ethjs-rpc] rpc error with payload {\"id\":8726092611900,\"jsonrpc\":\"2.0\",\"params\":[\"0xf8610384773594008094f45d68f31b3c9ac84ff0d07b86c59b753a60b1e3808029a052e5246c9a404f756a246b8cec545099741aeb4e6e0add935a5b7a366fa88f95a0538eaa2421e50377c534244dcdcd15ace00bf9c0adbd9eb162baae2b9e89a36f\"],\"method\":\"eth_sendRawTransaction\"} Error: intrinsic gas too low","stack":"Error: [ethjs-rpc] rpc error with payload {\"id\":8726092611900,\"jsonrpc\":\"2.0\",\"params\":[\"0xf8610384773594008094f45d68f31b3c9ac84ff0d07b86c59b753a60b1e3808029a052e5246c9a404f756a246b8cec545099741aeb4e6e0add935a5b7a366fa88f95a0538eaa2421e50377c534244dcdcd15ace00bf9c0adbd9eb162baae2b9e89a36f\"],\"method\":\"eth_sendRawTransaction\"} Error: intrinsic gas too low\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:72360:28\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103521:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27180:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27024:25)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:106691:25\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103501:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27033:9\n    at eachLimit (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:26723:36)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:26937:16\n    at end (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103498:5)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:106913:40"},"estimatedGas":"0xcf08","gasLimitSpecified":true,"gasPriceSpecified":true,"history":[{"id":4068311466147836,"loadingDefaults":true,"metamaskNetworkId":"1","status":"unapproved","time":1522378334455,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","gas":"0xcf08","gasPrice":"0x77359400","to":"0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3","value":"0x0"}},[{"op":"replace","path":"/loadingDefaults","value":false},{"op":"add","path":"/gasPriceSpecified","value":true},{"op":"add","path":"/gasLimitSpecified","value":true},{"op":"add","path":"/estimatedGas","value":"0xcf08"}],[{"note":"confTx: user approved transaction","op":"replace","path":"/txParams/gas","value":"0x0"}],[{"note":"txStateManager: setting status to approved","op":"replace","path":"/status","value":"approved"}],[{"note":"transactions#approveTransaction","op":"add","path":"/txParams/nonce","value":"0x3"},{"op":"add","path":"/nonceDetails","value":{"local":{"details":{"highest":3,"startPoint":3},"name":"local","nonce":3},"network":{"details":{"baseCount":3},"name":"network","nonce":3},"params":{"highestLocalNonce":3,"highestSuggested":3,"nextNetworkNonce":3}}}],[{"note":"txStateManager: setting status to signed","op":"add","path":"/txParams/chainId","value":"0x3"},{"op":"replace","path":"/status","value":"signed"}],[{"note":"transactions#publishTransaction","op":"add","path":"/rawTx","value":"0xf8610384773594008094f45d68f31b3c9ac84ff0d07b86c59b753a60b1e3808029a052e5246c9a404f756a246b8cec545099741aeb4e6e0add935a5b7a366fa88f95a0538eaa2421e50377c534244dcdcd15ace00bf9c0adbd9eb162baae2b9e89a36f"}],[{"op":"add","path":"/err","value":{"message":"Error: [ethjs-rpc] rpc error with payload {\"id\":8726092611900,\"jsonrpc\":\"2.0\",\"params\":[\"0xf8610384773594008094f45d68f31b3c9ac84ff0d07b86c59b753a60b1e3808029a052e5246c9a404f756a246b8cec545099741aeb4e6e0add935a5b7a366fa88f95a0538eaa2421e50377c534244dcdcd15ace00bf9c0adbd9eb162baae2b9e89a36f\"],\"method\":\"eth_sendRawTransaction\"} Error: intrinsic gas too low","stack":"Error: [ethjs-rpc] rpc error with payload {\"id\":8726092611900,\"jsonrpc\":\"2.0\",\"params\":[\"0xf8610384773594008094f45d68f31b3c9ac84ff0d07b86c59b753a60b1e3808029a052e5246c9a404f756a246b8cec545099741aeb4e6e0add935a5b7a366fa88f95a0538eaa2421e50377c534244dcdcd15ace00bf9c0adbd9eb162baae2b9e89a36f\"],\"method\":\"eth_sendRawTransaction\"} Error: intrinsic gas too low\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:72360:28\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103521:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27180:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27024:25)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:106691:25\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103501:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27033:9\n    at eachLimit (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:26723:36)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:26937:16\n    at end (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103498:5)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:106913:40"}}]],"id":4068311466147836,"loadingDefaults":false,"metamaskNetworkId":"1","nonceDetails":{"local":{"details":{"highest":3,"startPoint":3},"name":"local","nonce":3},"network":{"details":{"baseCount":3},"name":"network","nonce":3},"params":{"highestLocalNonce":3,"highestSuggested":3,"nextNetworkNonce":3}},"rawTx":"0xf8610384773594008094f45d68f31b3c9ac84ff0d07b86c59b753a60b1e3808029a052e5246c9a404f756a246b8cec545099741aeb4e6e0add935a5b7a366fa88f95a0538eaa2421e50377c534244dcdcd15ace00bf9c0adbd9eb162baae2b9e89a36f","status":"failed","time":1522378334455,"txParams":{"chainId":"0x3","from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","gas":"0x0","gasPrice":"0x77359400","nonce":"0x3","to":"0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3","value":"0x0"}},
-      {"id":2315363930841933,"time":1522378572149,"status":"approved","metamaskNetworkId":"1","loadingDefaults":false,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","to":"0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3","value":"0x0","gas":"0x0","gasPrice":"0x5f5e100"},"history":[{"id":2315363930841933,"time":1522378572149,"status":"unapproved","metamaskNetworkId":"1","loadingDefaults":true,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","to":"0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3","value":"0x0","gas":"0xcf08","gasPrice":"0x5f5e100"}},[{"op":"replace","path":"/loadingDefaults","value":false},{"op":"add","path":"/gasPriceSpecified","value":true},{"op":"add","path":"/gasLimitSpecified","value":true},{"op":"add","path":"/estimatedGas","value":"0xcf08"}],[{"op":"replace","path":"/txParams/gas","value":"0x0","note":"confTx: user approved transaction"}],[{"op":"replace","path":"/status","value":"approved","note":"txStateManager: setting status to approved"}]],"gasPriceSpecified":true,"gasLimitSpecified":true,"estimatedGas":"0xcf08"},
-      {"estimatedGas":"8d41","firstRetryBlockNumber":"0x2cbc70","gasLimitSpecified":false,"gasPriceSpecified":false,"hash":"0xfbd997bf9bb85ca1598952ca23e7910502d527e06cb6ee1bbe7e7dd59d6909cd","history":[{"id":2079438776801906,"loadingDefaults":true,"metamaskNetworkId":"1","status":"unapproved","time":1522346270251,"txParams":{"data":"0xa9059cbb000000000000000000000000e7884118ee52ec3f4eef715cb022279d7d4181a9000000000000000000000000000000000000000000000000000000000000000b","from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","to":"0x66f30b996a7d345cd00badcfe75e81e25dc5e1eb"}},[{"op":"add","path":"/txParams/gasPrice","value":"0x37e11d600"},{"op":"add","path":"/txParams/value","value":"0x0"},{"op":"add","path":"/txParams/gas","value":"0xd3e1"},{"op":"replace","path":"/loadingDefaults","value":false},{"op":"add","path":"/gasPriceSpecified","value":false},{"op":"add","path":"/gasLimitSpecified","value":false},{"op":"add","path":"/estimatedGas","value":"8d41"}],[{"note":"confTx: user approved transaction","op":"replace","path":"/txParams/gasPrice","value":"0x5f5e100"}],[{"note":"txStateManager: setting status to approved","op":"replace","path":"/status","value":"approved"}],[{"note":"transactions#approveTransaction","op":"add","path":"/txParams/nonce","value":"0x2"},{"op":"add","path":"/nonceDetails","value":{"local":{"details":{"highest":2,"startPoint":2},"name":"local","nonce":2},"network":{"details":{"baseCount":2},"name":"network","nonce":2},"params":{"highestLocalNonce":2,"highestSuggested":2,"nextNetworkNonce":2}}}],[{"note":"txStateManager: setting status to signed","op":"add","path":"/txParams/chainId","value":"0x3"},{"op":"replace","path":"/status","value":"signed"}],[{"note":"transactions#publishTransaction","op":"add","path":"/rawTx","value":"0xf8a8028405f5e10082d3e19466f30b996a7d345cd00badcfe75e81e25dc5e1eb80b844a9059cbb000000000000000000000000e7884118ee52ec3f4eef715cb022279d7d4181a9000000000000000000000000000000000000000000000000000000000000000b2aa05cb38a3a68e49008da2e93839f6dedeb96b1630c2a73c4cf5eb3fcc74299a100a039f17c0807469bd101165fa0749dc7065832b4a7c3a382b6cf7e29228c2a683d"}],[{"note":"transactions#setTxHash","op":"add","path":"/hash","value":"0xfbd997bf9bb85ca1598952ca23e7910502d527e06cb6ee1bbe7e7dd59d6909cd"}],[{"note":"txStateManager - add submitted time stamp","op":"add","path":"/submittedTime","value":1522346282571}],[{"note":"txStateManager: setting status to submitted","op":"replace","path":"/status","value":"submitted"}],[{"note":"transactions/pending-tx-tracker#event: tx:block-update","op":"add","path":"/firstRetryBlockNumber","value":"0x2cbc70"}],[{"note":"txStateManager: setting status to confirmed","op":"replace","path":"/status","value":"confirmed"}]],"id":2079438776801906,"loadingDefaults":false,"metamaskNetworkId":"1","nonceDetails":{"local":{"details":{"highest":2,"startPoint":2},"name":"local","nonce":2},"network":{"details":{"baseCount":2},"name":"network","nonce":2},"params":{"highestLocalNonce":2,"highestSuggested":2,"nextNetworkNonce":2}},"rawTx":"0xf8a8028405f5e10082d3e19466f30b996a7d345cd00badcfe75e81e25dc5e1eb80b844a9059cbb000000000000000000000000e7884118ee52ec3f4eef715cb022279d7d4181a9000000000000000000000000000000000000000000000000000000000000000b2aa05cb38a3a68e49008da2e93839f6dedeb96b1630c2a73c4cf5eb3fcc74299a100a039f17c0807469bd101165fa0749dc7065832b4a7c3a382b6cf7e29228c2a683d","status":"confirmed","submittedTime":1522346282571,"time":1522346270251,"txParams":{"chainId":"0x3","data":"0xa9059cbb000000000000000000000000e7884118ee52ec3f4eef715cb022279d7d4181a9000000000000000000000000000000000000000000000000000000000000000b","from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","gas":"0xd3e1","gasPrice":"0x5f5e100","nonce":"0x2","to":"0x66f30b996a7d345cd00badcfe75e81e25dc5e1eb","value":"0x0"}},
-      {"id":4087002078467524,"time":1522379587999,"status":"submitted","metamaskNetworkId":"1","loadingDefaults":false,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","to":"0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3","value":"0x0","gas":"0xcf08","gasPrice":"0x5f5e100","nonce":"0x3","chainId":"0x3"},"history":[{"id":4087002078467524,"time":1522379587999,"status":"unapproved","metamaskNetworkId":"1","loadingDefaults":true,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","to":"0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3","value":"0x0","gas":"0xcf08","gasPrice":"0x5f5e100"}},[{"op":"replace","path":"/loadingDefaults","value":false},{"op":"add","path":"/gasPriceSpecified","value":true},{"op":"add","path":"/gasLimitSpecified","value":true},{"op":"add","path":"/estimatedGas","value":"0xcf08"}],[],[{"op":"replace","path":"/status","value":"approved","note":"txStateManager: setting status to approved"}],[{"op":"add","path":"/txParams/nonce","value":"0x3","note":"transactions#approveTransaction"},{"op":"add","path":"/nonceDetails","value":{"params":{"highestLocalNonce":3,"highestSuggested":3,"nextNetworkNonce":3},"local":{"name":"local","nonce":3,"details":{"startPoint":3,"highest":3}},"network":{"name":"network","nonce":3,"details":{"baseCount":3}}}}],[{"op":"add","path":"/txParams/chainId","value":"0x3","note":"txStateManager: setting status to signed"},{"op":"replace","path":"/status","value":"signed"}],[{"op":"add","path":"/rawTx","value":"0xf863038405f5e10082cf0894f45d68f31b3c9ac84ff0d07b86c59b753a60b1e3808029a0d64ed427733ef67fe788fe85d3cfe51c43cfc83d07fa4ab8af5d3bc8c8199895a02699c131cc0ffcf842b54776ac611bdd165fdb87dd3ecff1554ec8da1bf3ff39","note":"transactions#publishTransaction"}],[{"op":"add","path":"/hash","value":"0x52f0929fc143d76f4e6255d95cebfc76b74f43726191bd4081a5ae9bd6c1fa4a","note":"transactions#setTxHash"}],[{"op":"add","path":"/submittedTime","value":1522379590158,"note":"txStateManager - add submitted time stamp"}],[{"op":"replace","path":"/status","value":"submitted","note":"txStateManager: setting status to submitted"}],[{"op":"add","path":"/firstRetryBlockNumber","value":"0x2cc718","note":"transactions/pending-tx-tracker#event: tx:block-update"}]],"gasPriceSpecified":true,"gasLimitSpecified":true,"estimatedGas":"0xcf08","nonceDetails":{"params":{"highestLocalNonce":3,"highestSuggested":3,"nextNetworkNonce":3},"local":{"name":"local","nonce":3,"details":{"startPoint":3,"highest":3}},"network":{"name":"network","nonce":3,"details":{"baseCount":3}}},"rawTx":"0xf863038405f5e10082cf0894f45d68f31b3c9ac84ff0d07b86c59b753a60b1e3808029a0d64ed427733ef67fe788fe85d3cfe51c43cfc83d07fa4ab8af5d3bc8c8199895a02699c131cc0ffcf842b54776ac611bdd165fdb87dd3ecff1554ec8da1bf3ff39","hash":"0x52f0929fc143d76f4e6255d95cebfc76b74f43726191bd4081a5ae9bd6c1fa4a","submittedTime":1522379590158,"firstRetryBlockNumber":"0x2cc718"},
-      {"estimatedGas":"0x5208","gasLimitSpecified":false,"gasPriceSpecified":false,"history":[{"id":6301441591225658,"loadingDefaults":true,"metamaskNetworkId":"1","status":"unapproved","time":1522346051227,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","to":"0x81b7e08f65bdf5648606c89998a9cc8164397647","value":"0xde0b6b3a7640000"}},[{"op":"add","path":"/txParams/gasPrice","value":"0x4a817c800"},{"op":"add","path":"/txParams/gas","value":"0x5208"},{"op":"replace","path":"/loadingDefaults","value":false},{"op":"add","path":"/gasPriceSpecified","value":false},{"op":"add","path":"/gasLimitSpecified","value":false},{"op":"add","path":"/simpleSend","value":true},{"op":"add","path":"/estimatedGas","value":"0x5208"}],[{"note":"txStateManager: setting status to rejected","op":"replace","path":"/status","value":"rejected"}]],"id":6301441591225658,"loadingDefaults":false,"metamaskNetworkId":"1","simpleSend":true,"status":"rejected","time":1522346051227,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","gas":"0x5208","gasPrice":"0x4a817c800","to":"0x81b7e08f65bdf5648606c89998a9cc8164397647","value":"0xde0b6b3a7640000"}},
-      {"id":2699829174766090,"time":1522381785750,"status":"unapproved","metamaskNetworkId":"1","loadingDefaults":false,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","to":"0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3","value":"0x0","gas":"0xcf08","gasPrice":"0x5f5e100"},"history":[{"id":2699829174766090,"time":1522381785750,"status":"unapproved","metamaskNetworkId":"1","loadingDefaults":true,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","to":"0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3","value":"0x0","gas":"0xcf08","gasPrice":"0x5f5e100"}},[{"op":"replace","path":"/loadingDefaults","value":false},{"op":"add","path":"/gasPriceSpecified","value":true},{"op":"add","path":"/gasLimitSpecified","value":true},{"op":"add","path":"/estimatedGas","value":"0xcf08"}]],"gasPriceSpecified":true,"gasLimitSpecified":true,"estimatedGas":"0xcf08"}
+      {"err":{"message":"Error: [ethjs-rpc] rpc error with payload {\"id\":8726092611900,\"jsonrpc\":\"2.0\",\"params\":[\"0xf8610384773594008094f45d68f31b3c9ac84ff0d07b86c59b753a60b1e3808029a052e5246c9a404f756a246b8cec545099741aeb4e6e0add935a5b7a366fa88f95a0538eaa2421e50377c534244dcdcd15ace00bf9c0adbd9eb162baae2b9e89a36f\"],\"method\":\"eth_sendRawTransaction\"} Error: intrinsic gas too low","stack":"Error: [ethjs-rpc] rpc error with payload {\"id\":8726092611900,\"jsonrpc\":\"2.0\",\"params\":[\"0xf8610384773594008094f45d68f31b3c9ac84ff0d07b86c59b753a60b1e3808029a052e5246c9a404f756a246b8cec545099741aeb4e6e0add935a5b7a366fa88f95a0538eaa2421e50377c534244dcdcd15ace00bf9c0adbd9eb162baae2b9e89a36f\"],\"method\":\"eth_sendRawTransaction\"} Error: intrinsic gas too low\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:72360:28\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103521:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27180:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27024:25)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:106691:25\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103501:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27033:9\n    at eachLimit (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:26723:36)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:26937:16\n    at end (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103498:5)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:106913:40"},"estimatedGas":"0xcf08","gasLimitSpecified":true,"gasPriceSpecified":true,"history":[{"id":4068311466147836,"loadingDefaults":true,"dekusanNetworkId":"1","status":"unapproved","time":1522378334455,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","gas":"0xcf08","gasPrice":"0x77359400","to":"0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3","value":"0x0"}},[{"op":"replace","path":"/loadingDefaults","value":false},{"op":"add","path":"/gasPriceSpecified","value":true},{"op":"add","path":"/gasLimitSpecified","value":true},{"op":"add","path":"/estimatedGas","value":"0xcf08"}],[{"note":"confTx: user approved transaction","op":"replace","path":"/txParams/gas","value":"0x0"}],[{"note":"txStateManager: setting status to approved","op":"replace","path":"/status","value":"approved"}],[{"note":"transactions#approveTransaction","op":"add","path":"/txParams/nonce","value":"0x3"},{"op":"add","path":"/nonceDetails","value":{"local":{"details":{"highest":3,"startPoint":3},"name":"local","nonce":3},"network":{"details":{"baseCount":3},"name":"network","nonce":3},"params":{"highestLocalNonce":3,"highestSuggested":3,"nextNetworkNonce":3}}}],[{"note":"txStateManager: setting status to signed","op":"add","path":"/txParams/chainId","value":"0x3"},{"op":"replace","path":"/status","value":"signed"}],[{"note":"transactions#publishTransaction","op":"add","path":"/rawTx","value":"0xf8610384773594008094f45d68f31b3c9ac84ff0d07b86c59b753a60b1e3808029a052e5246c9a404f756a246b8cec545099741aeb4e6e0add935a5b7a366fa88f95a0538eaa2421e50377c534244dcdcd15ace00bf9c0adbd9eb162baae2b9e89a36f"}],[{"op":"add","path":"/err","value":{"message":"Error: [ethjs-rpc] rpc error with payload {\"id\":8726092611900,\"jsonrpc\":\"2.0\",\"params\":[\"0xf8610384773594008094f45d68f31b3c9ac84ff0d07b86c59b753a60b1e3808029a052e5246c9a404f756a246b8cec545099741aeb4e6e0add935a5b7a366fa88f95a0538eaa2421e50377c534244dcdcd15ace00bf9c0adbd9eb162baae2b9e89a36f\"],\"method\":\"eth_sendRawTransaction\"} Error: intrinsic gas too low","stack":"Error: [ethjs-rpc] rpc error with payload {\"id\":8726092611900,\"jsonrpc\":\"2.0\",\"params\":[\"0xf8610384773594008094f45d68f31b3c9ac84ff0d07b86c59b753a60b1e3808029a052e5246c9a404f756a246b8cec545099741aeb4e6e0add935a5b7a366fa88f95a0538eaa2421e50377c534244dcdcd15ace00bf9c0adbd9eb162baae2b9e89a36f\"],\"method\":\"eth_sendRawTransaction\"} Error: intrinsic gas too low\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:72360:28\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103521:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27180:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27024:25)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:106691:25\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103501:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at iterateeCallback (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27014:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27196:16\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103503:9\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27315:16\n    at replenish (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27029:17)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:27033:9\n    at eachLimit (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:26723:36)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:26937:16\n    at end (chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:103498:5)\n    at chrome-extension://kedndjddlegigbgiknllkjcmbpcnoakf/scripts/background.js:106913:40"}}]],"id":4068311466147836,"loadingDefaults":false,"dekusanNetworkId":"1","nonceDetails":{"local":{"details":{"highest":3,"startPoint":3},"name":"local","nonce":3},"network":{"details":{"baseCount":3},"name":"network","nonce":3},"params":{"highestLocalNonce":3,"highestSuggested":3,"nextNetworkNonce":3}},"rawTx":"0xf8610384773594008094f45d68f31b3c9ac84ff0d07b86c59b753a60b1e3808029a052e5246c9a404f756a246b8cec545099741aeb4e6e0add935a5b7a366fa88f95a0538eaa2421e50377c534244dcdcd15ace00bf9c0adbd9eb162baae2b9e89a36f","status":"failed","time":1522378334455,"txParams":{"chainId":"0x3","from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","gas":"0x0","gasPrice":"0x77359400","nonce":"0x3","to":"0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3","value":"0x0"}},
+      {"id":2315363930841933,"time":1522378572149,"status":"approved","dekusanNetworkId":"1","loadingDefaults":false,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","to":"0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3","value":"0x0","gas":"0x0","gasPrice":"0x5f5e100"},"history":[{"id":2315363930841933,"time":1522378572149,"status":"unapproved","dekusanNetworkId":"1","loadingDefaults":true,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","to":"0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3","value":"0x0","gas":"0xcf08","gasPrice":"0x5f5e100"}},[{"op":"replace","path":"/loadingDefaults","value":false},{"op":"add","path":"/gasPriceSpecified","value":true},{"op":"add","path":"/gasLimitSpecified","value":true},{"op":"add","path":"/estimatedGas","value":"0xcf08"}],[{"op":"replace","path":"/txParams/gas","value":"0x0","note":"confTx: user approved transaction"}],[{"op":"replace","path":"/status","value":"approved","note":"txStateManager: setting status to approved"}]],"gasPriceSpecified":true,"gasLimitSpecified":true,"estimatedGas":"0xcf08"},
+      {"estimatedGas":"8d41","firstRetryBlockNumber":"0x2cbc70","gasLimitSpecified":false,"gasPriceSpecified":false,"hash":"0xfbd997bf9bb85ca1598952ca23e7910502d527e06cb6ee1bbe7e7dd59d6909cd","history":[{"id":2079438776801906,"loadingDefaults":true,"dekusanNetworkId":"1","status":"unapproved","time":1522346270251,"txParams":{"data":"0xa9059cbb000000000000000000000000e7884118ee52ec3f4eef715cb022279d7d4181a9000000000000000000000000000000000000000000000000000000000000000b","from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","to":"0x66f30b996a7d345cd00badcfe75e81e25dc5e1eb"}},[{"op":"add","path":"/txParams/gasPrice","value":"0x37e11d600"},{"op":"add","path":"/txParams/value","value":"0x0"},{"op":"add","path":"/txParams/gas","value":"0xd3e1"},{"op":"replace","path":"/loadingDefaults","value":false},{"op":"add","path":"/gasPriceSpecified","value":false},{"op":"add","path":"/gasLimitSpecified","value":false},{"op":"add","path":"/estimatedGas","value":"8d41"}],[{"note":"confTx: user approved transaction","op":"replace","path":"/txParams/gasPrice","value":"0x5f5e100"}],[{"note":"txStateManager: setting status to approved","op":"replace","path":"/status","value":"approved"}],[{"note":"transactions#approveTransaction","op":"add","path":"/txParams/nonce","value":"0x2"},{"op":"add","path":"/nonceDetails","value":{"local":{"details":{"highest":2,"startPoint":2},"name":"local","nonce":2},"network":{"details":{"baseCount":2},"name":"network","nonce":2},"params":{"highestLocalNonce":2,"highestSuggested":2,"nextNetworkNonce":2}}}],[{"note":"txStateManager: setting status to signed","op":"add","path":"/txParams/chainId","value":"0x3"},{"op":"replace","path":"/status","value":"signed"}],[{"note":"transactions#publishTransaction","op":"add","path":"/rawTx","value":"0xf8a8028405f5e10082d3e19466f30b996a7d345cd00badcfe75e81e25dc5e1eb80b844a9059cbb000000000000000000000000e7884118ee52ec3f4eef715cb022279d7d4181a9000000000000000000000000000000000000000000000000000000000000000b2aa05cb38a3a68e49008da2e93839f6dedeb96b1630c2a73c4cf5eb3fcc74299a100a039f17c0807469bd101165fa0749dc7065832b4a7c3a382b6cf7e29228c2a683d"}],[{"note":"transactions#setTxHash","op":"add","path":"/hash","value":"0xfbd997bf9bb85ca1598952ca23e7910502d527e06cb6ee1bbe7e7dd59d6909cd"}],[{"note":"txStateManager - add submitted time stamp","op":"add","path":"/submittedTime","value":1522346282571}],[{"note":"txStateManager: setting status to submitted","op":"replace","path":"/status","value":"submitted"}],[{"note":"transactions/pending-tx-tracker#event: tx:block-update","op":"add","path":"/firstRetryBlockNumber","value":"0x2cbc70"}],[{"note":"txStateManager: setting status to confirmed","op":"replace","path":"/status","value":"confirmed"}]],"id":2079438776801906,"loadingDefaults":false,"dekusanNetworkId":"1","nonceDetails":{"local":{"details":{"highest":2,"startPoint":2},"name":"local","nonce":2},"network":{"details":{"baseCount":2},"name":"network","nonce":2},"params":{"highestLocalNonce":2,"highestSuggested":2,"nextNetworkNonce":2}},"rawTx":"0xf8a8028405f5e10082d3e19466f30b996a7d345cd00badcfe75e81e25dc5e1eb80b844a9059cbb000000000000000000000000e7884118ee52ec3f4eef715cb022279d7d4181a9000000000000000000000000000000000000000000000000000000000000000b2aa05cb38a3a68e49008da2e93839f6dedeb96b1630c2a73c4cf5eb3fcc74299a100a039f17c0807469bd101165fa0749dc7065832b4a7c3a382b6cf7e29228c2a683d","status":"confirmed","submittedTime":1522346282571,"time":1522346270251,"txParams":{"chainId":"0x3","data":"0xa9059cbb000000000000000000000000e7884118ee52ec3f4eef715cb022279d7d4181a9000000000000000000000000000000000000000000000000000000000000000b","from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","gas":"0xd3e1","gasPrice":"0x5f5e100","nonce":"0x2","to":"0x66f30b996a7d345cd00badcfe75e81e25dc5e1eb","value":"0x0"}},
+      {"id":4087002078467524,"time":1522379587999,"status":"submitted","dekusanNetworkId":"1","loadingDefaults":false,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","to":"0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3","value":"0x0","gas":"0xcf08","gasPrice":"0x5f5e100","nonce":"0x3","chainId":"0x3"},"history":[{"id":4087002078467524,"time":1522379587999,"status":"unapproved","dekusanNetworkId":"1","loadingDefaults":true,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","to":"0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3","value":"0x0","gas":"0xcf08","gasPrice":"0x5f5e100"}},[{"op":"replace","path":"/loadingDefaults","value":false},{"op":"add","path":"/gasPriceSpecified","value":true},{"op":"add","path":"/gasLimitSpecified","value":true},{"op":"add","path":"/estimatedGas","value":"0xcf08"}],[],[{"op":"replace","path":"/status","value":"approved","note":"txStateManager: setting status to approved"}],[{"op":"add","path":"/txParams/nonce","value":"0x3","note":"transactions#approveTransaction"},{"op":"add","path":"/nonceDetails","value":{"params":{"highestLocalNonce":3,"highestSuggested":3,"nextNetworkNonce":3},"local":{"name":"local","nonce":3,"details":{"startPoint":3,"highest":3}},"network":{"name":"network","nonce":3,"details":{"baseCount":3}}}}],[{"op":"add","path":"/txParams/chainId","value":"0x3","note":"txStateManager: setting status to signed"},{"op":"replace","path":"/status","value":"signed"}],[{"op":"add","path":"/rawTx","value":"0xf863038405f5e10082cf0894f45d68f31b3c9ac84ff0d07b86c59b753a60b1e3808029a0d64ed427733ef67fe788fe85d3cfe51c43cfc83d07fa4ab8af5d3bc8c8199895a02699c131cc0ffcf842b54776ac611bdd165fdb87dd3ecff1554ec8da1bf3ff39","note":"transactions#publishTransaction"}],[{"op":"add","path":"/hash","value":"0x52f0929fc143d76f4e6255d95cebfc76b74f43726191bd4081a5ae9bd6c1fa4a","note":"transactions#setTxHash"}],[{"op":"add","path":"/submittedTime","value":1522379590158,"note":"txStateManager - add submitted time stamp"}],[{"op":"replace","path":"/status","value":"submitted","note":"txStateManager: setting status to submitted"}],[{"op":"add","path":"/firstRetryBlockNumber","value":"0x2cc718","note":"transactions/pending-tx-tracker#event: tx:block-update"}]],"gasPriceSpecified":true,"gasLimitSpecified":true,"estimatedGas":"0xcf08","nonceDetails":{"params":{"highestLocalNonce":3,"highestSuggested":3,"nextNetworkNonce":3},"local":{"name":"local","nonce":3,"details":{"startPoint":3,"highest":3}},"network":{"name":"network","nonce":3,"details":{"baseCount":3}}},"rawTx":"0xf863038405f5e10082cf0894f45d68f31b3c9ac84ff0d07b86c59b753a60b1e3808029a0d64ed427733ef67fe788fe85d3cfe51c43cfc83d07fa4ab8af5d3bc8c8199895a02699c131cc0ffcf842b54776ac611bdd165fdb87dd3ecff1554ec8da1bf3ff39","hash":"0x52f0929fc143d76f4e6255d95cebfc76b74f43726191bd4081a5ae9bd6c1fa4a","submittedTime":1522379590158,"firstRetryBlockNumber":"0x2cc718"},
+      {"estimatedGas":"0x5208","gasLimitSpecified":false,"gasPriceSpecified":false,"history":[{"id":6301441591225658,"loadingDefaults":true,"dekusanNetworkId":"1","status":"unapproved","time":1522346051227,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","to":"0x81b7e08f65bdf5648606c89998a9cc8164397647","value":"0xde0b6b3a7640000"}},[{"op":"add","path":"/txParams/gasPrice","value":"0x4a817c800"},{"op":"add","path":"/txParams/gas","value":"0x5208"},{"op":"replace","path":"/loadingDefaults","value":false},{"op":"add","path":"/gasPriceSpecified","value":false},{"op":"add","path":"/gasLimitSpecified","value":false},{"op":"add","path":"/simpleSend","value":true},{"op":"add","path":"/estimatedGas","value":"0x5208"}],[{"note":"txStateManager: setting status to rejected","op":"replace","path":"/status","value":"rejected"}]],"id":6301441591225658,"loadingDefaults":false,"dekusanNetworkId":"1","simpleSend":true,"status":"rejected","time":1522346051227,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","gas":"0x5208","gasPrice":"0x4a817c800","to":"0x81b7e08f65bdf5648606c89998a9cc8164397647","value":"0xde0b6b3a7640000"}},
+      {"id":2699829174766090,"time":1522381785750,"status":"unapproved","dekusanNetworkId":"1","loadingDefaults":false,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","to":"0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3","value":"0x0","gas":"0xcf08","gasPrice":"0x5f5e100"},"history":[{"id":2699829174766090,"time":1522381785750,"status":"unapproved","dekusanNetworkId":"1","loadingDefaults":true,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","to":"0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3","value":"0x0","gas":"0xcf08","gasPrice":"0x5f5e100"}},[{"op":"replace","path":"/loadingDefaults","value":false},{"op":"add","path":"/gasPriceSpecified","value":true},{"op":"add","path":"/gasLimitSpecified","value":true},{"op":"add","path":"/estimatedGas","value":"0xcf08"}]],"gasPriceSpecified":true,"gasLimitSpecified":true,"estimatedGas":"0xcf08"}
     ],
-    "unapprovedTxs": {"2699829174766090":{"id":2699829174766090,"time":1522381785750,"status":"unapproved","metamaskNetworkId":"1","loadingDefaults":false,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","to":"0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3","value":"0x0","gas":"0xcf08","gasPrice":"0x5f5e100"},"history":[{"id":2699829174766090,"time":1522381785750,"status":"unapproved","metamaskNetworkId":"1","loadingDefaults":true,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","to":"0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3","value":"0x0","gas":"0xcf08","gasPrice":"0x5f5e100"}},[{"op":"replace","path":"/loadingDefaults","value":false},{"op":"add","path":"/gasPriceSpecified","value":true},{"op":"add","path":"/gasLimitSpecified","value":true},{"op":"add","path":"/estimatedGas","value":"0xcf08"}]],"gasPriceSpecified":true,"gasLimitSpecified":true,"estimatedGas":"0xcf08"}},
+    "unapprovedTxs": {"2699829174766090":{"id":2699829174766090,"time":1522381785750,"status":"unapproved","dekusanNetworkId":"1","loadingDefaults":false,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","to":"0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3","value":"0x0","gas":"0xcf08","gasPrice":"0x5f5e100"},"history":[{"id":2699829174766090,"time":1522381785750,"status":"unapproved","dekusanNetworkId":"1","loadingDefaults":true,"txParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","to":"0xf45d68f31b3c9ac84ff0d07b86c59b753a60b1e3","value":"0x0","gas":"0xcf08","gasPrice":"0x5f5e100"}},[{"op":"replace","path":"/loadingDefaults","value":false},{"op":"add","path":"/gasPriceSpecified","value":true},{"op":"add","path":"/gasLimitSpecified","value":true},{"op":"add","path":"/estimatedGas","value":"0xcf08"}]],"gasPriceSpecified":true,"gasLimitSpecified":true,"estimatedGas":"0xcf08"}},
     "unapprovedMsgs": {"2315363930841932":{"id":2315363930841932,"msgParams":{"from":"0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4","data":"0x879a053d4800c6354e76c7985a865d2922c82fb5b3f4577b2fe08b998954f2e0"},"time":1522378539686,"status":"unapproved","type":"eth_sign"}},
     "unapprovedMsgCount": 0,
     "unapprovedPersonalMsgs": {},
diff --git a/docs/introduction.md b/docs/introduction.md
new file mode 100644
index 00000000..82f60fa4
--- /dev/null
+++ b/docs/introduction.md
@@ -0,0 +1,13 @@
+# Introduction
+
+### What is DekuSan?
+DekuSan is an extension for accessing Ethereum enabled distributed applications, or "Dapps" in your normal Chrome browser!
+
+The extension injects the DEXON web3 API (Ethereum compatible) into every website's javascript context, so that dapps can read from the blockchain.
+
+DekuSan also lets the user create and manage their own identities, so when a Dapp wants to perform a transaction and write to the blockchain, the user gets a secure interface to review the transaction, before approving or rejecting it.
+
+### Installation
+Download from Chrome & Firefox entension stores:
+- [Chrome Extension](https://chrome.google.com/webstore/detail/dekusan/anlicggbddjeebblaidciapponbpegoj)
+- [Firefox Addon](https://addons.mozilla.org/en-US/firefox/addon/dekusan/)
diff --git a/mascara/src/app/buy-ether-widget/index.js b/mascara/src/app/buy-ether-widget/index.js
index f238bd40..b6605b9c 100644
--- a/mascara/src/app/buy-ether-widget/index.js
+++ b/mascara/src/app/buy-ether-widget/index.js
@@ -188,7 +188,7 @@ class BuyEtherWidget extends Component {
 }
 
 export default connect(
-  ({ metamask: { selectedAddress } }) => ({
+  ({ dekusan: { selectedAddress } }) => ({
     address: selectedAddress,
   }),
   dispatch => ({
diff --git a/mascara/src/app/first-time/buy-ether-screen.js b/mascara/src/app/first-time/buy-ether-screen.js
index 6962a72d..b32008b1 100644
--- a/mascara/src/app/first-time/buy-ether-screen.js
+++ b/mascara/src/app/first-time/buy-ether-screen.js
@@ -190,7 +190,7 @@ class BuyEtherScreen extends Component {
 }
 
 export default connect(
-  ({ metamask: { selectedAddress } }) => ({
+  ({ dekusan: { selectedAddress } }) => ({
     address: selectedAddress,
   }),
   dispatch => ({
diff --git a/mascara/src/app/first-time/confirm-seed-screen.js b/mascara/src/app/first-time/confirm-seed-screen.js
index 445ef1e2..534cd84c 100644
--- a/mascara/src/app/first-time/confirm-seed-screen.js
+++ b/mascara/src/app/first-time/confirm-seed-screen.js
@@ -147,7 +147,7 @@ class ConfirmSeedScreen extends Component {
 export default compose(
   withRouter,
   connect(
-    ({ metamask: { selectedAddress, seedWords }, appState: { isLoading } }) => ({
+    ({ dekusan: { selectedAddress, seedWords }, appState: { isLoading } }) => ({
       seedWords,
       isLoading,
       address: selectedAddress,
diff --git a/mascara/src/app/first-time/create-password-screen.js b/mascara/src/app/first-time/create-password-screen.js
index ab8f3de4..e612ffa5 100644
--- a/mascara/src/app/first-time/create-password-screen.js
+++ b/mascara/src/app/first-time/create-password-screen.js
@@ -195,8 +195,8 @@ class CreatePasswordScreen extends Component {
   }
 }
 
-const mapStateToProps = ({ metamask, appState }) => {
-  const { isInitialized, isUnlocked, isMascara, noActiveNotices } = metamask
+const mapStateToProps = ({ dekusan, appState }) => {
+  const { isInitialized, isUnlocked, isMascara, noActiveNotices } = dekusan
   const { isLoading } = appState
 
   return {
diff --git a/mascara/src/app/first-time/index.js b/mascara/src/app/first-time/index.js
index 6e4dc74b..3077a412 100644
--- a/mascara/src/app/first-time/index.js
+++ b/mascara/src/app/first-time/index.js
@@ -67,7 +67,7 @@ class FirstTimeFlow extends Component {
   }
 }
 
-const mapStateToProps = ({ metamask }) => {
+const mapStateToProps = ({ dekusan }) => {
   const {
     isInitialized,
     seedWords,
@@ -78,7 +78,7 @@ const mapStateToProps = ({ metamask }) => {
     isUnlocked,
     welcomeScreenSeen,
     isPopup,
-  } = metamask
+  } = dekusan
 
   return {
     isMascara,
diff --git a/mascara/src/app/first-time/notice-screen.js b/mascara/src/app/first-time/notice-screen.js
index c7fe9472..806ac15f 100644
--- a/mascara/src/app/first-time/notice-screen.js
+++ b/mascara/src/app/first-time/notice-screen.js
@@ -107,8 +107,8 @@ class NoticeScreen extends Component {
   }
 }
 
-const mapStateToProps = ({ metamask, appState }) => {
-  const { selectedAddress, nextUnreadNotice, noActiveNotices } = metamask
+const mapStateToProps = ({ dekusan, appState }) => {
+  const { selectedAddress, nextUnreadNotice, noActiveNotices } = dekusan
   const { isLoading } = appState
 
   return {
diff --git a/mascara/src/app/first-time/seed-screen.js b/mascara/src/app/first-time/seed-screen.js
index 6b4d4a2c..a4cabae9 100644
--- a/mascara/src/app/first-time/seed-screen.js
+++ b/mascara/src/app/first-time/seed-screen.js
@@ -165,7 +165,7 @@ class BackupPhraseScreen extends Component {
 export default compose(
   withRouter,
   connect(
-    ({ metamask: { selectedAddress, seedWords }, appState: { isLoading } }) => ({
+    ({ dekusan: { selectedAddress, seedWords }, appState: { isLoading } }) => ({
       seedWords,
       isLoading,
       address: selectedAddress,
diff --git a/mascara/src/app/first-time/unique-image-screen.js b/mascara/src/app/first-time/unique-image-screen.js
index 4e94d6c9..1368c815 100644
--- a/mascara/src/app/first-time/unique-image-screen.js
+++ b/mascara/src/app/first-time/unique-image-screen.js
@@ -41,7 +41,7 @@ class UniqueImageScreen extends Component {
 export default compose(
   withRouter,
   connect(
-    ({ metamask: { selectedAddress } }) => ({
+    ({ dekusan: { selectedAddress } }) => ({
       address: selectedAddress,
     })
   )
diff --git a/mascara/src/app/shapeshift-form/index.js b/mascara/src/app/shapeshift-form/index.js
index 354dbeb9..0916211d 100644
--- a/mascara/src/app/shapeshift-form/index.js
+++ b/mascara/src/app/shapeshift-form/index.js
@@ -207,7 +207,7 @@ export class ShapeShiftForm extends Component {
 }
 
 export default connect(
-  ({ metamask: { coinOptions, tokenExchangeRates, selectedAddress } }) => ({
+  ({ dekusan: { coinOptions, tokenExchangeRates, selectedAddress } }) => ({
     coinOptions, tokenExchangeRates, selectedAddress,
   }),
   dispatch => ({
diff --git a/test/data/mock-state.json b/test/data/mock-state.json
index cd538252..724e6f43 100644
--- a/test/data/mock-state.json
+++ b/test/data/mock-state.json
@@ -1,5 +1,5 @@
 {
-  "metamask": {
+  "dekusan": {
     "network": "4",
     "identities": {
       "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc": {
@@ -16,7 +16,7 @@
         "id": 8393540981007587,
         "time": 1536268017676,
         "status": "unapproved",
-        "metamaskNetworkId": "4",
+        "dekusanNetworkId": "4",
         "loadingDefaults": false,
         "txParams": {
           "from": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc",
@@ -30,7 +30,7 @@
             "id": 8393540981007587,
             "time": 1536268017676,
             "status": "unapproved",
-            "metamaskNetworkId": "4",
+            "dekusanNetworkId": "4",
             "loadingDefaults": true,
             "txParams": {
               "from": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc",
@@ -148,7 +148,7 @@
         "id": 3387511061307736,
         "time": 1528133130531,
         "status": "confirmed",
-        "metamaskNetworkId": "4",
+        "dekusanNetworkId": "4",
         "loadingDefaults": false,
         "txParams": {
           "from": "0x3b222de3aaba8ec9771ca9e9af5d8ed757fb7f62",
@@ -163,7 +163,7 @@
             "id": 3387511061307736,
             "time": 1528133130531,
             "status": "unapproved",
-            "metamaskNetworkId": "4",
+            "dekusanNetworkId": "4",
             "loadingDefaults": true,
             "txParams": {
               "from": "0x3b222de3aaba8ec9771ca9e9af5d8ed757fb7f62",
@@ -346,7 +346,7 @@
         "id": 3387511061307737,
         "time": 1528133149983,
         "status": "confirmed",
-        "metamaskNetworkId": "4",
+        "dekusanNetworkId": "4",
         "loadingDefaults": false,
         "txParams": {
           "from": "0x3b222de3aaba8ec9771ca9e9af5d8ed757fb7f62",
@@ -361,7 +361,7 @@
             "id": 3387511061307737,
             "time": 1528133149983,
             "status": "unapproved",
-            "metamaskNetworkId": "4",
+            "dekusanNetworkId": "4",
             "loadingDefaults": true,
             "txParams": {
               "from": "0x3b222de3aaba8ec9771ca9e9af5d8ed757fb7f62",
@@ -544,7 +544,7 @@
         "id": 3387511061307738,
         "time": 1528133180635,
         "status": "confirmed",
-        "metamaskNetworkId": "4",
+        "dekusanNetworkId": "4",
         "loadingDefaults": false,
         "txParams": {
           "from": "0x3b222de3aaba8ec9771ca9e9af5d8ed757fb7f62",
@@ -559,7 +559,7 @@
             "id": 3387511061307738,
             "time": 1528133180635,
             "status": "unapproved",
-            "metamaskNetworkId": "4",
+            "dekusanNetworkId": "4",
             "loadingDefaults": true,
             "txParams": {
               "from": "0x3b222de3aaba8ec9771ca9e9af5d8ed757fb7f62",
@@ -742,7 +742,7 @@
         "id": 3387511061307739,
         "time": 1528133223918,
         "status": "confirmed",
-        "metamaskNetworkId": "4",
+        "dekusanNetworkId": "4",
         "loadingDefaults": false,
         "txParams": {
           "from": "0x3b222de3aaba8ec9771ca9e9af5d8ed757fb7f62",
@@ -758,7 +758,7 @@
             "id": 3387511061307739,
             "time": 1528133223918,
             "status": "unapproved",
-            "metamaskNetworkId": "4",
+            "dekusanNetworkId": "4",
             "loadingDefaults": true,
             "txParams": {
               "from": "0x3b222de3aaba8ec9771ca9e9af5d8ed757fb7f62",
@@ -951,7 +951,7 @@
         "id": 3387511061307740,
         "time": 1528133291381,
         "status": "confirmed",
-        "metamaskNetworkId": "4",
+        "dekusanNetworkId": "4",
         "loadingDefaults": false,
         "txParams": {
           "from": "0x3b222de3aaba8ec9771ca9e9af5d8ed757fb7f62",
@@ -967,7 +967,7 @@
             "id": 3387511061307740,
             "time": 1528133291381,
             "status": "unapproved",
-            "metamaskNetworkId": "4",
+            "dekusanNetworkId": "4",
             "loadingDefaults": true,
             "txParams": {
               "from": "0x3b222de3aaba8ec9771ca9e9af5d8ed757fb7f62",
@@ -1151,7 +1151,7 @@
         "id": 3387511061307741,
         "time": 1528133318440,
         "status": "rejected",
-        "metamaskNetworkId": "4",
+        "dekusanNetworkId": "4",
         "loadingDefaults": false,
         "txParams": {
           "from": "0x3b222de3aaba8ec9771ca9e9af5d8ed757fb7f62",
@@ -1165,7 +1165,7 @@
             "id": 3387511061307741,
             "time": 1528133318440,
             "status": "unapproved",
-            "metamaskNetworkId": "4",
+            "dekusanNetworkId": "4",
             "loadingDefaults": true,
             "txParams": {
               "from": "0x3b222de3aaba8ec9771ca9e9af5d8ed757fb7f62",
diff --git a/test/data/v17-long-history.json b/test/data/v17-long-history.json
index a33d425f..a89ba78c 100644
--- a/test/data/v17-long-history.json
+++ b/test/data/v17-long-history.json
@@ -369,7 +369,7 @@
           "id": 6616756286038869,
           "time": 1502438908445,
           "status": "confirmed",
-          "metamaskNetworkId": "3",
+          "dekusanNetworkId": "3",
           "txParams": {
             "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
             "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -383,7 +383,7 @@
               "id": 6616756286038869,
               "time": 1502438908445,
               "status": "unapproved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -398,7 +398,7 @@
               "id": 6616756286038869,
               "time": 1502438908445,
               "status": "unapproved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -413,7 +413,7 @@
               "id": 6616756286038869,
               "time": 1502438908445,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -428,7 +428,7 @@
               "id": 6616756286038869,
               "time": 1502438908445,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -443,7 +443,7 @@
               "id": 6616756286038869,
               "time": 1502438908445,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -465,7 +465,7 @@
               "id": 6616756286038869,
               "time": 1502438908445,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -487,7 +487,7 @@
               "id": 6616756286038869,
               "time": 1502438908445,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -509,7 +509,7 @@
               "id": 6616756286038869,
               "time": 1502438908445,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -531,7 +531,7 @@
               "id": 6616756286038869,
               "time": 1502438908445,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -554,7 +554,7 @@
               "id": 6616756286038869,
               "time": 1502438908445,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -577,7 +577,7 @@
               "id": 6616756286038869,
               "time": 1502438908445,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -601,7 +601,7 @@
               "id": 6616756286038869,
               "time": 1502438908445,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -625,7 +625,7 @@
               "id": 6616756286038869,
               "time": 1502438908445,
               "status": "submitted",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -649,7 +649,7 @@
               "id": 6616756286038869,
               "time": 1502438908445,
               "status": "submitted",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -673,7 +673,7 @@
               "id": 6616756286038869,
               "time": 1502438908445,
               "status": "confirmed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -698,7 +698,7 @@
               "id": 6616756286038869,
               "time": 1502438908445,
               "status": "confirmed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -736,7 +736,7 @@
           "id": 6616756286038870,
           "time": 1502573153664,
           "status": "rejected",
-          "metamaskNetworkId": "3",
+          "dekusanNetworkId": "3",
           "txParams": {
             "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
             "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -749,7 +749,7 @@
               "id": 6616756286038870,
               "time": 1502573153664,
               "status": "rejected",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -764,7 +764,7 @@
               "id": 6616756286038870,
               "time": 1502573153664,
               "status": "rejected",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -783,7 +783,7 @@
           "id": 6616756286038871,
           "time": 1502573157128,
           "status": "confirmed",
-          "metamaskNetworkId": "3",
+          "dekusanNetworkId": "3",
           "txParams": {
             "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
             "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -798,7 +798,7 @@
               "id": 6616756286038871,
               "time": 1502573157128,
               "status": "unapproved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -813,7 +813,7 @@
               "id": 6616756286038871,
               "time": 1502573157128,
               "status": "unapproved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -828,7 +828,7 @@
               "id": 6616756286038871,
               "time": 1502573157128,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -843,7 +843,7 @@
               "id": 6616756286038871,
               "time": 1502573157128,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -858,7 +858,7 @@
               "id": 6616756286038871,
               "time": 1502573157128,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -880,7 +880,7 @@
               "id": 6616756286038871,
               "time": 1502573157128,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -902,7 +902,7 @@
               "id": 6616756286038871,
               "time": 1502573157128,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -925,7 +925,7 @@
               "id": 6616756286038871,
               "time": 1502573157128,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -948,7 +948,7 @@
               "id": 6616756286038871,
               "time": 1502573157128,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -972,7 +972,7 @@
               "id": 6616756286038871,
               "time": 1502573157128,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -996,7 +996,7 @@
               "id": 6616756286038871,
               "time": 1502573157128,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1021,7 +1021,7 @@
               "id": 6616756286038871,
               "time": 1502573157128,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1046,7 +1046,7 @@
               "id": 6616756286038871,
               "time": 1502573157128,
               "status": "submitted",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1071,7 +1071,7 @@
               "id": 6616756286038871,
               "time": 1502573157128,
               "status": "submitted",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1096,7 +1096,7 @@
               "id": 6616756286038871,
               "time": 1502573157128,
               "status": "confirmed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1122,7 +1122,7 @@
               "id": 6616756286038871,
               "time": 1502573157128,
               "status": "confirmed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1161,7 +1161,7 @@
           "id": 6616756286038872,
           "time": 1502734903652,
           "status": "confirmed",
-          "metamaskNetworkId": "3",
+          "dekusanNetworkId": "3",
           "txParams": {
             "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
             "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1176,7 +1176,7 @@
               "id": 6616756286038872,
               "time": 1502734903652,
               "status": "unapproved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1191,7 +1191,7 @@
               "id": 6616756286038872,
               "time": 1502734903652,
               "status": "unapproved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1206,7 +1206,7 @@
               "id": 6616756286038872,
               "time": 1502734903652,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1221,7 +1221,7 @@
               "id": 6616756286038872,
               "time": 1502734903652,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1236,7 +1236,7 @@
               "id": 6616756286038872,
               "time": 1502734903652,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1258,7 +1258,7 @@
               "id": 6616756286038872,
               "time": 1502734903652,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1280,7 +1280,7 @@
               "id": 6616756286038872,
               "time": 1502734903652,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1303,7 +1303,7 @@
               "id": 6616756286038872,
               "time": 1502734903652,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1326,7 +1326,7 @@
               "id": 6616756286038872,
               "time": 1502734903652,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1350,7 +1350,7 @@
               "id": 6616756286038872,
               "time": 1502734903652,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1374,7 +1374,7 @@
               "id": 6616756286038872,
               "time": 1502734903652,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1399,7 +1399,7 @@
               "id": 6616756286038872,
               "time": 1502734903652,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1424,7 +1424,7 @@
               "id": 6616756286038872,
               "time": 1502734903652,
               "status": "submitted",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1449,7 +1449,7 @@
               "id": 6616756286038872,
               "time": 1502734903652,
               "status": "submitted",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1474,7 +1474,7 @@
               "id": 6616756286038872,
               "time": 1502734903652,
               "status": "confirmed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1500,7 +1500,7 @@
               "id": 6616756286038872,
               "time": 1502734903652,
               "status": "confirmed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1539,7 +1539,7 @@
           "id": 6616756286038873,
           "time": 1502734910224,
           "status": "confirmed",
-          "metamaskNetworkId": "3",
+          "dekusanNetworkId": "3",
           "txParams": {
             "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
             "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1554,7 +1554,7 @@
               "id": 6616756286038873,
               "time": 1502734910224,
               "status": "unapproved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1569,7 +1569,7 @@
               "id": 6616756286038873,
               "time": 1502734910224,
               "status": "unapproved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1584,7 +1584,7 @@
               "id": 6616756286038873,
               "time": 1502734910224,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1599,7 +1599,7 @@
               "id": 6616756286038873,
               "time": 1502734910224,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1614,7 +1614,7 @@
               "id": 6616756286038873,
               "time": 1502734910224,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1636,7 +1636,7 @@
               "id": 6616756286038873,
               "time": 1502734910224,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1658,7 +1658,7 @@
               "id": 6616756286038873,
               "time": 1502734910224,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1681,7 +1681,7 @@
               "id": 6616756286038873,
               "time": 1502734910224,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1704,7 +1704,7 @@
               "id": 6616756286038873,
               "time": 1502734910224,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1728,7 +1728,7 @@
               "id": 6616756286038873,
               "time": 1502734910224,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1752,7 +1752,7 @@
               "id": 6616756286038873,
               "time": 1502734910224,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1777,7 +1777,7 @@
               "id": 6616756286038873,
               "time": 1502734910224,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1802,7 +1802,7 @@
               "id": 6616756286038873,
               "time": 1502734910224,
               "status": "submitted",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1827,7 +1827,7 @@
               "id": 6616756286038873,
               "time": 1502734910224,
               "status": "submitted",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1852,7 +1852,7 @@
               "id": 6616756286038873,
               "time": 1502734910224,
               "status": "confirmed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1878,7 +1878,7 @@
               "id": 6616756286038873,
               "time": 1502734910224,
               "status": "confirmed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1917,7 +1917,7 @@
           "id": 6616756286038874,
           "time": 1502734917414,
           "status": "confirmed",
-          "metamaskNetworkId": "3",
+          "dekusanNetworkId": "3",
           "txParams": {
             "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
             "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1932,7 +1932,7 @@
               "id": 6616756286038874,
               "time": 1502734917414,
               "status": "unapproved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1947,7 +1947,7 @@
               "id": 6616756286038874,
               "time": 1502734917414,
               "status": "unapproved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1962,7 +1962,7 @@
               "id": 6616756286038874,
               "time": 1502734917414,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1977,7 +1977,7 @@
               "id": 6616756286038874,
               "time": 1502734917414,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -1992,7 +1992,7 @@
               "id": 6616756286038874,
               "time": 1502734917414,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2014,7 +2014,7 @@
               "id": 6616756286038874,
               "time": 1502734917414,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2036,7 +2036,7 @@
               "id": 6616756286038874,
               "time": 1502734917414,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2059,7 +2059,7 @@
               "id": 6616756286038874,
               "time": 1502734917414,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2082,7 +2082,7 @@
               "id": 6616756286038874,
               "time": 1502734917414,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2106,7 +2106,7 @@
               "id": 6616756286038874,
               "time": 1502734917414,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2130,7 +2130,7 @@
               "id": 6616756286038874,
               "time": 1502734917414,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2155,7 +2155,7 @@
               "id": 6616756286038874,
               "time": 1502734917414,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2180,7 +2180,7 @@
               "id": 6616756286038874,
               "time": 1502734917414,
               "status": "submitted",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2205,7 +2205,7 @@
               "id": 6616756286038874,
               "time": 1502734917414,
               "status": "submitted",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2230,7 +2230,7 @@
               "id": 6616756286038874,
               "time": 1502734917414,
               "status": "confirmed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2256,7 +2256,7 @@
               "id": 6616756286038874,
               "time": 1502734917414,
               "status": "confirmed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2295,7 +2295,7 @@
           "id": 6616756286038875,
           "time": 1502734922745,
           "status": "confirmed",
-          "metamaskNetworkId": "3",
+          "dekusanNetworkId": "3",
           "txParams": {
             "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
             "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2310,7 +2310,7 @@
               "id": 6616756286038875,
               "time": 1502734922745,
               "status": "unapproved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2325,7 +2325,7 @@
               "id": 6616756286038875,
               "time": 1502734922745,
               "status": "unapproved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2340,7 +2340,7 @@
               "id": 6616756286038875,
               "time": 1502734922745,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2355,7 +2355,7 @@
               "id": 6616756286038875,
               "time": 1502734922745,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2370,7 +2370,7 @@
               "id": 6616756286038875,
               "time": 1502734922745,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2392,7 +2392,7 @@
               "id": 6616756286038875,
               "time": 1502734922745,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2414,7 +2414,7 @@
               "id": 6616756286038875,
               "time": 1502734922745,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2437,7 +2437,7 @@
               "id": 6616756286038875,
               "time": 1502734922745,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2460,7 +2460,7 @@
               "id": 6616756286038875,
               "time": 1502734922745,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2484,7 +2484,7 @@
               "id": 6616756286038875,
               "time": 1502734922745,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2508,7 +2508,7 @@
               "id": 6616756286038875,
               "time": 1502734922745,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2533,7 +2533,7 @@
               "id": 6616756286038875,
               "time": 1502734922745,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2558,7 +2558,7 @@
               "id": 6616756286038875,
               "time": 1502734922745,
               "status": "submitted",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2583,7 +2583,7 @@
               "id": 6616756286038875,
               "time": 1502734922745,
               "status": "submitted",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2608,7 +2608,7 @@
               "id": 6616756286038875,
               "time": 1502734922745,
               "status": "confirmed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2634,7 +2634,7 @@
               "id": 6616756286038875,
               "time": 1502734922745,
               "status": "confirmed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2673,7 +2673,7 @@
           "id": 6616756286038876,
           "time": 1502734928623,
           "status": "confirmed",
-          "metamaskNetworkId": "3",
+          "dekusanNetworkId": "3",
           "txParams": {
             "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
             "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2688,7 +2688,7 @@
               "id": 6616756286038876,
               "time": 1502734928623,
               "status": "unapproved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2703,7 +2703,7 @@
               "id": 6616756286038876,
               "time": 1502734928623,
               "status": "unapproved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2718,7 +2718,7 @@
               "id": 6616756286038876,
               "time": 1502734928623,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2733,7 +2733,7 @@
               "id": 6616756286038876,
               "time": 1502734928623,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2748,7 +2748,7 @@
               "id": 6616756286038876,
               "time": 1502734928623,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2770,7 +2770,7 @@
               "id": 6616756286038876,
               "time": 1502734928623,
               "status": "approved",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2792,7 +2792,7 @@
               "id": 6616756286038876,
               "time": 1502734928623,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2815,7 +2815,7 @@
               "id": 6616756286038876,
               "time": 1502734928623,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2838,7 +2838,7 @@
               "id": 6616756286038876,
               "time": 1502734928623,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2862,7 +2862,7 @@
               "id": 6616756286038876,
               "time": 1502734928623,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2886,7 +2886,7 @@
               "id": 6616756286038876,
               "time": 1502734928623,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2911,7 +2911,7 @@
               "id": 6616756286038876,
               "time": 1502734928623,
               "status": "signed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2936,7 +2936,7 @@
               "id": 6616756286038876,
               "time": 1502734928623,
               "status": "submitted",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2961,7 +2961,7 @@
               "id": 6616756286038876,
               "time": 1502734928623,
               "status": "submitted",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -2986,7 +2986,7 @@
               "id": 6616756286038876,
               "time": 1502734928623,
               "status": "confirmed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
@@ -3012,7 +3012,7 @@
               "id": 6616756286038876,
               "time": 1502734928623,
               "status": "confirmed",
-              "metamaskNetworkId": "3",
+              "dekusanNetworkId": "3",
               "txParams": {
                 "from": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
                 "to": "0x3ae39e89dc7e736cce53091057a45bf44b1a566c",
diff --git a/test/lib/migrations/004.json b/test/lib/migrations/004.json
index b1866909..412f281c 100644
--- a/test/lib/migrations/004.json
+++ b/test/lib/migrations/004.json
@@ -76,13 +76,13 @@
             "time":1487184358262,
             "status":"confirmed",
             "gasMultiplier":1,
-            "metamaskNetworkId":"3",
+            "dekusanNetworkId":"3",
             "txParams":{
                "from":"0x0beb674745816b125fbc07285d39fd373e64895c",
                "to":"0x18a3462427bcc9133bb46e88bcbe39cd7ef0e761",
                "value":"0xde0b6b3a7640000",
                "metamaskId":3922064325443430,
-               "metamaskNetworkId":"3",
+               "dekusanNetworkId":"3",
                "gas":"0x5209",
                "gasPrice":"0x04a817c800",
                "nonce":"0x0",
@@ -100,13 +100,13 @@
             "time":1487184373172,
             "status":"confirmed",
             "gasMultiplier":1,
-            "metamaskNetworkId":"3",
+            "dekusanNetworkId":"3",
             "txParams":{
                "from":"0x0beb674745816b125fbc07285d39fd373e64895c",
                "to":"0x433eb37d2e4895815b90f555425dfa123ddaed40",
                "value":"0xde0b6b3a7640000",
                "metamaskId":3922064325443431,
-               "metamaskNetworkId":"3",
+               "dekusanNetworkId":"3",
                "gas":"0x5209",
                "nonce":"0x01",
                "gasPrice":"0x04a817c800",
@@ -124,13 +124,13 @@
             "time":1487184391226,
             "status":"unapproved",
             "gasMultiplier":1,
-            "metamaskNetworkId":"3",
+            "dekusanNetworkId":"3",
             "txParams":{
                "from":"0x0beb674745816b125fbc07285d39fd373e64895c",
                "to":"0x18a3462427bcc9133bb46e88bcbe39cd7ef0e761",
                "value":"0xde0b6b3a7640000",
                "metamaskId":3922064325443432,
-               "metamaskNetworkId":"3",
+               "dekusanNetworkId":"3",
                "gas":"0x5209"
             },
             "gasLimitSpecified":false,
diff --git a/test/unit/actions/config_test.js b/test/unit/actions/config_test.js
index 648f456f..d2ce459f 100644
--- a/test/unit/actions/config_test.js
+++ b/test/unit/actions/config_test.js
@@ -8,7 +8,7 @@ var reducers = require(path.join(__dirname, '..', '..', '..', 'ui', 'app', 'redu
 
 describe('config view actions', function () {
   var initialState = {
-    metamask: {
+    dekusan: {
       rpcTarget: 'foo',
       frequentRpcList: [],
     },
@@ -28,7 +28,7 @@ describe('config view actions', function () {
   })
 
   describe('SET_RPC_TARGET', function () {
-    it('sets the state.metamask.rpcTarget property of the state to the action.value', function () {
+    it('sets the state.dekusan.rpcTarget property of the state to the action.value', function () {
       const action = {
         type: actions.SET_RPC_TARGET,
         value: 'foo',
diff --git a/test/unit/actions/set_account_label_test.js b/test/unit/actions/set_account_label_test.js
index 53ea1d13..2b30643e 100644
--- a/test/unit/actions/set_account_label_test.js
+++ b/test/unit/actions/set_account_label_test.js
@@ -6,9 +6,9 @@ const actions = require(path.join(__dirname, '..', '..', '..', 'ui', 'app', 'act
 const reducers = require(path.join(__dirname, '..', '..', '..', 'ui', 'app', 'reducers.js'))
 
 describe('SET_ACCOUNT_LABEL', function () {
-  it('updates the state.metamask.identities[:i].name property of the state to the action.value.label', function () {
+  it('updates the state.dekusan.identities[:i].name property of the state to the action.value.label', function () {
     const initialState = {
-      metamask: {
+      dekusan: {
         identities: {
           foo: {
             name: 'bar',
@@ -28,7 +28,7 @@ describe('SET_ACCOUNT_LABEL', function () {
     freeze(action)
 
     const resultingState = reducers(initialState, action)
-    assert.equal(resultingState.metamask.identities.foo.name, action.value.label)
+    assert.equal(resultingstate.dekusan.identities.foo.name, action.value.label)
   })
 })
 
diff --git a/test/unit/actions/set_selected_account_test.js b/test/unit/actions/set_selected_account_test.js
index 28b47d09..2580d157 100644
--- a/test/unit/actions/set_selected_account_test.js
+++ b/test/unit/actions/set_selected_account_test.js
@@ -29,7 +29,7 @@ describe('SET_SELECTED_ACCOUNT', function () {
 describe('SHOW_ACCOUNT_DETAIL', function () {
   it('updates metamask state', function () {
     var initialState = {
-      metamask: {
+      dekusan: {
         selectedAddress: 'foo',
       },
     }
@@ -42,6 +42,6 @@ describe('SHOW_ACCOUNT_DETAIL', function () {
     freeze(action)
 
     var resultingState = reducers(initialState, action)
-    assert.equal(resultingState.metamask.selectedAddress, action.value)
+    assert.equal(resultingstate.dekusan.selectedAddress, action.value)
   })
 })
diff --git a/test/unit/actions/tx_test.js b/test/unit/actions/tx_test.js
index 160cd455..da950149 100644
--- a/test/unit/actions/tx_test.js
+++ b/test/unit/actions/tx_test.js
@@ -17,7 +17,7 @@ describe('tx confirmation screen', function () {
         name: 'confTx',
       },
     },
-    metamask: {
+    dekusan: {
       unapprovedTxs: {
         [txId]: {
           id: txId,
diff --git a/test/unit/app/controllers/metamask-controller-test.js b/test/unit/app/controllers/metamask-controller-test.js
index 7532abdb..349c0127 100644
--- a/test/unit/app/controllers/metamask-controller-test.js
+++ b/test/unit/app/controllers/metamask-controller-test.js
@@ -278,8 +278,8 @@ describe('DekuSanController', function () {
     })
 
     it('changes metamask controller selected address', function () {
-      const metamaskState = metamaskController.getState()
-      assert.equal(metamaskState.selectedAddress, address)
+      const dekusanState = metamaskController.getState()
+      assert.equal(dekusanState.selectedAddress, address)
     })
   })
 
@@ -538,10 +538,10 @@ describe('DekuSanController', function () {
       getNetworkstub.returns(42)
 
       metamaskController.txController.txStateManager._saveTxList([
-        createTxMeta({ id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {from: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'} }),
-        createTxMeta({ id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {from: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'} }),
-        createTxMeta({ id: 2, status: 'rejected', metamaskNetworkId: 32 }),
-        createTxMeta({ id: 3, status: 'submitted', metamaskNetworkId: currentNetworkId, txParams: {from: '0xB09d8505E1F4EF1CeA089D47094f5DD3464083d4'} }),
+        createTxMeta({ id: 1, status: 'unapproved', dekusanNetworkId: currentNetworkId, txParams: {from: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'} }),
+        createTxMeta({ id: 1, status: 'unapproved', dekusanNetworkId: currentNetworkId, txParams: {from: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'} }),
+        createTxMeta({ id: 2, status: 'rejected', dekusanNetworkId: 32 }),
+        createTxMeta({ id: 3, status: 'submitted', dekusanNetworkId: currentNetworkId, txParams: {from: '0xB09d8505E1F4EF1CeA089D47094f5DD3464083d4'} }),
       ])
     })
 
diff --git a/test/unit/app/controllers/transactions/tx-controller-test.js b/test/unit/app/controllers/transactions/tx-controller-test.js
index 2cf0a26c..5b838097 100644
--- a/test/unit/app/controllers/transactions/tx-controller-test.js
+++ b/test/unit/app/controllers/transactions/tx-controller-test.js
@@ -56,9 +56,9 @@ describe('Transaction Controller', function () {
   describe('#getUnapprovedTxCount', function () {
     it('should return the number of unapproved txs', function () {
       txController.txStateManager._saveTxList([
-        { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {}, history: [{}] },
-        { id: 2, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {}, history: [{}] },
-        { id: 3, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {}, history: [{}] },
+        { id: 1, status: 'unapproved', dekusanNetworkId: currentNetworkId, txParams: {}, history: [{}] },
+        { id: 2, status: 'unapproved', dekusanNetworkId: currentNetworkId, txParams: {}, history: [{}] },
+        { id: 3, status: 'unapproved', dekusanNetworkId: currentNetworkId, txParams: {}, history: [{}] },
       ])
       const unapprovedTxCount = txController.getUnapprovedTxCount()
       assert.equal(unapprovedTxCount, 3, 'should be 3')
@@ -68,9 +68,9 @@ describe('Transaction Controller', function () {
   describe('#getPendingTxCount', function () {
     it('should return the number of pending txs', function () {
       txController.txStateManager._saveTxList([
-        { id: 1, status: 'submitted', metamaskNetworkId: currentNetworkId, txParams: {}, history: [{}] },
-        { id: 2, status: 'submitted', metamaskNetworkId: currentNetworkId, txParams: {}, history: [{}] },
-        { id: 3, status: 'submitted', metamaskNetworkId: currentNetworkId, txParams: {}, history: [{}] },
+        { id: 1, status: 'submitted', dekusanNetworkId: currentNetworkId, txParams: {}, history: [{}] },
+        { id: 2, status: 'submitted', dekusanNetworkId: currentNetworkId, txParams: {}, history: [{}] },
+        { id: 3, status: 'submitted', dekusanNetworkId: currentNetworkId, txParams: {}, history: [{}] },
       ])
       const pendingTxCount = txController.getPendingTxCount()
       assert.equal(pendingTxCount, 3, 'should be 3')
@@ -86,15 +86,15 @@ describe('Transaction Controller', function () {
         'to': '0xc684832530fcbddae4b4230a47e991ddcec2831d',
       }
       txController.txStateManager._saveTxList([
-        {id: 0, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams, history: [{}] },
-        {id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams, history: [{}] },
-        {id: 2, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams, history: [{}] },
-        {id: 3, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams, history: [{}] },
-        {id: 4, status: 'rejected', metamaskNetworkId: currentNetworkId, txParams, history: [{}] },
-        {id: 5, status: 'approved', metamaskNetworkId: currentNetworkId, txParams, history: [{}] },
-        {id: 6, status: 'signed', metamaskNetworkId: currentNetworkId, txParams, history: [{}] },
-        {id: 7, status: 'submitted', metamaskNetworkId: currentNetworkId, txParams, history: [{}] },
-        {id: 8, status: 'failed', metamaskNetworkId: currentNetworkId, txParams, history: [{}] },
+        {id: 0, status: 'confirmed', dekusanNetworkId: currentNetworkId, txParams, history: [{}] },
+        {id: 1, status: 'confirmed', dekusanNetworkId: currentNetworkId, txParams, history: [{}] },
+        {id: 2, status: 'confirmed', dekusanNetworkId: currentNetworkId, txParams, history: [{}] },
+        {id: 3, status: 'unapproved', dekusanNetworkId: currentNetworkId, txParams, history: [{}] },
+        {id: 4, status: 'rejected', dekusanNetworkId: currentNetworkId, txParams, history: [{}] },
+        {id: 5, status: 'approved', dekusanNetworkId: currentNetworkId, txParams, history: [{}] },
+        {id: 6, status: 'signed', dekusanNetworkId: currentNetworkId, txParams, history: [{}] },
+        {id: 7, status: 'submitted', dekusanNetworkId: currentNetworkId, txParams, history: [{}] },
+        {id: 8, status: 'failed', dekusanNetworkId: currentNetworkId, txParams, history: [{}] },
       ])
     })
 
@@ -114,7 +114,7 @@ describe('Transaction Controller', function () {
       txMeta = {
         status: 'unapproved',
         id: 1,
-        metamaskNetworkId: currentNetworkId,
+        dekusanNetworkId: currentNetworkId,
         txParams,
         history: [{}],
       }
@@ -178,7 +178,7 @@ describe('Transaction Controller', function () {
       .then((txMeta) => {
         assert(('id' in txMeta), 'should have a id')
         assert(('time' in txMeta), 'should have a time stamp')
-        assert(('metamaskNetworkId' in txMeta), 'should have a metamaskNetworkId')
+        assert(('dekusanNetworkId' in txMeta), 'should have a dekusanNetworkId')
         assert(('txParams' in txMeta), 'should have a txParams')
         assert(('history' in txMeta), 'should have a history')
 
@@ -254,7 +254,7 @@ describe('Transaction Controller', function () {
       const txMeta = {
         id: '1',
         status: 'unapproved',
-        metamaskNetworkId: currentNetworkId,
+        dekusanNetworkId: currentNetworkId,
         txParams: {},
       }
 
@@ -285,7 +285,7 @@ describe('Transaction Controller', function () {
       txMeta = {
         id: '1',
         status: 'unapproved',
-        metamaskNetworkId: currentNetworkId,
+        dekusanNetworkId: currentNetworkId,
         txParams: {
           nonce: originalValue,
           gas: originalValue,
@@ -327,7 +327,7 @@ describe('Transaction Controller', function () {
 
   describe('#sign replay-protected tx', function () {
     it('prepares a tx with the chainId set', function (done) {
-      txController.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
+      txController.addTx({ id: '1', status: 'unapproved', dekusanNetworkId: currentNetworkId, txParams: {} }, noop)
       txController.signTransaction('1').then((rawTx) => {
         const ethTx = new EthTx(ethUtil.toBuffer(rawTx))
         assert.equal(ethTx.getChainId(), currentNetworkId)
@@ -349,7 +349,7 @@ describe('Transaction Controller', function () {
           gas: '0x7b0d',
           nonce: '0x4b',
         },
-        metamaskNetworkId: currentNetworkId,
+        dekusanNetworkId: currentNetworkId,
       }
     })
     it('should update and approve transactions', async () => {
@@ -371,13 +371,13 @@ describe('Transaction Controller', function () {
   describe('#cancelTransaction', function () {
     beforeEach(function () {
       txController.txStateManager._saveTxList([
-        { id: 0, status: 'unapproved', txParams: {}, metamaskNetworkId: currentNetworkId, history: [{}] },
-        { id: 1, status: 'rejected', txParams: {}, metamaskNetworkId: currentNetworkId, history: [{}] },
-        { id: 2, status: 'approved', txParams: {}, metamaskNetworkId: currentNetworkId, history: [{}] },
-        { id: 3, status: 'signed', txParams: {}, metamaskNetworkId: currentNetworkId, history: [{}] },
-        { id: 4, status: 'submitted', txParams: {}, metamaskNetworkId: currentNetworkId, history: [{}] },
-        { id: 5, status: 'confirmed', txParams: {}, metamaskNetworkId: currentNetworkId, history: [{}] },
-        { id: 6, status: 'failed', txParams: {}, metamaskNetworkId: currentNetworkId, history: [{}] },
+        { id: 0, status: 'unapproved', txParams: {}, dekusanNetworkId: currentNetworkId, history: [{}] },
+        { id: 1, status: 'rejected', txParams: {}, dekusanNetworkId: currentNetworkId, history: [{}] },
+        { id: 2, status: 'approved', txParams: {}, dekusanNetworkId: currentNetworkId, history: [{}] },
+        { id: 3, status: 'signed', txParams: {}, dekusanNetworkId: currentNetworkId, history: [{}] },
+        { id: 4, status: 'submitted', txParams: {}, dekusanNetworkId: currentNetworkId, history: [{}] },
+        { id: 5, status: 'confirmed', txParams: {}, dekusanNetworkId: currentNetworkId, history: [{}] },
+        { id: 6, status: 'failed', txParams: {}, dekusanNetworkId: currentNetworkId, history: [{}] },
       ])
     })
 
@@ -413,7 +413,7 @@ describe('Transaction Controller', function () {
         gasPrice: '0xa',
       }
       txController.txStateManager._saveTxList([
-        { id: 1, status: 'submitted', metamaskNetworkId: currentNetworkId, txParams, history: [{}] },
+        { id: 1, status: 'submitted', dekusanNetworkId: currentNetworkId, txParams, history: [{}] },
       ])
 
       expectedTxParams = Object.assign({}, txParams, { gasPrice: '0xb'})
@@ -467,7 +467,7 @@ describe('Transaction Controller', function () {
         id: 1,
         status: 'unapproved',
         txParams: {},
-        metamaskNetworkId: currentNetworkId,
+        dekusanNetworkId: currentNetworkId,
       }
       providerResultStub.eth_sendRawTransaction = hash
     })
@@ -492,7 +492,7 @@ describe('Transaction Controller', function () {
         data: '0x0',
       }
       txController.txStateManager._saveTxList([
-        { id: 1, status: 'submitted', metamaskNetworkId: currentNetworkId, txParams, history: [{}] },
+        { id: 1, status: 'submitted', dekusanNetworkId: currentNetworkId, txParams, history: [{}] },
       ])
       txController.retryTransaction(1)
       .then((txMeta) => {
@@ -511,13 +511,13 @@ describe('Transaction Controller', function () {
   describe('#_markNonceDuplicatesDropped', function () {
     it('should mark all nonce duplicates as dropped without marking the confirmed transaction as dropped', function () {
       txController.txStateManager._saveTxList([
-        { id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, history: [{}], txParams: { nonce: '0x01' } },
-        { id: 2, status: 'submitted', metamaskNetworkId: currentNetworkId, history: [{}], txParams: { nonce: '0x01' } },
-        { id: 3, status: 'submitted', metamaskNetworkId: currentNetworkId, history: [{}], txParams: { nonce: '0x01' } },
-        { id: 4, status: 'submitted', metamaskNetworkId: currentNetworkId, history: [{}], txParams: { nonce: '0x01' } },
-        { id: 5, status: 'submitted', metamaskNetworkId: currentNetworkId, history: [{}], txParams: { nonce: '0x01' } },
-        { id: 6, status: 'submitted', metamaskNetworkId: currentNetworkId, history: [{}], txParams: { nonce: '0x01' } },
-        { id: 7, status: 'submitted', metamaskNetworkId: currentNetworkId, history: [{}], txParams: { nonce: '0x01' } },
+        { id: 1, status: 'confirmed', dekusanNetworkId: currentNetworkId, history: [{}], txParams: { nonce: '0x01' } },
+        { id: 2, status: 'submitted', dekusanNetworkId: currentNetworkId, history: [{}], txParams: { nonce: '0x01' } },
+        { id: 3, status: 'submitted', dekusanNetworkId: currentNetworkId, history: [{}], txParams: { nonce: '0x01' } },
+        { id: 4, status: 'submitted', dekusanNetworkId: currentNetworkId, history: [{}], txParams: { nonce: '0x01' } },
+        { id: 5, status: 'submitted', dekusanNetworkId: currentNetworkId, history: [{}], txParams: { nonce: '0x01' } },
+        { id: 6, status: 'submitted', dekusanNetworkId: currentNetworkId, history: [{}], txParams: { nonce: '0x01' } },
+        { id: 7, status: 'submitted', dekusanNetworkId: currentNetworkId, history: [{}], txParams: { nonce: '0x01' } },
       ])
       txController._markNonceDuplicatesDropped(1)
       const confirmedTx = txController.txStateManager.getTx(1)
@@ -531,13 +531,13 @@ describe('Transaction Controller', function () {
   describe('#getPendingTransactions', function () {
     beforeEach(function () {
       txController.txStateManager._saveTxList([
-        { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} },
-        { id: 2, status: 'rejected', metamaskNetworkId: currentNetworkId, txParams: {}, history: [{}] },
-        { id: 3, status: 'approved', metamaskNetworkId: currentNetworkId, txParams: {}, history: [{}] },
-        { id: 4, status: 'signed', metamaskNetworkId: currentNetworkId, txParams: {}, history: [{}] },
-        { id: 5, status: 'submitted', metamaskNetworkId: currentNetworkId, txParams: {}, history: [{}] },
-        { id: 6, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {}, history: [{}] },
-        { id: 7, status: 'failed', metamaskNetworkId: currentNetworkId, txParams: {}, history: [{}] },
+        { id: 1, status: 'unapproved', dekusanNetworkId: currentNetworkId, txParams: {} },
+        { id: 2, status: 'rejected', dekusanNetworkId: currentNetworkId, txParams: {}, history: [{}] },
+        { id: 3, status: 'approved', dekusanNetworkId: currentNetworkId, txParams: {}, history: [{}] },
+        { id: 4, status: 'signed', dekusanNetworkId: currentNetworkId, txParams: {}, history: [{}] },
+        { id: 5, status: 'submitted', dekusanNetworkId: currentNetworkId, txParams: {}, history: [{}] },
+        { id: 6, status: 'confirmed', dekusanNetworkId: currentNetworkId, txParams: {}, history: [{}] },
+        { id: 7, status: 'failed', dekusanNetworkId: currentNetworkId, txParams: {}, history: [{}] },
       ])
     })
     it('should show only submitted and approved transactions as pending transasction', function () {
diff --git a/test/unit/app/controllers/transactions/tx-helper-test.js b/test/unit/app/controllers/transactions/tx-helper-test.js
index ce54ef48..1758daee 100644
--- a/test/unit/app/controllers/transactions/tx-helper-test.js
+++ b/test/unit/app/controllers/transactions/tx-helper-test.js
@@ -3,14 +3,14 @@ const txHelper = require('../../../../../ui/lib/tx-helper')
 
 describe('txHelper', function () {
   it('always shows the oldest tx first', function () {
-    const metamaskNetworkId = 1
+    const dekusanNetworkId = 1
     const txs = {
-      a: { metamaskNetworkId, time: 3 },
-      b: { metamaskNetworkId, time: 1 },
-      c: { metamaskNetworkId, time: 2 },
+      a: { dekusanNetworkId, time: 3 },
+      b: { dekusanNetworkId, time: 1 },
+      c: { dekusanNetworkId, time: 2 },
     }
 
-    const sorted = txHelper(txs, null, null, metamaskNetworkId)
+    const sorted = txHelper(txs, null, null, dekusanNetworkId)
     assert.equal(sorted[0].time, 1, 'oldest tx first')
     assert.equal(sorted[2].time, 3, 'newest tx last')
   })
diff --git a/test/unit/app/controllers/transactions/tx-state-manager-test.js b/test/unit/app/controllers/transactions/tx-state-manager-test.js
index 88bdaa60..67520fe5 100644
--- a/test/unit/app/controllers/transactions/tx-state-manager-test.js
+++ b/test/unit/app/controllers/transactions/tx-state-manager-test.js
@@ -20,7 +20,7 @@ describe('TransactionStateManager', function () {
 
   describe('#setTxStatusSigned', function () {
     it('sets the tx status to signed', function () {
-      const tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
+      const tx = { id: 1, status: 'unapproved', dekusanNetworkId: currentNetworkId, txParams: {} }
       txStateManager.addTx(tx, noop)
       txStateManager.setTxStatusSigned(1)
       const result = txStateManager.getTxList()
@@ -30,7 +30,7 @@ describe('TransactionStateManager', function () {
     })
 
     it('should emit a signed event to signal the exciton of callback', (done) => {
-      const tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
+      const tx = { id: 1, status: 'unapproved', dekusanNetworkId: currentNetworkId, txParams: {} }
       const noop = function () {
         assert(true, 'event listener has been triggered and noop executed')
         done()
@@ -44,7 +44,7 @@ describe('TransactionStateManager', function () {
 
   describe('#setTxStatusRejected', function () {
      it('sets the tx status to rejected and removes it from history', function () {
-      const tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
+      const tx = { id: 1, status: 'unapproved', dekusanNetworkId: currentNetworkId, txParams: {} }
       txStateManager.addTx(tx)
       txStateManager.setTxStatusRejected(1)
       const result = txStateManager.getTxList()
@@ -53,7 +53,7 @@ describe('TransactionStateManager', function () {
     })
 
     it('should emit a rejected event to signal the exciton of callback', (done) => {
-      const tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
+      const tx = { id: 1, status: 'unapproved', dekusanNetworkId: currentNetworkId, txParams: {} }
       txStateManager.addTx(tx)
       const noop = function (err, txId) {
           if (err) {
@@ -85,7 +85,7 @@ describe('TransactionStateManager', function () {
 
   describe('#addTx', function () {
     it('adds a tx returned in getTxList', function () {
-      const tx = { id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
+      const tx = { id: 1, status: 'confirmed', dekusanNetworkId: currentNetworkId, txParams: {} }
       txStateManager.addTx(tx, noop)
       const result = txStateManager.getTxList()
       assert.ok(Array.isArray(result))
@@ -94,8 +94,8 @@ describe('TransactionStateManager', function () {
     })
 
     it('does not override txs from other networks', function () {
-      const tx = { id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
-      const tx2 = { id: 2, status: 'confirmed', metamaskNetworkId: otherNetworkId, txParams: {} }
+      const tx = { id: 1, status: 'confirmed', dekusanNetworkId: currentNetworkId, txParams: {} }
+      const tx2 = { id: 2, status: 'confirmed', dekusanNetworkId: otherNetworkId, txParams: {} }
       txStateManager.addTx(tx, noop)
       txStateManager.addTx(tx2, noop)
       const result = txStateManager.getFullTxList()
@@ -107,7 +107,7 @@ describe('TransactionStateManager', function () {
     it('cuts off early txs beyond a limit', function () {
       const limit = txStateManager.txHistoryLimit
       for (let i = 0; i < limit + 1; i++) {
-        const tx = { id: i, time: new Date(), status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
+        const tx = { id: i, time: new Date(), status: 'confirmed', dekusanNetworkId: currentNetworkId, txParams: {} }
         txStateManager.addTx(tx, noop)
       }
       const result = txStateManager.getTxList()
@@ -118,7 +118,7 @@ describe('TransactionStateManager', function () {
     it('cuts off early txs beyond a limit whether or not it is confirmed or rejected', function () {
       const limit = txStateManager.txHistoryLimit
       for (let i = 0; i < limit + 1; i++) {
-        const tx = { id: i, time: new Date(), status: 'rejected', metamaskNetworkId: currentNetworkId, txParams: {} }
+        const tx = { id: i, time: new Date(), status: 'rejected', dekusanNetworkId: currentNetworkId, txParams: {} }
         txStateManager.addTx(tx, noop)
       }
       const result = txStateManager.getTxList()
@@ -127,11 +127,11 @@ describe('TransactionStateManager', function () {
     })
 
     it('cuts off early txs beyond a limit but does not cut unapproved txs', function () {
-      const unconfirmedTx = { id: 0, time: new Date(), status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
+      const unconfirmedTx = { id: 0, time: new Date(), status: 'unapproved', dekusanNetworkId: currentNetworkId, txParams: {} }
       txStateManager.addTx(unconfirmedTx, noop)
       const limit = txStateManager.txHistoryLimit
       for (let i = 1; i < limit + 1; i++) {
-        const tx = { id: i, time: new Date(), status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
+        const tx = { id: i, time: new Date(), status: 'confirmed', dekusanNetworkId: currentNetworkId, txParams: {} }
         txStateManager.addTx(tx, noop)
       }
       const result = txStateManager.getTxList()
@@ -144,8 +144,8 @@ describe('TransactionStateManager', function () {
 
   describe('#updateTx', function () {
     it('replaces the tx with the same id', function () {
-      txStateManager.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
-      txStateManager.addTx({ id: '2', status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
+      txStateManager.addTx({ id: '1', status: 'unapproved', dekusanNetworkId: currentNetworkId, txParams: {} }, noop)
+      txStateManager.addTx({ id: '2', status: 'confirmed', dekusanNetworkId: currentNetworkId, txParams: {} }, noop)
       const txMeta = txStateManager.getTx('1')
       txMeta.hash = 'foo'
       txStateManager.updateTx(txMeta)
@@ -160,7 +160,7 @@ describe('TransactionStateManager', function () {
       const txMeta = {
         id: '1',
         status: 'unapproved',
-        metamaskNetworkId: currentNetworkId,
+        dekusanNetworkId: currentNetworkId,
         txParams: {
           gasPrice: originalGasPrice,
         },
@@ -194,8 +194,8 @@ describe('TransactionStateManager', function () {
 
   describe('#getUnapprovedTxList', function () {
     it('returns unapproved txs in a hash', function () {
-      txStateManager.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
-      txStateManager.addTx({ id: '2', status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
+      txStateManager.addTx({ id: '1', status: 'unapproved', dekusanNetworkId: currentNetworkId, txParams: {} }, noop)
+      txStateManager.addTx({ id: '2', status: 'confirmed', dekusanNetworkId: currentNetworkId, txParams: {} }, noop)
       const result = txStateManager.getUnapprovedTxList()
       assert.equal(typeof result, 'object')
       assert.equal(result['1'].status, 'unapproved')
@@ -205,8 +205,8 @@ describe('TransactionStateManager', function () {
 
   describe('#getTx', function () {
     it('returns a tx with the requested id', function () {
-      txStateManager.addTx({ id: '1', status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
-      txStateManager.addTx({ id: '2', status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }, noop)
+      txStateManager.addTx({ id: '1', status: 'unapproved', dekusanNetworkId: currentNetworkId, txParams: {} }, noop)
+      txStateManager.addTx({ id: '2', status: 'confirmed', dekusanNetworkId: currentNetworkId, txParams: {} }, noop)
       assert.equal(txStateManager.getTx('1').status, 'unapproved')
       assert.equal(txStateManager.getTx('2').status, 'confirmed')
     })
@@ -215,16 +215,16 @@ describe('TransactionStateManager', function () {
   describe('#getFilteredTxList', function () {
     it('returns a tx with the requested data', function () {
       const txMetas = [
-        { id: 0, status: 'unapproved', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: currentNetworkId },
-        { id: 1, status: 'unapproved', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: currentNetworkId },
-        { id: 2, status: 'unapproved', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: currentNetworkId },
-        { id: 3, status: 'unapproved', txParams: { from: '0xbb', to: '0xaa' }, metamaskNetworkId: currentNetworkId },
-        { id: 4, status: 'unapproved', txParams: { from: '0xbb', to: '0xaa' }, metamaskNetworkId: currentNetworkId },
-        { id: 5, status: 'confirmed', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: currentNetworkId },
-        { id: 6, status: 'confirmed', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: currentNetworkId },
-        { id: 7, status: 'confirmed', txParams: { from: '0xbb', to: '0xaa' }, metamaskNetworkId: currentNetworkId },
-        { id: 8, status: 'confirmed', txParams: { from: '0xbb', to: '0xaa' }, metamaskNetworkId: currentNetworkId },
-        { id: 9, status: 'confirmed', txParams: { from: '0xbb', to: '0xaa' }, metamaskNetworkId: currentNetworkId },
+        { id: 0, status: 'unapproved', txParams: { from: '0xaa', to: '0xbb' }, dekusanNetworkId: currentNetworkId },
+        { id: 1, status: 'unapproved', txParams: { from: '0xaa', to: '0xbb' }, dekusanNetworkId: currentNetworkId },
+        { id: 2, status: 'unapproved', txParams: { from: '0xaa', to: '0xbb' }, dekusanNetworkId: currentNetworkId },
+        { id: 3, status: 'unapproved', txParams: { from: '0xbb', to: '0xaa' }, dekusanNetworkId: currentNetworkId },
+        { id: 4, status: 'unapproved', txParams: { from: '0xbb', to: '0xaa' }, dekusanNetworkId: currentNetworkId },
+        { id: 5, status: 'confirmed', txParams: { from: '0xaa', to: '0xbb' }, dekusanNetworkId: currentNetworkId },
+        { id: 6, status: 'confirmed', txParams: { from: '0xaa', to: '0xbb' }, dekusanNetworkId: currentNetworkId },
+        { id: 7, status: 'confirmed', txParams: { from: '0xbb', to: '0xaa' }, dekusanNetworkId: currentNetworkId },
+        { id: 8, status: 'confirmed', txParams: { from: '0xbb', to: '0xaa' }, dekusanNetworkId: currentNetworkId },
+        { id: 9, status: 'confirmed', txParams: { from: '0xbb', to: '0xaa' }, dekusanNetworkId: currentNetworkId },
       ]
       txMetas.forEach((txMeta) => txStateManager.addTx(txMeta, noop))
       let filterParams
@@ -252,9 +252,9 @@ describe('TransactionStateManager', function () {
     it('should remove only the transactions from a specific address', function () {
 
       const txMetas = [
-        { id: 0, status: 'unapproved', txParams: { from: specificAddress, to: otherAddress }, metamaskNetworkId: currentNetworkId },
-        { id: 1, status: 'confirmed', txParams: { from: otherAddress, to: specificAddress }, metamaskNetworkId: currentNetworkId },
-        { id: 2, status: 'confirmed', txParams: { from: otherAddress, to: specificAddress }, metamaskNetworkId: currentNetworkId },
+        { id: 0, status: 'unapproved', txParams: { from: specificAddress, to: otherAddress }, dekusanNetworkId: currentNetworkId },
+        { id: 1, status: 'confirmed', txParams: { from: otherAddress, to: specificAddress }, dekusanNetworkId: currentNetworkId },
+        { id: 2, status: 'confirmed', txParams: { from: otherAddress, to: specificAddress }, dekusanNetworkId: currentNetworkId },
       ]
       txMetas.forEach((txMeta) => txStateManager.addTx(txMeta, noop))
 
@@ -269,9 +269,9 @@ describe('TransactionStateManager', function () {
 
     it('should not remove the transactions from other networks', function () {
       const txMetas = [
-        { id: 0, status: 'unapproved', txParams: { from: specificAddress, to: otherAddress }, metamaskNetworkId: currentNetworkId },
-        { id: 1, status: 'confirmed', txParams: { from: specificAddress, to: otherAddress }, metamaskNetworkId: otherNetworkId },
-        { id: 2, status: 'confirmed', txParams: { from: specificAddress, to: otherAddress }, metamaskNetworkId: otherNetworkId },
+        { id: 0, status: 'unapproved', txParams: { from: specificAddress, to: otherAddress }, dekusanNetworkId: currentNetworkId },
+        { id: 1, status: 'confirmed', txParams: { from: specificAddress, to: otherAddress }, dekusanNetworkId: otherNetworkId },
+        { id: 2, status: 'confirmed', txParams: { from: specificAddress, to: otherAddress }, dekusanNetworkId: otherNetworkId },
       ]
 
       txMetas.forEach((txMeta) => txStateManager.addTx(txMeta, noop))
@@ -279,7 +279,7 @@ describe('TransactionStateManager', function () {
       txStateManager.wipeTransactions(specificAddress)
 
       const txsFromCurrentNetworkAndAddress = txStateManager.getTxList().filter((txMeta) => txMeta.txParams.from === specificAddress)
-      const txFromOtherNetworks = txStateManager.getFullTxList().filter((txMeta) => txMeta.metamaskNetworkId === otherNetworkId)
+      const txFromOtherNetworks = txStateManager.getFullTxList().filter((txMeta) => txMeta.dekusanNetworkId === otherNetworkId)
 
       assert.equal(txsFromCurrentNetworkAndAddress.length, 0)
       assert.equal(txFromOtherNetworks.length, 2)
diff --git a/test/unit/app/message-manager-test.js b/test/unit/app/message-manager-test.js
index 36ef6c29..e404c213 100644
--- a/test/unit/app/message-manager-test.js
+++ b/test/unit/app/message-manager-test.js
@@ -21,7 +21,7 @@ describe('Message Manager', function () {
 
   describe('#addMsg', function () {
     it('adds a Msg returned in getMsgList', function () {
-      var Msg = { id: 1, status: 'approved', metamaskNetworkId: 'unit test' }
+      var Msg = { id: 1, status: 'approved', dekusanNetworkId: 'unit test' }
       messageManager.addMsg(Msg)
       var result = messageManager.messages
       assert.ok(Array.isArray(result))
@@ -32,7 +32,7 @@ describe('Message Manager', function () {
 
   describe('#setMsgStatusApproved', function () {
     it('sets the Msg status to approved', function () {
-      var Msg = { id: 1, status: 'unapproved', metamaskNetworkId: 'unit test' }
+      var Msg = { id: 1, status: 'unapproved', dekusanNetworkId: 'unit test' }
       messageManager.addMsg(Msg)
       messageManager.setMsgStatusApproved(1)
       var result = messageManager.messages
@@ -44,7 +44,7 @@ describe('Message Manager', function () {
 
   describe('#rejectMsg', function () {
     it('sets the Msg status to rejected', function () {
-      var Msg = { id: 1, status: 'unapproved', metamaskNetworkId: 'unit test' }
+      var Msg = { id: 1, status: 'unapproved', dekusanNetworkId: 'unit test' }
       messageManager.addMsg(Msg)
       messageManager.rejectMsg(1)
       var result = messageManager.messages
@@ -56,9 +56,9 @@ describe('Message Manager', function () {
 
   describe('#_updateMsg', function () {
     it('replaces the Msg with the same id', function () {
-      messageManager.addMsg({ id: '1', status: 'unapproved', metamaskNetworkId: 'unit test' })
-      messageManager.addMsg({ id: '2', status: 'approved', metamaskNetworkId: 'unit test' })
-      messageManager._updateMsg({ id: '1', status: 'blah', hash: 'foo', metamaskNetworkId: 'unit test' })
+      messageManager.addMsg({ id: '1', status: 'unapproved', dekusanNetworkId: 'unit test' })
+      messageManager.addMsg({ id: '2', status: 'approved', dekusanNetworkId: 'unit test' })
+      messageManager._updateMsg({ id: '1', status: 'blah', hash: 'foo', dekusanNetworkId: 'unit test' })
       var result = messageManager.getMsg('1')
       assert.equal(result.hash, 'foo')
     })
@@ -66,8 +66,8 @@ describe('Message Manager', function () {
 
   describe('#getUnapprovedMsgs', function () {
     it('returns unapproved Msgs in a hash', function () {
-      messageManager.addMsg({ id: '1', status: 'unapproved', metamaskNetworkId: 'unit test' })
-      messageManager.addMsg({ id: '2', status: 'approved', metamaskNetworkId: 'unit test' })
+      messageManager.addMsg({ id: '1', status: 'unapproved', dekusanNetworkId: 'unit test' })
+      messageManager.addMsg({ id: '2', status: 'approved', dekusanNetworkId: 'unit test' })
       const result = messageManager.getUnapprovedMsgs()
       assert.equal(typeof result, 'object')
       assert.equal(result['1'].status, 'unapproved')
@@ -77,8 +77,8 @@ describe('Message Manager', function () {
 
   describe('#getMsg', function () {
     it('returns a Msg with the requested id', function () {
-      messageManager.addMsg({ id: '1', status: 'unapproved', metamaskNetworkId: 'unit test' })
-      messageManager.addMsg({ id: '2', status: 'approved', metamaskNetworkId: 'unit test' })
+      messageManager.addMsg({ id: '1', status: 'unapproved', dekusanNetworkId: 'unit test' })
+      messageManager.addMsg({ id: '2', status: 'approved', dekusanNetworkId: 'unit test' })
       assert.equal(messageManager.getMsg('1').status, 'unapproved')
       assert.equal(messageManager.getMsg('2').status, 'approved')
     })
diff --git a/test/unit/app/personal-message-manager-test.js b/test/unit/app/personal-message-manager-test.js
index b07167bf..b89819d1 100644
--- a/test/unit/app/personal-message-manager-test.js
+++ b/test/unit/app/personal-message-manager-test.js
@@ -22,7 +22,7 @@ describe('Personal Message Manager', function () {
 
   describe('#addMsg', function () {
     it('adds a Msg returned in getMsgList', function () {
-      var Msg = { id: 1, status: 'approved', metamaskNetworkId: 'unit test' }
+      var Msg = { id: 1, status: 'approved', dekusanNetworkId: 'unit test' }
       messageManager.addMsg(Msg)
       var result = messageManager.messages
       assert.ok(Array.isArray(result))
@@ -33,7 +33,7 @@ describe('Personal Message Manager', function () {
 
   describe('#setMsgStatusApproved', function () {
     it('sets the Msg status to approved', function () {
-      var Msg = { id: 1, status: 'unapproved', metamaskNetworkId: 'unit test' }
+      var Msg = { id: 1, status: 'unapproved', dekusanNetworkId: 'unit test' }
       messageManager.addMsg(Msg)
       messageManager.setMsgStatusApproved(1)
       var result = messageManager.messages
@@ -45,7 +45,7 @@ describe('Personal Message Manager', function () {
 
   describe('#rejectMsg', function () {
     it('sets the Msg status to rejected', function () {
-      var Msg = { id: 1, status: 'unapproved', metamaskNetworkId: 'unit test' }
+      var Msg = { id: 1, status: 'unapproved', dekusanNetworkId: 'unit test' }
       messageManager.addMsg(Msg)
       messageManager.rejectMsg(1)
       var result = messageManager.messages
@@ -57,9 +57,9 @@ describe('Personal Message Manager', function () {
 
   describe('#_updateMsg', function () {
     it('replaces the Msg with the same id', function () {
-      messageManager.addMsg({ id: '1', status: 'unapproved', metamaskNetworkId: 'unit test' })
-      messageManager.addMsg({ id: '2', status: 'approved', metamaskNetworkId: 'unit test' })
-      messageManager._updateMsg({ id: '1', status: 'blah', hash: 'foo', metamaskNetworkId: 'unit test' })
+      messageManager.addMsg({ id: '1', status: 'unapproved', dekusanNetworkId: 'unit test' })
+      messageManager.addMsg({ id: '2', status: 'approved', dekusanNetworkId: 'unit test' })
+      messageManager._updateMsg({ id: '1', status: 'blah', hash: 'foo', dekusanNetworkId: 'unit test' })
       var result = messageManager.getMsg('1')
       assert.equal(result.hash, 'foo')
     })
@@ -67,8 +67,8 @@ describe('Personal Message Manager', function () {
 
   describe('#getUnapprovedMsgs', function () {
     it('returns unapproved Msgs in a hash', function () {
-      messageManager.addMsg({ id: '1', status: 'unapproved', metamaskNetworkId: 'unit test' })
-      messageManager.addMsg({ id: '2', status: 'approved', metamaskNetworkId: 'unit test' })
+      messageManager.addMsg({ id: '1', status: 'unapproved', dekusanNetworkId: 'unit test' })
+      messageManager.addMsg({ id: '2', status: 'approved', dekusanNetworkId: 'unit test' })
       const result = messageManager.getUnapprovedMsgs()
       assert.equal(typeof result, 'object')
       assert.equal(result['1'].status, 'unapproved')
@@ -78,8 +78,8 @@ describe('Personal Message Manager', function () {
 
   describe('#getMsg', function () {
     it('returns a Msg with the requested id', function () {
-      messageManager.addMsg({ id: '1', status: 'unapproved', metamaskNetworkId: 'unit test' })
-      messageManager.addMsg({ id: '2', status: 'approved', metamaskNetworkId: 'unit test' })
+      messageManager.addMsg({ id: '1', status: 'unapproved', dekusanNetworkId: 'unit test' })
+      messageManager.addMsg({ id: '2', status: 'approved', dekusanNetworkId: 'unit test' })
       assert.equal(messageManager.getMsg('1').status, 'unapproved')
       assert.equal(messageManager.getMsg('2').status, 'approved')
     })
diff --git a/test/unit/migrations/migrations-test.js b/test/unit/migrations/migrations-test.js
index 50afd9c2..29725622 100644
--- a/test/unit/migrations/migrations-test.js
+++ b/test/unit/migrations/migrations-test.js
@@ -19,7 +19,7 @@ const migration12 = require(path.join('..', '..', '..', 'app', 'scripts', 'migra
 const migration13 = require(path.join('..', '..', '..', 'app', 'scripts', 'migrations', '013'))
 
 
-const oldTestRpc = 'https://rawtestrpc.metamask.io/'
+const oldTestRpc = 'https://api-testnet.dexon.org/v1/network/rpc/'
 const newTestRpc = 'https://testrpc.metamask.io/'
 
 describe('wallet1 is migrated successfully', () => {
diff --git a/test/unit/responsive/components/dropdown-test.js b/test/unit/responsive/components/dropdown-test.js
index f3f236d9..4f066f83 100644
--- a/test/unit/responsive/components/dropdown-test.js
+++ b/test/unit/responsive/components/dropdown-test.js
@@ -9,7 +9,7 @@ const { createMockStore } = require('redux-test-utils')
 const { mountWithStore } = require('../../../lib/render-helpers')
 
 const mockState = {
-  metamask: {
+  dekusan: {
   },
 }
 
diff --git a/test/unit/ui/add-token.spec.js b/test/unit/ui/add-token.spec.js
index f6b6155a..32070bc2 100644
--- a/test/unit/ui/add-token.spec.js
+++ b/test/unit/ui/add-token.spec.js
@@ -7,7 +7,7 @@ const AddTokenScreen = require('../../../old-ui/app/add-token')
 describe('Add Token Screen', function () {
   let addTokenComponent, store, component
   const mockState = {
-    metamask: {
+    dekusan: {
       identities: {
         '0x7d3517b0d011698406d6e0aed8453f0be2697926': {
           'address': '0x7d3517b0d011698406d6e0aed8453f0be2697926',
diff --git a/test/unit/ui/app/actions.spec.js b/test/unit/ui/app/actions.spec.js
index df7d2ee8..e9e9ae26 100644
--- a/test/unit/ui/app/actions.spec.js
+++ b/test/unit/ui/app/actions.spec.js
@@ -631,7 +631,7 @@ describe('Actions', () => {
     })
 
     it('', () => {
-      const store = mockStore({ metamask: devState })
+      const store = mockStore({ dekusan: devState })
 
       addNewAccountSpy = sinon.spy(background, 'addNewAccount')
 
@@ -892,7 +892,7 @@ describe('Actions', () => {
     })
 
     it('calls setSelectedAddress in background', () => {
-      const store = mockStore({ metamask: devState })
+      const store = mockStore({ dekusan: devState })
 
       store.dispatch(actions.setSelectedAddress('0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'))
       assert(setSelectedAddressSpy.calledOnce)
diff --git a/test/unit/ui/app/components/token-cell.spec.js b/test/unit/ui/app/components/token-cell.spec.js
index 6145c692..f7d18cff 100644
--- a/test/unit/ui/app/components/token-cell.spec.js
+++ b/test/unit/ui/app/components/token-cell.spec.js
@@ -12,7 +12,7 @@ describe('Token Cell', () => {
   let wrapper
 
   const state = {
-    metamask: {
+    dekusan: {
       network: 'test',
       currentCurrency: 'usd',
       selectedTokenAddress: '0xToken',
diff --git a/test/unit/ui/app/selectors.spec.js b/test/unit/ui/app/selectors.spec.js
index e2b198ab..375d3da6 100644
--- a/test/unit/ui/app/selectors.spec.js
+++ b/test/unit/ui/app/selectors.spec.js
@@ -12,7 +12,7 @@ describe('Selectors', function () {
     let state
     beforeEach(function () {
       state = {
-        metamask: {
+        dekusan: {
           accounts: {
             '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
               'balance': '0x0',
@@ -65,7 +65,7 @@ describe('Selectors', function () {
 
     beforeEach(function () {
       missingTokenRate = {
-        metamask: {
+        dekusan: {
           'contractExchangeRates': {},
         },
       }
diff --git a/ui/app/actions.js b/ui/app/actions.js
index fa175177..240c5b09 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -646,7 +646,7 @@ function navigateToNewAccountScreen () {
 function addNewAccount () {
   log.debug(`background.addNewAccount`)
   return (dispatch, getState) => {
-    const oldIdentities = getState().metamask.identities
+    const oldIdentities = getState().dekusan.identities
     dispatch(actions.showLoadingIndication())
     return new Promise((resolve, reject) => {
       background.addNewAccount((err, { identities: newIdentities}) => {
diff --git a/ui/app/app.js b/ui/app/app.js
index 970cb181..2df4c2ac 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -29,7 +29,6 @@ const AddTokenPage = require('./components/pages/add-token')
 const ConfirmAddTokenPage = require('./components/pages/confirm-add-token')
 const ConfirmAddSuggestedTokenPage = require('./components/pages/confirm-add-suggested-token')
 const CreateAccountPage = require('./components/pages/create-account')
-const NoticeScreen = require('./components/pages/notice')
 
 const Loading = require('./components/loading-screen')
 const NetworkDropdown = require('./components/dropdowns/network-dropdown')
@@ -61,7 +60,6 @@ const {
   SEND_ROUTE,
   CONFIRM_TRANSACTION_ROUTE,
   INITIALIZE_ROUTE,
-  NOTICE_ROUTE,
 } = require('./routes')
 
 class App extends Component {
@@ -83,7 +81,6 @@ class App extends Component {
         h(Initialized, { path: RESTORE_VAULT_ROUTE, exact, component: RestoreVaultPage }),
         h(Authenticated, { path: REVEAL_SEED_ROUTE, exact, component: RevealSeedConfirmation }),
         h(Authenticated, { path: SETTINGS_ROUTE, component: Settings }),
-        h(Authenticated, { path: NOTICE_ROUTE, exact, component: NoticeScreen }),
         h(Authenticated, {
           path: `${CONFIRM_TRANSACTION_ROUTE}/:id?`,
           component: ConfirmTransaction,
@@ -274,7 +271,7 @@ App.propTypes = {
 }
 
 function mapStateToProps (state) {
-  const { appState, metamask } = state
+  const { appState, dekusan } = state
   const {
     networkDropdownOpen,
     sidebar,
@@ -299,7 +296,7 @@ function mapStateToProps (state) {
     unapprovedMsgCount,
     unapprovedPersonalMsgCount,
     unapprovedTypedMessagesCount,
-  } = metamask
+  } = dekusan
   const selected = address || Object.keys(accounts)[0]
 
   return {
@@ -312,33 +309,34 @@ function mapStateToProps (state) {
     loadingMessage,
     noActiveNotices,
     isInitialized,
-    isUnlocked: state.metamask.isUnlocked,
-    selectedAddress: state.metamask.selectedAddress,
+    isUnlocked: state.dekusan.isUnlocked,
+    selectedAddress: state.dekusan.selectedAddress,
     currentView: state.appState.currentView,
     activeAddress: state.appState.activeAddress,
     transForward: state.appState.transForward,
-    isMascara: state.metamask.isMascara,
+    isMascara: state.dekusan.isMascara,
     isOnboarding: Boolean(!noActiveNotices || seedWords || !isInitialized),
-    isPopup: state.metamask.isPopup,
-    seedWords: state.metamask.seedWords,
     submittedPendingTransactions: submittedPendingTransactionsSelector(state),
+    isPopup: state.dekusan.isPopup,
+    seedWords: state.dekusan.seedWords,
     unapprovedTxs,
-    unapprovedMsgs: state.metamask.unapprovedMsgs,
+    unapprovedMsgs: state.dekusan.unapprovedMsgs,
     unapprovedMsgCount,
     unapprovedPersonalMsgCount,
     unapprovedTypedMessagesCount,
     menuOpen: state.appState.menuOpen,
-    network: state.metamask.network,
-    provider: state.metamask.provider,
+    network: state.dekusan.network,
+    provider: state.dekusan.provider,
     forgottenPassword: state.appState.forgottenPassword,
     nextUnreadNotice,
     lostAccounts,
-    frequentRpcListDetail: state.metamask.frequentRpcListDetail || [],
-    currentCurrency: state.metamask.currentCurrency,
+    frequentRpcListDetail: state.dekusan.frequentRpcListDetail || [],
+    currentCurrency: state.dekusan.currentCurrency,
+    frequentRpcList: state.dekusan.frequentRpcList || [],
     isMouseUser: state.appState.isMouseUser,
-    isRevealingSeedWords: state.metamask.isRevealingSeedWords,
+    isRevealingSeedWords: state.dekusan.isRevealingSeedWords,
     Qr: state.appState.Qr,
-    welcomeScreenSeen: state.metamask.welcomeScreenSeen,
+    welcomeScreenSeen: state.dekusan.welcomeScreenSeen,
 
     // state needed to get account dropdown temporarily rendering from app bar
     identities,
diff --git a/ui/app/components/account-menu/index.js b/ui/app/components/account-menu/index.js
index e8838909..b9a1c51c 100644
--- a/ui/app/components/account-menu/index.js
+++ b/ui/app/components/account-menu/index.js
@@ -38,10 +38,10 @@ function AccountMenu () { Component.call(this) }
 
 function mapStateToProps (state) {
   return {
-    selectedAddress: state.metamask.selectedAddress,
-    isAccountMenuOpen: state.metamask.isAccountMenuOpen,
-    keyrings: state.metamask.keyrings,
-    identities: state.metamask.identities,
+    selectedAddress: state.dekusan.selectedAddress,
+    isAccountMenuOpen: state.dekusan.isAccountMenuOpen,
+    keyrings: state.dekusan.keyrings,
+    identities: state.dekusan.identities,
     accounts: getMetaMaskAccounts(state),
   }
 }
diff --git a/ui/app/components/app-header/app-header.container.js b/ui/app/components/app-header/app-header.container.js
index 8b719bdf..3a6ab70e 100644
--- a/ui/app/components/app-header/app-header.container.js
+++ b/ui/app/components/app-header/app-header.container.js
@@ -6,7 +6,7 @@ import AppHeader from './app-header.component'
 const actions = require('../../actions')
 
 const mapStateToProps = state => {
-  const { appState, metamask } = state
+  const { appState, dekusan } = state
   const { networkDropdownOpen } = appState
   const {
     network,
@@ -14,7 +14,7 @@ const mapStateToProps = state => {
     providerRequests,
     selectedAddress,
     isUnlocked,
-  } = metamask
+  } = dekusan
 
   return {
     networkDropdownOpen,
diff --git a/ui/app/components/balance-component.js b/ui/app/components/balance-component.js
index 78b51449..50121aa0 100644
--- a/ui/app/components/balance-component.js
+++ b/ui/app/components/balance-component.js
@@ -14,8 +14,8 @@ module.exports = connect(mapStateToProps)(BalanceComponent)
 
 function mapStateToProps (state) {
   const accounts = getMetaMaskAccounts(state)
-  const network = state.metamask.network
-  const selectedAddress = state.metamask.selectedAddress || Object.keys(accounts)[0]
+  const network = state.dekusan.network
+  const selectedAddress = state.dekusan.selectedAddress || Object.keys(accounts)[0]
   const account = accounts[selectedAddress]
 
   return {
diff --git a/ui/app/components/currency-display/currency-display.container.js b/ui/app/components/currency-display/currency-display.container.js
index e581f8a5..61529692 100644
--- a/ui/app/components/currency-display/currency-display.container.js
+++ b/ui/app/components/currency-display/currency-display.container.js
@@ -3,7 +3,7 @@ import CurrencyDisplay from './currency-display.component'
 import { getValueFromWeiHex, formatCurrency } from '../../helpers/confirm-transaction/util'
 
 const mapStateToProps = state => {
-  const { metamask: { nativeCurrency, currentCurrency, conversionRate } } = state
+  const { dekusan: { nativeCurrency, currentCurrency, conversionRate } } = state
 
   return {
     currentCurrency,
diff --git a/ui/app/components/currency-display/tests/currency-display.container.test.js b/ui/app/components/currency-display/tests/currency-display.container.test.js
index 7973bf60..59cb8e72 100644
--- a/ui/app/components/currency-display/tests/currency-display.container.test.js
+++ b/ui/app/components/currency-display/tests/currency-display.container.test.js
@@ -17,7 +17,7 @@ describe('CurrencyDisplay container', () => {
   describe('mapStateToProps()', () => {
     it('should return the correct props', () => {
       const mockState = {
-        metamask: {
+        dekusan: {
           conversionRate: 280.45,
           currentCurrency: 'usd',
           nativeCurrency: 'ETH',
diff --git a/ui/app/components/currency-input/currency-input.container.js b/ui/app/components/currency-input/currency-input.container.js
index 941e9380..a5d40730 100644
--- a/ui/app/components/currency-input/currency-input.container.js
+++ b/ui/app/components/currency-input/currency-input.container.js
@@ -3,7 +3,7 @@ import CurrencyInput from './currency-input.component'
 import { DEX } from '../../constants/common'
 
 const mapStateToProps = state => {
-  const { metamask: { nativeCurrency, currentCurrency, conversionRate } } = state
+  const { dekusan: { nativeCurrency, currentCurrency, conversionRate } } = state
 
   return {
     nativeCurrency,
diff --git a/ui/app/components/currency-input/tests/currency-input.component.test.js b/ui/app/components/currency-input/tests/currency-input.component.test.js
index a33889f9..b5a0e282 100644
--- a/ui/app/components/currency-input/tests/currency-input.component.test.js
+++ b/ui/app/components/currency-input/tests/currency-input.component.test.js
@@ -21,7 +21,7 @@ describe('CurrencyInput Component', () => {
 
     it('should render properly with a suffix', () => {
       const mockStore = {
-        metamask: {
+        dekusan: {
           nativeCurrency: 'ETH',
           currentCurrency: 'usd',
           conversionRate: 231.06,
@@ -46,7 +46,7 @@ describe('CurrencyInput Component', () => {
 
     it('should render properly with an ETH value', () => {
       const mockStore = {
-        metamask: {
+        dekusan: {
           nativeCurrency: 'ETH',
           currentCurrency: 'usd',
           conversionRate: 231.06,
@@ -78,7 +78,7 @@ describe('CurrencyInput Component', () => {
 
     it('should render properly with a fiat value', () => {
       const mockStore = {
-        metamask: {
+        dekusan: {
           nativeCurrency: 'ETH',
           currentCurrency: 'usd',
           conversionRate: 231.06,
@@ -121,7 +121,7 @@ describe('CurrencyInput Component', () => {
 
     it('should call onChange and onBlur on input changes with the hex value for ETH', () => {
       const mockStore = {
-        metamask: {
+        dekusan: {
           nativeCurrency: 'ETH',
           currentCurrency: 'usd',
           conversionRate: 231.06,
@@ -167,7 +167,7 @@ describe('CurrencyInput Component', () => {
 
     it('should call onChange and onBlur on input changes with the hex value for fiat', () => {
       const mockStore = {
-        metamask: {
+        dekusan: {
           nativeCurrency: 'ETH',
           currentCurrency: 'usd',
           conversionRate: 231.06,
@@ -214,7 +214,7 @@ describe('CurrencyInput Component', () => {
 
     it('should change the state and pass in a new decimalValue when props.value changes', () => {
       const mockStore = {
-        metamask: {
+        dekusan: {
           nativeCurrency: 'ETH',
           currentCurrency: 'usd',
           conversionRate: 231.06,
diff --git a/ui/app/components/currency-input/tests/currency-input.container.test.js b/ui/app/components/currency-input/tests/currency-input.container.test.js
index 27965ec0..ce66f386 100644
--- a/ui/app/components/currency-input/tests/currency-input.container.test.js
+++ b/ui/app/components/currency-input/tests/currency-input.container.test.js
@@ -17,7 +17,7 @@ describe('CurrencyInput container', () => {
   describe('mapStateToProps()', () => {
     it('should return the correct props', () => {
       const mockState = {
-        metamask: {
+        dekusan: {
           conversionRate: 280.45,
           currentCurrency: 'usd',
           nativeCurrency: 'ETH',
diff --git a/ui/app/components/dropdowns/account-details-dropdown.js b/ui/app/components/dropdowns/account-details-dropdown.js
index c4eed8a2..248e88cd 100644
--- a/ui/app/components/dropdowns/account-details-dropdown.js
+++ b/ui/app/components/dropdowns/account-details-dropdown.js
@@ -17,8 +17,8 @@ module.exports = connect(mapStateToProps, mapDispatchToProps)(AccountDetailsDrop
 function mapStateToProps (state) {
   return {
     selectedIdentity: getSelectedIdentity(state),
-    network: state.metamask.network,
-    keyrings: state.metamask.keyrings,
+    network: state.dekusan.network,
+    keyrings: state.dekusan.keyrings,
   }
 }
 
@@ -63,7 +63,7 @@ AccountDetailsDropdown.prototype.render = function () {
     return kr.accounts.includes(address)
   })
 
-  const isRemovable = keyring.type !== 'HD Key Tree'
+  const isRemovable = keyring && keyring.type !== 'HD Key Tree'
 
   return h(Menu, { className: 'account-details-dropdown', isShowing: true }, [
     h(CloseArea, {
diff --git a/ui/app/components/dropdowns/components/account-dropdowns.js b/ui/app/components/dropdowns/components/account-dropdowns.js
index 8febe985..0146c8d0 100644
--- a/ui/app/components/dropdowns/components/account-dropdowns.js
+++ b/ui/app/components/dropdowns/components/account-dropdowns.js
@@ -459,8 +459,8 @@ const mapDispatchToProps = (dispatch) => {
 
 function mapStateToProps (state) {
   return {
-    ticker: state.metamask.ticker,
-    keyrings: state.metamask.keyrings,
+    ticker: state.dekusan.ticker,
+    keyrings: state.dekusan.keyrings,
     sidebarOpen: state.appState.sidebar.isOpen,
   }
 }
diff --git a/ui/app/components/dropdowns/network-dropdown.js b/ui/app/components/dropdowns/network-dropdown.js
index 61ea59fa..d8298963 100644
--- a/ui/app/components/dropdowns/network-dropdown.js
+++ b/ui/app/components/dropdowns/network-dropdown.js
@@ -23,8 +23,8 @@ const notToggleElementClassnames = [
 
 function mapStateToProps (state) {
   return {
-    provider: state.metamask.provider,
-    frequentRpcListDetail: state.metamask.frequentRpcListDetail || [],
+    provider: state.dekusan.provider,
+    frequentRpcListDetail: state.dekusan.frequentRpcListDetail || [],
     networkDropdownOpen: state.appState.networkDropdownOpen,
     network: state.metamask.network,
   }
diff --git a/ui/app/components/dropdowns/tests/network-dropdown.test.js b/ui/app/components/dropdowns/tests/network-dropdown.test.js
index 4cf47e2d..a956f753 100644
--- a/ui/app/components/dropdowns/tests/network-dropdown.test.js
+++ b/ui/app/components/dropdowns/tests/network-dropdown.test.js
@@ -11,7 +11,7 @@ describe('Network Dropdown', () => {
 
   describe('NetworkDropdown in appState in false', () => {
     const mockState = {
-      metamask: {
+      dekusan: {
         provider: {
           type: 'test',
         },
@@ -41,7 +41,7 @@ describe('Network Dropdown', () => {
 
   describe('NetworkDropdown in appState is true', () => {
     const mockState = {
-      metamask: {
+      dekusan: {
         provider: {
           'type': 'test',
         },
diff --git a/ui/app/components/dropdowns/token-menu-dropdown.js b/ui/app/components/dropdowns/token-menu-dropdown.js
index e1db4776..3e4c8e26 100644
--- a/ui/app/components/dropdowns/token-menu-dropdown.js
+++ b/ui/app/components/dropdowns/token-menu-dropdown.js
@@ -15,7 +15,7 @@ module.exports = connect(mapStateToProps, mapDispatchToProps)(TokenMenuDropdown)
 
 function mapStateToProps (state) {
   return {
-    network: state.metamask.network,
+    network: state.dekusan.network,
   }
 }
 
diff --git a/ui/app/components/identicon.js b/ui/app/components/identicon.js
index 334d1ebd..24175209 100644
--- a/ui/app/components/identicon.js
+++ b/ui/app/components/identicon.js
@@ -20,7 +20,7 @@ function IdenticonComponent () {
 
 function mapStateToProps (state) {
   return {
-    useBlockie: state.metamask.useBlockie,
+    useBlockie: state.dekusan.useBlockie,
   }
 }
 
diff --git a/ui/app/components/identicon/tests/identicon.component.test.js b/ui/app/components/identicon/tests/identicon.component.test.js
index 2944818f..93e1f9a2 100644
--- a/ui/app/components/identicon/tests/identicon.component.test.js
+++ b/ui/app/components/identicon/tests/identicon.component.test.js
@@ -7,7 +7,7 @@ import Identicon from '../identicon.component'
 
 describe('Identicon', () => {
   const state = {
-    metamask: {
+    dekusan: {
       useBlockie: false,
     },
   }
diff --git a/ui/app/components/modals/account-details-modal.js b/ui/app/components/modals/account-details-modal.js
index 2e75c169..2329ec95 100644
--- a/ui/app/components/modals/account-details-modal.js
+++ b/ui/app/components/modals/account-details-modal.js
@@ -14,9 +14,9 @@ import Button from '../button'
 
 function mapStateToProps (state) {
   return {
-    network: state.metamask.network,
+    network: state.dekusan.network,
     selectedIdentity: getSelectedIdentity(state),
-    keyrings: state.metamask.keyrings,
+    keyrings: state.dekusan.keyrings,
   }
 }
 
diff --git a/ui/app/components/modals/buy-options-modal.js b/ui/app/components/modals/buy-options-modal.js
index c70510b5..77fa50c4 100644
--- a/ui/app/components/modals/buy-options-modal.js
+++ b/ui/app/components/modals/buy-options-modal.js
@@ -8,8 +8,8 @@ const { getNetworkDisplayName } = require('../../../../app/scripts/controllers/n
 
 function mapStateToProps (state) {
   return {
-    network: state.metamask.network,
-    address: state.metamask.selectedAddress,
+    network: state.dekusan.network,
+    address: state.dekusan.selectedAddress,
   }
 }
 
diff --git a/ui/app/components/modals/cancel-transaction/cancel-transaction.container.js b/ui/app/components/modals/cancel-transaction/cancel-transaction.container.js
index 10931a00..85516e28 100644
--- a/ui/app/components/modals/cancel-transaction/cancel-transaction.container.js
+++ b/ui/app/components/modals/cancel-transaction/cancel-transaction.container.js
@@ -8,9 +8,9 @@ import { showModal, createCancelTransaction } from '../../../actions'
 import { getHexGasTotal } from '../../../helpers/confirm-transaction/util'
 
 const mapStateToProps = (state, ownProps) => {
-  const { metamask } = state
+  const { dekusan } = state
   const { transactionId, originalGasPrice } = ownProps
-  const { selectedAddressTxList } = metamask
+  const { selectedAddressTxList } = dekusan
   const transaction = selectedAddressTxList.find(({ id }) => id === transactionId)
   const transactionStatus = transaction ? transaction.status : ''
 
diff --git a/ui/app/components/modals/confirm-remove-account/confirm-remove-account.container.js b/ui/app/components/modals/confirm-remove-account/confirm-remove-account.container.js
index 45c6654a..1df2376f 100644
--- a/ui/app/components/modals/confirm-remove-account/confirm-remove-account.container.js
+++ b/ui/app/components/modals/confirm-remove-account/confirm-remove-account.container.js
@@ -6,7 +6,7 @@ import { removeAccount } from '../../../actions'
 
 const mapStateToProps = state => {
   return {
-    network: state.metamask.network,
+    network: state.dekusan.network,
   }
 }
 
diff --git a/ui/app/components/modals/deposit-ether-modal.js b/ui/app/components/modals/deposit-ether-modal.js
index ba5cbedb..5610440c 100644
--- a/ui/app/components/modals/deposit-ether-modal.js
+++ b/ui/app/components/modals/deposit-ether-modal.js
@@ -14,8 +14,8 @@ let FAUCET_ROW_TITLE
 
 function mapStateToProps (state) {
   return {
-    network: state.metamask.network,
-    address: state.metamask.selectedAddress,
+    network: state.dekusan.network,
+    address: state.dekusan.selectedAddress,
   }
 }
 
diff --git a/ui/app/components/modals/export-private-key-modal.js b/ui/app/components/modals/export-private-key-modal.js
index d3e3c9a5..d0bd5230 100644
--- a/ui/app/components/modals/export-private-key-modal.js
+++ b/ui/app/components/modals/export-private-key-modal.js
@@ -24,7 +24,7 @@ function mapStateToPropsFactory () {
     return {
       warning: state.appState.warning,
       privateKey: state.appState.accountDetail.privateKey,
-      network: state.metamask.network,
+      network: state.dekusan.network,
       selectedIdentity,
       previousModalState: state.appState.modal.previousModalState.name,
     }
diff --git a/ui/app/components/modals/hide-token-confirmation-modal.js b/ui/app/components/modals/hide-token-confirmation-modal.js
index 43f3009a..184dece0 100644
--- a/ui/app/components/modals/hide-token-confirmation-modal.js
+++ b/ui/app/components/modals/hide-token-confirmation-modal.js
@@ -8,9 +8,9 @@ import Identicon from '../identicon'
 
 function mapStateToProps (state) {
   return {
-    network: state.metamask.network,
+    network: state.dekusan.network,
     token: state.appState.modal.modalState.props.token,
-    assetImages: state.metamask.assetImages,
+    assetImages: state.dekusan.assetImages,
   }
 }
 
diff --git a/ui/app/components/modals/new-account-modal.js b/ui/app/components/modals/new-account-modal.js
index a66a3ed4..fea6aaac 100644
--- a/ui/app/components/modals/new-account-modal.js
+++ b/ui/app/components/modals/new-account-modal.js
@@ -73,7 +73,7 @@ NewAccountModal.propTypes = {
 }
 
 const mapStateToProps = state => {
-  const { metamask: { network, selectedAddress, identities = {} } } = state
+  const { dekusan: { network, selectedAddress, identities = {} } } = state
   const numberOfExistingAccounts = Object.keys(identities).length
 
   return {
diff --git a/ui/app/components/network-display/network-display.container.js b/ui/app/components/network-display/network-display.container.js
index 99a14fff..c57010f0 100644
--- a/ui/app/components/network-display/network-display.container.js
+++ b/ui/app/components/network-display/network-display.container.js
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux'
 import NetworkDisplay from './network-display.component'
 
-const mapStateToProps = ({ metamask: { network, provider } }) => {
+const mapStateToProps = ({ dekusan: { network, provider } }) => {
   return {
     network,
     provider,
diff --git a/ui/app/components/pages/add-token/add-token.component.js b/ui/app/components/pages/add-token/add-token.component.js
index 82299bf8..bd0a48f3 100644
--- a/ui/app/components/pages/add-token/add-token.component.js
+++ b/ui/app/components/pages/add-token/add-token.component.js
@@ -288,9 +288,9 @@ class AddToken extends Component {
   renderTabs () {
     return (
       <Tabs>
-        <Tab name={this.context.t('search')}>
+        {/* <Tab name={this.context.t('search')}>
           { this.renderSearchToken() }
-        </Tab>
+        </Tab> */}
         <Tab name={this.context.t('customToken')}>
           { this.renderCustomTokenForm() }
         </Tab>
diff --git a/ui/app/components/pages/add-token/add-token.container.js b/ui/app/components/pages/add-token/add-token.container.js
index 87671b15..87ba33f5 100644
--- a/ui/app/components/pages/add-token/add-token.container.js
+++ b/ui/app/components/pages/add-token/add-token.container.js
@@ -3,8 +3,8 @@ import AddToken from './add-token.component'
 
 const { setPendingTokens, clearPendingTokens } = require('../../../actions')
 
-const mapStateToProps = ({ metamask }) => {
-  const { identities, tokens, pendingTokens } = metamask
+const mapStateToProps = ({ dekusan }) => {
+  const { identities, tokens, pendingTokens } = dekusan
   return {
     identities,
     tokens,
diff --git a/ui/app/components/pages/add-token/token-list/token-list.container.js b/ui/app/components/pages/add-token/token-list/token-list.container.js
index cd7b07a3..597e7265 100644
--- a/ui/app/components/pages/add-token/token-list/token-list.container.js
+++ b/ui/app/components/pages/add-token/token-list/token-list.container.js
@@ -1,8 +1,8 @@
 import { connect } from 'react-redux'
 import TokenList from './token-list.component'
 
-const mapStateToProps = ({ metamask }) => {
-  const { tokens } = metamask
+const mapStateToProps = ({ dekusan }) => {
+  const { tokens } = dekusan
   return {
     tokens,
   }
diff --git a/ui/app/components/pages/authenticated.js b/ui/app/components/pages/authenticated.js
index 1f6b0be4..e9c12086 100644
--- a/ui/app/components/pages/authenticated.js
+++ b/ui/app/components/pages/authenticated.js
@@ -24,7 +24,7 @@ Authenticated.propTypes = {
 }
 
 const mapStateToProps = state => {
-  const { metamask: { isUnlocked, isInitialized } } = state
+  const { dekusan: { isUnlocked, isInitialized } } = state
   return {
     isUnlocked,
     isInitialized,
diff --git a/ui/app/components/pages/confirm-add-suggested-token/confirm-add-suggested-token.container.js b/ui/app/components/pages/confirm-add-suggested-token/confirm-add-suggested-token.container.js
index 1f2737e5..80dd9508 100644
--- a/ui/app/components/pages/confirm-add-suggested-token/confirm-add-suggested-token.container.js
+++ b/ui/app/components/pages/confirm-add-suggested-token/confirm-add-suggested-token.container.js
@@ -7,8 +7,8 @@ const extend = require('xtend')
 
 const { addToken, removeSuggestedTokens } = require('../../../actions')
 
-const mapStateToProps = ({ metamask }) => {
-  const { pendingTokens, suggestedTokens } = metamask
+const mapStateToProps = ({ dekusan }) => {
+  const { pendingTokens, suggestedTokens } = dekusan
   const params = extend(pendingTokens, suggestedTokens)
 
   return {
diff --git a/ui/app/components/pages/confirm-add-token/confirm-add-token.container.js b/ui/app/components/pages/confirm-add-token/confirm-add-token.container.js
index 0190024d..1b52615e 100644
--- a/ui/app/components/pages/confirm-add-token/confirm-add-token.container.js
+++ b/ui/app/components/pages/confirm-add-token/confirm-add-token.container.js
@@ -3,8 +3,8 @@ import ConfirmAddToken from './confirm-add-token.component'
 
 const { addTokens, clearPendingTokens } = require('../../../actions')
 
-const mapStateToProps = ({ metamask }) => {
-  const { pendingTokens } = metamask
+const mapStateToProps = ({ dekusan }) => {
+  const { pendingTokens } = dekusan
   return {
     pendingTokens,
   }
diff --git a/ui/app/components/pages/confirm-token-transaction-base/confirm-token-transaction-base.container.js b/ui/app/components/pages/confirm-token-transaction-base/confirm-token-transaction-base.container.js
index be38acdb..ef09b401 100644
--- a/ui/app/components/pages/confirm-token-transaction-base/confirm-token-transaction-base.container.js
+++ b/ui/app/components/pages/confirm-token-transaction-base/confirm-token-transaction-base.container.js
@@ -7,7 +7,7 @@ import {
 
 const mapStateToProps = (state, ownProps) => {
   const { tokenAmount: ownTokenAmount } = ownProps
-  const { confirmTransaction, metamask: { currentCurrency, conversionRate } } = state
+  const { confirmTransaction, dekusan: { currentCurrency, conversionRate } } = state
   const {
     txData: { txParams: { to: tokenAddress } = {} } = {},
     tokenProps: { tokenSymbol } = {},
diff --git a/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.container.js b/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.container.js
index 1e227043..417ffd94 100644
--- a/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.container.js
+++ b/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.container.js
@@ -29,7 +29,7 @@ const casedContractMap = Object.keys(contractMap).reduce((acc, base) => {
 
 const mapStateToProps = (state, props) => {
   const { toAddress: propsToAddress } = props
-  const { confirmTransaction, metamask, gas } = state
+  const { confirmTransaction, dekusan, gas } = state
   const {
     ethTransactionAmount,
     ethTransactionFee,
@@ -58,7 +58,7 @@ const mapStateToProps = (state, props) => {
     assetImages,
     network,
     unapprovedTxs,
-  } = metamask
+  } = dekusan
   const assetImage = assetImages[txParamsToAddress]
 
   const {
@@ -79,7 +79,7 @@ const mapStateToProps = (state, props) => {
   const transactionStatus = transaction ? transaction.status : ''
 
   const currentNetworkUnapprovedTxs = R.filter(
-    ({ metamaskNetworkId }) => metamaskNetworkId === network,
+    ({ dekusanNetworkId }) => dekusanNetworkId === network,
     unapprovedTxs,
   )
   const unapprovedTxCount = valuesFor(currentNetworkUnapprovedTxs).length
diff --git a/ui/app/components/pages/confirm-transaction/confirm-transaction.container.js b/ui/app/components/pages/confirm-transaction/confirm-transaction.container.js
index 46342dc7..9b952f42 100644
--- a/ui/app/components/pages/confirm-transaction/confirm-transaction.container.js
+++ b/ui/app/components/pages/confirm-transaction/confirm-transaction.container.js
@@ -13,7 +13,7 @@ import { getTotalUnapprovedCount } from '../../../selectors'
 import { unconfirmedTransactionsListSelector } from '../../../selectors/confirm-transaction'
 
 const mapStateToProps = state => {
-  const { metamask: { send }, confirmTransaction } = state
+  const { dekusan: { send }, confirmTransaction } = state
 
   return {
     totalUnapprovedCount: getTotalUnapprovedCount(state),
diff --git a/ui/app/components/pages/create-account/connect-hardware/connect-screen.js b/ui/app/components/pages/create-account/connect-hardware/connect-screen.js
index 026b6620..9ba85c8b 100644
--- a/ui/app/components/pages/create-account/connect-hardware/connect-screen.js
+++ b/ui/app/components/pages/create-account/connect-hardware/connect-screen.js
@@ -85,8 +85,8 @@ class ConnectScreen extends Component {
 
     getAffiliateLinks () {
       const links = {
-        trezor: `<a class='hw-connect__get-hw__link' href='https://shop.trezor.io/?a=metamask' target='_blank'>Trezor</a>`,
-        ledger: `<a class='hw-connect__get-hw__link' href='https://www.ledger.com/products/ledger-nano-s?r=17c4991a03fa&tracker=MY_TRACKER' target='_blank'>Ledger</a>`,
+        trezor: `<a class='hw-connect__get-hw__link' href='https://shop.trezor.io' target='_blank'>Trezor</a>`,
+        ledger: `<a class='hw-connect__get-hw__link' href='https://www.ledger.com/products/ledger-nano-s' target='_blank'>Ledger</a>`,
       }
 
       const text = this.context.t('orderOneHere')
@@ -155,7 +155,7 @@ class ConnectScreen extends Component {
                 h('p.hw-connect__footer__msg', {}, [
                     this.context.t(`havingTroubleConnecting`),
                     h('a.hw-connect__footer__link', {
-                        href: 'https://support.metamask.io/',
+                        href: 'https://github.com/dexon-foundation/dekusan/issues',
                         target: '_blank',
                       }, this.context.t('getHelp')),
                 ]),
diff --git a/ui/app/components/pages/create-account/connect-hardware/index.js b/ui/app/components/pages/create-account/connect-hardware/index.js
index bd877fd4..38fbd2f4 100644
--- a/ui/app/components/pages/create-account/connect-hardware/index.js
+++ b/ui/app/components/pages/create-account/connect-hardware/index.js
@@ -225,7 +225,7 @@ ConnectHardwareForm.propTypes = {
 
 const mapStateToProps = state => {
   const {
-    metamask: { network, selectedAddress, identities = {} },
+    dekusan: { network, selectedAddress, identities = {} },
   } = state
   const accounts = getMetaMaskAccounts(state)
   const numberOfExistingAccounts = Object.keys(identities).length
diff --git a/ui/app/components/pages/create-account/import-account/index.js b/ui/app/components/pages/create-account/import-account/index.js
index 48d8f883..1eb9d060 100644
--- a/ui/app/components/pages/create-account/import-account/index.js
+++ b/ui/app/components/pages/create-account/import-account/index.js
@@ -46,7 +46,7 @@ AccountImportSubview.prototype.render = function () {
           },
           onClick: () => {
             global.platform.openWindow({
-              url: 'https://metamask.zendesk.com/hc/en-us/articles/360015289932',
+              url: 'https://github.com/dexon-foundation/wiki/wiki',
             })
           },
         }, this.context.t('here')),
diff --git a/ui/app/components/pages/create-account/import-account/json.js b/ui/app/components/pages/create-account/import-account/json.js
index 8ca167e2..05bd3110 100644
--- a/ui/app/components/pages/create-account/import-account/json.js
+++ b/ui/app/components/pages/create-account/import-account/json.js
@@ -8,7 +8,6 @@ const actions = require('../../../../actions')
 const FileInput = require('react-simple-file-input').default
 const { DEFAULT_ROUTE } = require('../../../../routes')
 const { getMetaMaskAccounts } = require('../../../../selectors')
-const HELP_LINK = 'https://support.metamask.io/kb/article/7-importing-accounts'
 import Button from '../../../button'
 
 class JsonImportSubview extends Component {
diff --git a/ui/app/components/pages/create-account/new-account.js b/ui/app/components/pages/create-account/new-account.js
index 94a5fa48..59399a7d 100644
--- a/ui/app/components/pages/create-account/new-account.js
+++ b/ui/app/components/pages/create-account/new-account.js
@@ -73,7 +73,7 @@ NewAccountCreateForm.propTypes = {
 }
 
 const mapStateToProps = state => {
-  const { metamask: { network, selectedAddress, identities = {} } } = state
+  const { dekusan: { network, selectedAddress, identities = {} } } = state
   const numberOfExistingAccounts = Object.keys(identities).length
 
   return {
diff --git a/ui/app/components/pages/home/home.component.js b/ui/app/components/pages/home/home.component.js
index b9ec3c25..9b02881c 100644
--- a/ui/app/components/pages/home/home.component.js
+++ b/ui/app/components/pages/home/home.component.js
@@ -8,9 +8,9 @@ import ProviderApproval from '../provider-approval'
 
 import {
   INITIALIZE_BACKUP_PHRASE_ROUTE,
+  INITIALIZE_NOTICE_ROUTE,
   RESTORE_VAULT_ROUTE,
   CONFIRM_TRANSACTION_ROUTE,
-  NOTICE_ROUTE,
   CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE,
 } from '../../../routes'
 
@@ -54,7 +54,7 @@ export default class Home extends PureComponent {
 
     // notices
     if (!noActiveNotices || (lostAccounts && lostAccounts.length > 0)) {
-      return <Redirect to={{ pathname: NOTICE_ROUTE }} />
+      return <Redirect to={{ pathname: INITIALIZE_NOTICE_ROUTE }} />
     }
 
     // seed words
diff --git a/ui/app/components/pages/home/home.container.js b/ui/app/components/pages/home/home.container.js
index bb8cf5e8..e12e5516 100644
--- a/ui/app/components/pages/home/home.container.js
+++ b/ui/app/components/pages/home/home.container.js
@@ -5,14 +5,14 @@ import { withRouter } from 'react-router-dom'
 import { unconfirmedTransactionsCountSelector } from '../../../selectors/confirm-transaction'
 
 const mapStateToProps = state => {
-  const { metamask, appState } = state
+  const { dekusan, appState } = state
   const {
     noActiveNotices,
     lostAccounts,
     seedWords,
     suggestedTokens,
     providerRequests,
-  } = metamask
+  } = dekusan
   const { forgottenPassword } = appState
 
   return {
diff --git a/ui/app/components/pages/initialized.js b/ui/app/components/pages/initialized.js
index 3adf67b2..503d801b 100644
--- a/ui/app/components/pages/initialized.js
+++ b/ui/app/components/pages/initialized.js
@@ -16,7 +16,7 @@ Initialized.propTypes = {
 }
 
 const mapStateToProps = state => {
-  const { metamask: { isInitialized } } = state
+  const { dekusan: { isInitialized } } = state
   return {
     isInitialized,
   }
diff --git a/ui/app/components/pages/metamask-route.js b/ui/app/components/pages/metamask-route.js
index 23c5b519..d97490ee 100644
--- a/ui/app/components/pages/metamask-route.js
+++ b/ui/app/components/pages/metamask-route.js
@@ -19,7 +19,7 @@ MetamaskRoute.propTypes = {
 }
 
 const mapStateToProps = state => {
-  const { metamask: { isMascara } } = state
+  const { dekusan: { isMascara } } = state
   return {
     isMascara,
   }
diff --git a/ui/app/components/pages/notice.js b/ui/app/components/pages/notice.js
index a9077b98..4a415287 100644
--- a/ui/app/components/pages/notice.js
+++ b/ui/app/components/pages/notice.js
@@ -153,8 +153,8 @@ class Notice extends Component {
 }
 
 const mapStateToProps = state => {
-  const { metamask } = state
-  const { noActiveNotices, nextUnreadNotice, lostAccounts } = metamask
+  const { dekusan } = state
+  const { noActiveNotices, nextUnreadNotice, lostAccounts } = dekusan
 
   return {
     noActiveNotices,
diff --git a/ui/app/components/pages/settings/info-tab/info-tab.component.js b/ui/app/components/pages/settings/info-tab/info-tab.component.js
index b57b4cc3..6e9b6650 100644
--- a/ui/app/components/pages/settings/info-tab/info-tab.component.js
+++ b/ui/app/components/pages/settings/info-tab/info-tab.component.js
@@ -8,7 +8,7 @@ export default class InfoTab extends PureComponent {
 
   static propTypes = {
     tab: PropTypes.string,
-    metamask: PropTypes.object,
+    dekusan: PropTypes.object,
     setCurrentCurrency: PropTypes.func,
     setRpcTarget: PropTypes.func,
     displayWarning: PropTypes.func,
@@ -32,7 +32,7 @@ export default class InfoTab extends PureComponent {
         </div>
         <div className="info-tab__link-item">
           <a
-            href="https://dexon.org/dekusan/privacy.html"
+            href="https://github.com/dexon-foundation/dekusan/blob/develop/docs/privacy.md"
             target="_blank"
             rel="noopener noreferrer"
           >
@@ -43,7 +43,7 @@ export default class InfoTab extends PureComponent {
         </div>
         <div className="info-tab__link-item">
           <a
-            href="https://dexon.org/dekusan/terms.html"
+            href="https://github.com/dexon-foundation/dekusan/blob/develop/docs/terms-of-use.md"
             target="_blank"
             rel="noopener noreferrer"
           >
@@ -52,7 +52,7 @@ export default class InfoTab extends PureComponent {
             </span>
           </a>
         </div>
-        <div className="info-tab__link-item">
+        {/* <div className="info-tab__link-item">
           <a
             href="https://metamask.io/attributions.html"
             target="_blank"
@@ -62,9 +62,9 @@ export default class InfoTab extends PureComponent {
               { t('attributions') }
             </span>
           </a>
-        </div>
+        </div> */}
         <hr className="info-tab__separator" />
-        <div className="info-tab__link-item">
+        {/* <div className="info-tab__link-item">
           <a
             href="https://dexon.org"
             target="_blank"
@@ -74,7 +74,7 @@ export default class InfoTab extends PureComponent {
               { t('supportCenter') }
             </span>
           </a>
-        </div>
+        </div> */}
         <div className="info-tab__link-item">
           <a
             href="https://dexon.org/"
diff --git a/ui/app/components/pages/settings/settings-tab/settings-tab.component.js b/ui/app/components/pages/settings/settings-tab/settings-tab.component.js
index 761c32a8..f6af62bc 100644
--- a/ui/app/components/pages/settings/settings-tab/settings-tab.component.js
+++ b/ui/app/components/pages/settings/settings-tab/settings-tab.component.js
@@ -36,7 +36,7 @@ export default class SettingsTab extends PureComponent {
   }
 
   static propTypes = {
-    metamask: PropTypes.object,
+    dekusan: PropTypes.object,
     setUseBlockie: PropTypes.func,
     setHexDataFeatureFlag: PropTypes.func,
     setPrivacyMode: PropTypes.func,
diff --git a/ui/app/components/pages/settings/settings-tab/settings-tab.container.js b/ui/app/components/pages/settings/settings-tab/settings-tab.container.js
index 04d79295..6a033a4d 100644
--- a/ui/app/components/pages/settings/settings-tab/settings-tab.container.js
+++ b/ui/app/components/pages/settings/settings-tab/settings-tab.container.js
@@ -16,7 +16,7 @@ import {
 import { preferencesSelector } from '../../../../selectors'
 
 const mapStateToProps = state => {
-  const { appState: { warning }, metamask } = state
+  const { appState: { warning }, dekusan } = state
   const {
     currentCurrency,
     conversionDate,
@@ -29,7 +29,7 @@ const mapStateToProps = state => {
     provider = {},
     isMascara,
     currentLocale,
-  } = metamask
+  } = dekusan
   const { useNativeCurrencyAsPrimaryCurrency } = preferencesSelector(state)
 
   return {
diff --git a/ui/app/components/pages/unlock-page/unlock-page.container.js b/ui/app/components/pages/unlock-page/unlock-page.container.js
index 18fed9b2..874545eb 100644
--- a/ui/app/components/pages/unlock-page/unlock-page.container.js
+++ b/ui/app/components/pages/unlock-page/unlock-page.container.js
@@ -11,7 +11,7 @@ const {
 import UnlockPage from './unlock-page.component'
 
 const mapStateToProps = state => {
-  const { metamask: { isUnlocked } } = state
+  const { dekusan: { isUnlocked } } = state
   return {
     isUnlocked,
   }
diff --git a/ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.selectors.js b/ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.selectors.js
index 69fec199..d250e23e 100644
--- a/ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.selectors.js
+++ b/ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.selectors.js
@@ -5,5 +5,5 @@ const selectors = {
 module.exports = selectors
 
 function getMaxModeOn (state) {
-  return state.metamask.send.maxModeOn
+  return state.dekusan.send.maxModeOn
 }
diff --git a/ui/app/components/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-selectors.test.js b/ui/app/components/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-selectors.test.js
index 655fe196..c4923a70 100644
--- a/ui/app/components/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-selectors.test.js
+++ b/ui/app/components/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-selectors.test.js
@@ -8,7 +8,7 @@ describe('amount-max-button selectors', () => {
   describe('getMaxModeOn()', () => {
     it('should', () => {
       const state = {
-        metamask: {
+        dekusan: {
           send: {
             maxModeOn: null,
           },
diff --git a/ui/app/components/send/send-content/send-hex-data-row/send-hex-data-row.container.js b/ui/app/components/send/send-content/send-hex-data-row/send-hex-data-row.container.js
index df554ca5..c2c9cff7 100644
--- a/ui/app/components/send/send-content/send-hex-data-row/send-hex-data-row.container.js
+++ b/ui/app/components/send/send-content/send-hex-data-row/send-hex-data-row.container.js
@@ -8,7 +8,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(SendHexDataRow)
 
 function mapStateToProps (state) {
   return {
-    data: state.metamask.send.data,
+    data: state.dekusan.send.data,
   }
 }
 
diff --git a/ui/app/components/send/send.selectors.js b/ui/app/components/send/send.selectors.js
index 443c82af..175ada9b 100644
--- a/ui/app/components/send/send.selectors.js
+++ b/ui/app/components/send/send.selectors.js
@@ -62,7 +62,7 @@ module.exports = selectors
 
 function accountsWithSendEtherInfoSelector (state) {
   const accounts = getMetaMaskAccounts(state)
-  const { identities } = state.metamask
+  const { identities } = state.dekusan
 
   const accountsWithSendEtherInfo = Object.entries(accounts).map(([key, account]) => {
     return Object.assign({}, account, identities[key])
@@ -83,13 +83,13 @@ function accountsWithSendEtherInfoSelector (state) {
 //   const userPassesThreshold = (numberOfTransactions > autoAddTransactionThreshold) &&
 //     (numberOfAccounts > autoAddAccountsThreshold) &&
 //     (numberOfTokensAdded > autoAddTokensThreshold)
-//   const userIsNotInBeta = !state.metamask.featureFlags.betaUI
+//   const userIsNotInBeta = !state.dekusan.featureFlags.betaUI
 
 //   return userIsNotInBeta && userPassesThreshold
 // }
 
 function getAddressBook (state) {
-  return state.metamask.addressBook
+  return state.dekusan.addressBook
 }
 
 function getAmountConversionRate (state) {
@@ -99,11 +99,11 @@ function getAmountConversionRate (state) {
 }
 
 function getBlockGasLimit (state) {
-  return state.metamask.currentBlockGasLimit
+  return state.dekusan.currentBlockGasLimit
 }
 
 function getConversionRate (state) {
-  return state.metamask.conversionRate
+  return state.dekusan.conversionRate
 }
 
 function getCurrentAccountWithSendEtherInfo (state) {
@@ -114,7 +114,7 @@ function getCurrentAccountWithSendEtherInfo (state) {
 }
 
 function getCurrentCurrency (state) {
-  return state.metamask.currentCurrency
+  return state.dekusan.currentCurrency
 }
 
 function getNativeCurrency (state) {
@@ -122,7 +122,7 @@ function getNativeCurrency (state) {
 }
 
 function getCurrentNetwork (state) {
-  return state.metamask.network
+  return state.dekusan.network
 }
 
 function getCurrentViewContext (state) {
@@ -131,19 +131,19 @@ function getCurrentViewContext (state) {
 }
 
 function getForceGasMin (state) {
-  return state.metamask.send.forceGasMin
+  return state.dekusan.send.forceGasMin
 }
 
 function getGasLimit (state) {
-  return state.metamask.send.gasLimit || '0'
+  return state.dekusan.send.gasLimit || '0'
 }
 
 function getGasPrice (state) {
-  return state.metamask.send.gasPrice || getFastPriceEstimateInHexWEI(state)
+  return state.dekusan.send.gasPrice || getFastPriceEstimateInHexWEI(state)
 }
 
 function getGasPriceFromRecentBlocks (state) {
-  return estimateGasPriceFromRecentBlocks(state.metamask.recentBlocks)
+  return estimateGasPriceFromRecentBlocks(state.dekusan.recentBlocks)
 }
 
 function getGasTotal (state) {
@@ -156,7 +156,7 @@ function getPrimaryCurrency (state) {
 }
 
 function getRecentBlocks (state) {
-  return state.metamask.recentBlocks
+  return state.dekusan.recentBlocks
 }
 
 function getSelectedAccount (state) {
@@ -167,23 +167,23 @@ function getSelectedAccount (state) {
 }
 
 function getSelectedAddress (state) {
-  const selectedAddress = state.metamask.selectedAddress || Object.keys(getMetaMaskAccounts(state))[0]
+  const selectedAddress = state.dekusan.selectedAddress || Object.keys(getMetaMaskAccounts(state))[0]
 
   return selectedAddress
 }
 
 function getSelectedIdentity (state) {
   const selectedAddress = getSelectedAddress(state)
-  const identities = state.metamask.identities
+  const identities = state.dekusan.identities
 
   return identities[selectedAddress]
 }
 
 function getSelectedToken (state) {
-  const tokens = state.metamask.tokens || []
-  const selectedTokenAddress = state.metamask.selectedTokenAddress
+  const tokens = state.dekusan.tokens || []
+  const selectedTokenAddress = state.dekusan.selectedTokenAddress
   const selectedToken = tokens.filter(({ address }) => address === selectedTokenAddress)[0]
-  const sendToken = state.metamask.send.token
+  const sendToken = state.dekusan.send.token
 
   return selectedToken || sendToken || null
 }
@@ -197,7 +197,7 @@ function getSelectedTokenContract (state) {
 }
 
 function getSelectedTokenExchangeRate (state) {
-  const tokenExchangeRates = state.metamask.tokenExchangeRates
+  const tokenExchangeRates = state.dekusan.tokenExchangeRates
   const selectedToken = getSelectedToken(state) || {}
   const { symbol = '' } = selectedToken
   const pair = `${symbol.toLowerCase()}_eth`
@@ -220,19 +220,19 @@ function getSelectedTokenToFiatRate (state) {
 }
 
 function getSendAmount (state) {
-  return state.metamask.send.amount
+  return state.dekusan.send.amount
 }
 
 function getSendHexData (state) {
-  return state.metamask.send.data
+  return state.dekusan.send.data
 }
 
 function getSendHexDataFeatureFlagState (state) {
-  return state.metamask.featureFlags.sendHexData
+  return state.dekusan.featureFlags.sendHexData
 }
 
 function getSendEditingTransactionId (state) {
-  return state.metamask.send.editingTransactionId
+  return state.dekusan.send.editingTransactionId
 }
 
 function getSendErrors (state) {
@@ -240,7 +240,7 @@ function getSendErrors (state) {
 }
 
 function getSendFrom (state) {
-  return state.metamask.send.from
+  return state.dekusan.send.from
 }
 
 function getSendFromBalance (state) {
@@ -253,11 +253,11 @@ function getSendFromObject (state) {
 }
 
 function getSendMaxModeState (state) {
-  return state.metamask.send.maxModeOn
+  return state.dekusan.send.maxModeOn
 }
 
 function getSendTo (state) {
-  return state.metamask.send.to
+  return state.dekusan.send.to
 }
 
 function getSendToAccounts (state) {
@@ -269,26 +269,26 @@ function getSendToAccounts (state) {
 }
 
 function getTokenBalance (state) {
-  return state.metamask.send.tokenBalance
+  return state.dekusan.send.tokenBalance
 }
 
 function getTokenExchangeRate (state, tokenSymbol) {
   const pair = `${tokenSymbol.toLowerCase()}_eth`
-  const tokenExchangeRates = state.metamask.tokenExchangeRates
+  const tokenExchangeRates = state.dekusan.tokenExchangeRates
   const { rate: tokenExchangeRate = 0 } = tokenExchangeRates[pair] || {}
 
   return tokenExchangeRate
 }
 
 function getUnapprovedTxs (state) {
-  return state.metamask.unapprovedTxs
+  return state.dekusan.unapprovedTxs
 }
 
 function transactionsSelector (state) {
-  const { network, selectedTokenAddress } = state.metamask
-  const unapprovedMsgs = valuesFor(state.metamask.unapprovedMsgs)
-  const shapeShiftTxList = (network === '1') ? state.metamask.shapeShiftTxList : undefined
-  const transactions = state.metamask.selectedAddressTxList || []
+  const { network, selectedTokenAddress } = state.dekusan
+  const unapprovedMsgs = valuesFor(state.dekusan.unapprovedMsgs)
+  const shapeShiftTxList = (network === '1') ? state.dekusan.shapeShiftTxList : undefined
+  const transactions = state.dekusan.selectedAddressTxList || []
   const txsToRender = !shapeShiftTxList ? transactions.concat(unapprovedMsgs) : transactions.concat(unapprovedMsgs, shapeShiftTxList)
 
   return selectedTokenAddress
diff --git a/ui/app/components/send/tests/send-selectors-test-data.js b/ui/app/components/send/tests/send-selectors-test-data.js
index 09cadfd0..79489bf9 100644
--- a/ui/app/components/send/tests/send-selectors-test-data.js
+++ b/ui/app/components/send/tests/send-selectors-test-data.js
@@ -1,9 +1,9 @@
 module.exports = {
-  'metamask': {
+  'dekusan': {
     'isInitialized': true,
     'isUnlocked': true,
     'featureFlags': {'betaUI': true, 'sendHexData': true},
-    'rpcTarget': 'https://rawtestrpc.metamask.io/',
+    'rpcTarget': 'https://api-testnet.dexon.org/v1/network/rpc/',
     'identities': {
       '0xfdea65c8e26263f6d9a1b5de9555d2931a33b825': {
         'address': '0xfdea65c8e26263f6d9a1b5de9555d2931a33b825',
@@ -182,13 +182,13 @@ module.exports = {
         'time': 1487363153561,
         'status': 'unapproved',
         'gasMultiplier': 1,
-        'metamaskNetworkId': '3',
+        'dekusanNetworkId': '3',
         'txParams': {
           'from': '0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb',
           'to': '0x18a3462427bcc9133bb46e88bcbe39cd7ef0e761',
           'value': '0xde0b6b3a7640000',
           'metamaskId': 4768706228115573,
-          'metamaskNetworkId': '3',
+          'dekusanNetworkId': '3',
           'gas': '0x5209',
         },
         'gasLimitSpecified': false,
diff --git a/ui/app/components/send/tests/send-selectors.test.js b/ui/app/components/send/tests/send-selectors.test.js
index cdc86fe5..6c2104ab 100644
--- a/ui/app/components/send/tests/send-selectors.test.js
+++ b/ui/app/components/send/tests/send-selectors.test.js
@@ -128,7 +128,7 @@ describe('send selectors', () => {
 
     it('should return the eth conversion rate if no token is selected', () => {
       const editedMockState = {
-        metamask: Object.assign({}, mockState.metamask, { selectedTokenAddress: null }),
+        dekusan: Object.assign({}, mockstate.dekusan, { selectedTokenAddress: null }),
       }
       assert.equal(
         getAmountConversionRate(editedMockState),
@@ -314,7 +314,7 @@ describe('send selectors', () => {
         symbol: 'JKL',
       }
       const editedMockState = {
-        metamask: Object.assign({}, mockState.metamask, {
+        dekusan: Object.assign({}, mockstate.dekusan, {
           selectedTokenAddress: null,
           send: {
             token: mockSendToken,
@@ -337,9 +337,9 @@ describe('send selectors', () => {
     })
 
     it('should return null if no token is selected', () => {
-      const modifiedMetamaskState = Object.assign({}, mockState.metamask, { selectedTokenAddress: false })
+      const modifiedMetamaskState = Object.assign({}, mockstate.dekusan, { selectedTokenAddress: false })
       assert.equal(
-        getSelectedTokenContract(Object.assign({}, mockState, { metamask: modifiedMetamaskState })),
+        getSelectedTokenContract(Object.assign({}, mockState, { dekusan: modifiedMetamaskState })),
         null
       )
     })
@@ -421,7 +421,7 @@ describe('send selectors', () => {
 
     it('should get the selected account balance if the send.from does not exist', () => {
       const editedMockState = {
-        metamask: Object.assign({}, mockState.metamask, {
+        dekusan: Object.assign({}, mockstate.dekusan, {
           send: {
             from: null,
           },
@@ -447,7 +447,7 @@ describe('send selectors', () => {
 
     it('should return the current account with send ether info if send.from does not exist', () => {
       const editedMockState = {
-        metamask: Object.assign({}, mockState.metamask, {
+        dekusan: Object.assign({}, mockstate.dekusan, {
           send: {
             from: null,
           },
@@ -554,13 +554,13 @@ describe('send selectors', () => {
             time: 1487363153561,
             status: 'unapproved',
             gasMultiplier: 1,
-            metamaskNetworkId: '3',
+            dekusanNetworkId: '3',
             txParams: {
               from: '0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb',
               to: '0x18a3462427bcc9133bb46e88bcbe39cd7ef0e761',
               value: '0xde0b6b3a7640000',
               metamaskId: 4768706228115573,
-              metamaskNetworkId: '3',
+              dekusanNetworkId: '3',
               gas: '0x5209',
             },
             gasLimitSpecified: false,
@@ -599,8 +599,8 @@ describe('send selectors', () => {
     })
 
     it('should return all transactions if no token is selected', () => {
-      const modifiedMetamaskState = Object.assign({}, mockState.metamask, { selectedTokenAddress: false })
-      const modifiedState = Object.assign({}, mockState, { metamask: modifiedMetamaskState })
+      const modifiedMetamaskState = Object.assign({}, mockstate.dekusan, { selectedTokenAddress: false })
+      const modifiedState = Object.assign({}, mockState, { dekusan: modifiedMetamaskState })
       assert.deepEqual(
         transactionsSelector(modifiedState),
         [
@@ -649,8 +649,8 @@ describe('send selectors', () => {
     })
 
     it('should return shapeshift transactions if current network is 1', () => {
-      const modifiedMetamaskState = Object.assign({}, mockState.metamask, { selectedTokenAddress: false, network: '1' })
-      const modifiedState = Object.assign({}, mockState, { metamask: modifiedMetamaskState })
+      const modifiedMetamaskState = Object.assign({}, mockstate.dekusan, { selectedTokenAddress: false, network: '1' })
+      const modifiedState = Object.assign({}, mockState, { dekusan: modifiedMetamaskState })
       assert.deepEqual(
         transactionsSelector(modifiedState),
         [
diff --git a/ui/app/components/shapeshift-form.js b/ui/app/components/shapeshift-form.js
index 14513959..ab04d98a 100644
--- a/ui/app/components/shapeshift-form.js
+++ b/ui/app/components/shapeshift-form.js
@@ -16,7 +16,7 @@ function mapStateToProps (state) {
     coinOptions,
     tokenExchangeRates,
     selectedAddress,
-  } = state.metamask
+  } = state.dekusan
   const { warning } = state.appState
 
   return {
diff --git a/ui/app/components/shift-list-item.js b/ui/app/components/shift-list-item.js
index c0bffb82..2c05504c 100644
--- a/ui/app/components/shift-list-item.js
+++ b/ui/app/components/shift-list-item.js
@@ -22,9 +22,9 @@ module.exports = connect(mapStateToProps)(ShiftListItem)
 
 function mapStateToProps (state) {
   return {
-    selectedAddress: state.metamask.selectedAddress,
-    conversionRate: state.metamask.conversionRate,
-    currentCurrency: state.metamask.currentCurrency,
+    selectedAddress: state.dekusan.selectedAddress,
+    conversionRate: state.dekusan.conversionRate,
+    currentCurrency: state.dekusan.currentCurrency,
   }
 }
 
diff --git a/ui/app/components/token-cell.js b/ui/app/components/token-cell.js
index aad9e471..b044d95c 100644
--- a/ui/app/components/token-cell.js
+++ b/ui/app/components/token-cell.js
@@ -12,12 +12,12 @@ const TokenMenuDropdown = require('./dropdowns/token-menu-dropdown.js')
 
 function mapStateToProps (state) {
   return {
-    network: state.metamask.network,
-    currentCurrency: state.metamask.currentCurrency,
-    selectedTokenAddress: state.metamask.selectedTokenAddress,
+    network: state.dekusan.network,
+    currentCurrency: state.dekusan.currentCurrency,
+    selectedTokenAddress: state.dekusan.selectedTokenAddress,
     userAddress: selectors.getSelectedAddress(state),
-    contractExchangeRates: state.metamask.contractExchangeRates,
-    conversionRate: state.metamask.conversionRate,
+    contractExchangeRates: state.dekusan.contractExchangeRates,
+    conversionRate: state.dekusan.conversionRate,
     sidebarOpen: state.appState.sidebar.isOpen,
   }
 }
diff --git a/ui/app/components/token-input/tests/token-input.component.test.js b/ui/app/components/token-input/tests/token-input.component.test.js
index 2dacb9bc..03ad5376 100644
--- a/ui/app/components/token-input/tests/token-input.component.test.js
+++ b/ui/app/components/token-input/tests/token-input.component.test.js
@@ -25,7 +25,7 @@ describe('TokenInput Component', () => {
 
     it('should render properly with a token', () => {
       const mockStore = {
-        metamask: {
+        dekusan: {
           currentCurrency: 'usd',
           conversionRate: 231.06,
         },
@@ -59,7 +59,7 @@ describe('TokenInput Component', () => {
 
     it('should render properly with a token and selectedTokenExchangeRate', () => {
       const mockStore = {
-        metamask: {
+        dekusan: {
           currentCurrency: 'usd',
           conversionRate: 231.06,
         },
@@ -93,7 +93,7 @@ describe('TokenInput Component', () => {
 
     it('should render properly with a token value for ETH', () => {
       const mockStore = {
-        metamask: {
+        dekusan: {
           currentCurrency: 'usd',
           conversionRate: 231.06,
         },
@@ -127,7 +127,7 @@ describe('TokenInput Component', () => {
 
     it('should render properly with a token value for fiat', () => {
       const mockStore = {
-        metamask: {
+        dekusan: {
           currentCurrency: 'usd',
           conversionRate: 231.06,
         },
@@ -172,7 +172,7 @@ describe('TokenInput Component', () => {
 
     it('should call onChange and onBlur on input changes with the hex value for ETH', () => {
       const mockStore = {
-        metamask: {
+        dekusan: {
           currentCurrency: 'usd',
           conversionRate: 231.06,
         },
@@ -220,7 +220,7 @@ describe('TokenInput Component', () => {
 
     it('should call onChange and onBlur on input changes with the hex value for fiat', () => {
       const mockStore = {
-        metamask: {
+        dekusan: {
           currentCurrency: 'usd',
           conversionRate: 231.06,
         },
@@ -269,7 +269,7 @@ describe('TokenInput Component', () => {
 
     it('should change the state and pass in a new decimalValue when props.value changes', () => {
       const mockStore = {
-        metamask: {
+        dekusan: {
           currentCurrency: 'usd',
           conversionRate: 231.06,
         },
diff --git a/ui/app/components/token-input/tests/token-input.container.test.js b/ui/app/components/token-input/tests/token-input.container.test.js
index d73bc9a9..6621556e 100644
--- a/ui/app/components/token-input/tests/token-input.container.test.js
+++ b/ui/app/components/token-input/tests/token-input.container.test.js
@@ -17,7 +17,7 @@ describe('TokenInput container', () => {
   describe('mapStateToProps()', () => {
     it('should return the correct props when send is empty', () => {
       const mockState = {
-        metamask: {
+        dekusan: {
           currentCurrency: 'usd',
           tokens: [
             {
@@ -45,7 +45,7 @@ describe('TokenInput container', () => {
 
     it('should return the correct props when selectedTokenAddress is not found and send is populated', () => {
       const mockState = {
-        metamask: {
+        dekusan: {
           currentCurrency: 'usd',
           tokens: [
             {
@@ -73,7 +73,7 @@ describe('TokenInput container', () => {
 
     it('should return the correct props when contractExchangeRates is populated', () => {
       const mockState = {
-        metamask: {
+        dekusan: {
           currentCurrency: 'usd',
           tokens: [
             {
diff --git a/ui/app/components/token-input/token-input.container.js b/ui/app/components/token-input/token-input.container.js
index ec233b1b..91ba1c5f 100644
--- a/ui/app/components/token-input/token-input.container.js
+++ b/ui/app/components/token-input/token-input.container.js
@@ -3,7 +3,7 @@ import TokenInput from './token-input.component'
 import { getSelectedToken, getSelectedTokenExchangeRate } from '../../selectors'
 
 const mapStateToProps = state => {
-  const { metamask: { currentCurrency } } = state
+  const { dekusan: { currentCurrency } } = state
 
   return {
     currentCurrency,
diff --git a/ui/app/components/token-list.js b/ui/app/components/token-list.js
index 6a88f30b..87cb698e 100644
--- a/ui/app/components/token-list.js
+++ b/ui/app/components/token-list.js
@@ -10,10 +10,10 @@ const log = require('loglevel')
 
 function mapStateToProps (state) {
   return {
-    network: state.metamask.network,
-    tokens: state.metamask.tokens,
+    network: state.dekusan.network,
+    tokens: state.dekusan.tokens,
     userAddress: selectors.getSelectedAddress(state),
-    assetImages: state.metamask.assetImages,
+    assetImages: state.dekusan.assetImages,
   }
 }
 
diff --git a/ui/app/components/transaction-activity-log/tests/transaction-activity-log.container.test.js b/ui/app/components/transaction-activity-log/tests/transaction-activity-log.container.test.js
index a7c35f51..0d6bb4fa 100644
--- a/ui/app/components/transaction-activity-log/tests/transaction-activity-log.container.test.js
+++ b/ui/app/components/transaction-activity-log/tests/transaction-activity-log.container.test.js
@@ -16,7 +16,7 @@ describe('TransactionActivityLog container', () => {
   describe('mapStateToProps()', () => {
     it('should return the correct props', () => {
       const mockState = {
-        metamask: {
+        dekusan: {
           conversionRate: 280.45,
           nativeCurrency: 'ETH',
         },
diff --git a/ui/app/components/transaction-activity-log/tests/transaction-activity-log.util.test.js b/ui/app/components/transaction-activity-log/tests/transaction-activity-log.util.test.js
index aa2e2d4a..a30be0b4 100644
--- a/ui/app/components/transaction-activity-log/tests/transaction-activity-log.util.test.js
+++ b/ui/app/components/transaction-activity-log/tests/transaction-activity-log.util.test.js
@@ -151,7 +151,7 @@ describe('getActivities', () => {
         {
           id: 5559712943815343,
           loadingDefaults: true,
-          metamaskNetworkId: '3',
+          dekusanNetworkId: '3',
           status: 'unapproved',
           time: 1535507561452,
           txParams: {
diff --git a/ui/app/components/transaction-list-item-details/transaction-list-item-details.component.js b/ui/app/components/transaction-list-item-details/transaction-list-item-details.component.js
index 95a86519..69db3f9f 100644
--- a/ui/app/components/transaction-list-item-details/transaction-list-item-details.component.js
+++ b/ui/app/components/transaction-list-item-details/transaction-list-item-details.component.js
@@ -23,9 +23,9 @@ export default class TransactionListItemDetails extends PureComponent {
 
   handleEtherscanClick = () => {
     const { transactionGroup: { primaryTransaction } } = this.props
-    const { hash, metamaskNetworkId } = primaryTransaction
+    const { hash, dekusanNetworkId } = primaryTransaction
 
-    const prefix = prefixForNetwork(metamaskNetworkId)
+    const prefix = prefixForNetwork(dekusanNetworkId)
     const etherscanUrl = `https://${prefix}dexscan.org/transaction/${hash}`
     global.platform.openWindow({ url: etherscanUrl })
   }
diff --git a/ui/app/components/transaction-view-balance/transaction-view-balance.container.js b/ui/app/components/transaction-view-balance/transaction-view-balance.container.js
index f9f05b0a..da5d51b5 100644
--- a/ui/app/components/transaction-view-balance/transaction-view-balance.container.js
+++ b/ui/app/components/transaction-view-balance/transaction-view-balance.container.js
@@ -13,7 +13,7 @@ import { showModal } from '../../actions'
 
 const mapStateToProps = state => {
   const selectedAddress = getSelectedAddress(state)
-  const { metamask: { network } } = state
+  const { dekusan: { network } } = state
   const accounts = getMetaMaskAccounts(state)
   const account = accounts[selectedAddress]
   const { balance } = account
diff --git a/ui/app/components/user-preferenced-currency-display/tests/user-preferenced-currency-display.container.test.js b/ui/app/components/user-preferenced-currency-display/tests/user-preferenced-currency-display.container.test.js
index 2232e825..deb055fe 100644
--- a/ui/app/components/user-preferenced-currency-display/tests/user-preferenced-currency-display.container.test.js
+++ b/ui/app/components/user-preferenced-currency-display/tests/user-preferenced-currency-display.container.test.js
@@ -17,8 +17,7 @@ describe('UserPreferencedCurrencyDisplay container', () => {
   describe('mapStateToProps()', () => {
     it('should return the correct props', () => {
       const mockState = {
-        metamask: {
-          nativeCurrency: 'ETH',
+        dekusan: {
           preferences: {
             useNativeCurrencyAsPrimaryCurrency: true,
           },
diff --git a/ui/app/components/user-preferenced-currency-input/tests/user-preferenced-currency-input.container.test.js b/ui/app/components/user-preferenced-currency-input/tests/user-preferenced-currency-input.container.test.js
index 95972644..38a85932 100644
--- a/ui/app/components/user-preferenced-currency-input/tests/user-preferenced-currency-input.container.test.js
+++ b/ui/app/components/user-preferenced-currency-input/tests/user-preferenced-currency-input.container.test.js
@@ -16,7 +16,7 @@ describe('UserPreferencedCurrencyInput container', () => {
   describe('mapStateToProps()', () => {
     it('should return the correct props', () => {
       const mockState = {
-        metamask: {
+        dekusan: {
           preferences: {
             useNativeCurrencyAsPrimaryCurrency: true,
           },
diff --git a/ui/app/components/user-preferenced-token-input/tests/user-preferenced-token-input.container.test.js b/ui/app/components/user-preferenced-token-input/tests/user-preferenced-token-input.container.test.js
index 2f89fba9..86309afe 100644
--- a/ui/app/components/user-preferenced-token-input/tests/user-preferenced-token-input.container.test.js
+++ b/ui/app/components/user-preferenced-token-input/tests/user-preferenced-token-input.container.test.js
@@ -16,7 +16,7 @@ describe('UserPreferencedTokenInput container', () => {
   describe('mapStateToProps()', () => {
     it('should return the correct props', () => {
       const mockState = {
-        metamask: {
+        dekusan: {
           preferences: {
             useNativeCurrencyAsPrimaryCurrency: true,
           },
diff --git a/ui/app/components/wallet-view.js b/ui/app/components/wallet-view.js
index 8ad6637a..404d733e 100644
--- a/ui/app/components/wallet-view.js
+++ b/ui/app/components/wallet-view.js
@@ -35,15 +35,22 @@ WalletView.defaultProps = {
 function mapStateToProps (state) {
 
   return {
-    network: state.metamask.network,
+    network: state.dekusan.network,
     sidebarOpen: state.appState.sidebar.isOpen,
+<<<<<<< HEAD
     identities: state.metamask.identities,
     accounts: selectors.getMetaMaskAccounts(state),
     tokens: state.metamask.tokens,
     keyrings: state.metamask.keyrings,
+=======
+    identities: state.dekusan.identities,
+    accounts: state.dekusan.accounts,
+    tokens: state.dekusan.tokens,
+    keyrings: state.dekusan.keyrings,
+>>>>>>> Fix UI bugs
     selectedAddress: selectors.getSelectedAddress(state),
     selectedAccount: selectors.getSelectedAccount(state),
-    selectedTokenAddress: state.metamask.selectedTokenAddress,
+    selectedTokenAddress: state.dekusan.selectedTokenAddress,
   }
 }
 
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index 34f5466e..2da25fe7 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -20,34 +20,34 @@ module.exports = compose(
 )(ConfirmTxScreen)
 
 function mapStateToProps (state) {
-  const { metamask } = state
+  const { dekusan } = state
   const {
     unapprovedMsgCount,
     unapprovedPersonalMsgCount,
     unapprovedTypedMessagesCount,
-  } = metamask
+  } = dekusan
 
   return {
-    identities: state.metamask.identities,
+    identities: state.dekusan.identities,
     accounts: getMetaMaskAccounts(state),
-    selectedAddress: state.metamask.selectedAddress,
-    unapprovedTxs: state.metamask.unapprovedTxs,
-    unapprovedMsgs: state.metamask.unapprovedMsgs,
-    unapprovedPersonalMsgs: state.metamask.unapprovedPersonalMsgs,
-    unapprovedTypedMessages: state.metamask.unapprovedTypedMessages,
+    selectedAddress: state.dekusan.selectedAddress,
+    unapprovedTxs: state.dekusan.unapprovedTxs,
+    unapprovedMsgs: state.dekusan.unapprovedMsgs,
+    unapprovedPersonalMsgs: state.dekusan.unapprovedPersonalMsgs,
+    unapprovedTypedMessages: state.dekusan.unapprovedTypedMessages,
     index: state.appState.currentView.context,
     warning: state.appState.warning,
-    network: state.metamask.network,
-    provider: state.metamask.provider,
-    conversionRate: state.metamask.conversionRate,
-    currentCurrency: state.metamask.currentCurrency,
-    blockGasLimit: state.metamask.currentBlockGasLimit,
-    computedBalances: state.metamask.computedBalances,
+    network: state.dekusan.network,
+    provider: state.dekusan.provider,
+    conversionRate: state.dekusan.conversionRate,
+    currentCurrency: state.dekusan.currentCurrency,
+    blockGasLimit: state.dekusan.currentBlockGasLimit,
+    computedBalances: state.dekusan.computedBalances,
     unapprovedMsgCount,
     unapprovedPersonalMsgCount,
     unapprovedTypedMessagesCount,
-    send: state.metamask.send,
-    selectedAddressTxList: state.metamask.selectedAddressTxList,
+    send: state.dekusan.send,
+    selectedAddressTxList: state.dekusan.selectedAddressTxList,
   }
 }
 
diff --git a/ui/app/conversion-util.js b/ui/app/conversion-util.js
index 948ac3a0..6e08b50d 100644
--- a/ui/app/conversion-util.js
+++ b/ui/app/conversion-util.js
@@ -46,8 +46,8 @@ const decToBigNumberViaString = n => R.pipe(String, toBigNumber['dec'])
 
 // Setter Maps
 const toBigNumber = {
-  hex: n => new BigNumber(stripHexPrefix(n), 16),
-  dec: n => new BigNumber(String(n), 10),
+  hex: n => new BigNumber(stripHexPrefix(n || '0x0'), 16),
+  dec: n => new BigNumber(String(n || 0), 10),
   BN: n => new BigNumber(n.toString(16), 16),
 }
 const toNormalizedDenomination = {
diff --git a/ui/app/css/itcss/components/new-account.scss b/ui/app/css/itcss/components/new-account.scss
index 334e01cd..74752d7d 100644
--- a/ui/app/css/itcss/components/new-account.scss
+++ b/ui/app/css/itcss/components/new-account.scss
@@ -4,6 +4,7 @@
   border: 2px solid $geyser;
   border-radius: 4px;
   z-index: 25;
+  overflow-y: auto;
 
   &__header {
     display: flex;
@@ -553,7 +554,7 @@
   display: flex;
   flex-flow: column;
   align-items: center;
-  padding: 30px;
+  padding: 30px 20px;
 
   &__input-label {
     color: $dim-gray;
diff --git a/ui/app/ducks/tests/confirm-transaction.duck.test.js b/ui/app/ducks/tests/confirm-transaction.duck.test.js
index eceacd0b..2a9f52ef 100644
--- a/ui/app/ducks/tests/confirm-transaction.duck.test.js
+++ b/ui/app/ducks/tests/confirm-transaction.duck.test.js
@@ -509,7 +509,7 @@ describe('Confirm Transaction Duck', () => {
 
     it('updates txData and gas on an existing transaction in confirmTransaction', () => {
       const mockState = {
-        metamask: {
+        dekusan: {
           conversionRate: 468.58,
           currentCurrency: 'usd',
         },
@@ -536,7 +536,7 @@ describe('Confirm Transaction Duck', () => {
             history: [],
             id: 2603411941761054,
             loadingDefaults: false,
-            metamaskNetworkId: '3',
+            dekusanNetworkId: '3',
             origin: 'faucet.metamask.io',
             simpleSend: true,
             status: 'unapproved',
@@ -570,7 +570,7 @@ describe('Confirm Transaction Duck', () => {
         history: [],
         id: 2603411941761054,
         loadingDefaults: false,
-        metamaskNetworkId: '3',
+        dekusanNetworkId: '3',
         origin: 'faucet.metamask.io',
         simpleSend: true,
         status: 'unapproved',
@@ -584,7 +584,7 @@ describe('Confirm Transaction Duck', () => {
         },
       }
       const mockState = {
-        metamask: {
+        dekusan: {
           conversionRate: 468.58,
           currentCurrency: 'usd',
         },
@@ -632,7 +632,7 @@ describe('Confirm Transaction Duck', () => {
 
     it('updates confirmTransaction transaction', done => {
       const mockState = {
-        metamask: {
+        dekusan: {
           conversionRate: 468.58,
           currentCurrency: 'usd',
           network: '3',
@@ -644,7 +644,7 @@ describe('Confirm Transaction Duck', () => {
               history: [],
               id: 2603411941761054,
               loadingDefaults: false,
-              metamaskNetworkId: '3',
+              dekusanNetworkId: '3',
               origin: 'faucet.metamask.io',
               simpleSend: true,
               status: 'unapproved',
diff --git a/ui/app/first-time/init-menu.js b/ui/app/first-time/init-menu.js
index f40d0bbf..d877d8dd 100644
--- a/ui/app/first-time/init-menu.js
+++ b/ui/app/first-time/init-menu.js
@@ -207,7 +207,7 @@ InitializeMenuScreen.contextTypes = {
 }
 
 const mapStateToProps = state => {
-  const { metamask: { isInitialized, isUnlocked } } = state
+  const { dekusan: { isInitialized, isUnlocked } } = state
 
   return {
     isInitialized,
diff --git a/ui/app/keychains/hd/create-vault-complete.js b/ui/app/keychains/hd/create-vault-complete.js
index d4481d9f..ba9bc69a 100644
--- a/ui/app/keychains/hd/create-vault-complete.js
+++ b/ui/app/keychains/hd/create-vault-complete.js
@@ -15,7 +15,7 @@ function CreateVaultCompleteScreen () {
 function mapStateToProps (state) {
   return {
     seed: state.appState.currentView.seedWords,
-    cachedSeed: state.metamask.seedWords,
+    cachedSeed: state.dekusan.seedWords,
   }
 }
 
diff --git a/ui/app/reducers.js b/ui/app/reducers.js
index ea5b3e97..57865c33 100644
--- a/ui/app/reducers.js
+++ b/ui/app/reducers.js
@@ -5,7 +5,7 @@ const copyToClipboard = require('copy-to-clipboard')
 //
 // Sub-Reducers take in the complete state and return their sub-state
 //
-const reduceMetamask = require('./reducers/metamask')
+const reduceDekusan = require('./reducers/dekusan')
 const reduceApp = require('./reducers/app')
 const reduceLocale = require('./reducers/locale')
 const reduceSend = require('./ducks/send.duck').default
@@ -28,7 +28,7 @@ function rootReducer (state, action) {
   // DekuSan
   //
 
-  state.metamask = reduceMetamask(state, action)
+  state.dekusan = reduceDekusan(state, action)
 
   //
   // AppState
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index ea25b869..297a3c94 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -9,7 +9,7 @@ module.exports = reduceApp
 function reduceApp (state, action) {
   log.debug('App Reducer got ' + action.type)
   // clone and defaults
-  const selectedAddress = state.metamask.selectedAddress
+  const selectedAddress = state.dekusan.selectedAddress
   const hasUnconfActions = checkUnconfActions(state)
   let name = 'accounts'
   if (selectedAddress) {
@@ -28,7 +28,7 @@ function reduceApp (state, action) {
   }
 
   // confirm seed words
-  var seedWords = state.metamask.seedWords
+  var seedWords = state.dekusan.seedWords
   var seedConfView = {
     name: 'createVaultComplete',
     seedWords,
@@ -492,7 +492,7 @@ function reduceApp (state, action) {
           warning: null,
           currentView: {
             name: 'accountDetail',
-            context: state.metamask.selectedAddress,
+            context: state.dekusan.selectedAddress,
           },
           accountDetail: {
             subview: 'transactions',
@@ -638,7 +638,7 @@ function reduceApp (state, action) {
           name: 'buyEth',
           context: appState.currentView.name,
         },
-        identity: state.metamask.identities[action.value],
+        identity: state.dekusan.identities[action.value],
         buyView: {
           subview: 'Coinbase',
           amount: '15.00',
@@ -657,7 +657,7 @@ function reduceApp (state, action) {
           name: 'onboardingBuyEth',
           context: appState.currentView.name,
         },
-        identity: state.metamask.identities[action.value],
+        identity: state.dekusan.identities[action.value],
       })
 
     case actions.COINBASE_SUBVIEW:
@@ -761,7 +761,7 @@ function checkUnconfActions (state) {
 
 function getUnconfActionList (state) {
   const { unapprovedTxs, unapprovedMsgs,
-    unapprovedPersonalMsgs, unapprovedTypedMessages, network } = state.metamask
+    unapprovedPersonalMsgs, unapprovedTypedMessages, network } = state.dekusan
 
   const unconfActionList = txHelper(unapprovedTxs, unapprovedMsgs, unapprovedPersonalMsgs, unapprovedTypedMessages, network)
   return unconfActionList
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/dekusan.js
index 06b3afdb..edfdaf39 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/dekusan.js
@@ -5,19 +5,19 @@ const { getEnvironmentType } = require('../../../app/scripts/lib/util')
 const { ENVIRONMENT_TYPE_POPUP } = require('../../../app/scripts/lib/enums')
 const { TESTNET } = require('../../../app/scripts/controllers/network/enums')
 
-module.exports = reduceMetamask
+module.exports = reduceDekusan
 
-function reduceMetamask (state, action) {
+function reduceDekusan (state, action) {
   let newState
 
   // clone + defaults
-  var metamaskState = extend({
+  var dekusanState = extend({
     isInitialized: false,
     isUnlocked: false,
     isAccountMenuOpen: false,
     isMascara: window.platform instanceof MetamascaraPlatform,
     isPopup: getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP,
-    rpcTarget: 'https://rawtestrpc.metamask.io/',
+    rpcTarget: 'https://api-testnet.dexon.org/v1/network/rpc/',
     identities: {},
     unapprovedTxs: {},
     noActiveNotices: true,
@@ -54,51 +54,51 @@ function reduceMetamask (state, action) {
     preferences: {
       useNativeCurrencyAsPrimaryCurrency: true,
     },
-  }, state.metamask)
+  }, state.dekusan)
 
   switch (action.type) {
 
     case actions.SHOW_ACCOUNTS_PAGE:
-      newState = extend(metamaskState, {
+      newState = extend(dekusanState, {
         isRevealingSeedWords: false,
       })
       delete newState.seedWords
       return newState
 
     case actions.SHOW_NOTICE:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         noActiveNotices: false,
         nextUnreadNotice: action.value,
       })
 
     case actions.CLEAR_NOTICES:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         noActiveNotices: true,
         nextUnreadNotice: undefined,
       })
 
     case actions.UPDATE_METAMASK_STATE:
-      return extend(metamaskState, action.value)
+      return extend(dekusanState, action.value)
 
     case actions.UNLOCK_METAMASK:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         isUnlocked: true,
         isInitialized: true,
         selectedAddress: action.value,
       })
 
     case actions.LOCK_METAMASK:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         isUnlocked: false,
       })
 
     case actions.SET_RPC_LIST:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         frequentRpcList: action.value,
       })
 
     case actions.SET_RPC_TARGET:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         provider: {
           type: 'rpc',
           rpcTarget: action.value,
@@ -106,7 +106,7 @@ function reduceMetamask (state, action) {
       })
 
     case actions.SET_PROVIDER_TYPE:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         provider: {
           type: action.value,
         },
@@ -114,39 +114,39 @@ function reduceMetamask (state, action) {
 
     case actions.COMPLETED_TX:
       var stringId = String(action.id)
-      newState = extend(metamaskState, {
+      newState = extend(dekusanState, {
         unapprovedTxs: {},
         unapprovedMsgs: {},
       })
-      for (const id in metamaskState.unapprovedTxs) {
+      for (const id in dekusanState.unapprovedTxs) {
         if (id !== stringId) {
-          newState.unapprovedTxs[id] = metamaskState.unapprovedTxs[id]
+          newState.unapprovedTxs[id] = dekusanState.unapprovedTxs[id]
         }
       }
-      for (const id in metamaskState.unapprovedMsgs) {
+      for (const id in dekusanState.unapprovedMsgs) {
         if (id !== stringId) {
-          newState.unapprovedMsgs[id] = metamaskState.unapprovedMsgs[id]
+          newState.unapprovedMsgs[id] = dekusanState.unapprovedMsgs[id]
         }
       }
       return newState
 
     case actions.EDIT_TX:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         send: {
-          ...metamaskState.send,
+          ...dekusanState.send,
           editingTransactionId: action.value,
         },
       })
 
 
     case actions.SHOW_NEW_VAULT_SEED:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         isRevealingSeedWords: true,
         seedWords: action.value,
       })
 
     case actions.CLEAR_SEED_WORD_CACHE:
-      newState = extend(metamaskState, {
+      newState = extend(dekusanState, {
         isUnlocked: true,
         isInitialized: true,
         selectedAddress: action.value,
@@ -155,7 +155,7 @@ function reduceMetamask (state, action) {
       return newState
 
     case actions.SHOW_ACCOUNT_DETAIL:
-      newState = extend(metamaskState, {
+      newState = extend(dekusanState, {
         isUnlocked: true,
         isInitialized: true,
         selectedAddress: action.value,
@@ -164,7 +164,7 @@ function reduceMetamask (state, action) {
       return newState
 
     case actions.SET_SELECTED_TOKEN:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         selectedTokenAddress: action.value,
       })
 
@@ -172,119 +172,119 @@ function reduceMetamask (state, action) {
       const account = action.value.account
       const name = action.value.label
       const id = {}
-      id[account] = extend(metamaskState.identities[account], { name })
-      const identities = extend(metamaskState.identities, id)
-      return extend(metamaskState, { identities })
+      id[account] = extend(dekusanState.identities[account], { name })
+      const identities = extend(dekusanState.identities, id)
+      return extend(dekusanState, { identities })
 
     case actions.SET_CURRENT_FIAT:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         currentCurrency: action.value.currentCurrency,
         conversionRate: action.value.conversionRate,
         conversionDate: action.value.conversionDate,
       })
 
     case actions.UPDATE_TOKENS:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         tokens: action.newTokens,
       })
 
     // metamask.send
     case actions.UPDATE_GAS_LIMIT:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         send: {
-          ...metamaskState.send,
+          ...dekusanState.send,
           gasLimit: action.value,
         },
       })
 
     case actions.UPDATE_GAS_PRICE:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         send: {
-          ...metamaskState.send,
+          ...dekusanState.send,
           gasPrice: action.value,
         },
       })
 
     case actions.TOGGLE_ACCOUNT_MENU:
-      return extend(metamaskState, {
-        isAccountMenuOpen: !metamaskState.isAccountMenuOpen,
+      return extend(dekusanState, {
+        isAccountMenuOpen: !dekusanState.isAccountMenuOpen,
       })
 
     case actions.UPDATE_GAS_TOTAL:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         send: {
-          ...metamaskState.send,
+          ...dekusanState.send,
           gasTotal: action.value,
         },
       })
 
     case actions.UPDATE_SEND_TOKEN_BALANCE:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         send: {
-          ...metamaskState.send,
+          ...dekusanState.send,
           tokenBalance: action.value,
         },
       })
 
     case actions.UPDATE_SEND_HEX_DATA:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         send: {
-          ...metamaskState.send,
+          ...dekusanState.send,
           data: action.value,
         },
       })
 
     case actions.UPDATE_SEND_FROM:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         send: {
-          ...metamaskState.send,
+          ...dekusanState.send,
           from: action.value,
         },
       })
 
     case actions.UPDATE_SEND_TO:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         send: {
-          ...metamaskState.send,
+          ...dekusanState.send,
           to: action.value.to,
           toNickname: action.value.nickname,
         },
       })
 
     case actions.UPDATE_SEND_AMOUNT:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         send: {
-          ...metamaskState.send,
+          ...dekusanState.send,
           amount: action.value,
         },
       })
 
     case actions.UPDATE_SEND_MEMO:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         send: {
-          ...metamaskState.send,
+          ...dekusanState.send,
           memo: action.value,
         },
       })
 
     case actions.UPDATE_MAX_MODE:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         send: {
-          ...metamaskState.send,
+          ...dekusanState.send,
           maxModeOn: action.value,
         },
       })
 
     case actions.UPDATE_SEND:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         send: {
-          ...metamaskState.send,
+          ...dekusanState.send,
           ...action.value,
         },
       })
 
     case actions.CLEAR_SEND:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         send: {
           gasLimit: null,
           gasPrice: null,
@@ -304,7 +304,7 @@ function reduceMetamask (state, action) {
 
     case actions.UPDATE_TRANSACTION_PARAMS:
       const { id: txId, value } = action
-      let { selectedAddressTxList } = metamaskState
+      let { selectedAddressTxList } = dekusanState
       selectedAddressTxList = selectedAddressTxList.map(tx => {
         if (tx.id === txId) {
           tx.txParams = value
@@ -312,73 +312,73 @@ function reduceMetamask (state, action) {
         return tx
       })
 
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         selectedAddressTxList,
       })
 
     case actions.PAIR_UPDATE:
       const { value: { marketinfo: pairMarketInfo } } = action
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         tokenExchangeRates: {
-          ...metamaskState.tokenExchangeRates,
+          ...dekusanState.tokenExchangeRates,
           [pairMarketInfo.pair]: pairMarketInfo,
         },
       })
 
     case actions.SHAPESHIFT_SUBVIEW:
       const { value: { marketinfo: ssMarketInfo, coinOptions } } = action
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         tokenExchangeRates: {
-          ...metamaskState.tokenExchangeRates,
+          ...dekusanState.tokenExchangeRates,
           [ssMarketInfo.pair]: ssMarketInfo,
         },
         coinOptions,
       })
 
     case actions.SET_USE_BLOCKIE:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         useBlockie: action.value,
       })
 
     case actions.UPDATE_FEATURE_FLAGS:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         featureFlags: action.value,
       })
 
     case actions.UPDATE_NETWORK_ENDPOINT_TYPE:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         networkEndpointType: action.value,
       })
 
     case actions.CLOSE_WELCOME_SCREEN:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         welcomeScreenSeen: true,
       })
 
     case actions.SET_CURRENT_LOCALE:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         currentLocale: action.value,
       })
 
     case actions.SET_PENDING_TOKENS:
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         pendingTokens: { ...action.payload },
       })
 
     case actions.CLEAR_PENDING_TOKENS: {
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         pendingTokens: {},
       })
     }
 
     case actions.UPDATE_PREFERENCES: {
-      return extend(metamaskState, {
+      return extend(dekusanState, {
         preferences: { ...action.payload },
       })
     }
 
     default:
-      return metamaskState
+      return dekusanState
 
   }
 }
diff --git a/ui/app/routes.js b/ui/app/routes.js
index 76afed5d..9ef4b653 100644
--- a/ui/app/routes.js
+++ b/ui/app/routes.js
@@ -12,7 +12,6 @@ const NEW_ACCOUNT_ROUTE = '/new-account'
 const IMPORT_ACCOUNT_ROUTE = '/new-account/import'
 const CONNECT_HARDWARE_ROUTE = '/new-account/connect'
 const SEND_ROUTE = '/send'
-const NOTICE_ROUTE = '/notice'
 const WELCOME_ROUTE = '/welcome'
 const INITIALIZE_ROUTE = '/initialize'
 const INITIALIZE_CREATE_PASSWORD_ROUTE = '/initialize/create-password'
@@ -47,7 +46,6 @@ module.exports = {
   IMPORT_ACCOUNT_ROUTE,
   CONNECT_HARDWARE_ROUTE,
   SEND_ROUTE,
-  NOTICE_ROUTE,
   WELCOME_ROUTE,
   INITIALIZE_ROUTE,
   INITIALIZE_CREATE_PASSWORD_ROUTE,
diff --git a/ui/app/select-app.js b/ui/app/select-app.js
index ed705811..3835fdd0 100644
--- a/ui/app/select-app.js
+++ b/ui/app/select-app.js
@@ -11,9 +11,9 @@ const I18nProvider = require('./i18n-provider')
 function mapStateToProps (state) {
   return {
     autoAdd: autoAddToBetaUI(state),
-    isUnlocked: state.metamask.isUnlocked,
-    isMascara: state.metamask.isMascara,
-    shouldUseNewUi: true,
+    isUnlocked: state.dekusan.isUnlocked,
+    isMascara: state.dekusan.isMascara,
+    firstTime: Object.keys(state.dekusan.identities).length === 0,
   }
 }
 
diff --git a/ui/app/selectors.js b/ui/app/selectors.js
index 8259bb05..a5d147cb 100644
--- a/ui/app/selectors.js
+++ b/ui/app/selectors.js
@@ -41,21 +41,21 @@ const selectors = {
 module.exports = selectors
 
 function getSelectedAddress (state) {
-  const selectedAddress = state.metamask.selectedAddress || Object.keys(getMetaMaskAccounts(state))[0]
+  const selectedAddress = state.dekusan.selectedAddress || Object.keys(getMetaMaskAccounts(state))[0]
 
   return selectedAddress
 }
 
 function getSelectedIdentity (state) {
   const selectedAddress = getSelectedAddress(state)
-  const identities = state.metamask.identities
+  const identities = state.dekusan.identities
 
   return identities[selectedAddress]
 }
 
 function getMetaMaskAccounts (state) {
-  const currentAccounts = state.metamask.accounts
-  const cachedBalances = state.metamask.cachedBalances
+  const currentAccounts = state.dekusan.accounts
+  const cachedBalances = state.dekusan.cachedBalances
   const selectedAccounts = {}
 
   Object.keys(currentAccounts).forEach(accountID => {
@@ -80,49 +80,49 @@ function getSelectedAccount (state) {
 }
 
 function getSelectedToken (state) {
-  const tokens = state.metamask.tokens || []
-  const selectedTokenAddress = state.metamask.selectedTokenAddress
+  const tokens = state.dekusan.tokens || []
+  const selectedTokenAddress = state.dekusan.selectedTokenAddress
   const selectedToken = tokens.filter(({ address }) => address === selectedTokenAddress)[0]
-  const sendToken = state.metamask.send.token
+  const sendToken = state.dekusan.send.token
 
   return selectedToken || sendToken || null
 }
 
 function getSelectedTokenExchangeRate (state) {
-  const contractExchangeRates = state.metamask.contractExchangeRates
+  const contractExchangeRates = state.dekusan.contractExchangeRates
   const selectedToken = getSelectedToken(state) || {}
   const { address } = selectedToken
   return contractExchangeRates[address] || 0
 }
 
 function getSelectedTokenAssetImage (state) {
-  const assetImages = state.metamask.assetImages || {}
+  const assetImages = state.dekusan.assetImages || {}
   const selectedToken = getSelectedToken(state) || {}
   const { address } = selectedToken
   return assetImages[address]
 }
 
 function getAssetImages (state) {
-  const assetImages = state.metamask.assetImages || {}
+  const assetImages = state.dekusan.assetImages || {}
   return assetImages
 }
 
 function getTokenExchangeRate (state, address) {
-  const contractExchangeRates = state.metamask.contractExchangeRates
+  const contractExchangeRates = state.dekusan.contractExchangeRates
   return contractExchangeRates[address] || 0
 }
 
 function conversionRateSelector (state) {
-  return state.metamask.conversionRate
+  return state.dekusan.conversionRate
 }
 
 function getAddressBook (state) {
-  return state.metamask.addressBook
+  return state.dekusan.addressBook
 }
 
 function accountsWithSendEtherInfoSelector (state) {
   const accounts = getMetaMaskAccounts(state)
-  const { identities } = state.metamask
+  const { identities } = state.dekusan
 
   const accountsWithSendEtherInfo = Object.entries(accounts).map(([key, account]) => {
     return Object.assign({}, account, identities[key])
@@ -147,27 +147,27 @@ function getGasIsLoading (state) {
 }
 
 function getForceGasMin (state) {
-  return state.metamask.send.forceGasMin
+  return state.dekusan.send.forceGasMin
 }
 
 function getSendFrom (state) {
-  return state.metamask.send.from
+  return state.dekusan.send.from
 }
 
 function getSendAmount (state) {
-  return state.metamask.send.amount
+  return state.dekusan.send.amount
 }
 
 function getSendMaxModeState (state) {
-  return state.metamask.send.maxModeOn
+  return state.dekusan.send.maxModeOn
 }
 
 function getCurrentCurrency (state) {
-  return state.metamask.currentCurrency
+  return state.dekusan.currentCurrency
 }
 
 function getNativeCurrency (state) {
-  return state.metamask.nativeCurrency
+  return state.dekusan.nativeCurrency
 }
 
 function getSelectedTokenToFiatRate (state) {
@@ -195,22 +195,22 @@ function autoAddToBetaUI (state) {
   const autoAddAccountsThreshold = 2
   const autoAddTokensThreshold = 1
 
-  const numberOfTransactions = state.metamask.selectedAddressTxList.length
+  const numberOfTransactions = state.dekusan.selectedAddressTxList.length
   const numberOfAccounts = Object.keys(getMetaMaskAccounts(state)).length
-  const numberOfTokensAdded = state.metamask.tokens.length
+  const numberOfTokensAdded = state.dekusan.tokens.length
 
   const userPassesThreshold = (numberOfTransactions > autoAddTransactionThreshold) &&
     (numberOfAccounts > autoAddAccountsThreshold) &&
     (numberOfTokensAdded > autoAddTokensThreshold)
-  const userIsNotInBeta = !state.metamask.featureFlags.betaUI
+  const userIsNotInBeta = !state.dekusan.featureFlags.betaUI
 
   return userIsNotInBeta && userPassesThreshold
 }
 
 function getShouldUseNewUi (state) {
-  const isAlreadyUsingBetaUi = state.metamask.featureFlags.betaUI
-  const isMascara = state.metamask.isMascara
-  const isFreshInstall = Object.keys(state.metamask.identities).length === 0
+  const isAlreadyUsingBetaUi = state.dekusan.featureFlags.betaUI
+  const isMascara = state.dekusan.isMascara
+  const isFreshInstall = Object.keys(state.dekusan.identities).length === 0
   return isAlreadyUsingBetaUi || isMascara || isFreshInstall
 }
 
@@ -219,18 +219,18 @@ function getCurrentViewContext (state) {
   return currentView.context
 }
 
-function getTotalUnapprovedCount ({ metamask }) {
+function getTotalUnapprovedCount ({ dekusan }) {
   const {
     unapprovedTxs = {},
     unapprovedMsgCount,
     unapprovedPersonalMsgCount,
     unapprovedTypedMessagesCount,
-  } = metamask
+  } = dekusan
 
   return Object.keys(unapprovedTxs).length + unapprovedMsgCount + unapprovedPersonalMsgCount +
     unapprovedTypedMessagesCount
 }
 
-function preferencesSelector ({ metamask }) {
-  return metamask.preferences
+function preferencesSelector ({ dekusan }) {
+  return dekusan.preferences
 }
diff --git a/ui/app/selectors/confirm-transaction.js b/ui/app/selectors/confirm-transaction.js
index 23ef26d9..61fd9800 100644
--- a/ui/app/selectors/confirm-transaction.js
+++ b/ui/app/selectors/confirm-transaction.js
@@ -3,11 +3,11 @@ import txHelper from '../../lib/tx-helper'
 import { calcTokenAmount } from '../token-util'
 import { roundExponential } from '../helpers/confirm-transaction/util'
 
-const unapprovedTxsSelector = state => state.metamask.unapprovedTxs
-const unapprovedMsgsSelector = state => state.metamask.unapprovedMsgs
-const unapprovedPersonalMsgsSelector = state => state.metamask.unapprovedPersonalMsgs
-const unapprovedTypedMessagesSelector = state => state.metamask.unapprovedTypedMessages
-const networkSelector = state => state.metamask.network
+const unapprovedTxsSelector = state => state.dekusan.unapprovedTxs
+const unapprovedMsgsSelector = state => state.dekusan.unapprovedMsgs
+const unapprovedPersonalMsgsSelector = state => state.dekusan.unapprovedPersonalMsgs
+const unapprovedTypedMessagesSelector = state => state.dekusan.unapprovedTypedMessages
+const networkSelector = state => state.dekusan.network
 
 export const unconfirmedTransactionsListSelector = createSelector(
   unapprovedTxsSelector,
@@ -44,10 +44,10 @@ export const unconfirmedTransactionsHashSelector = createSelector(
     network
   ) => {
     const filteredUnapprovedTxs = Object.keys(unapprovedTxs).reduce((acc, address) => {
-      const { metamaskNetworkId } = unapprovedTxs[address]
+      const { dekusanNetworkId } = unapprovedTxs[address]
       const transactions = { ...acc }
 
-      if (metamaskNetworkId === network) {
+      if (dekusanNetworkId === network) {
         transactions[address] = unapprovedTxs[address]
       }
 
@@ -63,9 +63,9 @@ export const unconfirmedTransactionsHashSelector = createSelector(
   }
 )
 
-const unapprovedMsgCountSelector = state => state.metamask.unapprovedMsgCount
-const unapprovedPersonalMsgCountSelector = state => state.metamask.unapprovedPersonalMsgCount
-const unapprovedTypedMessagesCountSelector = state => state.metamask.unapprovedTypedMessagesCount
+const unapprovedMsgCountSelector = state => state.dekusan.unapprovedMsgCount
+const unapprovedPersonalMsgCountSelector = state => state.dekusan.unapprovedPersonalMsgCount
+const unapprovedTypedMessagesCountSelector = state => state.dekusan.unapprovedTypedMessagesCount
 
 export const unconfirmedTransactionsCountSelector = createSelector(
   unapprovedTxsSelector,
@@ -81,8 +81,8 @@ export const unconfirmedTransactionsCountSelector = createSelector(
     network
   ) => {
     const filteredUnapprovedTxIds = Object.keys(unapprovedTxs).filter(txId => {
-      const { metamaskNetworkId } = unapprovedTxs[txId]
-      return metamaskNetworkId === network
+      const { dekusanNetworkId } = unapprovedTxs[txId]
+      return dekusanNetworkId === network
     })
 
     return filteredUnapprovedTxIds.length + unapprovedTypedMessagesCount + unapprovedMsgCount +
@@ -91,15 +91,15 @@ export const unconfirmedTransactionsCountSelector = createSelector(
 )
 
 
-export const currentCurrencySelector = state => state.metamask.currentCurrency
-export const conversionRateSelector = state => state.metamask.conversionRate
-export const getNativeCurrency = state => state.metamask.nativeCurrency
+export const currentCurrencySelector = state => state.dekusan.currentCurrency
+export const conversionRateSelector = state => state.dekusan.conversionRate
+export const getNativeCurrency = state => state.dekusan.nativeCurrency
 
 const txDataSelector = state => state.confirmTransaction.txData
 const tokenDataSelector = state => state.confirmTransaction.tokenData
 const tokenPropsSelector = state => state.confirmTransaction.tokenProps
 
-const contractExchangeRatesSelector = state => state.metamask.contractExchangeRates
+const contractExchangeRatesSelector = state => state.dekusan.contractExchangeRates
 
 const tokenDecimalsSelector = createSelector(
   tokenPropsSelector,
diff --git a/ui/app/selectors/tokens.js b/ui/app/selectors/tokens.js
index 47b6e019..d6188653 100644
--- a/ui/app/selectors/tokens.js
+++ b/ui/app/selectors/tokens.js
@@ -1,7 +1,7 @@
 import { createSelector } from 'reselect'
 
-export const selectedTokenAddressSelector = state => state.metamask.selectedTokenAddress
-export const tokenSelector = state => state.metamask.tokens
+export const selectedTokenAddressSelector = state => state.dekusan.selectedTokenAddress
+export const tokenSelector = state => state.dekusan.tokens
 export const selectedTokenSelector = createSelector(
   tokenSelector,
   selectedTokenAddressSelector,
diff --git a/ui/app/selectors/transactions.js b/ui/app/selectors/transactions.js
index 301e8d11..b0f329f0 100644
--- a/ui/app/selectors/transactions.js
+++ b/ui/app/selectors/transactions.js
@@ -14,12 +14,12 @@ import { hexToDecimal } from '../helpers/conversions.util'
 import { selectedTokenAddressSelector } from './tokens'
 import txHelper from '../../lib/tx-helper'
 
-export const shapeShiftTxListSelector = state => state.metamask.shapeShiftTxList
-export const unapprovedMsgsSelector = state => state.metamask.unapprovedMsgs
-export const selectedAddressTxListSelector = state => state.metamask.selectedAddressTxList
-export const unapprovedPersonalMsgsSelector = state => state.metamask.unapprovedPersonalMsgs
-export const unapprovedTypedMessagesSelector = state => state.metamask.unapprovedTypedMessages
-export const networkSelector = state => state.metamask.network
+export const shapeShiftTxListSelector = state => state.dekusan.shapeShiftTxList
+export const unapprovedMsgsSelector = state => state.dekusan.unapprovedMsgs
+export const selectedAddressTxListSelector = state => state.dekusan.selectedAddressTxList
+export const unapprovedPersonalMsgsSelector = state => state.dekusan.unapprovedPersonalMsgs
+export const unapprovedTypedMessagesSelector = state => state.dekusan.unapprovedTypedMessages
+export const networkSelector = state => state.dekusan.network
 
 export const unapprovedMessagesSelector = createSelector(
   unapprovedMsgsSelector,
diff --git a/ui/app/welcome-screen.js b/ui/app/welcome-screen.js
index c871fc2b..638211dc 100644
--- a/ui/app/welcome-screen.js
+++ b/ui/app/welcome-screen.js
@@ -65,7 +65,7 @@ class WelcomeScreen extends Component {
   }
 }
 
-const mapStateToProps = ({ metamask: { welcomeScreenSeen } }) => {
+const mapStateToProps = ({ dekusan: { welcomeScreenSeen } }) => {
   return {
     welcomeScreenSeen,
   }
diff --git a/ui/index.js b/ui/index.js
index 1d9d411a..8e97b223 100644
--- a/ui/index.js
+++ b/ui/index.js
@@ -15,28 +15,28 @@ function launchMetamaskUi (opts, cb) {
   var accountManager = opts.accountManager
   actions._setBackgroundConnection(accountManager)
   // check if we are unlocked first
-  accountManager.getState(function (err, metamaskState) {
+  accountManager.getState(function (err, dekusanState) {
     if (err) return cb(err)
-    startApp(metamaskState, accountManager, opts)
+    startApp(dekusanState, accountManager, opts)
       .then((store) => {
         cb(null, store)
       })
   })
 }
 
-async function startApp (metamaskState, accountManager, opts) {
+async function startApp (dekusanState, accountManager, opts) {
   // parse opts
-  if (!metamaskState.featureFlags) metamaskState.featureFlags = {}
+  if (!dekusanState.featureFlags) dekusanState.featureFlags = {}
 
-  const currentLocaleMessages = metamaskState.currentLocale
-    ? await fetchLocale(metamaskState.currentLocale)
+  const currentLocaleMessages = dekusanState.currentLocale
+    ? await fetchLocale(dekusanState.currentLocale)
     : {}
   const enLocaleMessages = await fetchLocale('en')
 
   const store = configureStore({
 
-    // metamaskState represents the cross-tab state
-    metamask: metamaskState,
+    // dekusanState represents the cross-tab state
+    dekusan: dekusanState,
 
     // appState represents the current tab's popup state
     appState: {},
@@ -51,7 +51,7 @@ async function startApp (metamaskState, accountManager, opts) {
   })
 
   // if unconfirmed txs, start on txConf page
-  const unapprovedTxsAll = txHelper(metamaskState.unapprovedTxs, metamaskState.unapprovedMsgs, metamaskState.unapprovedPersonalMsgs, metamaskState.unapprovedTypedMessages, metamaskState.network)
+  const unapprovedTxsAll = txHelper(dekusanState.unapprovedTxs, dekusanState.unapprovedMsgs, dekusanState.unapprovedPersonalMsgs, dekusanState.unapprovedTypedMessages, dekusanState.network)
   const numberOfUnapprivedTx = unapprovedTxsAll.length
   if (numberOfUnapprivedTx > 0) {
     store.dispatch(actions.showConfTxPage({
@@ -59,8 +59,8 @@ async function startApp (metamaskState, accountManager, opts) {
     }))
   }
 
-  accountManager.on('update', function (metamaskState) {
-    store.dispatch(actions.updateMetamaskState(metamaskState))
+  accountManager.on('update', function (dekusanState) {
+    store.dispatch(actions.updateMetamaskState(dekusanState))
   })
 
   // global dekusan api - used by tooling
diff --git a/ui/lib/account-link.js b/ui/lib/account-link.js
index 82d3010a..ce8ef254 100644
--- a/ui/lib/account-link.js
+++ b/ui/lib/account-link.js
@@ -6,10 +6,9 @@ module.exports = function (address, network) {
       link = `https://dexscan.org/address/${address}`
       break
     case 2: // test net
-      link = `https://testnet.dexscan.org/address/${address}`
-      break
+    case 237: // test net
     default:
-      link = ''
+      link = `https://testnet.dexscan.org/address/${address}`
       break
   }
 
diff --git a/ui/lib/tx-helper.js b/ui/lib/tx-helper.js
index 260dbaa3..1c66452c 100644
--- a/ui/lib/tx-helper.js
+++ b/ui/lib/tx-helper.js
@@ -5,7 +5,7 @@ module.exports = function (unapprovedTxs, unapprovedMsgs, personalMsgs, typedMes
   log.debug('tx-helper called with params:')
   log.debug({ unapprovedTxs, unapprovedMsgs, personalMsgs, typedMessages, network })
 
-  const txValues = network ? valuesFor(unapprovedTxs).filter(txMeta => txMeta.metamaskNetworkId === network) : valuesFor(unapprovedTxs)
+  const txValues = network ? valuesFor(unapprovedTxs).filter(txMeta => txMeta.dekusanNetworkId === network) : valuesFor(unapprovedTxs)
   log.debug(`tx helper found ${txValues.length} unapproved txs`)
 
   const msgValues = valuesFor(unapprovedMsgs)
diff --git a/ui/lib/tx-link.js b/ui/lib/tx-link.js
new file mode 100644
index 00000000..aa457d38
--- /dev/null
+++ b/ui/lib/tx-link.js
@@ -0,0 +1,16 @@
+module.exports = function (txHash, network) {
+  const net = parseInt(network)
+  let link
+  switch (net) {
+    case 1: // main net
+      link = `https://dexscan.org/transaction/${txHash}`
+      break
+    case 2: // test net
+    case 237: // test net
+    default:
+      link = `https://testnet.dexscan.org/transaction/${txHash}`
+      break
+  }
+
+  return link
+}