aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrandon Millman <brandon.millman@gmail.com>2018-05-15 05:19:39 +0800
committerBrandon Millman <brandon.millman@gmail.com>2018-05-18 02:02:55 +0800
commitc787dc735695be351b23e1e91b792da44e01fc11 (patch)
tree847e67391e722d79e1447d7ae8c5b0e214826708
parentea948ac2c885c395f1e07b285c65232264c58b7b (diff)
downloaddexon-sol-tools-c787dc735695be351b23e1e91b792da44e01fc11.tar
dexon-sol-tools-c787dc735695be351b23e1e91b792da44e01fc11.tar.gz
dexon-sol-tools-c787dc735695be351b23e1e91b792da44e01fc11.tar.bz2
dexon-sol-tools-c787dc735695be351b23e1e91b792da44e01fc11.tar.lz
dexon-sol-tools-c787dc735695be351b23e1e91b792da44e01fc11.tar.xz
dexon-sol-tools-c787dc735695be351b23e1e91b792da44e01fc11.tar.zst
dexon-sol-tools-c787dc735695be351b23e1e91b792da44e01fc11.zip
Fix linter errors and relayer index reloading
-rw-r--r--packages/website/ts/components/legacy_portal/legacy_portal.tsx2
-rw-r--r--packages/website/ts/components/portal/portal.tsx26
-rw-r--r--packages/website/ts/components/wallet/wallet.tsx3
3 files changed, 17 insertions, 14 deletions
diff --git a/packages/website/ts/components/legacy_portal/legacy_portal.tsx b/packages/website/ts/components/legacy_portal/legacy_portal.tsx
index 002b258fb..a5ea95629 100644
--- a/packages/website/ts/components/legacy_portal/legacy_portal.tsx
+++ b/packages/website/ts/components/legacy_portal/legacy_portal.tsx
@@ -217,7 +217,7 @@ export class LegacyPortal extends React.Component<LegacyPortalProps, LegacyPorta
/>
<Route
path={`${WebsitePaths.Portal}/trades`}
- component={this._renderTradeHistory.bind(this)}
+ render={this._renderTradeHistory.bind(this)}
/>
<Route
path={`${WebsitePaths.Home}`}
diff --git a/packages/website/ts/components/portal/portal.tsx b/packages/website/ts/components/portal/portal.tsx
index 09f2ba10a..f3b0cc721 100644
--- a/packages/website/ts/components/portal/portal.tsx
+++ b/packages/website/ts/components/portal/portal.tsx
@@ -210,7 +210,7 @@ export class Portal extends React.Component<PortalProps, PortalState> {
<Route
exact={true}
path={`${WebsitePaths.Portal}`}
- component={this._renderWallet.bind(this)}
+ render={this._renderWallet.bind(this)}
/>
</Switch>
</div>
@@ -227,13 +227,17 @@ export class Portal extends React.Component<PortalProps, PortalState> {
/>
<Route
path={`${WebsitePaths.Portal}/trades`}
- component={this._renderTradeHistory.bind(this)}
+ render={this._renderTradeHistory.bind(this)}
/>
<Route
path={`${WebsitePaths.Portal}/direct`}
- component={this._renderTradeDirect.bind(this)}
+ render={this._renderTradeDirect.bind(this)}
+ />
+ <Route
+ exact={true}
+ path={`${WebsitePaths.Portal}/`}
+ render={this._renderRelayerIndex.bind(this)}
/>
- <Route path={`${WebsitePaths.Home}`} component={this._renderRelayerIndex.bind(this)} />
</Switch>
</div>
</div>
@@ -275,7 +279,7 @@ export class Portal extends React.Component<PortalProps, PortalState> {
</div>
);
}
- private _renderMenu(routeComponentProps: RouteComponentProps<any>) {
+ private _renderMenu(routeComponentProps: RouteComponentProps<any>): React.ReactNode {
return (
<div>
<BackButton to={`${WebsitePaths.Portal}`} labelText={'back to Relayers'} />
@@ -283,7 +287,7 @@ export class Portal extends React.Component<PortalProps, PortalState> {
</div>
);
}
- private _renderWallet() {
+ private _renderWallet(): React.ReactNode {
const allTokens = _.values(this.props.tokenByAddress);
const trackedTokens = _.filter(allTokens, t => t.isTracked);
return (
@@ -309,7 +313,7 @@ export class Portal extends React.Component<PortalProps, PortalState> {
</div>
);
}
- private _renderEthWrapper() {
+ private _renderEthWrapper(): React.ReactNode {
return (
<div>
<Title labelText={'Wrapped ETH'} />
@@ -325,7 +329,7 @@ export class Portal extends React.Component<PortalProps, PortalState> {
</div>
);
}
- private _renderTradeHistory() {
+ private _renderTradeHistory(): React.ReactNode {
return (
<div>
<Title labelText={'Trade History'} />
@@ -337,7 +341,7 @@ export class Portal extends React.Component<PortalProps, PortalState> {
</div>
);
}
- private _renderTradeDirect(match: any, location: Location, history: History) {
+ private _renderTradeDirect(match: any, location: Location, history: History): React.ReactNode {
return (
<div>
<Title labelText={'Trade Direct'} />
@@ -349,7 +353,7 @@ export class Portal extends React.Component<PortalProps, PortalState> {
</div>
);
}
- private _renderTokenBalances() {
+ private _renderTokenBalances(): React.ReactNode {
const allTokens = _.values(this.props.tokenByAddress);
const trackedTokens = _.filter(allTokens, t => t.isTracked);
return (
@@ -371,7 +375,7 @@ export class Portal extends React.Component<PortalProps, PortalState> {
</div>
);
}
- private _renderRelayerIndex() {
+ private _renderRelayerIndex(): React.ReactNode {
return (
<div>
<Title labelText={'Explore 0x Relayers'} />
diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx
index ff7127604..b7c3d5229 100644
--- a/packages/website/ts/components/wallet/wallet.tsx
+++ b/packages/website/ts/components/wallet/wallet.tsx
@@ -239,9 +239,8 @@ export class Wallet extends React.Component<WalletProps, WalletState> {
const userAddress = this.props.userAddress;
const primaryText = utils.getAddressBeginAndEnd(userAddress);
return (
- <Link to={`${WebsitePaths.Portal}/account`} style={{ textDecoration: 'none' }}>
+ <Link key={HEADER_ITEM_KEY} to={`${WebsitePaths.Portal}/account`} style={{ textDecoration: 'none' }}>
<ListItem
- key={HEADER_ITEM_KEY}
primaryText={primaryText}
leftIcon={<Identicon address={userAddress} diameter={ICON_DIMENSION} />}
style={{ ...styles.paddedItem, ...styles.borderedItem }}