Skip to content

fix(web): harden balance banner redirect #3845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RSO merged 1 commit into from
Jun 9, 2026
Merged

fix(web): harden balance banner redirect #3845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions apps/web/src/components/shared/InsufficientBalanceBanner.actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ import 'server-only';

import { setPaymentReturnUrl } from '@/lib/payment-return-url';

export async function setReturnUrlAndRedirect(
returnUrl: string,
creditsUrl: string
): Promise<string> {
export async function setReturnUrlAndRedirect(returnUrl: string): Promise<void> {
await setPaymentReturnUrl(returnUrl);
return creditsUrl;
}
11 changes: 7 additions & 4 deletions apps/web/src/components/shared/InsufficientBalanceBanner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { AlertTriangle, Info, type LucideIcon } from 'lucide-react';
import { Button } from '@/components/Button';
import { cn } from '@/lib/utils';
import { setReturnUrlAndRedirect } from './InsufficientBalanceBanner.actions';
import { usePathname } from 'next/navigation';
import { usePathname, useRouter } from 'next/navigation';

/** Minimum balance required to use features that require credits (in dollars) */
export const MIN_BALANCE_DOLLARS_DEFAULT = 1;
Expand Down Expand Up @@ -84,12 +84,15 @@ export function InsufficientBalanceBanner({
content,
}: InsufficientBalanceBannerProps) {
const pathname = usePathname();
const creditsUrl = organizationId ? `/organizations/${organizationId}` : '/credits';
const router = useRouter();
const creditsUrl = organizationId
? `/organizations/${encodeURIComponent(organizationId)}`
: '/credits';

const handleAddCreditsClick = async () => {
// Set the return URL cookie before redirecting
const redirectUrl = await setReturnUrlAndRedirect(pathname, creditsUrl);
window.location.href = redirectUrl;
await setReturnUrlAndRedirect(pathname);
router.push(creditsUrl);
};

const formattedBalance = balance.toLocaleString('en-US', {
Expand Down