diff --git a/packages/web/src/pages/sign-on-page/SignOnPage.tsx b/packages/web/src/pages/sign-on-page/SignOnPage.tsx index a1646fda6d3..71a345979a4 100644 --- a/packages/web/src/pages/sign-on-page/SignOnPage.tsx +++ b/packages/web/src/pages/sign-on-page/SignOnPage.tsx @@ -1,7 +1,7 @@ import { ReactNode, useEffect, useLayoutEffect } from 'react' import { SystemAppearance } from '@audius/common/models' -import { FEED_PAGE } from '@audius/common/src/utils/route' +import { FEED_PAGE, TRENDING_PAGE } from '@audius/common/src/utils/route' import { themeSelectors } from '@audius/common/store' import { route } from '@audius/common/utils' import { @@ -317,9 +317,14 @@ export const SignOnPage = () => { const SignOnRoot = isMobile ? MobileSignOnRoot : DesktopSignOnRoot const location = useLocation() const isSignUp = location.pathname.startsWith(SIGN_UP_PAGE) + const signUpCompletionRoute = + completionRoute === FEED_PAGE ? TRENDING_PAGE : completionRoute + const successRoute = startedSignUpProcess + ? (signUpCompletionRoute ?? TRENDING_PAGE) + : (completionRoute ?? FEED_PAGE) if (signOnStatus === EditingStatus.SUCCESS) { - return + return } return ( diff --git a/packages/web/src/pages/sign-up-page/SignUpPage.tsx b/packages/web/src/pages/sign-up-page/SignUpPage.tsx index 463457f6356..171f9f4db2d 100644 --- a/packages/web/src/pages/sign-up-page/SignUpPage.tsx +++ b/packages/web/src/pages/sign-up-page/SignUpPage.tsx @@ -69,6 +69,8 @@ function SignUpRoute({ export const SignUpPage = () => { const completionRoute = useSelector(getRouteOnCompletion) + const defaultCompletionRoute = + completionRoute === FEED_PAGE ? TRENDING_PAGE : completionRoute return ( @@ -161,7 +163,7 @@ export const SignUpPage = () => { path='completed' element={ - + } /> diff --git a/packages/web/src/pages/sign-up-page/utils/useDetermineAllowedRoutes.ts b/packages/web/src/pages/sign-up-page/utils/useDetermineAllowedRoutes.ts index 2c48e93f452..fa728ea6393 100644 --- a/packages/web/src/pages/sign-up-page/utils/useDetermineAllowedRoutes.ts +++ b/packages/web/src/pages/sign-up-page/utils/useDetermineAllowedRoutes.ts @@ -12,7 +12,7 @@ import { env } from 'services/env' import { useFastReferral } from '../hooks/useFastReferral' -const { FEED_PAGE, SignUpPath } = route +const { TRENDING_PAGE, SignUpPath } = route const isDevEnvironment = env.ENVIRONMENT === 'development' || @@ -63,7 +63,7 @@ export const useDetermineAllowedRoute = () => { return { allowedRoutes: [], isAllowedRoute: false, - correctedRoute: FEED_PAGE + correctedRoute: TRENDING_PAGE } } // Normalize path: strip /signup/ or signup/ prefix and trailing slash so "select-genres" always matches