nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #4655 from matrix-org/t3chguy/remove_cross_signing

Browse Source 
Remove feature_cross_signing
This commit is contained in:
Michael Telatynski
2020-06-03 10:42:13 +01:00
committed by GitHub
parent 7cfeda96d0 cc68f53fc2
commit 653b2ff060
25 changed files with 136 additions and 1696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
View File

@@ -17,7 +17,7 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
import {_t} from "../../../../../languageHandler";
import SettingsStore, {SettingLevel} from "../../../../../settings/SettingsStore";
import {SettingLevel} from "../../../../../settings/SettingsStore";
import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
import * as FormattingUtils from "../../../../../utils/FormattingUtils";
import AccessibleButton from "../../../elements/AccessibleButton";
@@ -306,9 +306,7 @@ export default class SecurityUserSettingsTab extends React.Component {
// in having advanced details here once all flows are implemented, we
// can remove this.
const CrossSigningPanel = sdk.getComponent('views.settings.CrossSigningPanel');
let crossSigning;
if (SettingsStore.getValue("feature_cross_signing")) {
crossSigning = (
const crossSigning = (
<div className='mx_SettingsTab_section'>
<span className="mx_SettingsTab_subheading">{_t("Cross-signing")}</span>
<div className='mx_SettingsTab_subsectionText'>
@@ -316,7 +314,6 @@ export default class SecurityUserSettingsTab extends React.Component {
</div>
</div>
);
}
const E2eAdvancedPanel = sdk.getComponent('views.settings.E2eAdvancedPanel');