@greatapps/common 1.1.685 → 1.1.686

package/dist/components/navigation/SubscriptionBanner.mjs

@@ -35,7 +35,7 @@ function SubscriptionBanner({
   const expiryDate = getSubscriptionExpiryDate(subscription);
   const cancellationState = getSubscriptionCancellationState(subscription);
   if (subscription.type === "trial") {
-    if (cancellationState !== "none" || daysToDue < 0) return null;
+    if (!subscription.active || daysToDue < 0) return null;
     return /* @__PURE__ */ jsx(TrialBanner, { daysRemaining: daysToDue, onReactivate });
   }
   if (cancellationState === "cancelled") {

package/dist/components/navigation/SubscriptionBanner.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/navigation/SubscriptionBanner.tsx"],"sourcesContent":["\"use client\";\n\nimport { useActiveSubscription } from \"../../modules/subscriptions/hooks/find-active-subscription.hook\";\nimport { useCharges } from \"../../modules/charges/hooks/charges.hook\";\nimport { SUBSCRIPTION_GRACE_PERIOD_DAYS } from \"../../modules/subscriptions/constants/subscription.constants\";\nimport { getSubscriptionExpiryDate } from \"../../modules/subscriptions/utils/get-subscription-expiry-date\";\nimport { getSubscriptionCancellationState } from \"../../modules/subscriptions/utils/get-subscription-cancellation-state\";\nimport { toCalendarDate, daysBetween } from \"../../infra/utils/date\";\nimport { OverdueInvoiceBanner } from \"./OverdueInvoiceBanner\";\nimport { UpcomingInvoiceBanner } from \"./UpcomingInvoiceBanner\";\nimport { CancelledSubscriptionBanner } from \"./CancelledSubscriptionBanner\";\nimport { PendingCancellationBanner } from \"./PendingCancellationBanner\";\nimport { TrialBanner } from \"./TrialBanner\";\n\nconst UPCOMING_WINDOW_DAYS = 7;\nconst PAYMENT_METHOD_BOLETO = 2;\n\ninterface SubscriptionBannerProps {\n  onReactivate?: () => void;\n  onDetails?: () => void;\n}\n\nexport function SubscriptionBanner({\n  onReactivate,\n  onDetails,\n}: SubscriptionBannerProps) {\n  const { data: { data: [subscription] = [] } = {} } = useActiveSubscription();\n  const { data: pendingChargesData, isLoading: isLoadingCharges } = useCharges({\n    page: 1,\n    limit: 1,\n    status: [0],\n  });\n\n  if (!subscription?.date_due) return null;\n  if (subscription.type === \"free\") return null;\n\n  const dueDate = toCalendarDate(subscription.date_due);\n  const today = toCalendarDate(new Date());\n  if (!dueDate || !today) return null;\n\n  const daysSinceDue = daysBetween(dueDate, today);\n  const daysToDue = daysBetween(today, dueDate);\n  const hasPendingCharge = !!pendingChargesData?.data?.[0];\n  const isBoleto = subscription.payment_method === PAYMENT_METHOD_BOLETO;\n\n  // Estado de cancelamento (fonte da verdade única, compartilhada com o\n  // CancelledSubscriptionBanner). `active === false` tem prioridade e cai em\n  // \"cancelled\" mesmo com date_due no futuro — é o caso da baixa por falha de\n  // pagamento, onde date_due aponta pra uma fatura não paga.\n  const expiryDate = getSubscriptionExpiryDate(subscription);\n  const cancellationState = getSubscriptionCancellationState(subscription);\n\n  // Trial: `date_due` guarda o fim do período de teste (ver auth.service).\n  // Só mostra a contagem regressiva enquanto o teste está vigente — não vencido\n  // (`daysToDue >= 0`) e não cancelado/baixado (`cancellationState === \"none\"`).\n  if (subscription.type === \"trial\") {\n    if (cancellationState !== \"none\" || daysToDue < 0) return null;\n    return <TrialBanner daysRemaining={daysToDue} onReactivate={onReactivate} />;\n  }\n\n  if (cancellationState === \"cancelled\") {\n    return <CancelledSubscriptionBanner onReactivate={onReactivate} />;\n  }\n\n  if (cancellationState === \"pending\") {\n    return (\n      <PendingCancellationBanner\n        limitDate={expiryDate}\n        onReactivate={onReactivate}\n      />\n    );\n  }\n\n  if (subscription.type === \"whitelabel\") return null;\n\n  if (daysSinceDue > 0 && daysSinceDue <= SUBSCRIPTION_GRACE_PERIOD_DAYS) {\n    return <OverdueInvoiceBanner onDetails={onDetails} />;\n  }\n\n  if (\n    isBoleto &&\n    !isLoadingCharges &&\n    hasPendingCharge &&\n    daysToDue >= 0 &&\n    daysToDue <= UPCOMING_WINDOW_DAYS\n  ) {\n    return <UpcomingInvoiceBanner dueDate={dueDate} onDetails={onDetails} />;\n  }\n\n  return null;\n}\n"],"mappings":";AAyDW;AAvDX,SAAS,6BAA6B;AACtC,SAAS,kBAAkB;AAC3B,SAAS,sCAAsC;AAC/C,SAAS,iCAAiC;AAC1C,SAAS,wCAAwC;AACjD,SAAS,gBAAgB,mBAAmB;AAC5C,SAAS,4BAA4B;AACrC,SAAS,6BAA6B;AACtC,SAAS,mCAAmC;AAC5C,SAAS,iCAAiC;AAC1C,SAAS,mBAAmB;AAE5B,MAAM,uBAAuB;AAC7B,MAAM,wBAAwB;AAOvB,SAAS,mBAAmB;AAAA,EACjC;AAAA,EACA;AACF,GAA4B;AAC1B,QAAM,EAAE,MAAM,EAAE,MAAM,CAAC,YAAY,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,IAAI,sBAAsB;AAC3E,QAAM,EAAE,MAAM,oBAAoB,WAAW,iBAAiB,IAAI,WAAW;AAAA,IAC3E,MAAM;AAAA,IACN,OAAO;AAAA,IACP,QAAQ,CAAC,CAAC;AAAA,EACZ,CAAC;AAED,MAAI,CAAC,cAAc,SAAU,QAAO;AACpC,MAAI,aAAa,SAAS,OAAQ,QAAO;AAEzC,QAAM,UAAU,eAAe,aAAa,QAAQ;AACpD,QAAM,QAAQ,eAAe,oBAAI,KAAK,CAAC;AACvC,MAAI,CAAC,WAAW,CAAC,MAAO,QAAO;AAE/B,QAAM,eAAe,YAAY,SAAS,KAAK;AAC/C,QAAM,YAAY,YAAY,OAAO,OAAO;AAC5C,QAAM,mBAAmB,CAAC,CAAC,oBAAoB,OAAO,CAAC;AACvD,QAAM,WAAW,aAAa,mBAAmB;AAMjD,QAAM,aAAa,0BAA0B,YAAY;AACzD,QAAM,oBAAoB,iCAAiC,YAAY;AAKvE,MAAI,aAAa,SAAS,SAAS;AACjC,QAAI,sBAAsB,UAAU,YAAY,EAAG,QAAO;AAC1D,WAAO,oBAAC,eAAY,eAAe,WAAW,cAA4B;AAAA,EAC5E;AAEA,MAAI,sBAAsB,aAAa;AACrC,WAAO,oBAAC,+BAA4B,cAA4B;AAAA,EAClE;AAEA,MAAI,sBAAsB,WAAW;AACnC,WACE;AAAA,MAAC;AAAA;AAAA,QACC,WAAW;AAAA,QACX;AAAA;AAAA,IACF;AAAA,EAEJ;AAEA,MAAI,aAAa,SAAS,aAAc,QAAO;AAE/C,MAAI,eAAe,KAAK,gBAAgB,gCAAgC;AACtE,WAAO,oBAAC,wBAAqB,WAAsB;AAAA,EACrD;AAEA,MACE,YACA,CAAC,oBACD,oBACA,aAAa,KACb,aAAa,sBACb;AACA,WAAO,oBAAC,yBAAsB,SAAkB,WAAsB;AAAA,EACxE;AAEA,SAAO;AACT;","names":[]}
+{"version":3,"sources":["../../../src/components/navigation/SubscriptionBanner.tsx"],"sourcesContent":["\"use client\";\n\nimport { useActiveSubscription } from \"../../modules/subscriptions/hooks/find-active-subscription.hook\";\nimport { useCharges } from \"../../modules/charges/hooks/charges.hook\";\nimport { SUBSCRIPTION_GRACE_PERIOD_DAYS } from \"../../modules/subscriptions/constants/subscription.constants\";\nimport { getSubscriptionExpiryDate } from \"../../modules/subscriptions/utils/get-subscription-expiry-date\";\nimport { getSubscriptionCancellationState } from \"../../modules/subscriptions/utils/get-subscription-cancellation-state\";\nimport { toCalendarDate, daysBetween } from \"../../infra/utils/date\";\nimport { OverdueInvoiceBanner } from \"./OverdueInvoiceBanner\";\nimport { UpcomingInvoiceBanner } from \"./UpcomingInvoiceBanner\";\nimport { CancelledSubscriptionBanner } from \"./CancelledSubscriptionBanner\";\nimport { PendingCancellationBanner } from \"./PendingCancellationBanner\";\nimport { TrialBanner } from \"./TrialBanner\";\n\nconst UPCOMING_WINDOW_DAYS = 7;\nconst PAYMENT_METHOD_BOLETO = 2;\n\ninterface SubscriptionBannerProps {\n  onReactivate?: () => void;\n  onDetails?: () => void;\n}\n\nexport function SubscriptionBanner({\n  onReactivate,\n  onDetails,\n}: SubscriptionBannerProps) {\n  const { data: { data: [subscription] = [] } = {} } = useActiveSubscription();\n  const { data: pendingChargesData, isLoading: isLoadingCharges } = useCharges({\n    page: 1,\n    limit: 1,\n    status: [0],\n  });\n\n  if (!subscription?.date_due) return null;\n  if (subscription.type === \"free\") return null;\n\n  const dueDate = toCalendarDate(subscription.date_due);\n  const today = toCalendarDate(new Date());\n  if (!dueDate || !today) return null;\n\n  const daysSinceDue = daysBetween(dueDate, today);\n  const daysToDue = daysBetween(today, dueDate);\n  const hasPendingCharge = !!pendingChargesData?.data?.[0];\n  const isBoleto = subscription.payment_method === PAYMENT_METHOD_BOLETO;\n\n  // Estado de cancelamento (fonte da verdade única, compartilhada com o\n  // CancelledSubscriptionBanner). `active === false` tem prioridade e cai em\n  // \"cancelled\" mesmo com date_due no futuro — é o caso da baixa por falha de\n  // pagamento, onde date_due aponta pra uma fatura não paga.\n  const expiryDate = getSubscriptionExpiryDate(subscription);\n  const cancellationState = getSubscriptionCancellationState(subscription);\n\n  // Trial: `date_due` guarda o fim do período de teste (ver auth.service).\n  // Mostra a contagem regressiva enquanto o teste está vigente: `active` e não\n  // vencido (`daysToDue >= 0`). NÃO usar `cancellationState` aqui — num trial o\n  // `date_cancellation` é o agendamento padrão de não-renovação (o Stripe seta\n  // = `date_due`), então cairia sempre em \"pending\" e o banner nunca apareceria.\n  // Um trial encerrado de verdade vem com `active === false` (date_due placeholder).\n  if (subscription.type === \"trial\") {\n    if (!subscription.active || daysToDue < 0) return null;\n    return <TrialBanner daysRemaining={daysToDue} onReactivate={onReactivate} />;\n  }\n\n  if (cancellationState === \"cancelled\") {\n    return <CancelledSubscriptionBanner onReactivate={onReactivate} />;\n  }\n\n  if (cancellationState === \"pending\") {\n    return (\n      <PendingCancellationBanner\n        limitDate={expiryDate}\n        onReactivate={onReactivate}\n      />\n    );\n  }\n\n  if (subscription.type === \"whitelabel\") return null;\n\n  if (daysSinceDue > 0 && daysSinceDue <= SUBSCRIPTION_GRACE_PERIOD_DAYS) {\n    return <OverdueInvoiceBanner onDetails={onDetails} />;\n  }\n\n  if (\n    isBoleto &&\n    !isLoadingCharges &&\n    hasPendingCharge &&\n    daysToDue >= 0 &&\n    daysToDue <= UPCOMING_WINDOW_DAYS\n  ) {\n    return <UpcomingInvoiceBanner dueDate={dueDate} onDetails={onDetails} />;\n  }\n\n  return null;\n}\n"],"mappings":";AA4DW;AA1DX,SAAS,6BAA6B;AACtC,SAAS,kBAAkB;AAC3B,SAAS,sCAAsC;AAC/C,SAAS,iCAAiC;AAC1C,SAAS,wCAAwC;AACjD,SAAS,gBAAgB,mBAAmB;AAC5C,SAAS,4BAA4B;AACrC,SAAS,6BAA6B;AACtC,SAAS,mCAAmC;AAC5C,SAAS,iCAAiC;AAC1C,SAAS,mBAAmB;AAE5B,MAAM,uBAAuB;AAC7B,MAAM,wBAAwB;AAOvB,SAAS,mBAAmB;AAAA,EACjC;AAAA,EACA;AACF,GAA4B;AAC1B,QAAM,EAAE,MAAM,EAAE,MAAM,CAAC,YAAY,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,IAAI,sBAAsB;AAC3E,QAAM,EAAE,MAAM,oBAAoB,WAAW,iBAAiB,IAAI,WAAW;AAAA,IAC3E,MAAM;AAAA,IACN,OAAO;AAAA,IACP,QAAQ,CAAC,CAAC;AAAA,EACZ,CAAC;AAED,MAAI,CAAC,cAAc,SAAU,QAAO;AACpC,MAAI,aAAa,SAAS,OAAQ,QAAO;AAEzC,QAAM,UAAU,eAAe,aAAa,QAAQ;AACpD,QAAM,QAAQ,eAAe,oBAAI,KAAK,CAAC;AACvC,MAAI,CAAC,WAAW,CAAC,MAAO,QAAO;AAE/B,QAAM,eAAe,YAAY,SAAS,KAAK;AAC/C,QAAM,YAAY,YAAY,OAAO,OAAO;AAC5C,QAAM,mBAAmB,CAAC,CAAC,oBAAoB,OAAO,CAAC;AACvD,QAAM,WAAW,aAAa,mBAAmB;AAMjD,QAAM,aAAa,0BAA0B,YAAY;AACzD,QAAM,oBAAoB,iCAAiC,YAAY;AAQvE,MAAI,aAAa,SAAS,SAAS;AACjC,QAAI,CAAC,aAAa,UAAU,YAAY,EAAG,QAAO;AAClD,WAAO,oBAAC,eAAY,eAAe,WAAW,cAA4B;AAAA,EAC5E;AAEA,MAAI,sBAAsB,aAAa;AACrC,WAAO,oBAAC,+BAA4B,cAA4B;AAAA,EAClE;AAEA,MAAI,sBAAsB,WAAW;AACnC,WACE;AAAA,MAAC;AAAA;AAAA,QACC,WAAW;AAAA,QACX;AAAA;AAAA,IACF;AAAA,EAEJ;AAEA,MAAI,aAAa,SAAS,aAAc,QAAO;AAE/C,MAAI,eAAe,KAAK,gBAAgB,gCAAgC;AACtE,WAAO,oBAAC,wBAAqB,WAAsB;AAAA,EACrD;AAEA,MACE,YACA,CAAC,oBACD,oBACA,aAAa,KACb,aAAa,sBACb;AACA,WAAO,oBAAC,yBAAsB,SAAkB,WAAsB;AAAA,EACxE;AAEA,SAAO;AACT;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@greatapps/common",
-  "version": "1.1.685",
+  "version": "1.1.686",
   "description": "Shared library for GreatApps frontend applications",
   "main": "./dist/index.mjs",
   "types": "./src/index.ts",

package/src/components/navigation/SubscriptionBanner.tsx

@@ -51,10 +51,13 @@ export function SubscriptionBanner({
   const cancellationState = getSubscriptionCancellationState(subscription);
 
   // Trial: `date_due` guarda o fim do período de teste (ver auth.service).
-  // Só mostra a contagem regressiva enquanto o teste está vigente — não vencido
-  // (`daysToDue >= 0`) e não cancelado/baixado (`cancellationState === "none"`).
+  // Mostra a contagem regressiva enquanto o teste está vigente: `active` e não
+  // vencido (`daysToDue >= 0`). NÃO usar `cancellationState` aqui — num trial o
+  // `date_cancellation` é o agendamento padrão de não-renovação (o Stripe seta
+  // = `date_due`), então cairia sempre em "pending" e o banner nunca apareceria.
+  // Um trial encerrado de verdade vem com `active === false` (date_due placeholder).
   if (subscription.type === "trial") {
-    if (cancellationState !== "none" || daysToDue < 0) return null;
+    if (!subscription.active || daysToDue < 0) return null;
     return <TrialBanner daysRemaining={daysToDue} onReactivate={onReactivate} />;
   }