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

Space Room View should react to join rule changes down /sync #6945

Merged
merged 1 commit into from
Oct 14, 2021
Merged

Space Room View should react to join rule changes down /sync #6945

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/components/structures/SpaceRoomView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ import { useAsyncMemo } from "../../hooks/useAsyncMemo";
import Spinner from "../views/elements/Spinner";
import GroupAvatar from "../views/avatars/GroupAvatar";
import { useDispatcher } from "../../hooks/useDispatcher";
import { useRoomState } from "../../hooks/useRoomState";

import { logger } from "matrix-js-sdk/src/logger";

Expand Down Expand Up @@ -124,7 +125,7 @@ const useMyRoomMembership = (room: Room) => {
};

const SpaceInfo = ({ space }) => {
const joinRule = space.getJoinRule();
const joinRule = useRoomState(space, state => state.getJoinRule());

let visibilitySection;
if (joinRule === "public") {
Expand Down Expand Up @@ -204,8 +205,9 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }: ISp

const spacesEnabled = SpaceStore.spacesEnabled;

const joinRule = useRoomState(space, state => state.getJoinRule());
const cannotJoin = getEffectiveMembership(myMembership) === EffectiveMembership.Leave
&& space.getJoinRule() !== JoinRule.Public;
&& joinRule !== JoinRule.Public;

let inviterSection;
let joinButtons;
Expand Down