diff options
Diffstat (limited to 'src/containers/settings/EditSettingsScreen.js')
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index d601e03d4..3b8f03ae4 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -14,7 +14,6 @@ import { | |||
14 | DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED, DEFAULT_IS_FEATURE_ENABLED_BY_USER, | 14 | DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED, DEFAULT_IS_FEATURE_ENABLED_BY_USER, |
15 | } from '../../config'; | 15 | } from '../../config'; |
16 | import { DEFAULT_APP_SETTINGS, isMac } from '../../environment'; | 16 | import { DEFAULT_APP_SETTINGS, isMac } from '../../environment'; |
17 | import { config as spellcheckerConfig } from '../../features/spellchecker'; | ||
18 | 17 | ||
19 | import { getSelectOptions } from '../../helpers/i18n-helpers'; | 18 | import { getSelectOptions } from '../../helpers/i18n-helpers'; |
20 | import { hash } from '../../helpers/password-helpers'; | 19 | import { hash } from '../../helpers/password-helpers'; |
@@ -516,8 +515,8 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
516 | }, | 515 | }, |
517 | enableSpellchecking: { | 516 | enableSpellchecking: { |
518 | label: intl.formatMessage(messages.enableSpellchecking), | 517 | label: intl.formatMessage(messages.enableSpellchecking), |
519 | value: !this.props.stores.user.data.isPremium && !spellcheckerConfig.isIncludedInCurrentPlan ? false : settings.all.app.enableSpellchecking, | 518 | value: settings.all.app.enableSpellchecking, |
520 | default: !this.props.stores.user.data.isPremium && !spellcheckerConfig.isIncludedInCurrentPlan ? false : DEFAULT_APP_SETTINGS.enableSpellchecking, | 519 | default: DEFAULT_APP_SETTINGS.enableSpellchecking, |
521 | }, | 520 | }, |
522 | spellcheckerLanguage: { | 521 | spellcheckerLanguage: { |
523 | label: intl.formatMessage(globalMessages.spellcheckerLanguage), | 522 | label: intl.formatMessage(globalMessages.spellcheckerLanguage), |
@@ -650,7 +649,6 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
650 | getCacheSize={() => app.cacheSize} | 649 | getCacheSize={() => app.cacheSize} |
651 | isClearingAllCache={isClearingAllCache} | 650 | isClearingAllCache={isClearingAllCache} |
652 | onClearAllCache={clearAllCache} | 651 | onClearAllCache={clearAllCache} |
653 | isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan} | ||
654 | isTodosEnabled={todos.isFeatureActive} | 652 | isTodosEnabled={todos.isFeatureActive} |
655 | isWorkspaceEnabled={workspaces.isFeatureActive} | 653 | isWorkspaceEnabled={workspaces.isFeatureActive} |
656 | lockingFeatureEnabled={lockingFeatureEnabled} | 654 | lockingFeatureEnabled={lockingFeatureEnabled} |