diff options
| author | fragosti <francesco.agosti93@gmail.com> | 2018-09-18 19:55:31 +0800 |
|---|---|---|
| committer | fragosti <francesco.agosti93@gmail.com> | 2018-09-18 19:55:31 +0800 |
| commit | e46807c28b0c915130b1b5e49d1c9f39f12751ae (patch) | |
| tree | 5292404cf5a0fd3ed73e86265e605ee6e715d8f3 | |
| parent | 074082ec945b89dba14315a5c9d715e77724566b (diff) | |
| download | dexon-sol-tools-e46807c28b0c915130b1b5e49d1c9f39f12751ae.tar.gz dexon-sol-tools-e46807c28b0c915130b1b5e49d1c9f39f12751ae.tar.zst dexon-sol-tools-e46807c28b0c915130b1b5e49d1c9f39f12751ae.zip | |
Fix order creation and fill flow in Portal
| -rw-r--r-- | packages/website/package.json | 1 | ||||
| -rw-r--r-- | packages/website/ts/blockchain.ts | 2 | ||||
| -rw-r--r-- | packages/website/ts/components/inputs/token_amount_input.tsx | 2 | ||||
| -rw-r--r-- | yarn.lock | 6 |
4 files changed, 6 insertions, 5 deletions
diff --git a/packages/website/package.json b/packages/website/package.json index b602a3116..f0a44b97b 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -20,6 +20,7 @@ "dependencies": { "0x.js": "^0.38.6", "@0xproject/contract-wrappers": "^1.0.1", + "@0xproject/json-schemas": "^1.0.1", "@0xproject/order-utils": "^1.0.1", "@0xproject/react-docs": "^1.0.8", "@0xproject/react-shared": "^1.0.9", diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts index d3f2f3f7b..632a63016 100644 --- a/packages/website/ts/blockchain.ts +++ b/packages/website/ts/blockchain.ts @@ -228,7 +228,7 @@ export class Blockchain { const tokenSymbolToAddressOverrides = tokenAddressOverrides[this.networkId]; let isTokenAddressInOverrides = false; if (!_.isUndefined(tokenSymbolToAddressOverrides)) { - isTokenAddressInOverrides = _.keys(tokenSymbolToAddressOverrides).includes(tokenAddress); + isTokenAddressInOverrides = _.values(tokenSymbolToAddressOverrides).includes(tokenAddress); } return !_.isUndefined(tokenIfExists) || isTokenAddressInOverrides; } diff --git a/packages/website/ts/components/inputs/token_amount_input.tsx b/packages/website/ts/components/inputs/token_amount_input.tsx index 93ef516cf..db093fb68 100644 --- a/packages/website/ts/components/inputs/token_amount_input.tsx +++ b/packages/website/ts/components/inputs/token_amount_input.tsx @@ -111,7 +111,7 @@ export class TokenAmountInput extends React.Component<TokenAmountInputProps, Tok <span> Insufficient allowance.{' '} <Link - to={`${WebsitePaths.Portal}/balances`} + to={`${WebsitePaths.Portal}/account`} style={{ cursor: 'pointer', color: colors.darkestGrey }} > Set allowance @@ -5296,9 +5296,9 @@ ethereumjs-wallet@~0.6.0: utf8 "^3.0.0" uuid "^3.3.2" -ethers@0xproject/ethers.js#eip-838-reasons, ethers@3.0.22: - version "3.0.18" - resolved "https://codeload.github.com/0xproject/ethers.js/tar.gz/b91342bd200d142af0165d6befddf783c8ae8447" +ethers@3.0.22: + version "3.0.22" + resolved "https://registry.npmjs.org/ethers/-/ethers-3.0.22.tgz#7fab1ea16521705837aa43c15831877b2716b436" dependencies: aes-js "3.0.0" bn.js "^4.4.0" |