From 59cebceb669dec97fc539a3189ebc3eb94966efd Mon Sep 17 00:00:00 2001 From: Mattermost Build Date: Wed, 18 Nov 2020 21:17:58 +0100 Subject: [PATCH] Remove Cloud billing flag from System Console (#7096) (cherry picked from commit 6c35b79ac663756b5e31f0b878531aabec68efd3) Co-authored-by: Maria A Nunez --- components/admin_console/admin_definition.jsx | 10 ---------- i18n/en.json | 2 -- 2 files changed, 12 deletions(-) diff --git a/components/admin_console/admin_definition.jsx b/components/admin_console/admin_definition.jsx index 6382f291660d..0b09ae8e44c6 100644 --- a/components/admin_console/admin_definition.jsx +++ b/components/admin_console/admin_definition.jsx @@ -5336,16 +5336,6 @@ const AdminDefinition = { // placeholder: t('admin.experimental.replyToAddress.example'), // placeholder_default: 'E.g.: "reply-to@example.com"', // }, - { - type: Constants.SettingsTypes.TYPE_BOOL, - key: 'ExperimentalSettings.CloudBilling', - label: t('admin.experimental.cloudBilling.title'), - label_default: 'Cloud Billing:', - help_text: t('admin.experimental.cloudBilling.desc'), - help_text_default: 'Show the new billing view for Cloud', - help_text_markdown: false, - isHidden: it.not(it.licensedForFeature('Cloud')), - }, ], }, }, diff --git a/i18n/en.json b/i18n/en.json index d3081c7deef3..ce2029149ccf 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -703,8 +703,6 @@ "admin.experimental.clientSideCertEnable.title": "Enable Client-Side Certification:", "admin.experimental.closeUnusedDirectMessages.desc": "When true, direct message conversations with no activity for 7 days will be hidden from the sidebar. When false, conversations remain in the sidebar until they are manually closed.", "admin.experimental.closeUnusedDirectMessages.title": "Autoclose Direct Messages in Sidebar:", - "admin.experimental.cloudBilling.desc": "Show the new billing view for Cloud", - "admin.experimental.cloudBilling.title": "Cloud Billing:", "admin.experimental.defaultTheme.desc": "Set a default theme that applies to all new users on the system.", "admin.experimental.defaultTheme.title": "Default Theme:", "admin.experimental.emailBatchingBufferSize.desc": "Specify the maximum number of notifications batched into a single email.",