aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/tx-list.js
diff options
context:
space:
mode:
authorChi Kei Chan <chikeichan@gmail.com>2017-09-27 00:15:14 +0800
committerChi Kei Chan <chikeichan@gmail.com>2017-09-27 00:15:14 +0800
commitbdd1e58e552b50ab5d060a1671d29cf3c2fdf7fa (patch)
treec8f0b0c0e5a620aa4493dbdc532b3ba828f58f69 /ui/app/components/tx-list.js
parent7102772c3a4a73d594ccc20e760defa2999f2d3f (diff)
downloadtangerine-wallet-browser-bdd1e58e552b50ab5d060a1671d29cf3c2fdf7fa.tar.gz
tangerine-wallet-browser-bdd1e58e552b50ab5d060a1671d29cf3c2fdf7fa.tar.zst
tangerine-wallet-browser-bdd1e58e552b50ab5d060a1671d29cf3c2fdf7fa.zip
Return null if transaction.key is shapeshift
Diffstat (limited to 'ui/app/components/tx-list.js')
-rw-r--r--ui/app/components/tx-list.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/ui/app/components/tx-list.js b/ui/app/components/tx-list.js
index f817d03a9..ef5cfa245 100644
--- a/ui/app/components/tx-list.js
+++ b/ui/app/components/tx-list.js
@@ -47,7 +47,6 @@ TxList.prototype.render = function () {
TxList.prototype.renderTransaction = function () {
const { txsToRender, conversionRate } = this.props
-
return txsToRender.length
? txsToRender.map((transaction, i) => this.renderTransactionListItem(transaction, conversionRate))
: [h('div.tx-list-item.tx-list-item--empty', [ 'No Transactions' ])]
@@ -55,6 +54,12 @@ TxList.prototype.renderTransaction = function () {
// TODO: Consider moving TxListItem into a separate component
TxList.prototype.renderTransactionListItem = function (transaction, conversionRate) {
+ // console.log({transaction})
+ // refer to transaction-list.js:line 58
+ if (transaction.key === 'shapeshift') {
+ return null
+ }
+
const props = {
dateString: formatDate(transaction.time),
address: transaction.txParams.to,