m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge branch 'master' into rebrocast-by-timeStamp

Browse Source
This commit is contained in:
frankiebee 2017-10-05 11:08:34 -07:00
commit e128e4859f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -69,7 +69,7 @@
"eth-bin-to-ops": "^1.0.1", "eth-bin-to-ops": "^1.0.1",
"eth-block-tracker": "^2.2.0", "eth-block-tracker": "^2.2.0",
"eth-contract-metadata": "^1.1.4", "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-json-rpc-filters": "^1.2.2",
"eth-keyring-controller": "^2.0.0", "eth-keyring-controller": "^2.0.0",
"eth-phishing-detect": "^1.1.4", "eth-phishing-detect": "^1.1.4",

4
ui/app/account-detail.js
View File

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

6
ui/app/components/pending-tx.js
View File

@ -33,7 +33,7 @@ function PendingTx () {
PendingTx.prototype.render = function () { PendingTx.prototype.render = function () {
const props = this.props const props = this.props
const { currentCurrency, blockGasLimit, computedBalances } = props const { currentCurrency, blockGasLimit } = props
const conversionRate = props.conversionRate const conversionRate = props.conversionRate
const txMeta = this.gatherTxMeta() const txMeta = this.gatherTxMeta()
@ -42,8 +42,8 @@ PendingTx.prototype.render = function () {
// Account Details // Account Details
const address = txParams.from || props.selectedAddress const address = txParams.from || props.selectedAddress
const identity = props.identities[address] || { address: address } 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 // recipient check
const isValidAddress = !txParams.to || util.isValidAddress(txParams.to) const isValidAddress = !txParams.to || util.isValidAddress(txParams.to)