Merge commit '34d2fdd25545e73e4578200de8cbaa6396f87ab3' into checkpoi…

…nt/main_from_release_2.3.0_34d2fdd25545e73e4578200de8cbaa6396f87ab3
Chia-Network · May 1, 2024 · 3a6b917 · 3a6b917
2 parents 3a13ce8 + 34d2fdd
commit 3a6b917
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 51 deletions.
diff --git a/packages/core/src/hooks/useOpenExternal.ts b/packages/core/src/hooks/useOpenExternal.ts
@@ -1,15 +1,21 @@
 import isElectron from 'is-electron';
+import { useCallback } from 'react';
+import isURL from 'validator/es/lib/isURL';
 
 export default function useOpenExternal(): (url: string) => void {
-  function handleOpen(url: string) {
+  const handleOpen = useCallback((url: string) => {
+    if (!isURL(url, { protocols: ['http', 'https', 'ipfs'], require_protocol: true })) {
+      return;
+    }
+
     if (isElectron()) {
       // @ts-ignore
       window.shell.openExternal(url);
       return;
     }
 
     window.open(url, '_blank');
-  }
+  }, []);
 
   return handleOpen;
 }
diff --git a/packages/gui/src/components/nfts/NFTDetails.tsx b/packages/gui/src/components/nfts/NFTDetails.tsx
@@ -7,7 +7,6 @@ import {
   Tooltip,
   Truncate,
   truncateValue,
-  Link,
   useCurrencyCode,
 } from '@chia-network/core';
 import { Trans } from '@lingui/macro';
@@ -302,35 +301,37 @@ export default function NFTDetails(props: NFTDetailsProps) {
       });
     }
 
-    if (metadata?.preview_image_uris) {
-      const value = metadata?.preview_image_uris.map((uri: string) => (
-        <span>
-          &nbsp;
-          <Link href={uri} target="_blank">
-            {uri}
-          </Link>
-        </span>
-      ));
-      rows.push({
-        key: 'preview_image_uris',
-        label: <Trans>Preview image uris</Trans>,
-        value,
+    if (Array.isArray(metadata?.preview_image_uris)) {
+      metadata.preview_image_uris.forEach((uri: string, i: number) => {
+        if (uri) {
+          const index = i + 1;
+          rows.push({
+            key: `preview-image-uris-${i}`,
+            label: <Trans>Preview image URL {index}</Trans>,
+            value: (
+              <Tooltip title={uri} copyToClipboard>
+                <Typography variant="body2">{uri}</Typography>
+              </Tooltip>
+            ),
+          });
+        }
       });
     }
 
     if (Array.isArray(metadata?.preview_video_uris)) {
-      const value = metadata?.preview_video_uris.map((uri: string) => (
-        <span>
-          &nbsp;
-          <Link target="_blank" href={uri}>
-            {uri}
-          </Link>
-        </span>
-      ));
-      rows.push({
-        key: 'preview_video_uris',
-        label: <Trans>Preview video uris</Trans>,
-        value,
+      metadata.preview_video_uris.forEach((uri: string, i: number) => {
+        if (uri) {
+          const index = i + 1;
+          rows.push({
+            key: `preview-video-uris-${i}`,
+            label: <Trans>Preview video URL {index}</Trans>,
+            value: (
+              <Tooltip title={uri} copyToClipboard>
+                <Typography variant="body2">{uri}</Typography>
+              </Tooltip>
+            ),
+          });
+        }
       });
     }
 

diff --git a/packages/gui/src/components/nfts/NFTProperties.tsx b/packages/gui/src/components/nfts/NFTProperties.tsx
@@ -6,7 +6,6 @@ import { useTheme } from '@mui/material/styles';
 import React, { useMemo } from 'react';
 import styled from 'styled-components';
 
-import useOpenUnsafeLink from '../../hooks/useOpenUnsafeLink';
 import isRankingAttribute from '../../util/isRankingAttribute';
 
 /* ========================================================================== */
@@ -34,7 +33,6 @@ export type NFTPropertiesProps = {
 
 export function NFTProperty(props: NFTPropertyProps) {
   const { attribute, size = 'regular', color = 'secondary' } = props;
-  const openUnsafeLink = useOpenUnsafeLink();
   const theme = useTheme();
   // eslint-disable-next-line @typescript-eslint/naming-convention -- Comes from API like this
   const { name, trait_type, value: rawValue } = attribute;
@@ -50,24 +48,6 @@ export function NFTProperty(props: NFTPropertyProps) {
     p: size === 'small' ? 1 : 2,
   };
 
-  function renderValueWithUrls(val: string) {
-    const urlRegex = /(https?:\/\/[^\s]+)/g;
-    const matches = val.split(urlRegex);
-    if (matches.length > 1) {
-      return matches.map((match, index) => {
-        if (index % 2 === 1) {
-          return (
-            <span style={{ cursor: 'pointer', textDecoration: 'underline' }} onClick={() => openUnsafeLink(match)}>
-              {match}
-            </span>
-          );
-        }
-        return match !== '' ? <span>{match}</span> : null;
-      });
-    }
-    return val;
-  }
-
   return (
     <Grid xs={12} sm={6} item>
       <Box {...borderStyle}>
@@ -93,7 +73,7 @@ export function NFTProperty(props: NFTPropertyProps) {
           }
         >
           <Typography variant={size === 'small' ? 'body2' : 'h6'} color={color} noWrap>
-            {renderValueWithUrls(value)}
+            {value}
           </Typography>
         </Tooltip>
       </Box>

diff --git a/packages/gui/src/hooks/useOpenExternal.ts b/packages/gui/src/hooks/useOpenExternal.ts
@@ -1,15 +1,21 @@
 import isElectron from 'is-electron';
+import { useCallback } from 'react';
+import isURL from 'validator/es/lib/isURL';
 
 export default function useOpenExternal(): (url: string) => void {
-  function handleOpen(url: string) {
+  const handleOpen = useCallback((url: string) => {
+    if (!isURL(url, { protocols: ['http', 'https', 'ipfs'], require_protocol: true })) {
+      return;
+    }
+
     if (isElectron()) {
       // @ts-ignore
       window.shell.openExternal(url);
       return;
     }
 
     window.open(url, '_blank');
-  }
+  }, []);
 
   return handleOpen;
 }