fix: cp-12.18.0 Infinite loader on approve request

ui/pages/confirmations/components/confirm/info/approve/hooks/use-is-nft.test.ts

@@ -6,24 +6,29 @@ import {
 } from '../../../../../../../../test/data/confirmations/contract-interaction';
 import mockState from '../../../../../../../../test/data/mock-state.json';
 import { renderHookWithProvider } from '../../../../../../../../test/lib/render-helpers';
-import { getTokenStandardAndDetails } from '../../../../../../../store/actions';
+import { getTokenStandardAndDetailsByChain } from '../../../../../../../store/actions';
 import { useIsNFT } from './use-is-nft';
 
 jest.mock('../../../../../../../store/actions', () => ({
   ...jest.requireActual('../../../../../../../store/actions'),
-  getTokenStandardAndDetails: jest.fn(),
+  getTokenStandardAndDetailsByChain: jest.fn(),
 }));
 
 describe('useIsNFT', () => {
-  it('identifies NFT in token with 0 decimals', async () => {
-    const getTokenStandardAndDetailsMock = jest
-      .fn()
-      .mockImplementation(() => ({ standard: TokenStandard.ERC721 }));
+  const mockGetTokenStandardAndDetailsByChain = jest.mocked(
+    getTokenStandardAndDetailsByChain,
+  );
 
-    (getTokenStandardAndDetails as jest.Mock).mockImplementation(
-      getTokenStandardAndDetailsMock,
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockGetTokenStandardAndDetailsByChain.mockImplementation(() =>
+      Promise.resolve({
+        standard: TokenStandard.ERC721,
+      }),
     );
+  });
 
+  it('identifies NFT in token with 0 decimals', async () => {
     const transactionMeta = genUnapprovedContractInteractionConfirmation({
       address: CONTRACT_INTERACTION_SENDER_ADDRESS,
     }) as TransactionMeta;
@@ -36,15 +41,19 @@ describe('useIsNFT', () => {
     await waitForNextUpdate();
 
     expect(result.current.isNFT).toMatchInlineSnapshot(`true`);
+    expect(mockGetTokenStandardAndDetailsByChain).toHaveBeenCalledWith(
+      transactionMeta.txParams.to,
+      transactionMeta.txParams.from,
+      undefined,
+      transactionMeta.chainId,
+    );
   });
 
   it('identifies fungible in token with greater than 0 decimals', async () => {
-    const getTokenStandardAndDetailsMock = jest
-      .fn()
-      .mockImplementation(() => ({ standard: TokenStandard.ERC20 }));
-
-    (getTokenStandardAndDetails as jest.Mock).mockImplementation(
-      getTokenStandardAndDetailsMock,
+    mockGetTokenStandardAndDetailsByChain.mockImplementation(() =>
+      Promise.resolve({
+        standard: TokenStandard.ERC20,
+      }),
     );
 
     const transactionMeta = genUnapprovedContractInteractionConfirmation({

ui/pages/confirmations/components/confirm/info/approve/hooks/use-is-nft.ts

@@ -1,14 +1,17 @@
 import { TransactionMeta } from '@metamask/transaction-controller';
 import { TokenStandard } from '../../../../../../../../shared/constants/transaction';
 import { useAsyncResult } from '../../../../../../../hooks/useAsync';
-import { getTokenStandardAndDetails } from '../../../../../../../store/actions';
+import { getTokenStandardAndDetailsByChain } from '../../../../../../../store/actions';
 
 export const useIsNFT = (
   transactionMeta: TransactionMeta,
 ): { isNFT: boolean; pending: boolean } => {
   const { value, pending } = useAsyncResult(async () => {
-    return await getTokenStandardAndDetails(
+    return await getTokenStandardAndDetailsByChain(
       transactionMeta?.txParams?.to as string,
+      transactionMeta?.txParams?.from as string,
+      undefined,
+      transactionMeta?.chainId as string,
     );
   }, [transactionMeta?.txParams?.to]);