diff --git a/packages/bridge-ui-v2/src/components/NFTs/NFTInfoDialog.svelte b/packages/bridge-ui-v2/src/components/NFTs/NFTInfoDialog.svelte
index 3354a674230..674f7c5dbad 100644
--- a/packages/bridge-ui-v2/src/components/NFTs/NFTInfoDialog.svelte
+++ b/packages/bridge-ui-v2/src/components/NFTs/NFTInfoDialog.svelte
@@ -20,6 +20,8 @@
 
   export let nft: NFT;
 
+  export let srcChainId = $network?.id;
+
   const dispatch = createEventDispatcher();
 
   const selectNFT = () => {
@@ -31,7 +33,7 @@
     modalOpen = false;
   };
 
-  $: currentChain = $network?.id;
+  $: currentChain = Number(srcChainId) || $network?.id;
 
   $: imgUrl = nft.metadata?.image || placeholderUrl;
 </script>
diff --git a/packages/bridge-ui-v2/src/components/Transactions/Transaction.svelte b/packages/bridge-ui-v2/src/components/Transactions/Transaction.svelte
index 3bbcd90bbeb..5c7d3c1530c 100644
--- a/packages/bridge-ui-v2/src/components/Transactions/Transaction.svelte
+++ b/packages/bridge-ui-v2/src/components/Transactions/Transaction.svelte
@@ -95,8 +95,8 @@
       tokenId: Number(tokenIds[0]),
       type: item.tokenType,
     })) as NFT;
-
     token = await fetchNFTImageUrl(token, Number(item.srcChainId), Number(item.destChainId));
+
     loading = false;
   }
 
@@ -109,9 +109,11 @@
   $: imgUrl = token?.metadata?.image || placeholderUrl;
 
   $: itemAmountDisplay = item.tokenType === TokenType.ERC721 ? '---' : item.amount;
+
+  $: isNFT = [TokenType.ERC1155, TokenType.ERC721].includes(item.tokenType);
 </script>
 
-{#if [TokenType.ETH, TokenType.ERC20].includes(item.tokenType)}
+{#if isNFT}
   <!-- We disable these warnings as we dynamically add the role -->
   <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
   <!-- svelte-ignore a11y-no-static-element-interactions -->
@@ -120,48 +122,50 @@
     tabindex="0"
     on:click={handleClick}
     on:keydown={handlePress}
-    class="flex text-primary-content md:h-[80px] h-[45px] w-full">
+    class="flex text-primary-content items-center md:h-[80px] h-[45px] w-full relative">
     {#if isDesktopOrLarger}
-      <div class="w-1/5 py-2 flex flex-row">
+      <button class="w-2/6 py-2 flex flex-row space-x-[8px]" on:click={() => (nftInfoOpen = true)}>
+        {#if loading}
+          <div class="rounded-[10px] w-[50px] h-[50px] bg-neutral flex items-center justify-center">
+            <Spinner />
+          </div>
+          <div class="f-col text-left space-y-1">
+            <LoadingText mask="&nbsp;" class="min-w-[50px] max-w-[50px] h-4" />
+            <LoadingText mask="&nbsp;" class="min-w-[90px] max-w-[90px] h-4" />
+            <LoadingText mask="&nbsp;" class="min-w-[20px] max-w-[20px] h-4" />
+          </div>
+        {:else}
+          <img alt="nft" src={imgUrl} class="rounded-[10px] min-w-[50px] max-w-[50px] bg-neutral self-center" />
+          <div class="f-col text-left">
+            <div class="text-sm">{token?.name ? truncateString(token?.name, 15) : ''}</div>
+            <div class="text-sm text-secondary-content">
+              {token?.metadata?.name ? truncateString(token?.metadata?.name, 15) : ''}
+            </div>
+            <div class="text-sm text-secondary-content">{token?.tokenId}</div>
+          </div>
+        {/if}
+      </button>
+
+      <div class="w-1/6 py-2 flex flex-row">
         <ChainSymbolName chainId={item.srcChainId} />
       </div>
-      <div class="w-1/5 py-2 flex flex-row">
+      <div class="w-1/6 py-2 flex flex-row">
         <ChainSymbolName chainId={item.destChainId} />
       </div>
-      <div class="w-1/5 py-2 flex flex-col justify-center">
-        {#if item.tokenType === TokenType.ERC20}
-          {formatUnits(item.amount ? item.amount : BigInt(0), item.decimals)}
-        {:else if item.tokenType === TokenType.ETH}
-          {formatEther(item.amount ? item.amount : BigInt(0))}
-        {/if}
-        {item.symbol}
+      <div class="w-1/6 py-2 flex flex-col justify-center">
+        {itemAmountDisplay}
       </div>
     {:else}
-      <div class="flex text-primary-content h-[80px] w-full">
-        <div class="flex-col">
-          <div class="flex">
-            <ChainSymbolName chainId={item.srcChainId} />
-            <i role="img" aria-label="arrow to" class="mx-auto px-2">
-              <Icon type="arrow-right" />
-            </i>
-            <ChainSymbolName chainId={item.destChainId} />
-          </div>
-          <div class="py-2 flex flex-col justify-center">
-            {formatEther(item.amount ? item.amount : BigInt(0))}
-            {item.symbol}
-          </div>
-        </div>
-      </div>
+      TODO: mobile view
     {/if}
-
-    <div class="sm:w-1/4 md:w-1/5 py-2 flex flex-col justify-center">
+    <div class="sm:w-1/4 md:w-1/6 py-2 flex flex-col justify-center">
       <Status
         on:click={isDesktopOrLarger ? undefined : openDetails}
         bridgeTx={item}
         on:insufficientFunds={handleInsufficientFunds} />
       <!-- <div class="btn btn-primary" on:click={isDesktopOrLarger ? undefined : openDetails}></div> -->
     </div>
-    <div class="hidden md:flex w-1/5 py-2 flex flex-col justify-center">
+    <div class="hidden md:flex w-1/6 py-2 flex flex-col justify-center">
       <a
         class="flex justify-start py-3 link"
         href={`${chainConfig[Number(item.srcChainId)].urls.explorer}/tx/${item.hash}`}
@@ -171,7 +175,7 @@
       </a>
     </div>
   </div>
-{:else if [TokenType.ERC1155, TokenType.ERC721].includes(item.tokenType)}
+{:else if !isNFT}
   <!-- We disable these warnings as we dynamically add the role -->
   <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
   <!-- svelte-ignore a11y-no-static-element-interactions -->
@@ -180,50 +184,48 @@
     tabindex="0"
     on:click={handleClick}
     on:keydown={handlePress}
-    class="flex text-primary-content items-center md:h-[80px] h-[45px] w-full relative">
+    class="flex text-primary-content md:h-[80px] h-[45px] w-full">
     {#if isDesktopOrLarger}
-      <button class="w-2/6 py-2 flex flex-row space-x-[8px]" on:click={() => (nftInfoOpen = true)}>
-        {#if loading}
-          <div class="rounded-[10px] w-[50px] h-[50px] bg-neutral flex items-center justify-center">
-            <Spinner />
-          </div>
-          <div class="f-col text-left space-y-1">
-            <LoadingText mask="&nbsp;" class="min-w-[50px] max-w-[50px] h-4" />
-            <LoadingText mask="&nbsp;" class="min-w-[90px] max-w-[90px] h-4" />
-            <LoadingText mask="&nbsp;" class="min-w-[20px] max-w-[20px] h-4" />
-          </div>
-        {:else}
-          <img alt="nft" src={imgUrl} class="rounded-[10px] min-w-[50px] max-w-[50px] bg-neutral self-center" />
-          <div class="f-col text-left">
-            <div class="text-sm">{token?.name ? truncateString(token?.name, 15) : ''}</div>
-            <div class="text-sm text-secondary-content">
-              {token?.metadata?.name ? truncateString(token?.metadata?.name, 15) : ''}
-            </div>
-            <div class="text-sm text-secondary-content">{token?.tokenId}</div>
-          </div>
-        {/if}
-      </button>
-
-      <div class="w-1/6 py-2 flex flex-row">
+      <div class="w-1/5 py-2 flex flex-row">
         <ChainSymbolName chainId={item.srcChainId} />
       </div>
-      <div class="w-1/6 py-2 flex flex-row">
+      <div class="w-1/5 py-2 flex flex-row">
         <ChainSymbolName chainId={item.destChainId} />
       </div>
-      <div class="w-1/6 py-2 flex flex-col justify-center">
-        {itemAmountDisplay}
+      <div class="w-1/5 py-2 flex flex-col justify-center">
+        {#if item.tokenType === TokenType.ERC20}
+          {formatUnits(item.amount ? item.amount : BigInt(0), item.decimals)}
+        {:else if item.tokenType === TokenType.ETH}
+          {formatEther(item.amount ? item.amount : BigInt(0))}
+        {/if}
+        {item.symbol}
       </div>
     {:else}
-      TODO: mobile view
+      <div class="flex text-primary-content h-[80px] w-full">
+        <div class="flex-col">
+          <div class="flex">
+            <ChainSymbolName chainId={item.srcChainId} />
+            <i role="img" aria-label="arrow to" class="mx-auto px-2">
+              <Icon type="arrow-right" />
+            </i>
+            <ChainSymbolName chainId={item.destChainId} />
+          </div>
+          <div class="py-2 flex flex-col justify-center">
+            {formatEther(item.amount ? item.amount : BigInt(0))}
+            {item.symbol}
+          </div>
+        </div>
+      </div>
     {/if}
-    <div class="sm:w-1/4 md:w-1/6 py-2 flex flex-col justify-center">
+
+    <div class="sm:w-1/4 md:w-1/5 py-2 flex flex-col justify-center">
       <Status
         on:click={isDesktopOrLarger ? undefined : openDetails}
         bridgeTx={item}
         on:insufficientFunds={handleInsufficientFunds} />
       <!-- <div class="btn btn-primary" on:click={isDesktopOrLarger ? undefined : openDetails}></div> -->
     </div>
-    <div class="hidden md:flex w-1/6 py-2 flex flex-col justify-center">
+    <div class="hidden md:flex w-1/5 py-2 flex flex-col justify-center">
       <a
         class="flex justify-start py-3 link"
         href={`${chainConfig[Number(item.srcChainId)].urls.explorer}/tx/${item.hash}`}
@@ -240,7 +242,7 @@
 <MobileDetailsDialog {closeDetails} {detailsOpen} selectedItem={item} on:insufficientFunds={handleInsufficientFunds} />
 
 {#if token}
-  <NftInfoDialog bind:modalOpen={nftInfoOpen} nft={token} viewOnly />
+  <NftInfoDialog bind:modalOpen={nftInfoOpen} nft={token} srcChainId={Number(item.srcChainId)} viewOnly />
 {/if}
 
 <InsufficientFunds bind:modalOpen={insufficientModal} />
diff --git a/packages/bridge-ui-v2/src/libs/token/fetchNFTImageUrl.ts b/packages/bridge-ui-v2/src/libs/token/fetchNFTImageUrl.ts
index 44afbbaf9db..8e37044e123 100644
--- a/packages/bridge-ui-v2/src/libs/token/fetchNFTImageUrl.ts
+++ b/packages/bridge-ui-v2/src/libs/token/fetchNFTImageUrl.ts
@@ -13,7 +13,7 @@ import { safeParseUrl } from '$libs/util/safeParseUrl';
 
 import { getCrossChainAddress } from './getCrossChainAddress';
 import { getTokenWithInfoFromAddress } from './getTokenWithInfoFromAddress';
-import { type NFT, type NFTMetadata, TokenType } from './types';
+import { type NFT, TokenType } from './types';
 
 const log = getLogger('libs:token:fetchNFTImageUrl');
 
@@ -57,42 +57,35 @@ const testImageLoad = (url: string): Promise<boolean> => {
 
 export const fetchNFTImageUrl = async (token: NFT, srcChainId: number, destChainId: number): Promise<NFT> => {
   try {
-    let metadata = token.metadata;
+    let tokenWithMetadata: NFT | null = token;
 
-    if (!metadata) {
-      const crossChainData = await crossChainFetchNFTMetadata(token, srcChainId, destChainId);
-      if (!crossChainData) throw new Error('No cross chain data found');
-      metadata = crossChainData;
+    if (!tokenWithMetadata.metadata) {
+      tokenWithMetadata = await crossChainFetchNFTMetadata(token, srcChainId, destChainId);
+      if (!tokenWithMetadata) throw new Error('No cross chain data found');
     }
 
-    if (!metadata?.image) throw new Error('No image found');
+    if (!tokenWithMetadata.metadata?.image) throw new Error('No image found');
 
-    const url = safeParseUrl(metadata.image);
-    if (!url) throw new Error(`Invalid image URL: ${metadata.image}`);
+    const url = safeParseUrl(tokenWithMetadata.metadata.image);
+    if (!url) throw new Error(`Invalid image URL: ${tokenWithMetadata.metadata.image}`);
 
     const imageUrl = await fetchImageUrl(url, token.tokenId);
-    token.metadata = {
-      ...metadata,
+    tokenWithMetadata.metadata = {
+      ...tokenWithMetadata.metadata,
       image: imageUrl,
     };
 
-    return token;
+    return tokenWithMetadata;
   } catch (error) {
     log(`Error fetching image for ${token.name} id: ${token.tokenId}`, error);
     return token;
   }
 };
 
-const crossChainFetchNFTMetadata = async (
-  token: NFT,
-  srcChainId: number,
-  destChainId: number,
-): Promise<NFTMetadata | null> => {
-  let metadata = null;
+const crossChainFetchNFTMetadata = async (token: NFT, srcChainId: number, destChainId: number): Promise<NFT | null> => {
   let canonicalAddress = null;
   try {
-    metadata = await fetchNFTMetadata(token);
-    return metadata;
+    return await fetchNFTMetadata(token);
   } catch (error) {
     log(`Error fetching metadata for ${token.name} id: ${token.tokenId}`, error);
 
@@ -128,6 +121,7 @@ const crossChainFetchNFTMetadata = async (
       tokenId: token.tokenId,
       type: token.type,
     })) as NFT;
+    cToken.addresses = { ...token.addresses, [destChainId]: canonicalAddress };
 
     return await fetchNFTMetadata(cToken);
   }
diff --git a/packages/bridge-ui-v2/src/libs/token/getCrossChainAddress.test.ts b/packages/bridge-ui-v2/src/libs/token/getCrossChainAddress.test.ts
index 0fa73137a19..380c7de9e98 100644
--- a/packages/bridge-ui-v2/src/libs/token/getCrossChainAddress.test.ts
+++ b/packages/bridge-ui-v2/src/libs/token/getCrossChainAddress.test.ts
@@ -92,10 +92,6 @@ describe('getCrossChainAddress', () => {
     // Then
     expect(result).toEqual(preconfiguredAddress);
     expect(mockTokenVaultContract.read.bridgedToCanonical).toHaveBeenCalledWith([mockToken.addresses[srcChainId]]);
-    expect(mockTokenVaultContract.read.canonicalToBridged).toHaveBeenCalledWith([
-      BigInt(destChainId),
-      preconfiguredAddress,
-    ]);
   });
 
   it('should return the bridged address if stored or configured', async () => {
diff --git a/packages/bridge-ui-v2/src/libs/token/getCrossChainAddress.ts b/packages/bridge-ui-v2/src/libs/token/getCrossChainAddress.ts
index 02a0dff9cfd..afe65657977 100644
--- a/packages/bridge-ui-v2/src/libs/token/getCrossChainAddress.ts
+++ b/packages/bridge-ui-v2/src/libs/token/getCrossChainAddress.ts
@@ -91,7 +91,7 @@ export async function getCrossChainAddress({
 
     // first we need to figure out the canonical address of the token
     const canonicalTokenInfo = (await srcTokenVaultContract.read.bridgedToCanonical([srcChainTokenAddress])) as Address;
-    const canonicalTokenAddress = canonicalTokenInfo[1]; // this will break if the contracts ever change the order of the return values
+    const canonicalTokenAddress = canonicalTokenInfo[1] as Address; // this will break if the contracts ever change the order of the return values
 
     // if the canonical address is 0x0, then the token is canonical
     if (canonicalTokenAddress === zeroAddress) {
@@ -102,13 +102,19 @@ export async function getCrossChainAddress({
         srcChainTokenAddress,
       ])) as Address;
     } else {
-      return canonicalTokenAddress as Address;
+      // return canonicalTokenAddress as Address;
       // if we have found a canonical, we can check for the bridged address on the source token vault
       // e.g. bridging L2 -> L1 with native L1 token
-      return (await srcTokenVaultContract.read.canonicalToBridged([
+      const bridgedCanonical = (await srcTokenVaultContract.read.canonicalToBridged([
         BigInt(destChainId),
         canonicalTokenAddress,
       ])) as Address;
+
+      if (bridgedCanonical === srcChainTokenAddress) {
+        return canonicalTokenAddress;
+      } else {
+        return bridgedCanonical;
+      }
     }
   }
 }
diff --git a/packages/bridge-ui-v2/src/libs/token/getTokenWithInfoFromAddress.test.ts b/packages/bridge-ui-v2/src/libs/token/getTokenWithInfoFromAddress.test.ts
index 41fa6ddc160..45eebf8b26e 100644
--- a/packages/bridge-ui-v2/src/libs/token/getTokenWithInfoFromAddress.test.ts
+++ b/packages/bridge-ui-v2/src/libs/token/getTokenWithInfoFromAddress.test.ts
@@ -7,21 +7,37 @@ import { fetchNFTMetadata } from '$libs/util/fetchNFTMetadata';
 
 import { detectContractType } from './detectContractType';
 import { getTokenWithInfoFromAddress } from './getTokenWithInfoFromAddress';
-import { TokenType } from './types';
+import { type NFT, TokenType } from './types';
 
 vi.mock('@wagmi/core');
 vi.mock('../util/fetchNFTMetadata');
 
 vi.mock('../../generated/customTokenConfig', () => {
-  const mockToken = {
-    name: 'Mock Token',
+  const mockERC20 = {
+    name: 'MockERC20',
     addresses: { '1': zeroAddress },
     symbol: 'MTF',
     decimals: 18,
     type: 'ERC20',
   };
+  const mockERC1155 = {
+    name: 'MockERC1155',
+    addresses: { '1': zeroAddress },
+    symbol: 'MNFT',
+    balance: 1337n,
+    tokenId: 123,
+    uri: 'some/uri/123',
+    type: 'ERC1155',
+  };
+  const mockERC721 = {
+    name: 'MockERC721',
+    addresses: { '1': zeroAddress },
+    symbol: 'MNFT',
+    decimals: 18,
+    type: 'ERC721',
+  };
   return {
-    customToken: [mockToken],
+    customToken: [mockERC20, mockERC1155, mockERC721],
   };
 });
 
@@ -106,16 +122,20 @@ describe('getTokenWithInfoFromAddress', () => {
       name: 'Mock Meta Name',
     };
 
+    const mockToken = customToken[1] as NFT;
+    mockToken.metadata = mockedMetadata;
+
     it('should return correct token details for ERC1155 tokens', async () => {
       // Given
 
       const address: Address = zeroAddress;
       vi.mocked(detectContractType).mockResolvedValue(TokenType.ERC1155);
       vi.mocked(readContract)
-        .mockResolvedValueOnce('Mock1155')
-        .mockResolvedValueOnce('some/uri/123')
-        .mockResolvedValueOnce(1337n);
-      vi.mocked(fetchNFTMetadata).mockResolvedValue(mockedMetadata);
+        .mockResolvedValueOnce(mockToken.name)
+        .mockResolvedValueOnce(mockToken.uri)
+        .mockResolvedValueOnce(mockToken.balance);
+      vi.mocked(fetchNFTMetadata).mockResolvedValue(mockToken);
+
       // When
       const result = await getTokenWithInfoFromAddress({
         contractAddress: address,
@@ -129,10 +149,11 @@ describe('getTokenWithInfoFromAddress', () => {
         addresses: {
           1: address,
         },
-        uri: 'some/uri/123',
-        tokenId: 123,
-        name: 'Mock1155',
-        balance: 1337n,
+        uri: mockToken.uri,
+        tokenId: mockToken.tokenId,
+        name: mockToken.name,
+        symbol: mockToken.symbol,
+        balance: mockToken.balance,
         type: TokenType.ERC1155,
         metadata: mockedMetadata,
       });
@@ -142,9 +163,8 @@ describe('getTokenWithInfoFromAddress', () => {
       // Given
       const address: Address = zeroAddress;
       vi.mocked(detectContractType).mockResolvedValue(TokenType.ERC1155);
-      vi.mocked(readContract).mockResolvedValueOnce('Mock1155').mockResolvedValueOnce('some/uri/123');
-
-      vi.mocked(fetchNFTMetadata).mockResolvedValue(mockedMetadata);
+      vi.mocked(readContract).mockResolvedValueOnce(mockToken.name).mockResolvedValueOnce(mockToken.uri);
+      vi.mocked(fetchNFTMetadata).mockResolvedValue(mockToken);
 
       // When
       const result = await getTokenWithInfoFromAddress({ contractAddress: address, srcChainId: 1, tokenId: 123 });
@@ -154,10 +174,11 @@ describe('getTokenWithInfoFromAddress', () => {
         addresses: {
           1: address,
         },
-        uri: 'some/uri/123',
-        tokenId: 123,
-        name: 'Mock1155',
-        balance: 0,
+        uri: mockToken.uri,
+        tokenId: mockToken.tokenId,
+        name: mockToken.name,
+        symbol: mockToken.symbol,
+        balance: mockToken.balance,
         type: TokenType.ERC1155,
         metadata: mockedMetadata,
       });
@@ -168,11 +189,11 @@ describe('getTokenWithInfoFromAddress', () => {
       const address: Address = zeroAddress;
       vi.mocked(detectContractType).mockResolvedValue(TokenType.ERC1155);
       vi.mocked(readContract)
-        .mockResolvedValueOnce('Mock1155')
+        .mockResolvedValueOnce(mockToken.name)
         .mockResolvedValueOnce(null) // first uri call
-        .mockResolvedValueOnce('some/uri/123');
+        .mockResolvedValueOnce(mockToken.uri);
 
-      vi.mocked(fetchNFTMetadata).mockResolvedValue(mockedMetadata);
+      vi.mocked(fetchNFTMetadata).mockResolvedValue(mockToken);
 
       // When
       const result = await getTokenWithInfoFromAddress({ contractAddress: address, srcChainId: 1, tokenId: 123 });
@@ -182,10 +203,11 @@ describe('getTokenWithInfoFromAddress', () => {
         addresses: {
           1: address,
         },
-        uri: 'some/uri/123',
-        tokenId: 123,
-        name: 'Mock1155',
-        balance: 0,
+        uri: mockToken.uri,
+        tokenId: mockToken.tokenId,
+        name: mockToken.name,
+        symbol: mockToken.symbol,
+        balance: mockToken.balance,
         type: TokenType.ERC1155,
         metadata: mockedMetadata,
       });
diff --git a/packages/bridge-ui-v2/src/libs/token/getTokenWithInfoFromAddress.ts b/packages/bridge-ui-v2/src/libs/token/getTokenWithInfoFromAddress.ts
index 66aecd96dd1..b977541087c 100644
--- a/packages/bridge-ui-v2/src/libs/token/getTokenWithInfoFromAddress.ts
+++ b/packages/bridge-ui-v2/src/libs/token/getTokenWithInfoFromAddress.ts
@@ -117,10 +117,11 @@ const getERC1155Info = async (
       balance: balance ? balance : 0,
     } as NFT;
     try {
-      const metadata = await fetchNFTMetadata(token);
-      if (metadata?.name !== '') name = metadata?.name;
-      // todo: more metadata?
-      token.metadata = metadata || undefined;
+      const tokenWithMetadata = await fetchNFTMetadata(token);
+      if (tokenWithMetadata?.metadata?.name !== '') name = tokenWithMetadata?.metadata?.name;
+
+      if (!tokenWithMetadata) return token;
+      return tokenWithMetadata;
     } catch {
       return token;
     }
@@ -174,10 +175,10 @@ const getERC721Info = async (
     uri: uri ? uri.toString() : undefined,
   } as NFT;
   try {
-    const metadata = await fetchNFTMetadata(token);
-    token.metadata = metadata || undefined;
+    const tokenWithMetadata = await fetchNFTMetadata(token);
+    if (!tokenWithMetadata) return token;
+    return tokenWithMetadata;
   } catch {
     return token;
   }
-  return token;
 };
diff --git a/packages/bridge-ui-v2/src/libs/util/fetchNFTMetadata.ts b/packages/bridge-ui-v2/src/libs/util/fetchNFTMetadata.ts
index 3285a7620df..9d511713491 100644
--- a/packages/bridge-ui-v2/src/libs/util/fetchNFTMetadata.ts
+++ b/packages/bridge-ui-v2/src/libs/util/fetchNFTMetadata.ts
@@ -12,7 +12,7 @@ import { getLogger } from './logger';
 
 const log = getLogger('libs:token:fetchNFTMetadata');
 
-export const fetchNFTMetadata = async (token: NFT): Promise<NFTMetadata | null> => {
+export const fetchNFTMetadata = async (token: NFT): Promise<NFT | null> => {
   const cacheKey = objectHash.sha1(token);
 
   // Retrieve the current value of the store
@@ -20,7 +20,8 @@ export const fetchNFTMetadata = async (token: NFT): Promise<NFTMetadata | null>
 
   if (cache.has(cacheKey)) {
     log(`Loaded metadata from cache for ${token.name} id: ${token.tokenId}`);
-    return cache.get(cacheKey) as NFTMetadata;
+    token.metadata = cache.get(cacheKey) as NFTMetadata;
+    return token;
   }
 
   try {
@@ -33,8 +34,8 @@ export const fetchNFTMetadata = async (token: NFT): Promise<NFTMetadata | null>
 
       return currentCache;
     });
-
-    return metadata;
+    token.metadata = metadata;
+    return token;
   } catch (error) {
     log(`Error fetching metadata for ${token.name} id: ${token.tokenId}`, error);
     throw new Error('No metadata found');