From 226257cd862451abccc28894e2b0a3270c6790e9 Mon Sep 17 00:00:00 2001
From: Vijay A <vraravam@users.noreply.github.com>
Date: Sun, 11 Feb 2024 12:07:30 +0530
Subject: rename features to better convey type (without migration)

---
 src/components/layout/Sidebar.tsx                     |  2 +-
 src/components/settings/settings/EditSettingsForm.tsx |  8 ++++----
 src/config.ts                                         |  4 ++--
 src/containers/settings/EditServiceScreen.tsx         |  4 ++--
 src/containers/settings/EditSettingsScreen.tsx        | 14 +++++++-------
 src/lib/Menu.ts                                       |  4 ++--
 src/stores/AppStore.ts                                |  4 ++--
 src/stores/SettingsStore.ts                           |  4 ++--
 8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/components/layout/Sidebar.tsx b/src/components/layout/Sidebar.tsx
index e423e408b..1106113f0 100644
--- a/src/components/layout/Sidebar.tsx
+++ b/src/components/layout/Sidebar.tsx
@@ -318,7 +318,7 @@ class Sidebar extends Component<IProps, IState> {
             <Icon icon={mdiCheckAll} size={1.5} />
           </button>
         ) : null}
-        {stores!.settings.all.app.lockingFeatureEnabled ? (
+        {stores!.settings.all.app.isLockingFeatureEnabled ? (
           <button
             type="button"
             className="sidebar__button"
diff --git a/src/components/settings/settings/EditSettingsForm.tsx b/src/components/settings/settings/EditSettingsForm.tsx
index 226dbac76..6a79fcc8f 100644
--- a/src/components/settings/settings/EditSettingsForm.tsx
+++ b/src/components/settings/settings/EditSettingsForm.tsx
@@ -306,7 +306,7 @@ interface IProps extends WrappedComponentProps {
   isDarkmodeEnabled: boolean;
   isAdaptableDarkModeEnabled: boolean;
   isUseGrayscaleServicesEnabled: boolean;
-  lockingFeatureEnabled: boolean;
+  isLockingFeatureEnabled: boolean;
   isSplitModeEnabled: boolean;
   isOnline: boolean;
   showServicesUpdatedInfoBar: boolean;
@@ -403,7 +403,7 @@ class EditSettingsForm extends Component<IProps, IState> {
     }
 
     const {
-      lockingFeatureEnabled,
+      isLockingFeatureEnabled,
       scheduledDNDEnabled,
       reloadAfterResume,
       useSelfSignedCertificates,
@@ -860,8 +860,8 @@ class EditSettingsForm extends Component<IProps, IState> {
 
                 <Hr />
 
-                <Toggle {...form.$('lockingFeatureEnabled').bind()} />
-                {lockingFeatureEnabled && (
+                <Toggle {...form.$('isLockingFeatureEnabled').bind()} />
+                {isLockingFeatureEnabled && (
                   <>
                     {isMac && systemPreferences.canPromptTouchID() && (
                       <Toggle {...form.$('useTouchIdToUnlock').bind()} />
diff --git a/src/config.ts b/src/config.ts
index 6e89cb9d1..055fc9ad1 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -380,7 +380,7 @@ export const DEFAULT_APP_SETTINGS = {
   server: LIVE_FERDIUM_API,
   predefinedTodoServer: TODO_TODOIST_URL,
   autohideMenuBar: false,
-  lockingFeatureEnabled: false,
+  isLockingFeatureEnabled: false,
   locked: false,
   lockedPassword: '',
   useTouchIdToUnlock: true,
@@ -452,7 +452,7 @@ export const DEFAULT_SERVICE_SETTINGS = {
   disablewebsecurity: false,
   spellcheckerLanguage: false,
   onlyShowFavoritesInUnreadCount: false,
-  proxyFeatureEnabled: false,
+  isProxyFeatureEnabled: false,
   proxyHost: '',
   proxyPort: 0,
   proxyUser: '',
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> {
               label: intl.formatMessage(messages.enableProxy),
               value: ifUndefined<boolean>(
                 serviceProxyConfig.isEnabled,
-                DEFAULT_SERVICE_SETTINGS.proxyFeatureEnabled,
+                DEFAULT_SERVICE_SETTINGS.isProxyFeatureEnabled,
               ),
-              default: DEFAULT_SERVICE_SETTINGS.proxyFeatureEnabled,
+              default: DEFAULT_SERVICE_SETTINGS.isProxyFeatureEnabled,
               type: 'checkbox',
             },
             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<
         wakeUpHibernationSplay: Boolean(settingsData.wakeUpHibernationSplay),
         predefinedTodoServer: settingsData.predefinedTodoServer,
         customTodoServer: settingsData.customTodoServer,
-        lockingFeatureEnabled: Boolean(settingsData.lockingFeatureEnabled),
+        isLockingFeatureEnabled: Boolean(settingsData.isLockingFeatureEnabled),
         lockedPassword: useOriginalPassword
           ? this.props.stores.settings.all.app.lockedPassword
           : hash(String(settingsData.lockedPassword)),
@@ -796,13 +796,13 @@ class EditSettingsScreen extends Component<
           ),
           default: DEFAULT_APP_SETTINGS.customTodoServer,
         },
-        lockingFeatureEnabled: {
+        isLockingFeatureEnabled: {
           label: intl.formatMessage(messages.enableLock),
           value: ifUndefined<boolean>(
-            settings.all.app.lockingFeatureEnabled,
-            DEFAULT_APP_SETTINGS.lockingFeatureEnabled,
+            settings.all.app.isLockingFeatureEnabled,
+            DEFAULT_APP_SETTINGS.isLockingFeatureEnabled,
           ),
-          default: DEFAULT_APP_SETTINGS.lockingFeatureEnabled,
+          default: DEFAULT_APP_SETTINGS.isLockingFeatureEnabled,
           type: 'checkbox',
         },
         lockedPassword: {
@@ -1223,7 +1223,7 @@ class EditSettingsScreen extends Component<
       updateVersion,
       updateStatusTypes,
       isClearingAllCache,
-      lockingFeatureEnabled,
+      isLockingFeatureEnabled,
     } = app;
     const { checkForUpdates, installUpdate, clearAllCache } =
       this.props.actions.app;
@@ -1247,7 +1247,7 @@ class EditSettingsScreen extends Component<
           getCacheSize={() => app.cacheSize}
           isClearingAllCache={isClearingAllCache}
           onClearAllCache={clearAllCache}
-          lockingFeatureEnabled={lockingFeatureEnabled}
+          isLockingFeatureEnabled={isLockingFeatureEnabled}
           automaticUpdates={this.props.stores.settings.app.automaticUpdates}
           isDarkmodeEnabled={this.props.stores.settings.app.darkMode}
           isAdaptableDarkModeEnabled={
diff --git a/src/lib/Menu.ts b/src/lib/Menu.ts
index 8ad4441d2..12dc1e42c 100644
--- a/src/lib/Menu.ts
+++ b/src/lib/Menu.ts
@@ -709,7 +709,7 @@ class FranzMenu implements StoresProps {
     const { intl } = window['ferdium'];
     const locked =
       this.stores.settings.app.locked &&
-      this.stores.settings.app.lockingFeatureEnabled &&
+      this.stores.settings.app.isLockingFeatureEnabled &&
       this.stores.user.isLoggedIn;
     const { actions } = this;
     const tpl = titleBarTemplateFactory(intl, locked);
@@ -847,7 +847,7 @@ class FranzMenu implements StoresProps {
           accelerator: `${lockFerdiumShortcutKey()}`,
           enabled:
             this.stores.user.isLoggedIn &&
-            this.stores.settings.app.lockingFeatureEnabled,
+            this.stores.settings.app.isLockingFeatureEnabled,
           click() {
             actions.settings.update({
               type: 'app',
diff --git a/src/stores/AppStore.ts b/src/stores/AppStore.ts
index b8c980dea..b8356bd56 100644
--- a/src/stores/AppStore.ts
+++ b/src/stores/AppStore.ts
@@ -121,8 +121,8 @@ export default class AppStore extends TypedStore {
 
   @observable isFocused = true;
 
-  @observable lockingFeatureEnabled =
-    DEFAULT_APP_SETTINGS.lockingFeatureEnabled;
+  @observable isLockingFeatureEnabled =
+    DEFAULT_APP_SETTINGS.isLockingFeatureEnabled;
 
   @observable launchInBackground = DEFAULT_APP_SETTINGS.autoLaunchInBackground;
 
diff --git a/src/stores/SettingsStore.ts b/src/stores/SettingsStore.ts
index 2e8568134..010290a4a 100644
--- a/src/stores/SettingsStore.ts
+++ b/src/stores/SettingsStore.ts
@@ -61,7 +61,7 @@ export default class SettingsStore extends TypedStore {
     let inactivityTimer;
     getCurrentWindow().on('blur', () => {
       if (
-        this.all.app.lockingFeatureEnabled &&
+        this.all.app.isLockingFeatureEnabled &&
         this.all.app.inactivityLock !== 0
       ) {
         inactivityTimer = setTimeout(
@@ -88,7 +88,7 @@ export default class SettingsStore extends TypedStore {
       if (
         !this.loaded &&
         resp.type === 'app' &&
-        resp.data.lockingFeatureEnabled
+        resp.data.isLockingFeatureEnabled
       ) {
         process.nextTick(() => {
           if (!this.all.app.locked) {
-- 
cgit v1.2.3-70-g09d2