imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Iterate

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2023-09-12 15:36:22 +01:00
parent 159deec937
commit 89fa7b4b39
No known key found for this signature in database
GPG key ID: A2B008A5F49F5D0D
6 changed files with 39 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/structures/RoomView.tsx
View file

@ -130,7 +130,6 @@ import { isNotUndefined } from "../../Typeguards";
import { CancelAskToJoinPayload } from "../../dispatcher/payloads/CancelAskToJoinPayload";
import { SubmitAskToJoinPayload } from "../../dispatcher/payloads/SubmitAskToJoinPayload";
import RightPanelStore from "../../stores/right-panel/RightPanelStore";
import { setPhase } from "../../utils/room/setPhase";
const DEBUG = false;
const PREVENT_MULTIPLE_JITSI_WITHIN = 30_000;
@ -1268,14 +1267,16 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
]);
}
} else {
setPhase(RightPanelPhases.RoomMemberList);
RightPanelStore.instance.setPhase(RightPanelPhases.RoomMemberList);
}
break;
case "view_3pid_invite":
if (payload.event) {
setPhase(RightPanelPhases.Room3pidMemberInfo, { memberInfoEvent: payload.event });
RightPanelStore.instance.setPhase(RightPanelPhases.Room3pidMemberInfo, {
memberInfoEvent: payload.event,
});
} else {
setPhase(RightPanelPhases.RoomMemberList);
RightPanelStore.instance.setPhase(RightPanelPhases.RoomMemberList);
}
break;
}

7
src/components/structures/SpaceRoomView.tsx
View file

@ -669,13 +669,14 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
return;
}
if (payload.action !== Action.ViewUser && payload.action !== "view_3pid_invite") return;
/**
* The rest of the `ViewUser` and `view_3pid_invite` exists in the `<RoomView />`
* component. This deals specifically with showing the space members list
*/
if (!payload.member && !payload.event) {
if (
(payload.action === Action.ViewUser && !payload.member) ||
(payload.action === "view_3pid_invite" && payload.event === null)
) {
RightPanelStore.instance.setCard({
phase: RightPanelPhases.SpaceMemberList,
state: { spaceId: this.props.space.roomId },