regression: remove unlimited mac info (#31044)

pull/30998/head^2
Hugo Costa 2 years ago committed by GitHub
parent 34498986f0
commit e0f3fc478b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
  2. 1
      apps/meteor/client/views/admin/subscription/components/cards/PlanCard.tsx
  3. 18
      apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx
  4. 4
      apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json

@ -115,12 +115,7 @@ const SubscriptionPage = () => {
</Grid.Item>
)}
<Grid.Item lg={4} xs={4} p={8}>
{license && (
<PlanCard
licenseInformation={license.information}
licenseLimits={{ activeUsers: seatsLimit, monthlyActiveContacts: macLimit }}
/>
)}
{license && <PlanCard licenseInformation={license.information} licenseLimits={{ activeUsers: seatsLimit }} />}
{!license && <PlanCardCommunity />}
</Grid.Item>
<Grid.Item lg={8} xs={4} p={8}>

@ -7,7 +7,6 @@ import PlanCardTrial from './PlanCard/PlanCardTrial';
type LicenseLimits = {
activeUsers: { max: number; value?: number };
monthlyActiveContacts: { max: number; value?: number };
};
type PlanCardProps = {

@ -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 (
<PlanCardBase name={planName.data ?? ''}>
{licenseLimits?.activeUsers.max === Infinity ||
(licenseLimits?.monthlyActiveContacts.max === Infinity && (
<Box fontScale='p2' display='flex' mb={4} alignItems='center'>
<Icon name='lightning' size={24} mie={12} />
{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')}
</Box>
))}
{licenseLimits?.activeUsers.max === Infinity && (
<Box fontScale='p2' display='flex' mb={4} alignItems='center'>
<Icon name='lightning' size={24} mie={12} />
{t('Unlimited_seats')}
</Box>
)}
{visualExpiration && (
<Box fontScale='p2' display='flex' mb={4} alignItems='center'>
<Icon name='calendar' size={24} mie={12} />

@ -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"
}

Loading…
Cancel
Save