Safe Link: Fix opening search-highlighted links (#2368)

src/components/common/SafeLink.tsx

@@ -29,10 +29,11 @@ const SafeLink: FC<OwnProps> = ({
   const { openUrl } = getActions();
 
   const content = children || text;
-  const isSafe = url === content;
+  const isSafe = url === text;
 
   const handleClick = useCallback((e: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => {
     if (!url) return true;
+
     e.preventDefault();
     openUrl({ url, shouldSkipModal: isSafe });
 

src/components/common/WebLink.tsx

@@ -84,6 +84,8 @@ const WebLink: FC<OwnProps> = ({
     (!photo && !video) && 'without-media',
   );
 
+  const safeLinkContent = url.replace('mailto:', '') || displayUrl;
+
   return (
     <div
       className={className}
@@ -105,11 +107,9 @@ const WebLink: FC<OwnProps> = ({
         <SafeLink
           url={url}
           className="site-name"
-          text=""
+          text={safeLinkContent}
           isRtl={lang.isRtl}
-        >
+        />
-          {url.replace('mailto:', '') || displayUrl}
-        </SafeLink>
         {senderTitle && <div className="sender-name">{renderText(senderTitle)}</div>}
       </div>
       {senderTitle && (

src/components/payment/Checkout.tsx

@@ -131,11 +131,9 @@ const Checkout: FC<OwnProps> = ({
         {langStringSplit[0]}
         <SafeLink
           url={url}
-          text=""
+          text={langStringSplit[1]}
           isRtl={isRtl}
-        >
+        />
-          {langStringSplit[1]}
-        </SafeLink>
         {langStringSplit.slice(2)}
       </>
     );