From bdd1e58e552b50ab5d060a1671d29cf3c2fdf7fa Mon Sep 17 00:00:00 2001
From: Chi Kei Chan <chikeichan@gmail.com>
Date: Tue, 26 Sep 2017 09:15:14 -0700
Subject: Return null if transaction.key is shapeshift

---
 ui/app/components/tx-list.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'ui')

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,
-- 
cgit