diff --git a/ui/app/AppLayouts/Profile/views/KeycardView.qml b/ui/app/AppLayouts/Profile/views/KeycardView.qml index 6d76849782..a582f31670 100644 --- a/ui/app/AppLayouts/Profile/views/KeycardView.qml +++ b/ui/app/AppLayouts/Profile/views/KeycardView.qml @@ -94,22 +94,27 @@ SettingsContentBase { target: root.keycardStore.keycardModule function onDisplayKeycardSharedModuleFlow() { - Global.openPopup(keycardPopup); + keycardPopup.active = true } function onDestroyKeycardSharedModuleFlow() { - Global.closePopup(); + keycardPopup.active = false } function onSharedModuleBusy() { Global.openPopup(sharedModuleBusyPopupComponent) } } - Component { + Loader { id: keycardPopup - KeycardPopup { + active: false + sourceComponent: KeycardPopup { sharedKeycardModule: root.keycardStore.keycardModule.keycardSharedModule emojiPopup: root.emojiPopup } + + onLoaded: { + keycardPopup.item.open() + } } } } diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml index cbcdd961e1..0326c3ed89 100644 --- a/ui/app/mainui/AppMain.qml +++ b/ui/app/mainui/AppMain.qml @@ -72,11 +72,11 @@ Item { } function onDisplayKeycardSharedModuleFlow() { - Global.openPopup(keycardPopup); + keycardPopup.active = true } function onDestroyKeycardSharedModuleFlow() { - Global.closePopup(); + keycardPopup.active = false } function onMailserverWorking() { @@ -1427,12 +1427,16 @@ Item { Global.settingsLoaded() } - Component { + Loader { id: keycardPopup - KeycardPopup { - anchors.centerIn: parent + active: false + sourceComponent: KeycardPopup { sharedKeycardModule: appMain.rootStore.mainModuleInst.keycardSharedModule } + + onLoaded: { + keycardPopup.item.open() + } } DropAreaPanel {