4 files changed, 61 insertions, 36 deletions

diff --git a/packages/instant/src/util/asset.ts b/packages/instant/src/util/asset.ts
new file mode 100644
index 000000000..4e3b2b946
--- /dev/null
+++ b/packages/instant/src/util/asset.ts
@@ -0,0 +1,53 @@
+import { AssetProxyId, ObjectMap } from '@0x/types';
+import * as _ from 'lodash';
+
+import { assetDataNetworkMapping } from '../data/asset_data_network_mapping';
+import { Asset, AssetMetaData, Network, ZeroExInstantError } from '../types';
+
+export const assetUtils = {
+    createAssetFromAssetData: (
+        assetData: string,
+        assetMetaDataMap: ObjectMap<AssetMetaData>,
+        network: Network,
+    ): Asset => {
+        return {
+            assetData,
+            metaData: assetUtils.getMetaDataOrThrow(assetData, assetMetaDataMap, network),
+        };
+    },
+    getMetaDataOrThrow: (assetData: string, metaDataMap: ObjectMap<AssetMetaData>, network: Network): AssetMetaData => {
+        let mainnetAssetData: string | undefined = assetData;
+        if (network !== Network.Mainnet) {
+            mainnetAssetData = assetUtils.getAssociatedAssetDataIfExists(assetData, network);
+        }
+        if (_.isUndefined(mainnetAssetData)) {
+            throw new Error(ZeroExInstantError.AssetMetaDataNotAvailable);
+        }
+        const metaData = metaDataMap[mainnetAssetData];
+        if (_.isUndefined(metaData)) {
+            throw new Error(ZeroExInstantError.AssetMetaDataNotAvailable);
+        }
+        return metaData;
+    },
+    bestNameForAsset: (asset?: Asset, defaultName: string = '???'): string => {
+        if (_.isUndefined(asset)) {
+            return defaultName;
+        }
+        const metaData = asset.metaData;
+        switch (metaData.assetProxyId) {
+            case AssetProxyId.ERC20:
+                return metaData.symbol.toUpperCase();
+            case AssetProxyId.ERC721:
+                return metaData.name;
+            default:
+                return defaultName;
+        }
+    },
+    getAssociatedAssetDataIfExists: (assetData: string, network: Network): string | undefined => {
+        const assetDataGroupIfExists = _.find(assetDataNetworkMapping, value => value[network] === assetData);
+        if (_.isUndefined(assetDataGroupIfExists)) {
+            return;
+        }
+        return assetDataGroupIfExists[Network.Mainnet];
+    },
+};
diff --git a/packages/instant/src/util/asset_buyer.ts b/packages/instant/src/util/asset_buyer.ts
deleted file mode 100644
index 6855fbcab..000000000
--- a/packages/instant/src/util/asset_buyer.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { AssetBuyer } from '@0x/asset-buyer';
-
-import { sraApiUrl } from '../constants';
-
-import { getProvider } from './provider';
-
-const provider = getProvider();
-
-export const assetBuyer = AssetBuyer.getAssetBuyerForStandardRelayerAPIUrl(provider, sraApiUrl);
diff --git a/packages/instant/src/util/asset_data.ts b/packages/instant/src/util/asset_data.ts
deleted file mode 100644
index fea2e2b19..000000000
--- a/packages/instant/src/util/asset_data.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import * as _ from 'lodash';
-
-import { AssetProxyId } from '@0x/types';
-
-import { assetMetaData } from '../data/asset_meta_data';
-
-export const assetDataUtil = {
-    bestNameForAsset: (assetData: string | undefined, defaultString: string) => {
-        if (_.isUndefined(assetData)) {
-            return defaultString;
-        }
-        const metaData = assetMetaData[assetData];
-        if (_.isUndefined(metaData)) {
-            return defaultString;
-        }
-        if (metaData.assetProxyId === AssetProxyId.ERC20) {
-            return metaData.symbol.toUpperCase();
-        }
-        return defaultString;
-    },
-};
diff --git a/packages/instant/src/util/error.ts b/packages/instant/src/util/error.ts
index c9b13ef83..40fd24c7e 100644
--- a/packages/instant/src/util/error.ts
+++ b/packages/instant/src/util/error.ts
@@ -2,7 +2,9 @@ import { AssetBuyerError } from '@0x/asset-buyer';
 import { Dispatch } from 'redux';
 
 import { Action, actions } from '../redux/actions';
-import { assetDataUtil } from '../util/asset_data';
+import { Asset } from '../types';
+
+import { assetUtils } from './asset';
 
 class ErrorFlasher {
     private _timeoutId?: number;
@@ -27,12 +29,12 @@ class ErrorFlasher {
     }
 }
 
-const humanReadableMessageForError = (error: Error, assetData?: string): string | undefined => {
+const humanReadableMessageForError = (error: Error, asset?: Asset): string | undefined => {
     const hasInsufficientLiquidity =
         error.message === AssetBuyerError.InsufficientAssetLiquidity ||
         error.message === AssetBuyerError.InsufficientZrxLiquidity;
     if (hasInsufficientLiquidity) {
-        const assetName = assetDataUtil.bestNameForAsset(assetData, 'of this asset');
+        const assetName = assetUtils.bestNameForAsset(asset, 'of this asset');
         return `Not enough ${assetName} available`;
     }
 
@@ -40,7 +42,7 @@ const humanReadableMessageForError = (error: Error, assetData?: string): string
         error.message === AssetBuyerError.StandardRelayerApiError ||
         error.message.startsWith(AssetBuyerError.AssetUnavailable)
     ) {
-        const assetName = assetDataUtil.bestNameForAsset(assetData, 'This asset');
+        const assetName = assetUtils.bestNameForAsset(asset, 'This asset');
         return `${assetName} is currently unavailable`;
     }
 
@@ -49,10 +51,10 @@ const humanReadableMessageForError = (error: Error, assetData?: string): string
 
 export const errorUtil = {
     errorFlasher: new ErrorFlasher(),
-    errorDescription: (error?: any, assetData?: string): { icon: string; message: string } => {
+    errorDescription: (error?: any, asset?: Asset): { icon: string; message: string } => {
         let bestMessage: string | undefined;
         if (error instanceof Error) {
-            bestMessage = humanReadableMessageForError(error, assetData);
+            bestMessage = humanReadableMessageForError(error, asset);
         }
         return {
             icon: '😢',