From a3d93d17cdefc2258a9f08e6fc680df1fb2b8456 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Fri, 14 Dec 2018 10:23:01 -0800
Subject: Factor in slippage amount in InsufficientAssetLiquidityError error,
 and show in instant

---
 packages/instant/src/util/asset.ts             | 17 ++++++++++++++++-
 packages/instant/src/util/buy_quote_updater.ts |  7 ++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

(limited to 'packages/instant/src/util')

diff --git a/packages/instant/src/util/asset.ts b/packages/instant/src/util/asset.ts
index 13f84ef74..5e83e7e6d 100644
--- a/packages/instant/src/util/asset.ts
+++ b/packages/instant/src/util/asset.ts
@@ -1,7 +1,10 @@
-import { AssetBuyerError } from '@0x/asset-buyer';
+import { AssetBuyerError, InsufficientAssetLiquidityError } from '@0x/asset-buyer';
 import { AssetProxyId, ObjectMap } from '@0x/types';
+import { BigNumber } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 
+import { BIG_NUMBER_ZERO } from '../constants';
 import { assetDataNetworkMapping } from '../data/asset_data_network_mapping';
 import { Asset, AssetMetaData, ERC20Asset, Network, ZeroExInstantError } from '../types';
 
@@ -110,6 +113,18 @@ export const assetUtils = {
     assetBuyerErrorMessage: (asset: ERC20Asset, error: Error): string | undefined => {
         if (error.message === AssetBuyerError.InsufficientAssetLiquidity) {
             const assetName = assetUtils.bestNameForAsset(asset, 'of this asset');
+            if (error instanceof InsufficientAssetLiquidityError) {
+                const unitAmountAvailableToFill = Web3Wrapper.toUnitAmount(
+                    error.amountAvailableToFill,
+                    asset.metaData.decimals,
+                );
+                const roundedUnitAmountAvailableToFill = unitAmountAvailableToFill.round(2, BigNumber.ROUND_DOWN);
+
+                if (roundedUnitAmountAvailableToFill.greaterThan(BIG_NUMBER_ZERO)) {
+                    return `There are only ${roundedUnitAmountAvailableToFill} ${assetName} available to buy`;
+                }
+            }
+
             return `Not enough ${assetName} available`;
         } else if (error.message === AssetBuyerError.InsufficientZrxLiquidity) {
             return 'Not enough ZRX available';
diff --git a/packages/instant/src/util/buy_quote_updater.ts b/packages/instant/src/util/buy_quote_updater.ts
index 6191c92e3..37974e71c 100644
--- a/packages/instant/src/util/buy_quote_updater.ts
+++ b/packages/instant/src/util/buy_quote_updater.ts
@@ -5,6 +5,7 @@ import * as _ from 'lodash';
 import { Dispatch } from 'redux';
 import { oc } from 'ts-optchain';
 
+import { SLIPPAGE_PERCENTAGE } from '../constants';
 import { Action, actions } from '../redux/actions';
 import { AffiliateInfo, ERC20Asset, QuoteFetchOrigin } from '../types';
 import { analytics } from '../util/analytics';
@@ -33,8 +34,12 @@ export const buyQuoteUpdater = {
         }
         const feePercentage = oc(options.affiliateInfo).feePercentage();
         let newBuyQuote: BuyQuote | undefined;
+        const slippagePercentage = SLIPPAGE_PERCENTAGE;
         try {
-            newBuyQuote = await assetBuyer.getBuyQuoteAsync(asset.assetData, baseUnitValue, { feePercentage });
+            newBuyQuote = await assetBuyer.getBuyQuoteAsync(asset.assetData, baseUnitValue, {
+                feePercentage,
+                slippagePercentage,
+            });
         } catch (error) {
             const errorMessage = assetUtils.assetBuyerErrorMessage(asset, error);
 
-- 
cgit v1.2.3


From 69054d85e80f9e41200015a9b0eef2a9fe00f439 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Fri, 14 Dec 2018 15:18:20 -0800
Subject: Only send in amountAvailableToFill if it's a non-zero amount, add
 additional tests and nest, and put error into its own file

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

(limited to 'packages/instant/src/util')

diff --git a/packages/instant/src/util/asset.ts b/packages/instant/src/util/asset.ts
index 5e83e7e6d..756194f1f 100644
--- a/packages/instant/src/util/asset.ts
+++ b/packages/instant/src/util/asset.ts
@@ -113,7 +113,11 @@ export const assetUtils = {
     assetBuyerErrorMessage: (asset: ERC20Asset, error: Error): string | undefined => {
         if (error.message === AssetBuyerError.InsufficientAssetLiquidity) {
             const assetName = assetUtils.bestNameForAsset(asset, 'of this asset');
-            if (error instanceof InsufficientAssetLiquidityError) {
+            if (
+                error instanceof InsufficientAssetLiquidityError &&
+                error.amountAvailableToFill &&
+                error.amountAvailableToFill.greaterThan(BIG_NUMBER_ZERO)
+            ) {
                 const unitAmountAvailableToFill = Web3Wrapper.toUnitAmount(
                     error.amountAvailableToFill,
                     asset.metaData.decimals,
-- 
cgit v1.2.3


From c8c8219c055cc5798cf5cdc71199ee7ae505cd5a Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Fri, 21 Dec 2018 16:26:07 -0800
Subject: Make amountAvailableToFill required

---
 packages/instant/src/util/asset.ts | 1 -
 1 file changed, 1 deletion(-)

(limited to 'packages/instant/src/util')

diff --git a/packages/instant/src/util/asset.ts b/packages/instant/src/util/asset.ts
index e7aa55c88..b009a327f 100644
--- a/packages/instant/src/util/asset.ts
+++ b/packages/instant/src/util/asset.ts
@@ -115,7 +115,6 @@ export const assetUtils = {
             const assetName = assetUtils.bestNameForAsset(asset, 'of this asset');
             if (
                 error instanceof InsufficientAssetLiquidityError &&
-                error.amountAvailableToFill &&
                 error.amountAvailableToFill.greaterThan(BIG_NUMBER_ZERO)
             ) {
                 const unitAmountAvailableToFill = Web3Wrapper.toUnitAmount(
-- 
cgit v1.2.3