imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Release Sign in with QR out of labs (#10066)" (#10176)

Browse source
This commit is contained in:
Hugh Nimmo-Smith 2023-02-16 12:10:52 +00:00 • committed by GitHub
parent a3a2a0f914
commit f0359a5c18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 66 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx
View file

@ -381,6 +381,7 @@ export default class SecurityUserSettingsTab extends React.Component<IProps, ISt
}
const useNewSessionManager = SettingsStore.getValue("feature_new_device_manager");
const showQrCodeEnabled = SettingsStore.getValue("feature_qr_signin_reciprocate_show");
const devicesSection = useNewSessionManager ? null : (
<>
<div className="mx_SettingsTab_heading">{_t("Where you're signed in")}</div>
@ -393,13 +394,15 @@ export default class SecurityUserSettingsTab extends React.Component<IProps, ISt
</span>
<DevicesPanel />
</div>
<LoginWithQRSection onShowQr={this.onShowQRClicked} versions={this.state.versions} />
{showQrCodeEnabled ? (
<LoginWithQRSection onShowQr={this.onShowQRClicked} versions={this.state.versions} />
) : null}
</>
);
const client = MatrixClientPeg.get();
if (this.state.showLoginWithQR) {
if (showQrCodeEnabled && this.state.showLoginWithQR) {
return (
<div className="mx_SettingsTab mx_SecurityUserSettingsTab">
<LoginWithQR