OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6945 from matrix-org/t3chguy/fix/19390

pull/21833/head
Michael Telatynski 2021-10-14 13:40:27 +01:00 committed by GitHub
parent 4d8346f364 069a8d05f1
commit 6bb47ec710
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/structures/SpaceRoomView.tsx
View File

@ -80,6 +80,7 @@ import { useAsyncMemo } from "../../hooks/useAsyncMemo";
import Spinner from "../views/elements/Spinner"; import Spinner from "../views/elements/Spinner";
import GroupAvatar from "../views/avatars/GroupAvatar"; import GroupAvatar from "../views/avatars/GroupAvatar";
import { useDispatcher } from "../../hooks/useDispatcher"; import { useDispatcher } from "../../hooks/useDispatcher";
import { useRoomState } from "../../hooks/useRoomState";
import { logger } from "matrix-js-sdk/src/logger"; import { logger } from "matrix-js-sdk/src/logger";
import { shouldShowComponent } from "../../customisations/helpers/UIComponents"; import { shouldShowComponent } from "../../customisations/helpers/UIComponents";
@ -127,7 +128,7 @@ const useMyRoomMembership = (room: Room) => {
}; };
const SpaceInfo = ({ space }) => { const SpaceInfo = ({ space }) => {
const joinRule = space.getJoinRule(); const joinRule = useRoomState(space, state => state.getJoinRule());
let visibilitySection; let visibilitySection;
if (joinRule === "public") { if (joinRule === "public") {
@ -207,8 +208,9 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }: ISp
const spacesEnabled = SpaceStore.spacesEnabled; const spacesEnabled = SpaceStore.spacesEnabled;
const joinRule = useRoomState(space, state => state.getJoinRule());
const cannotJoin = getEffectiveMembership(myMembership) === EffectiveMembership.Leave const cannotJoin = getEffectiveMembership(myMembership) === EffectiveMembership.Leave
&& space.getJoinRule() !== JoinRule.Public; && joinRule !== JoinRule.Public;
let inviterSection; let inviterSection;
let joinButtons; let joinButtons;