From 848fe7b7600250eb3196c67d36d19e98c6f042a1 Mon Sep 17 00:00:00 2001 From: James Chen Date: Sat, 9 Nov 2019 20:23:38 +0900 Subject: [PATCH 1/3] feat: Finalize testnet explorer URL --- packages/neuron-ui/src/components/Transaction/index.tsx | 5 +++-- packages/neuron-wallet/src/models/chain-info.ts | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/neuron-ui/src/components/Transaction/index.tsx b/packages/neuron-ui/src/components/Transaction/index.tsx index 54b83c0b54..b14dae6c1b 100644 --- a/packages/neuron-ui/src/components/Transaction/index.tsx +++ b/packages/neuron-ui/src/components/Transaction/index.tsx @@ -246,9 +246,10 @@ const Transaction = () => { }) }, []) - // TODO: add conditional branch on mainnet and testnet const onExplorerBtnClick = useCallback(() => { - openExternal(`https://explorer.nervos.org/transaction/${transaction.hash}`) + const isMainnet = false // TODO: add conditional branch on mainnet and testnet + const explorerUrl = isMainnet ? 'https://explorer.nervos.org' : 'https://explorer.nervos.org/testnet' + openExternal(`${explorerUrl}/transaction/${transaction.hash}`) }, [transaction.hash]) const basicInfoItems = useMemo( diff --git a/packages/neuron-wallet/src/models/chain-info.ts b/packages/neuron-wallet/src/models/chain-info.ts index d5fbf6394b..630fc3ac22 100644 --- a/packages/neuron-wallet/src/models/chain-info.ts +++ b/packages/neuron-wallet/src/models/chain-info.ts @@ -27,6 +27,6 @@ export default class ChainInfo { if (this.isMainnet()) { return "https://explorer.nervos.org" } - return "https://explorer.nervos.org" // TODO: change this to proper testnet explorer URL + return "https://explorer.nervos.org/testnet" } } From ffedca73da62d6640111ba412c74bcf988c581ad Mon Sep 17 00:00:00 2001 From: Keith Date: Sun, 10 Nov 2019 13:35:51 +0800 Subject: [PATCH 2/3] fix(neuron-ui): fix the address prefix on tx view according to the chain type. --- packages/neuron-ui/src/components/Addresses/index.tsx | 4 ++-- packages/neuron-ui/src/components/Transaction/index.tsx | 6 ++---- packages/neuron-ui/src/utils/const.ts | 1 + 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/neuron-ui/src/components/Addresses/index.tsx b/packages/neuron-ui/src/components/Addresses/index.tsx index 2ef12764cb..0afdffb770 100644 --- a/packages/neuron-ui/src/components/Addresses/index.tsx +++ b/packages/neuron-ui/src/components/Addresses/index.tsx @@ -20,6 +20,7 @@ import { StateWithDispatch } from 'states/stateProvider/reducer' import { useLocalDescription } from 'utils/hooks' import { localNumberFormatter, shannonToCKBFormatter } from 'utils/formatters' import { onRenderRow } from 'utils/fabricUIRender' +import { MAINNET_TAG } from 'utils/const' const Addresses = ({ app: { @@ -30,8 +31,7 @@ const Addresses = ({ settings: { networks = [] }, dispatch, }: React.PropsWithoutRef) => { - const isMainnet = - (networks.find(n => n.id === networkID) || {}).chain === (process.env.REACT_APP_MAINNET_TAG || 'ckb') + const isMainnet = (networks.find(n => n.id === networkID) || {}).chain === MAINNET_TAG const [showMainnetAddress, setShowMainnetAddress] = useState(false) const [t] = useTranslation() diff --git a/packages/neuron-ui/src/components/Transaction/index.tsx b/packages/neuron-ui/src/components/Transaction/index.tsx index 54b83c0b54..7e8287d8a0 100644 --- a/packages/neuron-ui/src/components/Transaction/index.tsx +++ b/packages/neuron-ui/src/components/Transaction/index.tsx @@ -8,7 +8,7 @@ import { ckbCore } from 'services/chain' import { transactionState } from 'states/initStates/chain' import { localNumberFormatter, uniformTimeFormatter, shannonToCKBFormatter } from 'utils/formatters' -import { ErrorCode } from 'utils/const' +import { ErrorCode, MAINNET_TAG } from 'utils/const' import { explorerNavButton } from './style.module.scss' const MIN_CELL_WIDTH = 70 @@ -199,9 +199,7 @@ const Transaction = () => { } setAddressPrefix( - network.chain === process.env.REACT_APP_MAINNET_TAG - ? ckbCore.utils.AddressPrefix.Mainnet - : ckbCore.utils.AddressPrefix.Testnet + network.chain === MAINNET_TAG ? ckbCore.utils.AddressPrefix.Mainnet : ckbCore.utils.AddressPrefix.Testnet ) } }) diff --git a/packages/neuron-ui/src/utils/const.ts b/packages/neuron-ui/src/utils/const.ts index 135ae4ab4f..f6d812a7d7 100644 --- a/packages/neuron-ui/src/utils/const.ts +++ b/packages/neuron-ui/src/utils/const.ts @@ -10,6 +10,7 @@ export const UNREMOVABLE_NETWORK_ID = '0' export const CONFIRMATION_THRESHOLD = 30 export const MAX_DECIMAL_DIGITS = 8 +export const MAINNET_TAG = 'ckb' export enum ConnectionStatus { Online = 'online', From 67aceb8ebf24fabf43bb32e4fdc6d7297ecae52d Mon Sep 17 00:00:00 2001 From: Keith Date: Sun, 10 Nov 2019 13:53:45 +0800 Subject: [PATCH 3/3] feat(neuron-ui): update the explorer url according to chain type. --- .../neuron-ui/src/components/Transaction/index.tsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/neuron-ui/src/components/Transaction/index.tsx b/packages/neuron-ui/src/components/Transaction/index.tsx index e822936eff..8aa66a5740 100644 --- a/packages/neuron-ui/src/components/Transaction/index.tsx +++ b/packages/neuron-ui/src/components/Transaction/index.tsx @@ -30,9 +30,11 @@ const CompactAddress = ({ address }: { address: string }) => ( const Transaction = () => { const [t] = useTranslation() const [transaction, setTransaction] = useState(transactionState) - const [addressPrefix, setAddressPrefix] = useState(ckbCore.utils.AddressPrefix.Mainnet) + const [isMainnet, setIsMainnet] = useState(false) const [error, setError] = useState({ code: '', message: '' }) + const addressPrefix = isMainnet ? ckbCore.utils.AddressPrefix.Mainnet : ckbCore.utils.AddressPrefix.Testnet + const inputColumns: IColumn[] = useMemo( () => [ @@ -198,9 +200,7 @@ const Transaction = () => { throw new Error('Cannot find current network in the network list') } - setAddressPrefix( - network.chain === MAINNET_TAG ? ckbCore.utils.AddressPrefix.Mainnet : ckbCore.utils.AddressPrefix.Testnet - ) + setIsMainnet(network.chain === MAINNET_TAG) } }) .catch(err => console.warn(err)) @@ -245,10 +245,9 @@ const Transaction = () => { }, []) const onExplorerBtnClick = useCallback(() => { - const isMainnet = false // TODO: add conditional branch on mainnet and testnet const explorerUrl = isMainnet ? 'https://explorer.nervos.org' : 'https://explorer.nervos.org/testnet' openExternal(`${explorerUrl}/transaction/${transaction.hash}`) - }, [transaction.hash]) + }, [transaction.hash, isMainnet]) const basicInfoItems = useMemo( () => [