From c8e5068537b6f0fa0f68752f246058d2c24cb4b8 Mon Sep 17 00:00:00 2001
From: Esteban MIno <efmino@uc.cl>
Date: Thu, 30 Aug 2018 13:51:57 -0300
Subject: fix watched tokens images showing in tx list

---
 ui/app/components/transaction-list/transaction-list.component.js | 8 +++++---
 ui/app/components/transaction-list/transaction-list.container.js | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'ui/app/components/transaction-list')

diff --git a/ui/app/components/transaction-list/transaction-list.component.js b/ui/app/components/transaction-list/transaction-list.component.js
index e30476d8c..79d9d1445 100644
--- a/ui/app/components/transaction-list/transaction-list.component.js
+++ b/ui/app/components/transaction-list/transaction-list.component.js
@@ -21,6 +21,7 @@ export default class TransactionList extends PureComponent {
     transactionToRetry: PropTypes.object,
     selectedToken: PropTypes.object,
     updateNetworkNonce: PropTypes.func,
+    assetImages: PropTypes.object,
   }
 
   componentDidMount () {
@@ -44,8 +45,8 @@ export default class TransactionList extends PureComponent {
 
   renderTransactions () {
     const { t } = this.context
-    const { pendingTransactions = [], completedTransactions = [] } = this.props
-
+    const { pendingTransactions = [], completedTransactions = [], assetImages } = this.props
+    console.log('REMDERING FROM TX LIST', assetImages)
     return (
       <div className="transaction-list__transactions">
         {
@@ -79,7 +80,7 @@ export default class TransactionList extends PureComponent {
   }
 
   renderTransaction (transaction, index) {
-    const { selectedToken } = this.props
+    const { selectedToken, assetImages } = this.props
 
     return transaction.key === TRANSACTION_TYPE_SHAPESHIFT
       ? (
@@ -93,6 +94,7 @@ export default class TransactionList extends PureComponent {
           key={transaction.id}
           showRetry={this.shouldShowRetry(transaction)}
           token={selectedToken}
+          assetImages={assetImages}
         />
       )
   }
diff --git a/ui/app/components/transaction-list/transaction-list.container.js b/ui/app/components/transaction-list/transaction-list.container.js
index 1ec1f9ccf..2e946c67d 100644
--- a/ui/app/components/transaction-list/transaction-list.container.js
+++ b/ui/app/components/transaction-list/transaction-list.container.js
@@ -7,7 +7,7 @@ import {
   submittedPendingTransactionsSelector,
   completedTransactionsSelector,
 } from '../../selectors/transactions'
-import { getSelectedAddress } from '../../selectors'
+import { getSelectedAddress, getAssetImages } from '../../selectors'
 import { selectedTokenSelector } from '../../selectors/tokens'
 import { getLatestSubmittedTxWithNonce } from '../../helpers/transactions.util'
 import { updateNetworkNonce } from '../../actions'
@@ -23,6 +23,7 @@ const mapStateToProps = state => {
     transactionToRetry: getLatestSubmittedTxWithNonce(submittedPendingTransactions, networkNonce),
     selectedToken: selectedTokenSelector(state),
     selectedAddress: getSelectedAddress(state),
+    assetImages: getAssetImages(state),
   }
 }
 
-- 
cgit 


From 165a966a2a0c1a6eb03b7eb53fd0824f4437200a Mon Sep 17 00:00:00 2001
From: Esteban MIno <efmino@uc.cl>
Date: Thu, 30 Aug 2018 17:19:10 -0300
Subject: balance components using selectors

---
 ui/app/components/transaction-list/transaction-list.component.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'ui/app/components/transaction-list')

diff --git a/ui/app/components/transaction-list/transaction-list.component.js b/ui/app/components/transaction-list/transaction-list.component.js
index 79d9d1445..c864fea3b 100644
--- a/ui/app/components/transaction-list/transaction-list.component.js
+++ b/ui/app/components/transaction-list/transaction-list.component.js
@@ -45,8 +45,7 @@ export default class TransactionList extends PureComponent {
 
   renderTransactions () {
     const { t } = this.context
-    const { pendingTransactions = [], completedTransactions = [], assetImages } = this.props
-    console.log('REMDERING FROM TX LIST', assetImages)
+    const { pendingTransactions = [], completedTransactions = [] } = this.props
     return (
       <div className="transaction-list__transactions">
         {
-- 
cgit