diff options
Diffstat (limited to 'packages/website')
| -rw-r--r-- | packages/website/package.json | 2 | ||||
| -rw-r--r-- | packages/website/public/images/fake_toggle.svg | 4 | ||||
| -rw-r--r-- | packages/website/public/images/team/matt.jpg | bin | 0 -> 769216 bytes | |||
| -rw-r--r-- | packages/website/ts/components/onboarding/intro_onboarding_step.tsx | 4 | ||||
| -rw-r--r-- | packages/website/ts/pages/about/about.tsx | 9 | ||||
| -rw-r--r-- | packages/website/ts/utils/utils.ts | 7 |
6 files changed, 17 insertions, 9 deletions
diff --git a/packages/website/package.json b/packages/website/package.json index 3b4055856..2784a0462 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -7,7 +7,7 @@ "private": true, "description": "Website and 0x portal dapp", "scripts": { - "build": "NODE_ENV=production node --max_old_space_size=8192 ../../node_modules/.bin/webpack; exit 0;", + "build": "NODE_ENV=production node --max_old_space_size=8192 ../../node_modules/.bin/webpack", "clean": "shx rm -f public/bundle*", "lint": "tslint --project . 'ts/**/*.ts' 'ts/**/*.tsx'", "watch_without_deps": "webpack-dev-server --content-base public --https", diff --git a/packages/website/public/images/fake_toggle.svg b/packages/website/public/images/fake_toggle.svg deleted file mode 100644 index c9632d0da..000000000 --- a/packages/website/public/images/fake_toggle.svg +++ /dev/null @@ -1,4 +0,0 @@ -<svg width="36" height="23" viewBox="0 0 36 23" fill="none" xmlns="http://www.w3.org/2000/svg"> -<path fill-rule="evenodd" clip-rule="evenodd" d="M0 11.4379C0 5.12093 5.12093 0 11.4379 0H23.8494C30.1664 0 35.2873 5.12093 35.2873 11.4379V11.4379C35.2873 17.7549 30.1664 22.8758 23.8494 22.8758H11.4379C5.12092 22.8758 0 17.7549 0 11.4379V11.4379Z" fill="#E0E0E0"/> -<path fill-rule="evenodd" clip-rule="evenodd" d="M6.85185 13.8889C10.636 13.8889 13.7037 10.7798 13.7037 6.94444C13.7037 3.10913 10.636 0 6.85185 0C3.06768 0 0 3.10913 0 6.94444C0 10.7798 3.06768 13.8889 6.85185 13.8889Z" transform="translate(3.49609 4.53125)" fill="white"/> -</svg> diff --git a/packages/website/public/images/team/matt.jpg b/packages/website/public/images/team/matt.jpg Binary files differnew file mode 100644 index 000000000..101209c37 --- /dev/null +++ b/packages/website/public/images/team/matt.jpg diff --git a/packages/website/ts/components/onboarding/intro_onboarding_step.tsx b/packages/website/ts/components/onboarding/intro_onboarding_step.tsx index 3a27b6854..f9ced7315 100644 --- a/packages/website/ts/components/onboarding/intro_onboarding_step.tsx +++ b/packages/website/ts/components/onboarding/intro_onboarding_step.tsx @@ -20,7 +20,9 @@ export const IntroOnboardingStep: React.StatelessComponent<IntroOnboardingStepPr <Text> Wrap ETH </Text> </div> <div className="flex flex-column items-center"> - <Image src="/images/fake_toggle.svg" height="50px" width="50px" /> + <Container marginBottom="9px"> + <Image src="/images/lock_icon.svg" height="35px" width="35x" /> + </Container> <Text> Unlock tokens </Text> </div> </Container> diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx index aef4d0df9..519e4be5e 100644 --- a/packages/website/ts/pages/about/about.tsx +++ b/packages/website/ts/pages/about/about.tsx @@ -82,7 +82,7 @@ const teamRow3: ProfileInfo[] = [ name: 'Brandon Millman', title: 'Senior Engineer', description: `Full-stack engineer. Previously senior software engineer at \ - Twitter. Electrical and Computer Engineering at Duke.`, + Twitter. Computer Science and Electrical Engineering at Duke.`, image: '/images/team/brandon.png', linkedIn: 'https://www.linkedin.com/in/brandon-millman-b093a022/', github: 'https://github.com/BMillman19', @@ -199,6 +199,13 @@ const teamRow7: ProfileInfo[] = [ image: 'images/team/clay.png', linkedIn: 'https://www.linkedin.com/in/robbinsclay/', }, + { + name: 'Matt Taylor', + title: 'Marketing Lead', + description: `Growth & Marketing. Previously marketing at Abra and Square. Economics and Philosophy at Claremont McKenna College.`, + image: 'images/team/matt.jpg', + linkedIn: 'https://www.linkedin.com/in/mattytay/', + }, ]; const advisors: ProfileInfo[] = [ diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts index 32b07473c..39bbd404c 100644 --- a/packages/website/ts/utils/utils.ts +++ b/packages/website/ts/utils/utils.ts @@ -247,9 +247,12 @@ export const utils = { } = { [ExchangeContractErrs.OrderFillExpired]: 'This order has expired', [ExchangeContractErrs.OrderCancelExpired]: 'This order has expired', - [ExchangeContractErrs.OrderCancelled]: 'This order has been cancelled', + [ExchangeContractErrs.OrderCancelAmountZero]: "Order cancel amount can't be 0", + [ExchangeContractErrs.OrderAlreadyCancelledOrFilled]: + 'This order has already been completely filled or cancelled', [ExchangeContractErrs.OrderFillAmountZero]: "Order fill amount can't be 0", - [ExchangeContractErrs.OrderRemainingFillAmountZero]: 'This order has already been completely filled', + [ExchangeContractErrs.OrderRemainingFillAmountZero]: + 'This order has already been completely filled or cancelled', [ExchangeContractErrs.OrderFillRoundingError]: 'Rounding error will occur when filling this order. Please try filling a different amount.', [ExchangeContractErrs.InsufficientTakerBalance]: |
