Merge branch 'main' into clean

packages/bridge-ui/src/libs/util/extractIPFSCidFromUrl.test.ts

@@ -0,0 +1,15 @@
+import { extractIPFSCidFromUrl } from './extractIPFSCidFromUrl';
+
+describe('extractIPFSCidFromUrl', () => {
+  test('should return the correct CID when a valid IPFS URL is provided', () => {
+    const url = 'https://ipfs.io/ipfs/QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnPbdG/readme';
+    const result = extractIPFSCidFromUrl(url);
+    expect(result).toEqual({ cid: 'QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnPbdG' });
+  });
+
+  test('should return null when an invalid IPFS URL is provided', () => {
+    const url = 'https://invalid-url.com';
+    const result = extractIPFSCidFromUrl(url);
+    expect(result).toEqual({ cid: null });
+  });
+});

packages/bridge-ui/src/libs/util/parseNFTMetadata.ts

@@ -10,6 +10,8 @@ import { getLogger } from './logger';
 
 const log = getLogger('libs:token:parseNFTMetadata');
 
+const request = axios.create({ timeout: apiService.timeout });
+
 export const parseNFTMetadata = async (token: NFT): Promise<NFTMetadata | null> => {
   if (token.type !== TokenType.ERC721 && token.type !== TokenType.ERC1155) throw new Error('Not a NFT');
 
@@ -27,7 +29,7 @@ export const parseNFTMetadata = async (token: NFT): Promise<NFTMetadata | null>
   let json;
 
   try {
-    json = await axios.get(url, { timeout: apiService.timeout });
+    json = await request.get(url);
   } catch (err) {
     const error = err as AxiosError;
     log(`error fetching metadata for ${token.name} id: ${token.tokenId}`, error);
@@ -76,7 +78,7 @@ const retry = async (url: string, tokenId: number): Promise<AxiosResponse | Erro
 const retryRequest = async (newUrl: string): Promise<AxiosResponse | Error> => {
   try {
     log(`retrying with ${newUrl}`);
-    return await axios.get(newUrl);
+    return await request.get(newUrl);
   } catch (error) {
     log('retrying failed', error);
     throw new Error(`No metadata found for ${newUrl}`);