Upgrade conflicted patch export-room-members

tchapgouv · Feb 5, 2024 · a33ec08 · a33ec08
1 parent de66591
commit a33ec08
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
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
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
@@ -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"