Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix inability to join a knock room via space hierarchy view #12404

Merged
merged 4 commits into from
Apr 11, 2024
Merged

Fix inability to join a knock room via space hierarchy view #12404

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a222bf
Fix inability to join a `knock` room via space hierarchy view
t3chguy Apr 8, 2024
8a17636
Update src/components/structures/SpaceHierarchy.tsx
t3chguy Apr 8, 2024
6baa15b
Add test
t3chguy Apr 9, 2024
1d37311
Update snapshot
t3chguy Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/structures/SpaceHierarchy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import {
HistoryVisibility,
HierarchyRelation,
HierarchyRoom,
JoinRule,
} from "matrix-js-sdk/src/matrix";
import { RoomHierarchy } from "matrix-js-sdk/src/room-hierarchy";
import classNames from "classnames";
Expand Down Expand Up @@ -157,7 +158,8 @@ const Tile: React.FC<ITileProps> = ({
<Spinner w={24} h={24} />
</AccessibleTooltipButton>
);
} else if (joinedRoom) {
} else if (joinedRoom || room.join_rule === JoinRule.Knock) {
// We use the view flow for knock rooms as it allows us to reuse the request to join UX in RoomView
button = (
<AccessibleButton
onClick={onPreviewClick}
Expand Down
Loading