aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/tx-list.js
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2017-09-29 22:50:09 +0800
committerChi Kei Chan <chikeichan@gmail.com>2017-10-02 09:58:57 +0800
commit7c4d8c45624ef840b8806589b47997e7c7c396f3 (patch)
tree976cea42949d30e528c4b78d74135fd7d54f22a9 /ui/app/components/tx-list.js
parent67ee5b21e6f64ac22e65f2712ae13dd8c09ed113 (diff)
downloadtangerine-wallet-browser-7c4d8c45624ef840b8806589b47997e7c7c396f3.tar
tangerine-wallet-browser-7c4d8c45624ef840b8806589b47997e7c7c396f3.tar.gz
tangerine-wallet-browser-7c4d8c45624ef840b8806589b47997e7c7c396f3.tar.bz2
tangerine-wallet-browser-7c4d8c45624ef840b8806589b47997e7c7c396f3.tar.lz
tangerine-wallet-browser-7c4d8c45624ef840b8806589b47997e7c7c396f3.tar.xz
tangerine-wallet-browser-7c4d8c45624ef840b8806589b47997e7c7c396f3.tar.zst
tangerine-wallet-browser-7c4d8c45624ef840b8806589b47997e7c7c396f3.zip
Enables the old shapeshift UI within new ui.
Diffstat (limited to 'ui/app/components/tx-list.js')
-rw-r--r--ui/app/components/tx-list.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/app/components/tx-list.js b/ui/app/components/tx-list.js
index ef5cfa245..82541704e 100644
--- a/ui/app/components/tx-list.js
+++ b/ui/app/components/tx-list.js
@@ -5,6 +5,7 @@ const inherits = require('util').inherits
const prefixForNetwork = require('../../lib/etherscan-prefix-for-network')
const selectors = require('../selectors')
const TxListItem = require('./tx-list-item')
+const ShiftListItem = require('./shift-list-item')
const { formatBalance, formatDate } = require('../util')
const { showConfTxPage } = require('../actions')
@@ -56,8 +57,9 @@ TxList.prototype.renderTransaction = function () {
TxList.prototype.renderTransactionListItem = function (transaction, conversionRate) {
// console.log({transaction})
// refer to transaction-list.js:line 58
+ const shapeshiftProps = {};
if (transaction.key === 'shapeshift') {
- return null
+ return h(ShiftListItem, transaction)
}
const props = {