Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/neuron-ui/src/components/Addresses/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -30,8 +31,7 @@ const Addresses = ({
settings: { networks = [] },
dispatch,
}: React.PropsWithoutRef<StateWithDispatch & RouteComponentProps>) => {
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()

Expand Down
18 changes: 8 additions & 10 deletions packages/neuron-ui/src/components/Transaction/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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(
() =>
[
Expand Down Expand Up @@ -198,11 +200,7 @@ const Transaction = () => {
throw new Error('Cannot find current network in the network list')
}

setAddressPrefix(
network.chain === process.env.REACT_APP_MAINNET_TAG
? ckbCore.utils.AddressPrefix.Mainnet
: ckbCore.utils.AddressPrefix.Testnet
)
setIsMainnet(network.chain === MAINNET_TAG)
}
})
.catch(err => console.warn(err))
Expand Down Expand Up @@ -246,10 +244,10 @@ const Transaction = () => {
})
}, [])

// TODO: add conditional branch on mainnet and testnet
const onExplorerBtnClick = useCallback(() => {
openExternal(`https://explorer.nervos.org/transaction/${transaction.hash}`)
}, [transaction.hash])
const explorerUrl = isMainnet ? 'https://explorer.nervos.org' : 'https://explorer.nervos.org/testnet'
openExternal(`${explorerUrl}/transaction/${transaction.hash}`)
}, [transaction.hash, isMainnet])

const basicInfoItems = useMemo(
() => [
Expand Down
1 change: 1 addition & 0 deletions packages/neuron-ui/src/utils/const.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion packages/neuron-wallet/src/models/chain-info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}