Merge development

5 files changed, 76 insertions, 16 deletions

diff --git a/packages/instant/package.json b/packages/instant/package.json
index 0a5e152ca..0888fc6a6 100644
--- a/packages/instant/package.json
+++ b/packages/instant/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/instant",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "engines": {
         "node": ">=6.12"
     },
@@ -41,15 +41,15 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/instant/README.md",
     "dependencies": {
-        "@0x/assert": "^1.0.20",
-        "@0x/asset-buyer": "^3.0.4",
-        "@0x/json-schemas": "^2.1.4",
-        "@0x/order-utils": "^3.0.7",
-        "@0x/subproviders": "^2.1.8",
-        "@0x/types": "^1.4.1",
+        "@0x/assert": "^1.0.21",
+        "@0x/asset-buyer": "^3.0.5",
+        "@0x/json-schemas": "^2.1.5",
+        "@0x/order-utils": "^3.1.0",
+        "@0x/subproviders": "^2.1.9",
+        "@0x/types": "^1.5.0",
         "@0x/typescript-typings": "^3.0.6",
-        "@0x/utils": "^2.0.8",
-        "@0x/web3-wrapper": "^3.2.1",
+        "@0x/utils": "^2.1.1",
+        "@0x/web3-wrapper": "^3.2.2",
         "bowser": "^1.9.4",
         "copy-to-clipboard": "^3.0.8",
         "ethereum-types": "^1.1.4",
@@ -76,7 +76,7 @@
         "@types/react-dom": "^16.0.8",
         "@types/react-redux": "^6.0.9",
         "@types/redux": "^3.6.0",
-        "@types/styled-components": "^4.0.1",
+        "@types/styled-components": "4.0.1",
         "awesome-typescript-loader": "^5.2.1",
         "dotenv-cli": "^1.4.0",
         "enzyme": "^3.6.0",
diff --git a/packages/instant/src/constants.ts b/packages/instant/src/constants.ts
index 22f0cb6a4..67558c84a 100644
--- a/packages/instant/src/constants.ts
+++ b/packages/instant/src/constants.ts
@@ -16,6 +16,7 @@ export const ONE_SECOND_MS = 1000;
 export const ONE_MINUTE_MS = ONE_SECOND_MS * 60;
 export const GIT_SHA = process.env.GIT_SHA;
 export const NODE_ENV = process.env.NODE_ENV;
+export const SLIPPAGE_PERCENTAGE = 0.2;
 export const NPM_PACKAGE_VERSION = process.env.NPM_PACKAGE_VERSION;
 export const DEFAULT_UNKOWN_ASSET_NAME = '???';
 export const ACCOUNT_UPDATE_INTERVAL_TIME_MS = ONE_SECOND_MS * 5;
diff --git a/packages/instant/src/util/asset.ts b/packages/instant/src/util/asset.ts
index faaeb7c22..b009a327f 100644
--- a/packages/instant/src/util/asset.ts
+++ b/packages/instant/src/util/asset.ts
@@ -1,8 +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 { DEFAULT_UNKOWN_ASSET_NAME } from '../constants';
+import { BIG_NUMBER_ZERO, DEFAULT_UNKOWN_ASSET_NAME } from '../constants';
 import { assetDataNetworkMapping } from '../data/asset_data_network_mapping';
 import { Asset, AssetMetaData, ERC20Asset, Network, ZeroExInstantError } from '../types';
 
@@ -111,6 +113,21 @@ 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 &&
+                error.amountAvailableToFill.greaterThan(BIG_NUMBER_ZERO)
+            ) {
+                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);
 
diff --git a/packages/instant/test/util/asset.test.ts b/packages/instant/test/util/asset.test.ts
index fc4e4e2e4..402a556d5 100644
--- a/packages/instant/test/util/asset.test.ts
+++ b/packages/instant/test/util/asset.test.ts
@@ -1,5 +1,6 @@
-import { AssetBuyerError } from '@0x/asset-buyer';
+import { AssetBuyerError, BigNumber, InsufficientAssetLiquidityError } from '@0x/asset-buyer';
 import { AssetProxyId, ObjectMap } from '@0x/types';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 
 import { Asset, AssetMetaData, ERC20Asset, ERC20AssetMetaData, Network, ZeroExInstantError } from '../../src/types';
 import { assetUtils } from '../../src/util/asset';
@@ -19,6 +20,16 @@ const ZRX_ASSET: ERC20Asset = {
 const META_DATA_MAP: ObjectMap<AssetMetaData> = {
     [ZRX_ASSET_DATA]: ZRX_META_DATA,
 };
+const WAX_ASSET: ERC20Asset = {
+    assetData: '0xf47261b000000000000000000000000039bb259f66e1c59d5abef88375979b4d20d98022',
+    metaData: {
+        assetProxyId: AssetProxyId.ERC20,
+        decimals: 8,
+        primaryColor: '#EDB740',
+        symbol: 'wax',
+        name: 'WAX',
+    },
+};
 
 describe('assetDataUtil', () => {
     describe('bestNameForAsset', () => {
@@ -47,13 +58,39 @@ describe('assetDataUtil', () => {
         });
     });
     describe('assetBuyerErrorMessage', () => {
-        it('should return message for InsufficientAssetLiquidity', () => {
+        it('should return message for generic InsufficientAssetLiquidity error', () => {
             const insufficientAssetError = new Error(AssetBuyerError.InsufficientAssetLiquidity);
             expect(assetUtils.assetBuyerErrorMessage(ZRX_ASSET, insufficientAssetError)).toEqual(
                 'Not enough ZRX available',
             );
         });
-        it('should return message for InsufficientAssetLiquidity', () => {
+        describe('InsufficientAssetLiquidityError', () => {
+            it('should return custom message for token w/ 18 decimals', () => {
+                const amountAvailable = Web3Wrapper.toBaseUnitAmount(new BigNumber(20.059), 18);
+                expect(
+                    assetUtils.assetBuyerErrorMessage(ZRX_ASSET, new InsufficientAssetLiquidityError(amountAvailable)),
+                ).toEqual('There are only 20.05 ZRX available to buy');
+            });
+            it('should return custom message for token w/ 18 decimals and small amount available', () => {
+                const amountAvailable = Web3Wrapper.toBaseUnitAmount(new BigNumber(0.01), 18);
+                expect(
+                    assetUtils.assetBuyerErrorMessage(ZRX_ASSET, new InsufficientAssetLiquidityError(amountAvailable)),
+                ).toEqual('There are only 0.01 ZRX available to buy');
+            });
+            it('should return custom message for token w/ 8 decimals', () => {
+                const amountAvailable = Web3Wrapper.toBaseUnitAmount(new BigNumber(3), 8);
+                expect(
+                    assetUtils.assetBuyerErrorMessage(WAX_ASSET, new InsufficientAssetLiquidityError(amountAvailable)),
+                ).toEqual('There are only 3 WAX available to buy');
+            });
+            it('should return generic message when amount available rounds to zero', () => {
+                const amountAvailable = Web3Wrapper.toBaseUnitAmount(new BigNumber(0.002), 18);
+                expect(
+                    assetUtils.assetBuyerErrorMessage(ZRX_ASSET, new InsufficientAssetLiquidityError(amountAvailable)),
+                ).toEqual('Not enough ZRX available');
+            });
+        });
+        it('should return message for InsufficientZrxLiquidity', () => {
             const insufficientZrxError = new Error(AssetBuyerError.InsufficientZrxLiquidity);
             expect(assetUtils.assetBuyerErrorMessage(ZRX_ASSET, insufficientZrxError)).toEqual(
                 'Not enough ZRX available',