regression: CE cards and small fixes (#30817)

RocketChat · Oct 31, 2023 · bd9d2b7 · bd9d2b7
1 parent a31d533
commit bd9d2b7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
@@ -124,18 +124,22 @@ const SubscriptionPage = () => {
 								</Grid.Item>
 							)}
 
-							{limits?.marketplaceApps !== undefined && (
-								<Grid.Item lg={4} xs={4} p={8}>
-									<AppsUsageCard privateAppsLimit={limits?.privateApps} marketplaceAppsLimit={limits.marketplaceApps} />
-								</Grid.Item>
-							)}
+							{!license && (
+								<>
+									{limits?.marketplaceApps !== undefined && (
+										<Grid.Item lg={4} xs={4} p={8}>
+											<AppsUsageCard privateAppsLimit={limits?.privateApps} marketplaceAppsLimit={limits.marketplaceApps} />
+										</Grid.Item>
+									)}
 
-							<Grid.Item lg={4} xs={4} p={8}>
-								<ActiveSessionsCard />
-							</Grid.Item>
-							<Grid.Item lg={4} xs={4} p={8}>
-								<ActiveSessionsPeakCard />
-							</Grid.Item>
+									<Grid.Item lg={4} xs={4} p={8}>
+										<ActiveSessionsCard />
+									</Grid.Item>
+									<Grid.Item lg={4} xs={4} p={8}>
+										<ActiveSessionsPeakCard />
+									</Grid.Item>
+								</>
+							)}
 						</Grid>
 						<UpgradeToGetMore activeModules={activeModules} isEnterprise={isEnterprise} />
 					</Box>

diff --git a/apps/meteor/client/views/admin/subscription/components/PieGraphCard.tsx b/apps/meteor/client/views/admin/subscription/components/PieGraphCard.tsx
@@ -21,7 +21,7 @@ const PieGraphCard = ({ pieGraph, card }: PieGraphCardProps): ReactElement => {
 
 	return (
 		<FeatureUsageCard card={card}>
-			<UsagePieGraph label={`${quantityAvailable} ${t('Available')}`} used={pieGraph.used} total={pieGraph.total} color={color} />)
+			<UsagePieGraph label={`${quantityAvailable} ${t('Available')}`} used={pieGraph.used} total={pieGraph.total} color={color} />
 		</FeatureUsageCard>
 	);
 };