diff options
Diffstat (limited to 'src/components/settings')
-rw-r--r-- | src/components/settings/recipes/RecipesDashboard.js | 8 | ||||
-rw-r--r-- | src/components/settings/services/EditServiceForm.js | 12 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 8 |
3 files changed, 15 insertions, 13 deletions
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js index ed4a429db..75e60b7ec 100644 --- a/src/components/settings/recipes/RecipesDashboard.js +++ b/src/components/settings/recipes/RecipesDashboard.js | |||
@@ -118,7 +118,7 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com | |||
118 | openRecipeDirectory: PropTypes.func.isRequired, | 118 | openRecipeDirectory: PropTypes.func.isRequired, |
119 | openDevDocs: PropTypes.func.isRequired, | 119 | openDevDocs: PropTypes.func.isRequired, |
120 | classes: PropTypes.object.isRequired, | 120 | classes: PropTypes.object.isRequired, |
121 | isCommunityRecipesPremiumFeature: PropTypes.bool.isRequired, | 121 | isCommunityRecipesIncludedInCurrentPlan: PropTypes.bool.isRequired, |
122 | }; | 122 | }; |
123 | 123 | ||
124 | static defaultProps = { | 124 | static defaultProps = { |
@@ -145,7 +145,7 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com | |||
145 | openRecipeDirectory, | 145 | openRecipeDirectory, |
146 | openDevDocs, | 146 | openDevDocs, |
147 | classes, | 147 | classes, |
148 | isCommunityRecipesPremiumFeature, | 148 | isCommunityRecipesIncludedInCurrentPlan, |
149 | } = this.props; | 149 | } = this.props; |
150 | const { intl } = this.context; | 150 | const { intl } = this.context; |
151 | 151 | ||
@@ -218,7 +218,7 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com | |||
218 | <> | 218 | <> |
219 | <H2> | 219 | <H2> |
220 | {intl.formatMessage(messages.headlineCustomRecipes)} | 220 | {intl.formatMessage(messages.headlineCustomRecipes)} |
221 | {isCommunityRecipesPremiumFeature && ( | 221 | {isCommunityRecipesIncludedInCurrentPlan && ( |
222 | <ProBadge className={classes.proBadge} /> | 222 | <ProBadge className={classes.proBadge} /> |
223 | )} | 223 | )} |
224 | </H2> | 224 | </H2> |
@@ -247,7 +247,7 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com | |||
247 | </> | 247 | </> |
248 | )} | 248 | )} |
249 | <PremiumFeatureContainer | 249 | <PremiumFeatureContainer |
250 | condition={(recipeFilter === 'dev' && communityRecipes.length > 0) && isCommunityRecipesPremiumFeature} | 250 | condition={(recipeFilter === 'dev' && communityRecipes.length > 0) && isCommunityRecipesIncludedInCurrentPlan} |
251 | > | 251 | > |
252 | {recipeFilter === 'dev' && communityRecipes.length > 0 && ( | 252 | {recipeFilter === 'dev' && communityRecipes.length > 0 && ( |
253 | <H3>{intl.formatMessage(messages.headlineCommunityRecipes)}</H3> | 253 | <H3>{intl.formatMessage(messages.headlineCommunityRecipes)}</H3> |
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index c089a1582..5cde0db8e 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js | |||
@@ -130,8 +130,8 @@ export default @observer class EditServiceForm extends Component { | |||
130 | isSaving: PropTypes.bool.isRequired, | 130 | isSaving: PropTypes.bool.isRequired, |
131 | isDeleting: PropTypes.bool.isRequired, | 131 | isDeleting: PropTypes.bool.isRequired, |
132 | isProxyFeatureEnabled: PropTypes.bool.isRequired, | 132 | isProxyFeatureEnabled: PropTypes.bool.isRequired, |
133 | isProxyPremiumFeature: PropTypes.bool.isRequired, | 133 | isServiceProxyIncludedInCurrentPlan: PropTypes.bool.isRequired, |
134 | isSpellcheckerPremiumFeature: PropTypes.bool.isRequired, | 134 | isSpellcheckerIncludedInCurrentPlan: PropTypes.bool.isRequired, |
135 | }; | 135 | }; |
136 | 136 | ||
137 | static defaultProps = { | 137 | static defaultProps = { |
@@ -194,8 +194,8 @@ export default @observer class EditServiceForm extends Component { | |||
194 | isDeleting, | 194 | isDeleting, |
195 | onDelete, | 195 | onDelete, |
196 | isProxyFeatureEnabled, | 196 | isProxyFeatureEnabled, |
197 | isProxyPremiumFeature, | 197 | isServiceProxyIncludedInCurrentPlan, |
198 | isSpellcheckerPremiumFeature, | 198 | isSpellcheckerIncludedInCurrentPlan, |
199 | } = this.props; | 199 | } = this.props; |
200 | const { intl } = this.context; | 200 | const { intl } = this.context; |
201 | 201 | ||
@@ -345,7 +345,7 @@ export default @observer class EditServiceForm extends Component { | |||
345 | </div> | 345 | </div> |
346 | 346 | ||
347 | <PremiumFeatureContainer | 347 | <PremiumFeatureContainer |
348 | condition={isSpellcheckerPremiumFeature} | 348 | condition={!isSpellcheckerIncludedInCurrentPlan} |
349 | gaEventInfo={{ category: 'User', event: 'upgrade', label: 'spellchecker' }} | 349 | gaEventInfo={{ category: 'User', event: 'upgrade', label: 'spellchecker' }} |
350 | > | 350 | > |
351 | <div className="settings__settings-group"> | 351 | <div className="settings__settings-group"> |
@@ -355,7 +355,7 @@ export default @observer class EditServiceForm extends Component { | |||
355 | 355 | ||
356 | {isProxyFeatureEnabled && ( | 356 | {isProxyFeatureEnabled && ( |
357 | <PremiumFeatureContainer | 357 | <PremiumFeatureContainer |
358 | condition={isProxyPremiumFeature} | 358 | condition={!isServiceProxyIncludedInCurrentPlan} |
359 | gaEventInfo={{ category: 'User', event: 'upgrade', label: 'proxy' }} | 359 | gaEventInfo={{ category: 'User', event: 'upgrade', label: 'proxy' }} |
360 | > | 360 | > |
361 | <div className="settings__settings-group"> | 361 | <div className="settings__settings-group"> |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index efd453356..6d0811b1b 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -100,7 +100,7 @@ export default @observer class EditSettingsForm extends Component { | |||
100 | isClearingAllCache: PropTypes.bool.isRequired, | 100 | isClearingAllCache: PropTypes.bool.isRequired, |
101 | onClearAllCache: PropTypes.func.isRequired, | 101 | onClearAllCache: PropTypes.func.isRequired, |
102 | cacheSize: PropTypes.string.isRequired, | 102 | cacheSize: PropTypes.string.isRequired, |
103 | isSpellcheckerPremiumFeature: PropTypes.bool.isRequired, | 103 | isSpellcheckerIncludedInCurrentPlan: PropTypes.bool.isRequired, |
104 | }; | 104 | }; |
105 | 105 | ||
106 | static contextTypes = { | 106 | static contextTypes = { |
@@ -130,7 +130,7 @@ export default @observer class EditSettingsForm extends Component { | |||
130 | isClearingAllCache, | 130 | isClearingAllCache, |
131 | onClearAllCache, | 131 | onClearAllCache, |
132 | cacheSize, | 132 | cacheSize, |
133 | isSpellcheckerPremiumFeature, | 133 | isSpellcheckerIncludedInCurrentPlan, |
134 | } = this.props; | 134 | } = this.props; |
135 | const { intl } = this.context; | 135 | const { intl } = this.context; |
136 | 136 | ||
@@ -143,6 +143,8 @@ export default @observer class EditSettingsForm extends Component { | |||
143 | updateButtonLabelMessage = messages.buttonSearchForUpdate; | 143 | updateButtonLabelMessage = messages.buttonSearchForUpdate; |
144 | } | 144 | } |
145 | 145 | ||
146 | console.log('isSpellcheckerIncludedInCurrentPlan', isSpellcheckerIncludedInCurrentPlan); | ||
147 | |||
146 | return ( | 148 | return ( |
147 | <div className="settings__main"> | 149 | <div className="settings__main"> |
148 | <div className="settings__header"> | 150 | <div className="settings__header"> |
@@ -173,7 +175,7 @@ export default @observer class EditSettingsForm extends Component { | |||
173 | <h2 id="language">{intl.formatMessage(messages.headlineLanguage)}</h2> | 175 | <h2 id="language">{intl.formatMessage(messages.headlineLanguage)}</h2> |
174 | <Select field={form.$('locale')} showLabel={false} /> | 176 | <Select field={form.$('locale')} showLabel={false} /> |
175 | <PremiumFeatureContainer | 177 | <PremiumFeatureContainer |
176 | condition={isSpellcheckerPremiumFeature} | 178 | condition={!isSpellcheckerIncludedInCurrentPlan} |
177 | gaEventInfo={{ category: 'User', event: 'upgrade', label: 'spellchecker' }} | 179 | gaEventInfo={{ category: 'User', event: 'upgrade', label: 'spellchecker' }} |
178 | > | 180 | > |
179 | <Fragment> | 181 | <Fragment> |