From 148d658f14df8b87865663a19348bab1c1a13671 Mon Sep 17 00:00:00 2001
From: Nafees Nazik <84864519+G3root@users.noreply.github.com>
Date: Wed, 30 Nov 2022 03:08:54 +0530
Subject: [PATCH] fix: update new team cancel button url (#5520)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 .../ee/teams/components/CreateANewTeamForm.tsx       | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/features/ee/teams/components/CreateANewTeamForm.tsx b/packages/features/ee/teams/components/CreateANewTeamForm.tsx
index 0293816d0c..66b05ee030 100644
--- a/packages/features/ee/teams/components/CreateANewTeamForm.tsx
+++ b/packages/features/ee/teams/components/CreateANewTeamForm.tsx
@@ -1,5 +1,6 @@
 import { useRouter } from "next/router";
 import { Controller, useForm } from "react-hook-form";
+import { z } from "zod";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import slugify from "@calcom/lib/slugify";
@@ -8,9 +9,18 @@ import { Avatar, Button, Form, Icon, ImageUploader, TextField } from "@calcom/ui
 
 import { NewTeamFormValues } from "../lib/types";
 
+const querySchema = z.optional(z.string());
+
 export const CreateANewTeamForm = () => {
   const { t } = useLocale();
   const router = useRouter();
+  const {
+    query: { returnTo },
+  } = router;
+  const returnToParsed = querySchema.safeParse(returnTo);
+
+  const returnToParam = returnToParsed.success ? returnToParsed.data : "/settings/teams";
+
   const newTeamFormMethods = useForm<NewTeamFormValues>();
 
   const createTeamMutation = trpc.viewer.teams.create.useMutation({
@@ -119,7 +129,7 @@ export const CreateANewTeamForm = () => {
           <Button
             disabled={createTeamMutation.isLoading}
             color="secondary"
-            href="/settings"
+            href={returnToParam}
             className="w-full justify-center">
             {t("cancel")}
           </Button>