From 83f4fa92a5619afc129dd1098877f4c889dc27c4 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Tue, 20 Nov 2018 10:19:59 -0800
Subject: fix(instant): Autofocus text amount input

---
 packages/instant/src/components/erc20_asset_amount_input.tsx | 1 +
 packages/instant/src/components/scaling_amount_input.tsx     | 3 +++
 packages/instant/src/components/scaling_input.tsx            | 5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'packages/instant')

diff --git a/packages/instant/src/components/erc20_asset_amount_input.tsx b/packages/instant/src/components/erc20_asset_amount_input.tsx
index 520ac33d5..8b4494022 100644
--- a/packages/instant/src/components/erc20_asset_amount_input.tsx
+++ b/packages/instant/src/components/erc20_asset_amount_input.tsx
@@ -62,6 +62,7 @@ export class ERC20AssetAmountInput extends React.Component<ERC20AssetAmountInput
                         maxFontSizePx={this.props.startingFontSizePx}
                         onAmountChange={this._handleChange}
                         onFontSizeChange={this._handleFontSizeChange}
+                        autofocus={true}
                     />
                 </Container>
                 <Container
diff --git a/packages/instant/src/components/scaling_amount_input.tsx b/packages/instant/src/components/scaling_amount_input.tsx
index 5dc719293..3395cded1 100644
--- a/packages/instant/src/components/scaling_amount_input.tsx
+++ b/packages/instant/src/components/scaling_amount_input.tsx
@@ -18,6 +18,7 @@ export interface ScalingAmountInputProps {
     value?: BigNumber;
     onAmountChange: (value?: BigNumber) => void;
     onFontSizeChange: (fontSizePx: number) => void;
+    autofocus: boolean;
 }
 interface ScalingAmountInputState {
     stringValue: string;
@@ -29,6 +30,7 @@ export class ScalingAmountInput extends React.Component<ScalingAmountInputProps,
         onAmountChange: util.boundNoop,
         onFontSizeChange: util.boundNoop,
         isDisabled: false,
+        autofocus: false,
     };
     public constructor(props: ScalingAmountInputProps) {
         super(props);
@@ -64,6 +66,7 @@ export class ScalingAmountInput extends React.Component<ScalingAmountInputProps,
                 placeholder="0.00"
                 emptyInputWidthCh={3.5}
                 isDisabled={this.props.isDisabled}
+                autofocus={this.props.autofocus}
             />
         );
     }
diff --git a/packages/instant/src/components/scaling_input.tsx b/packages/instant/src/components/scaling_input.tsx
index e1599a316..c379b76cd 100644
--- a/packages/instant/src/components/scaling_input.tsx
+++ b/packages/instant/src/components/scaling_input.tsx
@@ -28,6 +28,7 @@ export interface ScalingInputProps {
     maxLength?: number;
     scalingSettings: ScalingSettings;
     isDisabled: boolean;
+    autofocus: boolean;
 }
 
 export interface ScalingInputState {
@@ -51,6 +52,7 @@ export class ScalingInput extends React.Component<ScalingInputProps, ScalingInpu
         maxLength: 7,
         scalingSettings: defaultScalingSettings,
         isDisabled: false,
+        autofocus: false,
     };
     public state: ScalingInputState = {
         inputWidthPxAtPhaseChange: undefined,
@@ -123,7 +125,7 @@ export class ScalingInput extends React.Component<ScalingInputProps, ScalingInpu
         }
     }
     public render(): React.ReactNode {
-        const { isDisabled, fontColor, onChange, placeholder, value, maxLength } = this.props;
+        const { autofocus, isDisabled, fontColor, onChange, placeholder, value, maxLength } = this.props;
         const phase = ScalingInput.getPhaseFromProps(this.props);
         return (
             <Input
@@ -136,6 +138,7 @@ export class ScalingInput extends React.Component<ScalingInputProps, ScalingInpu
                 width={this._calculateWidth(phase)}
                 maxLength={maxLength}
                 disabled={isDisabled}
+                autoFocus={autofocus}
             />
         );
     }
-- 
cgit v1.2.3


From cd4600b081b9ee467471174fe6736efab6247759 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Tue, 20 Nov 2018 10:20:16 -0800
Subject: fix(instant): Right align amounts

---
 packages/instant/src/components/instant_heading.tsx | 4 ++--
 packages/instant/src/components/ui/text.tsx         | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'packages/instant')

diff --git a/packages/instant/src/components/instant_heading.tsx b/packages/instant/src/components/instant_heading.tsx
index 002695269..ace577824 100644
--- a/packages/instant/src/components/instant_heading.tsx
+++ b/packages/instant/src/components/instant_heading.tsx
@@ -107,7 +107,7 @@ export class InstantHeading extends React.Component<InstantHeadingProps, {}> {
 
     private readonly _renderEthAmount = (): React.ReactNode => {
         return (
-            <Text fontSize="16px" fontColor={ColorOption.white} fontWeight={500}>
+            <Text fontSize="16px" textAlign="right" width="100%" fontColor={ColorOption.white} fontWeight={500}>
                 {format.ethBaseUnitAmount(
                     this.props.totalEthBaseUnitAmount,
                     4,
@@ -119,7 +119,7 @@ export class InstantHeading extends React.Component<InstantHeadingProps, {}> {
 
     private readonly _renderDollarAmount = (): React.ReactNode => {
         return (
-            <Text fontSize="16px" fontColor={ColorOption.white}>
+            <Text fontSize="16px" textAlign="right" width="100%" fontColor={ColorOption.white}>
                 {format.ethBaseUnitAmountInUsd(
                     this.props.totalEthBaseUnitAmount,
                     this.props.ethUsdPrice,
diff --git a/packages/instant/src/components/ui/text.tsx b/packages/instant/src/components/ui/text.tsx
index fd14cc4d1..8e573d7b9 100644
--- a/packages/instant/src/components/ui/text.tsx
+++ b/packages/instant/src/components/ui/text.tsx
@@ -11,6 +11,7 @@ export interface TextProps {
     fontSize?: string;
     opacity?: number;
     letterSpacing?: string;
+    textAlign?: string;
     textTransform?: string;
     lineHeight?: string;
     className?: string;
@@ -22,6 +23,7 @@ export interface TextProps {
     noWrap?: boolean;
     display?: string;
     href?: string;
+    width?: string;
 }
 
 export const Text: React.StatelessComponent<TextProps> = ({ href, onClick, ...rest }) => {
@@ -51,6 +53,8 @@ export const StyledText =
         ${props => (props.display ? `display: ${props.display}` : '')};
         ${props => (props.letterSpacing ? `letter-spacing: ${props.letterSpacing}` : '')};
         ${props => (props.textTransform ? `text-transform: ${props.textTransform}` : '')};
+        ${props => (props.textAlign ? `text-align: ${props.textAlign}` : '')};
+        ${props => (props.width ? `width: ${props.width}` : '')};
         &:hover {
             ${props =>
                 props.onClick ? `color: ${darken(darkenOnHoverAmount, props.theme[props.fontColor || 'white'])}` : ''};
-- 
cgit v1.2.3


From 2bda6dd719d748a4bfa5ff8e23e97924e0258af1 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Tue, 20 Nov 2018 10:36:23 -0800
Subject: autofocus -> hasAutoFocus

---
 packages/instant/src/components/erc20_asset_amount_input.tsx | 2 +-
 packages/instant/src/components/scaling_amount_input.tsx     | 6 +++---
 packages/instant/src/components/scaling_input.tsx            | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'packages/instant')

diff --git a/packages/instant/src/components/erc20_asset_amount_input.tsx b/packages/instant/src/components/erc20_asset_amount_input.tsx
index 8b4494022..ab8c019c7 100644
--- a/packages/instant/src/components/erc20_asset_amount_input.tsx
+++ b/packages/instant/src/components/erc20_asset_amount_input.tsx
@@ -62,7 +62,7 @@ export class ERC20AssetAmountInput extends React.Component<ERC20AssetAmountInput
                         maxFontSizePx={this.props.startingFontSizePx}
                         onAmountChange={this._handleChange}
                         onFontSizeChange={this._handleFontSizeChange}
-                        autofocus={true}
+                        hasAutofocus={true}
                     />
                 </Container>
                 <Container
diff --git a/packages/instant/src/components/scaling_amount_input.tsx b/packages/instant/src/components/scaling_amount_input.tsx
index 3395cded1..0861bbe05 100644
--- a/packages/instant/src/components/scaling_amount_input.tsx
+++ b/packages/instant/src/components/scaling_amount_input.tsx
@@ -18,7 +18,7 @@ export interface ScalingAmountInputProps {
     value?: BigNumber;
     onAmountChange: (value?: BigNumber) => void;
     onFontSizeChange: (fontSizePx: number) => void;
-    autofocus: boolean;
+    hasAutofocus: boolean;
 }
 interface ScalingAmountInputState {
     stringValue: string;
@@ -30,7 +30,7 @@ export class ScalingAmountInput extends React.Component<ScalingAmountInputProps,
         onAmountChange: util.boundNoop,
         onFontSizeChange: util.boundNoop,
         isDisabled: false,
-        autofocus: false,
+        hasAutofocus: false,
     };
     public constructor(props: ScalingAmountInputProps) {
         super(props);
@@ -66,7 +66,7 @@ export class ScalingAmountInput extends React.Component<ScalingAmountInputProps,
                 placeholder="0.00"
                 emptyInputWidthCh={3.5}
                 isDisabled={this.props.isDisabled}
-                autofocus={this.props.autofocus}
+                hasAutofocus={this.props.hasAutofocus}
             />
         );
     }
diff --git a/packages/instant/src/components/scaling_input.tsx b/packages/instant/src/components/scaling_input.tsx
index c379b76cd..129162a74 100644
--- a/packages/instant/src/components/scaling_input.tsx
+++ b/packages/instant/src/components/scaling_input.tsx
@@ -28,7 +28,7 @@ export interface ScalingInputProps {
     maxLength?: number;
     scalingSettings: ScalingSettings;
     isDisabled: boolean;
-    autofocus: boolean;
+    hasAutofocus: boolean;
 }
 
 export interface ScalingInputState {
@@ -52,7 +52,7 @@ export class ScalingInput extends React.Component<ScalingInputProps, ScalingInpu
         maxLength: 7,
         scalingSettings: defaultScalingSettings,
         isDisabled: false,
-        autofocus: false,
+        hasAutofocus: false,
     };
     public state: ScalingInputState = {
         inputWidthPxAtPhaseChange: undefined,
@@ -125,7 +125,7 @@ export class ScalingInput extends React.Component<ScalingInputProps, ScalingInpu
         }
     }
     public render(): React.ReactNode {
-        const { autofocus, isDisabled, fontColor, onChange, placeholder, value, maxLength } = this.props;
+        const { hasAutofocus, isDisabled, fontColor, onChange, placeholder, value, maxLength } = this.props;
         const phase = ScalingInput.getPhaseFromProps(this.props);
         return (
             <Input
@@ -138,7 +138,7 @@ export class ScalingInput extends React.Component<ScalingInputProps, ScalingInpu
                 width={this._calculateWidth(phase)}
                 maxLength={maxLength}
                 disabled={isDisabled}
-                autoFocus={autofocus}
+                autoFocus={hasAutofocus}
             />
         );
     }
-- 
cgit v1.2.3


From 6124d80c89e7c8e4b1d00a934f2389d2b4461c44 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Tue, 20 Nov 2018 14:59:23 -0800
Subject: Move out generating of event properties, and send in orderSource

---
 .../src/components/zero_ex_instant_provider.tsx    |  9 +--------
 packages/instant/src/util/analytics.ts             | 23 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 8 deletions(-)

(limited to 'packages/instant')

diff --git a/packages/instant/src/components/zero_ex_instant_provider.tsx b/packages/instant/src/components/zero_ex_instant_provider.tsx
index 9435d8c7c..37ed3dc94 100644
--- a/packages/instant/src/components/zero_ex_instant_provider.tsx
+++ b/packages/instant/src/components/zero_ex_instant_provider.tsx
@@ -126,14 +126,7 @@ export class ZeroExInstantProvider extends React.Component<ZeroExInstantProvider
 
         // Analytics
         disableAnalytics(this.props.shouldDisableAnalyticsTracking || false);
-        analytics.addEventProperties({
-            embeddedHost: window.location.host,
-            embeddedUrl: window.location.href,
-            networkId: state.network,
-            providerName: state.providerState.name,
-            gitSha: process.env.GIT_SHA,
-            npmVersion: process.env.NPM_PACKAGE_VERSION,
-        });
+        analytics.addEventProperties(analytics.generateEventProperties(state, window));
         analytics.trackInstantOpened();
     }
     public componentWillUnmount(): void {
diff --git a/packages/instant/src/util/analytics.ts b/packages/instant/src/util/analytics.ts
index 2ffaac1dd..d790ec1e7 100644
--- a/packages/instant/src/util/analytics.ts
+++ b/packages/instant/src/util/analytics.ts
@@ -1,5 +1,8 @@
+import { BasicOrderProvider, StandardRelayerAPIOrderProvider } from '@0x/asset-buyer';
 import { ObjectMap } from '@0x/types';
 
+import { State } from '../redux/reducer';
+
 import { heapUtil } from './heap';
 
 let isDisabled = false;
@@ -47,6 +50,7 @@ export interface AnalyticsEventOptions {
     providerName?: string;
     gitSha?: string;
     npmVersion?: string;
+    orderSource?: string;
 }
 export const analytics = {
     addUserProperties: (properties: AnalyticsUserOptions): void => {
@@ -59,6 +63,25 @@ export const analytics = {
             heapUtil.evaluateHeapCall(heap => heap.addEventProperties(properties));
         });
     },
+    generateEventProperties: (state: State, window: Window): AnalyticsEventOptions => {
+        let orderSource = 'unknown';
+        const orderProvider = state.providerState.assetBuyer.orderProvider;
+        if (orderProvider instanceof StandardRelayerAPIOrderProvider) {
+            orderSource = orderProvider.apiUrl;
+        } else if (orderProvider instanceof BasicOrderProvider) {
+            orderSource = 'provided';
+        }
+
+        return {
+            embeddedHost: window.location.host,
+            embeddedUrl: window.location.href,
+            networkId: state.network,
+            providerName: state.providerState.name,
+            gitSha: process.env.GIT_SHA,
+            npmVersion: process.env.NPM_PACKAGE_VERSION,
+            orderSource,
+        };
+    },
     trackWalletReady: trackingEventFnWithoutPayload(EventNames.WALLET_READY),
     trackInstantOpened: trackingEventFnWithoutPayload(EventNames.INSTANT_OPENED),
 };
-- 
cgit v1.2.3


From 1593b94aacd69a9c48c04a13d696c4c0bede4d58 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Tue, 20 Nov 2018 15:07:37 -0800
Subject: feat(instant): Add more event properties to heap

---
 packages/instant/src/util/analytics.ts | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'packages/instant')

diff --git a/packages/instant/src/util/analytics.ts b/packages/instant/src/util/analytics.ts
index d790ec1e7..a18532bfa 100644
--- a/packages/instant/src/util/analytics.ts
+++ b/packages/instant/src/util/analytics.ts
@@ -51,6 +51,8 @@ export interface AnalyticsEventOptions {
     gitSha?: string;
     npmVersion?: string;
     orderSource?: string;
+    affiliateAddress?: string;
+    affiliateFeePercent?: number;
 }
 export const analytics = {
     addUserProperties: (properties: AnalyticsUserOptions): void => {
@@ -72,6 +74,8 @@ export const analytics = {
             orderSource = 'provided';
         }
 
+        const affiliateAddress = state.affiliateInfo ? state.affiliateInfo.feeRecipient : 'none';
+        const affiliateFeePercent = state.affiliateInfo ? parseFloat(state.affiliateInfo.feePercentage.toFixed(4)) : 0;
         return {
             embeddedHost: window.location.host,
             embeddedUrl: window.location.href,
@@ -80,6 +84,8 @@ export const analytics = {
             gitSha: process.env.GIT_SHA,
             npmVersion: process.env.NPM_PACKAGE_VERSION,
             orderSource,
+            affiliateAddress,
+            affiliateFeePercent,
         };
     },
     trackWalletReady: trackingEventFnWithoutPayload(EventNames.WALLET_READY),
-- 
cgit v1.2.3


From d750225554a0c4c317863cf11a7db5b1570e5b41 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Wed, 21 Nov 2018 08:20:09 -0800
Subject: Send in explicit props

---
 .../src/components/zero_ex_instant_provider.tsx    | 10 +++++++-
 packages/instant/src/util/analytics.ts             | 30 ++++++++++------------
 2 files changed, 23 insertions(+), 17 deletions(-)

(limited to 'packages/instant')

diff --git a/packages/instant/src/components/zero_ex_instant_provider.tsx b/packages/instant/src/components/zero_ex_instant_provider.tsx
index 37ed3dc94..dc6a45a23 100644
--- a/packages/instant/src/components/zero_ex_instant_provider.tsx
+++ b/packages/instant/src/components/zero_ex_instant_provider.tsx
@@ -126,7 +126,15 @@ export class ZeroExInstantProvider extends React.Component<ZeroExInstantProvider
 
         // Analytics
         disableAnalytics(this.props.shouldDisableAnalyticsTracking || false);
-        analytics.addEventProperties(analytics.generateEventProperties(state, window));
+        analytics.addEventProperties(
+            analytics.generateEventProperties(
+                state.network,
+                this.props.orderSource,
+                state.providerState,
+                window,
+                this.props.affiliateInfo,
+            ),
+        );
         analytics.trackInstantOpened();
     }
     public componentWillUnmount(): void {
diff --git a/packages/instant/src/util/analytics.ts b/packages/instant/src/util/analytics.ts
index a18532bfa..352ab3b6c 100644
--- a/packages/instant/src/util/analytics.ts
+++ b/packages/instant/src/util/analytics.ts
@@ -1,7 +1,6 @@
-import { BasicOrderProvider, StandardRelayerAPIOrderProvider } from '@0x/asset-buyer';
 import { ObjectMap } from '@0x/types';
 
-import { State } from '../redux/reducer';
+import { AffiliateInfo, Network, OrderSource, ProviderState } from '../types';
 
 import { heapUtil } from './heap';
 
@@ -65,25 +64,24 @@ export const analytics = {
             heapUtil.evaluateHeapCall(heap => heap.addEventProperties(properties));
         });
     },
-    generateEventProperties: (state: State, window: Window): AnalyticsEventOptions => {
-        let orderSource = 'unknown';
-        const orderProvider = state.providerState.assetBuyer.orderProvider;
-        if (orderProvider instanceof StandardRelayerAPIOrderProvider) {
-            orderSource = orderProvider.apiUrl;
-        } else if (orderProvider instanceof BasicOrderProvider) {
-            orderSource = 'provided';
-        }
-
-        const affiliateAddress = state.affiliateInfo ? state.affiliateInfo.feeRecipient : 'none';
-        const affiliateFeePercent = state.affiliateInfo ? parseFloat(state.affiliateInfo.feePercentage.toFixed(4)) : 0;
+    generateEventProperties: (
+        network: Network,
+        orderSource: OrderSource,
+        providerState: ProviderState,
+        window: Window,
+        affiliateInfo?: AffiliateInfo,
+    ): AnalyticsEventOptions => {
+        const affiliateAddress = affiliateInfo ? affiliateInfo.feeRecipient : 'none';
+        const affiliateFeePercent = affiliateInfo ? parseFloat(affiliateInfo.feePercentage.toFixed(4)) : 0;
+        const orderSourceName = typeof orderSource === 'string' ? orderSource : 'provided';
         return {
             embeddedHost: window.location.host,
             embeddedUrl: window.location.href,
-            networkId: state.network,
-            providerName: state.providerState.name,
+            networkId: network,
+            providerName: providerState.name,
             gitSha: process.env.GIT_SHA,
             npmVersion: process.env.NPM_PACKAGE_VERSION,
-            orderSource,
+            orderSource: orderSourceName,
             affiliateAddress,
             affiliateFeePercent,
         };
-- 
cgit v1.2.3


From 10c9d0b723ba190a7f1c4df112ae0c5b37887bb9 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Wed, 21 Nov 2018 14:24:13 -0800
Subject: Force scaling input component to rerender when a different asset is
 chosen

---
 packages/instant/src/components/erc20_asset_amount_input.tsx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/instant')

diff --git a/packages/instant/src/components/erc20_asset_amount_input.tsx b/packages/instant/src/components/erc20_asset_amount_input.tsx
index 0706833d2..b734af61a 100644
--- a/packages/instant/src/components/erc20_asset_amount_input.tsx
+++ b/packages/instant/src/components/erc20_asset_amount_input.tsx
@@ -65,6 +65,7 @@ export class ERC20AssetAmountInput extends React.Component<ERC20AssetAmountInput
                         onAmountChange={this._handleChange}
                         onFontSizeChange={this._handleFontSizeChange}
                         hasAutofocus={true}
+                        key={asset.assetData}
                     />
                 </Container>
                 <Container
-- 
cgit v1.2.3


From b0792a85a4d002bfe54ba228bfeadf29c89bfe09 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Wed, 21 Nov 2018 14:33:12 -0800
Subject: Add comment

---
 packages/instant/src/components/erc20_asset_amount_input.tsx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/instant')

diff --git a/packages/instant/src/components/erc20_asset_amount_input.tsx b/packages/instant/src/components/erc20_asset_amount_input.tsx
index b734af61a..ff900842a 100644
--- a/packages/instant/src/components/erc20_asset_amount_input.tsx
+++ b/packages/instant/src/components/erc20_asset_amount_input.tsx
@@ -65,6 +65,7 @@ export class ERC20AssetAmountInput extends React.Component<ERC20AssetAmountInput
                         onAmountChange={this._handleChange}
                         onFontSizeChange={this._handleFontSizeChange}
                         hasAutofocus={true}
+                        /* We send in a key of asset data to force a rerender of this component when the user selects a new asset.  We do this so the autofocus attribute will bring focus onto this input */
                         key={asset.assetData}
                     />
                 </Container>
-- 
cgit v1.2.3