From 46dc3fee969f12af7a8d9f9183e04963c7b3fe48 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Mon, 20 May 2019 15:30:58 +0200
Subject: [PATCH] Some fixes in the settings page

---
 nymea-app/ui/SettingsPage.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nymea-app/ui/SettingsPage.qml b/nymea-app/ui/SettingsPage.qml
index 5a393bc8..c54a0802 100644
--- a/nymea-app/ui/SettingsPage.qml
+++ b/nymea-app/ui/SettingsPage.qml
@@ -15,7 +15,7 @@ Page {
 
     Flickable {
         anchors.fill: parent
-        contentHeight: layout.implicitHeight
+        contentHeight: layout.implicitHeight + (layout.isGrid ? app.margins * 2 : 0)
 
         GridLayout {
             id: layout
@@ -158,7 +158,7 @@ Page {
             Pane {
                 Layout.fillWidth: true
                 Material.elevation: layout.isGrid ? 1 : 0
-                visible: engine.jsonRpcClient.ensureServerVersion("2.1")
+                visible: engine.jsonRpcClient.ensureServerVersion("2.1") && engine.systemController.updateManagementAvailable
 
                 padding: 0
                 MeaListItemDelegate {