fixed margins on PageSetupWizardApiServicesList

client/ui/qml/Controls2/CardWithIconsType.qml

@@ -145,6 +145,7 @@ Button {
 
         cursorShape: Qt.PointingHandCursor
         hoverEnabled: true
+        enabled: root.enabled
 
         onEntered: {
             backgroundRect.color = root.hoveredColor

client/ui/qml/Pages2/PageSetupWizardApiServicesList.qml

@@ -16,14 +16,8 @@ PageType {
 
     defaultActiveFocusItem: focusItem
 
-    FlickableType {
-        id: fl
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        contentHeight: content.height
-
     ColumnLayout {
-            id: content
+        id: header
 
         anchors.top: parent.top
         anchors.left: parent.left
@@ -47,32 +41,36 @@ PageType {
             Layout.topMargin: 8
             Layout.rightMargin: 16
             Layout.leftMargin: 16
-                Layout.bottomMargin: 32
+            Layout.bottomMargin: 16
 
             headerText: qsTr("VPN by Amnezia")
             descriptionText: qsTr("Choose a VPN service that suits your needs.")
         }
+    }
 
     ListView {
-                id: containers
-                width: parent.width
-                height: containers.contentItem.height
-                spacing: 16
+        id: servicesListView
+        anchors.top: header.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+        anchors.topMargin: 16
+        spacing: 0
 
         currentIndex: 1
-                interactive: false
+        clip: true
         model: ApiServicesModel
 
+        ScrollBar.vertical: ScrollBar {}
+
         delegate: Item {
-                    implicitWidth: containers.width
+            implicitWidth: servicesListView.width
             implicitHeight: delegateContent.implicitHeight
 
             ColumnLayout {
                 id: delegateContent
 
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
+                anchors.fill: parent
 
                 CardWithIconsType {
                     id: card
@@ -80,6 +78,7 @@ PageType {
                     Layout.fillWidth: true
                     Layout.rightMargin: 16
                     Layout.leftMargin: 16
+                    Layout.bottomMargin: 16
 
                     headerText: name
                     bodyText: cardDescription
@@ -87,6 +86,8 @@ PageType {
 
                     rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
+                    enabled: isServiceAvailable
+
                     onClicked: {
                         if (isServiceAvailable) {
                             ApiServicesModel.setServiceIndex(index)
@@ -97,6 +98,4 @@ PageType {
             }
         }
     }
-        }
-    }
 }

client/ui/qml/Pages2/PageSetupWizardConfigSource.qml

@@ -47,7 +47,6 @@ PageType {
                 KeyNavigation.tab: textKey.textField
             }
 
-
             HeaderType {
                 property bool isVisible: SettingsController.getInstallationUuid() !== "" || PageController.isStartPageVisible()