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

Remove invite only padlocks feature flag #4487

Merged
merged 1 commit into from
Apr 24, 2020
Merged

Remove invite only padlocks feature flag #4487

Show file tree
Hide file tree
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
5 changes: 0 additions & 5 deletions src/components/views/rooms/InviteOnlyIcon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ limitations under the License.
import React from 'react';
import { _t } from '../../../languageHandler';
import * as sdk from '../../../index';
import SettingsStore from '../../../settings/SettingsStore';

export default class InviteOnlyIcon extends React.Component {
constructor() {
Expand All @@ -39,10 +38,6 @@ export default class InviteOnlyIcon extends React.Component {
render() {
const classes = this.props.collapsedPanel ? "mx_InviteOnlyIcon_small": "mx_InviteOnlyIcon_large";

if (!SettingsStore.isFeatureEnabled("feature_invite_only_padlocks")) {
return null;
}

const Tooltip = sdk.getComponent("elements.Tooltip");
let tooltip;
if (this.state.hover) {
Expand Down
1 change: 0 additions & 1 deletion src/i18n/strings/en_EN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,6 @@
"Support adding custom themes": "Support adding custom themes",
"Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
"Show info about bridges in room settings": "Show info about bridges in room settings",
"Show padlocks on invite only rooms": "Show padlocks on invite only rooms",
"Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
"Use compact timeline layout": "Use compact timeline layout",
"Show a placeholder for removed messages": "Show a placeholder for removed messages",
Expand Down
6 changes: 0 additions & 6 deletions src/settings/Settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,12 +158,6 @@ export const SETTINGS = {
displayName: _td("Show info about bridges in room settings"),
default: false,
},
"feature_invite_only_padlocks": {
isFeature: true,
supportedLevels: LEVELS_FEATURE,
displayName: _td("Show padlocks on invite only rooms"),
default: true,
},
"MessageComposerInput.suggestEmoji": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td('Enable Emoji suggestions while typing'),
Expand Down