@greatapps/common 1.1.805 → 1.1.807

package/src/components/account/sections/subscription/PixDetailsDialog.tsx

@@ -12,7 +12,7 @@ import { useCurrencyFormatter } from '../../../../modules/accounts/hooks/use-cur
 import { useRefreshChargePix } from '../../../../modules/charges/hooks/refresh-pix.hook';
 import type { Charge } from '../../../../modules/charges/types/charge.type';
 import type { PixRefreshData } from '../../../../modules/charges/types/refresh-pix.type';
-import useCountdownTimer from '../../../../hooks/useCountdownTimer';
+import useSecondsUntil from '../../../../hooks/useSecondsUntil';
 import { copyToClipboard } from '../../../../utils/browser/clipboard';
 import { qrCodeToDataUrl } from '../../../../utils/qrcode/to-data-url';
 
@@ -82,12 +82,7 @@ export function PixDetailsDialog({ open, charge, onOpenChange }: PixDetailsDialo
   const isRefreshing = needsRefresh && refreshPix.isPending;
   const refreshNotice = refreshPix.data && !refreshPix.data.pix ? refreshPix.data.message : null;
 
-  const expiresInSeconds =
-    expiresAtRaw && mountedAt
-      ? Math.max(0, Math.floor((new Date(expiresAtRaw).getTime() - mountedAt) / 1000))
-      : null;
-  const shouldShowCountdown = typeof expiresInSeconds === 'number' && expiresInSeconds > 0;
-  const { seconds } = useCountdownTimer({ initialSeconds: shouldShowCountdown ? expiresInSeconds : 1 });
+  const secondsUntilExpiry = useSecondsUntil(expiresAtRaw);
 
   useEffect(() => {
     if (!qrCode) {
@@ -185,9 +180,9 @@ export function PixDetailsDialog({ open, charge, onOpenChange }: PixDetailsDialo
           </div>
 
           <div className="flex flex-col gap-6 p-5 border border-zinc-200 rounded-lg bg-white items-center">
-            {shouldShowCountdown && (
+            {!!secondsUntilExpiry && (
               <p className="paragraph-small-semibold text-zinc-950 text-center">
-                {translate('payIn')} <span className="text-red-600">{formatCountdown(seconds)}</span>
+                {translate('payIn')} <span className="text-red-600">{formatCountdown(secondsUntilExpiry)}</span>
               </p>
             )}
 

package/src/components/account/sections/subscription/PixPaymentDialog.tsx

@@ -10,7 +10,7 @@ import { Toast } from '../../../ui/feedback/Toast';
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from '../../../ui/overlay/Dialog';
 import { useCurrencyFormatter } from '../../../../modules/accounts/hooks/use-currency-formatter.hook';
 import { usePendingPixStatus } from '../../../../modules/subscriptions/hooks/pending-pix-status.hook';
-import useCountdownTimer from '../../../../hooks/useCountdownTimer';
+import useSecondsUntil from '../../../../hooks/useSecondsUntil';
 import { copyToClipboard } from '../../../../utils/browser/clipboard';
 import { qrCodeToDataUrl } from '../../../../utils/qrcode/to-data-url';
 import { useSubscriptionFlows } from '../../../../store/useSubscriptionFlows';
@@ -39,20 +39,11 @@ export function PixPaymentDialog() {
   const close = useSubscriptionFlows((state) => state.closePixPayment);
   const openPlansCatalog = useSubscriptionFlows((state) => state.openPlansCatalog);
 
-  const [mountedAt, setMountedAt] = useState<number | null>(null);
   const [generatedQrImage, setGeneratedQrImage] = useState<string | null>(null);
 
   const { data: statusData } = usePendingPixStatus(pixPayment?.correlationId);
   const phase = statusData?.data?.phase;
 
-  useEffect(() => {
-    if (!pixPayment) {
-      setMountedAt(null);
-      return;
-    }
-    setMountedAt(Date.now());
-  }, [pixPayment]);
-
   useEffect(() => {
     const qrCode = pixPayment?.qrCode;
     if (!qrCode) {
@@ -79,19 +70,22 @@ export function PixPaymentDialog() {
     };
   }, [pixPayment?.qrCode]);
 
-  const isPaid = phase === 'completed';
+  const isCompleted = phase === 'completed';
+  const isAuthorizedOnly = statusData?.data?.payment_collected === false;
+  const completedTitle = isAuthorizedOnly ? translate('authorizedTitle') : translate('paidTitle');
+  const completedMessage = isAuthorizedOnly ? translate('authorizedMessage') : translate('paidToast');
   const isRejected = phase === 'rejected';
   const isExpired = phase === 'expired';
 
   // Pago avisa uma vez; a janela fica com a confirmação na tela, como a página do gapps fazia.
   const paidNotifiedRef = useRef(false);
   useEffect(() => {
-    if (!isPaid || paidNotifiedRef.current) return;
+    if (!isCompleted || paidNotifiedRef.current) return;
     paidNotifiedRef.current = true;
     toast.custom((toastId) => (
-      <Toast variant="success" message={translate('paidToast')} toastId={toastId} />
+      <Toast variant="success" message={completedMessage} toastId={toastId} />
     ));
-  }, [isPaid, translate]);
+  }, [isCompleted, completedMessage]);
 
   useEffect(() => {
     if (!pixPayment) paidNotifiedRef.current = false;
@@ -102,12 +96,7 @@ export function PixPaymentDialog() {
     openPlansCatalog();
   };
 
-  const expiresInSeconds =
-    pixPayment?.expiresAt && mountedAt
-      ? Math.max(0, Math.floor((new Date(pixPayment.expiresAt).getTime() - mountedAt) / 1000))
-      : null;
-  const shouldShowCountdown = typeof expiresInSeconds === 'number' && expiresInSeconds > 0;
-  const { seconds } = useCountdownTimer({ initialSeconds: shouldShowCountdown ? expiresInSeconds : 1 });
+  const secondsUntilExpiry = useSecondsUntil(pixPayment?.expiresAt);
 
   const handleCopyCode = async () => {
     if (!pixPayment?.qrCode) return;
@@ -141,15 +130,15 @@ export function PixPaymentDialog() {
 
         {/* Fechado o ciclo (pago, recusado ou expirado), o QR perde a função: a janela vira o
             desfecho, como a página de pix do gapps. */}
-        {isPaid || isRejected || isExpired ? (
+        {isCompleted || isRejected || isExpired ? (
           <div className="flex flex-col items-center justify-center gap-4 p-8 text-center">
             <div
               className={cn(
                 'size-12 rounded-full flex items-center justify-center',
-                isPaid ? 'bg-green-50' : 'bg-red-50'
+                isCompleted ? 'bg-green-50' : 'bg-red-50'
               )}
             >
-              {isPaid ? (
+              {isCompleted ? (
                 <IconCircleCheck size={24} className="text-green-500" />
               ) : (
                 <IconAlertTriangle size={24} className="text-red-500" />
@@ -158,18 +147,18 @@ export function PixPaymentDialog() {
 
             <div className="flex flex-col gap-1">
               <span className="paragraph-xlarge-semibold text-zinc-950">
-                {isPaid
-                  ? translate('paidTitle')
+                {isCompleted
+                  ? completedTitle
                   : isRejected
                     ? translate('rejectedTitle')
                     : translate('expiredTitle')}
               </span>
               <span className="paragraph-small-regular text-zinc-500">
-                {isPaid ? translate('paidToast') : translate('rejectedOrExpiredDescription')}
+                {isCompleted ? completedMessage : translate('rejectedOrExpiredDescription')}
               </span>
             </div>
 
-            {isPaid ? (
+            {isCompleted ? (
               <Button variant="secondary" className="h-10" onClick={close}>
                 {translateActions('common.actions.close')}
               </Button>
@@ -189,9 +178,9 @@ export function PixPaymentDialog() {
           )}
 
           <div className="flex flex-col gap-6 p-5 border border-zinc-200 rounded-lg bg-white items-center">
-            {shouldShowCountdown && (
+            {!!secondsUntilExpiry && (
               <p className="paragraph-small-semibold text-zinc-950 text-center">
-                {translate('payIn')} <span className="text-red-600">{formatCountdown(seconds)}</span>
+                {translate('payIn')} <span className="text-red-600">{formatCountdown(secondsUntilExpiry)}</span>
               </p>
             )}
 

package/src/hooks/useSecondsUntil.ts

@@ -0,0 +1,17 @@
+'use client';
+
+import { useEffect, useState } from 'react';
+
+export default function useSecondsUntil(deadline: string | null | undefined): number | null {
+  const [now, setNow] = useState<number | null>(null);
+
+  useEffect(() => {
+    if (!deadline) return;
+    setNow(Date.now());
+    const interval = setInterval(() => setNow(Date.now()), 1000);
+    return () => clearInterval(interval);
+  }, [deadline]);
+
+  if (!deadline || now === null) return null;
+  return Math.max(0, Math.floor((new Date(deadline).getTime() - now) / 1000));
+}

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

@@ -558,6 +558,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.',
         },
@@ -1092,6 +1098,8 @@ const messages = {
           paidToast: 'Payment processed successfully.',
           waitingPayment: 'Waiting for payment confirmation...',
           paidTitle: 'PIX paid',
+          authorizedTitle: 'Automatic PIX authorized',
+          authorizedMessage: 'The charge will be made automatically on the due date.',
           rejectedTitle: 'PIX rejected',
           expiredTitle: 'PIX code expired',
           rejectedOrExpiredDescription: 'Click below to generate a new PIX code',

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

@@ -561,6 +561,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.',
         },
@@ -1098,6 +1104,8 @@ const messages = {
           paidToast: 'Pago realizado exitosamente.',
           waitingPayment: 'Esperando la confirmación del pago...',
           paidTitle: 'PIX pagado',
+          authorizedTitle: 'PIX automático autorizado',
+          authorizedMessage: 'El cobro se realizará automáticamente en la fecha de vencimiento.',
           rejectedTitle: 'PIX rechazado',
           expiredTitle: 'Código PIX expirado',
           rejectedOrExpiredDescription: 'Haz clic abajo para generar un nuevo código PIX',

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

@@ -569,6 +569,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.',
         },
@@ -1105,6 +1111,8 @@ const messages = {
           paidToast: 'Pagamento efetuado com sucesso.',
           waitingPayment: 'Aguardando a confirmação do pagamento...',
           paidTitle: 'PIX pago',
+          authorizedTitle: 'PIX automático autorizado',
+          authorizedMessage: 'A cobrança será feita automaticamente na data de vencimento.',
           rejectedTitle: 'Pix recusado',
           expiredTitle: 'Código PIX expirado',
           rejectedOrExpiredDescription: 'Clique abaixo para gerar um novo código PIX',

package/src/index.ts

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

package/src/modules/subscriptions/types/pending-pix-status.type.ts

@@ -16,6 +16,7 @@ export const PendingPixStatusDataSchema = z
     payment_method: z.number().nullable().optional(),
     subscription_id: z.union([z.number(), z.string()]).optional(),
     completed_at: z.string().nullable().optional(),
+    payment_collected: z.boolean().optional(),
     pix: z
       .object({
         qr_code: z.string().nullable().optional(),

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,4 @@ 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';

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,25 @@
+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;
+}