aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components
diff options
context:
space:
mode:
Diffstat (limited to 'ui/app/components')
-rw-r--r--ui/app/components/shift-list-item.js2
-rw-r--r--ui/app/components/tx-list.js4
2 files changed, 4 insertions, 2 deletions
diff --git a/ui/app/components/shift-list-item.js b/ui/app/components/shift-list-item.js
index 079f05e31..392b67630 100644
--- a/ui/app/components/shift-list-item.js
+++ b/ui/app/components/shift-list-item.js
@@ -29,7 +29,7 @@ function ShiftListItem () {
ShiftListItem.prototype.render = function () {
return (
- h('.transaction-list-item.flex-row', {
+ h('div.tx-list-item.tx-list-clickable', {
style: {
paddingTop: '20px',
paddingBottom: '20px',
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 = {