merge v2-prototype

2 files changed, 26 insertions, 92 deletions

diff --git a/packages/website/ts/containers/legacy_portal.ts b/packages/website/ts/containers/legacy_portal.ts
deleted file mode 100644
index e99f47fb7..000000000
--- a/packages/website/ts/containers/legacy_portal.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import { BigNumber } from '@0xproject/utils';
-import * as _ from 'lodash';
-import * as React from 'react';
-import { connect } from 'react-redux';
-import { Dispatch } from 'redux';
-import {
-    LegacyPortal as LegacyPortalComponent,
-    LegacyPortalProps as LegacyPortalComponentProps,
-} from 'ts/components/legacy_portal/legacy_portal';
-import { Dispatcher } from 'ts/redux/dispatcher';
-import { State } from 'ts/redux/reducer';
-import { BlockchainErrs, HashData, Order, ProviderType, ScreenWidths, Side, TokenByAddress } from 'ts/types';
-import { constants } from 'ts/utils/constants';
-import { Translate } from 'ts/utils/translate';
-
-interface ConnectedState {
-    blockchainErr: BlockchainErrs;
-    blockchainIsLoaded: boolean;
-    hashData: HashData;
-    injectedProviderName: string;
-    networkId: number;
-    nodeVersion: string;
-    orderFillAmount: BigNumber;
-    providerType: ProviderType;
-    tokenByAddress: TokenByAddress;
-    lastForceTokenStateRefetch: number;
-    userEtherBalanceInWei?: BigNumber;
-    screenWidth: ScreenWidths;
-    shouldBlockchainErrDialogBeOpen: boolean;
-    userAddress: string;
-    userSuppliedOrderCache: Order;
-    flashMessage?: string | React.ReactNode;
-    translate: Translate;
-}
-
-interface ConnectedDispatch {
-    dispatcher: Dispatcher;
-}
-
-const mapStateToProps = (state: State, _ownProps: LegacyPortalComponentProps): ConnectedState => {
-    const receiveAssetToken = state.sideToAssetToken[Side.Receive];
-    const depositAssetToken = state.sideToAssetToken[Side.Deposit];
-    const receiveAddress = !_.isUndefined(receiveAssetToken.address)
-        ? receiveAssetToken.address
-        : constants.NULL_ADDRESS;
-    const depositAddress = !_.isUndefined(depositAssetToken.address)
-        ? depositAssetToken.address
-        : constants.NULL_ADDRESS;
-    const receiveAmount = !_.isUndefined(receiveAssetToken.amount) ? receiveAssetToken.amount : new BigNumber(0);
-    const depositAmount = !_.isUndefined(depositAssetToken.amount) ? depositAssetToken.amount : new BigNumber(0);
-    const hashData = {
-        depositAmount,
-        depositTokenContractAddr: depositAddress,
-        feeRecipientAddress: constants.NULL_ADDRESS,
-        makerFee: constants.MAKER_FEE,
-        orderExpiryTimestamp: state.orderExpiryTimestamp,
-        orderMakerAddress: state.userAddress,
-        orderTakerAddress: state.orderTakerAddress !== '' ? state.orderTakerAddress : constants.NULL_ADDRESS,
-        receiveAmount,
-        receiveTokenContractAddr: receiveAddress,
-        takerFee: constants.TAKER_FEE,
-        orderSalt: state.orderSalt,
-    };
-    return {
-        blockchainErr: state.blockchainErr,
-        blockchainIsLoaded: state.blockchainIsLoaded,
-        hashData,
-        injectedProviderName: state.injectedProviderName,
-        networkId: state.networkId,
-        nodeVersion: state.nodeVersion,
-        orderFillAmount: state.orderFillAmount,
-        providerType: state.providerType,
-        screenWidth: state.screenWidth,
-        shouldBlockchainErrDialogBeOpen: state.shouldBlockchainErrDialogBeOpen,
-        tokenByAddress: state.tokenByAddress,
-        lastForceTokenStateRefetch: state.lastForceTokenStateRefetch,
-        userAddress: state.userAddress,
-        userEtherBalanceInWei: state.userEtherBalanceInWei,
-        userSuppliedOrderCache: state.userSuppliedOrderCache,
-        flashMessage: state.flashMessage,
-        translate: state.translate,
-    };
-};
-
-const mapDispatchToProps = (dispatch: Dispatch<State>): ConnectedDispatch => ({
-    dispatcher: new Dispatcher(dispatch),
-});
-
-export const LegacyPortal: React.ComponentClass<LegacyPortalComponentProps> = connect(
-    mapStateToProps,
-    mapDispatchToProps,
-)(LegacyPortalComponent);
diff --git a/packages/website/ts/containers/zero_ex_js_documentation.ts b/packages/website/ts/containers/zero_ex_js_documentation.ts
index b43a1f645..2fc08e923 100644
--- a/packages/website/ts/containers/zero_ex_js_documentation.ts
+++ b/packages/website/ts/containers/zero_ex_js_documentation.ts
@@ -183,6 +183,32 @@ const docsInfoConfig: DocsInfoConfig = {
             'JSONRPCErrorCallback',
             'LogEntryEvent',
             'LogEntry',
+            'ERC20AssetData',
+            'ERC721AssetData',
+            'AssetProxyId',
+            'WETH9Events',
+            'WETH9WithdrawalEventArgs',
+            'WETH9ApprovalEventArgs',
+            'WETH9EventArgs',
+            'WETH9DepositEventArgs',
+            'WETH9TransferEventArgs',
+            'ERC20TokenTransferEventArgs',
+            'ERC20TokenApprovalEventArgs',
+            'ERC20TokenEvents',
+            'ERC20TokenEventArgs',
+            'ERC721TokenApprovalEventArgs',
+            'ERC721TokenApprovalForAllEventArgs',
+            'ERC721TokenTransferEventArgs',
+            'ERC721TokenEvents',
+            'ExchangeCancelUpToEventArgs',
+            'ExchangeAssetProxyRegisteredEventArgs',
+            'ExchangeFillEventArgs',
+            'ExchangeCancelEventArgs',
+            'ExchangeEventArgs',
+            'ContractWrappersConfig',
+            'MessagePrefixType',
+            'MessagePrefixOpts',
+            'OrderInfo',
         ],
         typeNameToPrefix: {},
         typeNameToExternalLink: {