diff options
| author | F. Eugene Aumson <feuGeneA@users.noreply.github.com> | 2018-08-17 06:32:09 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 06:32:09 +0800 |
| commit | c1ec849554a1e55cd3e8d5bbee206f4bf1d67a5b (patch) | |
| tree | 919eca787e6da6b6e1b28073d7a9e876f9497616 /packages/website | |
| parent | 445177bf420049041ade4d7526a5f4a8194bd216 (diff) | |
| parent | 72752bcb68bac29ff5897ed57de357ad7af09abe (diff) | |
| download | dexon-sol-tools-c1ec849554a1e55cd3e8d5bbee206f4bf1d67a5b.tar dexon-sol-tools-c1ec849554a1e55cd3e8d5bbee206f4bf1d67a5b.tar.gz dexon-sol-tools-c1ec849554a1e55cd3e8d5bbee206f4bf1d67a5b.tar.bz2 dexon-sol-tools-c1ec849554a1e55cd3e8d5bbee206f4bf1d67a5b.tar.lz dexon-sol-tools-c1ec849554a1e55cd3e8d5bbee206f4bf1d67a5b.tar.xz dexon-sol-tools-c1ec849554a1e55cd3e8d5bbee206f4bf1d67a5b.tar.zst dexon-sol-tools-c1ec849554a1e55cd3e8d5bbee206f4bf1d67a5b.zip | |
Merge branch 'development' into sol-compile-lot
Diffstat (limited to 'packages/website')
| -rw-r--r-- | packages/website/package.json | 4 | ||||
| -rw-r--r-- | packages/website/ts/utils/utils.ts | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/packages/website/package.json b/packages/website/package.json index f4638229d..3b4055856 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -84,7 +84,7 @@ "@types/redux": "^3.6.0", "awesome-typescript-loader": "^3.1.3", "copy-webpack-plugin": "^4.0.1", - "copyfiles": "^1.2.0", + "copyfiles": "^2.0.0", "css-loader": "0.23.x", "exports-loader": "0.6.x", "imports-loader": "0.6.x", @@ -98,7 +98,7 @@ "style-loader": "0.13.x", "tslint": "5.11.0", "tslint-config-0xproject": "^0.0.2", - "typescript": "2.9.2", + "typescript": "3.0.1", "uglifyjs-webpack-plugin": "^1.2.5", "webpack": "^3.1.0", "webpack-dev-middleware": "^1.10.0", diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts index 39bbd404c..32b07473c 100644 --- a/packages/website/ts/utils/utils.ts +++ b/packages/website/ts/utils/utils.ts @@ -247,12 +247,9 @@ export const utils = { } = { [ExchangeContractErrs.OrderFillExpired]: 'This order has expired', [ExchangeContractErrs.OrderCancelExpired]: 'This order has expired', - [ExchangeContractErrs.OrderCancelAmountZero]: "Order cancel amount can't be 0", - [ExchangeContractErrs.OrderAlreadyCancelledOrFilled]: - 'This order has already been completely filled or cancelled', + [ExchangeContractErrs.OrderCancelled]: 'This order has been cancelled', [ExchangeContractErrs.OrderFillAmountZero]: "Order fill amount can't be 0", - [ExchangeContractErrs.OrderRemainingFillAmountZero]: - 'This order has already been completely filled or cancelled', + [ExchangeContractErrs.OrderRemainingFillAmountZero]: 'This order has already been completely filled', [ExchangeContractErrs.OrderFillRoundingError]: 'Rounding error will occur when filling this order. Please try filling a different amount.', [ExchangeContractErrs.InsufficientTakerBalance]: |