aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website/ts
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2017-12-13 01:38:13 +0800
committerFabio Berger <me@fabioberger.com>2017-12-13 01:38:13 +0800
commit4f72c527def4adef60200b60f9bf6221956af7a3 (patch)
treecfe74030bf9ebbfee9063da6faa878f995b65715 /packages/website/ts
parent71cb2e05d1d3d7e2abbbe319dc7a39d7d79d01ac (diff)
parentcb7188d47390719b74d7e09c938068a9f201c1b0 (diff)
downloaddexon-sol-tools-4f72c527def4adef60200b60f9bf6221956af7a3.tar
dexon-sol-tools-4f72c527def4adef60200b60f9bf6221956af7a3.tar.gz
dexon-sol-tools-4f72c527def4adef60200b60f9bf6221956af7a3.tar.bz2
dexon-sol-tools-4f72c527def4adef60200b60f9bf6221956af7a3.tar.lz
dexon-sol-tools-4f72c527def4adef60200b60f9bf6221956af7a3.tar.xz
dexon-sol-tools-4f72c527def4adef60200b60f9bf6221956af7a3.tar.zst
dexon-sol-tools-4f72c527def4adef60200b60f9bf6221956af7a3.zip
Merge branch 'development' of github.com:0xProject/0x.js into development
* 'development' of github.com:0xProject/0x.js: Re-hard code the dependency Add missing dependency Add missing dependency Fix a dependency Fix an invocation Move dependency Merge dependencies Don't unsubscribe on error. It's done automatically Rename blockAndLogStreamer to blockAndLogStreamerIfExists Move isAddress to shared utils and remove all dependencies on ethereum-address Remove ethereum-address dependency and add this logic to the repo
Diffstat (limited to 'packages/website/ts')
-rw-r--r--packages/website/ts/blockchain.ts9
-rw-r--r--packages/website/ts/components/inputs/address_input.tsx4
-rw-r--r--packages/website/ts/globals.d.ts5
3 files changed, 5 insertions, 13 deletions
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 76640a072..172ba6b52 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -468,8 +468,7 @@ export class Blockchain {
public destroy() {
clearInterval(this.zrxPollIntervalId);
this.web3Wrapper.destroy();
- // tslint:disable-next-line:no-floating-promises
- this.stopWatchingExchangeLogFillEventsAsync(); // fire and forget
+ this.stopWatchingExchangeLogFillEvents();
}
private async showEtherScanLinkAndAwaitTransactionMinedAsync(
txHash: string): Promise<TransactionReceiptWithDecodedLogs> {
@@ -485,7 +484,7 @@ export class Blockchain {
}
private async rehydrateStoreWithContractEvents() {
// Ensure we are only ever listening to one set of events
- await this.stopWatchingExchangeLogFillEventsAsync();
+ this.stopWatchingExchangeLogFillEvents();
if (!this.doesUserAddressExist()) {
return; // short-circuit
@@ -517,8 +516,6 @@ export class Blockchain {
// to rollbar and stop watching when one occurs
// tslint:disable-next-line:no-floating-promises
errorReporter.reportAsync(err); // fire and forget
- // tslint:disable-next-line:no-floating-promises
- this.stopWatchingExchangeLogFillEventsAsync(); // fire and forget
return;
} else {
const decodedLog = decodedLogEvent.log;
@@ -593,7 +590,7 @@ export class Blockchain {
tradeHistoryStorage.setFillsLatestBlock(this.userAddress, this.networkId, blockNumberToSet);
}
}
- private async stopWatchingExchangeLogFillEventsAsync() {
+ private stopWatchingExchangeLogFillEvents(): void {
this.zeroEx.exchange.unsubscribeAll();
}
private async getTokenRegistryTokensByAddressAsync(): Promise<TokenByAddress> {
diff --git a/packages/website/ts/components/inputs/address_input.tsx b/packages/website/ts/components/inputs/address_input.tsx
index 8b03b8d12..40ae722d9 100644
--- a/packages/website/ts/components/inputs/address_input.tsx
+++ b/packages/website/ts/components/inputs/address_input.tsx
@@ -1,4 +1,4 @@
-import {isAddress} from 'ethereum-address';
+import {addressUtils} from '@0xproject/utils';
import * as _ from 'lodash';
import {colors} from 'material-ui/styles';
import TextField from 'material-ui/TextField';
@@ -62,7 +62,7 @@ export class AddressInput extends React.Component<AddressInputProps, AddressInpu
}
private onOrderTakerAddressUpdated(e: any) {
const address = e.target.value.toLowerCase();
- const isValidAddress = isAddress(address) || address === '';
+ const isValidAddress = addressUtils.isAddress(address) || address === '';
const errMsg = isValidAddress ? '' : 'Invalid ethereum address';
this.setState({
address,
diff --git a/packages/website/ts/globals.d.ts b/packages/website/ts/globals.d.ts
index b4611f583..3144d7eb5 100644
--- a/packages/website/ts/globals.d.ts
+++ b/packages/website/ts/globals.d.ts
@@ -55,11 +55,6 @@ interface System {
}
declare var System: System;
-// ethereum-address declarations
-declare module 'ethereum-address' {
- export const isAddress: (address: string) => boolean;
-}
-
// jsonschema declarations
// Source: https://github.com/tdegrunt/jsonschema/blob/master/lib/index.d.ts
declare interface Schema {