Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…

…ktop into dev
KomodoPlatform · Dec 22, 2023 · 77106ee · 77106ee
2 parents ba9e296 + e3259a5
commit 77106ee
Show file tree

Hide file tree

Showing 11 changed files with 602 additions and 574 deletions.
diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml
@@ -10,7 +10,7 @@ on:
     - cron: '0 0 * * 1'
 
 env:
-  DEX_API: "mm2"
+  DEX_API: "mm2_kmd"
   DEX_RPCPORT: 7762
   DEX_RPC: "http://127.0.0.1:7762"
   DEX_PROJECT_NAME: "komodo-wallet"

diff --git a/atomic_defi_design/Dex/Settings/SettingModal.qml b/atomic_defi_design/Dex/Settings/SettingModal.qml
@@ -650,7 +650,7 @@ Qaterial.Dialog
                         {
                             anchors.fill: parent
                             topPadding: 10
-                            spacing: 15
+                            spacing: 12
 
                             ModalLoader
                             {
@@ -721,15 +721,15 @@ Qaterial.Dialog
                                 {
                                     Layout.alignment: Qt.AlignVCenter
                                     Layout.fillWidth: true
-                                    text: qsTr("Qt version")
+                                    text: qsTr("RPC Port")
                                 }
 
                                 DexCopyableLabel
                                 {
                                     Layout.alignment: Qt.AlignVCenter
-                                    text: qtversion
-                                    onCopyNotificationTitle: qsTr("Qt Version")
-                                    onCopyNotificationMsg: qsTr("Qt Version copied to clipboard.")
+                                    text: API.app.settings_pg.get_rpcport()
+                                    onCopyNotificationTitle: qsTr("RPC Port")
+                                    onCopyNotificationMsg: qsTr("RPC Port copied to clipboard.")
                                 }
                             }
 
@@ -755,6 +755,27 @@ Qaterial.Dialog
                                 }
                             }
 
+                            RowLayout
+                            {
+                                width: parent.width - 30
+                                anchors.horizontalCenter: parent.horizontalCenter
+                                height: 60
+
+                                DexLabel
+                                {
+                                    Layout.alignment: Qt.AlignVCenter
+                                    Layout.fillWidth: true
+                                    text: qsTr("Qt version")
+                                }
+
+                                DexCopyableLabel
+                                {
+                                    Layout.alignment: Qt.AlignVCenter
+                                    text: qtversion
+                                    onCopyNotificationTitle: qsTr("Qt Version")
+                                    onCopyNotificationMsg: qsTr("Qt Version copied to clipboard.")
+                                }
+                            }
                         }
                     }
                 }
@@ -777,7 +798,7 @@ Qaterial.Dialog
 
             DexAppButton
             {
-                text: qsTr("Search Update")
+                text: qsTr("Search for Update")
                 height: 48
                 radius: 20
                 leftPadding: 20