From 7bc2df56023641c27de62bc7e9a8953767cbc076 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 18 Oct 2018 17:42:32 -0700
Subject: feat: add network to state and use it where relevant

---
 packages/instant/src/util/asset.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'packages/instant/src/util/asset.ts')

diff --git a/packages/instant/src/util/asset.ts b/packages/instant/src/util/asset.ts
index a105a7c2b..d50efb5d1 100644
--- a/packages/instant/src/util/asset.ts
+++ b/packages/instant/src/util/asset.ts
@@ -6,17 +6,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);
-- 
cgit 


From f3a6800306a6fd40f19d15318b9fdac4dcdf76c8 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 18 Oct 2018 18:08:49 -0700
Subject: fix: dont force NFTs to uppercase their name

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

(limited to 'packages/instant/src/util/asset.ts')

diff --git a/packages/instant/src/util/asset.ts b/packages/instant/src/util/asset.ts
index d50efb5d1..698107538 100644
--- a/packages/instant/src/util/asset.ts
+++ b/packages/instant/src/util/asset.ts
@@ -39,7 +39,7 @@ export const assetUtils = {
             case AssetProxyId.ERC20:
                 return metaData.symbol.toUpperCase();
             case AssetProxyId.ERC721:
-                return metaData.name.toUpperCase();
+                return metaData.name;
             default:
                 return defaultName;
         }
-- 
cgit 


From 48f1e6057c878a948d21ed7d2214c7792c648f75 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Fri, 19 Oct 2018 09:23:58 -0700
Subject: chore: run linter

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

(limited to 'packages/instant/src/util/asset.ts')

diff --git a/packages/instant/src/util/asset.ts b/packages/instant/src/util/asset.ts
index 698107538..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';
 
-- 
cgit