cleanup

MetaMask · Jun 13, 2022 · e274d42 · e274d42
1 parent 70792c4
commit e274d42
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 24 deletions.
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -247,25 +247,27 @@ export default class MetamaskController extends EventEmitter {
       state: initState.TokensController,
     });
 
-    this.assetsContractController = new AssetsContractController({
-      onPreferencesStateChange: (listener) =>
-        this.preferencesController.store.subscribe(listener),
-      onNetworkStateChange: (cb) =>
-        this.networkController.store.subscribe((networkState) => {
-          const modifiedNetworkState = {
-            ...networkState,
-            provider: {
-              ...networkState.provider,
-              chainId: hexToDecimal(networkState.provider.chainId),
-            },
-          };
-          return cb(modifiedNetworkState);
-        }),
-      config: {
+    this.assetsContractController = new AssetsContractController(
+      {
+        onPreferencesStateChange: (listener) =>
+          this.preferencesController.store.subscribe(listener),
+        onNetworkStateChange: (cb) =>
+          this.networkController.store.subscribe((networkState) => {
+            const modifiedNetworkState = {
+              ...networkState,
+              provider: {
+                ...networkState.provider,
+                chainId: hexToDecimal(networkState.provider.chainId),
+              },
+            };
+            return cb(modifiedNetworkState);
+          }),
+      },
+      {
         provider: this.provider,
       },
-      state: initState.AssetsContractController,
-    });
+      initState.AssetsContractController,
+    );
 
     this.collectiblesController = new CollectiblesController(
       {

diff --git a/ui/pages/import-token/token-list/token-list.component.js b/ui/pages/import-token/token-list/token-list.component.js
@@ -39,13 +39,6 @@ export default class TokenList extends Component {
             .map((_, i) => {
               const { iconUrl, symbol, name, address } = results[i] || {};
               let iconPath = iconUrl;
-              if (!process.env.TOKEN_DETECTION_V2) {
-                /** TODO: Remove during TOKEN_DETECTION_V2 feature flag clean up */
-                // token from dynamic api list is fetched when useTokenDetection is true
-                iconPath = useTokenDetection
-                  ? iconUrl
-                  : `images/contract/${iconUrl}`;
-              }
               const tokenAlreadyAdded = checkExistingAddresses(address, tokens);
               const onClick = () =>
                 !tokenAlreadyAdded && onToggleToken(results[i]);