aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Agosti <francesco.agosti93@gmail.com>2018-09-24 23:23:13 +0800
committerGitHub <noreply@github.com>2018-09-24 23:23:13 +0800
commit4a316571ff9b539a540f0503b5753eb03509fea8 (patch)
tree5bb0da8da382241b0759ebba4de828c8e209ae00
parentfc33eacd2cbcc088d238f5e1f34b50b06ea8d58f (diff)
parent748a8a8ae30dd09cec4a8a5f5cf3e3c0381d4f94 (diff)
downloaddexon-sol-tools-4a316571ff9b539a540f0503b5753eb03509fea8.tar
dexon-sol-tools-4a316571ff9b539a540f0503b5753eb03509fea8.tar.gz
dexon-sol-tools-4a316571ff9b539a540f0503b5753eb03509fea8.tar.bz2
dexon-sol-tools-4a316571ff9b539a540f0503b5753eb03509fea8.tar.lz
dexon-sol-tools-4a316571ff9b539a540f0503b5753eb03509fea8.tar.xz
dexon-sol-tools-4a316571ff9b539a540f0503b5753eb03509fea8.tar.zst
dexon-sol-tools-4a316571ff9b539a540f0503b5753eb03509fea8.zip
Merge pull request #1073 from 0xProject/fix/website/signing-order-validation-bug
[website] Fix order creation and fill flow in Portal
-rw-r--r--packages/website/package.json1
-rw-r--r--packages/website/ts/blockchain.ts2
-rw-r--r--packages/website/ts/components/inputs/token_amount_input.tsx2
3 files changed, 3 insertions, 2 deletions
diff --git a/packages/website/package.json b/packages/website/package.json
index 54ec1c84b..65a0d4c10 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.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",
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