Merge branch '0.2.0' into development

package.json

@@ -54,7 +54,7 @@
     "lisk-js": "0.5.1",
     "lodash.throttle": "4.1.1",
     "moment": "2.20.1",
-    "numeral": "=2.0.6",
+    "numeral": "git+https://github.com/LiskHQ/Numeral-js.git",
     "parallax-js": "3.1.0",
     "popmotion": "7.8.2",
     "popmotion-react": "1.1.1",

src/store/middlewares/account.js

@@ -13,7 +13,10 @@ const { lockDuration } = accountConfig;
 const updateTransactions = (store, peers) => {
   const state = store.getState();
   const { filter } = state.transactions;
-  const address = state.transactions.address ? state.transactions.address : state.account.address;
+  const address = state.transactions.account
+    ? state.transactions.account.address
+    : state.account.address;
+
   getTransactions({
     activePeer: peers.data, address, limit: 25, filter,
   }).then(response => store.dispatch(transactionsUpdated({

src/store/middlewares/account.test.js

@@ -75,6 +75,7 @@ describe('Account middleware', () => {
           id: 12498250891724098,
         }],
         confirmed: [],
+        account: { address: 'test_address' },
       },
     };
     store.getState = () => (state);
@@ -150,7 +151,7 @@ describe('Account middleware', () => {
     middleware(store)(next)(newBlockCreated);
 
     expect(stubGetAccount).to.have.been.calledWith();
-    expect(stubTransactions).to.have.been.calledWith();
+    expect(stubTransactions).to.have.been.calledWith(match({ address: 'test_address' }));
   });
 
   it(`should call transactions API methods on ${actionTypes.newBlockCreated} action if block.transactions contains null element`, () => {