fix(clerk-js): SignUpVerificationCodeForm back navigation for combined flows #6909
Conversation
🦋 Changeset detectedLatest commit: d0d1c07 The changes in this PR will be included in the next version bump. This PR includes changesets to release 3 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
WalkthroughThe SignUp verification code form now reads SignInContext and SignUpContext, computes a local isCombinedFlow flag, and conditionally uses '../../' for the goBack navigation when in a combined flow (otherwise '../'). No exported APIs were changed. Changes
Sequence Diagram(s)sequenceDiagram
autonumber
actor U as User
participant V as SignUpVerificationCodeForm
participant SIC as SignInContext
participant SUC as SignUpContext
participant R as Router
U->>V: Load verification form
V->>SIC: useContext(SignInContext)
SIC-->>V: isWithinSignInContext
V->>SUC: useSignUpContext()
SUC-->>V: _isCombinedFlow
Note over V: isCombinedFlow = isWithinSignInContext && _isCombinedFlow
U->>V: Click Back
alt isCombinedFlow
V->>R: navigate("../../")
else not combined
V->>R: navigate("../")
end
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Poem
Pre-merge checks and finishing touches✅ Passed checks (3 passed)
✨ Finishing touches
🧪 Generate unit tests
Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 0
🧹 Nitpick comments (1)
packages/clerk-js/src/ui/components/SignUp/SignUpVerificationCodeForm.tsx (1)
32-33: Logic is correct; consider minor simplification.The combined flow detection correctly requires both the SignIn context presence and the
_isCombinedFlowflag. The double negation explicitly coerces to boolean.Optional: Line 33 can be simplified since
!!isWithinSignInContextalready returns boolean:- const isWithinSignInContext = !!React.useContext(SignInContext); - const isCombinedFlow = !!(isWithinSignInContext && _isCombinedFlow); + const isWithinSignInContext = !!React.useContext(SignInContext); + const isCombinedFlow = isWithinSignInContext && !!_isCombinedFlow;
📜 Review details
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Disabled knowledge base sources:
- Linear integration is disabled by default for public repositories
You can enable these sources in your CodeRabbit configuration.
📒 Files selected for processing (1)
packages/clerk-js/src/ui/components/SignUp/SignUpVerificationCodeForm.tsx(2 hunks)
🧰 Additional context used
📓 Path-based instructions (9)
packages/clerk-js/src/ui/**/*.{ts,tsx}
📄 CodeRabbit inference engine (.cursor/rules/clerk-js-ui.mdc)
packages/clerk-js/src/ui/**/*.{ts,tsx}: Element descriptors should always be camelCase
Use element descriptors in UI components to enable consistent theming and styling via appearance.elements
Element descriptors should generate unique, stable CSS classes for theming
Element descriptors should handle state classes (e.g., cl-loading, cl-active, cl-error, cl-open) automatically based on component state
Do not render hard-coded values; all user-facing strings must be localized using provided localization methods
Use the useLocalizations hook and localizationKeys utility for all text and error messages
Use the styled system (sx prop, theme tokens, responsive values) for custom component styling
Use useCardState for card-level state, useFormState for form-level state, and useLoadingStatus for loading states
Always use handleError utility for API errors and use translateError for localized error messages
Use useFormControl for form field state, implement proper validation, and handle loading and error states in forms
Use localization keys for all form labels and placeholders
Use element descriptors for consistent styling and follow the theme token system
Use the Card and FormContainer patterns for consistent UI structure
Files:
packages/clerk-js/src/ui/components/SignUp/SignUpVerificationCodeForm.tsx
**/*.{js,jsx,ts,tsx}
📄 CodeRabbit inference engine (.cursor/rules/development.mdc)
**/*.{js,jsx,ts,tsx}: All code must pass ESLint checks with the project's configuration
Follow established naming conventions (PascalCase for components, camelCase for variables)
Maintain comprehensive JSDoc comments for public APIs
Use dynamic imports for optional features
All public APIs must be documented with JSDoc
Provide meaningful error messages to developers
Include error recovery suggestions where applicable
Log errors appropriately for debugging
Lazy load components and features when possible
Implement proper caching strategies
Use efficient data structures and algorithms
Profile and optimize critical paths
Validate all inputs and sanitize outputs
Implement proper logging with different levels
Files:
packages/clerk-js/src/ui/components/SignUp/SignUpVerificationCodeForm.tsx
**/*.{js,jsx,ts,tsx,json,css,scss,md,yaml,yml}
📄 CodeRabbit inference engine (.cursor/rules/development.mdc)
Use Prettier for consistent code formatting
Files:
packages/clerk-js/src/ui/components/SignUp/SignUpVerificationCodeForm.tsx
packages/**/*.{ts,tsx}
📄 CodeRabbit inference engine (.cursor/rules/development.mdc)
TypeScript is required for all packages
Files:
packages/clerk-js/src/ui/components/SignUp/SignUpVerificationCodeForm.tsx
packages/**/*.{ts,tsx,d.ts}
📄 CodeRabbit inference engine (.cursor/rules/development.mdc)
Packages should export TypeScript types alongside runtime code
Files:
packages/clerk-js/src/ui/components/SignUp/SignUpVerificationCodeForm.tsx
**/*.{ts,tsx}
📄 CodeRabbit inference engine (.cursor/rules/development.mdc)
Use proper TypeScript error types
**/*.{ts,tsx}: Always define explicit return types for functions, especially public APIs
Use proper type annotations for variables and parameters where inference isn't clear
Avoidanytype - preferunknownwhen type is uncertain, then narrow with type guards
Useinterfacefor object shapes that might be extended
Usetypefor unions, primitives, and computed types
Preferreadonlyproperties for immutable data structures
Useprivatefor internal implementation details
Useprotectedfor inheritance hierarchies
Usepublicexplicitly for clarity in public APIs
Preferreadonlyfor properties that shouldn't change after construction
Prefer composition and interfaces over deep inheritance chains
Use mixins for shared behavior across unrelated classes
Implement dependency injection for loose coupling
Let TypeScript infer when types are obvious
Useconst assertionsfor literal types:as const
Usesatisfiesoperator for type checking without widening
Use mapped types for transforming object types
Use conditional types for type-level logic
Leverage template literal types for string manipulation
Use ES6 imports/exports consistently
Use default exports sparingly, prefer named exports
Use type-only imports:import type { ... } from ...
Noanytypes without justification
Proper error handling with typed errors
Consistent use ofreadonlyfor immutable data
Proper generic constraints
No unused type parameters
Proper use of utility types instead of manual type construction
Type-only imports where possible
Proper tree-shaking friendly exports
No circular dependencies
Efficient type computations (avoid deep recursion)
Files:
packages/clerk-js/src/ui/components/SignUp/SignUpVerificationCodeForm.tsx
**/*.{jsx,tsx}
📄 CodeRabbit inference engine (.cursor/rules/development.mdc)
**/*.{jsx,tsx}: Use error boundaries in React components
Minimize re-renders in React components
**/*.{jsx,tsx}: Always use functional components with hooks instead of class components
Follow PascalCase naming for components:UserProfile,NavigationMenu
Keep components focused on a single responsibility - split large components
Limit component size to 150-200 lines; extract logic into custom hooks
Use composition over inheritance - prefer smaller, composable components
Export components as named exports for better tree-shaking
One component per file with matching filename and component name
Use useState for simple state management
Use useReducer for complex state logic
Implement proper state initialization
Use proper state updates with callbacks
Implement proper state cleanup
Use Context API for theme/authentication
Implement proper state selectors
Use proper state normalization
Implement proper state persistence
Use React.memo for expensive components
Implement proper useCallback for handlers
Use proper useMemo for expensive computations
Implement proper virtualization for lists
Use proper code splitting with React.lazy
Implement proper cleanup in useEffect
Use proper refs for DOM access
Implement proper event listener cleanup
Use proper abort controllers for fetch
Implement proper subscription cleanup
Use proper HTML elements
Implement proper ARIA attributes
Use proper heading hierarchy
Implement proper form labels
Use proper button types
Implement proper focus management
Use proper keyboard shortcuts
Implement proper tab order
Use proper skip links
Implement proper focus traps
Implement proper error boundaries
Use proper error logging
Implement proper error recovery
Use proper error messages
Implement proper error fallbacks
Use proper form validation
Implement proper error states
Use proper error messages
Implement proper form submission
Use proper form reset
Use proper component naming
Implement proper file naming
Use proper prop naming
Implement proper...
Files:
packages/clerk-js/src/ui/components/SignUp/SignUpVerificationCodeForm.tsx
**/*.{js,ts,tsx,jsx}
📄 CodeRabbit inference engine (.cursor/rules/monorepo.mdc)
Support multiple Clerk environment variables (CLERK_, NEXT_PUBLIC_CLERK_, etc.) for configuration.
Files:
packages/clerk-js/src/ui/components/SignUp/SignUpVerificationCodeForm.tsx
**/*.tsx
📄 CodeRabbit inference engine (.cursor/rules/react.mdc)
**/*.tsx: Use proper type definitions for props and state
Leverage TypeScript's type inference where possible
Use proper event types for handlers
Implement proper generic types for reusable components
Use proper type guards for conditional rendering
Files:
packages/clerk-js/src/ui/components/SignUp/SignUpVerificationCodeForm.tsx
🧬 Code graph analysis (1)
packages/clerk-js/src/ui/components/SignUp/SignUpVerificationCodeForm.tsx (3)
packages/clerk-js/src/ui/contexts/components/SignUp.ts (1)
useSignUpContext(37-158)packages/clerk-js/src/ui/contexts/components/SignIn.ts (1)
SignInContext(36-36)packages/clerk-js/src/utils/getClerkQueryParam.ts (1)
forwardClerkQueryParams(58-70)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (4)
- GitHub Check: Build Packages
- GitHub Check: semgrep-cloud-platform/scan
- GitHub Check: semgrep-cloud-platform/scan
- GitHub Check: Analyze (javascript-typescript)
🔇 Additional comments (4)
packages/clerk-js/src/ui/components/SignUp/SignUpVerificationCodeForm.tsx (4)
3-3: LGTM: Import change supports context access.The explicit React import is necessary for accessing
React.useContexton line 32.
9-9: LGTM: SignInContext import is correct.The import is necessary for detecting whether the component is rendered within a SignIn context.
28-28: LGTM: Destructuring prepares for local flow detection.Renaming to
_isCombinedFlowclearly indicates this value will be refined locally.
37-37: LGTM: Navigation correctly accounts for combined flow route depth.The conditional navigation path correctly handles the extra
/createsegment present in combined flows, as evidenced by theemailLinkRedirectUrlandssoCallbackUrlconstruction in the SignUpContext (lines 73-84 in SignUp.ts). Query parameters are properly preserved viaforwardClerkQueryParams().Based on learnings from relevant code snippets.
@clerk/agent-toolkit
@clerk/astro
@clerk/backend
@clerk/chrome-extension
@clerk/clerk-js
@clerk/dev-cli
@clerk/elements
@clerk/clerk-expo
@clerk/expo-passkeys
@clerk/express
@clerk/fastify
@clerk/localizations
@clerk/nextjs
@clerk/nuxt
@clerk/clerk-react
@clerk/react-router
@clerk/remix
@clerk/shared
@clerk/tanstack-react-start
@clerk/testing
@clerk/themes
@clerk/types
@clerk/upgrade
@clerk/vue
commit: |
alexcarpenter
changed the title
| const { setActive } = useClerk(); | ||
| const { navigate } = useRouter(); | ||
|
|
||
| const isWithinSignInContext = !!React.useContext(SignInContext); |
There was a problem hiding this comment.
can we use our useSignInContext hook instead?
There was a problem hiding this comment.
oh wait I think that errors if it's not wrapped in SignInContext, so maybe this approach is the better one. Do we use this pattern elsewhere? This can't be the first time we're checking to see if we're in the combined flow.
There was a problem hiding this comment.
yeah, we use the same approach in a few other spots https://github.com/clerk/javascript/blob/main/packages/clerk-js/src/ui/components/SignUp/SignUpStart.tsx#L45
Description
Fixes an issue within the combined flow experience where a user enters the wrong phone number, and within the verification step hits the back button, and they were brought back to the sign-up step, vs moving back to the sign-in step. This is problematic because when they do enter the correct number during the sign-up step, they'd get an error that the number is already in use which is confusing.
This fix, ensures they go back to the sign-in step, to ensure when they do enter the right phone number, it correctly moves to the verification step.
BEFORE
before.mov
AFTER
after.mov
Fixes USER-3614
Checklist
pnpm testruns as expected.pnpm buildruns as expected.Type of change
Summary by CodeRabbit