From 3c436c96171a677a683ed9c5fe831138294f4e7b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 30 Jul 2021 12:20:02 +0100
Subject: [PATCH] update setting naming to match style

---
 .../settings/tabs/user/PreferencesUserSettingsTab.tsx     | 2 +-
 src/components/views/spaces/SpacePanel.tsx                | 2 +-
 src/settings/Settings.tsx                                 | 2 +-
 src/stores/SpaceStore.tsx                                 | 8 ++++----
 test/stores/SpaceStore-test.ts                            | 2 +-
 test/stores/room-list/SpaceWatcher-test.ts                | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
index 53d8d41f69..d3da8a7784 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
@@ -49,7 +49,7 @@ export default class PreferencesUserSettingsTab extends React.Component<{}, ISta
     ];
 
     static SPACES_SETTINGS = [
-        "Spaces.all_rooms_in_home",
+        "Spaces.allRoomsInHome",
     ];
 
     static KEYBINDINGS_SETTINGS = [
diff --git a/src/components/views/spaces/SpacePanel.tsx b/src/components/views/spaces/SpacePanel.tsx
index bbe27ced75..58e1db4b1d 100644
--- a/src/components/views/spaces/SpacePanel.tsx
+++ b/src/components/views/spaces/SpacePanel.tsx
@@ -83,7 +83,7 @@ const HomeButtonContextMenu = ({ onFinished, ...props }: ComponentProps<typeof S
                 label={_t("Show all rooms")}
                 active={allRoomsInHome}
                 onClick={() => {
-                    SettingsStore.setValue("Spaces.all_rooms_in_home", null, SettingLevel.ACCOUNT, !allRoomsInHome);
+                    SettingsStore.setValue("Spaces.allRoomsInHome", null, SettingLevel.ACCOUNT, !allRoomsInHome);
                 }}
             />
         </IconizedContextMenuOptionList>
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 8ee9c8c427..7ca57adb08 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -749,7 +749,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         default: null,
     },
-    "Spaces.all_rooms_in_home": {
+    "Spaces.allRoomsInHome": {
         displayName: _td("Show all rooms in Home"),
         description: _td("All rooms you're in will appear in Home."),
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
index 3b2f402173..da18646d0f 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -117,12 +117,12 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
     private _invitedSpaces = new Set<Room>();
     private spaceOrderLocalEchoMap = new Map<string, string>();
     private _restrictedJoinRuleSupport?: IRoomCapability;
-    private _allRoomsInHome: boolean = SettingsStore.getValue("Spaces.all_rooms_in_home");
+    private _allRoomsInHome: boolean = SettingsStore.getValue("Spaces.allRoomsInHome");
 
     constructor() {
         super(defaultDispatcher, {});
 
-        SettingsStore.monitorSetting("Spaces.all_rooms_in_home", null);
+        SettingsStore.monitorSetting("Spaces.allRoomsInHome", null);
     }
 
     public get invitedSpaces(): Room[] {
@@ -812,8 +812,8 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
 
             case Action.SettingUpdated: {
                 const settingUpdatedPayload = payload as SettingUpdatedPayload;
-                if (settingUpdatedPayload.settingName === "Spaces.all_rooms_in_home") {
-                    const newValue = SettingsStore.getValue("Spaces.all_rooms_in_home");
+                if (settingUpdatedPayload.settingName === "Spaces.allRoomsInHome") {
+                    const newValue = SettingsStore.getValue("Spaces.allRoomsInHome");
                     if (this.allRoomsInHome !== newValue) {
                         this._allRoomsInHome = newValue;
                         this.emit(UPDATE_HOME_BEHAVIOUR, this.allRoomsInHome);
diff --git a/test/stores/SpaceStore-test.ts b/test/stores/SpaceStore-test.ts
index eb3d5f0b97..2e823aa72b 100644
--- a/test/stores/SpaceStore-test.ts
+++ b/test/stores/SpaceStore-test.ts
@@ -85,7 +85,7 @@ describe("SpaceStore", () => {
     const setShowAllRooms = async (value: boolean) => {
         if (store.allRoomsInHome === value) return;
         const emitProm = testUtils.emitPromise(store, UPDATE_HOME_BEHAVIOUR);
-        await SettingsStore.setValue("Spaces.all_rooms_in_home", null, SettingLevel.DEVICE, value);
+        await SettingsStore.setValue("Spaces.allRoomsInHome", null, SettingLevel.DEVICE, value);
         jest.runAllTimers(); // run async dispatch
         await emitProm;
     };
diff --git a/test/stores/room-list/SpaceWatcher-test.ts b/test/stores/room-list/SpaceWatcher-test.ts
index c6254349b5..85f79c75b6 100644
--- a/test/stores/room-list/SpaceWatcher-test.ts
+++ b/test/stores/room-list/SpaceWatcher-test.ts
@@ -47,7 +47,7 @@ describe("SpaceWatcher", () => {
 
     const setShowAllRooms = async (value: boolean) => {
         if (store.allRoomsInHome === value) return;
-        await SettingsStore.setValue("Spaces.all_rooms_in_home", null, SettingLevel.DEVICE, value);
+        await SettingsStore.setValue("Spaces.allRoomsInHome", null, SettingLevel.DEVICE, value);
         await testUtils.emitPromise(store, UPDATE_HOME_BEHAVIOUR);
     };