@@ -19,7 +19,8 @@
1919import QtQuick 2.4
2020import QtQuick.Layouts 1.1
2121import Ubuntu.Components 1.3
22−import Ubuntu.SystemImage 0.1
22+import Ubuntu.SystemSettings.Update 1.0
23+import Ubuntu.Connectivity 1.0
2324import Wizard 0.1
2425import ".." as LocalComponents
2526
@@ -30,7 +31,7 @@ LocalComponents.Page {
3031 title: i18n.tr("firmware Update")
3132 forwardButtonSourceComponent: forwardButton
3233
33− skip: !SystemImage.SupportsFirmwareUpdate() || !online
34+ skip: !SystemImage.supportsFirmwareUpdate() || !online
3435
3536 property bool online: NetworkingStatus.online
3637 property bool hasUpdate: false
@@ -39,15 +40,15 @@ LocalComponents.Page {
3940 property var partitions: ""
4041
4142 function check() {
42− if (!SystemImage.SupportsFirmwareUpdate())
43− return
43+ if (!SystemImage.supportsFirmwareUpdate())
44+ return pageStack.next();
4445 systemUpdatePage.isChecking = true
4546 SystemImage.checkForFirmwareUpdate()
4647 }
4748
4849 function flash() {
49− if (!SystemImage.SupportsFirmwareUpdate())
50− return
50+ if (!SystemImage.supportsFirmwareUpdate())
51+ return pageStack.next();
5152 systemUpdatePage.isUpdating = true
5253 SystemImage.updateFirmware()
5354 }
@@ -223,7 +224,8 @@ LocalComponents.Page {
223224 Component {
224225 id: forwardButton
225226 LocalComponents.StackButton {
226− text: systemUpdatePage.hasUpdate ? i18n.tr("Next") : i18n.tr("Skip")
227+ text: !systemUpdatePage.hasUpdate && !systemUpdatePage.spinner
228+ ? i18n.tr("Next") : i18n.tr("Skip")
227229 onClicked: pageStack.next()
228230 }
229231 }