From 86df8d259ff0c3550786d86ddc553df665fcb851 Mon Sep 17 00:00:00 2001 From: Keith Date: Thu, 25 Apr 2019 21:27:05 +0800 Subject: [PATCH] refactor: rename constants as naming convention --- .../NetworkSetting/RemoveNetworkDialog.tsx | 4 ++-- .../MainContent/actionCreators/networks.ts | 6 +++--- packages/neuron-ui/src/utils/const.ts | 15 ++------------- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/packages/neuron-ui/src/components/NetworkSetting/RemoveNetworkDialog.tsx b/packages/neuron-ui/src/components/NetworkSetting/RemoveNetworkDialog.tsx index ae2572786a..b4ced1ae5e 100644 --- a/packages/neuron-ui/src/components/NetworkSetting/RemoveNetworkDialog.tsx +++ b/packages/neuron-ui/src/components/NetworkSetting/RemoveNetworkDialog.tsx @@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next' import { MainActions, actionCreators } from 'containers/MainContent/reducer' import { Network } from 'contexts/NeuronWallet' -import { UnremovableNetwork } from 'utils/const' +import { UNREMOVABLE_NETWORK } from 'utils/const' const RemoveNetworkDialog = ({ isChecked, @@ -29,7 +29,7 @@ const RemoveNetworkDialog = ({ {`Network of name: ${network.name}, address: ${network.remote} will be removed.`} {isChecked ? ( -

{`It's the active network, removing it will make reconnect to ${UnremovableNetwork}`}

+

{`It's the active network, removing it will make reconnect to ${UNREMOVABLE_NETWORK}`}

) : null}
diff --git a/packages/neuron-ui/src/containers/MainContent/actionCreators/networks.ts b/packages/neuron-ui/src/containers/MainContent/actionCreators/networks.ts index ba728442fb..531d1a97df 100644 --- a/packages/neuron-ui/src/containers/MainContent/actionCreators/networks.ts +++ b/packages/neuron-ui/src/containers/MainContent/actionCreators/networks.ts @@ -1,7 +1,7 @@ import { Network } from 'contexts/NeuronWallet' import { networksCall } from 'services/UILayer' -import { Message, MAX_NETWORK_NAME_LENGTH, UnremovableNetworkId, UnremovableNetwork } from 'utils/const' +import { Message, MAX_NETWORK_NAME_LENGTH, UNREMOVABLE_NETWORK_ID, UNREMOVABLE_NETWORK } from 'utils/const' import i18n from 'utils/i18n' import { MainActions } from '../reducer' @@ -71,10 +71,10 @@ export default { }, deleteNetwork: (id?: string) => { if (id === undefined) throw new Error('No network id found') - if (id === UnremovableNetworkId) { + if (id === UNREMOVABLE_NETWORK_ID) { return { type: MainActions.ErrorMessage, - payload: { networks: i18n.t(`messages.is-unremovable`, { target: UnremovableNetwork }) }, + payload: { networks: i18n.t(`messages.is-unremovable`, { target: UNREMOVABLE_NETWORK }) }, } } networksCall.delete(id) diff --git a/packages/neuron-ui/src/utils/const.ts b/packages/neuron-ui/src/utils/const.ts index de14ef51c8..c793c39e76 100644 --- a/packages/neuron-ui/src/utils/const.ts +++ b/packages/neuron-ui/src/utils/const.ts @@ -2,19 +2,8 @@ export const MAX_NETWORK_NAME_LENGTH = 28 export const ADDRESS_LENGTH = 40 export const PAGE_SIZE = 15 export const EXPLORER = 'http://localhost:3000' -export const UnremovableNetwork = 'Testnet' -export const UnremovableNetworkId = '0' - -export const DEFAULT_NETWORKS = [ - { - name: 'Testnet', - remote: 'http://localhost:8114', - }, - { - name: 'Localhost', - remote: 'http://localhost:8114', - }, -] +export const UNREMOVABLE_NETWORK = 'Testnet' +export const UNREMOVABLE_NETWORK_ID = '0' export enum ConnectStatus { Online = 'online',