@greatapps/common 1.1.806 → 1.1.808

package/src/components/account/sections/affiliates/RequestWithdrawalSheet.tsx

@@ -23,6 +23,11 @@ import {
   parseCurrencyToNumber,
 } from '../../../../utils/format/currency';
 import { formatDocument, formatPixKey } from '../../../../utils/format/masks';
+import {
+  AMBIGUOUS_PIX_KEY,
+  isPixKeyFromAnotherDocument,
+  normalizePixKeyForStorage,
+} from '../../../../utils/validators/pix-key';
 import { formatFileSize, isPDFFile } from '../../../../utils/file/index';
 import { useUploadProgress } from '../../../../hooks/useUploadProgress';
 import useIsMobile from '../../../../hooks/useIsMobile';
@@ -144,6 +149,12 @@ export function RequestWithdrawalSheet() {
   const requiresInvoice = limits?.requiresInvoice ?? false;
   const hasReceivingAccount = !!(affiliate?.pix && affiliate?.holder_name && affiliate?.holder_document);
 
+  const holderDocument = affiliate?.holder_document ?? '';
+  const storedPixKey = affiliate?.pix ? normalizePixKeyForStorage(affiliate.pix, holderDocument) : undefined;
+  const isPixKeyInvalid = storedPixKey === null || storedPixKey === AMBIGUOUS_PIX_KEY;
+  const isPixKeyMismatch = typeof storedPixKey === 'string' && isPixKeyFromAnotherDocument(storedPixKey, holderDocument);
+  const hasPixKeyIssue = isPixKeyInvalid || isPixKeyMismatch;
+
   const minValueLabel = minWithdrawal.toFixed(2).replace('.', ',');
 
   const withdrawalSchema = useMemo(
@@ -309,8 +320,13 @@ export function RequestWithdrawalSheet() {
                     <span className="w-40 text-zinc-950 paragraph-small-medium">
                       {translateSheet('pixKeyLabel')}
                     </span>
-                    <span className="w-full text-zinc-600 paragraph-small-regular truncate">
-                      {affiliate?.pix ? formatPixKey(affiliate.pix) : '—'}
+                    <span
+                      className={cn(
+                        'w-full paragraph-small-regular truncate',
+                        hasPixKeyIssue ? 'text-red-600' : 'text-zinc-600'
+                      )}
+                    >
+                      {affiliate?.pix ? (hasPixKeyIssue ? affiliate.pix : formatPixKey(affiliate.pix)) : '—'}
                     </span>
                   </div>
                   <div className="flex items-center gap-3">
@@ -322,9 +338,24 @@ export function RequestWithdrawalSheet() {
                     </span>
                   </div>
                 </div>
+                {hasPixKeyIssue && (
+                  <div role="alert" className="flex flex-col gap-3 rounded-lg bg-red-50 p-4">
+                    <div className="flex items-start gap-3">
+                      <IconAlertTriangle size={20} className="text-red-600 shrink-0 mt-0.5" />
+                      <p className="paragraph-small-medium text-zinc-950">
+                        {isPixKeyInvalid
+                          ? translateSheet('pixKeyInvalidWarning')
+                          : translateSheet('pixKeyMismatchWarning')}
+                      </p>
+                    </div>
+                    <Button className="h-10! w-fit" type="button" onClick={openReceivingAccount}>
+                      {translateSheet('updateReceivingAccountButton')}
+                    </Button>
+                  </div>
+                )}
               </div>
 
-              {limits && !limits.canWithdraw ? (
+              {limits && !limits.canWithdraw && !hasPixKeyIssue ? (
                 <div className="flex flex-col gap-3 bg-zinc-50 rounded-lg p-4">
                   <div className="size-8 bg-white rounded-lg shadow-[0px_2px_10px_0px_rgba(26,26,26,0.05)] flex items-center justify-center">
                     <IconAlertTriangle size={18} className="text-amber-500" />
@@ -350,6 +381,7 @@ export function RequestWithdrawalSheet() {
                     render={({ field, fieldState }) => (
                       <FormField
                         required
+                        disabled={hasPixKeyIssue}
                         label={translateSheet('withdrawalValueLabel')}
                         placeholder={translateSheet('withdrawalValuePlaceholder')}
                         inputMode="numeric"
@@ -481,6 +513,7 @@ export function RequestWithdrawalSheet() {
                   !affiliate ||
                   !limits ||
                   !hasReceivingAccount ||
+                  hasPixKeyIssue ||
                   !withdrawalAmount ||
                   withdrawalAmount < minWithdrawal ||
                   toCents(withdrawalAmount) > toCents(availableToWithdraw) ||

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

@@ -537,6 +537,11 @@ const messages = {
           blockedDescription:
             'The registered Pix key is a tax ID that differs from the account holder document. Update the key or the document to request withdrawals again.',
           blockedEditAccountButton: 'Edit receiving account',
+          pixKeyInvalidWarning:
+            'Your Pix key is invalid. Update your receiving details to request a withdrawal.',
+          pixKeyMismatchWarning:
+            'The Pix key does not match the account holder CPF/CNPJ. Update your receiving details to request a withdrawal.',
+          updateReceivingAccountButton: 'Update receiving details',
         },
         bankAccount: {
           dialogTitle: 'Receiving account',
@@ -558,6 +563,12 @@ const messages = {
           validationCnpjChecksum: 'Invalid CNPJ — check the verification digits',
           validationPixDocumentMismatch:
             'The Pix key is a tax ID that differs from the account holder document. Use a key for the same document or fix the holder tax ID.',
+          validationPixInvalid:
+            'Invalid Pix key. Use a CPF, CNPJ, mobile number with area code, email or random key.',
+          pixKeyPreview: 'Will be saved as: {value}',
+          pixAmbiguousQuestion: 'Is this number a mobile phone or a CPF?',
+          pixAmbiguousMobile: 'Mobile',
+          pixAmbiguousCpf: 'CPF',
           pixCnpjInvoiceNotice:
             'Company account: withdrawals require a PDF invoice and do not use the individual monthly limit.',
         },

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

@@ -540,6 +540,11 @@ const messages = {
           blockedDescription:
             'La clave Pix registrada es un CPF/CNPJ distinto del documento del titular. Ajusta la clave o el documento para volver a solicitar retiros.',
           blockedEditAccountButton: 'Editar cuenta de cobro',
+          pixKeyInvalidWarning:
+            'Tu clave Pix no es válida. Actualiza tus datos de cobro para solicitar el retiro.',
+          pixKeyMismatchWarning:
+            'La clave Pix no coincide con el CPF/CNPJ del titular. Actualiza tus datos de cobro para solicitar el retiro.',
+          updateReceivingAccountButton: 'Actualizar datos de cobro',
         },
         bankAccount: {
           dialogTitle: 'Cuenta de recepción',
@@ -561,6 +566,12 @@ const messages = {
           validationCnpjChecksum: 'CNPJ inválido — verifica los dígitos verificadores',
           validationPixDocumentMismatch:
             'La clave Pix es un CPF/CNPJ distinto del documento del titular. Usa una clave del mismo documento o corrige el CPF/CNPJ del titular.',
+          validationPixInvalid:
+            'Clave Pix inválida. Usa CPF, CNPJ, celular con código de área, correo electrónico o clave aleatoria.',
+          pixKeyPreview: 'Se guardará como: {value}',
+          pixAmbiguousQuestion: '¿Este número es un celular o un CPF?',
+          pixAmbiguousMobile: 'Celular',
+          pixAmbiguousCpf: 'CPF',
           pixCnpjInvoiceNotice:
             'Cuenta CNPJ: el retiro exige factura en PDF y no usa el límite mensual de CPF.',
         },

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

@@ -548,6 +548,11 @@ const messages = {
           blockedDescription:
             'A chave Pix cadastrada é um CPF/CNPJ diferente do documento do titular. Ajuste a chave ou o documento para voltar a solicitar saques.',
           blockedEditAccountButton: 'Editar conta de recebimento',
+          pixKeyInvalidWarning:
+            'Sua chave Pix está inválida. Atualize seus dados de recebimento para solicitar o saque.',
+          pixKeyMismatchWarning:
+            'A chave Pix não confere com o CPF/CNPJ do titular. Atualize seus dados de recebimento para solicitar o saque.',
+          updateReceivingAccountButton: 'Atualizar dados de recebimento',
         },
         bankAccount: {
           dialogTitle: 'Conta de recebimento',
@@ -569,6 +574,12 @@ const messages = {
           validationCnpjChecksum: 'CNPJ inválido — confira os dígitos verificadores',
           validationPixDocumentMismatch:
             'A chave Pix informada é um CPF/CNPJ diferente do documento do titular. Use uma chave do mesmo documento ou corrija o CPF/CNPJ do titular.',
+          validationPixInvalid:
+            'Chave Pix inválida. Use CPF, CNPJ, celular com DDD, e-mail ou chave aleatória.',
+          pixKeyPreview: 'Será salva como: {value}',
+          pixAmbiguousQuestion: 'Esse número é um celular ou um CPF?',
+          pixAmbiguousMobile: 'Celular',
+          pixAmbiguousCpf: 'CPF',
           pixCnpjInvoiceNotice:
             'Conta CNPJ: o saque passa a exigir nota fiscal em PDF e não usa o limite mensal de CPF.',
         },

package/src/index.ts

@@ -559,7 +559,9 @@ export {
   formatCPF,
   formatCNPJ,
   formatCardNumber,
+  formatPixKey,
 } from "./utils/format/masks";
+export { AMBIGUOUS_PIX_KEY, isPixKeyFromAnotherDocument, normalizePixKeyForStorage } from "./utils/validators/pix-key";
 export {
   formatCurrency,
   formatCurrencyNumber,

package/src/testing/factories/affiliate.factory.ts

@@ -0,0 +1,22 @@
+import { faker } from '@faker-js/faker';
+import type { Affiliate } from '../../modules/affiliates/types/affiliate.type';
+import { TEST_IDS } from '../constants';
+import { createMock } from './create-mock';
+
+export const createAffiliateMock = createMock<Affiliate, Partial<Affiliate>>((overrides) => ({
+  id: overrides?.id ?? 1,
+  id_wl: overrides?.id_wl ?? TEST_IDS.wl,
+  id_account: overrides?.id_account ?? TEST_IDS.account,
+  active: overrides?.active ?? true,
+  deleted: overrides?.deleted ?? false,
+  balance: overrides?.balance ?? 0,
+  datetime_add: overrides?.datetime_add ?? null,
+  datetime_alt: overrides?.datetime_alt ?? null,
+  datetime_del: overrides?.datetime_del ?? null,
+  holder_name: overrides?.holder_name || faker.person.fullName(),
+  pix: overrides?.pix ?? null,
+  holder_document: overrides?.holder_document ?? null,
+  bank: overrides?.bank ?? null,
+  agency: overrides?.agency ?? null,
+  account: overrides?.account ?? null,
+}));

package/src/testing/factories/index.ts

@@ -8,3 +8,5 @@ export { createPlanMock, createPlanItemMock } from './plan.factory';
 export { createProjectMock } from './project.factory';
 export { createProjectUserMock } from './project-user.factory';
 export { createCouponMock } from './coupon.factory';
+export { createAffiliateMock } from './affiliate.factory';
+export { createWithdrawalLimitsMock } from './withdrawal-limits.factory';

package/src/testing/factories/withdrawal-limits.factory.ts

@@ -0,0 +1,16 @@
+import type { WithdrawalLimits } from '../../modules/affiliates/types/affiliate.type';
+import { createMock } from './create-mock';
+
+export const createWithdrawalLimitsMock = createMock<WithdrawalLimits, Partial<WithdrawalLimits>>((overrides) => ({
+  personType: overrides?.personType ?? 'cpf',
+  financialDocumentType: overrides?.financialDocumentType ?? 1,
+  requiresInvoice: overrides?.requiresInvoice ?? false,
+  minValue: overrides?.minValue ?? 25,
+  maxValuePerMonth: overrides?.maxValuePerMonth ?? 350,
+  monthlyUsed: overrides?.monthlyUsed ?? 0,
+  monthlyRemaining: overrides?.monthlyRemaining ?? 350,
+  balance: overrides?.balance ?? 500,
+  availableToWithdraw: overrides?.availableToWithdraw ?? 350,
+  canWithdraw: overrides?.canWithdraw ?? true,
+  blockReason: overrides?.blockReason ?? null,
+}));

package/src/utils/format/masks.ts

@@ -92,8 +92,12 @@ function formatIfCpfCnpjShaped(value: string): string {
 /** Documento do titular: CPF/CNPJ mascarado; qualquer outro conteúdo volta intacto. */
 export const formatDocument = formatIfCpfCnpjShaped;
 
-/** Chave PIX: só mascara quando a chave é o próprio CPF/CNPJ; e-mail, telefone e aleatória saem como estão. */
-export const formatPixKey = formatIfCpfCnpjShaped;
+export function formatPixKey(value: string): string {
+  if (/^\+55\d{11}$/.test(value)) return `+55 ${formatPhone(value.slice(3))}`;
+  if (/^\d{11}$/.test(value)) return formatCPF(value);
+  if (/^\d{14}$/.test(value)) return formatCNPJ(value);
+  return value;
+}
 
 /** Tira a máscara antes de gravar; valor que não é CPF/CNPJ volta como veio. */
 export function normalizeCpfCnpjForStorage(value: string): string {

package/src/utils/validators/pix-key.ts

@@ -0,0 +1,29 @@
+import { isValidCNPJ, isValidCPF, isValidEmail } from './common';
+
+const RANDOM_KEY = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+const PIX_KEY_CHARS = /^[\d ().\/+-]+$/;
+const MOBILE_WITH_COUNTRY_CODE = /^55[1-9]{2}9\d{8}$/;
+const MOBILE = /^[1-9]{2}9\d{8}$/;
+
+export const AMBIGUOUS_PIX_KEY = Symbol('ambiguous-pix-key');
+
+export function normalizePixKeyForStorage(value: string, holderDocument: string): string | typeof AMBIGUOUS_PIX_KEY | null {
+  const key = value.trim();
+  if (isValidEmail(key) || RANDOM_KEY.test(key)) return key;
+  if (!PIX_KEY_CHARS.test(key)) return null;
+  const digits = key.replace(/\D/g, '');
+  if (key.startsWith('+')) return MOBILE_WITH_COUNTRY_CODE.test(digits) ? `+${digits}` : null;
+  if (digits.length === 14) return isValidCNPJ(digits) ? digits : null;
+  if (digits.length === 13) return MOBILE_WITH_COUNTRY_CODE.test(digits) ? `+${digits}` : null;
+  if (digits.length !== 11) return null;
+  if (digits === holderDocument.replace(/\D/g, '')) return digits;
+  const isMobile = MOBILE.test(digits);
+  const isCpf = isValidCPF(digits);
+  if (isMobile && isCpf) return AMBIGUOUS_PIX_KEY;
+  if (isMobile) return `+55${digits}`;
+  return isCpf ? digits : null;
+}
+
+export function isPixKeyFromAnotherDocument(canonicalPixKey: string, holderDocument: string): boolean {
+  return /^\d+$/.test(canonicalPixKey) && canonicalPixKey !== holderDocument.replace(/\D/g, '');
+}