Resolved linting errors

matrix-org · Aug 16, 2022 · fbdf224 · fbdf224
1 parent 104d560
commit fbdf224
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/cypress/e2e/knocking/knocking.spec.ts b/cypress/e2e/knocking/knocking.spec.ts
@@ -14,7 +14,6 @@ limitations under the License.
 /// <reference types="cypress" />
 
 import { SynapseInstance } from "../../plugins/synapsedocker";
-import { MatrixClient } from "../../global";
 import Chainable = Cypress.Chainable;
 
 function openCreateRoomDialog(): Chainable<JQuery<HTMLElement>> {
@@ -56,7 +55,6 @@ describe("Knocking", () => {
 
  // Change room settings
  cy.openRoomSettings("Security & Privacy");
- cy.get(".mx_StyledRadioButton_content").contains("Ask to join").click();
  cy.closeDialog();
 
  //Check if the room settings are visible if labs flag is disabled

diff --git a/src/TextForEvent.tsx b/src/TextForEvent.tsx
@@ -235,6 +235,10 @@ function textForJoinRulesEvent(ev: MatrixEvent, allowJSX: boolean): () => Render
  return () => _t('%(senderDisplayName)s made the room invite only.', {
  senderDisplayName,
  });
+ case JoinRule.Knock:
+ return () => _t('%(senderDisplayName)s made the room knock only.', {
+ senderDisplayName,
+ });
  case JoinRule.Restricted:
  if (allowJSX) {
  return () => <span>

diff --git a/src/components/views/dialogs/CreateRoomDialog.tsx b/src/components/views/dialogs/CreateRoomDialog.tsx
@@ -123,6 +123,9 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
  opts.joinRule = JoinRule.Restricted;
  }
 
+ if (this.state.joinRule === JoinRule.Knock) {
+ opts.joinRule = JoinRule.Knock;
+ }
  return opts;
  }
 

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
@@ -496,6 +496,7 @@
  "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s upgraded this room.",
  "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s made the room public to whoever knows the link.",
  "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s made the room invite only.",
+ "%(senderDisplayName)s made the room knock only.": "%(senderDisplayName)s made the room knock only.",
  "%(senderDisplayName)s changed who can join this room. <a>View settings</a>.": "%(senderDisplayName)s changed who can join this room. <a>View settings</a>.",
  "%(senderDisplayName)s changed who can join this room.": "%(senderDisplayName)s changed who can join this room.",
  "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s changed the join rule to %(rule)s",