updating the importTokens with addTokens for token detection token im…

…port, updating array type for ignortoken and TOKEN_DETECTION_V2 flag in token-details-page

app/scripts/metamask-controller.js

@@ -1930,9 +1930,7 @@ export default class MetamaskController extends EventEmitter {
       addDetectedTokens: tokensController.addDetectedTokens.bind(
         tokensController,
       ),
-      importTokens: process.env.TOKEN_DETECTION_V2
-        ? tokensController.importTokens.bind(tokensController)
-        : null,
+      addImportedTokens: tokensController.addTokens.bind(tokensController),
       ignoreTokens: tokensController.ignoreTokens.bind(tokensController),
       getBalancesInSingleCall: assetsContractController.getBalancesInSingleCall.bind(
         assetsContractController,

ui/components/app/detected-token/detected-token.js

@@ -4,7 +4,7 @@ import { useSelector, useDispatch } from 'react-redux';
 import { chain } from 'lodash';
 
 import {
-  importTokens,
+  addImportedTokens,
   ignoreTokens,
   setNewTokensImported,
 } from '../../../store/actions';
@@ -63,7 +63,7 @@ const DetectedToken = ({ setShowDetectedTokens }) => {
         },
       });
     });
-    await dispatch(importTokens(selectedTokens));
+    await dispatch(addImportedTokens(selectedTokens));
     const tokenSymbols = selectedTokens.map(({ symbol }) => symbol);
     dispatch(setNewTokensImported(tokenSymbols.join(', ')));
   };
@@ -90,7 +90,10 @@ const DetectedToken = ({ setShowDetectedTokens }) => {
         asset_type: ASSET_TYPES.TOKEN,
       },
     });
-    await dispatch(ignoreTokens(deSelectedTokens));
+    const deSelectedTokensAddresses = deSelectedTokens.map(
+      ({ address }) => address,
+    );
+    await dispatch(ignoreTokens(deSelectedTokensAddresses));
     setShowDetectedTokens(false);
   };
 

ui/pages/token-details/token-details-page.js

@@ -2,7 +2,7 @@ import React, { useContext } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { Redirect, useHistory, useParams } from 'react-router-dom';
 import { getTokens } from '../../ducks/metamask/metamask';
-import { getUseTokenDetection, getTokenList } from '../../selectors';
+import { getTokenList } from '../../selectors';
 import { useCopyToClipboard } from '../../hooks/useCopyToClipboard';
 import Identicon from '../../components/ui/identicon';
 import { I18nContext } from '../../contexts/i18n';
@@ -32,18 +32,14 @@ export default function TokenDetailsPage() {
   const t = useContext(I18nContext);
   const tokens = useSelector(getTokens);
   const tokenList = useSelector(getTokenList);
-  const useTokenDetection = useSelector(getUseTokenDetection);
 
   const { address: tokenAddress } = useParams();
   const tokenMetadata = Object.values(tokenList).find((token) =>
     isEqualCaseInsensitive(token.address, tokenAddress),
   );
   const aggregators = tokenMetadata?.aggregators?.join(', ');
   const fileName = tokenMetadata?.iconUrl;
-  let imagePath = fileName;
-  if (!process.env.TOKEN_DETECTION_V2) {
-    imagePath = useTokenDetection ? fileName : `images/contract/${fileName}`;
-  }
+  const imagePath = fileName;
 
   const token = tokens.find(({ address }) =>
     isEqualCaseInsensitive(address, tokenAddress),

ui/store/actions.js

@@ -1644,10 +1644,10 @@ export function addDetectedTokens(newDetectedTokens) {
  *
  * @param tokensToImport
  */
-export function importTokens(tokensToImport) {
+export function addImportedTokens(tokensToImport) {
   return async (dispatch) => {
     try {
-      await promisifiedBackground.importTokens(tokensToImport);
+      await promisifiedBackground.addImportedTokens(tokensToImport);
     } catch (error) {
       log.error(error);
     } finally {
@@ -1657,7 +1657,7 @@ export function importTokens(tokensToImport) {
 }
 
 /**
- * To add ignored tokens to state
+ * To add ignored token addresses to state
  *
  * @param tokensToIgnore
  */