diff options
| author | Dan Finlay <dan@danfinlay.com> | 2017-06-13 08:06:39 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2017-06-13 08:17:16 +0800 |
| commit | a741cc4fc4fb68e3f460c70ea848bdf3d2d2c894 (patch) | |
| tree | 58652d4789e71a47a763096e746bd25904d91bfe /ui/app/components/transaction-list.js | |
| parent | d05d9a5f57b9311d6f29539233f9065330e8bda4 (diff) | |
| parent | bbe0c73dca45542b519036bec2bae5feb1e55485 (diff) | |
| download | tangerine-wallet-browser-a741cc4fc4fb68e3f460c70ea848bdf3d2d2c894.tar.gz tangerine-wallet-browser-a741cc4fc4fb68e3f460c70ea848bdf3d2d2c894.tar.zst tangerine-wallet-browser-a741cc4fc4fb68e3f460c70ea848bdf3d2d2c894.zip | |
Merge branch 'master' into AddTokenList
Diffstat (limited to 'ui/app/components/transaction-list.js')
| -rw-r--r-- | ui/app/components/transaction-list.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/app/components/transaction-list.js b/ui/app/components/transaction-list.js index 4c25f3dd9..3b4ba741e 100644 --- a/ui/app/components/transaction-list.js +++ b/ui/app/components/transaction-list.js @@ -13,7 +13,7 @@ function TransactionList () { } TransactionList.prototype.render = function () { - const { transactions, network, unapprovedMsgs } = this.props + const { transactions, network, unapprovedMsgs, conversionRate } = this.props var shapeShiftTxList if (network === '1') { @@ -58,6 +58,7 @@ TransactionList.prototype.render = function () { } return h(TransactionListItem, { transaction, i, network, key, + conversionRate, showTx: (txId) => { this.props.viewPendingTx(txId) }, |