Merge remote-tracking branch 'upstream/fix/pro-field-overflow' into n…

…ogeo
cipig · Aug 17, 2024 · 5dd5f8a · 5dd5f8a
2 parents 385e399 + 182582b
commit 5dd5f8a
Show file tree

Hide file tree

Showing 178 changed files with 2,507 additions and 2,294 deletions.
diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml
@@ -6,7 +6,7 @@ on:
       - nogeo
 
 env:
-  DEX_API: "mm2_kmd"
+  DEX_API: "kdf_kwd"
   DEX_RPCPORT: 7762
   DEX_RPC: "http://127.0.0.1:7762"
   DEX_PROJECT_NAME: "komodo-wallet"

diff --git a/.gitignore b/.gitignore
@@ -69,7 +69,7 @@ Thumbs.db
 # --------
 *.exe
 
-/assets/tools/mm2/
+/assets/tools/kdf/
 /ci_tools_atomic_dex/vcpkg-repo/
 /ci_tools_atomic_dex/ci_tools_atomic_dex
 ci_tools_atomic_dex/build-Release

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -59,14 +59,14 @@ endif ()
 
 ##! We fetch our dependencies
 if (APPLE)
-    FetchContent_Declare(mm2
-            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.0.0-beta/mm2-b0fd99e84-Darwin-Release.zip)
+    FetchContent_Declare(kdf
+            URL https://sdk.devbuilds.komodo.earth/main/kdf_35e9239-mac-x86-64.zip)
 elseif (UNIX AND NOT APPLE)
-    FetchContent_Declare(mm2
-            URL https://sdk.devbuilds.komodo.earth/dev/mm2_8dfd0a9-linux-x86-64.zip)
+    FetchContent_Declare(kdf
+            URL https://sdk.devbuilds.komodo.earth/dev/kdf_8dfd0a9-linux-x86-64.zip)
 else ()
-    FetchContent_Declare(mm2
-            URL https://github.com/KomodoPlatform/komodo-defi-framework/releases/download/v2.0.0-beta/mm2-b0fd99e84-Win64.zip)
+    FetchContent_Declare(kdf
+            URL https://sdk.devbuilds.komodo.earth/main/kdf_35e9239-win-x86-64.zip)
 endif ()
 
 #FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip)
@@ -83,20 +83,20 @@ FetchContent_Declare(jl777-coins
 #FetchContent_Declare(adex-generics-coins
 #        URL https://github.com/KomodoPlatform/komodo-wallet-desktop/archive/main.zip)
 
-FetchContent_MakeAvailable(mm2 jl777-coins qmaterial)
+FetchContent_MakeAvailable(kdf jl777-coins qmaterial)
 
 ##! Configure our needs.
 if (UNIX)
     configure_file(${jl777-coins_SOURCE_DIR}/utils/coins_config_tcp.json ${CMAKE_CURRENT_SOURCE_DIR}/assets/config/${PROJECT_VERSION}-coins.json COPYONLY)
-    configure_file(${jl777-coins_SOURCE_DIR}/coins ${CMAKE_CURRENT_SOURCE_DIR}/assets/tools/mm2/coins COPYONLY)
-    configure_file(${mm2_SOURCE_DIR}/mm2 ${CMAKE_CURRENT_SOURCE_DIR}/assets/tools/mm2/${DEX_API} COPYONLY)
+    configure_file(${jl777-coins_SOURCE_DIR}/coins ${CMAKE_CURRENT_SOURCE_DIR}/assets/tools/kdf/coins COPYONLY)
+    configure_file(${kdf_SOURCE_DIR}/kdf ${CMAKE_CURRENT_SOURCE_DIR}/assets/tools/kdf/${DEX_API} COPYONLY)
     file(COPY ${jl777-coins_SOURCE_DIR}/icons/ DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/atomic_defi_design/assets/images/coins/)
 else ()
     configure_file(${jl777-coins_SOURCE_DIR}/utils/coins_config_tcp.json ${CMAKE_BINARY_DIR}/bin/assets/config/${PROJECT_VERSION}-coins.json COPYONLY)
-    configure_file(${jl777-coins_SOURCE_DIR}/coins ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/coins COPYONLY)
-    configure_file(${mm2_SOURCE_DIR}/mm2.exe ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/${DEX_API}.exe COPYONLY)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ci_tools_atomic_dex/windows_misc/msvcp140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/msvcp140.dll COPYONLY)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ci_tools_atomic_dex/windows_misc/vcruntime140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/vcruntime140.dll COPYONLY)
+    configure_file(${jl777-coins_SOURCE_DIR}/coins ${CMAKE_BINARY_DIR}/bin/assets/tools/kdf/coins COPYONLY)
+    configure_file(${kdf_SOURCE_DIR}/kdf.exe ${CMAKE_BINARY_DIR}/bin/assets/tools/kdf/${DEX_API}.exe COPYONLY)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ci_tools_atomic_dex/windows_misc/msvcp140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/kdf/msvcp140.dll COPYONLY)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ci_tools_atomic_dex/windows_misc/vcruntime140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/kdf/vcruntime140.dll COPYONLY)
 endif ()
 
 

diff --git a/assets/tools/.gitignore b/assets/tools/.gitignore
@@ -1,2 +1,3 @@
 mm2
 coins
+kdf
diff --git a/atomic_defi_design/Dex/Components/DexTextField.qml b/atomic_defi_design/Dex/Components/DexTextField.qml
@@ -10,6 +10,8 @@ TextField
 
     property alias left_text: left_text.text_value
     property alias right_text: right_text.text_value
+    property alias left_fontsize: left_text.font.pixelSize
+    property alias right_fontsize: right_text.font.pixelSize
     property alias radius: background.radius
     property color backgroundColor: Dex.CurrentTheme.textFieldBackgroundColor
     property color backgroundColorActive: Dex.CurrentTheme.textFieldActiveBackgroundColor

diff --git a/atomic_defi_design/Dex/Constants/General.qml b/atomic_defi_design/Dex/Constants/General.qml
@@ -175,7 +175,7 @@ QtObject {
     }
 
     function coinContractAddress(ticker) {
-        var cfg = API.app.trading_pg.get_raw_mm2_coin_cfg(ticker)
+        var cfg = API.app.trading_pg.get_raw_kdf_coin_cfg(ticker)
         if (cfg.hasOwnProperty('protocol')) {
             if (cfg.protocol.hasOwnProperty('protocol_data')) {
                 if (cfg.protocol.protocol_data.hasOwnProperty('contract_address')) {
@@ -187,7 +187,7 @@ QtObject {
     }
 
     function coinPlatform(ticker) {
-        var cfg = API.app.trading_pg.get_raw_mm2_coin_cfg(ticker)
+        var cfg = API.app.trading_pg.get_raw_kdf_coin_cfg(ticker)
         if (cfg.hasOwnProperty('protocol')) {
             if (cfg.protocol.hasOwnProperty('protocol_data')) {
                 if (cfg.protocol.protocol_data.hasOwnProperty('platform')) {

diff --git a/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/OrderForm.qml b/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/OrderForm.qml
@@ -103,7 +103,8 @@ ColumnLayout
             id: input_price
 
             left_text: qsTr("Price")
-            right_text: right_ticker
+            right_text: General.coinWithoutSuffix(right_ticker)
+            right_fontsize: 10
             enabled: !(API.app.trading_pg.preferred_order.price !== undefined)
             color: enabled ? Dex.CurrentTheme.foregroundColor : Dex.CurrentTheme.foregroundColor2
             text: backend_price ? backend_price : General.formatDouble(API.app.trading_pg.cex_price)
@@ -167,7 +168,8 @@ ColumnLayout
             height: 36
             radius: 18
             left_text: sell_mode ? qsTr("Send") : qsTr("Receive") 
-            right_text: left_ticker
+            right_text: General.coinWithoutSuffix(left_ticker)
+            right_fontsize: 10
             placeholderText: "0" 
             text: API.app.trading_pg.volume
             onTextChanged: {

diff --git a/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml b/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml
@@ -84,7 +84,7 @@ MultipageModal
         {
             id: config_section
 
-            readonly property var default_config: API.app.trading_pg.get_raw_mm2_coin_cfg(rel_ticker)
+            readonly property var default_config: API.app.trading_pg.get_raw_kdf_coin_cfg(rel_ticker)
             readonly property bool is_dpow_configurable: config_section.default_config.requires_notarization || false
 
             width: dex_pair_badges.width - 40

diff --git a/atomic_defi_design/Dex/Screens/Startup/Logging.qml b/atomic_defi_design/Dex/Screens/Startup/Logging.qml
@@ -39,7 +39,7 @@ SetupPage
         DefaultText
         {
             Layout.alignment: Qt.AlignHCenter
-            text_value: (current_status === "initializing_mm2" ? qsTr("Initializing MM2") :
+            text_value: (current_status === "initializing_kdf" ? qsTr("Initializing KDF") :
                 current_status === "enabling_coins" ? qsTr("Enabling assets") : qsTr("Getting ready")) + "..."
         }
     }

diff --git a/atomic_defi_design/Dex/Settings/AddCustomCoinModal.qml b/atomic_defi_design/Dex/Settings/AddCustomCoinModal.qml
@@ -44,7 +44,7 @@ MultipageModal
 
     onCustom_token_dataChanged: {
         const data = custom_token_data
-        if(!data.mm2_cfg) return
+        if(!data.kdf_cfg) return
 
         var fields = General.clone(config_fields)
 

diff --git a/atomic_defi_design/Dex/Settings/SettingModal.qml b/atomic_defi_design/Dex/Settings/SettingModal.qml
@@ -725,15 +725,15 @@ Qaterial.Dialog
                                 {
                                     Layout.alignment: Qt.AlignVCenter
                                     Layout.fillWidth: true
-                                    text: qsTr("MM2 version")
+                                    text: qsTr("KDF version")
                                 }
 
                                 DexCopyableLabel
                                 {
                                     Layout.alignment: Qt.AlignVCenter
-                                    text: API.app.settings_pg.get_mm2_version()
-                                    onCopyNotificationTitle: qsTr("MM2 Version")
-                                    onCopyNotificationMsg: qsTr("MM2 Version copied to clipboard.")
+                                    text: API.app.settings_pg.get_kdf_version()
+                                    onCopyNotificationTitle: qsTr("KDF Version")
+                                    onCopyNotificationMsg: qsTr("KDF Version copied to clipboard.")
                                 }
                             }
 

diff --git a/atomic_defi_design/Dex/Wallet/SendResult.qml b/atomic_defi_design/Dex/Wallet/SendResult.qml
@@ -16,7 +16,7 @@ MultipageModalContent
     property string custom_amount
     property alias  tx_hash: tx_hash.text_value
 
-    titleText: qsTr("Transaction Complete!")
+    titleText: qsTr("Transaction Broadcast!")
 
     // Transaction Hash
     TitleText

diff --git a/atomic_defi_design/Dex/Wallet/TransactionDetailsModal.qml b/atomic_defi_design/Dex/Wallet/TransactionDetailsModal.qml
@@ -124,7 +124,7 @@ MultipageModal
         TextEditWithTitle
         {
             title: qsTr("Date")
-            text: !details ? "" : details.timestamp === 0 ? qsTr("Unconfirmed"):  details.date
+            text: !details ? "" : details.timestamp === 0 ? qsTr("Awaiting confirmation"):  details.timestamp
             label.font.pixelSize: 13
         }