Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into bug-submitTx

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,