[Explorer] Fixes mistaken rendering of image in case of 0x2 (MystenLa…

…bs#2872) * fixes mistaken rendering of image in case of 0x2
Panamka0 · Jul 1, 2022 · b2dfe9b · b2dfe9b
1 parent 5f79c36
commit b2dfe9b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/explorer/client/src/utils/objectUtils.ts b/explorer/client/src/utils/objectUtils.ts
@@ -7,16 +7,28 @@ import {
     type ObjectOwner,
 } from '@mysten/sui.js';
 
+import { findIPFSvalue } from './stringUtils';
+
 import type { GetObjectDataResponse } from '@mysten/sui.js';
 
 export function parseImageURL(data: any): string {
-    return (
+    const url =
         data?.url ||
         // TODO: Remove Legacy format
         data?.display ||
-        data?.contents?.display ||
-        ''
-    );
+        data?.contents?.display;
+
+    if (!url) return '';
+
+    if (findIPFSvalue(url)) return url;
+
+    // String respresenting true http/https URLs are valid:
+    try {
+        new URL(url);
+        return url;
+    } catch {
+        return '';
+    }
 }
 
 export function parseObjectType(data: GetObjectDataResponse): string {

diff --git a/explorer/client/src/utils/stringUtils.ts b/explorer/client/src/utils/stringUtils.ts
@@ -20,12 +20,15 @@ export const handleCoinType = (str: string): string =>
         ? 'SUI'
         : str.match(/^([a-zA-Z0-9:]*)<([a-zA-Z0-9:]*)>$/)?.[2] || str;
 
+export const findIPFSvalue = (url: string): string | undefined =>
+    url.match(/^ipfs:\/\/(.*)/)?.[1];
+
 export function transformURL(url: string) {
-    const found = url.match(/^ipfs:\/\/(.*)/);
+    const found = findIPFSvalue(url);
     if (!found) {
         return url;
     }
-    return `https://ipfs.io/ipfs/${found[1]}`;
+    return `https://ipfs.io/ipfs/${found}`;
 }
 
 export function truncate(fullStr: string, strLen: number, separator?: string) {