From 581cd9984f4b77451c78ec66694ec7ac18c1eeac Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Thu, 19 Sep 2019 23:56:39 +0200
Subject: [PATCH] Some fixes in the add device results page

---
 nymea-app/ui/thingconfiguration/SetupWizard.qml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/nymea-app/ui/thingconfiguration/SetupWizard.qml b/nymea-app/ui/thingconfiguration/SetupWizard.qml
index 39f9837d..401c0f81 100644
--- a/nymea-app/ui/thingconfiguration/SetupWizard.qml
+++ b/nymea-app/ui/thingconfiguration/SetupWizard.qml
@@ -64,7 +64,7 @@ Page {
             busyOverlay.shown = false
             if (params["deviceError"] !== "DeviceErrorNoError") {
                 busyOverlay.shown = false;
-                internalPageStack.push(resultsPage, {success: false})
+                internalPageStack.push(resultsPage, {deviceError: params["deviceError"], message: params["displayMessage"]});
                 return;
 
             }
@@ -86,15 +86,16 @@ Page {
         }
         onConfirmPairingReply: {
             busyOverlay.shown = false
-            internalPageStack.push(resultsPage, {success: params["deviceError"] === "DeviceErrorNoError", deviceId: params["deviceId"], message: params["displayMessage"]})
+            internalPageStack.push(resultsPage, {deviceError: params["deviceError"], deviceId: params["deviceId"], message: params["displayMessage"]})
         }
         onAddDeviceReply: {
+            print("Device added:", JSON.stringify(params))
             busyOverlay.shown = false;
-            internalPageStack.push(resultsPage, {success: params["deviceError"] === "DeviceErrorNoError", deviceId: params["deviceId"]})
+            internalPageStack.push(resultsPage, {deviceError: params["deviceError"], deviceId: params["deviceId"], message: params["displayMessage"]})
         }
         onReconfigureDeviceReply: {
             busyOverlay.shown = false;
-            internalPageStack.push(resultsPage, {success: params["deviceError"] === "DeviceErrorNoError", deviceId: params["deviceId"]})
+            internalPageStack.push(resultsPage, {deviceError: params["deviceError"], deviceId: params["deviceId"], message: params["displayMessage"]})
         }
     }
 
@@ -486,10 +487,12 @@ Page {
         Page {
             id: resultsView
 
-            property bool success
             property string deviceId
+            property string deviceError
             property string message
 
+            readonly property bool success: deviceError === "DeviceErrorNoError"
+
             readonly property var device: root.device ? root.device : engine.deviceManager.devices.getDevice(deviceId)
 
             ColumnLayout {