aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/accounts/index.js
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2017-03-29 09:02:39 +0800
committerfrankiebee <frankie.diamond@gmail.com>2017-03-29 09:02:39 +0800
commita20a237282c38da86b03625d08b48c2e58e83523 (patch)
tree65c58173cf8e0da53dbb6b9f18014ed8c1babf9c /ui/app/accounts/index.js
parent79248ae5cd3fb1314c5a7ff71c05f9dbe7b3a4cd (diff)
parent7c09bde4120d1063df762076d41d2e9921dd3c0e (diff)
downloadtangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.tar
tangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.tar.gz
tangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.tar.bz2
tangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.tar.lz
tangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.tar.xz
tangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.tar.zst
tangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.zip
Merge branch 'master' into mascara
Diffstat (limited to 'ui/app/accounts/index.js')
-rw-r--r--ui/app/accounts/index.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/accounts/index.js b/ui/app/accounts/index.js
index e236a4e85..ae69d9297 100644
--- a/ui/app/accounts/index.js
+++ b/ui/app/accounts/index.js
@@ -11,7 +11,7 @@ module.exports = connect(mapStateToProps)(AccountsScreen)
function mapStateToProps (state) {
const pendingTxs = valuesFor(state.metamask.unapprovedTxs)
- .filter(tx => tx.txParams.metamaskNetworkId === state.metamask.network)
+ .filter(txMeta => txMeta.metamaskNetworkId === state.metamask.network)
const pendingMsgs = valuesFor(state.metamask.unapprovedMsgs)
const pending = pendingTxs.concat(pendingMsgs)