diff options
author | Fabio Berger <me@fabioberger.com> | 2018-05-17 19:57:51 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-05-17 19:57:51 +0800 |
commit | 0eacbac8f69bf3b5f03029aae338f63462ca3154 (patch) | |
tree | 4a7709245f79912b0223a2fcabad261288b80b7c /packages/website/ts/components | |
parent | 22f3f57f44cfc4bdd27a79df36a8d80b96b02a07 (diff) | |
parent | cec76c33b6a33d2c36305bd581de628641c14d5e (diff) | |
download | dexon-0x-contracts-0eacbac8f69bf3b5f03029aae338f63462ca3154.tar dexon-0x-contracts-0eacbac8f69bf3b5f03029aae338f63462ca3154.tar.gz dexon-0x-contracts-0eacbac8f69bf3b5f03029aae338f63462ca3154.tar.bz2 dexon-0x-contracts-0eacbac8f69bf3b5f03029aae338f63462ca3154.tar.lz dexon-0x-contracts-0eacbac8f69bf3b5f03029aae338f63462ca3154.tar.xz dexon-0x-contracts-0eacbac8f69bf3b5f03029aae338f63462ca3154.tar.zst dexon-0x-contracts-0eacbac8f69bf3b5f03029aae338f63462ca3154.zip |
Merge branch 'development' into improvement/addCustomTslintRules
* development:
Remove "Order utils" from menu for now
Fix top tokens key
Improve about page descriptions
Do not remove artifacts when running `clean`
Diffstat (limited to 'packages/website/ts/components')
-rw-r--r-- | packages/website/ts/components/relayer_index/relayer_top_tokens.tsx | 10 | ||||
-rw-r--r-- | packages/website/ts/components/top_bar/top_bar.tsx | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx b/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx index 03c70c9dd..40ab7bd03 100644 --- a/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx +++ b/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx @@ -26,7 +26,14 @@ export const TopTokens: React.StatelessComponent<TopTokensProps> = (props: TopTo {_.map(props.tokens, (tokenInfo: WebsiteBackendTokenInfo, index: number) => { const firstItemStyle = { ...styles.tokenLabel, ...styles.followingTokenLabel }; const style = index !== 0 ? firstItemStyle : styles.tokenLabel; - return <TokenLink tokenInfo={tokenInfo} style={style} networkId={props.networkId} />; + return ( + <TokenLink + key={tokenInfo.address} + tokenInfo={tokenInfo} + style={style} + networkId={props.networkId} + /> + ); })} </div> ); @@ -56,7 +63,6 @@ class TokenLink extends React.Component<TokenLinkProps, TokenLinkState> { }; return ( <a - key={this.props.tokenInfo.address} href={tokenLinkFromToken(this.props.tokenInfo, this.props.networkId)} target="_blank" style={style} diff --git a/packages/website/ts/components/top_bar/top_bar.tsx b/packages/website/ts/components/top_bar/top_bar.tsx index 5fde007d6..3b39d789b 100644 --- a/packages/website/ts/components/top_bar/top_bar.tsx +++ b/packages/website/ts/components/top_bar/top_bar.tsx @@ -143,12 +143,6 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> { primaryText={this.props.translate.get(Key.Web3Wrapper, Deco.CapWords)} /> </Link>, - <Link key="subMenuItem-order-utils" to={WebsitePaths.OrderUtils} className="text-decoration-none"> - <MenuItem - style={{ fontSize: styles.menuItem.fontSize }} - primaryText={this.props.translate.get(Key.OrderUtils, Deco.CapWords)} - /> - </Link>, <Link key="subMenuItem-sol-compiler" to={WebsitePaths.SolCompiler} className="text-decoration-none"> <MenuItem style={{ fontSize: styles.menuItem.fontSize }} |