Migrate to Lens v3

apps/web/src/components/Shared/Markup/MarkupLink/Mention.tsx

@@ -6,7 +6,7 @@ import Link from "next/link";
 import type { FC } from "react";
 
 const Mention: FC<MarkupLinkProps> = ({ mentions, title }) => {
-  const handle = title?.slice(1);
+  const handle = title;
 
   if (!handle) {
     return null;
@@ -26,29 +26,37 @@ const Mention: FC<MarkupLinkProps> = ({ mentions, title }) => {
     return Boolean(foundMention?.account);
   };
 
-  const getLocalNameFromFullHandle = (handle: string) => {
+  const getNameFromMention = (handle: string): string => {
     const foundMention = mentions?.find(
       (mention) => mention.replace.from === handle
     );
-    return foundMention?.replace.from;
+
+    return foundMention?.replace.from.split("/")[1] || "";
+  };
+
+  const getAddressFromMention = (handle: string): string => {
+    const foundMention = mentions?.find(
+      (mention) => mention.replace.from === handle
+    );
+
+    return foundMention?.account;
   };
 
   return canShowUserPreview(handle) ? (
     <Link
       className="outline-none focus:underline"
-      href={`/u/${getLocalNameFromFullHandle(handle)}`}
+      href={`/u/${getNameFromMention(handle)}`}
       onClick={stopEventPropagation}
     >
-      <AccountPreview handle={handle}>
-        <Slug
-          prefix="@"
-          slug={getLocalNameFromFullHandle(handle)}
-          useBrandColor
-        />
+      <AccountPreview
+        handle={getNameFromMention(handle)}
+        address={getAddressFromMention(handle)}
+      >
+        <Slug prefix="@" slug={getNameFromMention(handle)} useBrandColor />
       </AccountPreview>
     </Link>
   ) : (
-    <Slug prefix="@" slug={getLocalNameFromFullHandle(handle)} useBrandColor />
+    <Slug prefix="@" slug={getNameFromMention(handle)} useBrandColor />
   );
 };
 

apps/web/src/components/Shared/Markup/MarkupLink/index.tsx

@@ -1,7 +1,6 @@
 import type { MarkupLinkProps } from "@hey/types/misc";
 import Cashtag from "./Cashtag";
 import ExternalLink from "./ExternalLink";
-import Group from "./Group";
 import Hashtag from "./Hashtag";
 import Mention from "./Mention";
 
@@ -11,10 +10,6 @@ const MarkupLink = ({ mentions, title }: MarkupLinkProps) => {
   }
 
   if (title.startsWith("@")) {
-    if (title.startsWith("@club/")) {
-      return <Group title={title} />;
-    }
-
     return <Mention mentions={mentions} title={title} />;
   }