diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-10-06 02:08:34 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-10-06 02:08:34 +0800 |
| commit | e128e4859fdcffa580959041b01020bccb6e8a29 (patch) | |
| tree | 82c53d9392a4ec10959e26b30040f13902595a1e | |
| parent | ec9c5283135d2cc3dcb633f19dd89ea79267f34a (diff) | |
| parent | 35f4148343cf4400f7a38eef07282cae44cd0335 (diff) | |
| download | tangerine-wallet-browser-e128e4859fdcffa580959041b01020bccb6e8a29.tar tangerine-wallet-browser-e128e4859fdcffa580959041b01020bccb6e8a29.tar.gz tangerine-wallet-browser-e128e4859fdcffa580959041b01020bccb6e8a29.tar.bz2 tangerine-wallet-browser-e128e4859fdcffa580959041b01020bccb6e8a29.tar.lz tangerine-wallet-browser-e128e4859fdcffa580959041b01020bccb6e8a29.tar.xz tangerine-wallet-browser-e128e4859fdcffa580959041b01020bccb6e8a29.tar.zst tangerine-wallet-browser-e128e4859fdcffa580959041b01020bccb6e8a29.zip | |
Merge branch 'master' into rebrocast-by-timeStamp
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | ui/app/account-detail.js | 4 | ||||
| -rw-r--r-- | ui/app/components/pending-tx.js | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/package.json b/package.json index 03d095228..298691588 100644 --- a/package.json +++ b/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", diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 90724dc3f..a844daf88 100644 --- a/ui/app/account-detail.js +++ b/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: { diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js index 6f8c19a3c..c3350fcc1 100644 --- a/ui/app/components/pending-tx.js +++ b/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 balance = account ? account.ethBalance : '0x0' + const account = props.accounts[address] + const balance = account ? account.balance : '0x0' // recipient check const isValidAddress = !txParams.to || util.isValidAddress(txParams.to) |