From 08f2406ca2f41655ab147d91fd9f75f3643ebc27 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
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 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'packages/website/ts/components')

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,
         });
-- 
cgit v1.2.3