diff options
author | Leonid <logvinov.leon@gmail.com> | 2017-12-06 20:52:22 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-06 20:52:22 +0800 |
commit | 594bd2de1ccb41e34729834d67eba617baf1aa80 (patch) | |
tree | b623eb0ed7698b2f0076871fa8bd2bb12298c5c7 /packages/website | |
parent | 55083316fc7f4bcfbb77470a3f66e621a68ebb95 (diff) | |
parent | f0c27f98b809afda3c750e77dbd3f35ccd29ec01 (diff) | |
download | dexon-sol-tools-594bd2de1ccb41e34729834d67eba617baf1aa80.tar dexon-sol-tools-594bd2de1ccb41e34729834d67eba617baf1aa80.tar.gz dexon-sol-tools-594bd2de1ccb41e34729834d67eba617baf1aa80.tar.bz2 dexon-sol-tools-594bd2de1ccb41e34729834d67eba617baf1aa80.tar.lz dexon-sol-tools-594bd2de1ccb41e34729834d67eba617baf1aa80.tar.xz dexon-sol-tools-594bd2de1ccb41e34729834d67eba617baf1aa80.tar.zst dexon-sol-tools-594bd2de1ccb41e34729834d67eba617baf1aa80.zip |
Merge branch 'development' into feature/airport-experiments
Diffstat (limited to 'packages/website')
-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 |
3 files changed, 3 insertions, 3 deletions
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts index e71f61ead..31d725a41 100644 --- a/packages/website/ts/blockchain.ts +++ b/packages/website/ts/blockchain.ts @@ -504,7 +504,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 @@ -515,6 +514,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} |