Fix app name in controloverlay

androidservice/controlviews/Main.qml

@@ -11,7 +11,7 @@ ApplicationWindow {
     visible: true
     visibility: ApplicationWindow.FullScreen
     color: Material.background
-    title: appName
+    title: Configuration.appName
 
     Material.theme: NymeaUtils.isDark(Style.backgroundColor) ? Material.Dark : Material.Light
     Material.background: Style.backgroundColor
@@ -23,9 +23,6 @@ ApplicationWindow {
     font.capitalization: Font.MixedCase
     font.family: Style.fontFamily
 
-    property string appName: "appBranding" in app ? app.appBranding : "nymea:app"
-    property string systemName: "coreBranding" in app ? app.coreBranding : "nymea"
-
     property int margins: 16
     property int bigMargins: 20
 

nymea-app/ui/PushButtonAuthPage.qml

@@ -87,7 +87,7 @@ Page {
         Label {
             Layout.fillWidth: true
             horizontalAlignment: Text.AlignHCenter
-            text: qsTr("Please press the button on your %1 box to authenticate this device.").arg(Configuration.systemName)
+            text: qsTr("Please press the button on your %1 gateway to authenticate this device.").arg(Configuration.systemName)
             wrapMode: Text.WordWrap
         }
 

nymea-app/ui/mainviews/EnergyView.qml

@@ -86,7 +86,7 @@ MainViewBase {
                 rootMeter: root.rootMeter
                 meters: consumers
                 title: qsTr("Total consumed energy")
-                visible: consumers.count > 0
+                visible: rootMeterTotalEnergyState || consumers.count > 0
             }
 
             SmartMeterChart {