crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reuse intervalutils in website

Browse Source
This commit is contained in:
Leonid Logvinov 2017-12-14 17:43:42 +01:00
parent 9ad9e1204c
commit ce242b10e2
No known key found for this signature in database
GPG Key ID: 0DD294BFDE8C95D4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/website/ts/blockchain.ts
View File

@ -23,7 +23,7 @@ import {
LedgerWalletSubprovider, LedgerWalletSubprovider,
RedundantRPCSubprovider, RedundantRPCSubprovider,
} from '@0xproject/subproviders'; } from '@0xproject/subproviders';
import {promisify} from '@0xproject/utils'; import {intervalUtils, promisify} from '@0xproject/utils';
import BigNumber from 'bignumber.js'; import BigNumber from 'bignumber.js';
import compareVersions = require('compare-versions'); import compareVersions = require('compare-versions');
import ethUtil = require('ethereumjs-util'); import ethUtil = require('ethereumjs-util');
@ -75,7 +75,7 @@ export class Blockchain {
private userAddress: string; private userAddress: string;
private cachedProvider: Web3.Provider; private cachedProvider: Web3.Provider;
private ledgerSubprovider: LedgerWalletSubprovider; private ledgerSubprovider: LedgerWalletSubprovider;
private zrxPollIntervalId: number; private zrxPollIntervalId: NodeJS.Timer;
private static async onPageLoadAsync() { private static async onPageLoadAsync() {
if (document.readyState === 'complete') { if (document.readyState === 'complete') {
return; // Already loaded return; // Already loaded
@ -359,7 +359,7 @@ export class Blockchain {
const [currBalance] = await this.getTokenBalanceAndAllowanceAsync(this.userAddress, token.address); 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); const [balance] = await this.getTokenBalanceAndAllowanceAsync(this.userAddress, token.address);
if (!balance.eq(currBalance)) { if (!balance.eq(currBalance)) {
this.dispatcher.replaceTokenBalanceByAddress(token.address, balance); this.dispatcher.replaceTokenBalanceByAddress(token.address, balance);

6
packages/website/ts/web3_wrapper.ts
View File

@ -1,4 +1,4 @@
import {promisify} from '@0xproject/utils'; import {intervalUtils, promisify} from '@0xproject/utils';
import BigNumber from 'bignumber.js'; import BigNumber from 'bignumber.js';
import * as _ from 'lodash'; import * as _ from 'lodash';
import {Dispatcher} from 'ts/redux/dispatcher'; import {Dispatcher} from 'ts/redux/dispatcher';
@ -9,7 +9,7 @@ export class Web3Wrapper {
private web3: Web3; private web3: Web3;
private prevNetworkId: number; private prevNetworkId: number;
private shouldPollUserAddress: boolean; private shouldPollUserAddress: boolean;
private watchNetworkAndBalanceIntervalId: number; private watchNetworkAndBalanceIntervalId: NodeJS.Timer;
private prevUserEtherBalanceInEth: BigNumber; private prevUserEtherBalanceInEth: BigNumber;
private prevUserAddress: string; private prevUserAddress: string;
constructor(dispatcher: Dispatcher, provider: Web3.Provider, networkIdIfExists: number, constructor(dispatcher: Dispatcher, provider: Web3.Provider, networkIdIfExists: number,
@ -98,7 +98,7 @@ export class Web3Wrapper {
let prevNodeVersion: string; let prevNodeVersion: string;
this.prevUserEtherBalanceInEth = new BigNumber(0); this.prevUserEtherBalanceInEth = new BigNumber(0);
this.dispatcher.updateNetworkId(this.prevNetworkId); this.dispatcher.updateNetworkId(this.prevNetworkId);
this.watchNetworkAndBalanceIntervalId = window.setInterval(async () => { this.watchNetworkAndBalanceIntervalId = intervalUtils.setAsyncExcludingInterval(async () => {
// Check for network state changes // Check for network state changes
const currentNetworkId = await this.getNetworkIdIfExists(); const currentNetworkId = await this.getNetworkIdIfExists();
if (currentNetworkId !== this.prevNetworkId) { if (currentNetworkId !== this.prevNetworkId) {