Skip to content

Commit 9b09544

Browse files
authored
fix: try submit instead of form manual submition (calcom#25789)
* try submit * add toaster and logs
1 parent 44104e1 commit 9b09544

2 files changed

Lines changed: 11 additions & 12 deletions

File tree

apps/web/modules/onboarding/components/OnboardingLayout.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import classNames from "classnames";
44
import { signOut } from "next-auth/react";
55
import { Children, type ReactNode } from "react";
6+
import { Toaster } from "sonner";
67

78
import { useLocale } from "@calcom/lib/hooks/useLocale";
89
import { Button } from "@calcom/ui/components/button";
@@ -71,6 +72,7 @@ export const OnboardingLayout = ({ userEmail, currentStep, totalSteps, children
7172
{t("sign_out")}
7273
</Button>
7374
</div>
75+
<Toaster position="bottom-right" />
7476
</div>
7577
);
7678
};

apps/web/modules/onboarding/teams/invite/email/team-invite-email-view.tsx

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ export const TeamInviteEmailView = ({ userEmail }: TeamInviteEmailViewProps) =>
4343
// Read teamId from query params and store it (from payment callback or redirect)
4444
useEffect(() => {
4545
const teamIdParam = searchParams?.get("teamId");
46-
if (teamIdParam) {
47-
const teamId = parseInt(teamIdParam, 10);
48-
if (!isNaN(teamId)) {
49-
setTeamId(teamId);
46+
if (teamIdParam && !teamId) {
47+
const parsedTeamId = parseInt(teamIdParam, 10);
48+
if (!isNaN(parsedTeamId)) {
49+
setTeamId(parsedTeamId);
5050
}
5151
}
52-
}, [searchParams, setTeamId]);
52+
}, [searchParams, setTeamId, teamId]);
5353

5454
const formSchema = z.object({
5555
invites: z.array(
@@ -79,6 +79,7 @@ export const TeamInviteEmailView = ({ userEmail }: TeamInviteEmailViewProps) =>
7979
const teamIdParam = searchParams?.get("teamId");
8080
const parsedTeamId = !teamId ? parseInt(teamIdParam || "", 10) : teamId;
8181
if (!parsedTeamId) {
82+
console.log("Team ID is missing. Please go back and create your team first.");
8283
showToast(
8384
t("team_id_missing") || "Team ID is missing. Please go back and create your team first.",
8485
"error"
@@ -113,6 +114,7 @@ export const TeamInviteEmailView = ({ userEmail }: TeamInviteEmailViewProps) =>
113114
}
114115
} else {
115116
// No invites, skip to personal settings
117+
console.log("No invites, skipping to personal settings");
116118
const gettingStartedPath = "/onboarding/personal/settings?fromTeamOnboarding=true";
117119
router.replace(gettingStartedPath);
118120
}
@@ -125,10 +127,6 @@ export const TeamInviteEmailView = ({ userEmail }: TeamInviteEmailViewProps) =>
125127
router.replace(gettingStartedPath);
126128
};
127129

128-
const handleSubmitClick = () => {
129-
form.handleSubmit(handleContinue)();
130-
};
131-
132130
// Watch form values to pass to browser view for real-time updates
133131
const watchedInvites = form.watch("invites");
134132

@@ -156,12 +154,11 @@ export const TeamInviteEmailView = ({ userEmail }: TeamInviteEmailViewProps) =>
156154
{t("onboarding_skip_for_now")}
157155
</Button>
158156
<Button
159-
type="button"
157+
type="submit"
160158
color="primary"
161159
className="rounded-[10px]"
162160
disabled={!hasValidInvites || isSubmitting}
163-
loading={isSubmitting}
164-
onClick={handleSubmitClick}>
161+
loading={isSubmitting}>
165162
{t("continue")}
166163
</Button>
167164
</div>

0 commit comments

Comments
 (0)