diff options
author | Vijay A <vraravam@users.noreply.github.com> | 2021-10-16 21:43:20 +0530 |
---|---|---|
committer | Vijay A <vraravam@users.noreply.github.com> | 2021-10-16 21:43:20 +0530 |
commit | 19ef0c756eba1b6c554ce9892f503534e2bf0597 (patch) | |
tree | 3eeb4b631805a39f00ab58a0995c0003df467007 /src/containers | |
parent | regenerate i18n file (diff) | |
download | ferdium-app-19ef0c756eba1b6c554ce9892f503534e2bf0597.tar.gz ferdium-app-19ef0c756eba1b6c554ce9892f503534e2bf0597.tar.zst ferdium-app-19ef0c756eba1b6c554ce9892f503534e2bf0597.zip |
refactor: move service-defaults into the 'config' file for reuse
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/settings/EditServiceScreen.js | 5 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index 972d3d251..43b461670 100644 --- a/src/containers/settings/EditServiceScreen.js +++ b/src/containers/settings/EditServiceScreen.js | |||
@@ -23,6 +23,7 @@ import { config as proxyFeature } from '../../features/serviceProxy'; | |||
23 | import { SPELLCHECKER_LOCALES } from '../../i18n/languages'; | 23 | import { SPELLCHECKER_LOCALES } from '../../i18n/languages'; |
24 | 24 | ||
25 | import globalMessages from '../../i18n/globalMessages'; | 25 | import globalMessages from '../../i18n/globalMessages'; |
26 | import { DEFAULT_APP_SETTINGS } from '../../config'; | ||
26 | 27 | ||
27 | const messages = defineMessages({ | 28 | const messages = defineMessages({ |
28 | name: { | 29 | name: { |
@@ -307,7 +308,7 @@ class EditServiceScreen extends Component { | |||
307 | onlyShowFavoritesInUnreadCount: { | 308 | onlyShowFavoritesInUnreadCount: { |
308 | label: intl.formatMessage(messages.onlyShowFavoritesInUnreadCount), | 309 | label: intl.formatMessage(messages.onlyShowFavoritesInUnreadCount), |
309 | value: service.onlyShowFavoritesInUnreadCount, | 310 | value: service.onlyShowFavoritesInUnreadCount, |
310 | default: false, | 311 | default: DEFAULT_APP_SETTINGS.onlyShowFavoritesInUnreadCount, |
311 | }, | 312 | }, |
312 | }); | 313 | }); |
313 | } | 314 | } |
@@ -323,7 +324,7 @@ class EditServiceScreen extends Component { | |||
323 | isEnabled: { | 324 | isEnabled: { |
324 | label: intl.formatMessage(messages.enableProxy), | 325 | label: intl.formatMessage(messages.enableProxy), |
325 | value: serviceProxyConfig.isEnabled, | 326 | value: serviceProxyConfig.isEnabled, |
326 | default: false, | 327 | default: DEFAULT_APP_SETTINGS.proxyFeatureEnabled, |
327 | }, | 328 | }, |
328 | host: { | 329 | host: { |
329 | label: intl.formatMessage(messages.proxyHost), | 330 | label: intl.formatMessage(messages.proxyHost), |
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index aea077a1e..de0714870 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -517,7 +517,7 @@ class EditSettingsScreen extends Component { | |||
517 | lockingFeatureEnabled: { | 517 | lockingFeatureEnabled: { |
518 | label: intl.formatMessage(messages.enableLock), | 518 | label: intl.formatMessage(messages.enableLock), |
519 | value: settings.all.app.lockingFeatureEnabled || false, | 519 | value: settings.all.app.lockingFeatureEnabled || false, |
520 | default: false, | 520 | default: DEFAULT_APP_SETTINGS.lockingFeatureEnabled, |
521 | }, | 521 | }, |
522 | lockedPassword: { | 522 | lockedPassword: { |
523 | label: intl.formatMessage(messages.lockPassword), | 523 | label: intl.formatMessage(messages.lockPassword), |
@@ -539,7 +539,7 @@ class EditSettingsScreen extends Component { | |||
539 | scheduledDNDEnabled: { | 539 | scheduledDNDEnabled: { |
540 | label: intl.formatMessage(messages.scheduledDNDEnabled), | 540 | label: intl.formatMessage(messages.scheduledDNDEnabled), |
541 | value: settings.all.app.scheduledDNDEnabled || false, | 541 | value: settings.all.app.scheduledDNDEnabled || false, |
542 | default: false, | 542 | default: DEFAULT_APP_SETTINGS.scheduledDNDEnabled, |
543 | }, | 543 | }, |
544 | scheduledDNDStart: { | 544 | scheduledDNDStart: { |
545 | label: intl.formatMessage(messages.scheduledDNDStart), | 545 | label: intl.formatMessage(messages.scheduledDNDStart), |