diff options
author | Fabio Berger <me@fabioberger.com> | 2017-12-07 00:49:22 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2017-12-07 00:49:22 +0800 |
commit | 0abbdc6b9652a62f32f9f75e06e15f724260591c (patch) | |
tree | bb0db4619e1f87388c3b3b7a13ec87b99b399ddd /packages/website | |
parent | 06e348f80ba1e5580d18d927600688863f73c423 (diff) | |
parent | 598f1dd2d8a89b0e3ab04b2917138997031bafc6 (diff) | |
download | dexon-0x-contracts-0abbdc6b9652a62f32f9f75e06e15f724260591c.tar dexon-0x-contracts-0abbdc6b9652a62f32f9f75e06e15f724260591c.tar.gz dexon-0x-contracts-0abbdc6b9652a62f32f9f75e06e15f724260591c.tar.bz2 dexon-0x-contracts-0abbdc6b9652a62f32f9f75e06e15f724260591c.tar.lz dexon-0x-contracts-0abbdc6b9652a62f32f9f75e06e15f724260591c.tar.xz dexon-0x-contracts-0abbdc6b9652a62f32f9f75e06e15f724260591c.tar.zst dexon-0x-contracts-0abbdc6b9652a62f32f9f75e06e15f724260591c.zip |
Merge branch 'development' into feature/addSubproviders
* development:
Inline function
Introduce a const
Make private
Add version matcher script
Use same versions of dependencies everywhere
Add missing await
Move declaration into proper conditional block
Fix Party element so that an identicon's height is that which was passed in
# Conflicts:
# packages/website/package.json
# yarn.lock
Diffstat (limited to 'packages/website')
-rw-r--r-- | packages/website/package.json | 16 | ||||
-rw-r--r-- | packages/website/ts/blockchain.ts | 2 | ||||
-rw-r--r-- | packages/website/ts/components/ui/lifecycle_raised_button.tsx | 2 | ||||
-rw-r--r-- | packages/website/ts/components/ui/party.tsx | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/packages/website/package.json b/packages/website/package.json index a1990d958..fc7d65d05 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -34,13 +34,13 @@ "ethereumjs-util": "^5.1.1", "find-versions": "^2.0.0", "is-mobile": "^0.2.2", - "jsonschema": "^1.1.1", + "jsonschema": "^1.2.0", "ledgerco": "0xProject/ledger-node-js-api", "less": "^2.7.2", "lodash": "^4.17.4", "material-ui": "^0.17.1", "moment": "^2.18.1", - "query-string": "^5.0.0", + "query-string": "^5.0.1", "react": "15.6.1", "react-copy-to-clipboard": "^4.2.3", "react-document-title": "^2.0.3", @@ -63,9 +63,8 @@ "thenby": "^1.2.3", "truffle-contract": "2.0.1", "tslint-config-0xproject": "^0.0.2", - "typescript": "^2.4.1", "web3": "^0.20.0", - "web3-provider-engine": "^11.0.0", + "web3-provider-engine": "^13.0.1", "whatwg-fetch": "^2.0.3", "xml-js": "^1.3.2" }, @@ -74,11 +73,11 @@ "@types/dateformat": "^1.0.1", "@types/deep-equal": "^1.0.0", "@types/jsonschema": "^1.1.1", - "@types/lodash": "^4.14.55", + "@types/lodash": "^4.14.86", "@types/material-ui": "0.18.0", "@types/moment": "^2.13.0", - "@types/node": "^7.0.8", - "@types/query-string": "^5.0.0", + "@types/node": "^8.0.53", + "@types/query-string": "^5.0.1", "@types/react": "^15.0.15", "@types/react-copy-to-clipboard": "^4.2.0", "@types/react-dom": "^0.14.23", @@ -100,8 +99,9 @@ "source-map-loader": "^0.1.6", "style-loader": "0.13.x", "tslint": "5.8.0", + "typescript": "~2.6.1", "web3-typescript-typings": "^0.7.2", - "webpack": "3.1.0", + "webpack": "^3.1.0", "webpack-dev-middleware": "^1.10.0", "webpack-dev-server": "^2.5.0" } diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts index c32984477..f11c014fb 100644 --- a/packages/website/ts/blockchain.ts +++ b/packages/website/ts/blockchain.ts @@ -511,7 +511,6 @@ export class Blockchain { const subscriptionId = this.zeroEx.exchange.subscribe( ExchangeEvents.LogFill, indexFilterValues, async (err: Error, decodedLogEvent: DecodedLogEvent<LogFillContractEventArgs>) => { - const decodedLog = decodedLogEvent.log; if (err) { // Note: it's not entirely clear from the documentation which // errors will be thrown by `watch`. For now, let's log the error @@ -522,6 +521,7 @@ export class Blockchain { this.stopWatchingExchangeLogFillEventsAsync(); // fire and forget return; } else { + const decodedLog = decodedLogEvent.log; if (!this.doesLogEventInvolveUser(decodedLog)) { return; // We aren't interested in the fill event } diff --git a/packages/website/ts/components/ui/lifecycle_raised_button.tsx b/packages/website/ts/components/ui/lifecycle_raised_button.tsx index 630f71545..338a3bf76 100644 --- a/packages/website/ts/components/ui/lifecycle_raised_button.tsx +++ b/packages/website/ts/components/ui/lifecycle_raised_button.tsx @@ -83,7 +83,7 @@ export class LifeCycleRaisedButton extends this.setState({ buttonState: ButtonState.LOADING, }); - const didSucceed = this.props.onClickAsyncFn(); + const didSucceed = await this.props.onClickAsyncFn(); if (this.didUnmount) { return; // noop since unmount called before async callback returned. } diff --git a/packages/website/ts/components/ui/party.tsx b/packages/website/ts/components/ui/party.tsx index 2927d9d3d..5bafa6071 100644 --- a/packages/website/ts/components/ui/party.tsx +++ b/packages/website/ts/components/ui/party.tsx @@ -73,7 +73,7 @@ export class Party extends React.Component<PartyProps, PartyState> { /> : <div className="mx-auto" - style={{height: IMAGE_DIMENSION, width: IMAGE_DIMENSION}} + style={{height: identiconDiameter, width: identiconDiameter}} > <Identicon address={this.props.address} |