From 9b6f80b158eb5cf94551172afe8efea49e770968 Mon Sep 17 00:00:00 2001 From: epiqueras Date: Mon, 14 May 2018 20:30:08 -0500 Subject: [PATCH 1/5] feat: hide navbar links in 404 page --- src/bootstrap/app.js | 3 ++- src/bootstrap/dapp-api.js | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/bootstrap/app.js b/src/bootstrap/app.js index 290e804..844c767 100755 --- a/src/bootstrap/app.js +++ b/src/bootstrap/app.js @@ -13,7 +13,7 @@ import PageNotFound from '../containers/page-not-found' import Initializer from './initializer' import GlobalComponents from './global-components' -import { ETHAddressRegExp, ETHAddressRegExpCaptureGroup } from './dapp-api' +import { ETHAddressRegExpCaptureGroup, ETHAddressRegExp } from './dapp-api' import './app.css' @@ -21,6 +21,7 @@ const toWithAddress = base => location => `${base}/${location.pathname.match(ETHAddressRegExp)[0]}` const hasNonRootAddress = location => location.pathname.slice(0, 3) !== '/0x' && + location.pathname.slice(0, 4) !== '/404' && ETHAddressRegExp.test(location.pathname) const ConnectedNavBar = connect(state => ({ accounts: state.wallet.accounts, diff --git a/src/bootstrap/dapp-api.js b/src/bootstrap/dapp-api.js index ca60a69..b3fd0dc 100755 --- a/src/bootstrap/dapp-api.js +++ b/src/bootstrap/dapp-api.js @@ -14,14 +14,14 @@ else eth = new Eth(new Eth.HttpProvider(ETHEREUM_PROVIDER)) const IICOContractFactory = eth.contract && eth.contract(IICO.abi) // TODO: Put this on NPM or load dynamically? -const ETHAddressRegExp = /0x[a-fA-F0-9]{40}/ const ETHAddressRegExpCaptureGroup = '(0x[a-fA-F0-9]{40})' +const ETHAddressRegExp = /0x[a-fA-F0-9]{40}/ const strictETHAddressRegExp = /^0x[a-fA-F0-9]{40}$/ export { eth, IICOContractFactory, - ETHAddressRegExp, ETHAddressRegExpCaptureGroup, + ETHAddressRegExp, strictETHAddressRegExp } From ae3f53798c70ac2e7ab2fe8c662763895673287f Mon Sep 17 00:00:00 2001 From: epiqueras Date: Mon, 14 May 2018 20:34:04 -0500 Subject: [PATCH 2/5] feat: show link to home on 404 pages --- src/bootstrap/app.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/bootstrap/app.js b/src/bootstrap/app.js index 844c767..aeef7dd 100755 --- a/src/bootstrap/app.js +++ b/src/bootstrap/app.js @@ -32,6 +32,11 @@ const ConnectedNavBar = connect(state => ({ accounts={accounts} balance={balance} routes={[ + { + name: 'Home', + to: '/', + visible: location => location.pathname.slice(0, 4) === '/404' + }, { name: 'Simple', to: toWithAddress('/simple'), From 51df281e7faedbae097e900ea90e2410a610eac6 Mon Sep 17 00:00:00 2001 From: epiqueras Date: Tue, 15 May 2018 12:02:33 -0500 Subject: [PATCH 3/5] feat: withdraw is not redeem msg --- src/containers/iico/components/bids/index.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/containers/iico/components/bids/index.js b/src/containers/iico/components/bids/index.js index 5ae782b..382c5cf 100644 --- a/src/containers/iico/components/bids/index.js +++ b/src/containers/iico/components/bids/index.js @@ -192,6 +192,8 @@ class Bids extends PureComponent {
Are you sure you wish to withdraw this bid?
+ This withdraws your ETH, it does not redeem tokens. +
{lockedIn} ETH
would remain locked in{lockedIn ? ( @@ -513,6 +515,11 @@ class Bids extends PureComponent { )} } + tooltip={ + canWithdraw + ? 'This withdraws your ETH, it does not redeem tokens.' + : 'This redeems your tokens.' + } noFlex /> )} From fd32c2598448e7d9b6dbd15f429461164c7b0286 Mon Sep 17 00:00:00 2001 From: epiqueras Date: Tue, 15 May 2018 12:04:40 -0500 Subject: [PATCH 4/5] feat(simple): bold gas --- src/containers/simple-bid/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/simple-bid/index.js b/src/containers/simple-bid/index.js index da8ec72..69e8faf 100644 --- a/src/containers/simple-bid/index.js +++ b/src/containers/simple-bid/index.js @@ -77,7 +77,7 @@ class SimpleBid extends PureComponent { > KYC {' '} - and you need to send at least 300,000 gas with the transaction. + and you need to send at least 300,000 gas with the transaction. Date: Tue, 15 May 2018 12:08:30 -0500 Subject: [PATCH 5/5] feat(interactive): link to kyc --- src/containers/iico/components/bids/index.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/containers/iico/components/bids/index.js b/src/containers/iico/components/bids/index.js index 382c5cf..e926619 100644 --- a/src/containers/iico/components/bids/index.js +++ b/src/containers/iico/components/bids/index.js @@ -283,6 +283,18 @@ class Bids extends PureComponent { KYCLevel = 'None' } + let KYCLink + if (process.env.REACT_APP_BRANCH === 'master') + KYCLink = ( + + {KYCLevel} + + ) + return (

Your Bids

@@ -290,7 +302,7 @@ class Bids extends PureComponent { {KYCLevel === 'Base' && (