aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/account-detail.js
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-09-09 06:39:42 +0800
committerGitHub <noreply@github.com>2016-09-09 06:39:42 +0800
commitfc0f64a5a8cf23c0feed2e2583cf07de7c9548a5 (patch)
tree712c02bfc76bfa8136e123d6ab7ceae85a50a6ba /ui/app/account-detail.js
parent1f0b2ca787670455a2cbecf9d539a7fb66793525 (diff)
parent3f64095eed151dbef9e18d388c8f30d43f18bbae (diff)
downloadtangerine-wallet-browser-fc0f64a5a8cf23c0feed2e2583cf07de7c9548a5.tar
tangerine-wallet-browser-fc0f64a5a8cf23c0feed2e2583cf07de7c9548a5.tar.gz
tangerine-wallet-browser-fc0f64a5a8cf23c0feed2e2583cf07de7c9548a5.tar.bz2
tangerine-wallet-browser-fc0f64a5a8cf23c0feed2e2583cf07de7c9548a5.tar.lz
tangerine-wallet-browser-fc0f64a5a8cf23c0feed2e2583cf07de7c9548a5.tar.xz
tangerine-wallet-browser-fc0f64a5a8cf23c0feed2e2583cf07de7c9548a5.tar.zst
tangerine-wallet-browser-fc0f64a5a8cf23c0feed2e2583cf07de7c9548a5.zip
Merge pull request #627 from MetaMask/i#589pendingTxsIssue
I#589pending txs issue
Diffstat (limited to 'ui/app/account-detail.js')
-rw-r--r--ui/app/account-detail.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index cc956fed3..ebb15cd05 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