diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-08-23 02:59:08 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-08-23 02:59:08 +0800 |
| commit | 3d451ddf3e59e8d4ac610b7e6a01a59beed4f944 (patch) | |
| tree | 93193c3014065d00fc14d2efcdca8a11c63e2e4a /ui/app/components/transaction-list.js | |
| parent | 8592ffd85582612ae18b5f4e5ed6749401f86f3b (diff) | |
| parent | 3756384da6cb7d1566271cb99ec561d3b051a4ac (diff) | |
| download | tangerine-wallet-browser-3d451ddf3e59e8d4ac610b7e6a01a59beed4f944.tar.gz tangerine-wallet-browser-3d451ddf3e59e8d4ac610b7e6a01a59beed4f944.tar.zst tangerine-wallet-browser-3d451ddf3e59e8d4ac610b7e6a01a59beed4f944.zip | |
Merge branch 'master' into i390-TransactionLimit
Diffstat (limited to 'ui/app/components/transaction-list.js')
| -rw-r--r-- | ui/app/components/transaction-list.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/app/components/transaction-list.js b/ui/app/components/transaction-list.js index 85744381d..9348b9fc4 100644 --- a/ui/app/components/transaction-list.js +++ b/ui/app/components/transaction-list.js @@ -17,6 +17,11 @@ function TransactionList () { TransactionList.prototype.render = function () { const { txsToRender, network, unconfMsgs, address } = 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) const accountLink = genAccountLink(address, network) |