Merge pull request #379 from 0xProject/portal_json

Make portal order JSON compatible with 0x.js

2 files changed, 10 insertions, 12 deletions

diff --git a/packages/website/ts/redux/dispatcher.ts b/packages/website/ts/redux/dispatcher.ts
index 87415b285..925f2aa29 100644
--- a/packages/website/ts/redux/dispatcher.ts
+++ b/packages/website/ts/redux/dispatcher.ts
@@ -1,3 +1,4 @@
+import { ECSignature } from '0x.js';
 import { BigNumber } from '@0xproject/utils';
 import { Dispatch } from 'redux';
 import { State } from 'ts/redux/reducer';
@@ -10,7 +11,6 @@ import {
     ScreenWidths,
     Side,
     SideToAssetToken,
-    SignatureData,
     Token,
     TokenByAddress,
 } from 'ts/types';
@@ -148,10 +148,10 @@ export class Dispatcher {
             type: ActionTypes.ForceTokenStateRefetch,
         });
     }
-    public updateSignatureData(signatureData: SignatureData) {
+    public updateECSignature(ecSignature: ECSignature) {
         this._dispatch({
-            data: signatureData,
-            type: ActionTypes.UpdateOrderSignatureData,
+            data: ecSignature,
+            type: ActionTypes.UpdateOrderECSignature,
         });
     }
     public updateUserEtherBalance(balance: BigNumber) {
diff --git a/packages/website/ts/redux/reducer.ts b/packages/website/ts/redux/reducer.ts
index 7b0b03dae..c2a21dc07 100644
--- a/packages/website/ts/redux/reducer.ts
+++ b/packages/website/ts/redux/reducer.ts
@@ -1,4 +1,4 @@
-import { ZeroEx } from '0x.js';
+import { ECSignature, ZeroEx } from '0x.js';
 import { BigNumber } from '@0xproject/utils';
 import * as _ from 'lodash';
 import * as moment from 'moment';
@@ -11,7 +11,6 @@ import {
     ScreenWidths,
     Side,
     SideToAssetToken,
-    SignatureData,
     TokenByAddress,
 } from 'ts/types';
 import { utils } from 'ts/utils/utils';
@@ -29,7 +28,7 @@ export interface State {
     orderExpiryTimestamp: BigNumber;
     orderFillAmount: BigNumber;
     orderTakerAddress: string;
-    orderSignatureData: SignatureData;
+    orderECSignature: ECSignature;
     orderSalt: BigNumber;
     nodeVersion: string;
     screenWidth: ScreenWidths;
@@ -59,13 +58,12 @@ const INITIAL_STATE: State = {
     networkId: undefined,
     orderExpiryTimestamp: utils.initialOrderExpiryUnixTimestampSec(),
     orderFillAmount: undefined,
-    orderSignatureData: {
-        hash: '',
+    orderECSignature: {
         r: '',
         s: '',
         v: 27,
     },
-    orderTakerAddress: '',
+    orderTakerAddress: ZeroEx.NULL_ADDRESS,
     orderSalt: ZeroEx.generatePseudoRandomSalt(),
     nodeVersion: undefined,
     screenWidth: utils.getScreenWidth(),
@@ -188,10 +186,10 @@ export function reducer(state: State = INITIAL_STATE, action: Action) {
                 lastForceTokenStateRefetch: moment().unix(),
             };
 
-        case ActionTypes.UpdateOrderSignatureData: {
+        case ActionTypes.UpdateOrderECSignature: {
             return {
                 ...state,
-                orderSignatureData: action.data,
+                orderECSignature: action.data,
             };
         }