Merge pull request #809 from LiskHQ/808-issue-in-transactions-load-more

Hot fix for loading transactions for the first time - Closes #808
LiskArchive · Oct 4, 2017 · 4ec0fb0 · 4ec0fb0
2 parents 6e1cfcd + ef0d4b1
commit 4ec0fb0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/components/transactions/transactions.js b/src/components/transactions/transactions.js
@@ -27,7 +27,8 @@ class Transactions extends React.Component {
   }
 
   componentDidUpdate() {
-    this.canLoadMore = this.props.count > this.props.transactions.length;
+    const { count, transactions } = this.props;
+    this.canLoadMore = count === null || count > transactions.length;
   }
 
   render() {

diff --git a/src/store/reducers/transactions.js b/src/store/reducers/transactions.js
@@ -5,7 +5,7 @@ import actionTypes from '../../constants/actions';
  * @param {Array} state
  * @param {Object} action
  */
-const transactions = (state = { pending: [], confirmed: [], count: 0 }, action) => {
+const transactions = (state = { pending: [], confirmed: [], count: null }, action) => {
   switch (action.type) {
     case actionTypes.transactionAdded:
       return Object.assign({}, state, {