Merge pull request #369 from LiskHQ/359-console-error

Solve console error and remove empty list message - Closes #359 Closes #295
LiskHQ · Feb 14, 2018 · 67a0e76 · 67a0e76
2 parents cd2aa9c + 0a5e486
commit 67a0e76
Showing 1 changed file with 10 additions and 10 deletions.
diff --git 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;
   }
 }