diff options
| author | Leonid <logvinov.leon@gmail.com> | 2017-12-12 22:27:35 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 22:27:35 +0800 |
| commit | 02f22d91555ea05fc52d342e9c91cd9477321da1 (patch) | |
| tree | dac418d8936de790ca92b4c0fdbf5de6512fba91 /packages/website | |
| parent | 1339aadf4e495817f5172498c76da3399c8ac806 (diff) | |
| parent | 707b98849ccce8e56041d386eb18101bf326d270 (diff) | |
| download | dexon-0x-contracts-02f22d91555ea05fc52d342e9c91cd9477321da1.tar dexon-0x-contracts-02f22d91555ea05fc52d342e9c91cd9477321da1.tar.gz dexon-0x-contracts-02f22d91555ea05fc52d342e9c91cd9477321da1.tar.bz2 dexon-0x-contracts-02f22d91555ea05fc52d342e9c91cd9477321da1.tar.lz dexon-0x-contracts-02f22d91555ea05fc52d342e9c91cd9477321da1.tar.xz dexon-0x-contracts-02f22d91555ea05fc52d342e9c91cd9477321da1.tar.zst dexon-0x-contracts-02f22d91555ea05fc52d342e9c91cd9477321da1.zip | |
Merge pull request #262 from 0xProject/fix/portal-bug
Fix portal subscriptions bug
Diffstat (limited to 'packages/website')
| -rw-r--r-- | packages/website/package.json | 2 | ||||
| -rw-r--r-- | packages/website/ts/blockchain.ts | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/packages/website/package.json b/packages/website/package.json index 95e060552..5162a27ff 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -18,7 +18,7 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "0x.js": "0xproject/0x.js/packages/0x.js#0x.js@0.27.1", + "0x.js": "0.27.1", "@0xproject/subproviders": "^0.1.0", "accounting": "^0.4.1", "basscss": "^8.0.3", diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts index 76640a072..172ba6b52 100644 --- a/packages/website/ts/blockchain.ts +++ b/packages/website/ts/blockchain.ts @@ -468,8 +468,7 @@ export class Blockchain { public destroy() { clearInterval(this.zrxPollIntervalId); this.web3Wrapper.destroy(); - // tslint:disable-next-line:no-floating-promises - this.stopWatchingExchangeLogFillEventsAsync(); // fire and forget + this.stopWatchingExchangeLogFillEvents(); } private async showEtherScanLinkAndAwaitTransactionMinedAsync( txHash: string): Promise<TransactionReceiptWithDecodedLogs> { @@ -485,7 +484,7 @@ export class Blockchain { } private async rehydrateStoreWithContractEvents() { // Ensure we are only ever listening to one set of events - await this.stopWatchingExchangeLogFillEventsAsync(); + this.stopWatchingExchangeLogFillEvents(); if (!this.doesUserAddressExist()) { return; // short-circuit @@ -517,8 +516,6 @@ export class Blockchain { // to rollbar and stop watching when one occurs // tslint:disable-next-line:no-floating-promises errorReporter.reportAsync(err); // fire and forget - // tslint:disable-next-line:no-floating-promises - this.stopWatchingExchangeLogFillEventsAsync(); // fire and forget return; } else { const decodedLog = decodedLogEvent.log; @@ -593,7 +590,7 @@ export class Blockchain { tradeHistoryStorage.setFillsLatestBlock(this.userAddress, this.networkId, blockNumberToSet); } } - private async stopWatchingExchangeLogFillEventsAsync() { + private stopWatchingExchangeLogFillEvents(): void { this.zeroEx.exchange.unsubscribeAll(); } private async getTokenRegistryTokensByAddressAsync(): Promise<TokenByAddress> { |