Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

🐛 Redirect unregistered users to register page when upgrading from paywall (#2690)

Luke Vellab5bd5c077356
diff --git a/apps/web/src/features/billing/components/upgrade-button.tsx b/apps/web/src/features/billing/components/upgrade-button.tsx
index c0f3140fe..eb592925b 100644
--- a/apps/web/src/features/billing/components/upgrade-button.tsx
+++ b/apps/web/src/features/billing/components/upgrade-button.tsx
@@ -1,9 +1,10 @@
"use client";
import { Button } from "@rallly/ui/button";
-import { usePathname } from "next/navigation";
+import { usePathname, useRouter } from "next/navigation";
import type React from "react";
import { upgradeToProAction } from "@/features/billing/actions";
+import { useUser } from "@/features/user/components/user-provider";
import { Trans } from "@/i18n/client";
import { useSafeAction } from "@/lib/safe-action/client";
@@ -16,6 +17,8 @@ export const UpgradeButton = ({
className?: string;
}>) => {
const pathname = usePathname();
+ const router = useRouter();
+ const { user } = useUser();
const upgradeToPro = useSafeAction(upgradeToProAction);
return (
@@ -26,6 +29,10 @@ export const UpgradeButton = ({
variant="primary"
loading={upgradeToPro.isExecuting}
onClick={() => {
+ if (!user || user.isGuest) {
+ router.push(`/register?redirectTo=${encodeURIComponent(pathname)}`);
+ return;
+ }
upgradeToPro.execute({
period: annual ? "yearly" : "monthly",
returnPath: pathname,