diff --git a/src/app/subscription/components/subscription-back-link.tsx b/src/app/subscription/components/subscription-back-link.tsx
index ba2186ce..7411d657 100644
--- a/src/app/subscription/components/subscription-back-link.tsx
+++ b/src/app/subscription/components/subscription-back-link.tsx
@@ -16,12 +16,16 @@ import styles from "./subscription-back-link.module.css";
export interface SubscriptionBackLinkProps {
className?: string;
+ href?: string;
}
-export function SubscriptionBackLink({ className }: SubscriptionBackLinkProps) {
+export function SubscriptionBackLink({
+ className,
+ href = ROUTES.sidebar,
+}: SubscriptionBackLinkProps) {
return (
diff --git a/src/app/subscription/subscription-screen.tsx b/src/app/subscription/subscription-screen.tsx
index ca9ef45f..b35462ad 100644
--- a/src/app/subscription/subscription-screen.tsx
+++ b/src/app/subscription/subscription-screen.tsx
@@ -156,6 +156,7 @@ export function SubscriptionScreen({
payment.isPollingOrder;
const canActivate =
selectedPlan !== null && payment.agreed && !isPaymentBusy;
+ const backHref = returnTo === "chat" ? ROUTES.chat : ROUTES.sidebar;
const finishPaymentSuccessClose = () => {
setShowPaymentSuccessDialog(false);
@@ -215,7 +216,7 @@ export function SubscriptionScreen({