crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move isTestNetwork into utils and also check it from showing ZRX request button

Browse Source
This commit is contained in:
Fabio Berger
2018-02-06 17:29:10 -08:00
parent 9deaf612f1
commit 518efa8ad2
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/website/ts/components/token_balances.tsx
View File

@@ -176,14 +176,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
onTouchTap={this._onDharmaDialogToggle.bind(this, false)} onTouchTap={this._onDharmaDialogToggle.bind(this, false)}
/>, />,
]; ];
const isTestNetwork = _.includes( const isTestNetwork = utils.isTestNetwork(this.props.networkId);
[
constants.NETWORK_ID_BY_NAME[Networks.Kovan],
constants.NETWORK_ID_BY_NAME[Networks.Rinkeby],
constants.NETWORK_ID_BY_NAME[Networks.Ropsten],
],
this.props.networkId,
);
const isKovanTestNetwork = this.props.networkId === constants.NETWORK_ID_KOVAN; const isKovanTestNetwork = this.props.networkId === constants.NETWORK_ID_KOVAN;
const dharmaButtonColumnStyle = { const dharmaButtonColumnStyle = {
paddingLeft: 3, paddingLeft: 3,
@@ -426,7 +419,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
/> />
)} )}
{token.symbol === ZRX_TOKEN_SYMBOL && {token.symbol === ZRX_TOKEN_SYMBOL &&
this.props.networkId === constants.NETWORK_ID_KOVAN && ( utils.isTestNetwork(this.props.networkId) && (
<LifeCycleRaisedButton <LifeCycleRaisedButton
labelReady="Request" labelReady="Request"
labelLoading="Sending..." labelLoading="Sending..."

11
packages/website/ts/utils/utils.ts
View File

@@ -282,4 +282,15 @@ export const utils = {
isTestRpc(nodeVersion: string): boolean { isTestRpc(nodeVersion: string): boolean {
return _.includes(nodeVersion, 'TestRPC'); return _.includes(nodeVersion, 'TestRPC');
}, },
isTestNetwork(networkId: number): boolean {
const isTestNetwork = _.includes(
[
constants.NETWORK_ID_BY_NAME[Networks.Kovan],
constants.NETWORK_ID_BY_NAME[Networks.Rinkeby],
constants.NETWORK_ID_BY_NAME[Networks.Ropsten],
],
networkId,
);
return isTestNetwork;
},
}; };