feat(UI-1107): invite user to organization - rebase leftovers

src/components/organisms/settings/organization/addOrganization.tsx

@@ -47,20 +47,13 @@ export const AddOrganization = () => {
 
 	const onSubmit = async (values: FormValues) => {
 		setCreatingOrganization(true);
-<<<<<<< HEAD
 		const error = await createOrganization(values.name);
-=======
-		const error = await OrganizationsService.create(values.name);
->>>>>>> bedaaf92 (feat(UI-1167): organizations fetching and management)
 		if (error) {
 			addToast({
 				message: tErrors("errorCreateNewOrganization"),
 				type: "error",
 			});
-<<<<<<< HEAD
 			setCreatingOrganization(false);
-=======
->>>>>>> bedaaf92 (feat(UI-1167): organizations fetching and management)
 
 			return;
 		}
@@ -79,14 +72,10 @@ export const AddOrganization = () => {
 						isError={!!errors.name}
 						isRequired
 						label={t("form.organizationName")}
-<<<<<<< HEAD
 						{...register("name", {
 							required: t("nameRequired"),
 							validate: validateOrganizationName,
 						})}
-=======
-						{...register("name")}
->>>>>>> bedaaf92 (feat(UI-1167): organizations fetching and management)
 					/>
 
 					<ErrorMessage>{errors?.name?.message as string}</ErrorMessage>