From 79ef1470234b167454cc0b7db6295aa117a6bee3 Mon Sep 17 00:00:00 2001
From: Martti Malmi <sirius@iki.fi>
Date: Mon, 9 Oct 2023 15:44:47 +0300
Subject: [PATCH] simpler profile url nip05 replacement

---
 .../app/src/Pages/Profile/ProfilePage.tsx     | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/packages/app/src/Pages/Profile/ProfilePage.tsx b/packages/app/src/Pages/Profile/ProfilePage.tsx
index d0833a93..96d2da78 100644
--- a/packages/app/src/Pages/Profile/ProfilePage.tsx
+++ b/packages/app/src/Pages/Profile/ProfilePage.tsx
@@ -21,7 +21,7 @@ import Avatar from "Element/User/Avatar";
 import Timeline from "Element/Feed/Timeline";
 import Text from "Element/Text";
 import SendSats from "Element/SendSats";
-import Nip05, { useIsVerified } from "Element/User/Nip05";
+import Nip05 from "Element/User/Nip05";
 import Copy from "Element/Copy";
 import ProfileImage from "Element/User/ProfileImage";
 import BlockList from "Element/User/BlockList";
@@ -69,7 +69,6 @@ export default function ProfilePage({ id: propId }: ProfilePageProps) {
   const [modalImage, setModalImage] = useState<string>("");
   const aboutText = user?.about || "";
   const npub = !id?.startsWith(NostrPrefix.PublicKey) ? hexToBech32(NostrPrefix.PublicKey, id || undefined) : id;
-  const { isVerified } = useIsVerified(user?.pubkey || "");
 
   const lnurl = (() => {
     try {
@@ -140,23 +139,13 @@ export default function ProfilePage({ id: propId }: ProfilePageProps) {
   }
 
   useEffect(() => {
-    const replaceWith = (username: string) => {
-      const current = window.location.pathname;
-      const npub = hexToBech32(NostrPrefix.PublicKey, user?.pubkey);
-      if (current.endsWith(`/${npub}`)) {
-        window.history.replaceState?.(null, "", `/${username}`);
-      }
-    };
-    if (user?.nip05) {
+    if (user?.nip05 && user?.isNostrAddressValid) {
       if (user.nip05.endsWith(`@${process.env.NIP05_DOMAIN}`)) {
         const username = user.nip05?.replace(`@${process.env.NIP05_DOMAIN}`, "");
-        replaceWith(username);
-      } else {
-        // do we want this? would need to support urls with dots like /fiatjaf.com
-        // replaceWith(user.nip05?.replace(/^_@/, ""));
+        navigate(`/${username}`, { replace: true });
       }
     }
-  }, [isVerified, user?.pubkey]);
+  }, [user?.isNostrAddressValid, user?.nip05]);
 
   function username() {
     return (