edit registration

src/app/actions/auth.ts

@@ -170,6 +170,8 @@ export async function registration(
 
 	const validatedFields = SignupFormSchema.safeParse(dataToValidate);
 
+	console.log(`account-type ${accountType}`)
+
 	if (!validatedFields.success) {
 		const errors: Record<string, string> = {}
 		JSON.parse(validatedFields.error.message).forEach((obj: {
@@ -197,6 +199,19 @@ export async function registration(
 		};
 	}
 
+	/* 
+		return {
+			previousState: {
+				fullName,
+				email,
+				password,
+				confirm_password,
+				phone,
+				agree,
+				...(accountType === 'b2b' && { companyName })
+			}
+		}; */
+
 	try {
 		const { fullName, email, password, phone } = validatedFields.data;
 		const response = await fetch(`${API_BASE_URL}/api/v1/data`, {
@@ -228,6 +243,7 @@ export async function registration(
 
 			if (parsed.message_desc === 'Operation successful') {
 				await createSession(parsed.message_body.token, email as string);
+				console.log('succes registration');
 			} else {
 				throw parsed;
 			}

src/app/actions/definitions.ts

@@ -35,9 +35,6 @@ interface ValidationConfig {
 
 const defaultConfig = validationConfig as ValidationConfig;
 
-let cachedSignupSchema: any = null;
-let schemaPromise: Promise<any> | null = null;
-
 async function loadConfigFromBackend(accountType?: 'b2b' | 'b2c'): Promise<any> {
 	try {
 		const response = await fetch('/api/validation-config');
@@ -51,22 +48,16 @@ async function loadConfigFromBackend(accountType?: 'b2b' | 'b2c'): Promise<any>
 }
 
 export async function getSignupFormSchema(schemaType?: 'b2b' | 'b2c' | 'resetPassword') {
-	if (cachedSignupSchema) {
-		return cachedSignupSchema;
-	}
+	let schemaPromise: Promise<any> | null = null;
 
-	if (!schemaPromise) {
-		schemaPromise = (async () => {
-			const config = await loadConfigFromBackend();
-			if (schemaType === 'resetPassword') {
-				cachedSignupSchema = createValidationSchemaForPssword(config);
-			} else {
-				cachedSignupSchema = createValidationSchema(config, schemaType);
-			}
-
-			return cachedSignupSchema;
-		})();
-	}
+	schemaPromise = (async () => {
+		const config = await loadConfigFromBackend();
+		if (schemaType === 'resetPassword') {
+			return createValidationSchemaForPssword(config);
+		} else {
+			return createValidationSchema(config, schemaType);
+		}
+	})();
 
 	return await schemaPromise;
 }

src/app/lib/validation-config-parser.ts

@@ -38,8 +38,8 @@ export function createValidationSchema(config: ValidationConfig, accountType?: '
 			.trim();
 	}
 
-	// fullName
-	if (config.companyName && accountType !== 'b2c') {
+	// companyName
+	if (config.companyName && accountType === 'b2b') {
 		schema.companyName = z
 			.string()
 			.trim()

src/app/ui/forms/register-form.tsx

@@ -84,7 +84,7 @@ export default function RegisterForm() {
 				if (fieldName === 'phone') {
 					return schema.safeParse(value.replace(/[-\(\)\s]/g, ''));
 				}
-				if (fieldName === 'companyName' && accountType === 'b2c') {
+				if (fieldName === 'companyName') {
 					return { success: true, data: value };
 				}
 				return schema.safeParse(value);

src/app/ui/header/userMenuButton.tsx

@@ -22,8 +22,7 @@ export default function UserMenuButton() {
 		queryFn: () => {
 			return getUserData();
 		}
-	})
-
+	});
 
 	useClickOutside(
 		menuRef,

src/app/ui/payment/payment-tab-tariffs.tsx

@@ -1,4 +1,27 @@
+'use client'
+
+import { useEffect } from 'react';
+import { getUserData } from '@/app/actions/action';
+import { useQuery } from '@tanstack/react-query';
+
 export default function PaymentTabTariffs() {
+	const {
+		data: userData,
+		isLoading,
+		isError,
+		error
+	} = useQuery({
+		queryKey: ['userData'],
+		queryFn: () => {
+			return getUserData();
+		}
+	});
+
+	useEffect(() => {
+		console.log('show => userData');
+		console.log(userData);
+	}, [])
+
 	return (
 		<div className="tab-content">
 			<div className="billing-toggle">