Merge branch 'master' into rebrocast-by-timeStamp

package.json

@@ -69,7 +69,7 @@
     "eth-bin-to-ops": "^1.0.1",
     "eth-block-tracker": "^2.2.0",
     "eth-contract-metadata": "^1.1.4",
-    "eth-hd-keyring": "^1.1.1",
+    "eth-hd-keyring": "^1.2.1",
     "eth-json-rpc-filters": "^1.2.2",
     "eth-keyring-controller": "^2.0.0",
     "eth-phishing-detect": "^1.1.4",

ui/app/account-detail.js

@@ -46,7 +46,7 @@ AccountDetailScreen.prototype.render = function () {
   var selected = props.address || Object.keys(props.accounts)[0]
   var checksumAddress = selected && ethUtil.toChecksumAddress(selected)
   var identity = props.identities[selected]
-  var account = props.computedBalances[selected]
+  var account = props.accounts[selected]
   const { network, conversionRate, currentCurrency } = props
 
   return (
@@ -181,7 +181,7 @@ AccountDetailScreen.prototype.render = function () {
         }, [
 
           h(EthBalance, {
-            value: account && account.ethBalance,
+            value: account && account.balance,
             conversionRate,
             currentCurrency,
             style: {

ui/app/components/pending-tx.js

@@ -33,7 +33,7 @@ function PendingTx () {
 
 PendingTx.prototype.render = function () {
   const props = this.props
-  const { currentCurrency, blockGasLimit, computedBalances } = props
+  const { currentCurrency, blockGasLimit } = props
 
   const conversionRate = props.conversionRate
   const txMeta = this.gatherTxMeta()
@@ -42,8 +42,8 @@ PendingTx.prototype.render = function () {
   // Account Details
   const address = txParams.from || props.selectedAddress
   const identity = props.identities[address] || { address: address }
-  const account = computedBalances[address]
+  const account = props.accounts[address]
-  const balance = account ? account.ethBalance : '0x0'
+  const balance = account ? account.balance : '0x0'
 
   // recipient check
   const isValidAddress = !txParams.to || util.isValidAddress(txParams.to)