diff options
| author | Leonid <logvinov.leon@gmail.com> | 2017-12-08 19:46:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-08 19:46:51 +0800 |
| commit | 36125c3539fce6f67d62ab3378bbf09653a1c3c1 (patch) | |
| tree | 053c7b62f54be4447fb352c84a8452da5f92b697 /packages/website/ts/components | |
| parent | b362e2c28e9cafa7335bced17ec61fba93b018e6 (diff) | |
| parent | 72ced622d7fddac4d17b7814f45aeea01db23959 (diff) | |
| download | dexon-sol-tools-36125c3539fce6f67d62ab3378bbf09653a1c3c1.tar dexon-sol-tools-36125c3539fce6f67d62ab3378bbf09653a1c3c1.tar.gz dexon-sol-tools-36125c3539fce6f67d62ab3378bbf09653a1c3c1.tar.bz2 dexon-sol-tools-36125c3539fce6f67d62ab3378bbf09653a1c3c1.tar.lz dexon-sol-tools-36125c3539fce6f67d62ab3378bbf09653a1c3c1.tar.xz dexon-sol-tools-36125c3539fce6f67d62ab3378bbf09653a1c3c1.tar.zst dexon-sol-tools-36125c3539fce6f67d62ab3378bbf09653a1c3c1.zip | |
Merge branch 'development' into feature/web3-wrapper
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, |