aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrandon Millman <brandon@0xproject.com>2018-08-21 04:55:22 +0800
committerGitHub <noreply@github.com>2018-08-21 04:55:22 +0800
commit4ded59162459e8fa3ef4b4d9a73f1c0dd19942a1 (patch)
tree5bb09f8e575b9fbd01176b36ad7b6635baca9fb9
parent756787c61fff9c6b463fbbd69b48210dafe62004 (diff)
parent2af99a1fe24d7a2d6ac927a7762ad046e97d820e (diff)
downloaddexon-sol-tools-4ded59162459e8fa3ef4b4d9a73f1c0dd19942a1.tar
dexon-sol-tools-4ded59162459e8fa3ef4b4d9a73f1c0dd19942a1.tar.gz
dexon-sol-tools-4ded59162459e8fa3ef4b4d9a73f1c0dd19942a1.tar.bz2
dexon-sol-tools-4ded59162459e8fa3ef4b4d9a73f1c0dd19942a1.tar.lz
dexon-sol-tools-4ded59162459e8fa3ef4b4d9a73f1c0dd19942a1.tar.xz
dexon-sol-tools-4ded59162459e8fa3ef4b4d9a73f1c0dd19942a1.tar.zst
dexon-sol-tools-4ded59162459e8fa3ef4b4d9a73f1c0dd19942a1.zip
Merge pull request #988 from 0xProject/fix/website/build-error
[website] Revert changes to website causing it to fail building
-rw-r--r--CODEOWNERS8
-rw-r--r--packages/website/package.json2
-rw-r--r--packages/website/ts/utils/utils.ts7
3 files changed, 14 insertions, 3 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/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]: