aboutsummaryrefslogtreecommitdiffstats
path: root/packages/instant/src/util
diff options
context:
space:
mode:
authorSteve Klebanoff <steve.klebanoff@gmail.com>2018-10-20 06:40:44 +0800
committerSteve Klebanoff <steve.klebanoff@gmail.com>2018-10-20 06:40:44 +0800
commit30b077099306b8f2b522d0bc462da49fa9ee42e2 (patch)
tree05df98f7788993c2953d00acf64840de2ad6e9d4 /packages/instant/src/util
parentd2766d7ced990efd5a91441b459f36e8a21f8513 (diff)
parenta017f5e38561a152e8a757b340c1b0c6b3a3e21f (diff)
downloaddexon-sol-tools-30b077099306b8f2b522d0bc462da49fa9ee42e2.tar
dexon-sol-tools-30b077099306b8f2b522d0bc462da49fa9ee42e2.tar.gz
dexon-sol-tools-30b077099306b8f2b522d0bc462da49fa9ee42e2.tar.bz2
dexon-sol-tools-30b077099306b8f2b522d0bc462da49fa9ee42e2.tar.lz
dexon-sol-tools-30b077099306b8f2b522d0bc462da49fa9ee42e2.tar.xz
dexon-sol-tools-30b077099306b8f2b522d0bc462da49fa9ee42e2.tar.zst
dexon-sol-tools-30b077099306b8f2b522d0bc462da49fa9ee42e2.zip
Merge branch 'feature/instant/beta-render-et-al' into feature/instant/failure-state
Diffstat (limited to 'packages/instant/src/util')
-rw-r--r--packages/instant/src/util/asset.ts17
1 files changed, 8 insertions, 9 deletions
diff --git a/packages/instant/src/util/asset.ts b/packages/instant/src/util/asset.ts
index a105a7c2b..4e3b2b946 100644
--- a/packages/instant/src/util/asset.ts
+++ b/packages/instant/src/util/asset.ts
@@ -1,4 +1,3 @@
-import { assetDataUtils } from '@0x/order-utils';
import { AssetProxyId, ObjectMap } from '@0x/types';
import * as _ from 'lodash';
@@ -6,17 +5,17 @@ import { assetDataNetworkMapping } from '../data/asset_data_network_mapping';
import { Asset, AssetMetaData, Network, ZeroExInstantError } from '../types';
export const assetUtils = {
- createAssetFromAssetData: (assetData: string, assetMetaDataMap: ObjectMap<AssetMetaData>): Asset => {
+ createAssetFromAssetData: (
+ assetData: string,
+ assetMetaDataMap: ObjectMap<AssetMetaData>,
+ network: Network,
+ ): Asset => {
return {
assetData,
- metaData: assetUtils.getMetaDataOrThrow(assetData, assetMetaDataMap),
+ metaData: assetUtils.getMetaDataOrThrow(assetData, assetMetaDataMap, network),
};
},
- getMetaDataOrThrow: (
- assetData: string,
- metaDataMap: ObjectMap<AssetMetaData>,
- network: Network = Network.Mainnet,
- ): AssetMetaData => {
+ getMetaDataOrThrow: (assetData: string, metaDataMap: ObjectMap<AssetMetaData>, network: Network): AssetMetaData => {
let mainnetAssetData: string | undefined = assetData;
if (network !== Network.Mainnet) {
mainnetAssetData = assetUtils.getAssociatedAssetDataIfExists(assetData, network);
@@ -39,7 +38,7 @@ export const assetUtils = {
case AssetProxyId.ERC20:
return metaData.symbol.toUpperCase();
case AssetProxyId.ERC721:
- return metaData.name.toUpperCase();
+ return metaData.name;
default:
return defaultName;
}