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/ts/blockchain.ts | |
parent | 06e348f80ba1e5580d18d927600688863f73c423 (diff) | |
parent | 598f1dd2d8a89b0e3ab04b2917138997031bafc6 (diff) | |
download | dexon-sol-tools-0abbdc6b9652a62f32f9f75e06e15f724260591c.tar dexon-sol-tools-0abbdc6b9652a62f32f9f75e06e15f724260591c.tar.gz dexon-sol-tools-0abbdc6b9652a62f32f9f75e06e15f724260591c.tar.bz2 dexon-sol-tools-0abbdc6b9652a62f32f9f75e06e15f724260591c.tar.lz dexon-sol-tools-0abbdc6b9652a62f32f9f75e06e15f724260591c.tar.xz dexon-sol-tools-0abbdc6b9652a62f32f9f75e06e15f724260591c.tar.zst dexon-sol-tools-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/ts/blockchain.ts')
-rw-r--r-- | packages/website/ts/blockchain.ts | 2 |
1 files changed, 1 insertions, 1 deletions
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 } |