Merge pull request #297 from LiskHQ/278-extra-transactions-in-wallet

Fix wallet displays some extra transactions - Closes #278

src/components/accountTransactions/index.js

@@ -21,15 +21,20 @@ class accountTransactions extends React.Component {
         <Send/>
       </div>
       <div className={`${grid['col-sm-12']} ${styles.transactions} ${grid['col-md-8']}`}>
-        <Transactions address={this.props.match.params.address} />
+        <Transactions
+          address={this.props.match.params.address}
+          balance={this.props.balance} />
       </div>
     </div>;
   }
 }
 
+const mapStateToProps = state => ({
+  balance: state.transactions.account ? state.transactions.account.balance : null,
+});
+
 const mapDispatchToProps = dispatch => ({
   transactionsRequestInit: data => dispatch(transactionsRequestInit(data)),
 });
 
-
-export default connect(null, mapDispatchToProps)(translate()(accountTransactions));
+export default connect(mapStateToProps, mapDispatchToProps)(translate()(accountTransactions));

src/components/app/index.js

@@ -8,7 +8,7 @@ import Login from '../login';
 import Register from '../register';
 import Search from '../search';
 import TransactionDashboard from '../transactionDashboard';
-import accountTransactions from '../accountTransactions';
+import AccountTransactions from '../accountTransactions';
 import Voting from '../voting';
 import Forging from '../forging';
 import SingleTransaction from './../singleTransaction';
@@ -49,7 +49,7 @@ const App = () => (
             <Route path='/explorer' render={ ({ match }) => (
               <main>
                 <Route path={`${match.url}${routes.search.short}/:dialog?`} component={Search} />
-                <Route path={`${match.url}${routes.account.short}/:address?`} component={accountTransactions} />
+                <Route path={`${match.url}${routes.account.short}/:address?`} component={AccountTransactions} />
                 <Route path={`${match.url}${routes.transaction.short}/:id`} component={SingleTransaction} />
               </main>
             )} />

src/components/transactionDashboard/index.js

@@ -13,14 +13,15 @@ class TransactionsDashboard extends React.Component {
         <Send/>
       </div>
       <div className={`${grid['col-sm-12']} ${styles.transactions} ${grid['col-md-8']}`}>
-        <Transactions address={this.props.accountAddress} />
+        <Transactions {...this.props} />
       </div>
     </div>;
   }
 }
 
 const mapStateToProps = state => ({
-  accountAddress: state.account.address,
+  address: state.account.address,
+  balance: state.account.balance,
 });
 
 export default connect(mapStateToProps)(TransactionsDashboard);

src/components/transactions/index.js

@@ -4,8 +4,6 @@ import { transactionsRequested, transactionsFilterSet } from '../../actions/tran
 import Transactions from './transactions';
 
 const mapStateToProps = state => ({
-  balance: state.transactions.account ? state.transactions.account.balance : null,
-  accountAddress: state.account.address,
   activePeer: state.peers.data,
   transactions: [...state.transactions.pending, ...state.transactions.confirmed],
   count: state.transactions.count,

src/components/transactions/index.test.js

@@ -44,7 +44,6 @@ describe('TransactionsHOC', () => {
 
   it('should mount Transactions with appropriate properties', () => {
     const props = wrapper.find('Transactions').first().props();
-    expect(props.accountAddress).to.be.equal(account.address);
     expect(props.activePeer).to.be.equal(peers.data);
     expect(props.transactions).to.deep.equal([...transactions, ...pending]);
     expect(props.count).to.be.equal(transactions.count);

src/store/middlewares/account.js

@@ -12,13 +12,15 @@ import transactionTypes from '../../constants/transactionTypes';
 const { lockDuration } = accountConfig;
 
 const updateTransactions = (store, peers) => {
-  const filter = store.getState().transactions.filter;
-  const address = store.getState().transactions.address;
-  getTransactions({ activePeer: peers.data, address, limit: 25, filter })
-    .then(response => store.dispatch(transactionsUpdated({
-      confirmed: response.transactions,
-      count: parseInt(response.count, 10),
-    })));
+  const state = store.getState();
+  const { filter } = state.transactions;
+  const address = state.transactions.address ? state.transactions.address : state.account.address;
+  getTransactions({
+    activePeer: peers.data, address, limit: 25, filter,
+  }).then(response => store.dispatch(transactionsUpdated({
+    confirmed: response.transactions,
+    count: parseInt(response.count, 10),
+  })));
 };
 
 const hasRecentTransactions = txs => (