fix(AppMain): Open only one popup per component

Close #9131
status-im · Jan 17, 2023 · ba5062d · ba5062d
1 parent b2328d6
commit ba5062d
Showing 1 changed file with 15 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 var activePopupComponents: []
+
     signal closeProfilePopup()
 
     Connections {
@@ -158,8 +160,21 @@ Item {
         onOpenEditDisplayNamePopup: Global.openPopup(displayNamePopupComponent)
 
         onOpenPopupRequested: {
+            if (activePopupComponents.includes(popupComponent)) {
+                return;
+            }
+
             const popup = popupComponent.createObject(appMain, params);
             popup.open();
+
+            activePopupComponents.push(popupComponent);
+
+            popup.closed.connect(() => {
+                const removeIndex = activePopupComponents.indexOf(popupComponent);
+                if (removeIndex !== -1) {
+                    activePopupComponents.splice(removeIndex, 1);
+                }
+            })
             return popup;
         }