Merge pull request #1073 from 0xProject/fix/website/signing-order-validation-bug

[website] Fix order creation and fill flow in Portal
This commit is contained in:
Francesco Agosti
2018-09-24 17:23:13 +02:00
committed by GitHub
3 changed files with 3 additions and 2 deletions

View File

@@ -20,6 +20,7 @@
"dependencies": {
"0x.js": "^0.38.6",
"@0xproject/contract-wrappers": "^1.0.4",
"@0xproject/json-schemas": "^1.0.1",
"@0xproject/order-utils": "^1.0.3",
"@0xproject/react-docs": "^1.0.9",
"@0xproject/react-shared": "^1.0.10",

View File

@@ -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;
}

View File

@@ -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