Merge pull request #325 from 0xProject/fix/portal-bugs

Small Fixes/Additions

1 files changed, 6 insertions, 2 deletions

diff --git a/packages/website/ts/web3_wrapper.ts b/packages/website/ts/web3_wrapper.ts
index 6f260dc48..407c62aaa 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);
@@ -145,6 +149,6 @@ export class Web3Wrapper {
         }
     }
     private _stopEmittingNetworkConnectionAndUserBalanceStateAsync() {
-        clearInterval(this._watchNetworkAndBalanceIntervalId);
+        intervalUtils.clearAsyncExcludingInterval(this._watchNetworkAndBalanceIntervalId);
     }
 }