diff --git a/packages/client/src/components/MkQrCode.vue b/packages/client/src/components/MkQrCode.vue index c5a389b095..2984f88697 100644 --- a/packages/client/src/components/MkQrCode.vue +++ b/packages/client/src/components/MkQrCode.vue @@ -21,7 +21,7 @@ import { i18n } from "@/i18n"; import QRCodeVue3 from "qrcode-vue3"; const props = defineProps<{ - qrCode: string + qrCode: string; }>(); const modal = shallowRef<InstanceType<typeof MkModal>>(); diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts index c9b11063ea..b53cb3f303 100644 --- a/packages/client/src/os.ts +++ b/packages/client/src/os.ts @@ -1005,16 +1005,22 @@ export function post( } export async function displayQrCode(qrCode: string) { - (await new Promise<(() => void) | undefined>((resolve) => { - let dispose: (() => void) | undefined; - popup(MkQrCode, { qrCode }, { - closed: () => { - resolve(dispose); - } - }).then((res) => { - dispose = res.dispose + ( + await new Promise<(() => void) | undefined>((resolve) => { + let dispose: (() => void) | undefined; + popup( + MkQrCode, + { qrCode }, + { + closed: () => { + resolve(dispose); + }, + }, + ).then((res) => { + dispose = res.dispose; + }); }) - }))?.(); + )?.(); } export const deckGlobalEvents = new EventEmitter(); diff --git a/packages/client/src/scripts/get-user-menu.ts b/packages/client/src/scripts/get-user-menu.ts index ca43e40716..5f6108d008 100644 --- a/packages/client/src/scripts/get-user-menu.ts +++ b/packages/client/src/scripts/get-user-menu.ts @@ -294,8 +294,10 @@ export function getUserMenu(user, router: Router = mainRouter) { icon: "ph-qr-code ph-bold ph-lg", text: i18n.ts.getQrCode, action: () => { - os.displayQrCode(`https://${host}/authorize-follow?acct=${user.username}`) - } + os.displayQrCode( + `https://${host}/authorize-follow?acct=${user.username}`, + ); + }, }, isSignedIn(me) && me.id !== user.id ? {