From e0f3fc478babe19ff30f221d11a26e8ffc434aee Mon Sep 17 00:00:00 2001 From: Hugo Costa Date: Wed, 22 Nov 2023 15:25:43 -0300 Subject: [PATCH] regression: remove unlimited mac info (#31044) --- .../admin/subscription/SubscriptionPage.tsx | 7 +------ .../subscription/components/cards/PlanCard.tsx | 1 - .../cards/PlanCard/PlanCardPremium.tsx | 18 ++++++------------ .../packages/rocketchat-i18n/i18n/en.i18n.json | 4 +--- 4 files changed, 8 insertions(+), 22 deletions(-) diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx index 101565ce63d..d0dd1ec0be4 100644 --- a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx +++ b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx @@ -115,12 +115,7 @@ const SubscriptionPage = () => { )} - {license && ( - - )} + {license && } {!license && } diff --git a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard.tsx b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard.tsx index e9b026e5749..c9e1e06ff8c 100644 --- a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard.tsx +++ b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard.tsx @@ -7,7 +7,6 @@ import PlanCardTrial from './PlanCard/PlanCardTrial'; type LicenseLimits = { activeUsers: { max: number; value?: number }; - monthlyActiveContacts: { max: number; value?: number }; }; type PlanCardProps = { diff --git a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx index d829cd4affc..cd7227bda09 100644 --- a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx +++ b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx @@ -13,7 +13,6 @@ import PlanCardBase from './PlanCardBase'; type LicenseLimits = { activeUsers: { max: number; value?: number }; - monthlyActiveContacts: { max: number; value?: number }; }; type PlanCardProps = { @@ -33,17 +32,12 @@ const PlanCardPremium = ({ licenseInformation, licenseLimits }: PlanCardProps): return ( - {licenseLimits?.activeUsers.max === Infinity || - (licenseLimits?.monthlyActiveContacts.max === Infinity && ( - - - {licenseLimits?.activeUsers.max === Infinity && - licenseLimits?.monthlyActiveContacts.max === Infinity && - t('Unlimited_seats_MACs')} - {licenseLimits?.activeUsers.max === Infinity && licenseLimits?.monthlyActiveContacts.max !== Infinity && t('Unlimited_seats')} - {licenseLimits?.activeUsers.max !== Infinity && licenseLimits?.monthlyActiveContacts.max === Infinity && t('Unlimited_MACs')} - - ))} + {licenseLimits?.activeUsers.max === Infinity && ( + + + {t('Unlimited_seats')} + + )} {visualExpiration && ( diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json index aeee244efea..e2fc7b07805 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json @@ -6189,7 +6189,5 @@ "Sync_license_update_Callout": "If you don't notice any changes in your workspace within a few minutes, sync the license update.", "Includes": "Includes", "Unlock_premium_capabilities": "Unlock premium capabilities", - "Unlimited_seats": "Unlimited seats", - "Unlimited_MACs": "Unlimited MACs", - "Unlimited_seats_MACs": "Unlimited seats and MACs" + "Unlimited_seats": "Unlimited seats" }