Skip to content

fix(onboarding): hard-navigate to /dashboard after finish #86

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
f-amine merged 1 commit into from
May 15, 2026
Merged

fix(onboarding): hard-navigate to /dashboard after finish #86

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
17 changes: 12 additions & 5 deletions apps/web/src/app/onboarding/_wizard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import { Input } from "@starter-saas/ui/components/input";
import { Label } from "@starter-saas/ui/components/label";
import { ArrowRight, CheckCircle2 } from "lucide-react";
import Link from "next/link";
import { useRouter } from "next/navigation";
import * as React from "react";
import { toast } from "sonner";
import { authClient } from "@/lib/auth-client";
Expand Down Expand Up @@ -82,7 +81,6 @@ function StepDots({ active }: { active: StepKey }) {
}

export function OnboardingWizard({ user }: Props) {
const router = useRouter();
const [step, setStep] = React.useState<StepKey>("profile");
const [name, setName] = React.useState(user.name);
const [orgName, setOrgName] = React.useState("");
Expand Down Expand Up @@ -123,16 +121,25 @@ export function OnboardingWizard({ user }: Props) {
id: toastId,
description: result.error,
});
setFinishing(false);
return;
}
toast.success(skipped ? "Skipped — see you later" : "You're set", {
id: toastId,
});
router.replace("/dashboard");
router.refresh();
} finally {
// Hard navigation — `router.replace` doesn't always pick up the new
// audit-log row before the app layout re-runs `hasCompletedOnboarding`,
// which bounces us back to /onboarding. A full reload sidesteps that.
window.location.href = "/dashboard";
} catch (err) {
toast.error("Couldn't finish", {
id: toastId,
description: err instanceof Error ? err.message : "?",
});
setFinishing(false);
}
// Intentionally leave `finishing` true on success — the hard nav
// will unmount this component momentarily.
};

const saveProfile = async () => {
Expand Down
Loading