Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Change Marketplace info modal text #33239

Merged
merged 2 commits into from
Sep 18, 2024
Merged

chore: Change Marketplace info modal text #33239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9afd914
chore: Change Marketplace info modal text
MartinSchoeler Sep 9, 2024
07fe764
Merge branch 'release-7.0.0' into apps-modal-rename
MartinSchoeler Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/meteor/client/views/admin/subscription/components/FeatureUsageCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ type FeatureUsageCardProps = {

export type CardProps = {
title: string;
infoText?: string;
infoText?: string | ReactNode;
upgradeButton?: ReactNode;
};

Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/client/views/admin/subscription/components/InfoTextIconModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { IconButton } from '@rocket.chat/fuselage';
import { useSetModal } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
import type { ReactElement, ReactNode } from 'react';
import React, { memo } from 'react';
import { useTranslation } from 'react-i18next';

import GenericModal from '../../../../components/GenericModal';

export type InfoTextIconModalProps = {
title: string;
infoText: string;
infoText: string | ReactNode;
};

const InfoTextIconModal = ({ title, infoText }: InfoTextIconModalProps): ReactElement => {
Expand Down
12 changes: 10 additions & 2 deletions apps/meteor/client/views/admin/subscription/components/cards/AppsUsageCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Box, ProgressBar, Skeleton } from '@rocket.chat/fuselage';
import type { ReactElement } from 'react';
import React from 'react';
import { useTranslation } from 'react-i18next';
import { Trans, useTranslation } from 'react-i18next';

import type { CardProps } from '../FeatureUsageCard';
import FeatureUsageCard from '../FeatureUsageCard';
Expand All @@ -25,7 +25,15 @@ const AppsUsageCard = ({ privateAppsLimit, marketplaceAppsLimit }: AppsUsageCard

const card: CardProps = {
title: t('Apps'),
infoText: t('Apps_InfoText'),
infoText: (
<Trans i18nKey='Apps_InfoText'>
Community workspaces can enable up to 5 marketplace apps. Private apps can only be enabled in
<Box is='a' href='https://www.rocket.chat/pricing' target='_blank' color='info'>
premium plans
</Box>
.
</Trans>
),
...((marketplaceAppsPercentage || 0) >= 80 && {
upgradeButton: (
<UpgradeButton target='app-usage-card' action='upgrade' small>
Expand Down
2 changes: 1 addition & 1 deletion packages/i18n/src/locales/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6466,7 +6466,7 @@
"MAC_InfoText": "(MAC) the number of unique omnichannel contacts engaged with during the billing month.",
"CountMAC_InfoText": "(MAC) the number of unique omnichannel contacts engaged with during the calendar month.",
"ActiveSessions_InfoText": "Total concurrent connections. A single user can be connected multiple times. User presence service is disabled at 200 or more to prevent performance issues.",
"Apps_InfoText": "Community allows up to 3 private apps and 5 marketplace apps to be enabled",
"Apps_InfoText": "Community workspaces can enable up to 5 marketplace apps. Private apps can only be enabled in <1>premium plans</1>.",
"Remove_RocketChat_Watermark_InfoText": "Watermark is automatically removed when a paid license is active.",
"Remove_RocketChat_Watermark": "Remove Rocket.Chat watermark",
"High_scalabaility": "High scalabaility",
Expand Down
Loading