diff --git a/patches/patches.json b/patches/patches.json index 7cc175e65..7de7b18e2 100644 --- a/patches/patches.json +++ b/patches/patches.json @@ -145,7 +145,7 @@ "package": "matrix-react-sdk", "files": ["src/components/views/dialogs/security/AccessSecretStorageDialog.tsx"] }, - "use-the-term-direct-messages-not-people": { + "use-the-term-direct-messages-not-people-and-tchap-annonces": { "github-issue": "https://github.com/tchapgouv/tchap-web-v4/issues/448", "package": "matrix-react-sdk", "files": [ diff --git a/patches/use-the-term-direct-messages-not-people/matrix-react-sdk+3.95.0.patch b/patches/use-the-term-direct-messages-not-people-and-tchap-annonces/matrix-react-sdk+3.95.0.patch similarity index 89% rename from patches/use-the-term-direct-messages-not-people/matrix-react-sdk+3.95.0.patch rename to patches/use-the-term-direct-messages-not-people-and-tchap-annonces/matrix-react-sdk+3.95.0.patch index 667d4eb23..6ab6f8775 100644 --- a/patches/use-the-term-direct-messages-not-people/matrix-react-sdk+3.95.0.patch +++ b/patches/use-the-term-direct-messages-not-people-and-tchap-annonces/matrix-react-sdk+3.95.0.patch @@ -12,9 +12,21 @@ index 8e8e4ce..bd2b4d3 100644 {_t("space|preferences|show_people_in_space", { diff --git a/node_modules/matrix-react-sdk/src/components/views/rooms/RoomList.tsx b/node_modules/matrix-react-sdk/src/components/views/rooms/RoomList.tsx -index 28154c4..09f40ca 100644 +index 28154c4..ac9326b 100644 --- a/node_modules/matrix-react-sdk/src/components/views/rooms/RoomList.tsx +++ b/node_modules/matrix-react-sdk/src/components/views/rooms/RoomList.tsx +@@ -82,10 +82,10 @@ interface IState { + export const TAG_ORDER: TagID[] = [ + DefaultTagID.Invite, + DefaultTagID.Favourite, ++ DefaultTagID.ServerNotice, // :TCHAP: tchap-annonces + DefaultTagID.DM, + DefaultTagID.Untagged, + DefaultTagID.LowPriority, +- DefaultTagID.ServerNotice, + DefaultTagID.Suggested, + // DefaultTagID.Archived isn't here any more: we don't show it at all. + // The section still exists in the code as a place for rooms that we know @@ -382,7 +382,7 @@ const TAG_AESTHETICS: TagAestheticsMap = { defaultHidden: false, },