Merge pull request #6492 from matrix-org/t3chguy/fix/18275.1

2021-07-28 09:10:00 +01:00
parent 9707797d45 52e50863f8
commit 98f3a5120c
2 changed files with 8 additions and 1 deletions
@@ -250,7 +250,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
                &nbsp;
                { _t("You can change this at any time from room settings.") }
            </p>;
-        } else if (this.state.joinRule === JoinRule.Public) {
+        } else if (this.state.joinRule === JoinRule.Public && this.props.parentSpace) {
            publicPrivateLabel = <p>
                { _t(
                    "Anyone will be able to find and join this room, not just members of <SpaceName/>.", {}, {
@@ -260,6 +260,12 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
                &nbsp;
                { _t("You can change this at any time from room settings.") }
            </p>;
+        } else if (this.state.joinRule === JoinRule.Public) {
+            publicPrivateLabel = <p>
+                { _t("Anyone will be able to find and join this room.") }
+                &nbsp;
+                { _t("You can change this at any time from room settings.") }
+            </p>;
        } else if (this.state.joinRule === JoinRule.Invite) {
            publicPrivateLabel = <p>
                { _t(