From a9136284bf0c139a68c4bcca4849af06194f6842 Mon Sep 17 00:00:00 2001 From: "dev.daminik00" Date: Fri, 3 Oct 2025 04:36:42 +0200 Subject: [PATCH] remove renewal when cancelled --- .../SubscriptionTable/SubscriptionTable.tsx | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/components/domains/profile/subscriptions/SubscriptionTable/SubscriptionTable.tsx b/src/components/domains/profile/subscriptions/SubscriptionTable/SubscriptionTable.tsx index a45d09a..1876aa8 100644 --- a/src/components/domains/profile/subscriptions/SubscriptionTable/SubscriptionTable.tsx +++ b/src/components/domains/profile/subscriptions/SubscriptionTable/SubscriptionTable.tsx @@ -57,16 +57,22 @@ export default function SubscriptionTable({ subscription }: ITableProps) { t(`table.billing_period_value.${subscription.billingPeriod}`), ], [t("table.last_payment_on"), formatDate(subscription.lastPaymentOn)], - [t("table.renewal_date"), formatDate(subscription.renewalDate)], - [ - t("table.renewal_amount"), - getFormattedPrice( - subscription.renewalAmount, - Currency[subscription.currency] - ), - ], ]; + // Don't show renewal data for cancelled subscriptions + if (subscription.subscriptionStatus !== "CANCELLED") { + data.push( + [t("table.renewal_date"), formatDate(subscription.renewalDate)], + [ + t("table.renewal_amount"), + getFormattedPrice( + subscription.renewalAmount, + Currency[subscription.currency] + ), + ] + ); + } + const isActiveStatus = subscription.subscriptionStatus === "ACTIVE" || subscription.subscriptionStatus === "PAST_DUE";