crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix order creation and fill flow in Portal

Browse Source
This commit is contained in:
fragosti
2018-09-18 13:55:31 +02:00
parent 074082ec94
commit e46807c28b
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/website/package.json
View File

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

2
packages/website/ts/blockchain.ts
View File

@@ -228,7 +228,7 @@ export class Blockchain {
const tokenSymbolToAddressOverrides = tokenAddressOverrides[this.networkId]; const tokenSymbolToAddressOverrides = tokenAddressOverrides[this.networkId];
let isTokenAddressInOverrides = false; let isTokenAddressInOverrides = false;
if (!_.isUndefined(tokenSymbolToAddressOverrides)) { if (!_.isUndefined(tokenSymbolToAddressOverrides)) {
isTokenAddressInOverrides = _.keys(tokenSymbolToAddressOverrides).includes(tokenAddress); isTokenAddressInOverrides = _.values(tokenSymbolToAddressOverrides).includes(tokenAddress);
} }
return !_.isUndefined(tokenIfExists) || isTokenAddressInOverrides; return !_.isUndefined(tokenIfExists) || isTokenAddressInOverrides;
} }

2
packages/website/ts/components/inputs/token_amount_input.tsx
View File

@@ -111,7 +111,7 @@ export class TokenAmountInput extends React.Component<TokenAmountInputProps, Tok
<span> <span>
Insufficient allowance.{' '} Insufficient allowance.{' '}
<Link <Link
to={`${WebsitePaths.Portal}/balances`} to={`${WebsitePaths.Portal}/account`}
style={{ cursor: 'pointer', color: colors.darkestGrey }} style={{ cursor: 'pointer', color: colors.darkestGrey }}
> >
Set allowance Set allowance

6
yarn.lock
View File

@@ -5296,9 +5296,9 @@ ethereumjs-wallet@~0.6.0:
utf8 "^3.0.0" utf8 "^3.0.0"
uuid "^3.3.2" uuid "^3.3.2"
ethers@0xproject/ethers.js#eip-838-reasons, ethers@3.0.22: ethers@3.0.22:
version "3.0.18" version "3.0.22"
resolved "https://codeload.github.com/0xproject/ethers.js/tar.gz/b91342bd200d142af0165d6befddf783c8ae8447" resolved "https://registry.npmjs.org/ethers/-/ethers-3.0.22.tgz#7fab1ea16521705837aa43c15831877b2716b436"
dependencies: dependencies:
aes-js "3.0.0" aes-js "3.0.0"
bn.js "^4.4.0" bn.js "^4.4.0"