aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CODEOWNERS8
-rw-r--r--packages/website/package.json2
-rw-r--r--packages/website/public/images/team/matt.jpgbin0 -> 769216 bytes
-rw-r--r--packages/website/ts/pages/about/about.tsx9
-rw-r--r--packages/website/ts/utils/utils.ts7
5 files changed, 22 insertions, 4 deletions
diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 000000000..9f9ba666e
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,8 @@
+# See https://help.github.com/articles/about-codeowners/
+# for more info about CODEOWNERS file
+
+# It uses the same pattern rule for gitignore file
+# https://git-scm.com/docs/gitignore#_pattern_format
+
+# Website
+packages/website/ @BMillman19 @fragosti
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/team/matt.jpg b/packages/website/public/images/team/matt.jpg
new file mode 100644
index 000000000..101209c37
--- /dev/null
+++ b/packages/website/public/images/team/matt.jpg
Binary files differ
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]: