From 53e2cda4c8d6698b5c4b69f510ad8764cb089306 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Fri, 22 Jun 2018 15:37:42 -0700
Subject: Remove existing networkId watching logic from BlockchainWatcher

---
 packages/website/ts/blockchain.ts         |  6 ++---
 packages/website/ts/blockchain_watcher.ts | 37 ++++++++++---------------------
 2 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 46a4d6629..11202eb64 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -229,7 +229,7 @@ export class Blockchain {
             shouldPollUserAddress,
         );
         this._contractWrappers.setProvider(provider, this.networkId);
-        await this._blockchainWatcher.startEmittingNetworkConnectionAndUserBalanceStateAsync();
+        await this._blockchainWatcher.startEmittingUserBalanceStateAsync();
         this._dispatcher.updateProviderType(ProviderType.Ledger);
     }
     public async updateProviderToInjectedAsync(): Promise<void> {
@@ -259,7 +259,7 @@ export class Blockchain {
         this._contractWrappers.setProvider(provider, this.networkId);
 
         await this.fetchTokenInformationAsync();
-        await this._blockchainWatcher.startEmittingNetworkConnectionAndUserBalanceStateAsync();
+        await this._blockchainWatcher.startEmittingUserBalanceStateAsync();
         this._dispatcher.updateProviderType(ProviderType.Injected);
         delete this._ledgerSubprovider;
         delete this._cachedProvider;
@@ -816,7 +816,7 @@ export class Blockchain {
         this._userAddressIfExists = userAddresses[0];
         this._dispatcher.updateUserAddress(this._userAddressIfExists);
         await this.fetchTokenInformationAsync();
-        await this._blockchainWatcher.startEmittingNetworkConnectionAndUserBalanceStateAsync();
+        await this._blockchainWatcher.startEmittingUserBalanceStateAsync();
         await this._rehydrateStoreWithContractEventsAsync();
     }
     private _updateProviderName(injectedWeb3: Web3): void {
diff --git a/packages/website/ts/blockchain_watcher.ts b/packages/website/ts/blockchain_watcher.ts
index c576db6ac..8ae5e7797 100644
--- a/packages/website/ts/blockchain_watcher.ts
+++ b/packages/website/ts/blockchain_watcher.ts
@@ -8,7 +8,7 @@ export class BlockchainWatcher {
     private _web3Wrapper: Web3Wrapper;
     private _prevNetworkId: number;
     private _shouldPollUserAddress: boolean;
-    private _watchNetworkAndBalanceIntervalId: NodeJS.Timer;
+    private _watchBalanceIntervalId: NodeJS.Timer;
     private _prevUserEtherBalanceInWei?: BigNumber;
     private _prevUserAddressIfExists: string;
     constructor(
@@ -23,7 +23,7 @@ export class BlockchainWatcher {
         this._web3Wrapper = web3Wrapper;
     }
     public destroy(): void {
-        this._stopEmittingNetworkConnectionAndUserBalanceState();
+        this._stopEmittingUserBalanceState();
         // HACK: stop() is only available on providerEngine instances
         const provider = this._web3Wrapper.getProvider();
         if (!_.isUndefined((provider as any).stop)) {
@@ -34,36 +34,23 @@ export class BlockchainWatcher {
     public updatePrevUserAddress(userAddress: string): void {
         this._prevUserAddressIfExists = userAddress;
     }
-    public async startEmittingNetworkConnectionAndUserBalanceStateAsync(): Promise<void> {
-        if (!_.isUndefined(this._watchNetworkAndBalanceIntervalId)) {
+    public async startEmittingUserBalanceStateAsync(): Promise<void> {
+        if (!_.isUndefined(this._watchBalanceIntervalId)) {
             return; // we are already emitting the state
         }
         this._prevUserEtherBalanceInWei = undefined;
-        this._dispatcher.updateNetworkId(this._prevNetworkId);
-        await this._updateNetworkAndBalanceAsync();
-        this._watchNetworkAndBalanceIntervalId = intervalUtils.setAsyncExcludingInterval(
-            this._updateNetworkAndBalanceAsync.bind(this),
+        await this._updateBalanceAsync();
+        this._watchBalanceIntervalId = intervalUtils.setAsyncExcludingInterval(
+            this._updateBalanceAsync.bind(this),
             5000,
             (err: Error) => {
                 logUtils.log(`Watching network and balances failed: ${err.stack}`);
-                this._stopEmittingNetworkConnectionAndUserBalanceState();
+                this._stopEmittingUserBalanceState();
             },
         );
     }
-    private async _updateNetworkAndBalanceAsync(): Promise<void> {
-        // Check for network state changes
+    private async _updateBalanceAsync(): Promise<void> {
         let prevNodeVersion: string;
-        let currentNetworkId;
-        try {
-            currentNetworkId = await this._web3Wrapper.getNetworkIdAsync();
-        } catch (err) {
-            // Noop
-        }
-        if (currentNetworkId !== this._prevNetworkId) {
-            this._prevNetworkId = currentNetworkId;
-            this._dispatcher.updateNetworkId(currentNetworkId);
-        }
-
         // Check for node version changes
         const currentNodeVersion = await this._web3Wrapper.getNodeVersionAsync();
         if (currentNodeVersion !== prevNodeVersion) {
@@ -99,9 +86,9 @@ export class BlockchainWatcher {
             this._dispatcher.updateUserWeiBalance(balanceInWei);
         }
     }
-    private _stopEmittingNetworkConnectionAndUserBalanceState(): void {
-        if (!_.isUndefined(this._watchNetworkAndBalanceIntervalId)) {
-            intervalUtils.clearAsyncExcludingInterval(this._watchNetworkAndBalanceIntervalId);
+    private _stopEmittingUserBalanceState(): void {
+        if (!_.isUndefined(this._watchBalanceIntervalId)) {
+            intervalUtils.clearAsyncExcludingInterval(this._watchBalanceIntervalId);
         }
     }
 }
-- 
cgit v1.2.3