From 996e9e9102dc3f7ebcd6328c59593410c397c779 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 18 Jan 2018 15:02:36 +0800
Subject: Add missing onError callbacks

---
 packages/website/ts/web3_wrapper.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'packages/website/ts/web3_wrapper.ts')

diff --git a/packages/website/ts/web3_wrapper.ts b/packages/website/ts/web3_wrapper.ts
index 6f260dc48..f5e3985c5 100644
--- a/packages/website/ts/web3_wrapper.ts
+++ b/packages/website/ts/web3_wrapper.ts
@@ -1,6 +1,7 @@
 import { BigNumber, intervalUtils, promisify } from '@0xproject/utils';
 import * as _ from 'lodash';
 import { Dispatcher } from 'ts/redux/dispatcher';
+import { utils } from 'ts/utils/utils';
 import * as Web3 from 'web3';
 
 export class Web3Wrapper {
@@ -135,7 +136,10 @@ export class Web3Wrapper {
                     await this._updateUserEtherBalanceAsync(this._prevUserAddress);
                 }
             }
-        }, 5000);
+        }, 5000, (err: Error) => {
+            utils.consoleLog(`Watching network and balances failed: ${err}`);
+            this._stopEmittingNetworkConnectionAndUserBalanceStateAsync();
+        });
     }
     private async _updateUserEtherBalanceAsync(userAddress: string) {
         const balance = await this.getBalanceInEthAsync(userAddress);
-- 
cgit 


From f9c21efc3073fea4578d46a47f5a08214c592e87 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 18 Jan 2018 19:29:54 +0800
Subject: Use intervalUtils.clearAsyncExcludingInterval instead of calling
 clearInterval directly for grepability

---
 packages/website/ts/web3_wrapper.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/website/ts/web3_wrapper.ts')

diff --git a/packages/website/ts/web3_wrapper.ts b/packages/website/ts/web3_wrapper.ts
index f5e3985c5..407c62aaa 100644
--- a/packages/website/ts/web3_wrapper.ts
+++ b/packages/website/ts/web3_wrapper.ts
@@ -149,6 +149,6 @@ export class Web3Wrapper {
         }
     }
     private _stopEmittingNetworkConnectionAndUserBalanceStateAsync() {
-        clearInterval(this._watchNetworkAndBalanceIntervalId);
+        intervalUtils.clearAsyncExcludingInterval(this._watchNetworkAndBalanceIntervalId);
     }
 }
-- 
cgit