From 54002f527640b7cc75fa90ad069dec6d020b2448 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Fri, 7 Apr 2023 13:16:10 +0200
Subject: [PATCH] Fix removing a zigbee node from within the nodes view

---
 nymea-app/ui/system/zigbee/ZigbeeNodePage.qml | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/nymea-app/ui/system/zigbee/ZigbeeNodePage.qml b/nymea-app/ui/system/zigbee/ZigbeeNodePage.qml
index c8b51479..8e7aadf9 100644
--- a/nymea-app/ui/system/zigbee/ZigbeeNodePage.qml
+++ b/nymea-app/ui/system/zigbee/ZigbeeNodePage.qml
@@ -53,7 +53,7 @@ SettingsPageBase {
             imageSource: "/ui/images/delete.svg"
             text: qsTr("Remove node")
             onClicked: {
-                var popup = removeZigbeeNodeDialogComponent.createObject(app)
+                var popup = removeZigbeeNodeDialogComponent.createObject(app, {zigbeeNode: root.node})
                 popup.open()
             }
         }
@@ -126,6 +126,26 @@ SettingsPageBase {
                 popup.open();
             }
         }
+
+        onRemoveNodeReply: {
+            if (commandId == d.pendingCommandId) {
+                var props = {};
+                switch (error) {
+                case ZigbeeManager.ZigbeeErrorNoError:
+                    pageStack.pop();
+                    return;
+                case ZigbeeManager.ZigbeeErrorNetworkError:
+                    props.text = qsTr("An error happened in the ZigBee network when creating the binding.");
+                    break;
+                default:
+                    props.error = error;
+                    return;
+                }
+                var comp = Qt.createComponent("/ui/components/ErrorDialog.qml")
+                var popup = comp.createObject(app, props)
+                popup.open();
+            }
+        }
     }
 
     ThingsProxy {