Fix merge conflict v3.112.0

package.json

@@ -84,12 +84,8 @@
         "@babel/runtime": "^7.12.5",
         "@matrix-org/analytics-events": "^0.25.0",
         "@matrix-org/emojibase-bindings": "^1.1.2",
-<<<<<<< HEAD
-        "@matrix-org/matrix-wysiwyg": "2.37.8",
-        "@matrix-org/olm": "3.2.15",
-=======
         "@matrix-org/matrix-wysiwyg": "2.37.9",
->>>>>>> v3.112.0
+        "@matrix-org/olm": "3.2.15",
         "@matrix-org/react-sdk-module-api": "^2.4.0",
         "@matrix-org/spec": "^1.7.0",
         "@sentry/browser": "^8.0.0",

src/MatrixClientPeg.ts

@@ -32,12 +32,8 @@ import Modal from "./Modal";
 import MatrixClientBackedSettingsHandler from "./settings/handlers/MatrixClientBackedSettingsHandler";
 import * as StorageManager from "./utils/StorageManager";
 import IdentityAuthClient from "./IdentityAuthClient";
-<<<<<<< HEAD
 import { crossSigningCallbacks, tryToUnlockSecretStorageWithDehydrationKey } from "./SecurityManager";
 import { ModuleRunner } from "./modules/ModuleRunner";
-=======
-import { crossSigningCallbacks } from "./SecurityManager";
->>>>>>> v3.112.0
 import { SlidingSyncManager } from "./SlidingSyncManager";
 import CryptoStoreTooNewDialog from "./components/views/dialogs/CryptoStoreTooNewDialog";
 import { _t, UserFriendlyError } from "./languageHandler";
@@ -48,11 +44,8 @@ import PlatformPeg from "./PlatformPeg";
 import { formatList } from "./utils/FormattingUtils";
 import SdkConfig from "./SdkConfig";
 import { Features } from "./settings/Settings";
-<<<<<<< HEAD
 import { PhasedRolloutFeature } from "./utils/PhasedRolloutFeature";
-=======
 import { setDeviceIsolationMode } from "./settings/controllers/DeviceIsolationModeController.ts";
->>>>>>> v3.112.0
 
 export interface IMatrixClientCreds {
     homeserverUrl: string;
@@ -378,8 +371,10 @@ class MatrixClientPegClass implements IMatrixClientPeg {
                 storagePassword: rustCryptoStorePassword,
             });
 
-<<<<<<< HEAD
             StorageManager.setCryptoInitialised(true);
+
+            setDeviceIsolationMode(this.matrixClient, SettingsStore.getValue("feature_exclude_insecure_devices"));
+
             // TODO: device dehydration and whathaveyou
             return;
         }
@@ -404,14 +399,6 @@ class MatrixClientPegClass implements IMatrixClientPeg {
             // that the olm library was missing. It's not fatal.
             logger.warn("Unable to initialise e2e", e);
         }
-=======
-        StorageManager.setCryptoInitialised(true);
-
-        setDeviceIsolationMode(this.matrixClient, SettingsStore.getValue("feature_exclude_insecure_devices"));
-
-        // TODO: device dehydration and whathaveyou
-        return;
->>>>>>> v3.112.0
     }
 
     /**

src/SecurityManager.ts

@@ -6,14 +6,9 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
 Please see LICENSE files in the repository root for full details.
 */
 
-<<<<<<< HEAD
 import { Crypto, ICryptoCallbacks, MatrixClient, encodeBase64, SecretStorage } from "matrix-js-sdk/src/matrix";
 import { deriveKey } from "matrix-js-sdk/src/crypto/key_passphrase";
-import { decodeRecoveryKey } from "matrix-js-sdk/src/crypto/recoverykey";
-=======
-import { ICryptoCallbacks, SecretStorage } from "matrix-js-sdk/src/matrix";
 import { deriveRecoveryKeyFromPassphrase, decodeRecoveryKey } from "matrix-js-sdk/src/crypto-api";
->>>>>>> v3.112.0
 import { logger } from "matrix-js-sdk/src/logger";
 
 import type CreateSecretStorageDialog from "./async-components/views/dialogs/security/CreateSecretStorageDialog";
@@ -36,16 +31,13 @@ let secretStorageKeys: Record<string, Uint8Array> = {};
 let secretStorageKeyInfo: Record<string, SecretStorage.SecretStorageKeyDescription> = {};
 let secretStorageBeingAccessed = false;
 
-<<<<<<< HEAD
 let nonInteractive = false;
 
 let dehydrationCache: {
     key?: Uint8Array;
     keyInfo?: SecretStorage.SecretStorageKeyDescription;
 } = {};
 
-=======
->>>>>>> v3.112.0
 /**
  * This can be used by other components to check if secret storage access is in
  * progress, so that we can e.g. avoid intermittently showing toasts during

src/components/structures/auth/CompleteSecurity.tsx

@@ -88,15 +88,11 @@ export default class CompleteSecurity extends React.Component<IProps, IState> {
         const forceVerification = SdkConfig.get("force_verification") ?? false;
 
         let skipButton;
-<<<<<<< HEAD
-        if (phase === Phase.Intro || phase === Phase.ConfirmReset) {
+
+        if (!forceVerification && (phase === Phase.Intro || phase === Phase.ConfirmReset)) {
             // :Tchap: cross-signing-ui - Condition to skip Phase.ConfirmSkip and its "Are you sure" modal after login for csss
             const tchapOnSkipClick = phase === Phase.Intro ? this.props.onFinished : this.onSkipClick;
             // end :Tchap:
-
-=======
-        if (!forceVerification && (phase === Phase.Intro || phase === Phase.ConfirmReset)) {
->>>>>>> v3.112.0
             skipButton = (
                 <AccessibleButton
                     // :tchap: cross-signing-ui - remove onClick={this.onSkipClick}

src/components/structures/auth/Registration.tsx

@@ -607,9 +607,8 @@ export default class Registration extends React.Component<IProps, IState> {
             );
         } else if (this.state.matrixClient && this.state.flows.length) {
             let ssoSection: JSX.Element | undefined;
-<<<<<<< HEAD
             // :TCHAP: sso-agentconnect-flow
-            // if (this.state.ssoFlow) {
+            // if (!this.props.mobileRegister && this.state.ssoFlow) {
             //     let continueWithSection;
             //     const providers = this.state.ssoFlow.identity_providers || [];
             //     // when there is only a single (or 0) providers we show a wide button with `Continue with X` text
@@ -621,20 +620,6 @@ export default class Registration extends React.Component<IProps, IState> {
             //             </h2>
             //         );
             //     }
-=======
-            if (!this.props.mobileRegister && this.state.ssoFlow) {
-                let continueWithSection;
-                const providers = this.state.ssoFlow.identity_providers || [];
-                // when there is only a single (or 0) providers we show a wide button with `Continue with X` text
-                if (providers.length > 1) {
-                    // i18n: ssoButtons is a placeholder to help translators understand context
-                    continueWithSection = (
-                        <h2 className="mx_AuthBody_centered">
-                            {_t("auth|continue_with_sso", { ssoButtons: "" }).trim()}
-                        </h2>
-                    );
-                }
->>>>>>> v3.112.0
 
             //     // i18n: ssoButtons & usernamePassword are placeholders to help translators understand context
             //     ssoSection = (
@@ -655,18 +640,15 @@ export default class Registration extends React.Component<IProps, IState> {
             //             </h2>
             //         </React.Fragment>
             //     );
-            if (this.state.ssoFlow && TchapUIFeature.isSSOFlowActive()) {
+            if (!this.props.mobileRegister && this.state.ssoFlow && TchapUIFeature.isSSOFlowActive()) {
                 ssoSection = <>
                     <ProconnectButton/>
                     <p style={{textAlign: "center", fontWeight: "bold"}}>{_t("auth|sso|or")}</p>
                 </>
             }
-<<<<<<< HEAD
             // }
             // end :TCHAP:
 
-=======
->>>>>>> v3.112.0
             return (
                 <React.Fragment>
                     {ssoSection}

src/components/views/auth/PassphraseField.tsx

@@ -15,11 +15,8 @@ import withValidation, { IFieldState, IValidationResult } from "../elements/Vali
 import { _t, _td, TranslationKey } from "../../../languageHandler";
 import Field, { IInputProps } from "../elements/Field";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
-<<<<<<< HEAD
 import TchapStrongPassword from "../../../../../../src/tchap/util/TchapStrongPassword";
-=======
 import { Alignment } from "../elements/Tooltip";
->>>>>>> v3.112.0
 
 interface IProps extends Omit<IInputProps, "onValidate" | "element"> {
     autoFocus?: boolean;

src/components/views/auth/RegistrationForm.tsx

@@ -595,7 +595,6 @@ export default class RegistrationForm extends React.PureComponent<IProps, IState
         return (
             <div>
                 <form onSubmit={this.onSubmit}>
-<<<<<<< HEAD
                     { /* :TCHAP: registration-for-mainlining - remove username field, the server will generate it from email.
                     <div className="mx_AuthBody_fieldRow">
                         { this.renderUsername() }
@@ -607,14 +606,7 @@ export default class RegistrationForm extends React.PureComponent<IProps, IState
                         { this.renderEmail() }
                         { this.renderPhoneNumber() }
                     </div>
-=======
-                    <div className="mx_AuthBody_fieldRow">{this.renderUsername()}</div>
                     {passwordFields}
->>>>>>> v3.112.0
-                    <div className="mx_AuthBody_fieldRow">
-                        { this.renderPassword() }
-                        { this.renderPasswordConfirm() }
-                    </div>
                     { /* end :TCHAP: */}
                     { /** :TCHAP: registration-for-mainlining - remove helper text, adds confusion since email=username in tchap. // emailHelperText */ }
                     {registerButton}

src/components/views/context_menus/MessageContextMenu.tsx

@@ -51,13 +51,10 @@ import { getForwardableEvent } from "../../../events/forward/getForwardableEvent
 import { getShareableLocationEvent } from "../../../events/location/getShareableLocationEvent";
 import { ShowThreadPayload } from "../../../dispatcher/payloads/ShowThreadPayload";
 import { CardContext } from "../right_panel/context";
-<<<<<<< HEAD
 //:tchap: remove-thread-buttons - add feature flags
 import TchapUIFeature from "../../../../../../src/tchap/util/TchapUIFeature";
-=======
 import PinningUtils from "../../../utils/PinningUtils";
 import PosthogTrackers from "../../../PosthogTrackers.ts";
->>>>>>> v3.112.0
 
 interface IReplyInThreadButton {
     mxEvent: MatrixEvent;

src/components/views/messages/MessageActionBar.tsx

@@ -58,12 +58,9 @@ import { ShowThreadPayload } from "../../../dispatcher/payloads/ShowThreadPayloa
 import { GetRelationsForEvent, IEventTileType } from "../rooms/EventTile";
 import { VoiceBroadcastInfoEventType } from "../../../voice-broadcast/types";
 import { ButtonEvent } from "../elements/AccessibleButton";
-<<<<<<< HEAD
 import TchapUIFeature from "../../../../../../src/tchap/util/TchapUIFeature"; // :TCHAP: remove-thread-buttons
-=======
 import PinningUtils from "../../../utils/PinningUtils";
 import PosthogTrackers from "../../../PosthogTrackers.ts";
->>>>>>> v3.112.0
 
 interface IOptionsButtonProps {
     mxEvent: MatrixEvent;

src/components/views/right_panel/LegacyRoomHeaderButtons.tsx

@@ -30,11 +30,8 @@ import { SummarizedNotificationState } from "../../../stores/notifications/Summa
 import PosthogTrackers from "../../../PosthogTrackers";
 import { ButtonEvent } from "../elements/AccessibleButton";
 import { doesRoomOrThreadHaveUnreadMessages } from "../../../Unread";
-<<<<<<< HEAD
 import TchapUIFeature from "../../../../../../src/tchap/util/TchapUIFeature"; // :TCHAP: remove-thread-buttons
-=======
 import { usePinnedEvents, useReadPinnedEvents } from "../../../hooks/usePinnedEvents";
->>>>>>> v3.112.0
 
 const ROOM_INFO_PHASES = [
     RightPanelPhases.RoomSummary,

src/components/views/rooms/RoomHeader.tsx

@@ -262,18 +262,6 @@ export default function RoomHeader({
                     onClick={() => RightPanelStore.instance.showOrHidePhase(RightPanelPhases.RoomSummary)}
                     className="mx_RoomHeader_infoWrapper"
                 >
-<<<<<<< HEAD
-                    <button
-                        aria-label={_t("right_panel|room_summary_card|title")}
-                        tabIndex={0}
-                        onClick={() => {
-                            if (isReleaseAnnouncementOpen) {
-                                ReleaseAnnouncementStore.instance.nextReleaseAnnouncement();
-                            }
-                            RightPanelStore.instance.showOrHidePanel(RightPanelPhases.RoomSummary);
-                        }}
-                        className="mx_RoomHeader_infoWrapper"
-                    >
                     {/* :TCHAP: customize-room-header-bar - RoomAvatar -> DecoratedRoomAvatar
                     <WithPresenceIndicator room={room} size="8px">
                         <RoomAvatar room={room} size="40px" oobData={oobData} />
@@ -284,8 +272,6 @@ export default function RoomHeader({
                     {/* :tchap: customize-room-header-bar - Add external caption when room is open to external */}
                     <TchapExternalRoomHeader room={room}></TchapExternalRoomHeader>
                     {/* :tchap: end */}
-=======
->>>>>>> v3.112.0
                     <Box flex="1" className="mx_RoomHeader_info">
                         <BodyText
                             as="div"
@@ -298,12 +284,8 @@ export default function RoomHeader({
                         >
                             <span className="mx_RoomHeader_truncated mx_lineClamp">{roomName}</span>
 
-<<<<<<< HEAD
                             {/* :tchap: customize-room-header-bar - remove public forum icon
-                            {!isDirectMessage && roomState.getJoinRule() === JoinRule.Public && (
-=======
-                            {!isDirectMessage && joinRule === JoinRule.Public && (
->>>>>>> v3.112.0
+                            {!isDirectMessage && joinRule === JoinRule.Publicc && (
                                 <Tooltip label={_t("common|public_room")} placement="right">
                                     <PublicIcon
                                         width="16px"
@@ -313,13 +295,9 @@ export default function RoomHeader({
                                     />
                                 </Tooltip>
                             )}
-<<<<<<< HEAD
                             */}
 
                             {/* :tchap: customize-room-header-bar - do not show e2eStatus
-=======
-
->>>>>>> v3.112.0
                             {isDirectMessage && e2eStatus === E2EStatus.Verified && (
                                 <Tooltip label={_t("common|verified")} placement="right">
                                     <VerifiedIcon
@@ -330,13 +308,9 @@ export default function RoomHeader({
                                     />
                                 </Tooltip>
                             )}
-<<<<<<< HEAD
                             */}
 
                             {/* :tchap: customize-room-header-bar - do not show E2EStatus.Warning
-=======
-
->>>>>>> v3.112.0
                             {isDirectMessage && e2eStatus === E2EStatus.Warning && (
                                 <Tooltip label={_t("room|header_untrusted_label")} placement="right">
                                     <ErrorIcon
@@ -347,17 +321,10 @@ export default function RoomHeader({
                                     />
                                 </Tooltip>
                             )}
-<<<<<<< HEAD
                             */}
                         </BodyText>
-                        </Box>
-                    </button>
-                </ReleaseAnnouncement>
-=======
-                        </BodyText>
                     </Box>
                 </button>
->>>>>>> v3.112.0
                 <Flex align="center" gap="var(--cpd-space-2x)">
                     {additionalButtons?.map((props) => {
                         const label = props.label();

test/MatrixClientPeg-test.ts

@@ -8,26 +8,15 @@ Please see LICENSE files in the repository root for full details.
 
 import { logger } from "matrix-js-sdk/src/logger";
 import fetchMockJest from "fetch-mock-jest";
-<<<<<<< HEAD
 import EventEmitter from "events";
-import {
-    ProvideCryptoSetupExtensions,
-    SecretStorageKeyDescription,
-} from "@matrix-org/react-sdk-module-api/lib/lifecycles/CryptoSetupExtensions";
-=======
->>>>>>> v3.112.0
 
 import { advanceDateAndTime, stubClient } from "./test-utils";
 import { IMatrixClientPeg, MatrixClientPeg as peg } from "../src/MatrixClientPeg";
 import SettingsStore from "../src/settings/SettingsStore";
 import Modal from "../src/Modal";
 import PlatformPeg from "../src/PlatformPeg";
 import { SettingLevel } from "../src/settings/SettingLevel";
-<<<<<<< HEAD
 import { Features } from "../src/settings/Settings";
-import { ModuleRunner } from "../src/modules/ModuleRunner";
-=======
->>>>>>> v3.112.0
 
 jest.useFakeTimers();