Fix profile sub-route tabs defaulting to first tab

packages/web/src/pages/profile-page/components/desktop/ProfilePage.tsx

@@ -329,7 +329,7 @@ const ProfilePage = ({ containerRef }: ProfilePageProps) => {
     isMobile: false,
     tabs: headers,
     tabRecalculator,
-    initialTab: activeTab || undefined,
+    selectedTabLabel: activeTab ?? undefined,
     elements,
     pathname: profilePage(handle)
   })

packages/web/src/pages/profile-page/components/mobile/ProfilePage.tsx

@@ -345,7 +345,7 @@ const ProfilePage = ({ containerRef }: ProfilePageProps) => {
     didChangeTabsFrom,
     tabs: profileTabs,
     elements: profileElements,
-    initialTab: activeTab || undefined,
+    selectedTabLabel: activeTab ?? undefined,
     pathname: profilePage(handle)
   })
 

packages/web/src/pages/profile-page/useProfilePage.ts

@@ -230,7 +230,7 @@ export const useProfilePage = (
 
   // Reset state when profile changes
   useEffect(() => {
-    setActiveTab(null)
+    setActiveTab(params?.tab ? getTabForRoute(params.tab) : null)
     setEditMode(false)
     setUpdatedName(null)
     setUpdatedCoverPhoto(null)
@@ -243,6 +243,8 @@ export const useProfilePage = (
     setUpdatedWebsite(null)
     setUpdatedArtistCoinBadge(null)
     setAreArtistRecommendationsVisible(false)
+    // We intentionally only reset when switching profiles, not when changing tabs.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [profile?.handle])
 
   // Check if owner changed from visitor to owner

packages/web/src/utils/route/userRouteParser.test.ts

@@ -0,0 +1,25 @@
+import { describe, expect, it } from 'vitest'
+
+import { parseUserRoute } from './userRouteParser'
+
+describe('parseUserRoute', () => {
+  it('parses profile tab routes', () => {
+    expect(parseUserRoute('/test-user/albums')).toEqual({
+      handle: 'test-user',
+      userId: null,
+      tab: 'albums'
+    })
+  })
+
+  it('parses base profile routes', () => {
+    expect(parseUserRoute('/test-user')).toEqual({
+      handle: 'test-user',
+      userId: null,
+      tab: null
+    })
+  })
+
+  it('does not parse static routes as user profiles', () => {
+    expect(parseUserRoute('/search/albums')).toBeNull()
+  })
+})

packages/web/src/utils/route/userRouteParser.ts

@@ -47,7 +47,7 @@ export const parseUserRoute = (
     return { userId, handle: null, tab: null }
   }
 
-  const profilePageMatch = matchPath(PROFILE_PAGE, route)
+  const profilePageMatch = matchPath({ path: PROFILE_PAGE, end: true }, route)
   if (profilePageMatch?.params?.handle) {
     const { handle } = profilePageMatch.params
     // Decode handle to prevent double-encoding when used in API calls
@@ -58,7 +58,10 @@ export const parseUserRoute = (
     }
   }
 
-  const commentHistoryMatch = matchPath(PROFILE_PAGE_COMMENTS, route)
+  const commentHistoryMatch = matchPath(
+    { path: PROFILE_PAGE_COMMENTS, end: true },
+    route
+  )
   if (commentHistoryMatch?.params?.handle) {
     const { handle } = commentHistoryMatch.params
     // Decode handle to prevent double-encoding when used in API calls
@@ -68,7 +71,10 @@ export const parseUserRoute = (
     }
   }
 
-  const profilePageTabMatch = matchPath(`${PROFILE_PAGE}/:tab`, route)
+  const profilePageTabMatch = matchPath(
+    { path: `${PROFILE_PAGE}/:tab`, end: true },
+    route
+  )
   if (profilePageTabMatch?.params) {
     const { handle, tab } = profilePageTabMatch.params as {
       handle?: string