From 08f2406ca2f41655ab147d91fd9f75f3643ebc27 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 19 Dec 2017 23:04:08 +0100 Subject: Fix merge --- .../website/ts/components/dialogs/eth_weth_conversion_dialog.tsx | 4 ++-- packages/website/ts/components/eth_wrappers.tsx | 8 ++++---- packages/website/ts/components/portal.tsx | 2 +- packages/website/ts/utils/constants.ts | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) (limited to 'packages/website/ts') 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}} >
1 ETH = 1 WETH
- {this.props.direction === Side.receive && + {this.props.direction === Side.Receive &&
Max
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
@@ -98,7 +98,7 @@ export class EthWrappers extends React.Component
@@ -273,7 +273,7 @@ export class EthWrappers extends React.Component { }); } 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', }; -- cgit v1.2.3