Tchap : fix conflict with element 1.11.89

.eslintrc.js

@@ -174,7 +174,7 @@ module.exports = {
     overrides: [
         {
             // :TCHAP: also lint our cypress files, copied from react-sdk, because react-sdk lints them.
-            files: ["cypress/**/*.ts", "src/**/*.{ts,tsx}", "test/**/*.{ts,tsx}", "scripts/*.ts", "playwright/**/*.ts"],
+            files: ["src/**/*.{ts,tsx}", "test/**/*.{ts,tsx}", "scripts/tchap/*.ts", "playwright/**/*.ts"],
             extends: ["plugin:matrix-org/typescript", "plugin:matrix-org/react"],
             rules: {
                 "@typescript-eslint/explicit-function-return-type": [

.github/CODEOWNERS

@@ -1,22 +0,0 @@
-<<<<<<< HEAD
-=======
-*                         @element-hq/element-web-reviewers
-/.github/workflows/**     @element-hq/element-web-team
-/package.json             @element-hq/element-web-team
-/yarn.lock                @element-hq/element-web-team
-
-/src/SecurityManager.ts                           @element-hq/element-crypto-web-reviewers
-/test/SecurityManager-test.ts                     @element-hq/element-crypto-web-reviewers
-/src/async-components/views/dialogs/security/     @element-hq/element-crypto-web-reviewers
-/src/components/views/dialogs/security/           @element-hq/element-crypto-web-reviewers
-/test/components/views/dialogs/security/          @element-hq/element-crypto-web-reviewers
-/src/stores/SetupEncryptionStore.ts               @element-hq/element-crypto-web-reviewers
-/test/stores/SetupEncryptionStore-test.ts         @element-hq/element-crypto-web-reviewers
-
-# Ignore translations as those will be updated by GHA for Localazy download
-/src/i18n/strings
-/src/i18n/strings/en_EN.json  @element-hq/element-web-reviewers
-# Ignore the synapse plugin as this is updated by GHA for docker image updating
-/playwright/plugins/homeserver/synapse/index.ts
-
->>>>>>> v1.11.89

package.json

@@ -1,12 +1,8 @@
 {
     "name": "element-web",
-<<<<<<< HEAD
     "productName": "Tchap",
     "version": "4.12.1",
-    "version-element-web": "1.11.87",
-=======
-    "version": "1.11.89",
->>>>>>> v1.11.89
+    "version-element-web": "1.11.89",
     "description": "A feature-rich client for Matrix.org",
     "author": "DINUM",
     "repository": {
@@ -79,13 +75,9 @@
         "test:playwright:open": "yarn test:playwright --ui",
         "test:playwright:screenshots": "yarn test:playwright:screenshots:build && yarn test:playwright:screenshots:run",
         "test:playwright:screenshots:build": "docker build playwright -t element-web-playwright",
-<<<<<<< HEAD
-        "test:playwright:screenshots:run": "docker run --rm --network host -e BASE_URL -e CI -v $(pwd):/work/ -v $(node -e 'console.log(require(`path`).dirname(require.resolve(`matrix-js-sdk/package.json`)))'):/work/node_modules/matrix-js-sdk -v /var/run/docker.sock:/var/run/docker.sock -v /tmp/:/tmp/ -it element-web-playwright",
+        "test:playwright:screenshots:run": "docker run --rm --network host -e BASE_URL -e CI -v $(pwd):/work/ -v $(node -e 'console.log(require(`path`).dirname(require.resolve(`matrix-js-sdk/package.json`)))'):/work/node_modules/matrix-js-sdk -v /var/run/docker.sock:/var/run/docker.sock -v /tmp/:/tmp/ -it element-web-playwright --grep @screenshot",
         "test:tchap": "jest unit-tests/tchap/",
         "coverage:tchap": "yarn test:tchap --coverage",
-=======
-        "test:playwright:screenshots:run": "docker run --rm --network host -e BASE_URL -e CI -v $(pwd):/work/ -v $(node -e 'console.log(require(`path`).dirname(require.resolve(`matrix-js-sdk/package.json`)))'):/work/node_modules/matrix-js-sdk -v /var/run/docker.sock:/var/run/docker.sock -v /tmp/:/tmp/ -it element-web-playwright --grep @screenshot",
->>>>>>> v1.11.89
         "coverage": "yarn test --coverage",
         "analyse:unused-exports": "ts-node ./scripts/analyse_unused_exports.ts",
         "patch-package": "patch-package",

src/components/structures/RoomSearchView.tsx

@@ -26,12 +26,8 @@ import ErrorDialog from "../views/dialogs/ErrorDialog";
 import ResizeNotifier from "../../utils/ResizeNotifier";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import { RoomPermalinkCreator } from "../../utils/permalinks/Permalinks";
-<<<<<<< HEAD
-import RoomContext from "../../contexts/RoomContext";
 import Tchapi18nUtils from "~tchap-web/src/tchap/i18n/Tchapi18nUtils"; // :tchap: error-tchap-is-down
-=======
 import { useScopedRoomContext } from "../../contexts/ScopedRoomContext.tsx";
->>>>>>> v1.11.89
 
 const DEBUG = false;
 let debuglog = function (msg: string): void {};

src/components/views/rooms/ThreadSummary.tsx

@@ -23,12 +23,9 @@ import defaultDispatcher from "../../../dispatcher/dispatcher";
 import { useUnreadNotifications } from "../../../hooks/useUnreadNotifications";
 import { notificationLevelToIndicator } from "../../../utils/notifications";
 import { EventPreviewTile, useEventPreview } from "./EventPreview.tsx";
-<<<<<<< HEAD
 import ExternalLink from "../elements/ExternalLink"; // :TCHAP: better-text-for-locked-messages
 import TchapUrls from "~tchap-web/src/tchap/util/TchapUrls"; // :TCHAP: better-text-for-locked-messages
-=======
 import { useScopedRoomContext } from "../../../contexts/ScopedRoomContext.tsx";
->>>>>>> v1.11.89
 
 interface IProps {
     mxEvent: MatrixEvent;
@@ -85,20 +82,6 @@ export const ThreadMessagePreview: React.FC<IPreviewProps> = ({ thread, showDisp
         return null;
     }
 
-    // :TCHAP: better-text-for-locked-messages
-    const undecryptedText = _t(
-        "threads|unable_to_decrypt_with_info_message",
-        {},
-        {
-            a: (sub) => (
-                <ExternalLink href={TchapUrls.lockedMessagesPage}>
-                    {sub}
-                </ExternalLink>
-            ),
-        },
-    );
-    // end :TCHAP:
-
     return (
         <>
             <MemberAvatar