From ab7689d188c92c6f53a57abe2c28e4b9da953a6c Mon Sep 17 00:00:00 2001
From: Jacob Evans <jacob@dekz.net>
Date: Tue, 19 Nov 2019 16:38:12 +1000
Subject: [PATCH] Re-enable affiliate fee

---
 packages/instant/src/components/buy_button.tsx           | 9 ++++++++-
 packages/instant/src/components/erc20_token_selector.tsx | 5 +++--
 .../instant/src/components/zero_ex_instant_provider.tsx  | 3 ++-
 packages/instant/src/index.umd.ts                        | 7 +++----
 packages/instant/src/redux/reducer.ts                    | 1 +
 packages/instant/src/types.ts                            | 6 ++++++
 6 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/packages/instant/src/components/buy_button.tsx b/packages/instant/src/components/buy_button.tsx
index 2764a547cf..cfd7a76cb8 100644
--- a/packages/instant/src/components/buy_button.tsx
+++ b/packages/instant/src/components/buy_button.tsx
@@ -97,7 +97,7 @@ export class BuyButton extends React.PureComponent<BuyButtonProps> {
         let txHash: string | undefined;
         const gasInfo = await gasPriceEstimator.getGasInfoAsync();
         const feeRecipient = oc(affiliateInfo).feeRecipient();
-        const feePercentage = oc(affiliateInfo).feeRecipient();
+        const feePercentage = oc(affiliateInfo).feePercentage();
         try {
             analytics.trackBuyStarted(swapQuote);
             txHash = await swapQuoteConsumer.executeSwapQuoteOrThrowAsync(swapQuote, {
@@ -125,6 +125,13 @@ export class BuyButton extends React.PureComponent<BuyButtonProps> {
                     return;
                 }
             }
+            // HACK(dekz): Wrappers no longer include decorators which map errors
+            // like transaction deny
+            if (e.message && e.message.includes('User denied transaction signature')) {
+                analytics.trackBuySignatureDenied(swapQuote);
+                this.props.onSignatureDenied(swapQuote);
+                return;
+            }
             throw e;
         }
         const startTimeUnix = new Date().getTime();
diff --git a/packages/instant/src/components/erc20_token_selector.tsx b/packages/instant/src/components/erc20_token_selector.tsx
index e50d68aee4..9cfea07320 100644
--- a/packages/instant/src/components/erc20_token_selector.tsx
+++ b/packages/instant/src/components/erc20_token_selector.tsx
@@ -163,8 +163,9 @@ class TokenSelectorRowIcon extends React.PureComponent<TokenSelectorRowIconProps
         const displaySymbol = assetUtils.bestNameForAsset(token);
         if (iconUrlIfExists !== undefined) {
             return <img src={iconUrlIfExists} />;
-        } else if (TokenIcon !== undefined) {
-            return <TokenIcon />;
+            // HACK(dekz): Disale Token icon as it is throwing an error in React renderer
+            // } else if (TokenIcon !== undefined) {
+            //     return <TokenIcon />;
         } else {
             return (
                 <Text fontColor={ColorOption.white} fontSize="8px">
diff --git a/packages/instant/src/components/zero_ex_instant_provider.tsx b/packages/instant/src/components/zero_ex_instant_provider.tsx
index 59cf8476bd..4eda54b288 100644
--- a/packages/instant/src/components/zero_ex_instant_provider.tsx
+++ b/packages/instant/src/components/zero_ex_instant_provider.tsx
@@ -85,6 +85,7 @@ export class ZeroExInstantProvider extends React.PureComponent<ZeroExInstantProv
                       ),
             assetMetaDataMap: completeAssetMetaDataMap,
             onSuccess: props.onSuccess,
+            affiliateInfo: props.affiliateInfo,
         };
         return storeStateFromProps;
     }
@@ -139,7 +140,7 @@ export class ZeroExInstantProvider extends React.PureComponent<ZeroExInstantProv
                 state.providerState,
                 window,
                 state.selectedAsset,
-                undefined,
+                this.props.affiliateInfo,
                 state.baseCurrency,
             ),
         );
diff --git a/packages/instant/src/index.umd.ts b/packages/instant/src/index.umd.ts
index 344a8de9b5..d430f5c056 100644
--- a/packages/instant/src/index.umd.ts
+++ b/packages/instant/src/index.umd.ts
@@ -48,10 +48,9 @@ const validateInstantRenderConfig = (config: ZeroExInstantConfig, selector: stri
     if (config.zIndex !== undefined) {
         assert.isNumber('zIndex', config.zIndex);
     }
-    // TODO(dave4506) reenable affiliate fees once we figure out how to work with it
-    // if (config.affiliateInfo !== undefined) {
-    //     assert.isValidAffiliateInfo('affiliateInfo', config.affiliateInfo);
-    // }
+    if (config.affiliateInfo !== undefined) {
+        assert.isValidAffiliateInfo('affiliateInfo', config.affiliateInfo);
+    }
     if (config.provider !== undefined) {
         providerUtils.standardizeOrThrow(config.provider);
     }
diff --git a/packages/instant/src/redux/reducer.ts b/packages/instant/src/redux/reducer.ts
index 6583615c89..ebb7d9fbbf 100644
--- a/packages/instant/src/redux/reducer.ts
+++ b/packages/instant/src/redux/reducer.ts
@@ -291,6 +291,7 @@ const doesSwapQuoteMatchState = (swapQuote: MarketBuySwapQuote, state: State): b
             selectedAssetMetaData.decimals,
         );
         const doesAssetAmountMatch = selectedAssetAmountBaseUnits.eq(swapQuote.makerAssetFillAmount);
+
         return doesAssetAmountMatch;
     } else {
         return true;
diff --git a/packages/instant/src/types.ts b/packages/instant/src/types.ts
index d41cdd117e..0115f3efc1 100644
--- a/packages/instant/src/types.ts
+++ b/packages/instant/src/types.ts
@@ -192,6 +192,11 @@ export interface ZeroExInstantRequiredBaseConfig {
     orderSource: OrderSource;
 }
 
+export interface AffiliateInfo {
+    feeRecipient: string;
+    feePercentage: number;
+}
+
 export interface ZeroExInstantOptionalBaseConfig {
     provider: SupportedProvider;
     walletDisplayName: string;
@@ -200,6 +205,7 @@ export interface ZeroExInstantOptionalBaseConfig {
     defaultSelectedAssetData: string;
     additionalAssetMetaDataMap: ObjectMap<AssetMetaData>;
     networkId: Network;
+    affiliateInfo: AffiliateInfo;
     shouldDisableAnalyticsTracking: boolean;
     onSuccess?: (txHash: string) => void;
 }