From 710b59354b8468776173a393c534c7d8080c9418 Mon Sep 17 00:00:00 2001
From: "Builder.io" <builder-bot@builder.io>
Date: Mon, 17 Nov 2025 02:57:37 +0000
Subject: [PATCH] completionId: cgen-1765ddfef25d4e2aa2039158e5f581f8

cgen-1765ddfef25d4e2aa2039158e5f581f8
---
 client/pages/creators/CreatorProfile.tsx | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/client/pages/creators/CreatorProfile.tsx b/client/pages/creators/CreatorProfile.tsx
index 595f3369..918c221e 100644
--- a/client/pages/creators/CreatorProfile.tsx
+++ b/client/pages/creators/CreatorProfile.tsx
@@ -16,6 +16,7 @@ import {
   Music,
 } from "lucide-react";
 import { getCreatorByUsername } from "@/api/creators";
+import { resolveIdentifierToUsername, isUUID } from "@/lib/identifier-resolver";
 import { ArmBadge } from "@/components/creator-network/ArmBadge";
 import type { Creator } from "@/api/creators";
 
@@ -30,7 +31,22 @@ export default function CreatorProfile() {
       if (!username) return;
       setIsLoading(true);
       try {
-        const data = await getCreatorByUsername(username);
+        // Support both username and UUID
+        let resolvedUsername = username;
+
+        if (isUUID(username)) {
+          // If param is UUID, try to resolve to username for canonical redirect
+          const resolved = await resolveIdentifierToUsername(username);
+          if (resolved) {
+            resolvedUsername = resolved;
+            // Optionally redirect to username canonical URL
+            if (resolved !== username) {
+              navigate(`/creators/${resolved}`, { replace: true });
+            }
+          }
+        }
+
+        const data = await getCreatorByUsername(resolvedUsername);
         setCreator(data);
       } catch (error) {
         console.error("Failed to fetch creator:", error);
@@ -41,7 +57,7 @@ export default function CreatorProfile() {
     };
 
     fetchCreator();
-  }, [username]);
+  }, [username, navigate]);
 
   if (isLoading) {
     return (