fix(AppMain): Open only one popup per component

Close #9131
status-im · Jan 17, 2023 · 7e767d9 · 7e767d9
1 parent 34cf8b6
commit 7e767d9
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml
@@ -52,6 +52,8 @@ Item {
     // set from main.qml
     property var sysPalette
 
+    property Component activePopupComponent: null
+
     signal closeProfilePopup()
 
     Connections {
@@ -158,8 +160,20 @@ Item {
         onOpenEditDisplayNamePopup: Global.openPopup(displayNamePopupComponent)
 
         onOpenPopupRequested: {
+            if (activePopupComponent === popupComponent) {
+                return;
+            }
+
             const popup = popupComponent.createObject(appMain, params);
             popup.open();
+
+            activePopupComponent = popupComponent;
+
+            popup.closed.connect(() => {
+                if (activePopupComponent === popupComponent) {
+                    activePopupComponent = null;
+                }
+            })
             return popup;
         }