Prevent wallet from listing unrelated transactions

LiskHQ · Feb 8, 2018 · 968a0e8 · 968a0e8
1 parent b8ea748
commit 968a0e8
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/store/middlewares/account.js b/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 => (