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

Release Sign in with QR out of labs (#10182)

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

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

@ -34,7 +34,6 @@ import { deleteDevicesWithInteractiveAuth } from "../../devices/deleteDevices";
import SettingsTab from "../SettingsTab";
import LoginWithQRSection from "../../devices/LoginWithQRSection";
import LoginWithQR, { Mode } from "../../../auth/LoginWithQR";
import SettingsStore from "../../../../../settings/SettingsStore";
import { useAsyncMemo } from "../../../../../hooks/useAsyncMemo";
import QuestionDialog from "../../../dialogs/QuestionDialog";
import { FilterVariation } from "../../devices/filter";
@ -212,8 +211,6 @@ const SessionManagerTab: React.FC = () => {
const [signInWithQrMode, setSignInWithQrMode] = useState<Mode | null>();
const showQrCodeEnabled = SettingsStore.getValue("feature_qr_signin_reciprocate_show");
const onQrFinish = useCallback(() => {
setSignInWithQrMode(null);
}, [setSignInWithQrMode]);
@ -222,7 +219,7 @@ const SessionManagerTab: React.FC = () => {
setSignInWithQrMode(Mode.Show);
}, [setSignInWithQrMode]);
if (showQrCodeEnabled && signInWithQrMode) {
if (signInWithQrMode) {
return <LoginWithQR mode={signInWithQrMode} onFinished={onQrFinish} client={matrixClient} />;
}
@ -282,7 +279,7 @@ const SessionManagerTab: React.FC = () => {
/>
</SettingsSubsection>
)}
{showQrCodeEnabled ? <LoginWithQRSection onShowQr={onShowQrClicked} versions={clientVersions} /> : null}
<LoginWithQRSection onShowQr={onShowQrClicked} versions={clientVersions} />
</SettingsTab>
);
};