diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-12-08 05:15:23 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-12-08 05:15:23 +0800 |
| commit | 6c2bf8ed264c8941a0f234f3caceb52e412fda84 (patch) | |
| tree | 8558863db2ce6ab1c435c2afc82ca7453faadb6b /packages/website/ts/components | |
| parent | be17b75ad3e043df6f4ff05ead0627cb9a45d93b (diff) | |
| parent | f1ecdcf6029debbd2183511080b302a4fccc6703 (diff) | |
| download | dexon-0x-contracts-6c2bf8ed264c8941a0f234f3caceb52e412fda84.tar.gz dexon-0x-contracts-6c2bf8ed264c8941a0f234f3caceb52e412fda84.tar.zst dexon-0x-contracts-6c2bf8ed264c8941a0f234f3caceb52e412fda84.zip | |
Merge branch 'development' into feature/addSubproviders
* development:
Make sure we don't pass empty maker into getOrderHashHex
Make sure we always pass in the correct networkId even if no injectedWeb3 found
Diffstat (limited to 'packages/website/ts/components')
| -rw-r--r-- | packages/website/ts/components/inputs/hash_input.tsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/website/ts/components/inputs/hash_input.tsx b/packages/website/ts/components/inputs/hash_input.tsx index 7fadc3c15..25e7b5009 100644 --- a/packages/website/ts/components/inputs/hash_input.tsx +++ b/packages/website/ts/components/inputs/hash_input.tsx @@ -1,4 +1,5 @@ import {Order, ZeroEx} from '0x.js'; +import * as _ from 'lodash'; import * as React from 'react'; import ReactTooltip = require('react-tooltip'); import {Blockchain} from 'ts/blockchain'; @@ -49,7 +50,7 @@ export class HashInput extends React.Component<HashInputProps, HashInputState> { exchangeContractAddress, expirationUnixTimestampSec: hashData.orderExpiryTimestamp, feeRecipient: hashData.feeRecipientAddress, - maker: hashData.orderMakerAddress, + maker: _.isEmpty(hashData.orderMakerAddress) ? constants.NULL_ADDRESS : hashData.orderMakerAddress, makerFee: hashData.makerFee, makerTokenAddress: hashData.depositTokenContractAddr, makerTokenAmount: hashData.depositAmount, |