Merge branch 'feature/website/update-portal-v2' of https://github.com/0xProject/0x-monorepo into feature/website/update-portal-v2

This commit is contained in:
fragosti
2018-09-04 11:55:42 -07:00
3 changed files with 5 additions and 9 deletions

View File

@@ -368,13 +368,11 @@ export class Blockchain {
fillTakerTokenAmount: BigNumber,
takerAddress: string,
): Promise<void> {
// TODO: add validation here
// we can use OrderValidationUtils here?
// await this._contractWrappers.exchange.validateFillOrderThrowIfInvalidAsync(
// signedOrder,
// fillTakerTokenAmount,
// takerAddress,
// );
await this._contractWrappers.exchange.validateFillOrderThrowIfInvalidAsync(
signedOrder,
fillTakerTokenAmount,
takerAddress,
);
}
public isValidAddress(address: string): boolean {
const lowercaseAddress = address.toLowerCase();

View File

@@ -483,7 +483,6 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
});
}
console.log(parsedOrder);
this.setState({
didOrderValidationRun: true,
orderJSON,

View File

@@ -6,7 +6,6 @@ import { BigNumber } from '@0xproject/utils';
import { Web3Wrapper } from '@0xproject/web3-wrapper';
import * as bowser from 'bowser';
import deepEqual = require('deep-equal');
import { Provider } from 'ethereum-types';
import * as _ from 'lodash';
import * as moment from 'moment';
import * as numeral from 'numeral';