Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

[beta] Ropsten chain for UI #3622

Merged
merged 1 commit into from
Nov 25, 2016
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
2 changes: 1 addition & 1 deletion js/src/dapps/basiccoin/services.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export function attachInstances () {
])
.then(([registryAddress, netChain]) => {
const registry = api.newContract(abis.registry, registryAddress).instance;
isTest = netChain === 'morden' || netChain === 'testnet';
isTest = netChain === 'ropsten' || netChain === 'morden' || netChain === 'testnet';

console.log(`contract was found at registry=${registryAddress}`);
console.log(`running on ${netChain}, isTest=${isTest}`);
Expand Down
2 changes: 1 addition & 1 deletion js/src/redux/providers/status.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export default class Status {
this._api.eth.syncing()
])
.then(([clientVersion, coinbase, defaultExtraData, extraData, gasFloorTarget, hashrate, minGasPrice, netChain, netPeers, netPort, nodeName, rpcSettings, syncing, traceMode]) => {
const isTest = netChain === 'morden' || netChain === 'testnet';
const isTest = netChain === 'ropsten' || netChain === 'morden' || netChain === 'testnet';

this._store.dispatch(statusCollection({
clientVersion,
Expand Down
2 changes: 1 addition & 1 deletion js/src/redux/providers/statusReducer.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const initialState = {
gasFloorTarget: new BigNumber(0),
hashrate: new BigNumber(0),
minGasPrice: new BigNumber(0),
netChain: 'morden',
netChain: 'ropsten',
netPeers: {
active: new BigNumber(0),
connected: new BigNumber(0),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export default class AccountLink extends Component {
}

updateLink (address, chain) {
const link = addressLink(address, chain === 'morden' || chain === 'testnet');
const link = addressLink(address, chain === 'ropsten' || chain === 'morden' || chain === 'testnet');

this.setState({
link
Expand Down
2 changes: 1 addition & 1 deletion js/src/views/Signer/components/TxHashLink/TxHashLink.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default class TxHashLink extends Component {

return (
<a
href={ txLink(txHash, chain === 'morden' || chain === 'testnet') }
href={ txLink(txHash, chain === 'ropsten' || chain === 'morden' || chain === 'testnet') }
target='_blank'
className={ className }>
{ children || txHash }
Expand Down