diff options
| author | Frankie <frankie.pangilinan@consensys.net> | 2016-09-08 11:56:51 +0800 |
|---|---|---|
| committer | Frankie <frankie.pangilinan@consensys.net> | 2016-09-08 11:56:51 +0800 |
| commit | 5f8d3085d7603135849eb22ad22c70733c236c2d (patch) | |
| tree | 258fa356f968d2fc6f339fa7e47c03b056345624 /ui | |
| parent | 03c84cff6985ebfbd81f55e761e2d3360b01fbf4 (diff) | |
| download | tangerine-wallet-browser-5f8d3085d7603135849eb22ad22c70733c236c2d.tar tangerine-wallet-browser-5f8d3085d7603135849eb22ad22c70733c236c2d.tar.gz tangerine-wallet-browser-5f8d3085d7603135849eb22ad22c70733c236c2d.tar.bz2 tangerine-wallet-browser-5f8d3085d7603135849eb22ad22c70733c236c2d.tar.lz tangerine-wallet-browser-5f8d3085d7603135849eb22ad22c70733c236c2d.tar.xz tangerine-wallet-browser-5f8d3085d7603135849eb22ad22c70733c236c2d.tar.zst tangerine-wallet-browser-5f8d3085d7603135849eb22ad22c70733c236c2d.zip | |
Filter out pending txs based on network from tx history
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app/account-detail.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 486a1a633..5ce6b6703 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -235,7 +235,7 @@ AccountDetailScreen.prototype.subview = function () { AccountDetailScreen.prototype.transactionList = function () { const { transactions, unconfTxs, unconfMsgs, address, network, shapeShiftTxList } = this.props - var txsToRender = transactions + 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 |