From 2887eee3935e75640fc45111a904e78496dab62e Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Mon, 17 Jun 2019 16:52:46 +0200 Subject: Rename feature flags --- src/containers/settings/EditServiceScreen.js | 4 ++-- src/containers/settings/EditSettingsScreen.js | 6 +++--- src/containers/settings/RecipesScreen.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/containers/settings') diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index 870ca4ecd..e4ff03bb3 100644 --- a/src/containers/settings/EditServiceScreen.js +++ b/src/containers/settings/EditServiceScreen.js @@ -330,8 +330,8 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex onSubmit={d => this.onSubmit(d)} onDelete={() => this.deleteService()} isProxyFeatureEnabled={proxyFeature.isEnabled} - isProxyPremiumFeature={proxyFeature.isPremium} - isSpellcheckerPremiumFeature={spellcheckerFeature.isPremium} + isServiceProxyIncludedInCurrentPlan={proxyFeature.isIncludedInCurrentPlan} + isSpellcheckerIncludedInCurrentPlan={spellcheckerFeature.isIncludedInCurrentPlan} /> ); diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 97c1fa3b1..67d52f102 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -159,8 +159,8 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e }, enableSpellchecking: { label: intl.formatMessage(messages.enableSpellchecking), - value: !this.props.stores.user.data.isPremium && spellcheckerConfig.isPremium ? false : settings.all.app.enableSpellchecking, - default: !this.props.stores.user.data.isPremium && spellcheckerConfig.isPremium ? false : DEFAULT_APP_SETTINGS.enableSpellchecking, + value: !this.props.stores.user.data.isPremium && !spellcheckerConfig.isIncludedInCurrentPlan ? false : settings.all.app.enableSpellchecking, + default: !this.props.stores.user.data.isPremium && !spellcheckerConfig.isIncludedInCurrentPlan ? false : DEFAULT_APP_SETTINGS.enableSpellchecking, }, spellcheckerLanguage: { label: intl.formatMessage(globalMessages.spellcheckerLanguage), @@ -223,7 +223,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e cacheSize={cacheSize} isClearingAllCache={isClearingAllCache} onClearAllCache={clearAllCache} - isSpellcheckerPremiumFeature={spellcheckerConfig.isPremium} + isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan} /> ); diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js index 57e879f42..132820b6f 100644 --- a/src/containers/settings/RecipesScreen.js +++ b/src/containers/settings/RecipesScreen.js @@ -128,7 +128,7 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend appActions.openExternalUrl({ url: FRANZ_DEV_DOCS }); gaEvent('Recipe', 'open-dev-docs', 'Developer Documentation'); }} - isCommunityRecipesPremiumFeature={communityRecipesStore.isCommunityRecipesPremiumFeature} + isCommunityRecipesIncludedInCurrentPlan={communityRecipesStore.isCommunityRecipesIncludedInCurrentPlan} isUserPremiumUser={user.isPremium} /> -- cgit v1.2.3-70-g09d2