Merge branch 'develop' into new/custom-push-gateway-flag

apps/meteor/client/components/Omnichannel/modals/EnterpriseDepartmentsModal.tsx

@@ -37,7 +37,7 @@ const EnterpriseDepartmentsModal = ({ closeModal }: { closeModal: () => void }):
 			<Modal.Content fontScale='p2'>
 				<Modal.HeroImage src='/images/departments.svg' />
 				<Box fontScale='h3' mbe={28}>
-					{t('Enterprise_Departments_title')}
+					{t('Premium_Departments_title')}
 				</Box>
 				{t('Premium_Departments_description_upgrade')}
 			</Modal.Content>

apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx

@@ -68,7 +68,7 @@ export const VoipFooter = ({
 
 	const holdTitle = ((): string => {
 		if (!isEnterprise) {
-			return t('Hold_EE_only');
+			return t('Hold_Premium_only');
 		}
 		return paused ? t('Resume') : t('Hold');
 	})();

apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx

@@ -49,7 +49,7 @@ type CreateChannelModalPayload = {
 
 const getFederationHintKey = (licenseModule: ReturnType<typeof useHasLicenseModule>, featureToggle: boolean): TranslationKey => {
 	if (licenseModule === 'loading' || !licenseModule) {
-		return 'error-this-is-an-ee-feature';
+		return 'error-this-is-a-premium-feature';
 	}
 	if (!featureToggle) {
 		return 'Federation_Matrix_Federated_Description_disabled';

apps/meteor/client/sidebar/sections/actions/OmnichannelCallDialPad.tsx

@@ -19,7 +19,7 @@ export const OmniChannelCallDialPad = ({ ...props }): ReactElement => {
 			onClick={(): void => openDialModal()}
 			disabled={!outBoundCallsEnabledForUser}
 			aria-label={t('Open_Dialpad')}
-			data-tooltip={outBoundCallsAllowed ? t('New_Call') : t('New_Call_Enterprise_Edition_Only')}
+			data-tooltip={outBoundCallsAllowed ? t('New_Call') : t('New_Call_Premium_Only')}
 			{...props}
 		/>
 	);

apps/meteor/client/views/home/cards/CustomContentCard.tsx

@@ -80,7 +80,7 @@ const CustomContentCard = (): ReactElement | null => {
 						<Button
 							icon='lightning'
 							disabled={willNotShowCustomContent || !isEnterprise}
-							title={!isEnterprise ? t('Enterprise_Only') : customContentOnlyTooltipText}
+							title={!isEnterprise ? t('Premium_only') : customContentOnlyTooltipText}
 							onClick={handleOnlyShowCustomContent}
 							role='button'
 						>

apps/meteor/client/views/marketplace/AppsPage/AppsPage.tsx

@@ -6,7 +6,7 @@ import Page from '../../../components/Page';
 import MarketplaceHeader from '../components/MarketplaceHeader';
 import AppsPageContent from './AppsPageContent';
 
-type AppsContext = 'explore' | 'installed' | 'enterprise' | 'private';
+type AppsContext = 'explore' | 'installed' | 'premium' | 'private';
 
 const AppsPage = (): ReactElement => {
 	const t = useTranslation();

apps/meteor/client/views/marketplace/AppsRoute.tsx

@@ -42,7 +42,7 @@ const AppsRoute = (): ReactElement => {
 	}, [marketplaceRoute, context]);
 
 	if (
-		(context === 'explore' || context === 'installed' || context === 'private' || context === 'enterprise') &&
+		(context === 'explore' || context === 'installed' || context === 'private' || context === 'premium') &&
 		!canAccessMarketplace &&
 		!isAdminUser
 	) {

apps/meteor/client/views/marketplace/components/BannerEnterpriseTrialEnded.tsx

@@ -25,13 +25,13 @@ const BannerEnterpriseTrialEnded = (): ReactElement => {
 					closeable
 					icon={<Icon name='store' size='x24' />}
 					variant='warning'
-					title={t('Apps_disabled_when_Enterprise_trial_ended')}
+					title={t('Apps_disabled_when_Premium_trial_ended')}
 					onClose={() => setShowTrialBanner(false)}
 					{...(isAdmin && bannerLink)}
 				>
 					{isAdmin
-						? t('Apps_disabled_when_Enterprise_trial_ended_description_admin')
-						: t('Apps_disabled_when_Enterprise_trial_ended_description')}
+						? t('Apps_disabled_when_Premium_trial_ended_description_admin')
+						: t('Apps_disabled_when_Premium_trial_ended_description')}
 				</Banner>
 			)}
 		</>

apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfoCallButton.tsx

@@ -25,7 +25,7 @@ export const VoipInfoCallButton = ({ phoneNumber, ...props }: VoipInfoCallButton
 			{...props} // this props are injected by ButtonGroup
 			onClick={(): void => openDialModal({ initialValue: phoneNumber })}
 			disabled={!outBoundCallsEnabledForUser || !phoneNumber}
-			title={outBoundCallsAllowed ? t('Call_number') : t('Call_number_enterprise_only')}
+			title={outBoundCallsAllowed ? t('Call_number') : t('Call_number_premium_only')}
 			display='flex'
 			justifyContent='center'
 			fontSize='p2'

apps/meteor/client/views/omnichannel/directory/components/CallDialpadButton.tsx

@@ -27,7 +27,7 @@ export const CallDialpadButton = ({ phoneNumber }: { phoneNumber: string }): Rea
 	return (
 		<IconButton
 			rcx-call-dial-button
-			title={outBoundCallsAllowed ? t('Call_number') : t('Call_number_enterprise_only')}
+			title={outBoundCallsAllowed ? t('Call_number') : t('Call_number_premium_only')}
 			className={rcxCallDialButton}
 			disabled={!outBoundCallsEnabledForUser || !phoneNumber}
 			tiny

apps/meteor/client/views/room/composer/ComposerFederation/ComposerFederationJoinRoomDisabled.tsx

@@ -6,7 +6,7 @@ import React from 'react';
 const ComposerFederationJoinRoomDisabled = (): ReactElement => {
 	const t = useTranslation();
 
-	return <MessageFooterCallout>{t('Federation_Matrix_join_public_rooms_is_enterprise')}</MessageFooterCallout>;
+	return <MessageFooterCallout>{t('Federation_Matrix_join_public_rooms_is_premium')}</MessageFooterCallout>;
 };
 
 export default ComposerFederationJoinRoomDisabled;