diff options
author | kumavis <aaron@kumavis.me> | 2017-01-14 07:51:36 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2017-01-14 07:51:36 +0800 |
commit | d06c54e0b7eb7803798e31d8d035b648e9da0421 (patch) | |
tree | 0dc1e906dbc2e460090f86e4e3f8171e8e2960ea /ui/app/account-detail.js | |
parent | d755b66e204277ac6a904ba432f7b10a340c9288 (diff) | |
parent | 9f162e72b48552b7ab3f2755114c9e2be6d0aace (diff) | |
download | tangerine-wallet-browser-d06c54e0b7eb7803798e31d8d035b648e9da0421.tar.gz tangerine-wallet-browser-d06c54e0b7eb7803798e31d8d035b648e9da0421.tar.zst tangerine-wallet-browser-d06c54e0b7eb7803798e31d8d035b648e9da0421.zip |
Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into bug-submitTx
Diffstat (limited to 'ui/app/account-detail.js')
-rw-r--r-- | ui/app/account-detail.js | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index c41ba61fd..7a0c599ba 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -26,11 +26,10 @@ function mapStateToProps (state) { accounts: state.metamask.accounts, address: state.metamask.selectedAccount, accountDetail: state.appState.accountDetail, - transactions: state.metamask.transactions, network: state.metamask.network, - unconfTxs: valuesFor(state.metamask.unconfTxs), unconfMsgs: valuesFor(state.metamask.unconfMsgs), shapeShiftTxList: state.metamask.shapeShiftTxList, + transactions: state.metamask.selectedAccountTxList || [], } } @@ -248,20 +247,10 @@ AccountDetailScreen.prototype.subview = function () { } AccountDetailScreen.prototype.transactionList = function () { - const { transactions, unconfTxs, unconfMsgs, address, network, shapeShiftTxList } = this.props - - var txsToRender = transactions.concat(unconfTxs) - // only transactions that are from the current address - .filter(tx => tx.txParams.from === address) - // only transactions that are on the current network - .filter(tx => tx.txParams.metamaskNetworkId === network) - // sort by recency - .sort((a, b) => b.time - a.time) - + const {transactions, unconfMsgs, address, network, shapeShiftTxList } = this.props return h(TransactionList, { - txsToRender, + transactions: transactions.sort((a, b) => b.time - a.time), network, - unconfTxs, unconfMsgs, address, shapeShiftTxList, |