diff --git a/packages/ui/src/App.tsx b/packages/ui/src/App.tsx
index 21b50ddb2..93e1040b4 100644
--- a/packages/ui/src/App.tsx
+++ b/packages/ui/src/App.tsx
@@ -95,14 +95,14 @@ const App = () => {
} />
+ {/* Passwordless verification code */}
+ } />
+
{/* Continue set up missing profile */}
} />
- {/* Passwordless verification code */}
- } />
-
{/* Social sign-in pages */}
} />
diff --git a/packages/ui/src/hooks/use-send-verification-code.ts b/packages/ui/src/hooks/use-send-verification-code.ts
index 8d4a82a49..cb561cb45 100644
--- a/packages/ui/src/hooks/use-send-verification-code.ts
+++ b/packages/ui/src/hooks/use-send-verification-code.ts
@@ -46,7 +46,7 @@ const useSendVerificationCode = (flow: UserFlow, replaceCurrentPage?: boolean) =
if (result) {
navigate(
{
- pathname: `verification-code`,
+ pathname: `/${flow}/verification-code`,
search: location.search,
},
{
diff --git a/packages/ui/src/pages/ForgotPassword/ForgotPasswordForm/index.test.tsx b/packages/ui/src/pages/ForgotPassword/ForgotPasswordForm/index.test.tsx
index ae9f2d177..9801aa787 100644
--- a/packages/ui/src/pages/ForgotPassword/ForgotPasswordForm/index.test.tsx
+++ b/packages/ui/src/pages/ForgotPassword/ForgotPasswordForm/index.test.tsx
@@ -5,7 +5,7 @@ import { MemoryRouter } from 'react-router-dom';
import renderWithPageContext from '@/__mocks__/RenderWithPageContext';
import { putInteraction, sendVerificationCode } from '@/apis/interaction';
-import { VerificationCodeIdentifier } from '@/types';
+import { UserFlow, VerificationCodeIdentifier } from '@/types';
import ForgotPasswordForm from '.';
@@ -81,7 +81,7 @@ describe('ForgotPasswordForm', () => {
expect(sendVerificationCode).toBeCalledWith({ email });
expect(mockedNavigate).toBeCalledWith(
{
- pathname: 'verification-code',
+ pathname: `/${UserFlow.forgotPassword}/verification-code`,
search: '',
},
{ state: { identifier, value }, replace: undefined }
diff --git a/packages/ui/src/pages/SignInPassword/PasswordForm/index.test.tsx b/packages/ui/src/pages/SignInPassword/PasswordForm/index.test.tsx
index 9e7669ad5..8e745e552 100644
--- a/packages/ui/src/pages/SignInPassword/PasswordForm/index.test.tsx
+++ b/packages/ui/src/pages/SignInPassword/PasswordForm/index.test.tsx
@@ -7,6 +7,7 @@ import {
putInteraction,
sendVerificationCode,
} from '@/apis/interaction';
+import { UserFlow } from '@/types';
import PasswordForm from '.';
@@ -89,7 +90,7 @@ describe('PasswordSignInForm', () => {
expect(mockedNavigate).toBeCalledWith(
{
- pathname: 'verification-code',
+ pathname: `/${UserFlow.signIn}/verification-code`,
search: '',
},
{