diff options
| author | fragosti <francesco.agosti93@gmail.com> | 2018-08-17 07:08:02 +0800 |
|---|---|---|
| committer | fragosti <francesco.agosti93@gmail.com> | 2018-08-17 07:08:02 +0800 |
| commit | 89174cd63fb8c178c33d456d3b9d1d645ee07e91 (patch) | |
| tree | 1d3b1932bdb4ff435d7a4d44ca443605d78b9bd0 /packages/website | |
| parent | 8cb1d2a0af2df12e0b628a7b016a2b96a4a66860 (diff) | |
| parent | d0d6a6a500cf8bbaf5da144490056d0275675eb3 (diff) | |
| download | dexon-sol-tools-89174cd63fb8c178c33d456d3b9d1d645ee07e91.tar dexon-sol-tools-89174cd63fb8c178c33d456d3b9d1d645ee07e91.tar.gz dexon-sol-tools-89174cd63fb8c178c33d456d3b9d1d645ee07e91.tar.bz2 dexon-sol-tools-89174cd63fb8c178c33d456d3b9d1d645ee07e91.tar.lz dexon-sol-tools-89174cd63fb8c178c33d456d3b9d1d645ee07e91.tar.xz dexon-sol-tools-89174cd63fb8c178c33d456d3b9d1d645ee07e91.tar.zst dexon-sol-tools-89174cd63fb8c178c33d456d3b9d1d645ee07e91.zip | |
Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/connect/sra-api-v2
Diffstat (limited to 'packages/website')
| -rw-r--r-- | packages/website/package.json | 2 | ||||
| -rw-r--r-- | packages/website/ts/utils/utils.ts | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/packages/website/package.json b/packages/website/package.json index 0fcf9c9b9..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", 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]: |