diff options
| author | Brandon Millman <brandon.millman@gmail.com> | 2018-08-30 14:41:09 +0800 |
|---|---|---|
| committer | Brandon Millman <brandon.millman@gmail.com> | 2018-08-31 04:36:44 +0800 |
| commit | 660e670d381316f412e706a9d7ced66b6c48c18c (patch) | |
| tree | 375ae8edf3aba7f6e04a407cccd88685c369901f /packages/website/ts/components/generate_order | |
| parent | 052824f4e30c6dce63f3b57591d0a5727c0bd4c2 (diff) | |
| download | dexon-sol-tools-660e670d381316f412e706a9d7ced66b6c48c18c.tar dexon-sol-tools-660e670d381316f412e706a9d7ced66b6c48c18c.tar.gz dexon-sol-tools-660e670d381316f412e706a9d7ced66b6c48c18c.tar.bz2 dexon-sol-tools-660e670d381316f412e706a9d7ced66b6c48c18c.tar.lz dexon-sol-tools-660e670d381316f412e706a9d7ced66b6c48c18c.tar.xz dexon-sol-tools-660e670d381316f412e706a9d7ced66b6c48c18c.tar.zst dexon-sol-tools-660e670d381316f412e706a9d7ced66b6c48c18c.zip | |
Update generate and fill order flows
Diffstat (limited to 'packages/website/ts/components/generate_order')
| -rw-r--r-- | packages/website/ts/components/generate_order/generate_order_form.tsx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/website/ts/components/generate_order/generate_order_form.tsx b/packages/website/ts/components/generate_order/generate_order_form.tsx index 9eb50f3d7..bb6265170 100644 --- a/packages/website/ts/components/generate_order/generate_order_form.tsx +++ b/packages/website/ts/components/generate_order/generate_order_form.tsx @@ -331,7 +331,7 @@ export class GenerateOrderForm extends React.Component<GenerateOrderFormProps, G salt: hashData.orderSalt, takerAddress: hashData.orderTakerAddress, takerFee: hashData.takerFee, - takerAssetData: hashData.receiveTokenContractAddr, + takerAssetData, takerAssetAmount: hashData.receiveAmount, }; const orderHash = orderHashUtils.getOrderHashHex(zeroExOrder); @@ -339,7 +339,7 @@ export class GenerateOrderForm extends React.Component<GenerateOrderFormProps, G let globalErrMsg = ''; let order; try { - const ecSignature = await this.props.blockchain.signOrderHashAsync(orderHash); + const signature = await this.props.blockchain.signOrderHashAsync(orderHash); order = utils.generateOrder( exchangeAddress, this.props.sideToAssetToken, @@ -349,10 +349,11 @@ export class GenerateOrderForm extends React.Component<GenerateOrderFormProps, G hashData.makerFee, hashData.takerFee, hashData.feeRecipientAddress, - ecSignature, + signature, this.props.tokenByAddress, hashData.orderSalt, ); + console.log(order); const validationResult = validator.validate(order, portalOrderSchema); if (validationResult.errors.length > 0) { globalErrMsg = 'Order signing failed. Please refresh and try again'; |