diff --git a/packages/website/ts/components/fill_order.tsx b/packages/website/ts/components/fill_order.tsx index 9da3006a07..97f616be20 100644 --- a/packages/website/ts/components/fill_order.tsx +++ b/packages/website/ts/components/fill_order.tsx @@ -561,6 +561,8 @@ export class FillOrder extends React.Component { }); return; } + const networkName = constants.NETWORK_NAME_BY_ID[this.props.networkId]; + const eventLabel = `${parsedOrder.taker.token.symbol}-${networkName}`; try { const orderFilledAmount: BigNumber = await this.props.blockchain.fillOrderAsync( signedOrder, @@ -569,7 +571,7 @@ export class FillOrder extends React.Component { ReactGA.event({ category: 'Portal', action: 'Fill Order Success', - label: parsedOrder.taker.token.symbol, + label: eventLabel, value: parsedOrder.taker.amount, }); // After fill completes, let's force fetch the token balances @@ -588,7 +590,7 @@ export class FillOrder extends React.Component { ReactGA.event({ category: 'Portal', action: 'Fill Order Failure', - label: parsedOrder.taker.token.symbol, + label: eventLabel, value: parsedOrder.taker.amount, }); const errMsg = `${err}`; @@ -658,6 +660,8 @@ export class FillOrder extends React.Component { }); return; } + const networkName = constants.NETWORK_NAME_BY_ID[this.props.networkId]; + const eventLabel = `${parsedOrder.maker.token.symbol}-${networkName}`; try { await this.props.blockchain.cancelOrderAsync(signedOrder, availableTakerTokenAmount); this.setState({ @@ -669,7 +673,7 @@ export class FillOrder extends React.Component { ReactGA.event({ category: 'Portal', action: 'Cancel Order Success', - label: parsedOrder.maker.token.symbol, + label: eventLabel, value: parsedOrder.maker.amount, }); return; @@ -684,7 +688,7 @@ export class FillOrder extends React.Component { ReactGA.event({ category: 'Portal', action: 'Cancel Order Failure', - label: parsedOrder.maker.token.symbol, + label: eventLabel, value: parsedOrder.maker.amount, }); globalErrMsg = 'Failed to cancel order, please refresh and try again'; 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 2a62d4b9e3..c9417f5a41 100644 --- a/packages/website/ts/components/generate_order/generate_order_form.tsx +++ b/packages/website/ts/components/generate_order/generate_order_form.tsx @@ -30,6 +30,7 @@ import { TokenByAddress, } from 'ts/types'; import { colors } from 'ts/utils/colors'; +import { constants } from 'ts/utils/constants'; import { errorReporter } from 'ts/utils/error_reporter'; import { utils } from 'ts/utils/utils'; @@ -262,10 +263,12 @@ export class GenerateOrderForm extends React.Component void; @@ -74,12 +76,14 @@ export class AllowanceToggle extends React.Component