Merge branch 'development' into feature/instant/rollbar-env
This commit is contained in:
		@@ -10,6 +10,7 @@ import { BuyOrderStateButtons } from '../components/buy_order_state_buttons';
 | 
				
			|||||||
import { Action, actions } from '../redux/actions';
 | 
					import { Action, actions } from '../redux/actions';
 | 
				
			||||||
import { State } from '../redux/reducer';
 | 
					import { State } from '../redux/reducer';
 | 
				
			||||||
import { AccountState, AffiliateInfo, OrderProcessState, ZeroExInstantError } from '../types';
 | 
					import { AccountState, AffiliateInfo, OrderProcessState, ZeroExInstantError } from '../types';
 | 
				
			||||||
 | 
					import { analytics } from '../util/analytics';
 | 
				
			||||||
import { errorFlasher } from '../util/error_flasher';
 | 
					import { errorFlasher } from '../util/error_flasher';
 | 
				
			||||||
import { etherscanUtil } from '../util/etherscan';
 | 
					import { etherscanUtil } from '../util/etherscan';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -59,6 +60,8 @@ const mapStateToProps = (state: State, _ownProps: SelectedAssetBuyOrderStateButt
 | 
				
			|||||||
                    assetBuyer.networkId,
 | 
					                    assetBuyer.networkId,
 | 
				
			||||||
                );
 | 
					                );
 | 
				
			||||||
                if (etherscanUrl) {
 | 
					                if (etherscanUrl) {
 | 
				
			||||||
 | 
					                    analytics.trackTransactionViewed(state.buyOrderState.processState);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    window.open(etherscanUrl, '_blank');
 | 
					                    window.open(etherscanUrl, '_blank');
 | 
				
			||||||
                    return;
 | 
					                    return;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4,6 +4,7 @@ import * as ReactDOM from 'react-dom';
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import { DEFAULT_ZERO_EX_CONTAINER_SELECTOR, INJECTED_DIV_CLASS, INJECTED_DIV_ID } from './constants';
 | 
					import { DEFAULT_ZERO_EX_CONTAINER_SELECTOR, INJECTED_DIV_CLASS, INJECTED_DIV_ID } from './constants';
 | 
				
			||||||
import { ZeroExInstantOverlay, ZeroExInstantOverlayProps } from './index';
 | 
					import { ZeroExInstantOverlay, ZeroExInstantOverlayProps } from './index';
 | 
				
			||||||
 | 
					import { analytics } from './util/analytics';
 | 
				
			||||||
import { assert } from './util/assert';
 | 
					import { assert } from './util/assert';
 | 
				
			||||||
import { util } from './util/util';
 | 
					import { util } from './util/util';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -57,6 +58,7 @@ const renderInstant = (config: ZeroExInstantConfig, selector: string) => {
 | 
				
			|||||||
    injectedDiv.setAttribute('class', INJECTED_DIV_CLASS);
 | 
					    injectedDiv.setAttribute('class', INJECTED_DIV_CLASS);
 | 
				
			||||||
    appendTo.appendChild(injectedDiv);
 | 
					    appendTo.appendChild(injectedDiv);
 | 
				
			||||||
    const closeInstant = () => {
 | 
					    const closeInstant = () => {
 | 
				
			||||||
 | 
					        analytics.trackInstantClosed();
 | 
				
			||||||
        if (!_.isUndefined(config.onClose)) {
 | 
					        if (!_.isUndefined(config.onClose)) {
 | 
				
			||||||
            config.onClose();
 | 
					            config.onClose();
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,6 +7,7 @@ import {
 | 
				
			|||||||
    AffiliateInfo,
 | 
					    AffiliateInfo,
 | 
				
			||||||
    Asset,
 | 
					    Asset,
 | 
				
			||||||
    Network,
 | 
					    Network,
 | 
				
			||||||
 | 
					    OrderProcessState,
 | 
				
			||||||
    OrderSource,
 | 
					    OrderSource,
 | 
				
			||||||
    ProviderState,
 | 
					    ProviderState,
 | 
				
			||||||
    QuoteFetchOrigin,
 | 
					    QuoteFetchOrigin,
 | 
				
			||||||
@@ -28,6 +29,7 @@ export const evaluateIfEnabled = (fnCall: () => void) => {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
enum EventNames {
 | 
					enum EventNames {
 | 
				
			||||||
    INSTANT_OPENED = 'Instant - Opened',
 | 
					    INSTANT_OPENED = 'Instant - Opened',
 | 
				
			||||||
 | 
					    INSTANT_CLOSED = 'Instant - Closed',
 | 
				
			||||||
    ACCOUNT_LOCKED = 'Account - Locked',
 | 
					    ACCOUNT_LOCKED = 'Account - Locked',
 | 
				
			||||||
    ACCOUNT_READY = 'Account - Ready',
 | 
					    ACCOUNT_READY = 'Account - Ready',
 | 
				
			||||||
    ACCOUNT_UNLOCK_REQUESTED = 'Account - Unlock Requested',
 | 
					    ACCOUNT_UNLOCK_REQUESTED = 'Account - Unlock Requested',
 | 
				
			||||||
@@ -52,6 +54,7 @@ enum EventNames {
 | 
				
			|||||||
    TOKEN_SELECTOR_CLOSED = 'Token Selector - Closed',
 | 
					    TOKEN_SELECTOR_CLOSED = 'Token Selector - Closed',
 | 
				
			||||||
    TOKEN_SELECTOR_CHOSE = 'Token Selector - Chose',
 | 
					    TOKEN_SELECTOR_CHOSE = 'Token Selector - Chose',
 | 
				
			||||||
    TOKEN_SELECTOR_SEARCHED = 'Token Selector - Searched',
 | 
					    TOKEN_SELECTOR_SEARCHED = 'Token Selector - Searched',
 | 
				
			||||||
 | 
					    TRANSACTION_VIEWED = 'Transaction - Viewed',
 | 
				
			||||||
    QUOTE_FETCHED = 'Quote - Fetched',
 | 
					    QUOTE_FETCHED = 'Quote - Fetched',
 | 
				
			||||||
    QUOTE_ERROR = 'Quote - Error',
 | 
					    QUOTE_ERROR = 'Quote - Error',
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@@ -152,6 +155,7 @@ export const analytics = {
 | 
				
			|||||||
        return eventOptions;
 | 
					        return eventOptions;
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    trackInstantOpened: trackingEventFnWithoutPayload(EventNames.INSTANT_OPENED),
 | 
					    trackInstantOpened: trackingEventFnWithoutPayload(EventNames.INSTANT_OPENED),
 | 
				
			||||||
 | 
					    trackInstantClosed: trackingEventFnWithoutPayload(EventNames.INSTANT_CLOSED),
 | 
				
			||||||
    trackAccountLocked: trackingEventFnWithoutPayload(EventNames.ACCOUNT_LOCKED),
 | 
					    trackAccountLocked: trackingEventFnWithoutPayload(EventNames.ACCOUNT_LOCKED),
 | 
				
			||||||
    trackAccountReady: (address: string) => trackingEventFnWithPayload(EventNames.ACCOUNT_READY)({ address }),
 | 
					    trackAccountReady: (address: string) => trackingEventFnWithPayload(EventNames.ACCOUNT_READY)({ address }),
 | 
				
			||||||
    trackAccountUnlockRequested: trackingEventFnWithoutPayload(EventNames.ACCOUNT_UNLOCK_REQUESTED),
 | 
					    trackAccountUnlockRequested: trackingEventFnWithoutPayload(EventNames.ACCOUNT_UNLOCK_REQUESTED),
 | 
				
			||||||
@@ -204,6 +208,8 @@ export const analytics = {
 | 
				
			|||||||
        trackingEventFnWithPayload(EventNames.TOKEN_SELECTOR_CHOSE)(payload),
 | 
					        trackingEventFnWithPayload(EventNames.TOKEN_SELECTOR_CHOSE)(payload),
 | 
				
			||||||
    trackTokenSelectorSearched: (searchText: string) =>
 | 
					    trackTokenSelectorSearched: (searchText: string) =>
 | 
				
			||||||
        trackingEventFnWithPayload(EventNames.TOKEN_SELECTOR_SEARCHED)({ searchText }),
 | 
					        trackingEventFnWithPayload(EventNames.TOKEN_SELECTOR_SEARCHED)({ searchText }),
 | 
				
			||||||
 | 
					    trackTransactionViewed: (orderProcesState: OrderProcessState) =>
 | 
				
			||||||
 | 
					        trackingEventFnWithPayload(EventNames.TRANSACTION_VIEWED)({ orderState: orderProcesState }),
 | 
				
			||||||
    trackQuoteFetched: (buyQuote: BuyQuote, fetchOrigin: QuoteFetchOrigin) =>
 | 
					    trackQuoteFetched: (buyQuote: BuyQuote, fetchOrigin: QuoteFetchOrigin) =>
 | 
				
			||||||
        trackingEventFnWithPayload(EventNames.QUOTE_FETCHED)({
 | 
					        trackingEventFnWithPayload(EventNames.QUOTE_FETCHED)({
 | 
				
			||||||
            ...buyQuoteEventProperties(buyQuote),
 | 
					            ...buyQuoteEventProperties(buyQuote),
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user