Additional merge fix

Author: hughns

src/components/views/dialogs/UserTab.ts

@@ -16,14 +16,15 @@ limitations under the License.
 
 export enum UserTab {
     General = "USER_GENERAL_TAB",
+    Account = "USER_GENERAL_ACCOUNT",
     Appearance = "USER_APPEARANCE_TAB",
     Notifications = "USER_NOTIFICATIONS_TAB",
     Preferences = "USER_PREFERENCES_TAB",
     Keyboard = "USER_KEYBOARD_TAB",
     Sidebar = "USER_SIDEBAR_TAB",
     Voice = "USER_VOICE_TAB",
-    Security = "USER_SECURITY_TAB",
+    SecureMessaging = "USER_SECUREMESSAGING_TAB",
     Labs = "USER_LABS_TAB",
-    Mjolnir = "USER_MJOLNIR_TAB",
+    Privacy = "USER_MJOLNIR_TAB",
     Help = "USER_HELP_TAB",
 }

src/components/views/settings/E2eDevicesPanel.tsx

@@ -22,7 +22,6 @@ import { CrossSigningInfo } from "matrix-js-sdk/src/crypto/CrossSigning";
 
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import DevicesPanelEntry from "./DevicesPanelEntry";
 import Spinner from "../elements/Spinner";
 import AccessibleButton from "../elements/AccessibleButton";
@@ -38,7 +37,6 @@ interface IState {
     selectedDevices: string[];
 }
 
-@replaceableComponent("views.settings.E2eDevicesPanel")
 export default class E2eDevicesPanel extends React.Component<IProps, IState> {
     private unmounted = false;
 

src/components/views/settings/tabs/user/AccountUserSettingsTab.tsx

@@ -30,7 +30,6 @@ import dis from "../../../../../dispatcher/dispatcher";
 import { getThreepidsWithBindStatus } from '../../../../../boundThreepids';
 import Spinner from "../../../elements/Spinner";
 import { UIFeature } from "../../../../../settings/UIFeature";
-import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import { ActionPayload } from "../../../../../dispatcher/payloads";
 import ErrorDialog from "../../../dialogs/ErrorDialog";
 import AccountPhoneNumbers from "../../account/PhoneNumbers";
@@ -51,7 +50,6 @@ interface IState {
     canChangePassword: boolean;
 }
 
-@replaceableComponent("views.settings.tabs.user.AccountUserSettingsTab")
 export default class AccountUserSettingsTab extends React.Component<IProps, IState> {
     private readonly dispatcherRef: string;
 

src/components/views/settings/tabs/user/PrivacyUserSettingsTab.tsx

@@ -28,7 +28,6 @@ import { ListRule } from "../../../../../mjolnir/ListRule";
 import { BanList, RULE_SERVER, RULE_USER } from "../../../../../mjolnir/BanList";
 import Modal from "../../../../../Modal";
 import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
-import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import ErrorDialog from "../../../dialogs/ErrorDialog";
 import QuestionDialog from "../../../dialogs/QuestionDialog";
 import AccessibleButton from "../../../elements/AccessibleButton";
@@ -107,7 +106,6 @@ interface IState {
     haveIdServer: boolean;
 }
 
-@replaceableComponent("views.settings.tabs.user.MjolnirUserSettingsTab")
 export default class MjolnirUserSettingsTab extends React.Component<IProps, IState> {
     private dispatcherRef: string;
     private mjolnirWatcher: string;

src/components/views/settings/tabs/user/SecureMessagingUserSettingsTab.tsx

@@ -17,12 +17,11 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from "../../../../../languageHandler";
-import { privateShouldBeEncrypted } from "../../../../../createRoom";
+import { privateShouldBeEncrypted } from "../../../../../utils/rooms";
 import SecureBackupPanel from "../../SecureBackupPanel";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import { UIFeature } from "../../../../../settings/UIFeature";
 import E2eAdvancedPanel, { isE2eAdvancedPanelPossible } from "../../E2eAdvancedPanel";
-import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import CryptographyPanel from "../../CryptographyPanel";
 import E2eDevicesPanel from "../../E2eDevicesPanel";
 import CrossSigningPanel from "../../CrossSigningPanel";
@@ -37,7 +36,6 @@ interface IState {
     canChangePassword: boolean;
 }
 
-@replaceableComponent("views.settings.tabs.user.SecureMessagingUserSettingsTab")
 export default class SecureMessagingUserSettingsTab extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);

yarn.lock

@@ -6232,7 +6232,7 @@ matrix-encrypt-attachment@^1.0.3:
   resolved "https://registry.yarnpkg.com/matrix-encrypt-attachment/-/matrix-encrypt-attachment-1.0.3.tgz#6e016587728c396549c833985f39cbf6c07ee97b"
   integrity sha512-NwfoDY/yHL9Zo8KrY5GP8ymAoZJpEFKEK+IgJKdWf5xtsIFf7KIU2pbw8+Eq592j//nSDOC+/Ff4Fk8gVvDZpw==
 
-matrix-events-sdk@^0.0.1-beta.7:
+matrix-events-sdk@^0.0.1-beta.6, matrix-events-sdk@^0.0.1-beta.7:
   version "0.0.1-beta.7"
   resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934"
   integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA==
@@ -6247,7 +6247,7 @@ matrix-events-sdk@^0.0.1-beta.7:
     bs58 "^4.0.1"
     content-type "^1.0.4"
     loglevel "^1.7.1"
-    matrix-events-sdk "^0.0.1-beta.6"
+    matrix-events-sdk "^0.0.1-beta.7"
     p-retry "^4.5.0"
     qs "^6.9.6"
     request "^2.88.2"