chore: fixed native config post processing

amnezia-vpn · Feb 21, 2025 · 8afe50c · 8afe50c
1 parent 48980c4
commit 8afe50c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/client/ui/controllers/api/apiConfigsController.cpp b/client/ui/controllers/api/apiConfigsController.cpp
@@ -87,6 +87,7 @@ bool ApiConfigsController::exportNativeConfig(const QString &serverCountryCode,
 
     QJsonObject jsonConfig = QJsonDocument::fromJson(responseBody).object();
     QString nativeConfig = jsonConfig.value(configKey::config).toString();
+    nativeConfig.replace("$WIREGUARD_CLIENT_PRIVATE_KEY", apiPayloadData.wireGuardClientPrivKey);
 
     SystemController::saveFile(fileName, nativeConfig);
     return true;
@@ -124,6 +125,8 @@ void ApiConfigsController::prepareVpnKeyExport()
 
     auto vpnKey = apiConfigObject.value(apiDefs::key::vpnKey).toString();
 
+    vpnKey.replace("vpn://", "");
+
     m_qrCodes = qrCodeUtils::generateQrCodeImageSeries(vpnKey.toUtf8());
 
     emit vpnKeyExportReady();

diff --git a/client/ui/qml/Pages2/PageSettingsApiServerInfo.qml b/client/ui/qml/Pages2/PageSettingsApiServerInfo.qml
@@ -217,7 +217,7 @@ PageType {
             LabelWithButtonType {
                 Layout.fillWidth: true
 
-                text: qsTr("How to connect on another devicey")
+                text: qsTr("How to connect on another device")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
@@ -266,11 +266,12 @@ PageType {
             BasicButtonType {
                 id: revokeButton
                 Layout.alignment: Qt.AlignHCenter
-                Layout.topMargin: 24
                 Layout.bottomMargin: 16
                 Layout.leftMargin: 8
                 implicitHeight: 32
 
+                visible: footer.isVisibleForAmneziaFree
+
                 defaultColor: "transparent"
                 hoveredColor: AmneziaStyle.color.translucentWhite
                 pressedColor: AmneziaStyle.color.sheerWhite