aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website/ts
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2017-12-20 06:04:08 +0800
committerFabio Berger <me@fabioberger.com>2017-12-20 06:04:08 +0800
commit08f2406ca2f41655ab147d91fd9f75f3643ebc27 (patch)
tree64d5cc10967ae43a00d0e8d102fc170b72f06f7e /packages/website/ts
parent41104b2d457b9b662122c139ee83bb8d0f519a51 (diff)
downloaddexon-sol-tools-08f2406ca2f41655ab147d91fd9f75f3643ebc27.tar
dexon-sol-tools-08f2406ca2f41655ab147d91fd9f75f3643ebc27.tar.gz
dexon-sol-tools-08f2406ca2f41655ab147d91fd9f75f3643ebc27.tar.bz2
dexon-sol-tools-08f2406ca2f41655ab147d91fd9f75f3643ebc27.tar.lz
dexon-sol-tools-08f2406ca2f41655ab147d91fd9f75f3643ebc27.tar.xz
dexon-sol-tools-08f2406ca2f41655ab147d91fd9f75f3643ebc27.tar.zst
dexon-sol-tools-08f2406ca2f41655ab147d91fd9f75f3643ebc27.zip
Fix merge
Diffstat (limited to 'packages/website/ts')
-rw-r--r--packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx4
-rw-r--r--packages/website/ts/components/eth_wrappers.tsx8
-rw-r--r--packages/website/ts/components/portal.tsx2
-rw-r--r--packages/website/ts/utils/constants.ts1
4 files changed, 8 insertions, 7 deletions
diff --git a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
index 25ded40e9..700255163 100644
--- a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
+++ b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
@@ -109,11 +109,11 @@ export class EthWethConversionDialog extends
style={{fontSize: 12}}
>
<div className="left">1 ETH = 1 WETH</div>
- {this.props.direction === Side.receive &&
+ {this.props.direction === Side.Receive &&
<div
className="right"
onClick={this.onMaxClick.bind(this)}
- style={{color: DARK_BLUE, textDecoration: 'underline', cursor: 'pointer'}}
+ style={{color: colors.darkBlue, textDecoration: 'underline', cursor: 'pointer'}}
>
Max
</div>
diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx
index da95aa6fd..bdd4664e8 100644
--- a/packages/website/ts/components/eth_wrappers.tsx
+++ b/packages/website/ts/components/eth_wrappers.tsx
@@ -88,9 +88,9 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
const wethBalance = ZeroEx.toUnitAmount(etherTokenState.balance, constants.DECIMAL_PLACES_ETH);
const isBidirectional = true;
const etherscanUrl = utils.getEtherScanLinkIfExists(
- etherToken.address, this.props.networkId, EtherscanLinkSuffixes.address,
+ etherToken.address, this.props.networkId, EtherscanLinkSuffixes.Address,
);
- const tokenLabel = this.renderToken('Wrapped Ether', etherToken.address, constants.iconUrlBySymbol.WETH);
+ const tokenLabel = this.renderToken('Wrapped Ether', etherToken.address, configs.ICON_URL_BY_SYMBOL.WETH);
return (
<div className="clearfix lg-px4 md-px4 sm-px2" style={{minHeight: 600}}>
<div className="relative">
@@ -98,7 +98,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
<div className="absolute" style={{top: 0, right: 0}}>
<a
target="_blank"
- href={constants.WETH_IO_URL}
+ href={constants.URL_WETH_IO}
style={{color: colors.grey}}
>
<div className="flex">
@@ -273,7 +273,7 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
this, outdatedWETHIfExists.address,
);
const etherscanUrl = utils.getEtherScanLinkIfExists(
- outdatedWETHIfExists.address, this.props.networkId, EtherscanLinkSuffixes.address,
+ outdatedWETHIfExists.address, this.props.networkId, EtherscanLinkSuffixes.Address,
);
const tokenLabel = this.renderToken(dateRange, outdatedEtherToken.address, OUTDATED_WETH_ICON_PATH);
return (
diff --git a/packages/website/ts/components/portal.tsx b/packages/website/ts/components/portal.tsx
index 08028d15e..939dae6f7 100644
--- a/packages/website/ts/components/portal.tsx
+++ b/packages/website/ts/components/portal.tsx
@@ -330,7 +330,7 @@ export class Portal extends React.Component<PortalAllProps, PortalAllState> {
});
}
private onWethNoticeAccepted() {
- localStorage.setItem(constants.DISMISS_WETH_NOTICE_LOCAL_STORAGE_KEY, 'set');
+ localStorage.setItem(constants.LOCAL_STORAGE_KEY_DISMISS_WETH_NOTICE, 'set');
this.setState({
isWethNoticeDialogOpen: false,
});
diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts
index e6b51c452..761d00ef7 100644
--- a/packages/website/ts/utils/constants.ts
+++ b/packages/website/ts/utils/constants.ts
@@ -82,5 +82,6 @@ export const constants = {
'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L123',
URL_WEB3_LOG_ENTRY_EVENT: 'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L127',
URL_WEB3_PROVIDER_DOCS: 'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L150',
+ URL_WETH_IO: 'https://weth.io/',
URL_ZEROEX_CHAT: 'https://chat.0xproject.com',
};