diff --git a/apps/web/modules/onboarding/hooks/useSubmitOnboarding.ts b/apps/web/modules/onboarding/hooks/useSubmitOnboarding.ts index 5d24c1cda2..0e5db227b7 100644 --- a/apps/web/modules/onboarding/hooks/useSubmitOnboarding.ts +++ b/apps/web/modules/onboarding/hooks/useSubmitOnboarding.ts @@ -16,7 +16,11 @@ export const useSubmitOnboarding = () => { const intentToCreateOrg = trpc.viewer.organizations.intentToCreateOrg.useMutation(); - const submitOnboarding = async (store: OnboardingState, userEmail: string) => { + const submitOnboarding = async ( + store: OnboardingState, + userEmail: string, + invitesToSubmit: OnboardingState["invites"] + ) => { setIsSubmitting(true); setError(null); @@ -26,7 +30,6 @@ export const useSubmitOnboarding = () => { organizationDetails, organizationBrand, teams, - invites, inviteRole, resetOnboarding, } = store; @@ -46,7 +49,7 @@ export const useSubmitOnboarding = () => { })); // Prepare invites data - const invitedMembersData = invites + const invitedMembersData = invitesToSubmit .filter((invite) => invite.email.trim().length > 0) .map((invite) => ({ email: invite.email, diff --git a/apps/web/modules/onboarding/organization/invite/organization-invite-view.tsx b/apps/web/modules/onboarding/organization/invite/organization-invite-view.tsx index a2b2b5381c..d326202712 100644 --- a/apps/web/modules/onboarding/organization/invite/organization-invite-view.tsx +++ b/apps/web/modules/onboarding/organization/invite/organization-invite-view.tsx @@ -63,7 +63,7 @@ export const OrganizationInviteView = ({ userEmail }: OrganizationInviteViewProp const handleSubmitOnboarding = async (invitesData: FormValues["invites"]) => { // Save invites to store before submitting setInvites(invitesData); - await submitOnboarding(store, userEmail); + await submitOnboarding(store, userEmail, invitesData); }; const handleContinue = async (data?: FormValues) => {