From 660e670d381316f412e706a9d7ced66b6c48c18c Mon Sep 17 00:00:00 2001
From: Brandon Millman <brandon.millman@gmail.com>
Date: Wed, 29 Aug 2018 23:41:09 -0700
Subject: Update generate and fill order flows

---
 .../website/ts/components/generate_order/generate_order_form.tsx   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'packages/website/ts/components/generate_order/generate_order_form.tsx')

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';
-- 
cgit v1.2.3

