Skip to content

feat: activate QR code link #1412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
odelcroi wants to merge 1 commit into
base: develop_tchap
Choose a base branch
from
Draft

feat: activate QR code link #1412

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: 2 additions & 3 deletions src/components/structures/UserMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,9 +331,8 @@ export default class UserMenu extends React.Component<IProps, IState> {
let primaryOptionList = (
<IconizedContextMenuOptionList>
{homeButton}
{/* :TCHAP: remove-link-new-device-qr-code */}
{/* {linkNewDeviceButton} */}
{/* end :TCHAP: */}
{linkNewDeviceButton}

<IconizedContextMenuOption
iconClassName="mx_UserMenu_iconBell"
label={_t("notifications|enable_prompt_toast_title")}
Expand Down
9 changes: 4 additions & 5 deletions src/components/views/settings/tabs/user/SessionManagerTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import SecurityRecommendations from "../../devices/SecurityRecommendations";
import { type ExtendedDevice } from "../../devices/types";
import { deleteDevicesWithInteractiveAuth } from "../../devices/deleteDevices";
import SettingsTab from "../SettingsTab";
// import LoginWithQRSection from "../../devices/LoginWithQRSection"; // :TCHAP: remove-link-new-device-qr-code
import LoginWithQRSection from "../../devices/LoginWithQRSection";
import { Mode } from "../../../auth/LoginWithQR-types";
import { useAsyncMemo } from "../../../../../hooks/useAsyncMemo";
import QuestionDialog from "../../../dialogs/QuestionDialog";
Expand Down Expand Up @@ -275,14 +275,13 @@ const SessionManagerTab: React.FC<{
return (
<SettingsTab>
<SettingsSection>
{/* :TCHAP: remove-link-new-device-qr-code */}
{/* <LoginWithQRSection

<LoginWithQRSection
onShowQr={onShowQrClicked}
versions={clientVersions}
oidcClientConfig={oidcClientConfig}
isCrossSigningReady={isCrossSigningReady}
/> */}
{/* end :TCHAP: */}
/>
<SecurityRecommendations
devices={devices}
goToFilteredList={onGoToFilteredList}
Expand Down
Loading