Enable users to enter Lisk Service URL in network switcher - Closes #3475

i18n/locales/en/common.json

@@ -456,8 +456,8 @@
   "Try again": "Try again",
   "Twitter": "Twitter",
   "Type": "Type",
+  "Unable to connect to Lisk Service, please check the address and try again": "Unable to connect to Lisk Service, please check the address and try again",
   "Unable to connect to the node, no response from the server.": "Unable to connect to the node, no response from the server.",
-  "Unable to connect to the node, please check the address and try again": "Unable to connect to the node, please check the address and try again",
   "Undo": "Undo",
   "Unlock": "Unlock",
   "Unnamed account": "Unnamed account",

src/components/screens/login/login.js

@@ -20,13 +20,13 @@ import styles from './login.css';
 class Login extends React.Component {
   constructor() { // eslint-disable-line max-statements
     super();
-    const { liskCoreUrl } = getAutoLogInData();
+    const { liskServiceUrl } = getAutoLogInData();
     let loginNetwork = findMatchingLoginNetwork();
     let address = '';
 
     if (!loginNetwork) {
-      loginNetwork = liskCoreUrl ? networks.customNode : networks[networkKeys.mainNet];
-      address = liskCoreUrl || '';
+      loginNetwork = liskServiceUrl ? networks.customNode : networks[networkKeys.mainNet];
+      address = liskServiceUrl || '';
     }
 
     this.state = {

src/components/screens/login/networkSelector/networkSelector.js

@@ -27,9 +27,9 @@ const getNetwork = (name, url) => {
 };
 
 const getInitialState = (address) => {
-  const { liskCoreUrl } = getAutoLogInData();
+  const { liskServiceUrl } = getAutoLogInData();
   return {
-    address: liskCoreUrl || address,
+    address: liskServiceUrl || address,
     connected: true,
     isValid: true,
     isCustomSelected: false,
@@ -115,7 +115,7 @@ const NetworkSelector = ({
     isValidationLoading,
   } = state;
 
-  const validationError = isValid ? '' : t('Unable to connect to the node, please check the address and try again');
+  const validationError = isValid ? '' : t('Unable to connect to Lisk Service, please check the address and try again');
 
   return (
     <DropdownButton

src/constants/settings.js

@@ -3,6 +3,7 @@ const settings = {
   keys: {
     loginKey: 'loginKey',
     liskCoreUrl: 'liskCoreUrl',
+    liskServiceUrl: 'liskServiceUrl',
   },
 };
 export default settings;

src/store/middlewares/account.js

@@ -106,10 +106,10 @@ const autoLogInIfNecessary = async ({ dispatch, getState }) => {
   } = getState().settings;
   const autoLoginData = getAutoLogInData();
 
-  const address = autoLoginData[settings.keys.liskCoreUrl];
+  const address = autoLoginData[settings.keys.liskServiceUrl];
   const network = address
     ? { name: networkKeys.customNode, address }
-    : { name: networkKeys.mainNet, address: networks.mainnet.nodes[0] };
+    : { name: networkKeys.mainNet, address: networks.mainnet.serviceUrl };
   dispatch(networkSelected(network));
   dispatch(networkStatusUpdated({ online: true }));
 

src/utils/api/network/lsk.js

@@ -28,14 +28,7 @@ const getServiceUrl = ({ name, address = 'http://localhost:4000' }) => {
   if ([networkKeys.mainNet, networkKeys.testNet].includes(name)) {
     return networks[name].serviceUrl;
   }
-  if (name === networkKeys.customNode) {
-    const serviceUrl = window.localStorage.getItem('serviceUrl');
-    if (serviceUrl) {
-      return serviceUrl;
-    }
-    return address.replace(/:\d{2,4}/, ':9901');
-  }
-  throw Error('The node url entered does not have a corresponding service url');
+  return address;
 };
 
 /**

src/utils/login.js

@@ -35,16 +35,16 @@ export const validateUrl = (value) => {
 // Ignore coverage because this is only development feature
 export const getAutoLogInData = /* istanbul ignore next */ () => ({
   [settings.keys.loginKey]: localStorage.getItem(settings.keys.loginKey),
-  [settings.keys.liskCoreUrl]: localStorage.getItem(settings.keys.liskCoreUrl),
+  [settings.keys.liskServiceUrl]: localStorage.getItem(settings.keys.liskServiceUrl),
 });
 
 // Ignore coverage because this is only development feature
 export const shouldAutoLogIn = /* istanbul ignore next */ autologin =>
-  autologin[settings.keys.liskCoreUrl] && autologin[settings.keys.liskCoreUrl] !== ''
+  autologin[settings.keys.liskServiceUrl] && autologin[settings.keys.liskServiceUrl] !== ''
     && autologin[settings.keys.loginKey] && autologin[settings.keys.loginKey] !== '';
 
 export const findMatchingLoginNetwork = () => {
-  const { liskCoreUrl } = getAutoLogInData();
+  const { liskServiceUrl } = getAutoLogInData();
   return Object.values(networks).find(({ nodes }) =>
-    (Array.isArray(nodes) ? nodes.includes(liskCoreUrl) : false));
+    (Array.isArray(nodes) ? nodes.includes(liskServiceUrl) : false));
 };

test/cypress/support/commands.js

@@ -61,6 +61,6 @@ Cypress.Commands.add('addObjectToLocalStorage', (item, key, value) => {
 });
 
 Cypress.Commands.add('autologin', (passphrase, network) => {
-  localStorage.setItem('liskCoreUrl', network);
+  localStorage.setItem('liskServiceUrl', network);
   localStorage.setItem('loginKey', passphrase);
 });