add min/max vol to orders modal

KomodoPlatform · Apr 1, 2024 · af650fd · af650fd
1 parent 955a091
commit af650fd
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 2 deletions.
diff --git a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml
@@ -120,6 +120,26 @@ MultipageModal
                 label.font.pixelSize: 13
             }
 
+            // Min Vol
+            TextEditWithTitle
+            {
+                Layout.fillWidth: true
+                title: qsTr("Min Volume")
+                text: details ? details.min_volume + " " + details.base_coin : ""
+                label.font.pixelSize: 13
+                visible: General.exists(details) && details.min_volume != ""
+            }
+
+            // Max Vol
+            TextEditWithTitle
+            {
+                Layout.fillWidth: true
+                title: qsTr("Max Volume")
+                text: details ? details.max_volume + " " + details.base_coin : ""
+                label.font.pixelSize: 13
+                visible: General.exists(details) && details.max_volume != ""
+            }
+
             // Refund state
             TextEditWithTitle
             {

diff --git a/src/core/atomicdex/api/mm2/mm2.cpp b/src/core/atomicdex/api/mm2/mm2.cpp
@@ -293,7 +293,8 @@ namespace atomic_dex::mm2
                 .is_swap        = false,
                 .is_cancellable = value.at("cancellable").get<bool>(),
                 .is_recoverable = false,
-                .min_volume     = is_maker ? QString::fromStdString(value.at("min_base_vol").get<std::string>()) : std::optional<QString>(std::nullopt),
+                .min_volume     = is_maker ? QString::fromStdString(value.at("min_base_vol").get<std::string>()) : "",
+                .max_volume     = is_maker ? QString::fromStdString(value.at("max_base_vol").get<std::string>()) : "",
                 .conf_settings  = conf_settings};
             if (action.empty() && contents.order_type == "maker")
             {

diff --git a/src/core/atomicdex/data/dex/qt.orders.data.hpp b/src/core/atomicdex/data/dex/qt.orders.data.hpp
@@ -85,7 +85,8 @@ namespace atomic_dex::mm2
         bool is_swap_active{false};
 
         //! Only available for maker order
-        std::optional<QString>        min_volume{std::nullopt};
+        QString        min_volume;
+        QString        max_volume;
         std::optional<nlohmann::json> conf_settings{std::nullopt};
     };
 } // namespace atomic_dex::mm2

diff --git a/src/core/atomicdex/models/qt.orders.model.cpp b/src/core/atomicdex/models/qt.orders.model.cpp
@@ -82,6 +82,12 @@ namespace atomic_dex
         case RelCoinAmountCurrentCurrencyRole:
             item.rel_amount_fiat = value.toString();
             break;
+        case MinVolumeRole:
+            item.min_volume = value.toString();
+            break;
+        case MaxVolumeRole:
+            item.max_volume = value.toString();
+            break;
         case OrderTypeRole:
             item.order_type = value.toString();
             break;
@@ -166,6 +172,10 @@ namespace atomic_dex
             return item.rel_amount;
         case RelCoinAmountCurrentCurrencyRole:
             return item.rel_amount_fiat;
+        case MinVolumeRole:
+            return item.min_volume;
+        case MaxVolumeRole:
+            return item.max_volume;
         case OrderTypeRole:
             return item.order_type;
         case HumanDateRole:
@@ -233,6 +243,8 @@ namespace atomic_dex
             {BaseCoinAmountCurrentCurrencyRole, "base_amount_current_currency"},
             {RelCoinAmountRole, "rel_amount"},
             {RelCoinAmountCurrentCurrencyRole, "rel_amount_current_currency"},
+            {MinVolumeRole, "min_volume"},
+            {MaxVolumeRole, "max_volume"},
             {OrderTypeRole, "type"},
             {IsMakerRole, "is_maker"},
             {HumanDateRole, "date"},

diff --git a/src/core/atomicdex/models/qt.orders.model.hpp b/src/core/atomicdex/models/qt.orders.model.hpp
@@ -63,6 +63,8 @@ namespace atomic_dex
             RelCoinAmountRole,
             RelCoinAmountCurrentCurrencyRole,
             OrderTypeRole,
+            MinVolumeRole,
+            MaxVolumeRole,
             IsMakerRole,
             HumanDateRole,
             UnixTimestampRole,

diff --git a/src/core/atomicdex/models/qt.orders.proxy.model.cpp b/src/core/atomicdex/models/qt.orders.proxy.model.cpp
@@ -55,6 +55,10 @@ namespace atomic_dex
             break;
         case orders_model::RelCoinAmountCurrentCurrencyRole:
             break;
+        case orders_model::MinVolumeRole:
+            break;
+        case orders_model::MaxVolumeRole:
+            break;
         case orders_model::OrderTypeRole:
             break;
         case orders_model::IsMakerRole: