@greatapps/common 1.1.797 → 1.1.798

package/src/components/modals/billing/BillingDataForm.tsx

@@ -20,7 +20,7 @@ import { useUpdateBillingData } from '../../../modules/accounts/hooks/useAccount
 import { COUNTRIES } from '../../../utils/countries';
 import { readGeoCountry } from '../../../utils/geo-country';
 import { BR_STATE_OPTIONS } from '../../../utils/constants/br-states';
-import { formatCNPJ, formatCPF, formatPostalCode } from '../../../utils/format/masks';
+import { formatCPFCNPJ, formatPostalCode } from '../../../utils/format/masks';
 import { isValidCNPJ, isValidCPF } from '../../../utils/validators/common';
 import type { Account } from '../../../modules/accounts/types';
 import type { UpdateBillingDataRequest } from '../../../modules/accounts/types';
@@ -28,7 +28,6 @@ import type { UpdateBillingDataRequest } from '../../../modules/accounts/types';
 type TranslateFn = (key: any, values?: Record<string, string | number>) => string;
 
 type BillingDataFormValues = {
-  personType: 'pf' | 'pj';
   document: string;
   financialName: string;
   financialEmail: string;
@@ -55,9 +54,12 @@ const BR_REQUIRED_ADDRESS_FIELDS: readonly (keyof BillingDataFormValues)[] = [
   'state',
 ];
 
+function isCompanyDocument(document: string): boolean {
+  return document.replace(/\D/g, '').length > 11;
+}
+
 function buildBillingDataSchema(translate: TranslateFn) {
   const base = z.object({
-    personType: z.enum(['pf', 'pj']),
     document: z.string().trim(),
     financialName: z
       .string()
@@ -99,7 +101,7 @@ function buildBillingDataSchema(translate: TranslateFn) {
       });
     }
 
-    const isCompany = data.personType === 'pj';
+    const isCompany = isCompanyDocument(data.document);
     const digits = data.document.replace(/\D/g, '');
 
     if (digits.length !== (isCompany ? 14 : 11)) {
@@ -126,11 +128,6 @@ function buildBillingDataSchema(translate: TranslateFn) {
   });
 }
 
-function formatDocument(document: string | null | undefined, isCompany: boolean) {
-  if (!document) return '';
-  return isCompany ? formatCNPJ(document) : formatCPF(document);
-}
-
 export interface BillingDataFormProps {
   account: Account | undefined;
   onSaved: () => void;
@@ -155,7 +152,6 @@ export function BillingDataForm({ account, onSaved, country, submitLabel }: Bill
     resolver: zodResolver(schema),
     mode: 'onChange',
     defaultValues: {
-      personType: 'pf',
       document: '',
       financialName: '',
       financialEmail: '',
@@ -180,18 +176,15 @@ export function BillingDataForm({ account, onSaved, country, submitLabel }: Bill
     formState: { errors, isSubmitting, isValid },
   } = form;
 
-  const personType = watch('personType');
-  const isCompany = personType === 'pj';
+  const isCompany = isCompanyDocument(watch('document'));
   const isBrazil = watch('country') === 'BR';
 
   useEffect(() => {
     if (!account || isPrefilled.current) return;
     isPrefilled.current = true;
 
-    const accountIsCompany = account.financial_document_type === 2;
     reset({
-      personType: accountIsCompany ? 'pj' : 'pf',
-      document: formatDocument(account.financial_document, accountIsCompany),
+      document: formatCPFCNPJ(account.financial_document ?? ''),
       financialName: account.financial_name ?? '',
       financialEmail: account.financial_email || user?.email || '',
       cep: account.zipcode ?? '',
@@ -206,15 +199,7 @@ export function BillingDataForm({ account, onSaved, country, submitLabel }: Bill
   }, [account, country, reset, user?.email]);
 
   const handleDocumentChange = (rawValue: string) => {
-    setValue('document', isCompany ? formatCNPJ(rawValue) : formatCPF(rawValue), {
-      shouldValidate: true,
-    });
-  };
-
-  const handlePersonTypeChange = (value: 'pf' | 'pj') => {
-    if (value === personType) return;
-    setValue('document', '');
-    setValue('personType', value, { shouldValidate: true });
+    setValue('document', formatCPFCNPJ(rawValue), { shouldValidate: true });
   };
 
   const handleCepChange = (rawValue: string) => {
@@ -237,7 +222,7 @@ export function BillingDataForm({ account, onSaved, country, submitLabel }: Bill
     const payload: UpdateBillingDataRequest =
       data.country === 'BR'
         ? {
-            financial_document_type: data.personType === 'pf' ? 1 : 2,
+            financial_document_type: isCompanyDocument(data.document) ? 2 : 1,
             financial_document: data.document,
             financial_name: data.financialName,
             financial_email: data.financialEmail,
@@ -312,49 +297,6 @@ export function BillingDataForm({ account, onSaved, country, submitLabel }: Bill
             </>
           )}
 
-          {isBrazil && (
-            <div className="flex gap-4">
-              <Controller
-                name="personType"
-                control={control}
-                render={({ field }) => (
-                  <SelectField
-                    label={translate('common.billing.requiredData.personType')}
-                    placeholder={translate('common.billing.requiredData.select')}
-                    value={field.value}
-                    onChange={(value) => handlePersonTypeChange(value as 'pf' | 'pj')}
-                    options={[
-                      {
-                        value: 'pf',
-                        label: translate('common.billing.requiredData.personTypePf'),
-                      },
-                      {
-                        value: 'pj',
-                        label: translate('common.billing.requiredData.personTypePj'),
-                      },
-                    ]}
-                    containerClassName="flex-1"
-                  />
-                )}
-              />
-              <div className="flex-1">
-                <FormField
-                  label={
-                    isCompany
-                      ? translate('common.billing.requiredData.cnpj')
-                      : translate('common.billing.requiredData.cpf')
-                  }
-                  placeholder={isCompany ? '__.___.___/____-__' : '___.___.___-__'}
-                  error={!!errors.document}
-                  errorMessage={errors.document?.message}
-                  {...register('document', {
-                    onChange: (event) => handleDocumentChange(event.target.value),
-                  })}
-                />
-              </div>
-            </div>
-          )}
-
           <FormField
             label={
               isBrazil && isCompany
@@ -367,6 +309,18 @@ export function BillingDataForm({ account, onSaved, country, submitLabel }: Bill
             {...register('financialName')}
           />
 
+          {isBrazil && (
+            <FormField
+              label={translate('common.billing.requiredData.document')}
+              placeholder={translate('common.billing.requiredData.documentPlaceholder')}
+              error={!!errors.document}
+              errorMessage={errors.document?.message}
+              {...register('document', {
+                onChange: (event) => handleDocumentChange(event.target.value),
+              })}
+            />
+          )}
+
           <FormField
             label={translate('common.billing.requiredData.financialEmail')}
             placeholder={translate('common.billing.requiredData.financialEmailPlaceholder')}

package/src/i18n/messages/en-us.ts

@@ -1224,11 +1224,8 @@ const messages = {
       addressHeading: 'Billing address',
       select: 'Select',
       typeHere: 'Type here',
-      personType: 'Entity type',
-      personTypePf: 'Individual',
-      personTypePj: 'Company',
-      cpf: 'CPF',
-      cnpj: 'CNPJ',
+      document: 'CPF or CNPJ',
+      documentPlaceholder: 'Enter your CPF or CNPJ',
       fullName: 'Full name',
       companyName: 'Legal name',
       financialEmail: 'Billing email',
@@ -1252,8 +1249,8 @@ const messages = {
       invalidCep: 'Invalid ZIP code',
       invalidCpf: 'Invalid CPF',
       invalidCnpj: 'Invalid CNPJ',
-      invalidCpfChecksum: 'Invalid CPF — check the verification digits',
-      invalidCnpjChecksum: 'Invalid CNPJ — check the verification digits',
+      invalidCpfChecksum: 'Invalid CPF, check the verification digits',
+      invalidCnpjChecksum: 'Invalid CNPJ, check the verification digits',
     },
   },
   navigation: {

package/src/i18n/messages/es-es.ts

@@ -1230,11 +1230,8 @@ const messages = {
       addressHeading: 'Dirección de facturación',
       select: 'Selecciona',
       typeHere: 'Escribe aquí',
-      personType: 'Tipo de persona',
-      personTypePf: 'Persona física',
-      personTypePj: 'Persona jurídica',
-      cpf: 'CPF',
-      cnpj: 'CNPJ',
+      document: 'CPF o CNPJ',
+      documentPlaceholder: 'Escribe tu CPF o CNPJ',
       fullName: 'Nombre completo',
       companyName: 'Razón social',
       financialEmail: 'Correo de facturación',
@@ -1258,8 +1255,8 @@ const messages = {
       invalidCep: 'Código postal inválido',
       invalidCpf: 'CPF inválido',
       invalidCnpj: 'CNPJ inválido',
-      invalidCpfChecksum: 'CPF inválido — revisa los dígitos verificadores',
-      invalidCnpjChecksum: 'CNPJ inválido — revisa los dígitos verificadores',
+      invalidCpfChecksum: 'CPF inválido, revisa los dígitos verificadores',
+      invalidCnpjChecksum: 'CNPJ inválido, revisa los dígitos verificadores',
     },
   },
   navigation: {

package/src/i18n/messages/pt-br.ts

@@ -1241,11 +1241,8 @@ const messages = {
       addressHeading: 'Endereço de cobrança',
       select: 'Selecione',
       typeHere: 'Digite aqui',
-      personType: 'Tipo de pessoa',
-      personTypePf: 'Pessoa física',
-      personTypePj: 'Pessoa jurídica',
-      cpf: 'CPF',
-      cnpj: 'CNPJ',
+      document: 'CPF ou CNPJ',
+      documentPlaceholder: 'Digite seu CPF ou CNPJ',
       fullName: 'Nome completo',
       companyName: 'Razão social',
       financialEmail: 'E-mail financeiro',
@@ -1269,8 +1266,8 @@ const messages = {
       invalidCep: 'CEP inválido',
       invalidCpf: 'CPF inválido',
       invalidCnpj: 'CNPJ inválido',
-      invalidCpfChecksum: 'CPF inválido — confira os dígitos verificadores',
-      invalidCnpjChecksum: 'CNPJ inválido — confira os dígitos verificadores',
+      invalidCpfChecksum: 'CPF inválido, confira os dígitos verificadores',
+      invalidCnpjChecksum: 'CNPJ inválido, confira os dígitos verificadores',
     },
   },