feat: integrate NFT api to display names for nfts within simulations for ERC721s

app/scripts/metamask-controller.js

@@ -3432,6 +3432,8 @@ export default class MetamaskController extends EventEmitter {
           nftController,
         ),
 
+      getNFTContractInfo: nftController.getNFTContractInfo.bind(nftController),
+
       isNftOwner: nftController.isNftOwner.bind(nftController),
 
       // AddressController

ui/components/app/name/__snapshots__/name.test.tsx.snap

@@ -1,5 +1,27 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Name renders address with image 1`] = `
+<div>
+  <div>
+    <div
+      class="name name__saved"
+    >
+      <img
+        alt=""
+        class="identicon"
+        src="test-image"
+        style="height: 16px; width: 16px; border-radius: 8px;"
+      />
+      <p
+        class="mm-box mm-text name__name mm-text--body-md mm-box--color-text-default"
+      >
+        TestName
+      </p>
+    </div>
+  </div>
+</div>
+`;
+
 exports[`Name renders address with no saved name 1`] = `
 <div>
   <div>

ui/components/app/name/name.test.tsx

@@ -82,6 +82,21 @@ describe('Name', () => {
     expect(container).toMatchSnapshot();
   });
 
+  it('renders address with image', () => {
+    useDisplayNameMock.mockReturnValue({
+      name: SAVED_NAME_MOCK,
+      hasPetname: true,
+      image: 'test-image',
+    });
+
+    const { container } = renderWithProvider(
+      <Name type={NameType.ETHEREUM_ADDRESS} value={ADDRESS_SAVED_NAME_MOCK} />,
+      store,
+    );
+
+    expect(container).toMatchSnapshot();
+  });
+
   describe('metrics', () => {
     // @ts-expect-error This is missing from the Mocha type definitions
     it.each([

ui/components/app/name/name.tsx

@@ -27,17 +27,17 @@ export type NameProps = {
   /** Whether this is being rendered inside the NameDetails modal. */
   internal?: boolean;
 
-  /** The type of value, e.g. NameType.ETHEREUM_ADDRESS */
-  type: NameType;
-
-  /** The raw value to display the name of. */
-  value: string;
-
   /**
    * Applies to recognized contracts with no petname saved:
    * If true the contract symbol (e.g. WBTC) will be used instead of the contract name.
    */
   preferContractSymbol?: boolean;
+
+  /** The type of value, e.g. NameType.ETHEREUM_ADDRESS */
+  type: NameType;
+
+  /** The raw value to display the name of. */
+  value: string;
 };
 
 function formatValue(value: string, type: NameType): string {
@@ -65,7 +65,7 @@ const Name = memo(
     const [modalOpen, setModalOpen] = useState(false);
     const trackEvent = useContext(MetaMetricsContext);
 
-    const { name, hasPetname } = useDisplayName(
+    const { name, hasPetname, image } = useDisplayName(
       value,
       type,
       preferContractSymbol,
@@ -112,7 +112,7 @@ const Name = memo(
           onClick={handleClick}
         >
           {hasDisplayName ? (
-            <Identicon address={value} diameter={16} />
+            <Identicon address={value} diameter={16} image={image} />
           ) : (
             <Icon
               name={IconName.Question}

ui/hooks/useDisplayName.test.ts

@@ -1,10 +1,12 @@
 import { NameEntry, NameType } from '@metamask/name-controller';
 import { NftContract } from '@metamask/assets-controllers';
+import { renderHook } from '@testing-library/react-hooks';
 import { getRemoteTokens } from '../selectors';
 import { getNftContractsByAddressOnCurrentChain } from '../selectors/nft';
 import { useDisplayName } from './useDisplayName';
 import { useNames } from './useName';
 import { useFirstPartyContractNames } from './useFirstPartyContractName';
+import { useNftCollectionsMetadata } from './useNftCollectionsMetadata';
 
 jest.mock('react-redux', () => ({
   // TODO: Replace `any` with type
@@ -20,6 +22,10 @@ jest.mock('./useFirstPartyContractName', () => ({
   useFirstPartyContractNames: jest.fn(),
 }));
 
+jest.mock('./useNftCollectionsMetadata', () => ({
+  useNftCollectionsMetadata: jest.fn(),
+}));
+
 jest.mock('../selectors', () => ({
   getRemoteTokens: jest.fn(),
   getCurrentChainId: jest.fn(),
@@ -62,6 +68,7 @@ describe('useDisplayName', () => {
   const getNftContractsByAddressOnCurrentChainMock = jest.mocked(
     getNftContractsByAddressOnCurrentChain,
   );
+  const useNftCollectionsMetadataMock = jest.mocked(useNftCollectionsMetadata);
 
   beforeEach(() => {
     jest.resetAllMocks();
@@ -78,10 +85,12 @@ describe('useDisplayName', () => {
     getNftContractsByAddressOnCurrentChainMock.mockReturnValue(
       NO_WATCHED_NFT_NAME_FOUND_RETURN_VALUE,
     );
+    useNftCollectionsMetadataMock.mockReturnValue({});
   });
 
   it('handles no name found', () => {
-    expect(useDisplayName(VALUE_MOCK, TYPE_MOCK)).toEqual({
+    const { result } = renderHook(() => useDisplayName(VALUE_MOCK, TYPE_MOCK));
+    expect(result.current).toEqual({
       name: null,
       hasPetname: false,
     });
@@ -101,7 +110,9 @@ describe('useDisplayName', () => {
       WATCHED_NFT_FOUND_RETURN_VALUE,
     );
 
-    expect(useDisplayName(VALUE_MOCK, TYPE_MOCK)).toEqual({
+    const { result } = renderHook(() => useDisplayName(VALUE_MOCK, TYPE_MOCK));
+
+    expect(result.current).toEqual({
       name: NAME_MOCK,
       hasPetname: true,
       contractDisplayName: CONTRACT_NAME_MOCK,
@@ -119,7 +130,9 @@ describe('useDisplayName', () => {
       WATCHED_NFT_FOUND_RETURN_VALUE,
     );
 
-    expect(useDisplayName(VALUE_MOCK, TYPE_MOCK)).toEqual({
+    const { result } = renderHook(() => useDisplayName(VALUE_MOCK, TYPE_MOCK));
+
+    expect(result.current).toEqual({
       name: FIRST_PARTY_CONTRACT_NAME_MOCK,
       hasPetname: false,
     });
@@ -135,7 +148,9 @@ describe('useDisplayName', () => {
       WATCHED_NFT_FOUND_RETURN_VALUE,
     );
 
-    expect(useDisplayName(VALUE_MOCK, TYPE_MOCK)).toEqual({
+    const { result } = renderHook(() => useDisplayName(VALUE_MOCK, TYPE_MOCK));
+
+    expect(result.current).toEqual({
       name: CONTRACT_NAME_MOCK,
       hasPetname: false,
       contractDisplayName: CONTRACT_NAME_MOCK,
@@ -147,9 +162,57 @@ describe('useDisplayName', () => {
       WATCHED_NFT_FOUND_RETURN_VALUE,
     );
 
-    expect(useDisplayName(VALUE_MOCK, TYPE_MOCK)).toEqual({
+    const { result } = renderHook(() => useDisplayName(VALUE_MOCK, TYPE_MOCK));
+
+    expect(result.current).toEqual({
       name: WATCHED_NFT_NAME_MOCK,
       hasPetname: false,
     });
   });
+
+  it('returns nft collection name from metadata if no other name is found', () => {
+    const IMAGE_MOCK = 'url';
+
+    useNftCollectionsMetadataMock.mockReturnValue({
+      [VALUE_MOCK.toLowerCase()]: {
+        name: CONTRACT_NAME_MOCK,
+        image: IMAGE_MOCK,
+        isSpam: false,
+      },
+    });
+
+    const { result } = renderHook(() =>
+      useDisplayName(VALUE_MOCK, TYPE_MOCK, false),
+    );
+
+    expect(result.current).toEqual({
+      name: CONTRACT_NAME_MOCK,
+      hasPetname: false,
+      contractDisplayName: undefined,
+      image: IMAGE_MOCK,
+    });
+  });
+
+  it('does not return nft collection name if collection is marked as spam', () => {
+    const IMAGE_MOCK = 'url';
+
+    useNftCollectionsMetadataMock.mockReturnValue({
+      [VALUE_MOCK.toLowerCase()]: {
+        name: CONTRACT_NAME_MOCK,
+        image: IMAGE_MOCK,
+        isSpam: true,
+      },
+    });
+
+    const { result } = renderHook(() =>
+      useDisplayName(VALUE_MOCK, TYPE_MOCK, false),
+    );
+
+    expect(result.current).toEqual(
+      expect.objectContaining({
+        name: null,
+        image: undefined,
+      }),
+    );
+  });
 });

ui/hooks/useDisplayName.ts

@@ -1,32 +1,36 @@
+import { useMemo } from 'react';
 import { NameType } from '@metamask/name-controller';
 import { useSelector } from 'react-redux';
 import { getRemoteTokens } from '../selectors';
 import { getNftContractsByAddressOnCurrentChain } from '../selectors/nft';
 import { useNames } from './useName';
 import { useFirstPartyContractNames } from './useFirstPartyContractName';
+import { useNftCollectionsMetadata } from './useNftCollectionsMetadata';
 
 export type UseDisplayNameRequest = {
   value: string;
-  type: NameType;
   preferContractSymbol?: boolean;
+  type: NameType;
 };
 
 export type UseDisplayNameResponse = {
   name: string | null;
   hasPetname: boolean;
   contractDisplayName?: string;
+  image?: string;
 };
 
 export function useDisplayNames(
   requests: UseDisplayNameRequest[],
 ): UseDisplayNameResponse[] {
-  const nameRequests = requests.map(({ value, type }) => ({
-    value,
-    type,
-  }));
+  const nameRequests = useMemo(
+    () => requests.map(({ value, type }) => ({ value, type })),
+    [requests],
+  );
 
   const nameEntries = useNames(nameRequests);
   const firstPartyContractNames = useFirstPartyContractNames(nameRequests);
+  const nftCollections = useNftCollectionsMetadata(nameRequests);
   const values = requests.map(({ value }) => value);
 
   const contractInfo = useSelector((state) =>
@@ -42,6 +46,16 @@ export function useDisplayNames(
     const firstPartyContractName = firstPartyContractNames[index];
     const singleContractInfo = contractInfo[index];
     const watchedNftName = watchedNftNames[value.toLowerCase()]?.name;
+    const nftCollectionProperties = nftCollections[value.toLowerCase()];
+
+    const isNotSpam = nftCollectionProperties?.isSpam === false;
+
+    const nftCollectionName = isNotSpam
+      ? nftCollectionProperties?.name
+      : undefined;
+    const nftCollectionImage = isNotSpam
+      ? nftCollectionProperties?.image
+      : undefined;
 
     const contractDisplayName =
       preferContractSymbol && singleContractInfo?.symbol
@@ -51,6 +65,7 @@ export function useDisplayNames(
     const name =
       nameEntry?.name ||
       firstPartyContractName ||
+      nftCollectionName ||
       contractDisplayName ||
       watchedNftName ||
       null;
@@ -61,15 +76,16 @@ export function useDisplayNames(
       name,
       hasPetname,
       contractDisplayName,
+      image: nftCollectionImage,
     };
   });
 }
 
 /**
  * Attempts to resolve the name for the given parameters.
  *
- * @param value
- * @param type
+ * @param value - The address or contract address to resolve.
+ * @param type - The type of value, e.g. NameType.ETHEREUM_ADDRESS.
  * @param preferContractSymbol - Applies to recognized contracts when no petname is saved:
  * If true the contract symbol (e.g. WBTC) will be used instead of the contract name.
  * @returns An object with two properties:
@@ -81,5 +97,5 @@ export function useDisplayName(
   type: NameType,
   preferContractSymbol: boolean = false,
 ): UseDisplayNameResponse {
-  return useDisplayNames([{ value, type, preferContractSymbol }])[0];
+  return useDisplayNames([{ preferContractSymbol, type, value }])[0];
 }