Change disabled analytics name, add assertion, and always set

3 files changed, 9 insertions, 8 deletions

diff --git a/packages/instant/src/components/zero_ex_instant_provider.tsx b/packages/instant/src/components/zero_ex_instant_provider.tsx
index 52454148f..9435d8c7c 100644
--- a/packages/instant/src/components/zero_ex_instant_provider.tsx
+++ b/packages/instant/src/components/zero_ex_instant_provider.tsx
@@ -37,7 +37,7 @@ export interface ZeroExInstantProviderOptionalProps {
     additionalAssetMetaDataMap: ObjectMap<AssetMetaData>;
     networkId: Network;
     affiliateInfo: AffiliateInfo;
-    disableAnalyticsTracking: boolean;
+    shouldDisableAnalyticsTracking: boolean;
 }
 
 export class ZeroExInstantProvider extends React.Component<ZeroExInstantProviderProps> {
@@ -125,9 +125,7 @@ export class ZeroExInstantProvider extends React.Component<ZeroExInstantProvider
         this._flashErrorIfWrongNetwork();
 
         // Analytics
-        if (this.props.disableAnalyticsTracking) {
-            disableAnalytics();
-        }
+        disableAnalytics(this.props.shouldDisableAnalyticsTracking || false);
         analytics.addEventProperties({
             embeddedHost: window.location.host,
             embeddedUrl: window.location.href,
diff --git a/packages/instant/src/index.umd.ts b/packages/instant/src/index.umd.ts
index 0274db30c..5010347b3 100644
--- a/packages/instant/src/index.umd.ts
+++ b/packages/instant/src/index.umd.ts
@@ -35,6 +35,9 @@ export const render = (props: ZeroExInstantOverlayProps, selector: string = DEFA
     if (!_.isUndefined(props.provider)) {
         assert.isWeb3Provider('props.provider', props.provider);
     }
+    if (!_.isUndefined(props.shouldDisableAnalyticsTracking)) {
+        assert.isBoolean('props.shouldDisableAnalyticsTracking', props.shouldDisableAnalyticsTracking);
+    }
     assert.isString('selector', selector);
     const appendToIfExists = document.querySelector(selector);
     assert.assert(!_.isNull(appendToIfExists), `Could not find div with selector: ${selector}`);
diff --git a/packages/instant/src/util/analytics.ts b/packages/instant/src/util/analytics.ts
index ce40d08e7..2ffaac1dd 100644
--- a/packages/instant/src/util/analytics.ts
+++ b/packages/instant/src/util/analytics.ts
@@ -2,12 +2,12 @@ import { ObjectMap } from '@0x/types';
 
 import { heapUtil } from './heap';
 
-let disabled = false;
-export const disableAnalytics = () => {
-    disabled = true;
+let isDisabled = false;
+export const disableAnalytics = (shouldDisableAnalytics: boolean) => {
+    isDisabled = shouldDisableAnalytics;
 };
 export const evaluateIfEnabled = (fnCall: () => void) => {
-    if (disabled) {
+    if (isDisabled) {
         return;
     }
     fnCall();