diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-08-23 06:03:36 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-08-23 06:03:36 +0800 |
| commit | 6e1000f361afcf259beb587d777f3025fcde7667 (patch) | |
| tree | 758ddcf89896b8c7976347e9e2c97226378e05a6 /ui/app/components/transaction-list.js | |
| parent | 270dbacbc472dae660fe8b143df9c64b7f8279cf (diff) | |
| parent | 3756384da6cb7d1566271cb99ec561d3b051a4ac (diff) | |
| download | tangerine-wallet-browser-6e1000f361afcf259beb587d777f3025fcde7667.tar.gz tangerine-wallet-browser-6e1000f361afcf259beb587d777f3025fcde7667.tar.zst tangerine-wallet-browser-6e1000f361afcf259beb587d777f3025fcde7667.zip | |
Merge branch 'master' into PopupNotifications
Diffstat (limited to 'ui/app/components/transaction-list.js')
| -rw-r--r-- | ui/app/components/transaction-list.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/app/components/transaction-list.js b/ui/app/components/transaction-list.js index 886aa7c00..9bf0f6d81 100644 --- a/ui/app/components/transaction-list.js +++ b/ui/app/components/transaction-list.js @@ -14,7 +14,11 @@ function TransactionList () { TransactionList.prototype.render = function () { const { txsToRender, network, unconfMsgs } = this.props - const transactions = txsToRender.concat(unconfMsgs) + var shapeShiftTxList + if (network === '1'){ + shapeShiftTxList = this.props.shapeShiftTxList + } + const transactions = !shapeShiftTxList ? txsToRender.concat(unconfMsgs) : txsToRender.concat(unconfMsgs, shapeShiftTxList) .sort((a, b) => b.time - a.time) return ( |