Merge pull request #60 from pennyteenycat/develop

remove renewal when cancelled

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";