Merge pull request #1492 from LiskHQ/1404-rename-activePeer

Rename active peer - Closes #1404

docs/REDUX_ACTIONS.md

@@ -42,7 +42,7 @@ When entering actions execution order:
 ![alt text](assets/login_screen.png "Login Screen")
 
 After clicking `Log in` it executes:
-- [`activePeerSet`](https://github.com/LiskHQ/lisk-hub/blob/86ab1874d89519a37d817c326c37d594f29b94eb/src/components/login/index.js#L28) with passphrase<br/>
+- [`liskAPIClientSet`](https://github.com/LiskHQ/lisk-hub/blob/d2207d4e8cab7776bf6fc3b3544afb8808866fac/src/components/login/index.js#L27) with passphrase<br/>
   ↪️ Login Middleware<br/>
   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;⬇️ [`getAccount`](https://github.com/LiskHQ/lisk-hub/blob/ea41bf3a898b2955de2d39e3a2bdd79ad150842e/src/store/middlewares/login.js#L31)<br/>
   &nbsp;&nbsp;&nbsp;&nbsp;
@@ -68,15 +68,15 @@ After clicking `Logout` it executes:
 
 
 After clicking `Send` it executes:
-- Calls [`activePeer.transactions.broadcast(transaction)`](https://github.com/LiskHQ/lisk-hub/blob/e71527bd273af2f16d6980fe3b0c1a379694c45b/src/utils/api/transactions.js#L17) and then dispatches [`TRANSACTION_ADDED`](https://github.com/LiskHQ/lisk-hub/blob/2811c2be14fe5ab4ead3e4a375b20b67348fc191/src/store/reducers/transactions.js#L10)
+- Calls [`liskAPIClient.transactions.broadcast(transaction)`](https://github.com/LiskHQ/lisk-hub/blob/e71527bd273af2f16d6980fe3b0c1a379694c45b/src/utils/api/transactions.js#L17) and then dispatches [`TRANSACTION_ADDED`](https://github.com/LiskHQ/lisk-hub/blob/d2207d4e8cab7776bf6fc3b3544afb8808866fac/src/store/reducers/transactions.js#L10)
 
 
 ### Delegates voting
 ![alt text](assets/voting_confirm_screen.png "Voting Screen")
 
 
 After clicking `Confirm` it executes:
-- Calls [`activePeer.transactions.broadcast(transaction)`](https://github.com/LiskHQ/lisk-hub/blob/e71527bd273af2f16d6980fe3b0c1a379694c45b/src/utils/api/delegate.js#L34) and then dispatches [`TRANSACTION_ADDED`](https://github.com/LiskHQ/lisk-hub/blob/2811c2be14fe5ab4ead3e4a375b20b67348fc191/src/store/reducers/transactions.js#L10)
+- Calls [`liskAPIClient.transactions.broadcast(transaction)`](https://github.com/LiskHQ/lisk-hub/blob/e71527bd273af2f16d6980fe3b0c1a379694c45b/src/utils/api/delegate.js#L34) and then dispatches [`TRANSACTION_ADDED`](https://github.com/LiskHQ/lisk-hub/blob/d2207d4e8cab7776bf6fc3b3544afb8808866fac/src/utils/api/delegate.js#L36)
 
 On delegate select/uselect it executes:
 - On Select -- [`voteToggled`](https://github.com/LiskHQ/lisk-hub/blob/d27796d57eb9246fae5876f02b242e6bb8343775/src/store/reducers/voting.js#L76) it adds to `voting.votes` redux new voted delegate object
@@ -87,7 +87,7 @@ On delegate select/uselect it executes:
 
 
 After going thru whole process and clicking `Confirm` it executes:
-- Calls [`activePeer.transactions.broadcast(transaction)`](https://github.com/LiskHQ/lisk-hub/blob/e71527bd273af2f16d6980fe3b0c1a379694c45b/src/utils/api/transactions.js#L17) and then dispatches [`TRANSACTION_ADDED`](https://github.com/LiskHQ/lisk-hub/blob/2811c2be14fe5ab4ead3e4a375b20b67348fc191/src/store/reducers/transactions.js#L10)
+- Calls [`liskAPIClient.transactions.broadcast(transaction)`](https://github.com/LiskHQ/lisk-hub/blob/e71527bd273af2f16d6980fe3b0c1a379694c45b/src/utils/api/transactions.js#L17) and then dispatches [`TRANSACTION_ADDED`](https://github.com/LiskHQ/lisk-hub/blob/d2207d4e8cab7776bf6fc3b3544afb8808866fac/src/store/reducers/transactions.js#L10)
 
 
 ## Socket

i18n/locales/en/common.json

@@ -305,7 +305,6 @@
   "Sender": "Sender",
   "Session timeout": "Session timeout",
   "Session timeout in": "Session timeout in",
-  "Set max. amount": "Set max. amount",
   "Set up Lisk Hub and your account.": "Set up Lisk Hub and your account.",
   "Settings": "Settings",
   "Show more": "Show more",

src/actions/account.js

@@ -5,7 +5,7 @@ import { registerDelegate, getDelegate, getAllVotes, getVoters } from '../utils/
 import { loadTransactionsFinish, transactionsUpdated } from './transactions';
 import { delegateRegisteredFailure } from './delegate';
 import { errorAlertDialogDisplayed } from './dialog';
-import { activePeerUpdate } from './peers';
+import { liskAPIClientUpdate } from './peers';
 import { getTimeOffset } from '../utils/hacks';
 import Fees from '../constants/fees';
 import transactionTypes from '../constants/transactionTypes';
@@ -69,8 +69,8 @@ export const passphraseUsed = data => ({
  */
 export const accountVotesFetched = ({ address }) =>
   (dispatch, getState) => {
-    const activePeer = getState().peers.data;
-    return getAllVotes(activePeer, address).then(({ data }) => {
+    const liskAPIClient = getState().peers.liskAPIClient;
+    return getAllVotes(liskAPIClient, address).then(({ data }) => {
       dispatch({
         type: actionTypes.accountAddVotes,
         votes: data.votes,
@@ -83,8 +83,8 @@ export const accountVotesFetched = ({ address }) =>
  */
 export const accountVotersFetched = ({ publicKey }) =>
   (dispatch, getState) => {
-    const activePeer = getState().peers.data;
-    return getVoters(activePeer, { publicKey }).then(({ data }) => {
+    const liskAPIClient = getState().peers.liskAPIClient;
+    return getVoters(liskAPIClient, { publicKey }).then(({ data }) => {
       dispatch({
         type: actionTypes.accountAddVoters,
         voters: data,
@@ -96,9 +96,9 @@ export const accountVotersFetched = ({ publicKey }) =>
  */
 export const secondPassphraseRegistered = ({ secondPassphrase, account, passphrase }) =>
   (dispatch, getState) => {
-    const activePeer = getState().peers.data;
+    const liskAPIClient = getState().peers.liskAPIClient;
     const timeOffset = getTimeOffset(getState());
-    setSecondPassphrase(activePeer, secondPassphrase, account.publicKey, passphrase, timeOffset)
+    setSecondPassphrase(liskAPIClient, secondPassphrase, account.publicKey, passphrase, timeOffset)
       .then((data) => {
         dispatch({
           data: {
@@ -120,8 +120,8 @@ export const secondPassphraseRegistered = ({ secondPassphrase, account, passphra
 
 export const updateDelegateAccount = ({ publicKey }) =>
   (dispatch, getState) => {
-    const activePeer = getState().peers.data;
-    return getDelegate(activePeer, { publicKey })
+    const liskAPIClient = getState().peers.liskAPIClient;
+    return getDelegate(liskAPIClient, { publicKey })
       .then((response) => {
         dispatch(accountUpdated(Object.assign(
           {},
@@ -138,8 +138,8 @@ export const delegateRegistered = ({
 }) =>
   (dispatch, getState) => {
     const timeOffset = getTimeOffset(getState());
-    const activePeer = getState().peers.data;
-    registerDelegate(activePeer, username, passphrase, secondPassphrase, timeOffset)
+    const liskAPIClient = getState().peers.liskAPIClient;
+    registerDelegate(liskAPIClient, username, passphrase, secondPassphrase, timeOffset)
       .then((data) => {
         // dispatch to add to pending transaction
         dispatch({
@@ -163,8 +163,8 @@ export const delegateRegistered = ({
 
 export const loadDelegate = ({ publicKey }) =>
   (dispatch, getState) => {
-    const activePeer = getState().peers.data;
-    getDelegate(activePeer, { publicKey }).then((response) => {
+    const liskAPIClient = getState().peers.liskAPIClient;
+    getDelegate(liskAPIClient, { publicKey }).then((response) => {
       dispatch({
         data: {
           delegate: response.delegate,
@@ -180,8 +180,8 @@ export const loadAccount = ({
   isSameAccount,
 }) =>
   (dispatch, getState) => {
-    const activePeer = getState().peers.data;
-    getAccount(activePeer, address)
+    const liskAPIClient = getState().peers.liskAPIClient;
+    getAccount(liskAPIClient, address)
       .then((response) => {
         let accountDataUpdated = {
           confirmed: transactionsResponse.data,
@@ -228,8 +228,8 @@ export const accountDataUpdated = ({
   account, windowIsFocused, transactions,
 }) =>
   (dispatch, getState) => {
-    const activePeer = getState().peers.data;
-    getAccount(activePeer, account.address).then((result) => {
+    const liskAPIClient = getState().peers.liskAPIClient;
+    getAccount(liskAPIClient, account.address).then((result) => {
       if (result.balance !== account.balance) {
         dispatch(updateTransactionsIfNeeded(
           {
@@ -240,8 +240,8 @@ export const accountDataUpdated = ({
         ));
       }
       dispatch(accountUpdated(result));
-      dispatch(activePeerUpdate({ online: true }));
+      dispatch(liskAPIClientUpdate({ online: true }));
     }).catch((res) => {
-      dispatch(activePeerUpdate({ online: false, code: res.error.code }));
+      dispatch(liskAPIClientUpdate({ online: false, code: res.error.code }));
     });
   };

src/actions/account.test.js

@@ -70,7 +70,7 @@ describe('actions: account', () => {
       accountApiMock = stub(accountApi, 'setSecondPassphrase');
       dispatch = spy();
       getState = () => ({
-        peers: { data: {} },
+        peers: { liskAPIClient: {} },
       });
       i18nextMock = stub(i18next, 't');
       i18next.t = key => key;
@@ -137,7 +137,7 @@ describe('actions: account', () => {
       delegateApiMock = stub(delegateApi, 'registerDelegate');
       dispatch = spy();
       getState = () => ({
-        peers: { data: {} },
+        peers: { liskAPIClient: {} },
         blocks: { latestBlocks: [] },
       });
     });
@@ -198,7 +198,7 @@ describe('actions: account', () => {
       delegateApiMock = stub(delegateApi, 'getDelegate');
       dispatch = spy();
       getState = () => ({
-        peers: { data: {} },
+        peers: { liskAPIClient: {} },
       });
     });
 
@@ -247,7 +247,7 @@ describe('actions: account', () => {
       getAccountStub = stub(accountApi, 'getAccount').returnsPromise();
       transactionsActionsStub = spy(transactionsActions, 'loadTransactionsFinish');
       getState = () => ({
-        peers: { data: {} },
+        peers: { liskAPIClient: {} },
       });
     });
 
@@ -312,11 +312,11 @@ describe('actions: account', () => {
     const dispatch = spy();
 
     beforeEach(() => {
-      peersActionsStub = spy(peersActions, 'activePeerUpdate');
+      peersActionsStub = spy(peersActions, 'liskAPIClientUpdate');
       getAccountStub = stub(accountApi, 'getAccount').returnsPromise();
       transactionsActionsStub = spy(transactionsActions, 'transactionsUpdated');
       getState = () => ({
-        peers: { data: {} },
+        peers: { liskAPIClient: {} },
       });
     });
 
@@ -373,7 +373,7 @@ describe('actions: account', () => {
     beforeEach(() => {
       transactionsActionsStub = spy(transactionsActions, 'transactionsUpdated');
       getState = () => ({
-        peers: { data: {} },
+        peers: { liskAPIClient: {} },
       });
     });
 
@@ -409,7 +409,7 @@ describe('actions: account', () => {
     beforeEach(() => {
       stub(delegateApi, 'getDelegate').returnsPromise();
       getState = () => ({
-        peers: { data: {} },
+        peers: { liskAPIClient: {} },
       });
     });
 

src/actions/delegate.js

@@ -24,9 +24,9 @@ export const delegateRetrieving = data => ({
  */
 export const delegatesFetched = ({ username }) =>
   (dispatch, getState) => {
-    const activePeer = getState().peers.data;
+    const liskAPIClient = getState().peers.liskAPIClient;
     dispatch(delegateRetrieving());
-    getDelegate(activePeer, { username })
+    getDelegate(liskAPIClient, { username })
       .then((response) => {
         if (response.data.length > 0) {
           dispatch(delegateRetrieved({ delegate: response.data[0], username }));

src/actions/delegate.test.js

@@ -21,7 +21,7 @@ describe('actions: delegate', () => {
       getDelegateStub = sinon.stub(delegateApi, 'getDelegate');
       dispatch = sinon.spy();
       getState = () => ({
-        peers: { data: {} },
+        peers: { liskAPIClient: {} },
       });
     });
 

src/actions/followedAccounts.js

@@ -23,8 +23,8 @@ export const followedAccountsRetrieved = accounts => ({
 
 export const followedAccountFetchedAndUpdated = ({ account }) =>
   (dispatch, getState) => {
-    const activePeer = getState().peers.data;
-    getAccount(activePeer, account.address).then((result) => {
+    const liskAPIClient = getState().peers.liskAPIClient;
+    getAccount(liskAPIClient, account.address).then((result) => {
       if (result.balance !== account.balance) {
         account.balance = result.balance;
         dispatch(followedAccountUpdated(account));

src/actions/followedAccounts.test.js

@@ -19,7 +19,7 @@ describe('actions: followedAccount', () => {
     title: accounts.genesis.address,
   };
   const getState = () => ({
-    peers: { data: {} },
+    peers: { liskAPIClient: {} },
   });
 
   it('should create an action to retrieve the followed accounts list', () => {

src/actions/peers.js

@@ -15,11 +15,11 @@ const peerSet = (data, config) => ({
   data: Object.assign({
     passphrase: data.passphrase,
     publicKey: data.publicKey,
-    activePeer: new Lisk.APIClient(config.nodes, { nethash: config.nethash }),
+    liskAPIClient: new Lisk.APIClient(config.nodes, { nethash: config.nethash }),
     options: config,
     loginType: data.loginType,
   }),
-  type: actionTypes.activePeerSet,
+  type: actionTypes.liskAPIClientSet,
 });
 
 const login = (dispatch, getState, data, config) => {
@@ -29,7 +29,7 @@ const login = (dispatch, getState, data, config) => {
     const { passphrase } = data;
     const { code } = data.network;
     const publicKey = passphrase ? extractPublicKey(passphrase) : data.publicKey;
-    const activePeer = store.peers.data ||
+    const liskAPIClient = store.peers.liskAPIClient ||
       new Lisk.APIClient(config.nodes, { nethash: config.nethash });
     const address = extractAddress(publicKey);
     const accountBasics = {
@@ -43,7 +43,7 @@ const login = (dispatch, getState, data, config) => {
     dispatch(accountLoading());
 
     // redirect to main/transactions
-    getAccount(activePeer, address).then((accountData) => {
+    getAccount(liskAPIClient, address).then((accountData) => {
       const duration = (passphrase && store.settings.autoLog) ?
         Date.now() + lockDuration : 0;
       const accountUpdated = {
@@ -75,7 +75,7 @@ const login = (dispatch, getState, data, config) => {
  * @param {Object} data - Active peer data and the passphrase of account
  * @returns {Object} Action object
  */
-export const activePeerSet = data =>
+export const liskAPIClientSet = data =>
   (dispatch, getState) => {
     const config = data.network || {};
 
@@ -119,7 +119,7 @@ export const activePeerSet = data =>
  * @param {Object} data - Active peer data
  * @returns {Object} Action object
  */
-export const activePeerUpdate = data => ({
+export const liskAPIClientUpdate = data => ({
   data,
-  type: actionTypes.activePeerUpdate,
+  type: actionTypes.liskAPIClientUpdate,
 });