changing stdErr to stdOut

Adding error handling in the server controller for:
Sudo package is not pre-installed for sudo users.
Server user or associated group is not listed in the sudoers file.
Server user password required

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.8.2.4
+project(${PROJECT} VERSION 4.8.2.3
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )
@@ -11,7 +11,7 @@ string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
 set(RELEASE_DATE "${CURRENT_DATE}")
 
 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
-set(APP_ANDROID_VERSION_CODE 2071)
+set(APP_ANDROID_VERSION_CODE 2069)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     set(MZ_PLATFORM_NAME "linux")

client/android/AndroidManifest.xml

@@ -20,7 +20,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- To request network state -->
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" android:maxSdkVersion="30" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="28" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt

@@ -1,12 +1,11 @@
 package org.amnezia.vpn.protocol.wireguard
 
 import android.net.VpnService.Builder
-import kotlinx.coroutines.CoroutineScope
+import java.io.IOException
+import java.util.Locale
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.amnezia.awg.GoBackend
 import org.amnezia.vpn.protocol.Protocol
 import org.amnezia.vpn.protocol.ProtocolState.CONNECTED
@@ -28,8 +27,6 @@ open class Wireguard : Protocol() {
 
     private var tunnelHandle: Int = -1
     protected open val ifName: String = "amn0"
-    private lateinit var scope: CoroutineScope
-    private var statusJob: Job? = null
 
     override val statistics: Statistics
         get() {
@@ -52,17 +49,46 @@ open class Wireguard : Protocol() {
 
     override fun internalInit() {
         if (!isInitialized) loadSharedLibrary(context, "wg-go")
-        if (this::scope.isInitialized) {
-            scope.cancel()
-        }
-        scope = CoroutineScope(Dispatchers.IO)
     }
 
     override suspend fun startVpn(config: JSONObject, vpnBuilder: Builder, protect: (Int) -> Boolean) {
         val wireguardConfig = parseConfig(config)
+        val startTime = System.currentTimeMillis()
         start(wireguardConfig, vpnBuilder, protect)
+        waitForConnection(startTime)
+        state.value = CONNECTED
     }
 
+    private suspend fun waitForConnection(startTime: Long) {
+        Log.d(TAG, "Waiting for connection")
+        withContext(Dispatchers.IO) {
+            val time = String.format(Locale.ROOT,"%.3f", startTime / 1000.0)
+            try {
+                delay(1000)
+                var log = getLogcat(time)
+                Log.v(TAG, "First waiting log: $log")
+                // check that there is a connection log,
+                // to avoid infinite connection
+                if (!log.contains("Attaching to interface")) {
+                    Log.w(TAG, "Logs do not contain a connection log")
+                    return@withContext
+                }
+                while (!log.contains("Received handshake response")) {
+                    delay(1000)
+                    log = getLogcat(time)
+                }
+            } catch (e: IOException) {
+                Log.e(TAG, "Failed to get logcat: $e")
+            }
+        }
+    }
+
+    private fun getLogcat(time: String): String =
+        ProcessBuilder("logcat", "--buffer=main", "--format=raw", "*:S AmneziaWG/awg0", "-t", time)
+            .redirectErrorStream(true)
+            .start()
+            .inputStream.reader().readText()
+
     protected open fun parseConfig(config: JSONObject): WireguardConfig {
         val configData = config.getJSONObject("wireguard_config_data")
         return WireguardConfig.build {
@@ -152,43 +178,6 @@ open class Wireguard : Protocol() {
             tunnelHandle = -1
             throw VpnStartException("Protect VPN interface: permission not granted or revoked")
         }
-        launchStatusJob()
-    }
-
-    private fun launchStatusJob() {
-        Log.d(TAG, "Launch status job")
-        statusJob = scope.launch {
-            while (true) {
-                val lastHandshake = getLastHandshake()
-                Log.v(TAG, "lastHandshake=$lastHandshake")
-                if (lastHandshake == 0L) {
-                    delay(1000)
-                    continue
-                }
-                if (lastHandshake == -2L || lastHandshake > 0L) state.value = CONNECTED
-                else if (lastHandshake == -1L) state.value = DISCONNECTED
-                statusJob = null
-                break
-            }
-        }
-    }
-
-    private fun getLastHandshake(): Long {
-        if (tunnelHandle == -1) {
-            Log.e(TAG, "Trying to get config of a non-existent tunnel")
-            return -1
-        }
-        val config = GoBackend.awgGetConfig(tunnelHandle)
-        if (config == null) {
-            Log.e(TAG, "Failed to get tunnel config")
-            return -2
-        }
-        val lastHandshake = config.lines().find { it.startsWith("last_handshake_time_sec=") }?.substring(24)?.toLong()
-        if (lastHandshake == null) {
-            Log.e(TAG, "Failed to get last_handshake_time_sec")
-            return -2
-        }
-        return lastHandshake
     }
 
     override fun stopVpn() {
@@ -196,8 +185,6 @@ open class Wireguard : Protocol() {
             Log.w(TAG, "Tunnel already down")
             return
         }
-        statusJob?.cancel()
-        statusJob = null
         val handleToClose = tunnelHandle
         tunnelHandle = -1
         GoBackend.awgTurnOff(handleToClose)

client/core/controllers/serverController.cpp

@@ -770,6 +770,12 @@ ErrorCode ServerController::isUserInSudo(const ServerCredentials &credentials, D
 
     if (!stdOut.contains("sudo"))
         return ErrorCode::ServerUserNotInSudo;
+    if (stdOut.contains("command not found"))
+        return ErrorCode::SudoPackageIsNotPreinstalled;
+    if (stdOut.contains("sudoers"))
+        return ErrorCode::ServerUserNotListedInSudoers;
+    if (stdOut.contains("password is required"))
+        return ErrorCode::ServerUserPasswordRequired;
 
     return error;
 }

client/core/defs.h

@@ -56,6 +56,9 @@ namespace amnezia
         ServerCancelInstallation = 204,
         ServerUserNotInSudo = 205,
         ServerPacketManagerError = 206,
+        SudoPackageIsNotPreinstalled = 207,
+        ServerUserNotListedInSudoers = 208,
+        ServerUserPasswordRequired = 209,
 
         // Ssh connection errors
         SshRequestDeniedError = 300,

client/core/errorstrings.cpp

@@ -21,6 +21,9 @@ QString errorString(ErrorCode code) {
     case(ErrorCode::ServerCancelInstallation): errorMessage = QObject::tr("Installation canceled by user"); break;
     case(ErrorCode::ServerUserNotInSudo): errorMessage = QObject::tr("The user does not have permission to use sudo"); break;
     case(ErrorCode::ServerPacketManagerError): errorMessage = QObject::tr("Server error: Packet manager error"); break;
+    case(ErrorCode::SudoPackageIsNotPreinstalled): errorMessage = QObject::tr("The sudo package is not pre-installed"); break;
+    case(ErrorCode::ServerUserNotListedInSudoers): errorMessage = QObject::tr("The user is not listed in sudoers"); break;
+    case(ErrorCode::ServerUserPasswordRequired): errorMessage = QObject::tr("The user's password is required"); break;
 
     // Libssh errors
     case(ErrorCode::SshRequestDeniedError): errorMessage = QObject::tr("SSH request was denied"); break;

client/server_scripts/check_user_in_sudo.sh

@@ -1,2 +1,3 @@
+echo $LC_MESSAGES | grep -qE "en_US.UTF-8|C.UTF-8" || export LC_MESSAGES=C.UTF-8;\
 CUR_USER=$(whoami);\
-groups $CUR_USER
+groups $CUR_USER | grep sudo && sudo -nu $CUR_USER sudo -n uname > /dev/null

client/ui/controllers/installController.cpp

@@ -848,6 +848,7 @@ bool InstallController::updateServiceFromApi(const int serverIndex, const QStrin
 
     newServerConfig.insert(configKey::apiConfig, newApiConfig);
     newServerConfig.insert(configKey::authData, authData);
+    newServerConfig.insert(config_key::crc, serverConfig.value(config_key::crc));
     m_serversModel->editServer(newServerConfig, serverIndex);
 
     if (reloadServiceConfig) {

client/ui/qml/Components/ShareConnectionDrawer.qml

@@ -84,7 +84,7 @@ DrawerType2 {
                     Layout.topMargin: 16
 
                     text: qsTr("Share")
-                    leftImageSource: "qrc:/images/controls/share-2.svg"
+                    imageSource: "qrc:/images/controls/share-2.svg"
 
                     KeyNavigation.tab: copyConfigTextButton
 
@@ -120,7 +120,7 @@ DrawerType2 {
                     borderWidth: 1
 
                     text: qsTr("Copy")
-                    leftImageSource: "qrc:/images/controls/copy.svg"
+                    imageSource: "qrc:/images/controls/copy.svg"
 
                     Keys.onReturnPressed: { copyConfigTextButton.clicked() }
                     Keys.onEnterPressed: { copyConfigTextButton.clicked() }
@@ -143,7 +143,7 @@ DrawerType2 {
                     borderWidth: 1
 
                     text: qsTr("Copy config string")
-                    leftImageSource: "qrc:/images/controls/copy.svg"
+                    imageSource: "qrc:/images/controls/copy.svg"
 
                     KeyNavigation.tab: showSettingsButton
                 }

client/ui/qml/Controls2/BasicButtonType.qml

@@ -22,10 +22,9 @@ Button {
     property int borderWidth: 0
     property int borderFocusedWidth: 1
 
-    property string leftImageSource
+    property string imageSource
     property string rightImageSource
-    property string leftImageColor
-    property bool changeLeftImageSize: true
+    property string leftImageColor: textColor
 
     property bool squareLeftSide: false
 
@@ -128,23 +127,18 @@ Button {
             anchors.centerIn: parent
 
             Image {
-                id: leftImage
-                source: root.leftImageSource
-                visible: root.leftImageSource === "" ? false : true
+                Layout.preferredHeight: 20
+                Layout.preferredWidth: 20
+
+                source: root.imageSource
+                visible: root.imageSource === "" ? false : true
 
                 layer {
-                    enabled: leftImageColor !== "" ? true : false
+                    enabled: true
                     effect: ColorOverlay {
                         color: leftImageColor
                     }
                 }
-
-                Component.onCompleted: {
-                    if (root.changeLeftImageSize) {
-                        leftImage.Layout.preferredHeight = 20
-                        leftImage.Layout.preferredWidth = 20
-                    }
-                }
             }
 
             ButtonTextType {

client/ui/qml/Controls2/BusyIndicatorType.qml

@@ -14,7 +14,7 @@ Popup {
     visible: false
 
     Overlay.modal: Rectangle {
-        color: AmneziaStyle.color.translucentMidnightBlack
+        color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
     }
 
     background: Rectangle {

client/ui/qml/Controls2/CardType.qml

@@ -19,7 +19,7 @@ RadioButton {
 
     property string textColor: AmneziaStyle.color.midnightBlack
 
-    property string pressedBorderColor: AmneziaStyle.color.softGoldenApricot
+    property string pressedBorderColor: Qt.rgba(251/255, 178/255, 106/255, 0.3)
     property string selectedBorderColor: AmneziaStyle.color.goldenApricot
     property string defaultBodredColor: AmneziaStyle.color.transparent
     property int borderWidth: 0

client/ui/qml/Controls2/CardWithIconsType.qml

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

client/ui/qml/Controls2/DrawerType2.qml

@@ -92,7 +92,7 @@ Item {
         id: background
 
         anchors.fill: parent
-        color: root.isCollapsed ? AmneziaStyle.color.transparent : AmneziaStyle.color.translucentMidnightBlack
+        color: root.isCollapsed ? AmneziaStyle.color.transparent : Qt.rgba(14/255, 14/255, 17/255, 0.8)
 
         Behavior on color {
             PropertyAnimation { duration: 200 }

client/ui/qml/Controls2/PopupType.qml

@@ -24,7 +24,7 @@ Popup {
 
     Overlay.modal: Rectangle {
         visible: root.closeButtonVisible
-        color: AmneziaStyle.color.translucentMidnightBlack
+        color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
     }
 
     onOpened: {

client/ui/qml/Controls2/TextFieldWithHeaderType.qml

@@ -183,7 +183,7 @@ Item {
 
         focusPolicy: Qt.NoFocus
         text: root.buttonText
-        leftImageSource: root.buttonImageSource
+        imageSource: root.buttonImageSource
 
         anchors.top: content.top
         anchors.bottom: content.bottom

client/ui/qml/Controls2/TopCloseButtonType.qml

@@ -14,7 +14,7 @@ Popup {
     visible: false
 
     Overlay.modal: Rectangle {
-        color: AmneziaStyle.color.translucentMidnightBlack
+        color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
     }
 
     background: Rectangle {

client/ui/qml/Modules/Style/AmneziaStyle.qml

@@ -22,9 +22,5 @@ QtObject {
         readonly property color sheerWhite: Qt.rgba(1, 1, 1, 0.12)
         readonly property color translucentWhite: Qt.rgba(1, 1, 1, 0.08)
         readonly property color barelyTranslucentWhite: Qt.rgba(1, 1, 1, 0.05)
-        readonly property color translucentMidnightBlack: Qt.rgba(14/255, 14/255, 17/255, 0.8)
-        readonly property color softGoldenApricot: Qt.rgba(251/255, 178/255, 106/255, 0.3)
-        readonly property color mistyGray: Qt.rgba(215/255, 216/255, 219/255, 0.8)
-        readonly property color cloudyGray: Qt.rgba(215/255, 216/255, 219/255, 0.65)
     }
 }

client/ui/qml/Pages2/PageHome.qml

@@ -98,6 +98,7 @@ PageType {
                 pressedColor: AmneziaStyle.color.sheerWhite
                 disabledColor: AmneziaStyle.color.mutedGray
                 textColor: AmneziaStyle.color.mutedGray
+                leftImageColor: AmneziaStyle.color.transparent
                 borderWidth: 0
 
                 buttonTextLabel.lineHeight: 20
@@ -109,7 +110,7 @@ PageType {
 
                 text: isSplitTunnelingEnabled ? qsTr("Split tunneling enabled") : qsTr("Split tunneling disabled")
 
-                leftImageSource: isSplitTunnelingEnabled ? "qrc:/images/controls/split-tunneling.svg" : ""
+                imageSource: isSplitTunnelingEnabled ? "qrc:/images/controls/split-tunneling.svg" : ""
                 rightImageSource: "qrc:/images/controls/chevron-down.svg"
 
                 Keys.onEnterPressed: splitTunnelingButton.clicked()
@@ -165,7 +166,6 @@ PageType {
 
                 anchors.left: parent.left
                 anchors.right: parent.right
-                spacing: 0
 
                 Component.onCompleted: {
                     drawer.collapsedHeight = collapsed.implicitHeight
@@ -267,39 +267,18 @@ PageType {
 
                 RowLayout {
                     Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-                    Layout.topMargin: 8
-                    Layout.bottomMargin: drawer.isCollapsed ? 44 : ServersModel.isDefaultServerFromApi ? 61 : 16
+                    Layout.bottomMargin: drawer.isCollapsed ? 44 : ServersModel.isDefaultServerFromApi ? 89 : 44
                     spacing: 0
 
-                    BasicButtonType {
-                        enabled: (ServersModel.defaultServerImagePathCollapsed !== "") && drawer.isCollapsed
-                        hoverEnabled: enabled
-
-                        implicitHeight: 36
-
-                        leftPadding: 16
-                        rightPadding: 16
-
-                        defaultColor: AmneziaStyle.color.transparent
-                        hoveredColor: AmneziaStyle.color.translucentWhite
-                        pressedColor: AmneziaStyle.color.sheerWhite
-                        disabledColor: AmneziaStyle.color.transparent
-                        textColor: AmneziaStyle.color.mutedGray
-
-                        buttonTextLabel.lineHeight: 16
-                        buttonTextLabel.font.pixelSize: 13
-                        buttonTextLabel.font.weight: 400
+                    Image {
+                        Layout.rightMargin: 8
+                        visible: source !== ""
+                        source: ServersModel.defaultServerImagePathCollapsed
+                    }
 
+                    LabelTextType {
+                        id: collapsedServerMenuDescription
                         text: drawer.isCollapsed ? ServersModel.defaultServerDescriptionCollapsed : ServersModel.defaultServerDescriptionExpanded
-                        leftImageSource: ServersModel.defaultServerImagePathCollapsed
-                        changeLeftImageSize: false
-
-                        rightImageSource: hoverEnabled ? "qrc:/images/controls/chevron-down.svg" : ""
-
-                        onClicked: {
-                            ServersModel.processedIndex = ServersModel.defaultIndex
-                            PageController.goToPage(PageEnum.PageSettingsServerInfo)
-                        }
                     }
                 }
             }
@@ -337,8 +316,8 @@ PageType {
 
                         rootButtonImageColor: AmneziaStyle.color.midnightBlack
                         rootButtonBackgroundColor: AmneziaStyle.color.paleGray
-                        rootButtonBackgroundHoveredColor: AmneziaStyle.color.mistyGray
-                        rootButtonBackgroundPressedColor: AmneziaStyle.color.cloudyGray
+                        rootButtonBackgroundHoveredColor: Qt.rgba(215, 216, 219, 0.8)
+                        rootButtonBackgroundPressedColor: Qt.rgba(215, 216, 219, 0.65)
                         rootButtonHoveredBorderColor: AmneziaStyle.color.transparent
                         rootButtonDefaultBorderColor: AmneziaStyle.color.transparent
                         rootButtonTextTopMargin: 8

client/ui/qml/Pages2/PageSettingsApiServerInfo.qml

@@ -132,8 +132,8 @@ PageType {
                 implicitHeight: 32
 
                 defaultColor: "transparent"
-                hoveredColor: AmneziaStyle.color.translucentWhite
-                pressedColor: AmneziaStyle.color.sheerWhite
+                hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                pressedColor: Qt.rgba(1, 1, 1, 0.12)
                 textColor: AmneziaStyle.color.vibrantRed
 
                 text: qsTr("Reload API config")
@@ -172,8 +172,8 @@ PageType {
                 implicitHeight: 32
 
                 defaultColor: "transparent"
-                hoveredColor: AmneziaStyle.color.translucentWhite
-                pressedColor: AmneziaStyle.color.sheerWhite
+                hoveredColor: Qt.rgba(1, 1, 1, 0.08)
+                pressedColor: Qt.rgba(1, 1, 1, 0.12)
                 textColor: AmneziaStyle.color.vibrantRed
 
                 text: qsTr("Remove from application")

client/ui/qml/Pages2/PageSetupWizardApiServicesList.qml

@@ -16,82 +16,83 @@ PageType {
 
     defaultActiveFocusItem: focusItem
 
-    ColumnLayout {
-        id: header
-
+    FlickableType {
+        id: fl
         anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        spacing: 0
-
-        Item {
-            id: focusItem
-            KeyNavigation.tab: backButton
-        }
-
-        BackButtonType {
-            id: backButton
-            Layout.topMargin: 20
-//                KeyNavigation.tab: fileButton.rightButton
-        }
-
-        HeaderType {
-            Layout.fillWidth: true
-            Layout.topMargin: 8
-            Layout.rightMargin: 16
-            Layout.leftMargin: 16
-            Layout.bottomMargin: 16
-
-            headerText: qsTr("VPN by Amnezia")
-            descriptionText: qsTr("Choose a VPN service that suits your needs.")
-        }
-    }
-
-    ListView {
-        id: servicesListView
-        anchors.top: header.bottom
-        anchors.right: parent.right
-        anchors.left: parent.left
         anchors.bottom: parent.bottom
-        anchors.topMargin: 16
-        spacing: 0
+        contentHeight: content.height
 
-        currentIndex: 1
-        clip: true
-        model: ApiServicesModel
+        ColumnLayout {
+            id: content
 
-        ScrollBar.vertical: ScrollBar {}
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
 
-        delegate: Item {
-            implicitWidth: servicesListView.width
-            implicitHeight: delegateContent.implicitHeight
+            spacing: 0
 
-            ColumnLayout {
-                id: delegateContent
+            Item {
+                id: focusItem
+                KeyNavigation.tab: backButton
+            }
 
-                anchors.fill: parent
+            BackButtonType {
+                id: backButton
+                Layout.topMargin: 20
+//                KeyNavigation.tab: fileButton.rightButton
+            }
 
-                CardWithIconsType {
-                    id: card
+            HeaderType {
+                Layout.fillWidth: true
+                Layout.topMargin: 8
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+                Layout.bottomMargin: 32
 
-                    Layout.fillWidth: true
-                    Layout.rightMargin: 16
-                    Layout.leftMargin: 16
-                    Layout.bottomMargin: 16
+                headerText: qsTr("VPN by Amnezia")
+                descriptionText: qsTr("Choose a VPN service that suits your needs.")
+            }
 
-                    headerText: name
-                    bodyText: cardDescription
-                    footerText: price
+            ListView {
+                id: containers
+                width: parent.width
+                height: containers.contentItem.height
+                spacing: 16
 
-                    rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                currentIndex: 1
+                interactive: false
+                model: ApiServicesModel
 
-                    enabled: isServiceAvailable
+                delegate: Item {
+                    implicitWidth: containers.width
+                    implicitHeight: delegateContent.implicitHeight
 
-                    onClicked: {
-                        if (isServiceAvailable) {
-                            ApiServicesModel.setServiceIndex(index)
-                            PageController.goToPage(PageEnum.PageSetupWizardApiServiceInfo)
+                    ColumnLayout {
+                        id: delegateContent
+
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+
+                        CardWithIconsType {
+                            id: card
+
+                            Layout.fillWidth: true
+                            Layout.rightMargin: 16
+                            Layout.leftMargin: 16
+
+                            headerText: name
+                            bodyText: cardDescription
+                            footerText: price
+
+                            rightImageSource: "qrc:/images/controls/chevron-right.svg"
+
+                            onClicked: {
+                                if (isServiceAvailable) {
+                                    ApiServicesModel.setServiceIndex(index)
+                                    PageController.goToPage(PageEnum.PageSetupWizardApiServiceInfo)
+                                }
+                            }
                         }
                     }
                 }

client/ui/qml/Pages2/PageSetupWizardConfigSource.qml

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

client/ui/qml/Pages2/PageShare.qml

@@ -573,7 +573,7 @@ PageType {
                 visible: accessTypeSelector.currentIndex === 0
 
                 text: qsTr("Share")
-                leftImageSource: "qrc:/images/controls/share-2.svg"
+                imageSource: "qrc:/images/controls/share-2.svg"                
 
                 Keys.onTabPressed: lastItemTabClicked(focusItem)
 

client/ui/qml/Pages2/PageShareFullAccess.qml

@@ -135,7 +135,7 @@ PageType {
                 Layout.topMargin: 40
 
                 text: qsTr("Share")
-                leftImageSource: "qrc:/images/controls/share-2.svg"
+                imageSource: "qrc:/images/controls/share-2.svg"
 
                 Keys.onTabPressed: lastItemTabClicked(focusItem)