From a33ec08de20cb564a0a13820d20a60336b1fd945 Mon Sep 17 00:00:00 2001
From: Estelle Comment <estelle.comment@gmail.com>
Date: Mon, 5 Feb 2024 16:43:34 +0100
Subject: [PATCH] Upgrade conflicted patch export-room-members

---
 .../matrix-react-sdk+3.82.0.patch             | 25 -------------------
 .../matrix-react-sdk+3.88.0.patch             | 25 +++++++++++++++++++
 2 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 patches/export-room-members/matrix-react-sdk+3.82.0.patch
 create mode 100644 patches/export-room-members/matrix-react-sdk+3.88.0.patch

diff --git a/patches/export-room-members/matrix-react-sdk+3.82.0.patch b/patches/export-room-members/matrix-react-sdk+3.82.0.patch
deleted file mode 100644
index d40da3dbb5..0000000000
--- a/patches/export-room-members/matrix-react-sdk+3.82.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/node_modules/matrix-react-sdk/src/components/views/rooms/MemberList.tsx b/node_modules/matrix-react-sdk/src/components/views/rooms/MemberList.tsx
-index cb349b4..121c42b 100644
---- a/node_modules/matrix-react-sdk/src/components/views/rooms/MemberList.tsx
-+++ b/node_modules/matrix-react-sdk/src/components/views/rooms/MemberList.tsx
-@@ -53,6 +53,7 @@ import { UIComponent } from "../../../settings/UIFeature";
- import PosthogTrackers from "../../../PosthogTrackers";
- import { SDKContext } from "../../../contexts/SDKContext";
- import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
-+import TchapExportMembersButton from "../../../../../../src/tchap/components/views/rooms/TchapExportMembersButton"; // TCHAP
- 
- const INITIAL_LOAD_NUM_MEMBERS = 30;
- const INITIAL_LOAD_NUM_INVITED = 5;
-@@ -420,6 +421,12 @@ export default class MemberList extends React.Component<IProps, IState> {
-                     <React.Fragment>
-                         {scopeHeader}
-                         {inviteButton}
-+                        {/** TCHAP */}
-+                        <TchapExportMembersButton
-+                            room={room}
-+                            roomMembersIds={this.state.filteredJoinedMembers.map(roomMember => roomMember.userId)}>
-+                        </TchapExportMembersButton>
-+                        {/** end TCHAP */}
-                     </React.Fragment>
-                 }
-                 footer={footer}
diff --git a/patches/export-room-members/matrix-react-sdk+3.88.0.patch b/patches/export-room-members/matrix-react-sdk+3.88.0.patch
new file mode 100644
index 0000000000..c64ef9a792
--- /dev/null
+++ b/patches/export-room-members/matrix-react-sdk+3.88.0.patch
@@ -0,0 +1,25 @@
+diff --git a/node_modules/matrix-react-sdk/src/components/views/rooms/MemberList.tsx b/node_modules/matrix-react-sdk/src/components/views/rooms/MemberList.tsx
+index 639e149..e6e4317 100644
+--- a/node_modules/matrix-react-sdk/src/components/views/rooms/MemberList.tsx
++++ b/node_modules/matrix-react-sdk/src/components/views/rooms/MemberList.tsx
+@@ -55,6 +55,7 @@ import { canInviteTo } from "../../../utils/room/canInviteTo";
+ import { inviteToRoom } from "../../../utils/room/inviteToRoom";
+ import { Action } from "../../../dispatcher/actions";
+ import { SpaceScopeHeader } from "./SpaceScopeHeader";
++import TchapExportMembersButton from "../../../../../../src/tchap/components/views/rooms/TchapExportMembersButton"; // TCHAP
+ 
+ const INITIAL_LOAD_NUM_MEMBERS = 30;
+ const INITIAL_LOAD_NUM_INVITED = 5;
+@@ -420,6 +421,12 @@ export default class MemberList extends React.Component<IProps, IState> {
+                 onClose={this.props.onClose}
+             >
+                 {inviteButton}
++                {/** TCHAP */}
++                <TchapExportMembersButton
++                    room={room}
++                    roomMembersIds={this.state.filteredJoinedMembers.map(roomMember => roomMember.userId)}>
++                </TchapExportMembersButton>
++                {/** end TCHAP */}
+                 <div className="mx_MemberList_wrapper">
+                     <TruncatedList
+                         className="mx_MemberList_section mx_MemberList_joined"