diff --git a/src/components/dashboard/SubscriptionCardExpired.tsx b/src/components/dashboard/SubscriptionCardExpired.tsx index 499ab92..361e727 100644 --- a/src/components/dashboard/SubscriptionCardExpired.tsx +++ b/src/components/dashboard/SubscriptionCardExpired.tsx @@ -228,7 +228,7 @@ export default function SubscriptionCardExpired({ >
- {t('dashboard.expired.expiredDate')} + {isLimited ? t('dashboard.expired.activeUntil') : t('dashboard.expired.expiredDate')}
{formattedDate} @@ -280,7 +280,7 @@ export default function SubscriptionCardExpired({ > - {t('subscription.trafficLimited')} + {t('subscription.buyTraffic')} ) : ( <> diff --git a/src/components/subscription/PurchaseCTAButton.tsx b/src/components/subscription/PurchaseCTAButton.tsx index 1fa7b0f..a4c816a 100644 --- a/src/components/subscription/PurchaseCTAButton.tsx +++ b/src/components/subscription/PurchaseCTAButton.tsx @@ -15,7 +15,9 @@ export default function PurchaseCTAButton({ }: PurchaseCTAButtonProps) { const { t } = useTranslation(); - const isExpired = !subscription || (!subscription.is_active && !subscription.is_trial); + const isExpired = + !subscription || + (!subscription.is_active && !subscription.is_trial && !subscription.is_limited); const isTrial = subscription?.is_trial; const isDaily = subscription?.is_daily; diff --git a/src/locales/en.json b/src/locales/en.json index 9ccd9d8..4038228 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -272,7 +272,8 @@ "tariffs": "Tariffs", "traffic": "Traffic", "devices": "Devices", - "expiredDate": "Expired" + "expiredDate": "Expired", + "activeUntil": "Active until" }, "suspended": { "title": "Subscription Suspended", diff --git a/src/locales/ru.json b/src/locales/ru.json index 00f19e4..21dd916 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -284,7 +284,8 @@ "tariffs": "Тарифы", "traffic": "Трафик", "devices": "Устройства", - "expiredDate": "Истекла" + "expiredDate": "Истекла", + "activeUntil": "Активна до" }, "suspended": { "title": "Подписка приостановлена", diff --git a/src/pages/Subscription.tsx b/src/pages/Subscription.tsx index 2be268d..5e2c5f3 100644 --- a/src/pages/Subscription.tsx +++ b/src/pages/Subscription.tsx @@ -957,7 +957,7 @@ export default function Subscription() {