From ce242b10e2c4d35bbba3842d198b78373dd609f0 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Thu, 14 Dec 2017 17:43:42 +0100
Subject: Reuse intervalutils in website

---
 packages/website/ts/blockchain.ts   | 6 +++---
 packages/website/ts/web3_wrapper.ts | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 172ba6b52..321a603ef 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -23,7 +23,7 @@ import {
     LedgerWalletSubprovider,
     RedundantRPCSubprovider,
 } from '@0xproject/subproviders';
-import {promisify} from '@0xproject/utils';
+import {intervalUtils, promisify} from '@0xproject/utils';
 import BigNumber from 'bignumber.js';
 import compareVersions = require('compare-versions');
 import ethUtil = require('ethereumjs-util');
@@ -75,7 +75,7 @@ export class Blockchain {
     private userAddress: string;
     private cachedProvider: Web3.Provider;
     private ledgerSubprovider: LedgerWalletSubprovider;
-    private zrxPollIntervalId: number;
+    private zrxPollIntervalId: NodeJS.Timer;
     private static async onPageLoadAsync() {
         if (document.readyState === 'complete') {
             return; // Already loaded
@@ -359,7 +359,7 @@ export class Blockchain {
 
         const [currBalance] = await this.getTokenBalanceAndAllowanceAsync(this.userAddress, token.address);
 
-        this.zrxPollIntervalId = window.setInterval(async () => {
+        this.zrxPollIntervalId = intervalUtils.setAsyncExcludingInterval(async () => {
             const [balance] = await this.getTokenBalanceAndAllowanceAsync(this.userAddress, token.address);
             if (!balance.eq(currBalance)) {
                 this.dispatcher.replaceTokenBalanceByAddress(token.address, balance);
diff --git a/packages/website/ts/web3_wrapper.ts b/packages/website/ts/web3_wrapper.ts
index b713f8a33..1bf7ffed5 100644
--- a/packages/website/ts/web3_wrapper.ts
+++ b/packages/website/ts/web3_wrapper.ts
@@ -1,4 +1,4 @@
-import {promisify} from '@0xproject/utils';
+import {intervalUtils, promisify} from '@0xproject/utils';
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import {Dispatcher} from 'ts/redux/dispatcher';
@@ -9,7 +9,7 @@ export class Web3Wrapper {
     private web3: Web3;
     private prevNetworkId: number;
     private shouldPollUserAddress: boolean;
-    private watchNetworkAndBalanceIntervalId: number;
+    private watchNetworkAndBalanceIntervalId: NodeJS.Timer;
     private prevUserEtherBalanceInEth: BigNumber;
     private prevUserAddress: string;
     constructor(dispatcher: Dispatcher, provider: Web3.Provider, networkIdIfExists: number,
@@ -98,7 +98,7 @@ export class Web3Wrapper {
         let prevNodeVersion: string;
         this.prevUserEtherBalanceInEth = new BigNumber(0);
         this.dispatcher.updateNetworkId(this.prevNetworkId);
-        this.watchNetworkAndBalanceIntervalId = window.setInterval(async () => {
+        this.watchNetworkAndBalanceIntervalId = intervalUtils.setAsyncExcludingInterval(async () => {
             // Check for network state changes
             const currentNetworkId = await this.getNetworkIdIfExists();
             if (currentNetworkId !== this.prevNetworkId) {
-- 
cgit v1.2.3