From 0a5e4864dd4efa16c27d8f459a9efe4b1d1f3c8f Mon Sep 17 00:00:00 2001
From: Gina Contrino <gina@lightcurve.io>
Date: Wed, 14 Feb 2018 19:51:28 +0100
Subject: [PATCH] Solve console error and remove empty list message

---
 .../transactions/transactionList.js           | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/transactions/transactionList.js b/src/components/transactions/transactionList.js
index 0271b8d6c7..93f45e2c6b 100644
--- a/src/components/transactions/transactionList.js
+++ b/src/components/transactions/transactionList.js
@@ -45,22 +45,22 @@ class TransactionsList extends React.Component {
           this.isLargeScreen()
             ? <Waypoint bottomOffset='-80%'
               key={this.props.transactions.length}
-              onEnter={() => { this.props.loadMore(); }}></Waypoint>
+              onEnter={() => {
+                if (this.props.loadMore) {
+                  this.props.loadMore();
+                }
+              }}></Waypoint>
             : null
         }
       </div>;
-    } else if (!this.props.loadMore) {
+    } else if (!this.props.filter || this.props.filter.value !== txFilters.all) {
       return <p className={`${styles.empty} hasPaddingRow empty-message`}>
-        {this.props.t('There are no transactions yet.')}
+        {this.props.t('There are no {{filterName}} transactions.', {
+          filterName: this.props.filter && this.props.filter.name ? this.props.filter.name.toLowerCase() : '',
+        })}
       </p>;
-    } else if (!this.props.filter || this.props.filter === txFilters.all) {
-      return null;
     }
-    return <p className={`${styles.empty} hasPaddingRow empty-message`}>
-      {this.props.t('There are no {{filterName}} transactions.', {
-        filterName: this.props.filter && this.props.filter.name ? this.props.filter.name.toLowerCase() : '',
-      })}
-    </p>;
+    return null;
   }
 }