diff options
author | 2024-02-11 12:07:30 +0530 | |
---|---|---|
committer | 2024-02-11 17:43:49 +0000 | |
commit | 226257cd862451abccc28894e2b0a3270c6790e9 (patch) | |
tree | 3c6516bfe1bcc258ce40afa6af6cbd9582961ad9 /src/containers/settings | |
parent | Update dependabot.yml to handle both app and GHA dependencies (diff) | |
download | ferdium-app-226257cd862451abccc28894e2b0a3270c6790e9.tar.gz ferdium-app-226257cd862451abccc28894e2b0a3270c6790e9.tar.zst ferdium-app-226257cd862451abccc28894e2b0a3270c6790e9.zip |
rename features to better convey type
(without migration)
Diffstat (limited to 'src/containers/settings')
-rw-r--r-- | src/containers/settings/EditServiceScreen.tsx | 4 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.tsx | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/containers/settings/EditServiceScreen.tsx b/src/containers/settings/EditServiceScreen.tsx index 946ec09d3..3c65877c8 100644 --- a/src/containers/settings/EditServiceScreen.tsx +++ b/src/containers/settings/EditServiceScreen.tsx | |||
@@ -409,9 +409,9 @@ class EditServiceScreen extends Component<IProps> { | |||
409 | label: intl.formatMessage(messages.enableProxy), | 409 | label: intl.formatMessage(messages.enableProxy), |
410 | value: ifUndefined<boolean>( | 410 | value: ifUndefined<boolean>( |
411 | serviceProxyConfig.isEnabled, | 411 | serviceProxyConfig.isEnabled, |
412 | DEFAULT_SERVICE_SETTINGS.proxyFeatureEnabled, | 412 | DEFAULT_SERVICE_SETTINGS.isProxyFeatureEnabled, |
413 | ), | 413 | ), |
414 | default: DEFAULT_SERVICE_SETTINGS.proxyFeatureEnabled, | 414 | default: DEFAULT_SERVICE_SETTINGS.isProxyFeatureEnabled, |
415 | type: 'checkbox', | 415 | type: 'checkbox', |
416 | }, | 416 | }, |
417 | host: { | 417 | host: { |
diff --git a/src/containers/settings/EditSettingsScreen.tsx b/src/containers/settings/EditSettingsScreen.tsx index 528b1410b..272297700 100644 --- a/src/containers/settings/EditSettingsScreen.tsx +++ b/src/containers/settings/EditSettingsScreen.tsx | |||
@@ -398,7 +398,7 @@ class EditSettingsScreen extends Component< | |||
398 | wakeUpHibernationSplay: Boolean(settingsData.wakeUpHibernationSplay), | 398 | wakeUpHibernationSplay: Boolean(settingsData.wakeUpHibernationSplay), |
399 | predefinedTodoServer: settingsData.predefinedTodoServer, | 399 | predefinedTodoServer: settingsData.predefinedTodoServer, |
400 | customTodoServer: settingsData.customTodoServer, | 400 | customTodoServer: settingsData.customTodoServer, |
401 | lockingFeatureEnabled: Boolean(settingsData.lockingFeatureEnabled), | 401 | isLockingFeatureEnabled: Boolean(settingsData.isLockingFeatureEnabled), |
402 | lockedPassword: useOriginalPassword | 402 | lockedPassword: useOriginalPassword |
403 | ? this.props.stores.settings.all.app.lockedPassword | 403 | ? this.props.stores.settings.all.app.lockedPassword |
404 | : hash(String(settingsData.lockedPassword)), | 404 | : hash(String(settingsData.lockedPassword)), |
@@ -796,13 +796,13 @@ class EditSettingsScreen extends Component< | |||
796 | ), | 796 | ), |
797 | default: DEFAULT_APP_SETTINGS.customTodoServer, | 797 | default: DEFAULT_APP_SETTINGS.customTodoServer, |
798 | }, | 798 | }, |
799 | lockingFeatureEnabled: { | 799 | isLockingFeatureEnabled: { |
800 | label: intl.formatMessage(messages.enableLock), | 800 | label: intl.formatMessage(messages.enableLock), |
801 | value: ifUndefined<boolean>( | 801 | value: ifUndefined<boolean>( |
802 | settings.all.app.lockingFeatureEnabled, | 802 | settings.all.app.isLockingFeatureEnabled, |
803 | DEFAULT_APP_SETTINGS.lockingFeatureEnabled, | 803 | DEFAULT_APP_SETTINGS.isLockingFeatureEnabled, |
804 | ), | 804 | ), |
805 | default: DEFAULT_APP_SETTINGS.lockingFeatureEnabled, | 805 | default: DEFAULT_APP_SETTINGS.isLockingFeatureEnabled, |
806 | type: 'checkbox', | 806 | type: 'checkbox', |
807 | }, | 807 | }, |
808 | lockedPassword: { | 808 | lockedPassword: { |
@@ -1223,7 +1223,7 @@ class EditSettingsScreen extends Component< | |||
1223 | updateVersion, | 1223 | updateVersion, |
1224 | updateStatusTypes, | 1224 | updateStatusTypes, |
1225 | isClearingAllCache, | 1225 | isClearingAllCache, |
1226 | lockingFeatureEnabled, | 1226 | isLockingFeatureEnabled, |
1227 | } = app; | 1227 | } = app; |
1228 | const { checkForUpdates, installUpdate, clearAllCache } = | 1228 | const { checkForUpdates, installUpdate, clearAllCache } = |
1229 | this.props.actions.app; | 1229 | this.props.actions.app; |
@@ -1247,7 +1247,7 @@ class EditSettingsScreen extends Component< | |||
1247 | getCacheSize={() => app.cacheSize} | 1247 | getCacheSize={() => app.cacheSize} |
1248 | isClearingAllCache={isClearingAllCache} | 1248 | isClearingAllCache={isClearingAllCache} |
1249 | onClearAllCache={clearAllCache} | 1249 | onClearAllCache={clearAllCache} |
1250 | lockingFeatureEnabled={lockingFeatureEnabled} | 1250 | isLockingFeatureEnabled={isLockingFeatureEnabled} |
1251 | automaticUpdates={this.props.stores.settings.app.automaticUpdates} | 1251 | automaticUpdates={this.props.stores.settings.app.automaticUpdates} |
1252 | isDarkmodeEnabled={this.props.stores.settings.app.darkMode} | 1252 | isDarkmodeEnabled={this.props.stores.settings.app.darkMode} |
1253 | isAdaptableDarkModeEnabled={ | 1253 | isAdaptableDarkModeEnabled={ |