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

Small Fixes/Additions

1 files changed, 7 insertions, 3 deletions

diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 1320fbeb9..66f982427 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -372,10 +372,14 @@ export class Blockchain {
             const [balance] = await this.getTokenBalanceAndAllowanceAsync(this._userAddress, token.address);
             if (!balance.eq(currBalance)) {
                 this._dispatcher.replaceTokenBalanceByAddress(token.address, balance);
-                clearInterval(this._zrxPollIntervalId);
+                intervalUtils.clearAsyncExcludingInterval(this._zrxPollIntervalId);
                 delete this._zrxPollIntervalId;
             }
-        }, 5000);
+        }, 5000, (err: Error) => {
+            utils.consoleLog(`Polling tokenBalance failed: ${err}`);
+            intervalUtils.clearAsyncExcludingInterval(this._zrxPollIntervalId);
+            delete this._zrxPollIntervalId;
+        });
     }
     public async signOrderHashAsync(orderHash: string): Promise<SignatureData> {
         utils.assert(!_.isUndefined(this._zeroEx), 'ZeroEx must be instantiated.');
@@ -471,7 +475,7 @@ export class Blockchain {
         this._web3Wrapper.updatePrevUserAddress(newUserAddress);
     }
     public destroy() {
-        clearInterval(this._zrxPollIntervalId);
+        intervalUtils.clearAsyncExcludingInterval(this._zrxPollIntervalId);
         this._web3Wrapper.destroy();
         this._stopWatchingExchangeLogFillEvents();
     }