Merge pull request #31 from nexpid/feat/fix-loginqr

fix(loginwithqr): fix qr code icon crash
This commit is contained in:
nyx 2024-08-09 23:58:54 +03:00 committed by GitHub
commit 97f8a315fc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 7 deletions

View file

@ -12,7 +12,7 @@ import { Button, Forms, i18n, Menu, TabBar } from "@webpack/common";
import { ReactElement } from "react"; import { ReactElement } from "react";
import { preload, unload } from "./images"; import { preload, unload } from "./images";
import { cl, QrCodeCameraIcon } from "./ui"; import { cl, QrCodeIcon } from "./ui";
import openQrModal from "./ui/modals/QrModal"; import openQrModal from "./ui/modals/QrModal";
export default definePlugin({ export default definePlugin({
@ -106,7 +106,7 @@ export default definePlugin({
<Menu.MenuItem <Menu.MenuItem
id="scan-qr" id="scan-qr"
label={i18n.Messages.USER_SETTINGS_SCAN_QR_CODE} label={i18n.Messages.USER_SETTINGS_SCAN_QR_CODE}
icon={QrCodeCameraIcon} icon={QrCodeIcon}
action={openQrModal} action={openQrModal}
showIconFirst showIconFirst
focusedClassName={menuItemFocused} focusedClassName={menuItemFocused}

View file

@ -37,11 +37,10 @@ export const { Spinner } = proxyLazy(() => Forms as any as {
SpinnerTypes: typeof SpinnerTypes; SpinnerTypes: typeof SpinnerTypes;
}); });
export const { QrCodeCameraIcon } = findByPropsLazy("QrCodeCameraIcon") as { const icons = findByPropsLazy("PencilIcon");
QrCodeCameraIcon: ComponentType<{ export const QrCodeIcon = proxyLazy(() => icons.QrCodeCameraIcon ?? icons.QrCodeIcon) as ComponentType<{
size: number; size: number;
}>; }>;
};
export const cl = classNameFactory("qrlogin-"); export const cl = classNameFactory("qrlogin-");